[FIX] Changing Room name updates the webhook (#13672)

* Fixes #8477 * Rebased branch * CI fix
RocketChat · Mar 14, 2019 · d33d3cd · d33d3cd
1 parent 98c5d22
commit d33d3cd
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/app/channel-settings/server/functions/saveRoomName.js b/app/channel-settings/server/functions/saveRoomName.js
@@ -1,5 +1,5 @@
 import { Meteor } from 'meteor/meteor';
-import { Rooms, Messages, Subscriptions } from '/app/models';
+import { Rooms, Messages, Subscriptions, Integrations } from '/app/models';
 import { roomTypes, getValidRoomName } from '/app/utils';
 
 export const saveRoomName = function(rid, displayName, user, sendMessage = true) {
@@ -17,7 +17,13 @@ export const saveRoomName = function(rid, displayName, user, sendMessage = true)
 
 	const update = Rooms.setNameById(rid, slugifiedRoomName, displayName) && Subscriptions.updateNameAndAlertByRoomId(rid, slugifiedRoomName, displayName);
 
-	if (update && sendMessage) {
+	if (!update) {
+		return;
+	}
+
+	Integrations.updateRoomName(room.name, displayName);
+
+	if (sendMessage) {
 		Messages.createRoomRenamedWithRoomIdRoomNameAndUser(rid, displayName, user);
 	}
 	return displayName;

diff --git a/app/models/server/models/Integrations.js b/app/models/server/models/Integrations.js
@@ -17,6 +17,12 @@ export class Integrations extends Base {
 	disableByUserId(userId) {
 		return this.update({ userId }, { $set: { enabled: false } }, { multi: true });
 	}
+
+	updateRoomName(oldRoomName, newRoomName) {
+		const hashedOldRoomName = `#${ oldRoomName }`;
+		const hashedNewRoomName = `#${ newRoomName }`;
+		return this.update({ channel: hashedOldRoomName }, { $set: { 'channel.$': hashedNewRoomName } }, { multi: true });
+	}
 }
 
 export default new Integrations();