Improved coding style

Author: Bond-009

iTool.DiscordBot/Modules/Weather.cs

@@ -12,53 +12,55 @@ public class Weather : ModuleBase
         [Summary("Gets the weather info")]
         public async Task GetWeather(string input)
         {
-            if (!string.IsNullOrEmpty(Program.Settings.OpenWeatherMapKey))
+            if (string.IsNullOrEmpty(Program.Settings.OpenWeatherMapKey))
             {
-                //TODO: Add weather
-                OpenWeatherClient client = new OpenWeatherClient(Program.Settings.OpenWeatherMapKey);
-                WeatherInfo weather = await client.GetCurrentAsync(input);
-                weather.Temperature = weather.Temperature.ToCelsius(); //TODO: Add temperaturescale setting
+                await Program.Log(new LogMessage(LogSeverity.Warning, "", "No OpenWeatherMapKey found."));
+                return;
+            }
 
-                EmbedBuilder b = new EmbedBuilder()
-                {
-                    Title = weather.City.Name + " " + weather.City.Country,
-                    Color = new Color(3, 144, 255),
-                    ThumbnailUrl = weather.IconURL
-                };
-                b.AddField(delegate (EmbedFieldBuilder f)
-                {
-                    f.IsInline = true;
-                    f.Name = "Temperature";
-                    f.Value = $"Max: {weather.Temperature.Max} {weather.Temperature.Unit}" + Environment.NewLine +
-                                $"Gem: {weather.Temperature.Value} {weather.Temperature.Unit}" + Environment.NewLine +
-                                $"Min: {weather.Temperature.Min} {weather.Temperature.Unit}";
-                });
+            OpenWeatherClient client = new OpenWeatherClient(Program.Settings.OpenWeatherMapKey);
+            WeatherInfo weather = await client.GetCurrentAsync(input);
+            weather.Temperature = weather.Temperature.ToCelsius(); //TODO: Add temperaturescale setting
 
-                if (weather.Precipitation.Value != 0)
-                {
-                    b.AddField(delegate (EmbedFieldBuilder f)
-                    {
-                        f.IsInline = true;
-                        f.Name = "Precipation";
-                        f.Value = weather.Precipitation.Value + weather.Precipitation.Unit;
-                    });
-                }
-                
-                b.AddField(delegate (EmbedFieldBuilder f)
-                {
-                    f.IsInline = true;
-                    f.Name = "Humidity";
-                    f.Value = weather.Humidity.Value + weather.Humidity.Unit;
-                });
+            EmbedBuilder b = new EmbedBuilder()
+            {
+                Title = weather.City.Name + " " + weather.City.Country,
+                Color = new Color(3, 144, 255),
+                ThumbnailUrl = weather.IconURL
+            };
+            b.AddField(delegate (EmbedFieldBuilder f)
+            {
+                f.IsInline = true;
+                f.Name = "Temperature";
+                f.Value = $"Max: {weather.Temperature.Max} {weather.Temperature.Unit}" + Environment.NewLine +
+                            $"Gem: {weather.Temperature.Value} {weather.Temperature.Unit}" + Environment.NewLine +
+                            $"Min: {weather.Temperature.Min} {weather.Temperature.Unit}";
+            });
+
+            if (weather.Precipitation.Value != 0)
+            {
                 b.AddField(delegate (EmbedFieldBuilder f)
                 {
                     f.IsInline = true;
-                    f.Name = "Wind";
-                    f.Value = weather.Wind.Speed.Name + Environment.NewLine +
-                                weather.Wind.Speed.Value + "m/s";
+                    f.Name = "Precipation";
+                    f.Value = weather.Precipitation.Value + weather.Precipitation.Unit;
                 });
-                await ReplyAsync("", embed: b);
             }
+
+            b.AddField(delegate (EmbedFieldBuilder f)
+            {
+                f.IsInline = true;
+                f.Name = "Humidity";
+                f.Value = weather.Humidity.Value + weather.Humidity.Unit;
+            });
+            b.AddField(delegate (EmbedFieldBuilder f)
+            {
+                f.IsInline = true;
+                f.Name = "Wind";
+                f.Value = weather.Wind.Speed.Name + Environment.NewLine +
+                            weather.Wind.Speed.Value + "m/s";
+            });
+            await ReplyAsync("", embed: b);
         }
     }
 }

iTool.DiscordBot/Program.cs

@@ -15,7 +15,7 @@ static class Program
     {
         public static void Main(string[] args) => Start().GetAwaiter().GetResult();
 
-        public static CommandHandler CommandHandler { get; private set;}
+        public static CommandHandler CommandHandler { get; private set; }
         public static Settings Settings { get; set; }
 
         private static DiscordSocketClient discordClient;
@@ -35,28 +35,26 @@ public static async Task Start()
                 Console.ReadKey();
                 Environment.Exit(0);
             }
-            else
-            {
-                discordClient = new DiscordSocketClient();
 
-                await discordClient.LoginAsync(TokenType.Bot, Settings.DiscordToken);
-                await discordClient.ConnectAsync();
-                Console.WriteLine("Succesfully connected.");
+            discordClient = new DiscordSocketClient();
 
-                if (!string.IsNullOrEmpty(Settings.Game))
-                {
-                    await discordClient.SetGameAsync(Settings.Game);
-                }
+            await discordClient.LoginAsync(TokenType.Bot, Settings.DiscordToken);
+            await discordClient.ConnectAsync();
+            Console.WriteLine("Succesfully connected.");
 
-                DependencyMap map = new DependencyMap();
-                map.Add(discordClient);
+            if (!string.IsNullOrEmpty(Settings.Game))
+            {
+                await discordClient.SetGameAsync(Settings.Game);
+            }
 
-                CommandHandler = new CommandHandler();
-                await CommandHandler.Install(map);
+            DependencyMap map = new DependencyMap();
+            map.Add(discordClient);
 
-                discordClient.Log += Log;
-                discordClient.MessageReceived += DiscordClient_MessageReceived;
-            }
+            CommandHandler = new CommandHandler();
+            await CommandHandler.Install(map);
+
+            discordClient.Log += Log;
+            discordClient.MessageReceived += DiscordClient_MessageReceived;
 
             while (true)
             {
@@ -89,6 +87,7 @@ private async static Task DiscordClient_MessageReceived(SocketMessage arg)
         public static Task Log(LogMessage msg)
         {
             Console.WriteLine(msg.ToString());
+            if (msg.Exception != null) { Console.WriteLine(msg.Exception.ToString()); }
             return Task.CompletedTask;
         }