From c77a54fe0aadceb9b1e74097dbdb272a4eb62fd5 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Wed, 22 Feb 2017 15:52:47 +0100 Subject: [PATCH] Fix #651 - Do not reinsert original status into all followers feeds upon un-reblogging. Check if the reblog was in the feed in the first place. It might have been filtered on distribution. --- app/services/remove_status_service.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/services/remove_status_service.rb b/app/services/remove_status_service.rb index 73b545f170b..cf1f432e481 100644 --- a/app/services/remove_status_service.rb +++ b/app/services/remove_status_service.rb @@ -59,7 +59,7 @@ class RemoveStatusService < BaseService end def unpush(type, receiver, status) - if status.reblog? + if status.reblog? && !redis.zscore(FeedManager.instance.key(type, receiver.id), status.reblog_of_id).nil? redis.zadd(FeedManager.instance.key(type, receiver.id), status.reblog_of_id, status.reblog_of_id) else redis.zremrangebyscore(FeedManager.instance.key(type, receiver.id), status.id, status.id)