From 9d35a7aef6f64088dd97446f10aee581f3009af7 Mon Sep 17 00:00:00 2001
From: Fire Demon <firedemon@creature.cafe>
Date: Mon, 24 Aug 2020 13:22:41 -0500
Subject: [Bug, Command Tags] Avoid processing deleted statuses

---
 app/lib/command_tag/processor.rb         | 2 +-
 app/services/process_mentions_service.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'app')

diff --git a/app/lib/command_tag/processor.rb b/app/lib/command_tag/processor.rb
index 9edcb58ba..5a1f6a68d 100644
--- a/app/lib/command_tag/processor.rb
+++ b/app/lib/command_tag/processor.rb
@@ -91,7 +91,7 @@ class CommandTag::Processor
     all_handlers!(:shutdown)
   rescue CommandTag::Break
     nil
-  rescue StandardError => e
+  rescue StandardError
     @status.update(published: false)
     @status.destroy
     raise
diff --git a/app/services/process_mentions_service.rb b/app/services/process_mentions_service.rb
index ba61e4464..b5134bf9c 100644
--- a/app/services/process_mentions_service.rb
+++ b/app/services/process_mentions_service.rb
@@ -10,7 +10,7 @@ class ProcessMentionsService < BaseService
   # @option [Enumerable] :mentions Mentions to include
   # @option [Boolean] :deliver Deliver mention notifications
   def call(status, mentions: [], deliver: true)
-    return unless status.local? && !status.frozen?
+    return unless status.local? && !(status.frozen? || status.destroyed?)
 
     @status = status
     @status.text, mentions = ResolveMentionsService.new.call(@status, mentions: mentions)
-- 
cgit