From 7308e5257a3eafdc79afc690df312e034ef461c1 Mon Sep 17 00:00:00 2001 From: Runebaas Date: Wed, 27 Sep 2017 17:18:31 +0200 Subject: [PATCH] Moved store providers to geekbot.net.lib.media --- Geekbot.net/Geekbot.net.csproj | 2 ++ Geekbot.net/Lib/ErrorHandler.cs | 2 +- Geekbot.net/Lib/{ => Media}/CheckEmImageProvider.cs | 2 +- Geekbot.net/Lib/{ => Media}/FortunesProvider.cs | 2 +- Geekbot.net/Lib/{ => Media}/PandaProvider.cs | 2 +- Geekbot.net/Modules/CheckEm.cs | 1 + Geekbot.net/Modules/Fortune.cs | 2 +- Geekbot.net/Modules/Panda.cs | 2 +- Geekbot.net/Program.cs | 7 ++++--- 9 files changed, 13 insertions(+), 9 deletions(-) rename Geekbot.net/Lib/{ => Media}/CheckEmImageProvider.cs (94%) rename Geekbot.net/Lib/{ => Media}/FortunesProvider.cs (93%) rename Geekbot.net/Lib/{ => Media}/PandaProvider.cs (93%) diff --git a/Geekbot.net/Geekbot.net.csproj b/Geekbot.net/Geekbot.net.csproj index 37f26fa..0da2296 100755 --- a/Geekbot.net/Geekbot.net.csproj +++ b/Geekbot.net/Geekbot.net.csproj @@ -14,6 +14,8 @@ 1.0.2 + + 1.5.0.1 diff --git a/Geekbot.net/Lib/ErrorHandler.cs b/Geekbot.net/Lib/ErrorHandler.cs index 3dd06cc..4320df5 100644 --- a/Geekbot.net/Lib/ErrorHandler.cs +++ b/Geekbot.net/Lib/ErrorHandler.cs @@ -15,7 +15,7 @@ namespace Geekbot.net.Lib // this.botOwnerDmChannel = botOwnerDmChannel; } - public async void HandleCommandException(Exception e, ICommandContext Context) + public void HandleCommandException(Exception e, ICommandContext Context) { var errorMsg = $"Error Occured while executing \"{Context.Message.Content}\", executed by \"{Context.User.Username}\""; diff --git a/Geekbot.net/Lib/CheckEmImageProvider.cs b/Geekbot.net/Lib/Media/CheckEmImageProvider.cs similarity index 94% rename from Geekbot.net/Lib/CheckEmImageProvider.cs rename to Geekbot.net/Lib/Media/CheckEmImageProvider.cs index 43f4b94..4f51a2e 100644 --- a/Geekbot.net/Lib/CheckEmImageProvider.cs +++ b/Geekbot.net/Lib/Media/CheckEmImageProvider.cs @@ -2,7 +2,7 @@ using System.IO; using Serilog; -namespace Geekbot.net.Lib +namespace Geekbot.net.Lib.Media { public class CheckEmImageProvider : ICheckEmImageProvider { diff --git a/Geekbot.net/Lib/FortunesProvider.cs b/Geekbot.net/Lib/Media/FortunesProvider.cs similarity index 93% rename from Geekbot.net/Lib/FortunesProvider.cs rename to Geekbot.net/Lib/Media/FortunesProvider.cs index 3b839d1..a1e8fb9 100644 --- a/Geekbot.net/Lib/FortunesProvider.cs +++ b/Geekbot.net/Lib/Media/FortunesProvider.cs @@ -2,7 +2,7 @@ using System.IO; using Serilog; -namespace Geekbot.net.Lib +namespace Geekbot.net.Lib.Media { internal class FortunesProvider : IFortunesProvider { diff --git a/Geekbot.net/Lib/PandaProvider.cs b/Geekbot.net/Lib/Media/PandaProvider.cs similarity index 93% rename from Geekbot.net/Lib/PandaProvider.cs rename to Geekbot.net/Lib/Media/PandaProvider.cs index 25a6f95..8bbd14e 100644 --- a/Geekbot.net/Lib/PandaProvider.cs +++ b/Geekbot.net/Lib/Media/PandaProvider.cs @@ -2,7 +2,7 @@ using System.IO; using Serilog; -namespace Geekbot.net.Lib +namespace Geekbot.net.Lib.Media { public class PandaProvider : IPandaProvider { diff --git a/Geekbot.net/Modules/CheckEm.cs b/Geekbot.net/Modules/CheckEm.cs index eea5a5f..8af8ae0 100644 --- a/Geekbot.net/Modules/CheckEm.cs +++ b/Geekbot.net/Modules/CheckEm.cs @@ -4,6 +4,7 @@ using System.Text; using System.Threading.Tasks; using Discord.Commands; using Geekbot.net.Lib; +using Geekbot.net.Lib.Media; using Serilog; namespace Geekbot.net.Modules diff --git a/Geekbot.net/Modules/Fortune.cs b/Geekbot.net/Modules/Fortune.cs index 2040034..cc52bcf 100644 --- a/Geekbot.net/Modules/Fortune.cs +++ b/Geekbot.net/Modules/Fortune.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; using Discord.Commands; -using Geekbot.net.Lib; +using Geekbot.net.Lib.Media; namespace Geekbot.net.Modules { diff --git a/Geekbot.net/Modules/Panda.cs b/Geekbot.net/Modules/Panda.cs index 515dfed..f5675c9 100644 --- a/Geekbot.net/Modules/Panda.cs +++ b/Geekbot.net/Modules/Panda.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; using Discord.Commands; -using Geekbot.net.Lib; +using Geekbot.net.Lib.Media; namespace Geekbot.net.Modules { diff --git a/Geekbot.net/Program.cs b/Geekbot.net/Program.cs index 6f33214..1f36aa2 100755 --- a/Geekbot.net/Program.cs +++ b/Geekbot.net/Program.cs @@ -6,6 +6,7 @@ using Discord; using Discord.Commands; using Discord.WebSocket; using Geekbot.net.Lib; +using Geekbot.net.Lib.Media; using Microsoft.Extensions.DependencyInjection; using Serilog; using StackExchange.Redis; @@ -61,9 +62,9 @@ namespace Geekbot.net redis = redisMultiplexer.GetDatabase(6); logger.Information($"[Redis] Connected to db {redis.Database}"); } - catch (Exception) + catch (Exception e) { - logger.Information("Start Redis pls..."); + logger.Fatal(e, "Redis Connection Failed"); Environment.Exit(102); } @@ -90,7 +91,7 @@ namespace Geekbot.net var fortunes = new FortunesProvider(RandomClient, logger); var checkEmImages = new CheckEmImageProvider(RandomClient, logger); var pandaImages = new PandaProvider(RandomClient, logger); - IErrorHandler errorHandler = new ErrorHandler(logger); + var errorHandler = new ErrorHandler(logger); services.AddSingleton(errorHandler); services.AddSingleton(redis); services.AddSingleton(RandomClient);