Skip to content

Commit 244ec9d

Browse files
authored
REVERT: "FEATURE: Experimental Private Message Bot Homepage (#1159)" (#1272)
This reverts commit 5fec8fe.
1 parent 5fec8fe commit 244ec9d

19 files changed

+16
-1149
lines changed

app/controllers/discourse_ai/ai_bot/conversations_controller.rb

-35
This file was deleted.

assets/javascripts/discourse/components/ai-bot-header-icon.gjs

-4
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ export default class AiBotHeaderIcon extends Component {
99
@service currentUser;
1010
@service siteSettings;
1111
@service composer;
12-
@service router;
1312

1413
get bots() {
1514
const availableBots = this.currentUser.ai_enabled_chat_bots
@@ -25,9 +24,6 @@ export default class AiBotHeaderIcon extends Component {
2524

2625
@action
2726
compose() {
28-
if (this.siteSettings.ai_enable_experimental_bot_ux) {
29-
return this.router.transitionTo("discourse-ai-bot-conversations");
30-
}
3127
composeAiBotMessage(this.bots[0], this.composer);
3228
}
3329

assets/javascripts/discourse/components/ai-bot-sidebar-new-conversation.gjs

-27
This file was deleted.

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

-70
This file was deleted.

assets/javascripts/discourse/discourse-ai-bot-dashboard-route-map.js

-5
This file was deleted.

assets/javascripts/discourse/lib/ai-bot-helper.js

+16-35
Original file line numberDiff line numberDiff line change
@@ -23,43 +23,24 @@ export function showShareConversationModal(modal, topicId) {
2323
.catch(popupAjaxError);
2424
}
2525

26-
export async function composeAiBotMessage(
27-
targetBot,
28-
composer,
29-
options = {
30-
skipFocus: false,
31-
topicBody: "",
32-
personaUsername: null,
33-
}
34-
) {
26+
export function composeAiBotMessage(targetBot, composer) {
3527
const currentUser = composer.currentUser;
3628
const draftKey = "new_private_message_ai_" + new Date().getTime();
3729

38-
let botUsername;
39-
if (targetBot) {
40-
botUsername = currentUser.ai_enabled_chat_bots.find(
41-
(bot) => bot.model_name === targetBot
42-
)?.username;
43-
} else if (options.personaUsername) {
44-
botUsername = options.personaUsername;
45-
} else {
46-
botUsername = currentUser.ai_enabled_chat_bots[0].username;
47-
}
30+
let botUsername = currentUser.ai_enabled_chat_bots.find(
31+
(bot) => bot.model_name === targetBot
32+
).username;
4833

49-
const data = {
50-
action: Composer.PRIVATE_MESSAGE,
51-
recipients: botUsername,
52-
topicTitle: i18n("discourse_ai.ai_bot.default_pm_prefix"),
53-
archetypeId: "private_message",
54-
draftKey,
55-
hasGroups: false,
56-
warningsDisabled: true,
57-
};
58-
59-
if (options.skipFocus) {
60-
data.topicBody = options.topicBody;
61-
await composer.open(data);
62-
} else {
63-
composer.focusComposer({ fallbackToNewTopic: true, openOpts: data });
64-
}
34+
composer.focusComposer({
35+
fallbackToNewTopic: true,
36+
openOpts: {
37+
action: Composer.PRIVATE_MESSAGE,
38+
recipients: botUsername,
39+
topicTitle: i18n("discourse_ai.ai_bot.default_pm_prefix"),
40+
archetypeId: "private_message",
41+
draftKey,
42+
hasGroups: false,
43+
warningsDisabled: true,
44+
},
45+
});
6546
}

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

-62
This file was deleted.

assets/javascripts/discourse/services/ai-conversations-sidebar-manager.js

-40
This file was deleted.

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

-51
This file was deleted.

0 commit comments

Comments
 (0)