Skip to content

Commit 91b86cd

Browse files
authored
Merge pull request #146 from merefield/fix_some_deprecations
FIX: bot launch on personal messages
2 parents 6bc4f33 + 5321890 commit 91b86cd

File tree

3 files changed

+12
-16
lines changed

3 files changed

+12
-16
lines changed

assets/javascripts/discourse/components/chatbot-launch.gjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import Component from "@glimmer/component";
22
import { tracked } from "@glimmer/tracking";
33
import { action } from "@ember/object";
44
import didInsert from "@ember/render-modifiers/modifiers/did-insert";
5-
import { inject as service } from "@ember/service";
5+
import { service } from "@ember/service";
66
import DButton from "discourse/components/d-button";
77
import avatar from "discourse/helpers/avatar";
88
import concatClass from "discourse/helpers/concat-class";

assets/javascripts/discourse/components/composer-raiser.gjs

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import Component from "@glimmer/component";
22
import { action } from "@ember/object";
33
import didInsert from "@ember/render-modifiers/modifiers/did-insert";
4-
import { inject as service } from "@ember/service";
5-
import Composer from "discourse/models/composer";
4+
import { scheduleOnce } from "@ember/runloop";
5+
import { service } from "@ember/service";
66

77
export default class ComposerRaiserCompopnent extends Component {
88
@service siteSettings;
@@ -13,7 +13,7 @@ export default class ComposerRaiserCompopnent extends Component {
1313
BOT_USER_ID = -4;
1414

1515
@action
16-
raiseComposer() {
16+
async raiseComposer() {
1717
if (
1818
!(
1919
this.site.mobileView &&
@@ -22,20 +22,16 @@ export default class ComposerRaiserCompopnent extends Component {
2222
) &&
2323
this.args.model.current_post_number === 1
2424
) {
25-
this.composer.focusComposer({
26-
fallbackToNewTopic: true,
27-
openOpts: {
28-
action: Composer.REPLY,
29-
recipients: this.siteSettings.chatbot_bot_user,
30-
draftKey: this.args.model.get("draft_key"),
31-
topic: this.args.model,
32-
hasGroups: false,
33-
warningsDisabled: true,
34-
},
35-
});
25+
scheduleOnce("afterRender", this, this._focusComposer);
3626
}
3727
}
3828

29+
_focusComposer() {
30+
this.composer.focusComposer({
31+
topic: this.args.model,
32+
});
33+
}
34+
3935
get isBotConversation() {
4036
return (
4137
this.currentUser &&
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import ComposerRaiser from "../../components/composer-raiser";
22

33
<template>
4-
<ComposerRaiser @model={{this.model}} />
4+
<ComposerRaiser @model={{@model}} />
55
</template>

0 commit comments

Comments
 (0)