Only show deprecation warning if the webhook is active

Only show deprecation warning if the webhook is active

diff --git a/app/models/web_hook.rb b/app/models/web_hook.rb
index c9cf902..ac36d64 100644
--- a/app/models/web_hook.rb
+++ b/app/models/web_hook.rb
@@ -58,11 +58,11 @@ class WebHook < ActiveRecord::Base
   end
 
   def self.enqueue_object_hooks(type, object, event, serializer = nil)
-    if type == :flag
-      Discourse.deprecate("The flags webhook is deprecated. Please use reviewable instead.")
-    end
-
     if active_web_hooks(type).exists?
+      if type == :flag
+        Discourse.deprecate("The flags webhook is deprecated. Please use reviewable instead.")
+      end
+
       payload = WebHook.generate_payload(type, object, serializer)
 
       WebHook.enqueue_hooks(type, event,
diff --git a/config/initializers/012-web_hook_events.rb b/config/initializers/012-web_hook_events.rb
index 5df4c8d..1451a5d 100644
--- a/config/initializers/012-web_hook_events.rb
+++ b/config/initializers/012-web_hook_events.rb
@@ -97,7 +97,7 @@ end
 DiscourseEvent.on(:reviewable_transitioned_to) do |status, reviewable|
   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.approved?
       WebHook.enqueue_object_hooks(:queued_post, reviewable, :approved_post, QueuedPostSerializer)

GitHub sha: ecebff50

1 Like