IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Add topic deleted check to email/sender (#9166)

Browse Source 
It already had a deleted post check and log reason, add a topic one too to avoid errors
This commit is contained in:
Martin Brennan
2020-03-13 10:04:15 +10:00
committed by GitHub
parent 4d7f6749be
commit 2237ba8c9d
4 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/email/sender.rb
View File

@@ -96,12 +96,13 @@ module Email
if topic_id.present? && post_id.present?
post = Post.find_by(id: post_id, topic_id: topic_id)
# guards against deleted posts
return skip(SkippedEmailLog.reason_types[:sender_post_deleted]) unless post
add_attachments(post)
# guards against deleted posts and topics
return skip(SkippedEmailLog.reason_types[:sender_post_deleted]) if post.blank?
topic = post.topic
return skip(SkippedEmailLog.reason_types[:sender_topic_deleted]) if topic.blank?
add_attachments(post)
first_post = topic.ordered_posts.first
topic_message_id = first_post.incoming_email&.message_id.present? ?