From 1762bf438f02bc85c5dee3a23c6a5607beb36f97 Mon Sep 17 00:00:00 2001 From: RogueException Date: Wed, 23 Dec 2015 03:00:46 -0400 Subject: [PATCH] Fixed modules/commands compile errors --- src/Discord.Net.Commands/CommandService.cs | 12 +- .../Levels/PermissionLevelChecker.cs | 2 +- .../Permissions/Userlist/BlacklistChecker.cs | 2 +- .../Permissions/Userlist/WhitelistChecker.cs | 2 +- .../Permissions/Visibility/PrivateChecker.cs | 2 +- .../Permissions/Visibility/PublicChecker.cs | 2 +- src/Discord.Net.Modules/ModuleExtensions.cs | 2 +- src/Discord.Net.Modules/ModuleManager.cs | 112 +++++++++--------- src/Discord.Net.Modules/ModuleService.cs | 1 - 9 files changed, 68 insertions(+), 69 deletions(-) diff --git a/src/Discord.Net.Commands/CommandService.cs b/src/Discord.Net.Commands/CommandService.cs index c856fb3b0..8cf52e498 100644 --- a/src/Discord.Net.Commands/CommandService.cs +++ b/src/Discord.Net.Commands/CommandService.cs @@ -51,14 +51,14 @@ namespace Discord.Commands .Description("Returns information about commands.") .Do(async e => { - Channel replyChannel = _config.HelpMode == HelpMode.Public ? e.Channel : await client.CreatePMChannel(e.User); + Channel replyChannel = _config.HelpMode == HelpMode.Public ? e.Channel : await e.User.CreateChannel(); if (e.Args.Length > 0) //Show command help { var map = _map.GetItem(string.Join(" ", e.Args)); if (map != null) await ShowCommandHelp(map, e.User, e.Channel, replyChannel); else - await client.SendMessage(replyChannel, "Unable to display help: Unknown command."); + await replyChannel.SendMessage("Unable to display help: Unknown command."); } else //Show general help await ShowGeneralHelp(e.User, e.Channel, replyChannel); @@ -68,7 +68,7 @@ namespace Discord.Commands client.MessageReceived += async (s, e) => { if (_allCommands.Count == 0) return; - if (e.Message.IsAuthor) return; + if (e.Message.User.Id == _client.CurrentUser.Id) return; string msg = e.Message.RawText; if (msg.Length == 0) return; @@ -199,7 +199,7 @@ namespace Discord.Commands output.AppendLine($"`help ` can tell you more about how to use a command."); } - return _client.SendMessage(replyChannel ?? channel, output.ToString()); + return (replyChannel ?? channel).SendMessage(output.ToString()); } private Task ShowCommandHelp(CommandMap map, User user, Channel channel, Channel replyChannel = null) @@ -255,7 +255,7 @@ namespace Discord.Commands output.AppendLine("There are no commands you have permission to run."); } - return _client.SendMessage(replyChannel ?? channel, output.ToString()); + return (replyChannel ?? channel).SendMessage(output.ToString()); } public Task ShowCommandHelp(Command command, User user, Channel channel, Channel replyChannel = null) { @@ -265,7 +265,7 @@ namespace Discord.Commands output.AppendLine(error ?? DefaultPermissionError); else ShowCommandHelpInternal(command, user, channel, output); - return _client.SendMessage(replyChannel ?? channel, output.ToString()); + return (replyChannel ?? channel).SendMessage(output.ToString()); } private void ShowCommandHelpInternal(Command command, User user, Channel channel, StringBuilder output) { diff --git a/src/Discord.Net.Commands/Permissions/Levels/PermissionLevelChecker.cs b/src/Discord.Net.Commands/Permissions/Levels/PermissionLevelChecker.cs index 0092c4edf..0ebe5c890 100644 --- a/src/Discord.Net.Commands/Permissions/Levels/PermissionLevelChecker.cs +++ b/src/Discord.Net.Commands/Permissions/Levels/PermissionLevelChecker.cs @@ -10,7 +10,7 @@ internal PermissionLevelChecker(DiscordClient client, int minPermissions) { - _service = client.GetService(true); + _service = client.Services.Get(true); _minPermissions = minPermissions; } diff --git a/src/Discord.Net.Commands/Permissions/Userlist/BlacklistChecker.cs b/src/Discord.Net.Commands/Permissions/Userlist/BlacklistChecker.cs index 23c48cba9..0c0b5500b 100644 --- a/src/Discord.Net.Commands/Permissions/Userlist/BlacklistChecker.cs +++ b/src/Discord.Net.Commands/Permissions/Userlist/BlacklistChecker.cs @@ -6,7 +6,7 @@ internal BlacklistChecker(DiscordClient client) { - _service = client.GetService(true); + _service = client.Services.Get(true); } public bool CanRun(Command command, User user, Channel channel, out string error) diff --git a/src/Discord.Net.Commands/Permissions/Userlist/WhitelistChecker.cs b/src/Discord.Net.Commands/Permissions/Userlist/WhitelistChecker.cs index fa441644f..783455e3a 100644 --- a/src/Discord.Net.Commands/Permissions/Userlist/WhitelistChecker.cs +++ b/src/Discord.Net.Commands/Permissions/Userlist/WhitelistChecker.cs @@ -6,7 +6,7 @@ internal WhitelistChecker(DiscordClient client) { - _service = client.GetService(true); + _service = client.Services.Get(true); } public bool CanRun(Command command, User user, Channel channel, out string error) diff --git a/src/Discord.Net.Commands/Permissions/Visibility/PrivateChecker.cs b/src/Discord.Net.Commands/Permissions/Visibility/PrivateChecker.cs index 1a6a91e7d..dd336042d 100644 --- a/src/Discord.Net.Commands/Permissions/Visibility/PrivateChecker.cs +++ b/src/Discord.Net.Commands/Permissions/Visibility/PrivateChecker.cs @@ -6,7 +6,7 @@ public bool CanRun(Command command, User user, Channel channel, out string error) { - if (!user.IsPrivate) + if (user.Server != null) { error = "This command may only be run in a private chat."; return false; diff --git a/src/Discord.Net.Commands/Permissions/Visibility/PublicChecker.cs b/src/Discord.Net.Commands/Permissions/Visibility/PublicChecker.cs index 32e7fbb1f..0369c2db9 100644 --- a/src/Discord.Net.Commands/Permissions/Visibility/PublicChecker.cs +++ b/src/Discord.Net.Commands/Permissions/Visibility/PublicChecker.cs @@ -6,7 +6,7 @@ public bool CanRun(Command command, User user, Channel channel, out string error) { - if (user.IsPrivate) + if (user.Server == null) { error = "This command can't be run in n a private chat."; return false; diff --git a/src/Discord.Net.Modules/ModuleExtensions.cs b/src/Discord.Net.Modules/ModuleExtensions.cs index 385138ba2..d430a9325 100644 --- a/src/Discord.Net.Modules/ModuleExtensions.cs +++ b/src/Discord.Net.Modules/ModuleExtensions.cs @@ -3,6 +3,6 @@ public static class ModuleExtensions { public static ModuleService Modules(this DiscordClient client, bool required = true) - => client.GetService(required); + => client.Services.Get(required); } } diff --git a/src/Discord.Net.Modules/ModuleManager.cs b/src/Discord.Net.Modules/ModuleManager.cs index e279e89d4..1d2010706 100644 --- a/src/Discord.Net.Modules/ModuleManager.cs +++ b/src/Discord.Net.Modules/ModuleManager.cs @@ -8,39 +8,39 @@ namespace Discord.Modules { public class ModuleManager { - public event EventHandler ServerEnabled; - public event EventHandler ServerDisabled; - public event EventHandler ChannelEnabled; - public event EventHandler ChannelDisabled; - - public event EventHandler LeftServer; - public event EventHandler ServerUpdated; - public event EventHandler ServerUnavailable; - public event EventHandler ServerAvailable; - - public event EventHandler UserBanned; - public event EventHandler UserUnbanned; - - public event EventHandler ChannelCreated; - public event EventHandler ChannelDestroyed; - public event EventHandler ChannelUpdated; - - public event EventHandler RoleCreated; - public event EventHandler RoleUpdated; - public event EventHandler RoleDeleted; - - public event EventHandler UserJoined; - public event EventHandler UserLeft; - public event EventHandler UserUpdated; - public event EventHandler UserPresenceUpdated; - public event EventHandler UserVoiceStateUpdated; - public event EventHandler UserIsTypingUpdated; - - public event EventHandler MessageReceived; - public event EventHandler MessageSent; - public event EventHandler MessageDeleted; - public event EventHandler MessageUpdated; - public event EventHandler MessageReadRemotely; + public event EventHandler ServerEnabled = delegate { }; + public event EventHandler ServerDisabled = delegate { }; + public event EventHandler ChannelEnabled = delegate { }; + public event EventHandler ChannelDisabled = delegate { }; + + public event EventHandler LeftServer = delegate { }; + public event EventHandler ServerUpdated = delegate { }; + public event EventHandler ServerUnavailable = delegate { }; + public event EventHandler ServerAvailable = delegate { }; + + public event EventHandler UserBanned = delegate { }; + public event EventHandler UserUnbanned = delegate { }; + + public event EventHandler ChannelCreated = delegate { }; + public event EventHandler ChannelDestroyed = delegate { }; + public event EventHandler ChannelUpdated = delegate { }; + + public event EventHandler RoleCreated = delegate { }; + public event EventHandler RoleUpdated = delegate { }; + public event EventHandler RoleDeleted = delegate { }; + + public event EventHandler UserJoined = delegate { }; + public event EventHandler UserLeft = delegate { }; + public event EventHandler UserUpdated = delegate { }; + public event EventHandler UserPresenceUpdated = delegate { }; + public event EventHandler UserVoiceStateUpdated = delegate { }; + public event EventHandler UserIsTypingUpdated = delegate { }; + + public event EventHandler MessageReceived = delegate { }; + public event EventHandler MessageSent = delegate { }; + public event EventHandler MessageDeleted = delegate { }; + public event EventHandler MessageUpdated = delegate { }; + public event EventHandler MessageReadRemotely = delegate { }; private readonly DiscordClient _client; private readonly string _name, _id; @@ -75,36 +75,36 @@ namespace Discord.Modules if (_allowAll || _useServerWhitelist) //Server-only events { - client.ChannelCreated += (s, e) => { if (ChannelCreated != null && HasServer(e.Server)) ChannelCreated(s, e); }; - client.UserVoiceStateUpdated += (s, e) => { if (UserVoiceStateUpdated != null && HasServer(e.Server)) UserVoiceStateUpdated(s, e); }; + client.ChannelCreated += (s, e) => { if (HasServer(e.Server)) ChannelCreated(s, e); }; + client.UserVoiceStateUpdated += (s, e) => { if (HasServer(e.Server)) UserVoiceStateUpdated(s, e); }; } - client.ChannelDestroyed += (s, e) => { if (ChannelDestroyed != null && HasChannel(e.Channel)) ChannelDestroyed(s, e); }; - client.ChannelUpdated += (s, e) => { if (ChannelUpdated != null && HasChannel(e.Channel)) ChannelUpdated(s, e); }; + client.ChannelDestroyed += (s, e) => { if (HasChannel(e.Channel)) ChannelDestroyed(s, e); }; + client.ChannelUpdated += (s, e) => { if (HasChannel(e.Channel)) ChannelUpdated(s, e); }; - client.MessageReceived += (s, e) => { if (MessageReceived != null && HasChannel(e.Channel)) MessageReceived(s, e); }; - client.MessageSent += (s, e) => { if (MessageSent != null && HasChannel(e.Channel)) MessageSent(s, e); }; - client.MessageDeleted += (s, e) => { if (MessageDeleted != null && HasChannel(e.Channel)) MessageDeleted(s, e); }; - client.MessageUpdated += (s, e) => { if (MessageUpdated != null && HasChannel(e.Channel)) MessageUpdated(s, e); }; - client.MessageAcknowledged += (s, e) => { if (MessageReadRemotely != null && HasChannel(e.Channel)) MessageReadRemotely(s, e); }; + client.MessageReceived += (s, e) => { if (HasChannel(e.Channel)) MessageReceived(s, e); }; + client.MessageSent += (s, e) => { if (HasChannel(e.Channel)) MessageSent(s, e); }; + client.MessageDeleted += (s, e) => { if (HasChannel(e.Channel)) MessageDeleted(s, e); }; + client.MessageUpdated += (s, e) => { if (HasChannel(e.Channel)) MessageUpdated(s, e); }; + client.MessageAcknowledged += (s, e) => { if (HasChannel(e.Channel)) MessageReadRemotely(s, e); }; - client.RoleCreated += (s, e) => { if (RoleCreated != null && HasIndirectServer(e.Server)) RoleCreated(s, e); }; - client.RoleUpdated += (s, e) => { if (RoleUpdated != null && HasIndirectServer(e.Server)) RoleUpdated(s, e); }; - client.RoleDeleted += (s, e) => { if (RoleDeleted != null && HasIndirectServer(e.Server)) RoleDeleted(s, e); }; + client.RoleCreated += (s, e) => { if (HasIndirectServer(e.Server)) RoleCreated(s, e); }; + client.RoleUpdated += (s, e) => { if (HasIndirectServer(e.Server)) RoleUpdated(s, e); }; + client.RoleDeleted += (s, e) => { if (HasIndirectServer(e.Server)) RoleDeleted(s, e); }; - client.LeftServer += (s, e) => { if (LeftServer != null && HasIndirectServer(e.Server)) { DisableServer(e.Server); LeftServer(s, e); } }; - client.ServerUpdated += (s, e) => { if (ServerUpdated != null && HasIndirectServer(e.Server)) ServerUpdated(s, e); }; - client.ServerUnavailable += (s, e) => { if (ServerUnavailable != null && HasIndirectServer(e.Server)) ServerUnavailable(s, e); }; - client.ServerAvailable += (s, e) => { if (ServerAvailable != null && HasIndirectServer(e.Server)) ServerAvailable(s, e); }; + client.LeftServer += (s, e) => { if (HasIndirectServer(e.Server)) { DisableServer(e.Server); LeftServer(s, e); } }; + client.ServerUpdated += (s, e) => { if (HasIndirectServer(e.Server)) ServerUpdated(s, e); }; + client.ServerUnavailable += (s, e) => { if (HasIndirectServer(e.Server)) ServerUnavailable(s, e); }; + client.ServerAvailable += (s, e) => { if (HasIndirectServer(e.Server)) ServerAvailable(s, e); }; - client.UserJoined += (s, e) => { if (UserJoined != null && HasIndirectServer(e.Server)) UserJoined(s, e); }; - client.UserLeft += (s, e) => { if (UserLeft != null && HasIndirectServer(e.Server)) UserLeft(s, e); }; - client.UserUpdated += (s, e) => { if (UserUpdated != null && HasIndirectServer(e.Server)) UserUpdated(s, e); }; - client.UserIsTypingUpdated += (s, e) => { if (UserIsTypingUpdated != null && HasChannel(e.Channel)) UserIsTypingUpdated(s, e); }; + client.UserJoined += (s, e) => { if (HasIndirectServer(e.Server)) UserJoined(s, e); }; + client.UserLeft += (s, e) => { if (HasIndirectServer(e.Server)) UserLeft(s, e); }; + client.UserUpdated += (s, e) => { if (HasIndirectServer(e.Server)) UserUpdated(s, e); }; + client.UserIsTypingUpdated += (s, e) => { if (HasChannel(e.Channel)) UserIsTypingUpdated(s, e); }; //TODO: We aren't getting events from UserPresence if AllowPrivate is enabled, but the server we know that user through isn't on the whitelist - client.UserPresenceUpdated += (s, e) => { if (UserPresenceUpdated != null && HasIndirectServer(e.Server)) UserPresenceUpdated(s, e); }; - client.UserBanned += (s, e) => { if (UserBanned != null && HasIndirectServer(e.Server)) UserBanned(s, e); }; - client.UserUnbanned += (s, e) => { if (UserUnbanned != null && HasIndirectServer(e.Server)) UserUnbanned(s, e); }; + client.UserPresenceUpdated += (s, e) => { if (HasIndirectServer(e.Server)) UserPresenceUpdated(s, e); }; + client.UserBanned += (s, e) => { if (HasIndirectServer(e.Server)) UserBanned(s, e); }; + client.UserUnbanned += (s, e) => { if (HasIndirectServer(e.Server)) UserUnbanned(s, e); }; } public void CreateCommands(string prefix, Action config) diff --git a/src/Discord.Net.Modules/ModuleService.cs b/src/Discord.Net.Modules/ModuleService.cs index f7118aadd..0f3c455ae 100644 --- a/src/Discord.Net.Modules/ModuleService.cs +++ b/src/Discord.Net.Modules/ModuleService.cs @@ -33,7 +33,6 @@ namespace Discord.Modules var manager = new ModuleManager(_client, name, type); _modules.Add(module, manager); module.Install(manager); - _client.AddSingleton(module); } public ModuleManager GetManager(IModule module)