From 6a5e0a85013f3c1bb9c2de3155bb7460b4fce64a Mon Sep 17 00:00:00 2001 From: SlightlyCircuitous <71394296+SlightlyCircuitous@users.noreply.github.com> Date: Sun, 11 Dec 2022 17:40:47 -0500 Subject: [PATCH] Display Welcome Message as Most Recent Message (#4720) * Move Join Message Block - Moves Join Message code block to after the for loop that gets old chat message, which makes the Join Message the most recent message in the chat box instead of the oldest -Only the rc.enqueuePostResponseItem() line really needs to move for functionality, but I have moved the whole block for readability * Comply with formatting guide -Remove offending white space --- common/server_protocolhandler.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/common/server_protocolhandler.cpp b/common/server_protocolhandler.cpp index b5273b9a..978dad57 100644 --- a/common/server_protocolhandler.cpp +++ b/common/server_protocolhandler.cpp @@ -680,11 +680,6 @@ Response::ResponseCode Server_ProtocolHandler::cmdJoinRoom(const Command_JoinRoo room->addClient(this); rooms.insert(room->getId(), room); - Event_RoomSay joinMessageEvent; - joinMessageEvent.set_message(room->getJoinMessage().toStdString()); - joinMessageEvent.set_message_type(Event_RoomSay::Welcome); - rc.enqueuePostResponseItem(ServerMessage::ROOM_EVENT, room->prepareRoomEvent(joinMessageEvent)); - QReadLocker chatHistoryLocker(&room->historyLock); QList chatHistory = room->getChatHistory(); ServerInfo_ChatMessage chatMessage; @@ -698,6 +693,11 @@ Response::ResponseCode Server_ProtocolHandler::cmdJoinRoom(const Command_JoinRoo rc.enqueuePostResponseItem(ServerMessage::ROOM_EVENT, room->prepareRoomEvent(roomChatHistory)); } + Event_RoomSay joinMessageEvent; + joinMessageEvent.set_message(room->getJoinMessage().toStdString()); + joinMessageEvent.set_message_type(Event_RoomSay::Welcome); + rc.enqueuePostResponseItem(ServerMessage::ROOM_EVENT, room->prepareRoomEvent(joinMessageEvent)); + Response_JoinRoom *re = new Response_JoinRoom; room->getInfo(*re->mutable_room_info(), true);