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 broken tests.

Browse Source
This commit is contained in:
Guo Xiang Tan 2017-03-16 10:22:15 +08:00
parent cfbfea0596
commit 0a87547cbc
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/jobs/regular/emit_web_hook_event.rb
View File

@ -20,7 +20,7 @@ module Jobs
!web_hook.category_ids.include?(args[:category_id])) !web_hook.category_ids.include?(args[:category_id]))
event_type = args[:event_type].to_s event_type = args[:event_type].to_s
return unless self.send("setup_#{event_type}") return unless self.send("setup_#{event_type}", args)
end end
web_hook_request(args, web_hook) web_hook_request(args, web_hook)
@ -41,13 +41,13 @@ module Jobs
def setup_topic(args) def setup_topic(args)
topic_view = (TopicView.new(args[:topic_id], Discourse.system_user) rescue nil) topic_view = (TopicView.new(args[:topic_id], Discourse.system_user) rescue nil)
return if topic_view.blank? return if topic_view.blank?
args[:payload] = WebHookTopicViewSerializer.new(post, scope: guardian, root: false).as_json args[:payload] = WebHookTopicViewSerializer.new(topic_view, scope: guardian, root: false).as_json
end end
def setup_user(args) def setup_user(args)
user = User.find_by(id: args[:user_id]) user = User.find_by(id: args[:user_id])
return if user.blank? return if user.blank?
args[:payload] = WebHookUserSerializer.new(post, scope: guardian, root: false).as_json args[:payload] = WebHookUserSerializer.new(user, scope: guardian, root: false).as_json
end end
def ping_event?(event_type) def ping_event?(event_type)