From cfb3f4db135263f8839c110ca6fc5e5443a019c0 Mon Sep 17 00:00:00 2001 From: Penar Musaraj Date: Tue, 22 Sep 2020 12:56:21 -0400 Subject: [PATCH] FIX: Unexpected return during system_message_sent event Followup to 0bb51dc, should fix an issue with multiple system message events being sent --- plugins/discourse-narrative-bot/plugin.rb | 24 +++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/plugins/discourse-narrative-bot/plugin.rb b/plugins/discourse-narrative-bot/plugin.rb index e9ceeee41e8..826d190f032 100644 --- a/plugins/discourse-narrative-bot/plugin.rb +++ b/plugins/discourse-narrative-bot/plugin.rb @@ -287,20 +287,20 @@ after_initialize do ) self.on(:system_message_sent) do |args| - return if args[:message_type] != 'tl2_promotion_message' - return if !SiteSetting.discourse_narrative_bot_enabled + if args[:message_type] == 'tl2_promotion_message' && SiteSetting.discourse_narrative_bot_enabled - raw = I18n.t("discourse_narrative_bot.tl2_promotion_message.text_body_template", - discobot_username: ::DiscourseNarrativeBot::Base.new.discobot_username, - reset_trigger: "#{::DiscourseNarrativeBot::TrackSelector.reset_trigger} #{::DiscourseNarrativeBot::AdvancedUserNarrative.reset_trigger}") + raw = I18n.t("discourse_narrative_bot.tl2_promotion_message.text_body_template", + discobot_username: ::DiscourseNarrativeBot::Base.new.discobot_username, + reset_trigger: "#{::DiscourseNarrativeBot::TrackSelector.reset_trigger} #{::DiscourseNarrativeBot::AdvancedUserNarrative.reset_trigger}") - PostCreator.create!( - ::DiscourseNarrativeBot::Base.new.discobot_user, - title: I18n.t("discourse_narrative_bot.tl2_promotion_message.subject_template"), - raw: raw, - topic_id: args[:post].topic_id, - skip_validations: true - ) + PostCreator.create!( + ::DiscourseNarrativeBot::Base.new.discobot_user, + title: I18n.t("discourse_narrative_bot.tl2_promotion_message.subject_template"), + raw: raw, + topic_id: args[:post].topic_id, + skip_validations: true + ) + end end PostGuardian.class_eval do