Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Only show deprecation warning if the webhook is active

This commit is contained in:
Robin Ward 2019-06-10 16:22:51 -04:00
parent ace6ce0462
commit ecebff5060
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/web_hook.rb
View File

@ -58,11 +58,11 @@ class WebHook < ActiveRecord::Base
end end
def self.enqueue_object_hooks(type, object, event, serializer = nil) def self.enqueue_object_hooks(type, object, event, serializer = nil)
if active_web_hooks(type).exists?
if type == :flag if type == :flag
Discourse.deprecate("The flags webhook is deprecated. Please use reviewable instead.") Discourse.deprecate("The flags webhook is deprecated. Please use reviewable instead.")
end end
if active_web_hooks(type).exists?
payload = WebHook.generate_payload(type, object, serializer) payload = WebHook.generate_payload(type, object, serializer)
WebHook.enqueue_hooks(type, event, WebHook.enqueue_hooks(type, event,

2
config/initializers/012-web_hook_events.rb
View File

@ -97,7 +97,7 @@ end
DiscourseEvent.on(:reviewable_transitioned_to) do |status, reviewable| DiscourseEvent.on(:reviewable_transitioned_to) do |status, reviewable|
WebHook.enqueue_object_hooks(:reviewable, reviewable, :reviewable_transitioned_to, reviewable.serializer) WebHook.enqueue_object_hooks(:reviewable, reviewable, :reviewable_transitioned_to, reviewable.serializer)
# TODO: Backwards compatibility for Queued Post webhooks. Remve in favor of Reviewable API # TODO: Backwards compatibility for Queued Post webhooks. Remove in favor of Reviewable API
if reviewable.is_a?(ReviewableQueuedPost) if reviewable.is_a?(ReviewableQueuedPost)
if reviewable.approved? if reviewable.approved?
WebHook.enqueue_object_hooks(:queued_post, reviewable, :approved_post, QueuedPostSerializer) WebHook.enqueue_object_hooks(:queued_post, reviewable, :approved_post, QueuedPostSerializer)