Finished implementation of clickable links. Had to add dname field to channel objects and message parser to make matching by parser possible without changing display of channels by using fname.

lpilz · lpilz · commit 4e0055be632a · 2020-05-28T22:53:47.000+02:00
diff --git a/app/importer-slack/server/importer.js b/app/importer-slack/server/importer.js
@@ -243,35 +243,46 @@ export class SlackImporter extends Base {
 		});
 	}
 
-	parseMentions(message) {
-		let mentionsParser;
-		mentionsParser = new MentionsParser({
+	parseMentions (message) {
+		const mentionsParser = new MentionsParser({
 			pattern: () => settings.get('UTF8_Names_Validation'),
 			useRealName: () => settings.get('UI_Use_Real_Name'),
 			me: () => 'me',
 		});
 
-		if(!message.mentions){
-			message.mentions=[];
+		if (!message.mentions) {
+			message.mentions = [];
 		}
-		message.mentions.push(...mentionsParser.getUserMentions(message.msg));
+		let users = mentionsParser.getUserMentions(message.msg);
+		users.forEach((user_id, index, arr) => {
+			const user = user_id.slice(1, user_id.length);
+			try {
+				if (user === 'all' || user === 'here'){
+					arr[index] = user;
+				} else {
+					arr[index] = Users.findOneByUsernameIgnoringCase(user);
+				}
+			} catch (e) {
+				this.logger.warn(`Failed to import user mention with name: ${ user }`);
+			}
+		});
+		message.mentions.push(...users);
 
-		if(!message.channels){
-			message.channels=[];
+		if (!message.channels) {
+			message.channels = [];
 		}
 		let channels = mentionsParser.getChannelMentions(message.msg);
 		channels.forEach((channel_name, index, arr) => {
-			let chan = channel_name.slice(1, channel_name.length);
-			try{
+			const chan = channel_name.slice(1, channel_name.length);
+			try {
 				const slackChannel = this.getSlackChannelFromName(chan);
 				arr[index] = Rooms.findOneById(slackChannel.rocketId);
+				arr[index].dname = chan; // Have to store name to display so parser can match it
 			} catch (e) {
-				this.logger.warn(`Failed to import room with name: ${ chan }`);
+				this.logger.warn(`Failed to import channel mention with name: ${ chan }`);
 			}
 		});
 		message.channels.push(...channels);
-
-		message.temp = message.msg;
 	}
 
 	processMessageSubType(message, room, msgDataDefaults, missedTypes) {
@@ -552,8 +563,12 @@ export class SlackImporter extends Base {
 						Meteor.call('saveRoomSettings', 'GENERAL', 'roomName', channel.name);
 					}
 
+					if (!channel.fname) {
+						channel.fname = channel.name;
+					}
+
 					channel.rocketId = channel.is_general ? 'GENERAL' : existingRoom._id;
-					Rooms.update({ _id: channel.rocketId }, { $addToSet: { importIds: channel.id } });
+					Rooms.update({ _id: channel.rocketId }, { $set: { fname: channel.name}, $addToSet: { importIds: channel.id } });
 				} else {
 					const users = this._getChannelUserList(channel);
 					const userId = this.getImportedRocketUserIdFromSlackUserId(channel.creator) || startedByUserId;
diff --git a/app/mentions/lib/MentionsParser.js b/app/mentions/lib/MentionsParser.js
@@ -79,11 +79,11 @@ export class MentionsParser {
 	replaceChannels = (msg, { temp, channels }) => msg
 		.replace(/&#39;/g, '\'')
 		.replace(this.channelMentionRegex, (match, prefix, mention) => {
-			if (!temp && !(channels && channels.find((c) => c.name === mention))) {
+			if (!temp && !(channels && channels.find((c) => c.dname ? c.dname === mention : c.name === mention))) {
 				return match;
 			}
 
-			const channel = channels && channels.find(({ name }) => name === mention);
+			const channel = channels && channels.find(({ name, dname }) => dname? dname === mention : name === mention);
 			const reference = channel ? channel._id : mention;
 			return `${ prefix }<a class="mention-link mention-link--room" data-channel="${ reference }">${ `#${ mention }` }</a>`;
 		})
