From 25cf4f7b0ea7c57eac38af87b7bbf3d6f30f3f6e Mon Sep 17 00:00:00 2001 From: Kwoth Date: Wed, 12 Oct 2016 17:53:00 +0200 Subject: [PATCH] Hgit in alphabetical order. Fixes. --- .../Administration/Commands/Migration.cs | 4 ++-- src/NadekoBot/Modules/Help/Help.cs | 2 +- .../Impl/GuildConfigRepository.cs | 20 +++++++++---------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/NadekoBot/Modules/Administration/Commands/Migration.cs b/src/NadekoBot/Modules/Administration/Commands/Migration.cs index 598d36ac..cd7ae2f8 100644 --- a/src/NadekoBot/Modules/Administration/Commands/Migration.cs +++ b/src/NadekoBot/Modules/Administration/Commands/Migration.cs @@ -70,9 +70,9 @@ namespace NadekoBot.Modules.Administration { var botConfig = uow.BotConfig.GetOrCreate(); MigrateConfig0_9(uow, botConfig); - //MigratePermissions0_9(uow); + MigratePermissions0_9(uow); MigrateServerSpecificConfigs0_9(uow); - //MigrateDb0_9(uow); + MigrateDb0_9(uow); //NOW save it botConfig.MigrationVersion = 1; diff --git a/src/NadekoBot/Modules/Help/Help.cs b/src/NadekoBot/Modules/Help/Help.cs index 96d2c4f6..11038af9 100644 --- a/src/NadekoBot/Modules/Help/Help.cs +++ b/src/NadekoBot/Modules/Help/Help.cs @@ -127,7 +127,7 @@ namespace NadekoBot.Modules.Help var helpstr = new StringBuilder(); var lastModule = ""; - foreach (var com in _commands.Commands.GroupBy(c=>c.Text).Select(g=>g.First())) + foreach (var com in _commands.Commands.OrderBy(com=>com.Module.Name).GroupBy(c=>c.Text).Select(g=>g.First())) { if (com.Module.Name != lastModule) { diff --git a/src/NadekoBot/Services/Database/Repositories/Impl/GuildConfigRepository.cs b/src/NadekoBot/Services/Database/Repositories/Impl/GuildConfigRepository.cs index 7c17af34..0e9151bb 100644 --- a/src/NadekoBot/Services/Database/Repositories/Impl/GuildConfigRepository.cs +++ b/src/NadekoBot/Services/Database/Repositories/Impl/GuildConfigRepository.cs @@ -39,16 +39,16 @@ namespace NadekoBot.Services.Database.Repositories.Impl public GuildConfig For(ulong guildId) { var config = _set - //.Include(gc => gc.FollowedStreams) - // .Include(gc => gc.LogSetting) - // .ThenInclude(ls => ls.IgnoredChannels) - //.Include(gc => gc.LogSetting) - // .ThenInclude(ls => ls.IgnoredVoicePresenceChannelIds) - //.Include(gc => gc.FilterInvitesChannelIds) - //.Include(gc => gc.FilterWordsChannelIds) - //.Include(gc => gc.FilteredWords) - //.Include(gc => gc.GenerateCurrencyChannelIds) - //.Include(gc => gc.CommandCooldowns) + .Include(gc => gc.FollowedStreams) + .Include(gc => gc.LogSetting) + .ThenInclude(ls => ls.IgnoredChannels) + .Include(gc => gc.LogSetting) + .ThenInclude(ls => ls.IgnoredVoicePresenceChannelIds) + .Include(gc => gc.FilterInvitesChannelIds) + .Include(gc => gc.FilterWordsChannelIds) + .Include(gc => gc.FilteredWords) + .Include(gc => gc.GenerateCurrencyChannelIds) + .Include(gc => gc.CommandCooldowns) .FirstOrDefault(c => c.GuildId == guildId); if (config == null)