update to discord.net b2 finished possibly
This commit is contained in:
		 Submodule Discord.Net updated: cfc827404a...40fa35c851
									
								
							@@ -21,7 +21,7 @@ namespace NadekoBot.Modules.Administration
 | 
				
			|||||||
    public partial class Administration
 | 
					    public partial class Administration
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
        [Group]
 | 
					        [Group]
 | 
				
			||||||
        public class LogCommands
 | 
					        public class LogCommands : ModuleBase
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
            private static ShardedDiscordClient _client { get; }
 | 
					            private static ShardedDiscordClient _client { get; }
 | 
				
			||||||
            private static Logger _log { get; }
 | 
					            private static Logger _log { get; }
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -17,7 +17,7 @@ namespace NadekoBot.Modules.Gambling
 | 
				
			|||||||
    public partial class Gambling
 | 
					    public partial class Gambling
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
        [Group]
 | 
					        [Group]
 | 
				
			||||||
        public class DriceRollCommands
 | 
					        public class DriceRollCommands : ModuleBase
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
            private Regex dndRegex { get; } = new Regex(@"^(?<n1>\d+)d(?<n2>\d+)(?:\+(?<add>\d+))?(?:\-(?<sub>\d+))?$", RegexOptions.Compiled);
 | 
					            private Regex dndRegex { get; } = new Regex(@"^(?<n1>\d+)d(?<n2>\d+)(?:\+(?<add>\d+))?(?:\-(?<sub>\d+))?$", RegexOptions.Compiled);
 | 
				
			||||||
            private Regex fudgeRegex { get; } = new Regex(@"^(?<n1>\d+)d(?:F|f)$", RegexOptions.Compiled);
 | 
					            private Regex fudgeRegex { get; } = new Regex(@"^(?<n1>\d+)d(?:F|f)$", RegexOptions.Compiled);
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -18,7 +18,7 @@ namespace NadekoBot.Modules.Games
 | 
				
			|||||||
    public partial class Games
 | 
					    public partial class Games
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
        [Group]
 | 
					        [Group]
 | 
				
			||||||
        public class Acropobia
 | 
					        public class Acropobia : ModuleBase
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
            //channelId, game
 | 
					            //channelId, game
 | 
				
			||||||
            public static ConcurrentDictionary<ulong, AcrophobiaGame> AcrophobiaGames { get; } = new ConcurrentDictionary<ulong, AcrophobiaGame>();
 | 
					            public static ConcurrentDictionary<ulong, AcrophobiaGame> AcrophobiaGames { get; } = new ConcurrentDictionary<ulong, AcrophobiaGame>();
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -41,7 +41,7 @@ namespace NadekoBot.Modules.Help
 | 
				
			|||||||
        {
 | 
					        {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            var embed = new EmbedBuilder().WithOkColor().WithFooter(efb => efb.WithText($" ℹ️ Type `-cmds ModuleName` to get a list of commands in that module. eg `-cmds games`"))
 | 
					            var embed = new EmbedBuilder().WithOkColor().WithFooter(efb => efb.WithText($" ℹ️ Type `-cmds ModuleName` to get a list of commands in that module. eg `-cmds games`"))
 | 
				
			||||||
                .WithTitle("📜 List Of Modules").WithDescription("\n• " + string.Join("\n• ", NadekoBot.CommandService.Modules.Select(m => m.Name).OrderBy(s=>s)));
 | 
					                .WithTitle("📜 List Of Modules").WithDescription("\n• " + string.Join("\n• ", NadekoBot.CommandService.Modules.GroupBy(m => m.GetTopLevelModule()).Select(m => m.Key.Name).OrderBy(s => s)));
 | 
				
			||||||
            await Context.Channel.EmbedAsync(embed).ConfigureAwait(false);
 | 
					            await Context.Channel.EmbedAsync(embed).ConfigureAwait(false);
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -53,7 +53,7 @@ namespace NadekoBot.Modules.Help
 | 
				
			|||||||
            module = module?.Trim().ToUpperInvariant();
 | 
					            module = module?.Trim().ToUpperInvariant();
 | 
				
			||||||
            if (string.IsNullOrWhiteSpace(module))
 | 
					            if (string.IsNullOrWhiteSpace(module))
 | 
				
			||||||
                return;
 | 
					                return;
 | 
				
			||||||
            var cmds = NadekoBot.CommandService.Commands.Where(c => c.Module.Name.ToUpperInvariant().StartsWith(module))
 | 
					            var cmds = NadekoBot.CommandService.Commands.Where(c => c.Module.GetTopLevelModule().Name.ToUpperInvariant().StartsWith(module))
 | 
				
			||||||
                                                  .OrderBy(c => c.Aliases.First())
 | 
					                                                  .OrderBy(c => c.Aliases.First())
 | 
				
			||||||
                                                  .Distinct(new CommandTextEqualityComparer())
 | 
					                                                  .Distinct(new CommandTextEqualityComparer())
 | 
				
			||||||
                                                  .AsEnumerable();
 | 
					                                                  .AsEnumerable();
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -68,8 +68,7 @@ namespace NadekoBot
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
            //initialize Services
 | 
					            //initialize Services
 | 
				
			||||||
            CommandService = new CommandService(new CommandServiceConfig() {
 | 
					            CommandService = new CommandService(new CommandServiceConfig() {
 | 
				
			||||||
                CaseSensitiveCommands = false,
 | 
					                CaseSensitiveCommands = false
 | 
				
			||||||
                SeparatorChar = '-'
 | 
					 | 
				
			||||||
            });
 | 
					            });
 | 
				
			||||||
            Google = new GoogleApiService();
 | 
					            Google = new GoogleApiService();
 | 
				
			||||||
            CommandHandler = new CommandHandler(Client, CommandService);
 | 
					            CommandHandler = new CommandHandler(Client, CommandService);
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user