Show messages in Team when Channel is added/removed

app/models/server/models/Messages.js

@@ -910,6 +910,14 @@ export class Messages extends Base {
 		return this.createWithTypeRoomIdMessageAndUser('subscription-role-removed', roomId, message, user, extraData);
 	}
 
+	createRoomAddedToTeamWithRoomIdAndUser(roomId, message, user, extraData) {
+		return this.createWithTypeRoomIdMessageAndUser('room_added_to_team', roomId, message, user, extraData);
+	}
+
+	createRoomRemovedFromTeamWithRoomIdAndUser(roomId, message, user, extraData) {
+		return this.createWithTypeRoomIdMessageAndUser('room_removed_from_team', roomId, message, user, extraData);
+	}
+
 	// REMOVE
 	removeById(_id) {
 		const query = { _id };

client/startup/messageTypes.ts

@@ -73,4 +73,32 @@ Meteor.startup(() => {
 			};
 		},
 	});
+
+	MessageTypes.registerType({
+		id: 'room_added_to_team',
+		system: true,
+		message: 'room_added_to_team',
+		data(message: IMessage) {
+			return {
+				// eslint-disable-next-line @typescript-eslint/camelcase
+				user_by: message.u && message.u.username,
+				// eslint-disable-next-line @typescript-eslint/camelcase
+				room_names: escapeHTML(message.msg || `(${t('None').toLowerCase()})`),
+			};
+		},
+	});
+
+	MessageTypes.registerType({
+		id: 'room_removed_from_team',
+		system: true,
+		message: 'room_removed_from_team',
+		data(message: IMessage) {
+			return {
+				// eslint-disable-next-line @typescript-eslint/camelcase
+				user_by: message.u && message.u.username,
+				// eslint-disable-next-line @typescript-eslint/camelcase
+				room_name: escapeHTML(message.msg || `(${t('None').toLowerCase()})`),
+			};
+		},
+	});
 });

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

@@ -3518,11 +3518,13 @@
   "Room_archivation_state_false": "Active",
   "Room_archivation_state_true": "Archived",
   "Room_archived": "Room archived",
+  "room_added_to_team": "Room(s): <em>__room_names__</em> added to the team by <em>__user_by__<em/>",
   "room_changed_announcement": "Room announcement changed to: <em>__room_announcement__</em> by <em>__user_by__</em>",
   "room_changed_avatar": "Room avatar changed by <em>__user_by__</em>",
   "room_changed_description": "Room description changed to: <em>__room_description__</em> by <em>__user_by__</em>",
   "room_changed_privacy": "Room type changed to: <em>__room_type__</em> by <em>__user_by__</em>",
   "room_changed_topic": "Room topic changed to: <em>__room_topic__</em> by <em>__user_by__</em>",
+  "room_removed_from_team": "Room: <em>__room_name__</em> was removed from the team by <em>__user_by__<em/>",
   "Room_default_change_to_private_will_be_default_no_more": "This is a default channel and changing it to a private group will cause it to no longer be a default channel. Do you want to proceed?",
   "Room_description_changed_successfully": "Room description changed successfully",
   "Room_Edit": "Room Edit",

server/services/team/service.ts

@@ -6,6 +6,7 @@ import { addUserToRoom } from '../../../app/lib/server/functions/addUserToRoom';
 import { removeUserFromRoom } from '../../../app/lib/server/functions/removeUserFromRoom';
 import { getSubscribedRoomsForUserWithDetails } from '../../../app/lib/server/functions/getRoomsWithSingleOwner';
 import type { InsertionModel } from '../../../app/models/server/raw/BaseRaw';
+import { Messages } from '../../../app/models/server';
 import { MessagesRaw } from '../../../app/models/server/raw/Messages';
 import { RoomsRaw } from '../../../app/models/server/raw/Rooms';
 import { SubscriptionsRaw } from '../../../app/models/server/raw/Subscriptions';
@@ -312,7 +313,7 @@ export class TeamService extends ServiceClass implements ITeamService {
 			throw new Error('missing-userId');
 		}
 
-		const team = await this.TeamModel.findOneById(teamId, { projection: { _id: 1 } });
+		const team = await this.TeamModel.findOne(teamId, { projection: { _id: 1, roomId: 1 } });
 		if (!team) {
 			throw new Error('invalid-team');
 		}
@@ -322,6 +323,7 @@ export class TeamService extends ServiceClass implements ITeamService {
 		const user = await this.Users.findOneById(uid);
 		const rids = rooms.filter((rid) => rid && typeof rid === 'string');
 		const validRooms = await this.RoomsModel.findManyByRoomIds(rids).toArray();
+		const roomNames = [];
 		if (validRooms.length < rids.length) {
 			throw new Error('invalid-room');
 		}
@@ -342,11 +344,12 @@ export class TeamService extends ServiceClass implements ITeamService {
 			if (!await this.SubscriptionsModel.isUserInRole(uid, 'owner', room._id)) {
 				throw new Error('error-no-owner-channel');
 			}
-
+			roomNames.push(room.name);
 			room.teamId = teamId;
 		}
 
 		this.RoomsModel.setTeamByIds(rids, teamId);
+		Messages.createRoomAddedToTeamWithRoomIdAndUser(team.roomId, roomNames.join(), user, {});
 		return validRooms;
 	}
 
@@ -366,15 +369,15 @@ export class TeamService extends ServiceClass implements ITeamService {
 			throw new Error('invalid-room');
 		}
 
+		const user = await this.Users.findOneById(uid);
 		if (!canRemoveAnyRoom) {
-			const user = await this.Users.findOneById(uid);
 			const canSeeRoom = await canAccessRoom(room, user);
 			if (!canSeeRoom) {
 				throw new Error('invalid-room');
 			}
 		}
 
-		const team = await this.TeamModel.findOneById(teamId, { projection: { _id: 1 } });
+		const team = await this.TeamModel.findOneById(teamId, { projection: { _id: 1, roomId: 1 } });
 		if (!team) {
 			throw new Error('invalid-team');
 		}
@@ -386,6 +389,7 @@ export class TeamService extends ServiceClass implements ITeamService {
 		delete room.teamId;
 		delete room.teamDefault;
 		this.RoomsModel.unsetTeamById(room._id);
+		Messages.createRoomRemovedFromTeamWithRoomIdAndUser(team.roomId, room.name, user, {});
 		return {
 			...room,
 		};