From 03b20bc0a4b12940602325a52fbcd50274b1118c Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 28 May 2026 03:19:52 -0400
Subject: [PATCH] Use `rescue_from` to handle missing status scenario in
 `NotificationMailer` (#38155)

---
 app/mailers/notification_mailer.rb | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/app/mailers/notification_mailer.rb b/app/mailers/notification_mailer.rb
index ecb3750968..db9218619a 100644
--- a/app/mailers/notification_mailer.rb
+++ b/app/mailers/notification_mailer.rb
@@ -19,17 +19,15 @@ class NotificationMailer < ApplicationMailer
 
   default to: -> { email_address_with_name(@user.email, @me.username) }
 
+  rescue_from(ActiveRecord::RecordNotFound) { false }
+
   layout 'mailer'
 
   def mention
-    return if @status.blank?
-
     mail subject: default_i18n_subject(name: @status.account.acct)
   end
 
   def quote
-    return if @status.blank?
-
     mail subject: default_i18n_subject(name: @status.account.acct)
   end
 
@@ -38,14 +36,10 @@ class NotificationMailer < ApplicationMailer
   end
 
   def favourite
-    return if @status.blank?
-
     mail subject: default_i18n_subject(name: @account.acct)
   end
 
   def reblog
-    return if @status.blank?
-
     mail subject: default_i18n_subject(name: @account.acct)
   end
 
@@ -64,7 +58,7 @@ class NotificationMailer < ApplicationMailer
   end
 
   def set_status
-    @status = @notification.target_status
+    @status = @notification.target_status || raise(ActiveRecord::RecordNotFound)
   end
 
   def set_account