about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2018-07-05 20:57:50 +0200
committerGitHub <noreply@github.com>2018-07-05 20:57:50 +0200
commit8461cd4bb5d620cf16e36766b11d507449b27cb5 (patch)
tree3989421cdef958b2ff843007d92cf2c6ecf3d5f1
parentbaff4a7ce01907c924beae1a3c7fe5524261e753 (diff)
Send undo of boost to original poster if reblog (#7959)
Fix #7874
-rw-r--r--app/services/remove_status_service.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/services/remove_status_service.rb b/app/services/remove_status_service.rb
index b9631077c..238099169 100644
--- a/app/services/remove_status_service.rb
+++ b/app/services/remove_status_service.rb
@@ -67,7 +67,9 @@ class RemoveStatusService < BaseService
     # delete notification - so here, we explicitly
     # send it to them
 
-    target_accounts = (@mentions.map(&:account).reject(&:local?) + @reblogs.map(&:account).reject(&:local?)).uniq(&:id)
+    target_accounts = (@mentions.map(&:account).reject(&:local?) + @reblogs.map(&:account).reject(&:local?))
+    target_accounts << @status.reblog.account if @status.reblog? && !@status.reblog.account.local?
+    target_accounts.uniq!(&:id)
 
     # Ostatus
     NotificationWorker.push_bulk(target_accounts.select(&:ostatus?).uniq(&:domain)) do |target_account|