A platform for community discussion. Free, open, simple.
FIX: Order chat messages by server time (#44035)
Joffrey JAFFEUX15a3ce4ae5f9
diff --git a/plugins/chat/app/queries/chat/messages_query.rb b/plugins/chat/app/queries/chat/messages_query.rbindex 0551cd967ac..d1bcc5202a5 100644--- a/plugins/chat/app/queries/chat/messages_query.rb+++ b/plugins/chat/app/queries/chat/messages_query.rb@@ -137,15 +137,23 @@ module Chatpast_messages =messages- .where("chat_messages.created_at < ?", target_message.created_at)- .order(created_at: :desc)+ .where(+ "(chat_messages.created_at, chat_messages.id) < (?, ?)",+ target_message.created_at,+ target_message.id,+ )+ .order(created_at: :desc, id: :desc).limit(PAST_MESSAGE_LIMIT).to_afuture_messages =messages- .where("chat_messages.created_at > ?", target_message.created_at)- .order(created_at: :asc)+ .where(+ "(chat_messages.created_at, chat_messages.id) > (?, ?)",+ target_message.created_at,+ target_message.id,+ )+ .order(created_at: :asc, id: :asc).limit(FUTURE_MESSAGE_LIMIT).to_a@@ -180,7 +188,10 @@ module Chatcondition = direction == PAST ? "<" : ">"end- messages = messages.where("chat_messages.id #{condition} ?", target_message_id.to_i)+ messages = messages.where(<<~SQL, target_message_id: target_message_id.to_i)+ (chat_messages.created_at, chat_messages.id) #{condition}+ (SELECT created_at, id FROM chat_messages WHERE id = :target_message_id)+ SQLendorder = direction == FUTURE ? "ASC" : "DESC"@@ -212,14 +223,14 @@ module Chatpast_messages =messages.where("chat_messages.created_at <= ?", target_date.to_time.utc)- .order(created_at: :desc)+ .order(created_at: :desc, id: :desc).limit(PAST_MESSAGE_LIMIT).to_afuture_messages =messages.where("chat_messages.created_at > ?", target_date.to_time.utc)- .order(created_at: :asc)+ .order(created_at: :asc, id: :asc).limit(FUTURE_MESSAGE_LIMIT).to_adiff --git a/plugins/chat/app/services/chat/create_message.rb b/plugins/chat/app/services/chat/create_message.rbindex 7cd30248b24..ac7f877c6d6 100644--- a/plugins/chat/app/services/chat/create_message.rb+++ b/plugins/chat/app/services/chat/create_message.rb@@ -46,7 +46,6 @@ module Chatattribute :upload_ids, :arrayattribute :thread_id, :stringattribute :blocks, :array- attribute :client_created_at, :stringvalidates :chat_channel_id, presence: truevalidates :message, presence: true, if: -> { upload_ids.blank? && blocks.blank? }@@ -165,7 +164,7 @@ module Chatenddef instantiate_message(channel:, guardian:, params:, uploads:, thread:, reply:, options:)- message_attrs = {+ channel.chat_messages.new(user: guardian.user,last_editor: guardian.user,in_reply_to: reply,@@ -181,20 +180,7 @@ module Chatcooked_version: ::Chat::Message::BAKED_VERSION,streaming: options.streaming,blocks: params.blocks,- }-- if params.client_created_at.present?- begin- client_time = Time.zone.parse(params.client_created_at)- # Only accept client timestamps that are reasonable (within 1 minute of server time)- if client_time && (Time.zone.now - client_time).abs <= 60.seconds- message_attrs[:created_at] = client_time- end- rescue ArgumentError- end- end-- channel.chat_messages.new(message_attrs)+ )enddef save_message(message_instance:)diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-channel.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-channel.gjsindex b1eef126f9e..6eb80883fc7 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat-channel.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat-channel.gjs@@ -721,7 +721,6 @@ export default class ChatChannel extends Component {in_reply_to_id: message.inReplyTo?.id,staged_id: message.id,upload_ids: message.uploads.map((upload) => upload.id),- client_created_at: message.createdAt.toISOString(),...extractCurrentTopicInfo(this),});diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-thread.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-thread.gjsindex 50bef95292b..68f8b96a2f8 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat-thread.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat-thread.gjs@@ -529,7 +529,6 @@ export default class ChatThread extends Component {staged_id: message.id,upload_ids: message.uploads.map((upload) => upload.id),thread_id: message.thread.id,- client_created_at: message.createdAt.toISOString(),...extractCurrentTopicInfo(this),});diff --git a/plugins/chat/assets/javascripts/discourse/lib/chat-channel-subscription-manager.js b/plugins/chat/assets/javascripts/discourse/lib/chat-channel-subscription-manager.jsindex 979b5e78e13..cae75f1ef59 100644--- a/plugins/chat/assets/javascripts/discourse/lib/chat-channel-subscription-manager.js+++ b/plugins/chat/assets/javascripts/discourse/lib/chat-channel-subscription-manager.js@@ -129,6 +129,8 @@ export default class ChatChannelSubscriptionManager {stagedMessage.edited = data.chat_message.edited;stagedMessage.isAction = data.chat_message.is_action;+ messagesManager.sortMessages();+return stagedMessage;}diff --git a/plugins/chat/assets/javascripts/discourse/lib/chat-channel-thread-subscription-manager.js b/plugins/chat/assets/javascripts/discourse/lib/chat-channel-thread-subscription-manager.jsindex 0cfb9cc7029..7f36340598b 100644--- a/plugins/chat/assets/javascripts/discourse/lib/chat-channel-thread-subscription-manager.js+++ b/plugins/chat/assets/javascripts/discourse/lib/chat-channel-thread-subscription-manager.js@@ -115,6 +115,8 @@ export default class ChatChannelThreadSubscriptionManager {stagedMessage.edited = data.chat_message.edited;stagedMessage.isAction = data.chat_message.is_action;+ messagesManager.sortMessages();+return stagedMessage;}diff --git a/plugins/chat/assets/javascripts/discourse/lib/chat-messages-manager.js b/plugins/chat/assets/javascripts/discourse/lib/chat-messages-manager.jsindex 5907bf4d6c1..880daa92fa1 100644--- a/plugins/chat/assets/javascripts/discourse/lib/chat-messages-manager.js+++ b/plugins/chat/assets/javascripts/discourse/lib/chat-messages-manager.js@@ -6,6 +6,18 @@ import {} from "discourse/lib/array-tools";import { autoTrackedArray } from "discourse/lib/tracked-tools";+function compareMessages(a, b) {+ if (a.staged !== b.staged) {+ return a.staged ? 1 : -1;+ }++ if (a.staged) {+ return 0;+ }++ return a.createdAt - b.createdAt || a.id - b.id;+}+export default class ChatMessagesManager {@autoTrackedArray messages = [];@@ -35,7 +47,11 @@ export default class ChatMessagesManager {this.messages = uniqueItemsFromArray(this.messages.concat(messages),"id"- ).sort((a, b) => a.createdAt - b.createdAt);+ ).sort(compareMessages);+ }++ sortMessages() {+ this.messages = this.messages.toSorted(compareMessages);}findMessage(messageId) {diff --git a/plugins/chat/spec/queries/chat/messages_query_spec.rb b/plugins/chat/spec/queries/chat/messages_query_spec.rbindex c3e32dfb598..032eb2c89e4 100644--- a/plugins/chat/spec/queries/chat/messages_query_spec.rb+++ b/plugins/chat/spec/queries/chat/messages_query_spec.rb@@ -79,6 +79,27 @@ RSpec.describe Chat::MessagesQuery do)end+ it "returns a message created at the same time as the target" do+ same_time_message =+ Fabricate(:chat_message, chat_channel: channel, created_at: target_message.created_at)++ expect(query[:future_messages]).to eq([same_time_message, message_3])+ end++ it "returns a message inserted after the target but dated before it when loading the past" do+ backdated_message = Fabricate(:chat_message, chat_channel: channel, created_at: 1.day.ago)+ options[:direction] = "past"++ expect(query[:messages]).to eq([message_1, backdated_message])+ end++ it "returns a message inserted before the target but dated after it when loading the future" do+ message_1.update!(created_at: 1.hour.ago)+ options[:direction] = "future"++ expect(query[:messages]).to eq([message_1, message_3])+ end+it "does not include deleted messages" domessage_3.trash!expect(query[:future_messages]).to eq([])diff --git a/plugins/chat/spec/services/chat/create_message_spec.rb b/plugins/chat/spec/services/chat/create_message_spec.rbindex 83d9523a456..f6d04088609 100644--- a/plugins/chat/spec/services/chat/create_message_spec.rb+++ b/plugins/chat/spec/services/chat/create_message_spec.rb@@ -24,13 +24,6 @@ RSpec.describe Chat::CreateMessage doit { is_expected.not_to validate_presence_of :message }end-- describe "client_created_at parameter" do- it "accepts client_created_at parameter" do- contract = described_class.new(client_created_at: 1.minute.ago.iso8601)- expect(contract.attributes.keys).to include("client_created_at")- end- endenddescribe ".call" do@@ -568,65 +561,6 @@ RSpec.describe Chat::CreateMessage doexpect(message.uploads).to contain_exactly(upload, another_upload)endend-- context "when client_created_at is provided" do- let(:client_timestamp) { 30.seconds.ago }-- before do- params[:client_created_at] = client_timestamp.iso8601- params[:upload_ids] = [] # Remove uploads to avoid ID conflicts- end-- it "uses the client timestamp for created_at" do- expect(result).to run_successfully- expect(message.created_at).to be_within(1.second).of(client_timestamp)- end-- context "when client timestamp is too old" do- let(:client_timestamp) { 2.minutes.ago }-- it "falls back to server timestamp" do- expect(result).to run_successfully- expect(message.created_at).to be_within(5.seconds).of(Time.zone.now)- end- end-- context "when client timestamp is in the future" do- let(:client_timestamp) { 2.minutes.from_now }-- it "falls back to server timestamp" do- expect(result).to run_successfully- expect(message.created_at).to be_within(5.seconds).of(Time.zone.now)- end- end-- context "when client timestamp is invalid format" do- before { params[:client_created_at] = "invalid-timestamp" }-- it "falls back to server timestamp" do- expect(result).to run_successfully- expect(message.created_at).to be_within(5.seconds).of(Time.zone.now)- end- end-- context "when client timestamp is empty" do- before { params[:client_created_at] = "" }-- it "falls back to server timestamp" do- expect(result).to run_successfully- expect(message.created_at).to be_within(5.seconds).of(Time.zone.now)- end- end- end-- context "when client_created_at is not provided" do- before { params[:upload_ids] = [] } # Remove uploads to avoid ID conflicts-- it "uses server timestamp" do- expect(result).to run_successfully- expect(message.created_at).to be_within(5.seconds).of(Time.zone.now)- end- endendendenddiff --git a/plugins/chat/spec/system/chat_channel_spec.rb b/plugins/chat/spec/system/chat_channel_spec.rbindex 174c4061036..8eee47fc49e 100644--- a/plugins/chat/spec/system/chat_channel_spec.rb+++ b/plugins/chat/spec/system/chat_channel_spec.rb@@ -429,46 +429,4 @@ RSpec.describe "Chat channel" doexpect(page).to have_title("#🐕 Dogs - Chat - Discourse")end-- context "when messages are sent with client timestamps" do- it "orders messages by client timestamp rather than server timestamp" do- first_message =- Chat::CreateMessage.call(- params: {- chat_channel_id: channel_1.id,- message: "I was created first but should appear second",- client_created_at: 30.seconds.ago.iso8601,- },- guardian: current_user.guardian,- ).message_instance-- second_message =- Chat::CreateMessage.call(- params: {- chat_channel_id: channel_1.id,- message: "I was created second but should appear first",- client_created_at: 45.seconds.ago.iso8601,- },- guardian: current_user.guardian,- ).message_instance-- chat_page.visit_channel(channel_1)-- expect(page).to have_selector(- ".chat-message-container[data-id='#{first_message.id}'] .chat-message-text",- text: "I was created first but should appear second",- )- expect(page).to have_selector(- ".chat-message-container[data-id='#{second_message.id}'] .chat-message-text",- text: "I was created second but should appear first",- )-- messages = page.all(".chat-message-container[data-id]")- message_ids = messages.map { |msg| msg["data-id"].to_i }- second_message_index = message_ids.index(second_message.id)- first_message_index = message_ids.index(first_message.id)-- expect(second_message_index).to be < first_message_index- end- endenddiff --git a/plugins/chat/spec/system/single_thread_spec.rb b/plugins/chat/spec/system/single_thread_spec.rbindex d7fcb3e5974..a0618513bf7 100644--- a/plugins/chat/spec/system/single_thread_spec.rb+++ b/plugins/chat/spec/system/single_thread_spec.rb@@ -267,49 +267,5 @@ describe "Single thread in side panel" doexpect(page).to have_selector(".chat-thread .chat-message-separator__text", text: "Today")endend-- context "when thread messages are sent with client timestamps" do- it "orders thread messages by client timestamp rather than server timestamp" do- first_message =- Chat::CreateMessage.call(- params: {- chat_channel_id: channel.id,- thread_id: thread.id,- message: "Thread message created first but should appear second",- client_created_at: 30.seconds.ago.iso8601,- },- guardian: current_user.guardian,- ).message_instance-- second_message =- Chat::CreateMessage.call(- params: {- chat_channel_id: channel.id,- thread_id: thread.id,- message: "Thread message created second but should appear first",- client_created_at: 45.seconds.ago.iso8601,- },- guardian: current_user.guardian,- ).message_instance-- chat_page.visit_thread(thread)-- expect(page).to have_selector(- ".chat-thread .chat-message-container[data-id='#{first_message.id}'] .chat-message-text",- text: "Thread message created first but should appear second",- )- expect(page).to have_selector(- ".chat-thread .chat-message-container[data-id='#{second_message.id}'] .chat-message-text",- text: "Thread message created second but should appear first",- )-- messages = page.all(".chat-thread .chat-message-container[data-id]")- message_ids = messages.map { |msg| msg["data-id"].to_i }- second_message_index = message_ids.index(second_message.id)- first_message_index = message_ids.index(first_message.id)-- expect(second_message_index).to be < first_message_index- end- endendenddiff --git a/plugins/chat/test/javascripts/unit/lib/chat-messages-manager-test.js b/plugins/chat/test/javascripts/unit/lib/chat-messages-manager-test.jsindex 590704718ba..85145f719fc 100644--- a/plugins/chat/test/javascripts/unit/lib/chat-messages-manager-test.js+++ b/plugins/chat/test/javascripts/unit/lib/chat-messages-manager-test.js@@ -2,10 +2,63 @@ import { getOwner } from "@ember/owner";import { setupTest } from "ember-qunit";import { module, test } from "qunit";import ChatMessagesManager from "discourse/plugins/chat/discourse/lib/chat-messages-manager";+import ChatFabricators from "discourse/plugins/chat/discourse/lib/fabricators";module("Unit | Lib | chat-messages-manager", function (hooks) {setupTest(hooks);+ hooks.beforeEach(function () {+ this.fabricators = new ChatFabricators(getOwner(this));+ this.manager = new ChatMessagesManager(getOwner(this));+ });++ test("keeps staged messages after confirmed ones, in the order they were sent", function (assert) {+ const firstStaged = this.fabricators.message({+ id: "staged-1",+ staged: true,+ created_at: "2026-09-23T12:00:00.000Z",+ });+ const secondStaged = this.fabricators.message({+ id: "staged-2",+ staged: true,+ created_at: "2026-09-23T11:59:00.000Z",+ });+ const confirmed = this.fabricators.message({+ id: 10,+ created_at: "2026-09-23T12:00:10.000Z",+ });++ this.manager.addMessages([firstStaged]);+ this.manager.addMessages([secondStaged]);+ this.manager.addMessages([confirmed]);++ assert.deepEqual(+ this.manager.messages.map((message) => message.id),+ [10, "staged-1", "staged-2"],+ "staged messages ignore their local timestamps"+ );+ });++ test("orders confirmed messages created in the same second by id", function (assert) {+ const newer = this.fabricators.message({+ id: 51,+ created_at: "2026-09-23T12:00:00Z",+ });+ const older = this.fabricators.message({+ id: 50,+ created_at: "2026-09-23T12:00:00Z",+ });++ this.manager.addMessages([newer]);+ this.manager.addMessages([older]);++ assert.deepEqual(+ this.manager.messages.map((message) => message.id),+ [50, 51],+ "the lower id comes first"+ );+ });+test("finds the first message using the user's timezone", function (assert) {const manager = new ChatMessagesManager(getOwner(this));manager.messages = [diff --git a/plugins/chat/test/javascripts/unit/lib/chat-subscription-manager-test.js b/plugins/chat/test/javascripts/unit/lib/chat-subscription-manager-test.jsindex c53df6d5da4..382d78e6ce8 100644--- a/plugins/chat/test/javascripts/unit/lib/chat-subscription-manager-test.js+++ b/plugins/chat/test/javascripts/unit/lib/chat-subscription-manager-test.js@@ -152,6 +152,71 @@ module("Unit | Lib | chat subscription managers", function (hooks) {);});+ test("channel manager moves a confirmed message to its server position", function (assert) {+ const channel = this.fabricators.channel({ id: 15 });+ const manager = new ChatChannelSubscriptionManager(this, channel);+ manager.currentUser = { id: 1 };++ const stagedMessage = this.fabricators.message({+ id: "staged-3",+ channel,+ staged: true,+ user: { id: 1, username: "current_user" },+ });+ const laterMessage = this.fabricators.message({+ id: 101,+ channel,+ created_at: "2024-01-01T00:00:01.000Z",+ user: { id: 2, username: "other_user" },+ });+ channel.messagesManager.addMessages([stagedMessage, laterMessage]);++ manager.handleSentMessage({+ type: "sent",+ staged_id: "staged-3",+ chat_message: buildChatMessagePayload({ id: 100, uploads: [] }),+ });++ assert.deepEqual(+ channel.messagesManager.messages.map((message) => message.id),+ [100, 101],+ "the confirmed message moves above the message created after it"+ );+ });++ test("thread manager moves a confirmed message to its server position", function (assert) {+ const channel = this.fabricators.channel({ id: 16 });+ const thread = this.fabricators.thread({ id: 224, channel });+ const manager = new ChatChannelThreadSubscriptionManager(this, thread);+ manager.currentUser = { id: 1 };++ const stagedMessage = this.fabricators.message({+ id: "staged-4",+ channel,+ staged: true,+ user: { id: 1, username: "current_user" },+ });+ const laterMessage = this.fabricators.message({+ id: 111,+ channel,+ created_at: "2024-01-01T00:00:01.000Z",+ user: { id: 2, username: "other_user" },+ });+ thread.messagesManager.addMessages([stagedMessage, laterMessage]);++ manager.handleSentMessage({+ type: "sent",+ staged_id: "staged-4",+ chat_message: buildChatMessagePayload({ id: 110, uploads: [] }),+ });++ assert.deepEqual(+ thread.messagesManager.messages.map((message) => message.id),+ [110, 111],+ "the confirmed message moves above the message created after it"+ );+ });+test("channel manager keeps deleted messages visible for category moderators", function (assert) {const channel = this.fabricators.channel({id: 13,