diff --git a/Ditto/ChannelPair.cs b/Ditto/ChannelPair.cs index b922a1f..94568d6 100644 --- a/Ditto/ChannelPair.cs +++ b/Ditto/ChannelPair.cs @@ -70,7 +70,7 @@ public async Task SendDiscordMessage(string msg) } catch (Exception ex) { - Console.WriteLine("Failed to send message to Discord: " + ex.ToString()); + if (EnableConsoleLogging) Console.WriteLine("Failed to send message to Discord: " + ex.ToString()); } } diff --git a/Ditto/Program.cs b/Ditto/Program.cs index 7da3c3d..8b6d299 100644 --- a/Ditto/Program.cs +++ b/Ditto/Program.cs @@ -19,16 +19,17 @@ public class Program public static async Task Main(string[] args) { + var noprompt = args.Contains("noprompt"); try { - Console.WriteLine("Starting..."); + if (!noprompt) Console.WriteLine("Starting..."); Pairs = new List(); var discordFilenames = Directory.GetFiles(".", "*.discord.json"); - Console.WriteLine("Found " + discordFilenames.Length.ToString() + " Discord settings"); + if (!noprompt) Console.WriteLine("Found " + discordFilenames.Length.ToString() + " Discord settings"); foreach (var discordFilename in discordFilenames) { - Console.WriteLine(discordFilename); + if (!noprompt) Console.WriteLine(discordFilename); var ircFilename = discordFilename.Replace(".discord.json", ".irc.json"); if (File.Exists(ircFilename)) { @@ -36,24 +37,23 @@ public static async Task Main(string[] args) var discordInfo = JsonConvert.DeserializeObject(File.ReadAllText(discordFilename)); var ircInfo = JsonConvert.DeserializeObject(File.ReadAllText(ircFilename)); - var pair = new ChannelPair(new IrcConnection(ircInfo), discordInfo); - if (args.Contains("noprompt")) + var pair = new ChannelPair(new IrcConnection(ircInfo) { EnableConsoleLogging = !noprompt }, discordInfo) { - pair.EnableConsoleLogging = false; - } - Console.WriteLine("Connecting..."); + EnableConsoleLogging = !noprompt + }; + if (!noprompt) Console.WriteLine("Connecting..."); await pair.Connect(); - Console.WriteLine("Ready."); + if (!noprompt) Console.WriteLine("Ready."); Pairs.Add(pair); } else { - Console.Write("Did not find IRC settings. Not creating pair."); + if (!noprompt) Console.Write("Did not find IRC settings. Not creating pair."); } } // Listen for mannual commands - if (args.Contains("noprompt")) + if (noprompt) { while (true) { @@ -72,7 +72,7 @@ public static async Task Main(string[] args) case "say": if (Pairs.Count > 1) { - Console.WriteLine("There is currently more than 1 channel pair active. Manual input is not currently supported."); + if (!noprompt) Console.WriteLine("There is currently more than 1 channel pair active. Manual input is not currently supported."); break; } @@ -83,7 +83,7 @@ public static async Task Main(string[] args) } else { - Console.WriteLine("Usage: say "); + if (!noprompt) Console.WriteLine("Usage: say "); } break; case "exit": @@ -100,7 +100,7 @@ public static async Task Main(string[] args) { Console.Write(ex.ToString()); throw; - } - } + } + } } }