update to discord.net b2 finished possibly

This commit is contained in:
Kwoth 2017-01-01 12:48:07 +01:00
parent 6e3ff96616
commit 479963bcc1
6 changed files with 7 additions and 8 deletions

@ -1 +1 @@
Subproject commit cfc827404af535b1e09d725284671b111fe85b93
Subproject commit 40fa35c851076fb035fab06deb06f2b013281c15

View File

@ -21,7 +21,7 @@ namespace NadekoBot.Modules.Administration
public partial class Administration
{
[Group]
public class LogCommands
public class LogCommands : ModuleBase
{
private static ShardedDiscordClient _client { get; }
private static Logger _log { get; }

View File

@ -17,7 +17,7 @@ namespace NadekoBot.Modules.Gambling
public partial class Gambling
{
[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 fudgeRegex { get; } = new Regex(@"^(?<n1>\d+)d(?:F|f)$", RegexOptions.Compiled);

View File

@ -18,7 +18,7 @@ namespace NadekoBot.Modules.Games
public partial class Games
{
[Group]
public class Acropobia
public class Acropobia : ModuleBase
{
//channelId, game
public static ConcurrentDictionary<ulong, AcrophobiaGame> AcrophobiaGames { get; } = new ConcurrentDictionary<ulong, AcrophobiaGame>();

View File

@ -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`"))
.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);
}
@ -53,7 +53,7 @@ namespace NadekoBot.Modules.Help
module = module?.Trim().ToUpperInvariant();
if (string.IsNullOrWhiteSpace(module))
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())
.Distinct(new CommandTextEqualityComparer())
.AsEnumerable();

View File

@ -68,8 +68,7 @@ namespace NadekoBot
//initialize Services
CommandService = new CommandService(new CommandServiceConfig() {
CaseSensitiveCommands = false,
SeparatorChar = '-'
CaseSensitiveCommands = false
});
Google = new GoogleApiService();
CommandHandler = new CommandHandler(Client, CommandService);