Rebased branch

app/channel-settings/client/views/channelSettings.js

@@ -248,8 +248,7 @@ Template.channelSettingsEditing.onCreated(function() {
 						_id: room._id,
 						name: value,
 					});
-					// To update webhooks name
-					call('changeChannelNameInWebhook', room.name, value);
+
 					return toastr.success(t('Room_name_changed_successfully'));
 				});
 			},

app/channel-settings/server/functions/saveRoomName.js

@@ -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;

app/channel-settings/server/methods/saveRoomSettings.js

@@ -1,8 +1,8 @@
 import { Meteor } from 'meteor/meteor';
 import { Match, check } from 'meteor/check';
-import { hasPermission } from 'meteor/rocketchat:authorization';
-import { Rooms, Integrations } from 'meteor/rocketchat:models';
-import { callbacks } from 'meteor/rocketchat:callbacks';
+import { hasPermission } from '/app/authorization';
+import { Rooms } from '/app/models';
+import { callbacks } from '/app/callbacks';
 
 import { saveRoomName } from '../functions/saveRoomName';
 import { saveRoomTopic } from '../functions/saveRoomTopic';
@@ -231,10 +231,4 @@ Meteor.methods({
 			rid: room._id,
 		};
 	},
-	changeChannelNameInWebhook(oldRoomName, newRoomName) {
-		const hashedOldRoomName = `#${ oldRoomName }`;
-		const hashedNewRoomName = `#${ newRoomName }`;
-		const changedNumber = Integrations.update({ channel: hashedOldRoomName }, { $set: { 'channel.$': hashedNewRoomName } }, { multi: true });
-		return changedNumber;
-	},
 });

app/models/server/models/Integrations.js

@@ -17,6 +17,13 @@ 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 }`;
+		const changedNumber = Integrations.update({ channel: hashedOldRoomName }, { $set: { 'channel.$': hashedNewRoomName } }, { multi: true });
+		return changedNumber;
+	}
 }
 
 export default new Integrations();