about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authormultiple creatures <dev@multiple-creature.party>2019-12-12 11:12:07 -0600
committermultiple creatures <dev@multiple-creature.party>2019-12-12 11:12:43 -0600
commit5464e5a0b71c2b66b1e4707eaa854d9801558525 (patch)
tree13517f060a032b166da16f8ef015f63496fef6da /app
parent16332682931d3a59c180ecff94e07d6bf650e5e0 (diff)
avoid letting folks kick themselves out of their own threads
Diffstat (limited to 'app')
-rw-r--r--app/lib/bangtags.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/lib/bangtags.rb b/app/lib/bangtags.rb
index 201ed9622..05d65c192 100644
--- a/app/lib/bangtags.rb
+++ b/app/lib/bangtags.rb
@@ -303,7 +303,7 @@ class Bangtags
               next if @parent_status.nil?
               parent_account = @parent_status.account
             end
-            next if parent_account.nil?
+            next if parent_account.nil? || parent_account.id == @account.id
             ConversationKick.find_or_create_by(account_id: parent_account.id, conversation_id: status.conversation_id)
             convo_statuses.where(account_id: parent_account.id).find_each do |s|
               RemoveStatusForAccountService.new.call(@account, s)
@@ -325,7 +325,7 @@ class Bangtags
               next if @parent_status.nil?
               parent_account = @parent_status.account
             end
-            next if parent_account.nil?
+            next if parent_account.nil? || parent_account.id == @account.id
             ConversationKick.where(account_id: parent_account.id, conversation_id: status.conversation_id).destroy_all
             service_dm(
               'janitor', @account,