FIX: TL2 promotion message and advance training (#10679)

This is a little bit of refactoring. Core Discourse should have default promotion message for TL2.

In addition, when the Discobot plugin is enabled, the user is invited to advanced training

plugins/discourse-narrative-bot/autoload/jobs/send_advanced_tutorial_message.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-module Jobs
-  class SendAdvancedTutorialMessage < ::Jobs::Base
-    def execute(args)
-      user = User.find_by(id: args[:user_id])
-      return if user.nil?
-
-      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!(
-        Discourse.system_user,
-        title: I18n.t("discourse_narrative_bot.tl2_promotion_message.subject_template"),
-        raw: raw,
-        archetype: Archetype.private_message,
-        target_usernames: user.username,
-        skip_validations: true
-      )
-    end
-  end
-end

plugins/discourse-narrative-bot/config/locales/server.en.yml

@@ -30,8 +30,6 @@ en:
 
         Reply to this message with `@%{discobot_username} %{reset_trigger}` to find out more about what you can do.
 
-        We invite you to keep getting involved – we enjoy having you around.
-
     timeout:
       message: |-
         Hey @%{username}, just checking in because I haven’t heard from you in a while.

plugins/discourse-narrative-bot/plugin.rb

@@ -33,7 +33,6 @@ after_initialize do
     '../autoload/jobs/narrative_timeout.rb',
     '../autoload/jobs/narrative_init.rb',
     '../autoload/jobs/send_default_welcome_message.rb',
-    '../autoload/jobs/send_advanced_tutorial_message.rb',
     '../autoload/jobs/onceoff/grant_badges.rb',
     '../autoload/jobs/onceoff/remap_old_bot_images.rb',
     '../lib/discourse_narrative_bot/actions.rb',
@@ -282,25 +281,28 @@ after_initialize do
     end
   end
 
-  self.on(:user_promoted) do |args|
-    promoted_from_tl1 = args[:new_trust_level] == TrustLevel[2] &&
-      args[:old_trust_level] == TrustLevel[1]
-
-    if SiteSetting.discourse_narrative_bot_enabled && promoted_from_tl1
-      # The event 'user_promoted' is sometimes called from inside a transaction.
-      # Use this helper to ensure the job is enqueued after commit to prevent
-      # any race conditions.
-      DB.after_commit do
-        Jobs.enqueue(:send_advanced_tutorial_message, user_id: args[:user_id])
-      end
-    end
-  end
-
   UserAvatar.register_custom_user_gravatar_email_hash(
     DiscourseNarrativeBot::BOT_USER_ID,
     "discobot@discourse.org"
   )
 
+  self.on(:system_message_sent) do |args|
+    return if args[:message_type] != 'tl2_promotion_message'
+    return if !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}")
+
+    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
+
   PostGuardian.class_eval do
     alias_method :existing_can_create_post?, :can_create_post?
 

plugins/discourse-narrative-bot/spec/jobs/send_advanced_tutorial_message_spec.rb

@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe Jobs::SendAdvancedTutorialMessage do
-  before do
-    Jobs.run_immediately!
-    SiteSetting.discourse_narrative_bot_enabled = true
-  end
-
-  it 'sends a message to the promoted user' do
-    user = Fabricate(:user)
-    system_user = Discourse.system_user
-    Jobs.enqueue(:send_advanced_tutorial_message, user_id: user.id)
-
-    topic = Topic.last
-
-    expect(topic).not_to be_nil
-    expect(topic.user).to eq(system_user)
-    expect(topic.archetype).to eq(Archetype.private_message)
-    expect(topic.topic_allowed_users.pluck(:user_id)).to contain_exactly(
-      system_user.id, user.id
-    )
-    expect(topic.first_post.raw).to eq(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}"
-    ).chomp)
-  end
-end