github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-23 08:51:05 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: post & topic destroyed hooks not triggering with tag filter

Browse Source
This commit is contained in:
Vinoth Kannan
2019-03-06 22:52:54 +05:30
parent 2db3652338
commit 167d85c21f
3 changed files with 36 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/models/web_hook.rb
View File

@ -65,10 +65,12 @@ class WebHook < ActiveRecord::Base
end
end
def self.enqueue_topic_hooks(event, topic)
def self.enqueue_topic_hooks(event, topic, payload = nil)
if active_web_hooks('topic').exists? && topic.present?
topic_view = TopicView.new(topic.id, Discourse.system_user)
payload = WebHook.generate_payload(:topic, topic_view, WebHookTopicViewSerializer)
payload ||= begin
topic_view = TopicView.new(topic.id, Discourse.system_user)
WebHook.generate_payload(:topic, topic_view, WebHookTopicViewSerializer)
end
WebHook.enqueue_hooks(:topic, event,
id: topic.id,
@ -79,9 +81,9 @@ class WebHook < ActiveRecord::Base
end
end
def self.enqueue_post_hooks(event, post)
def self.enqueue_post_hooks(event, post, payload = nil)
if active_web_hooks('post').exists? && post.present?
payload = WebHook.generate_payload(:post, post)
payload ||= WebHook.generate_payload(:post, post)
WebHook.enqueue_hooks(:post, event,
id: post.id,