remove composer reliance.. simply some shiz

Author: markvanlan

assets/javascripts/discourse/controllers/discourse-ai-bot-conversations.js

@@ -1,48 +1,28 @@
 import Controller from "@ember/controller";
 import { action } from "@ember/object";
+import { alias } from "@ember/object/computed";
 import { service } from "@ember/service";
-import { tracked } from "@ember-compat/tracked-built-ins";
 
 export default class DiscourseAiBotConversations extends Controller {
   @service aiBotConversationsHiddenSubmit;
   @service currentUser;
 
-  @tracked selectedPersona = this.personaOptions[0].username;
+  @alias("aiBotConversationsHiddenSubmit.loading") loading;
 
   textarea = null;
 
   init() {
     super.init(...arguments);
-    this.selectedPersonaChanged(this.selectedPersona);
   }
 
-  get personaOptions() {
-    if (this.currentUser.ai_enabled_personas) {
-      return this.currentUser.ai_enabled_personas
-        .filter((persona) => persona.username)
-        .map((persona) => {
-          return {
-            id: persona.id,
-            username: persona.username,
-            name: persona.name,
-            description: persona.description,
-          };
-        });
-    }
-  }
-
-  get displayPersonaSelector() {
-    return this.personaOptions.length > 1;
-  }
-
-  get filterable() {
-    return this.personaOptions.length > 4;
+  @action
+  setPersonaId(id) {
+    this.aiBotConversationsHiddenSubmit.personaId = id;
   }
 
   @action
-  selectedPersonaChanged(username) {
-    this.selectedPersona = username;
-    this.aiBotConversationsHiddenSubmit.personaUsername = username;
+  setTargetRecipient(username) {
+    this.aiBotConversationsHiddenSubmit.targetUsername = username;
   }
 
   @action

assets/javascripts/discourse/services/ai-bot-conversations-hidden-submit.js

@@ -1,16 +1,22 @@
 import { action } from "@ember/object";
 import { next } from "@ember/runloop";
 import Service, { service } from "@ember/service";
+import { tracked } from "@ember-compat/tracked-built-ins";
+import { ajax } from "discourse/lib/ajax";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { i18n } from "discourse-i18n";
-import { composeAiBotMessage } from "../lib/ai-bot-helper";
 
 export default class AiBotConversationsHiddenSubmit extends Service {
-  @service composer;
   @service aiConversationsSidebarManager;
+  @service appEvents;
+  @service composer;
   @service dialog;
+  @service router;
+
+  @tracked loading = false;
 
-  personaUsername;
+  personaId;
+  targetUsername;
 
   inputValue = "";
 
@@ -25,9 +31,6 @@ export default class AiBotConversationsHiddenSubmit extends Service {
 
   @action
   async submitToBot() {
-    this.composer.destroyDraft();
-    this.composer.close();
-
     if (this.inputValue.length < 10) {
       return this.dialog.alert({
         message: i18n(
@@ -38,25 +41,32 @@ export default class AiBotConversationsHiddenSubmit extends Service {
       });
     }
 
-    // we are intentionally passing null as the targetBot to allow for the
-    // function to select the first available bot. This will be refactored in the
-    // future to allow for selecting a specific bot.
-    await composeAiBotMessage(null, this.composer, {
-      skipFocus: true,
-      topicBody: this.inputValue,
-      personaUsername: this.personaUsername,
-    });
+    this.loading = true;
+    const title = i18n("discourse_ai.ai_bot.default_pm_prefix");
 
     try {
-      await this.composer.save();
-      this.aiConversationsSidebarManager.newTopicForceSidebar = true;
-      if (this.inputValue.length > 10) {
-        // prevents submitting same message again when returning home
-        // but avoids deleting too-short message on submit
-        this.inputValue = "";
-      }
+      const response = await ajax("/posts.json", {
+        method: "POST",
+        data: {
+          raw: this.inputValue,
+          title,
+          archetype: "private_message",
+          target_recipients: this.targetUsername,
+          meta_data: { ai_persona_id: this.personaId },
+          topic_custom_fields: { is_ai_bot_pm: true },
+        },
+      });
+
+      this.appEvents.trigger("discourse-ai:bot-pm-created", {
+        id: response.topic_id,
+        slug: response.topic_slug,
+        title,
+      });
+      this.router.transitionTo(response.post_url);
     } catch (e) {
       popupAjaxError(e);
+    } finally {
+      this.loading = false;
     }
   }
 }

assets/javascripts/discourse/templates/discourse-ai-bot-conversations.gjs

@@ -1,50 +1,45 @@
-import { hash } from "@ember/helper";
 import { on } from "@ember/modifier";
 import didInsert from "@ember/render-modifiers/modifiers/did-insert";
 import RouteTemplate from "ember-route-template";
+import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";
 import DButton from "discourse/components/d-button";
 import { i18n } from "discourse-i18n";
-import DropdownSelectBox from "select-kit/components/dropdown-select-box";
+import AiPersonaLlmSelector from "discourse/plugins/discourse-ai/discourse/components/ai-persona-llm-selector";
 
 export default RouteTemplate(
   <template>
     <div class="ai-bot-conversations">
-      {{#if @controller.displayPersonaSelector}}
-        <div class="ai-bot-conversations__persona-selector">
-          <DropdownSelectBox
-            class="persona-llm-selector__persona-dropdown"
-            @value={{@controller.selectedPersona}}
-            @valueProperty="username"
-            @content={{@controller.personaOptions}}
-            @options={{hash icon="robot" filterable=@controller.filterable}}
-            @onChange={{@controller.selectedPersonaChanged}}
-          />
-        </div>
-      {{/if}}
+      <AiPersonaLlmSelector
+        @setPersonaId={{@controller.setPersonaId}}
+        @setTargetRecipient={{@controller.setTargetRecipient}}
+      />
 
       <div class="ai-bot-conversations__content-wrapper">
-
-        <h1>{{i18n "discourse_ai.ai_bot.conversations.header"}}</h1>
-        <div class="ai-bot-conversations__input-wrapper">
-          <textarea
-            {{didInsert @controller.setTextArea}}
-            {{on "input" @controller.updateInputValue}}
-            {{on "keydown" @controller.handleKeyDown}}
-            id="ai-bot-conversations-input"
-            placeholder={{i18n "discourse_ai.ai_bot.conversations.placeholder"}}
-            minlength="10"
-            rows="1"
-          />
-          <DButton
-            @action={{@controller.aiBotConversationsHiddenSubmit.submitToBot}}
-            @icon="paper-plane"
-            @title="discourse_ai.ai_bot.conversations.header"
-            class="ai-bot-button btn-primary ai-conversation-submit"
-          />
-        </div>
-        <p class="ai-disclaimer">
-          {{i18n "discourse_ai.ai_bot.conversations.disclaimer"}}
-        </p>
+        <ConditionalLoadingSpinner @condition={{@controller.loading}}>
+          <h1>{{i18n "discourse_ai.ai_bot.conversations.header"}}</h1>
+          <div class="ai-bot-conversations__input-wrapper">
+            <textarea
+              {{didInsert @controller.setTextArea}}
+              {{on "input" @controller.updateInputValue}}
+              {{on "keydown" @controller.handleKeyDown}}
+              id="ai-bot-conversations-input"
+              placeholder={{i18n
+                "discourse_ai.ai_bot.conversations.placeholder"
+              }}
+              minlength="10"
+              rows="1"
+            />
+            <DButton
+              @action={{@controller.aiBotConversationsHiddenSubmit.submitToBot}}
+              @icon="paper-plane"
+              @title="discourse_ai.ai_bot.conversations.header"
+              class="ai-bot-button btn-primary ai-conversation-submit"
+            />
+          </div>
+          <p class="ai-disclaimer">
+            {{i18n "discourse_ai.ai_bot.conversations.disclaimer"}}
+          </p>
+        </ConditionalLoadingSpinner>
       </div>
     </div>
   </template>

assets/javascripts/initializers/ai-conversations-sidebar.js

@@ -53,6 +53,10 @@ export default {
               this.topic = topic;
             }
 
+            get key() {
+              return this.topic.id;
+            }
+
             get name() {
               return this.topic.title;
             }
@@ -90,13 +94,21 @@ export default {
               super(...arguments);
               this.fetchMessages();
 
-              appEvents.on("topic:created", this, "addNewMessageToSidebar");
+              appEvents.on(
+                "discourse-ai:bot-pm-created",
+                this,
+                "addNewPMToSidebar"
+              );
             }
 
             @bind
             willDestroy() {
               this.removeScrollListener();
-              appEvents.on("topic:created", this, "addNewMessageToSidebar");
+              appEvents.off(
+                "discourse-ai:bot-pm-created",
+                this,
+                "addNewPMToSidebar"
+              );
             }
 
             get name() {
@@ -115,8 +127,8 @@ export default {
               );
             }
 
-            addNewMessageToSidebar(topic) {
-              this.addNewMessage(topic);
+            addNewPMToSidebar(topic) {
+              this.links = [new AiConversationLink(topic), ...this.links];
               this.watchForTitleUpdate(topic);
             }
 
@@ -201,28 +213,25 @@ export default {
               );
             }
 
-            addNewMessage(newTopic) {
-              this.links = [new AiConversationLink(newTopic), ...this.links];
-            }
-
             watchForTitleUpdate(topic) {
-              const channel = `/discourse-ai/ai-bot/topic/${topic.topic_id}`;
-              const topicId = topic.topic_id;
+              const channel = `/discourse-ai/ai-bot/topic/${topic.id}`;
               const callback = this.updateTopicTitle.bind(this);
               messageBus.subscribe(channel, ({ title }) => {
-                callback(topicId, title);
+                callback(topic, title);
                 messageBus.unsubscribe(channel);
               });
             }
 
-            updateTopicTitle(topicId, title) {
-              // update the topic title in the sidebar, instead of the default title
-              const text = document.querySelector(
-                `.sidebar-section-link-wrapper .ai-conversation-${topicId} .sidebar-section-link-content-text`
+            updateTopicTitle(topic, title) {
+              // update the data
+              topic.title = title;
+
+              // force Glimmer to re-render that one link
+              this.links = this.links.map((link) =>
+                link.topic.id === topic.id
+                  ? new AiConversationLink(topic)
+                  : link
               );
-              if (text) {
-                text.innerText = title;
-              }
             }
           };
         },
@@ -240,9 +249,10 @@ export default {
         if (
           topic?.archetype === "private_message" &&
           topic.user_id === currentUser.id &&
-          topic.postStream.posts.some((post) =>
-            isPostFromAiBot(post, currentUser)
-          )
+          (topic.is_bot_pm ||
+            topic.postStream.posts.some((post) =>
+              isPostFromAiBot(post, currentUser)
+            ))
         ) {
           return aiConversationsSidebarManager.forceCustomSidebar();
         }

lib/ai_bot/entry_point.rb

@@ -3,6 +3,7 @@
 module DiscourseAi
   module AiBot
     USER_AGENT = "Discourse AI Bot 1.0 (https://www.discourse.org)"
+    TOPIC_AI_BOT_PM_FIELD = "is_ai_bot_pm"
 
     class EntryPoint
       Bot = Struct.new(:id, :name, :llm)
@@ -64,6 +65,8 @@ def self.ai_share_error(topic, guardian)
       end
 
       def inject_into(plugin)
+        plugin.register_editable_topic_custom_field(TOPIC_AI_BOT_PM_FIELD)
+
         plugin.register_modifier(:chat_allowed_bot_user_ids) do |user_ids, guardian|
           if guardian.user
             allowed_chat =
@@ -102,6 +105,14 @@ def inject_into(plugin)
           Rails.root.join("plugins", "discourse-ai", "db", "fixtures", "ai_bot"),
         )
 
+        plugin.add_to_serializer(
+          :topic_view,
+          :is_bot_pm,
+          include_condition: -> do
+            object.personal_message && object.topic.custom_fields[TOPIC_AI_BOT_PM_FIELD]
+          end,
+        ) { true }
+
         plugin.add_to_serializer(
           :current_user,
           :ai_enabled_personas,