Merge branch 'master' into master

Author: gdude2002

CHANGELOG.md

@@ -1,6 +1,16 @@
 # Changelog
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.7.1] - 2019-06-15
+### Changed
+* Upgraded dependencies.
+
+## [2.7.0] - 2019-04-02
+### Changed
+* Convert channel mentions to codified mentions (thanks to [Throne3d](https://github.com/reactiflux/discord-irc/pull/476)).
+* Match IRC style mentions at the beginning of message (thanks to [rdb](https://github.com/reactiflux/discord-irc/pull/470)).
+* Upgraded dependencies.
+
 ## [2.6.2] - 2018-09-19
 ### Changed
 * Upgraded dependencies.

lib/bot.js

@@ -6,6 +6,10 @@ import { ConfigurationError } from './errors';
 import { validateChannelMapping } from './validators';
 import { formatFromDiscordToIRC, formatFromIRCToDiscord } from './formatting';
 
+// Usernames need to be between 2 and 32 characters for webhooks:
+const USERNAME_MIN_LENGTH = 2;
+const USERNAME_MAX_LENGTH = 32;
+
 const REQUIRED_FIELDS = ['server', 'nickname', 'channelMapping', 'discordToken'];
 const NICK_COLORS = ['light_blue', 'dark_blue', 'light_red', 'dark_red', 'light_green',
   'dark_green', 'magenta', 'light_magenta', 'orange', 'yellow', 'cyan', 'light_cyan'];
@@ -471,12 +475,14 @@ class Bot {
       // skips usernames including spaces for ease (they cannot include hashes)
       // checks case insensitively as Discord does
       const user = guild.members.find(x =>
-        Bot.caseComp(x.user.username, username.toUpperCase())
+        Bot.caseComp(x.user.username, username)
         && x.user.discriminator === discriminator);
       if (user) return user;
 
       return match;
-    }).replace(/@([^\s]+)/g, (match, reference) => {
+    }).replace(/^([^@\s:,]+)[:,]|@([^\s]+)/g, (match, startRef, atRef) => {
+      const reference = startRef || atRef;
+
       // this preliminary stuff is ultimately unnecessary
       // but might save time over later more complicated calculations
       // @nickname => mention, case insensitively
@@ -535,15 +541,24 @@ class Bot {
       if (emoji) return emoji;
 
       return match;
+    }).replace(/#([^\s#@'!?,.]+)/g, (match, channelName) => {
+      // channel names can't contain spaces, #, @, ', !, ?, , or .
+      // (based on brief testing. they also can't contain some other symbols,
+      // but these seem likely to be common around channel references)
+
+      // discord matches channel names case insensitively
+      const chan = guild.channels.find(x => Bot.caseComp(x.name, channelName));
+      return chan || match;
     });
 
     // Webhooks first
     const webhook = this.findWebhook(channel);
     if (webhook) {
       logger.debug('Sending message to Discord via webhook', withMentions, channel, '->', `#${discordChannel.name}`);
       const avatarURL = this.getDiscordAvatar(author, channel);
+      const username = _.padEnd(author.substring(0, USERNAME_MAX_LENGTH), USERNAME_MIN_LENGTH, '_');
       webhook.client.sendMessage(withMentions, {
-        username: author,
+        username,
         text,
         avatarURL
       }).catch(logger.error);