Merge branch 'dev' into b2

src/NadekoBot/Modules/Games/Commands/CleverBotCommands.cs

@@ -35,7 +35,7 @@ namespace NadekoBot.Modules.Games
                 {
                     var bot = ChatterBotFactory.Create(ChatterBotType.CLEVERBOT);
                     CleverbotGuilds = new ConcurrentDictionary<ulong, ChatterBotSession>(
-                        uow.GuildConfigs.GetAll()
+                        NadekoBot.AllGuildConfigs
                             .Where(gc => gc.CleverbotEnabled)
                             .ToDictionary(gc => gc.GuildId, gc => bot.CreateSession()));
                 }

src/NadekoBot/NadekoBot.cs

@@ -46,7 +46,7 @@ namespace NadekoBot
 
             using (var uow = DbHandler.UnitOfWork())
             {
-                AllGuildConfigs = uow.GuildConfigs.GetAll();
+                AllGuildConfigs = uow.GuildConfigs.GetAllGuildConfigs();
             }
         }
 

src/NadekoBot/Services/Database/Repositories/IGuildConfigRepository.cs

@@ -11,6 +11,7 @@ namespace NadekoBot.Services.Database.Repositories
         GuildConfig For(ulong guildId, Func<DbSet<GuildConfig>, IQueryable<GuildConfig>> includes = null);
         GuildConfig PermissionsFor(ulong guildId);
         IEnumerable<GuildConfig> PermissionsForAll();
+        IEnumerable<GuildConfig> GetAllGuildConfigs();
         GuildConfig SetNewRootPermission(ulong guildId, Permission p);
         IEnumerable<FollowedStream> GetAllFollowedStreams();
         void SetCleverbotEnabled(ulong id, bool cleverbotEnabled);

src/NadekoBot/Services/Database/Repositories/Impl/GuildConfigRepository.cs

@@ -13,7 +13,7 @@ namespace NadekoBot.Services.Database.Repositories.Impl
         {
         }
 
-        public new IEnumerable<GuildConfig> GetAll() =>
+        public IEnumerable<GuildConfig> GetAllGuildConfigs() =>
             _set.Include(gc => gc.LogSetting)
                     .ThenInclude(ls => ls.IgnoredChannels)
                 .Include(gc => gc.LogSetting)