Regression: User thread join message (RocketChat#13656)

packages/rocketchat-i18n/i18n/en.i18n.json

@@ -2961,6 +2961,7 @@
   "User_is_now_an_admin": "User is now an admin",
   "User_is_unblocked": "User is unblocked",
   "User_joined_channel": "Has joined the channel.",
+  "User_joined_conversation":"Has joined the conversation",
   "User_joined_channel_female": "Has joined the channel.",
   "User_joined_channel_male": "Has joined the channel.",
   "User_left": "Has left the channel.",

packages/rocketchat-lib/lib/MessageTypes.js

@@ -56,6 +56,16 @@ Meteor.startup(function() {
 			};
 		},
 	});
+	MessageTypes.registerType({
+		id: 'ut',
+		system: true,
+		message: 'User_joined_conversation',
+		data(message) {
+			return {
+				user: message.u.username,
+			};
+		},
+	});
 	MessageTypes.registerType({
 		id: 'wm',
 		system: true,

packages/rocketchat-lib/server/functions/addUserToRoom.js

@@ -44,6 +44,8 @@ export const addUserToRoom = function(rid, user, inviter, silenced) {
 					username: inviter.username,
 				},
 			});
+		} else if (room.prid) {
+			Messages.createUserJoinWithRoomIdAndUserThread(rid, user, { ts: now });
 		} else {
 			Messages.createUserJoinWithRoomIdAndUser(rid, user, { ts: now });
 		}

packages/rocketchat-models/server/models/Messages.js

@@ -752,6 +752,11 @@ export class Messages extends Base {
 		return this.createWithTypeRoomIdMessageAndUser('uj', roomId, message, user, extraData);
 	}
 
+	createUserJoinWithRoomIdAndUserThread(roomId, user, extraData) {
+		const message = user.username;
+		return this.createWithTypeRoomIdMessageAndUser('ut', roomId, message, user, extraData);
+	}
+
 	createUserLeaveWithRoomIdAndUser(roomId, user, extraData) {
 		const message = user.username;
 		return this.createWithTypeRoomIdMessageAndUser('ul', roomId, message, user, extraData);