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: skip pm view action log while generating webhook payload.

Browse Source 
Currently, while generating webhook payloads for a topic it's accidentally adding a personal message view log in 'system' user's history.
This commit is contained in:
Vinoth Kannan
2020-09-02 05:40:42 +05:30
parent 26ec4fd25b
commit 3b55de90e5
3 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/post_destroyer.rb
View File

@@ -57,10 +57,11 @@ class PostDestroyer
payload = WebHook.generate_payload(:post, @post) if WebHook.active_web_hooks(:post).exists?
topic = @post.topic
is_first_post = @post.is_first_post? && topic
has_topic_web_hooks = is_first_post && WebHook.active_web_hooks(:topic).exists?
if is_first_post
topic_view = TopicView.new(topic.id, Discourse.system_user)
topic_payload = WebHook.generate_payload(:topic, topic_view, WebHookTopicViewSerializer) if WebHook.active_web_hooks(:topic).exists?
if has_topic_web_hooks
topic_view = TopicView.new(topic.id, Discourse.system_user, skip_staff_action: true)
topic_payload = WebHook.generate_payload(:topic, topic_view, WebHookTopicViewSerializer)
end
delete_removed_posts_after = @opts[:delete_removed_posts_after] || SiteSetting.delete_removed_posts_after
@@ -80,7 +81,7 @@ class PostDestroyer
UserProfile.remove_featured_topic_from_all_profiles(@topic)
UserActionManager.topic_destroyed(topic)
DiscourseEvent.trigger(:topic_destroyed, topic, @user)
WebHook.enqueue_topic_hooks(:topic_destroyed, topic, topic_payload)
WebHook.enqueue_topic_hooks(:topic_destroyed, topic, topic_payload) if has_topic_web_hooks
end
end