[FIX] Discussion list timestamp and Edit room system messages (#27180)

RocketChat · Nov 4, 2022 · 28b42d8 · 28b42d8
1 parent a9a1aae
commit 28b42d8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/apps/meteor/app/channel-settings/server/methods/saveRoomSettings.js b/apps/meteor/app/channel-settings/server/methods/saveRoomSettings.js
@@ -160,11 +160,17 @@ const settingSavers = {
 		}
 	},
 	roomTopic({ value, room, rid, user }) {
+		if (!value && !room.topic) {
+			return;
+		}
 		if (value !== room.topic) {
 			saveRoomTopic(rid, value, user);
 		}
 	},
 	roomAnnouncement({ value, room, rid, user }) {
+		if (!value && !room.announcement) {
+			return;
+		}
 		if (value !== room.announcement) {
 			saveRoomAnnouncement(rid, value, user);
 		}
@@ -175,6 +181,9 @@ const settingSavers = {
 		}
 	},
 	roomDescription({ value, room, rid, user }) {
+		if (!value && !room.description) {
+			return;
+		}
 		if (value !== room.description) {
 			saveRoomDescription(rid, value, user);
 		}

diff --git a/apps/meteor/client/views/room/contextualBar/Discussions/Row.js b/apps/meteor/client/views/room/contextualBar/Discussions/Row.js
@@ -26,6 +26,7 @@ const Row = memo(function Row({ discussion, showRealNames, userId, onClick }) {
 			username={discussion.u.username}
 			following={discussion.replies && discussion.replies.includes(userId)}
 			data-drid={discussion.drid}
+			ts={discussion.ts}
 			msg={msg}
 			t={t}
 			formatDate={formatDate}