github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-06 13:06:56 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: correctly syncs current user message in multiple sessions (#20584)

Browse Source
This commit is contained in:
Joffrey JAFFEUX
2023-03-08 17:28:39 +01:00
committed by GitHub
parent 54351e1b8a
commit 4f2dfd3857
2 changed files with 42 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
plugins/chat/assets/javascripts/discourse/components/chat-live-pane.js
View File

@ -517,7 +517,8 @@ export default class ChatLivePane extends Component {
} }
} }
handleMessage(data) { @bind
onMessage(data) {
switch (data.type) { switch (data.type) {
case "sent": case "sent":
this.handleSentMessage(data); this.handleSentMessage(data);
@ -555,9 +556,7 @@ export default class ChatLivePane extends Component {
} }
} }
_handleOwnSentMessage(data) { _handleStagedMessage(stagedMessage, data) {
const stagedMessage = this.args.channel.findStagedMessage(data.staged_id);
if (stagedMessage) {
stagedMessage.error = null; stagedMessage.error = null;
stagedMessage.id = data.chat_message.id; stagedMessage.id = data.chat_message.id;
stagedMessage.staged = false; stagedMessage.staged = false;
@ -579,7 +578,6 @@ export default class ChatLivePane extends Component {
stagedMessage.cooked = data.chat_message.cooked; stagedMessage.cooked = data.chat_message.cooked;
} }
} }
}
handleSentMessage(data) { handleSentMessage(data) {
if (this.args.channel.isFollowing) { if (this.args.channel.isFollowing) {
@ -587,7 +585,10 @@ export default class ChatLivePane extends Component {
} }
if (data.chat_message.user.id === this.currentUser.id && data.staged_id) { if (data.chat_message.user.id === this.currentUser.id && data.staged_id) {
return this._handleOwnSentMessage(data); const stagedMessage = this.args.channel.findStagedMessage(data.staged_id);
if (stagedMessage) {
return this._handleStagedMessage(stagedMessage, data);
}
} }
if (this.args.channel.canLoadMoreFuture) { if (this.args.channel.canLoadMoreFuture) {
@ -1138,13 +1139,6 @@ export default class ChatLivePane extends Component {
); );
} }
@bind
onMessage(busData) {
if (!this.args.channel.canLoadMoreFuture || busData.type !== "sent") {
this.handleMessage(busData);
}
}
@bind @bind
_forceBodyScroll() { _forceBodyScroll() {
// when keyboard is visible this will ensure body // when keyboard is visible this will ensure body

18
plugins/chat/spec/system/chat_channel_spec.rb
View File

@ -33,6 +33,24 @@ RSpec.describe "Chat channel", type: :system, js: true do
end end
end end
context "with two sessions opened on same channel" do
it "syncs the messages" do
using_session(:tab_1) do
sign_in(current_user)
chat.visit_channel(channel_1)
end
using_session(:tab_2) do
sign_in(current_user)
chat.visit_channel(channel_1)
end
using_session(:tab_1) { channel.send_message("test_message") }
using_session(:tab_2) { expect(channel).to have_message(text: "test_message") }
end
end
it "allows to edit this message once persisted" do it "allows to edit this message once persisted" do
chat.visit_channel(channel_1) chat.visit_channel(channel_1)
channel.send_message("aaaaaaaaaaaaaaaaaaaa") channel.send_message("aaaaaaaaaaaaaaaaaaaa")