Add support for specifying a particular IRC nick to show in-game as (…

…Discord) instead
123DMWM · Jul 3, 2017 · 2d3fd26 · 2d3fd26
1 parent fb2ec86
commit 2d3fd26
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 28 deletions.
diff --git a/fCraft/Network/IRC.cs b/fCraft/Network/IRC.cs
@@ -367,52 +367,53 @@ void HandleMessage([NotNull] string message)
                     } else {
                         return;
                     }
-                }
-
-                string processedMessage = ProcessMessageFromIRC(rawMessage);
-                if (processedMessage.Length == 0) return;
-                bool elapsed = DateTime.UtcNow.Subtract(IRCHandlers.lastUrlExpand).TotalSeconds > 5;
+                }                
+                string text = ProcessMessageFromIRC(rawMessage);
+                if (text.Length == 0) return;
+
                 if (ConfigKey.IRCBotForwardFromIRC.Enabled()) {
                     if (msg.Type == IRCMessageType.ChannelAction) {
-                        if (elapsed) {
-                            Scheduler.NewTask(t => Chat.getUrls(processedMessage)).RunOnce();
-                            IRCHandlers.lastUrlExpand = DateTime.UtcNow;
-                        }
-                        foreach (Player player in Server.Players) {
-                            if (player.Info.ReadIRC) {
-                                player.Message("&I(IRC) * {0} {1}", msg.Nick, processedMessage);
-                            }
+                        TryExpandUrls(text);
+
+                        foreach (Player player in Server.Players.Where(pl => pl.Info.ReadIRC)) {
+                            player.Message("&I(IRC) * {0} {1}", msg.Nick, text);
                         }
                         Logger.Log(LogType.IrcChat, "{0}: * {1} {2}", msg.Channel, msg.Nick,
                                    IRCColorsAndNonStandardCharsExceptEmotes.Replace(rawMessage, ""));
                     } else if (IRCHandlers.HandleCommand(ActualBotNick, msg.Nick, rawMessage)) {
                     } else if (IRCHandlers.HandlePM(ActualBotNick, msg.Nick, rawMessage)) {
                     } else {
-                        if (elapsed) {
-                            Scheduler.NewTask(t => Chat.getUrls(processedMessage)).RunOnce();
-                            IRCHandlers.lastUrlExpand = DateTime.UtcNow;
-                        }
-                        foreach (Player player in Server.Players.Where(player => player.Info.ReadIRC)) {
-                            player.Message("&I(IRC) {0}{1}: {2}", msg.Nick, Color.White,
-                                           processedMessage);
+                        TryExpandUrls(text);
+                        string discordBotNick = ConfigKey.DiscordBotNick.GetString();
+                        string prefix = msg.Nick == discordBotNick ? "(Discord)" : "(IRC) " + msg.Nick;
+
+                        foreach (Player player in Server.Players.Where(pl => pl.Info.ReadIRC)) {
+                            player.Message("&I{0}{1}: {2}", prefix, Color.White, text);
                         }
                     }
                     Logger.Log(LogType.IrcChat, "{0}: {1}: {2}", msg.Channel, msg.Nick,
                                IRCColorsAndNonStandardCharsExceptEmotes.Replace(rawMessage, ""));
                 } else if (msg.Message.StartsWith("#")) {
-                    if (elapsed) {
-                        Scheduler.NewTask(t => Chat.getUrls(processedMessage)).RunOnce();
-                        IRCHandlers.lastIrcCommand = DateTime.UtcNow;
-                    }
-                    foreach (Player player in Server.Players.Where(player => player.Info.ReadIRC)) {
-                        player.Message("&I(IRC) {0}{1}: {2}", msg.Nick, Color.White,
-                                       processedMessage.Substring(1));
+                    TryExpandUrls(text);
+                    string discordBotNick = ConfigKey.DiscordBotNick.GetString();
+                    string prefix = msg.Nick == discordBotNick ? "(Discord)" : "(IRC) " + msg.Nick;
+
+                    foreach (Player player in Server.Players.Where(pl => pl.Info.ReadIRC)) {
+                        player.Message("&I{0}{1}: {2}", prefix, Color.White, text.Substring(1));
                     }
                     Logger.Log(LogType.IrcChat, "{0}: {1}: {2}", msg.Channel, msg.Nick,
                                IRCColorsAndNonStandardCharsExceptEmotes.Replace(rawMessage, ""));
                 }
             }
 
+            void TryExpandUrls(string msg) {
+                bool elapsed = DateTime.UtcNow.Subtract(IRCHandlers.lastUrlExpand).TotalSeconds > 5;
+                if (elapsed) {
+                    Scheduler.NewTask(t => Chat.getUrls(msg)).RunOnce();
+                    IRCHandlers.lastUrlExpand = DateTime.UtcNow;
+                }
+            }
+
 
             void HandleIrcJoin(IRCMessage msg) {
                 if (!ResponsibleForInputParsing) return;

diff --git a/fCraft/System/ConfigKey.cs b/fCraft/System/ConfigKey.cs
@@ -446,7 +446,12 @@ public enum ConfigKey {
 with IRC bots falling behind on messages.",
             MinValue = 1, MaxValue=3 )]
         IRCThreads,
-
+
+        [StringKey( ConfigSection.IRC, "",
+@"Optional, nick of account that is used to relay chat to Discord.
+In-game, messages sent by this account will show as (Discord) instead of (IRC).",
+            MinLength = 0, MaxLength = 32 )]
+        DiscordBotNick,
         #endregion