From d7fe2fda9e5e5e4b58a7aa22c53c7aaceb8dbee4 Mon Sep 17 00:00:00 2001 From: samvaio Date: Fri, 25 Nov 2016 17:24:01 +0530 Subject: [PATCH 1/8] Update Permissions.cs - added emojis --- .../Modules/Permissions/Permissions.cs | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/src/NadekoBot/Modules/Permissions/Permissions.cs b/src/NadekoBot/Modules/Permissions/Permissions.cs index 1edd21ce..0d959610 100644 --- a/src/NadekoBot/Modules/Permissions/Permissions.cs +++ b/src/NadekoBot/Modules/Permissions/Permissions.cs @@ -62,7 +62,7 @@ namespace NadekoBot.Modules.Permissions await uow.CompleteAsync().ConfigureAwait(false); } - await channel.SendMessageAsync("I will " + (action.Value ? "now" : "no longer") + " show permission warnings.").ConfigureAwait(false); + await channel.SendMessageAsync("ℹ️ I will " + (action.Value ? "now" : "no longer") + " show permission warnings.").ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] @@ -75,7 +75,7 @@ namespace NadekoBot.Modules.Permissions var config = uow.GuildConfigs.For(channel.Guild.Id); if (role == null) { - await channel.SendMessageAsync($"Current permission role is **{config.PermissionRole}**.").ConfigureAwait(false); + await channel.SendMessageAsync($"ℹ️ Current permission role is **{config.PermissionRole}**.").ConfigureAwait(false); return; } else { @@ -90,7 +90,7 @@ namespace NadekoBot.Modules.Permissions } } - await channel.SendMessageAsync($"Users now require **{role.Name}** role in order to edit permissions.").ConfigureAwait(false); + await channel.SendMessageAsync($"✅ Users now require **{role.Name}** role in order to edit permissions.").ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] @@ -106,11 +106,11 @@ namespace NadekoBot.Modules.Permissions { var perms = uow.GuildConfigs.PermissionsFor(channel.Guild.Id).RootPermission; var i = 1 + 20 * (page - 1); - toSend = Format.Code($"Permissions page {page}") + "\n\n" + String.Join("\n", perms.AsEnumerable().Skip((page - 1) * 20).Take(20).Select(p => $"`{(i++)}.` {(p.Next == null ? Format.Bold(p.GetCommand(channel.Guild) + " [uneditable]") : (p.GetCommand(channel.Guild)))}")); + toSend = Format.Code($"📄 Permissions page {page}") + "\n\n" + String.Join("\n", perms.AsEnumerable().Skip((page - 1) * 20).Take(20).Select(p => $"`{(i++)}.` {(p.Next == null ? Format.Bold(p.GetCommand(channel.Guild) + " [uneditable]") : (p.GetCommand(channel.Guild)))}")); } if (string.IsNullOrWhiteSpace(toSend)) - await channel.SendMessageAsync("`No permissions set.`").ConfigureAwait(false); + await channel.SendMessageAsync("❗️`No permissions set.`").ConfigureAwait(false); else await channel.SendMessageAsync(toSend).ConfigureAwait(false); } @@ -156,11 +156,11 @@ namespace NadekoBot.Modules.Permissions uow2._context.SaveChanges(); } - await channel.SendMessageAsync($"{imsg.Author.Mention} removed permission **{p.GetCommand(channel.Guild)}** from position #{index + 1}.").ConfigureAwait(false); + await channel.SendMessageAsync($"✅ {imsg.Author.Mention} removed permission **{p.GetCommand(channel.Guild)}** from position #{index + 1}.").ConfigureAwait(false); } catch (ArgumentOutOfRangeException) { - await channel.SendMessageAsync("`No command on that index found.`").ConfigureAwait(false); + await channel.SendMessageAsync("❗️`No command on that index found.`").ConfigureAwait(false); } } @@ -208,13 +208,13 @@ namespace NadekoBot.Modules.Permissions { if (!fromFound) { - await channel.SendMessageAsync($"`Can't find permission at index `#{++from}`").ConfigureAwait(false); + await channel.SendMessageAsync($"❗️`Can't find permission at index `#{++from}`").ConfigureAwait(false); return; } if (!toFound) { - await channel.SendMessageAsync($"`Can't find permission at index `#{++to}`").ConfigureAwait(false); + await channel.SendMessageAsync($"❗️`Can't find permission at index `#{++to}`").ConfigureAwait(false); return; } } @@ -264,7 +264,7 @@ namespace NadekoBot.Modules.Permissions }, (id, old) => { old.RootPermission = config.RootPermission; return old; }); await uow.CompleteAsync().ConfigureAwait(false); } - await channel.SendMessageAsync($"`Moved permission:` \"{fromPerm.GetCommand(channel.Guild)}\" `from #{++from} to #{++to}.`").ConfigureAwait(false); + await channel.SendMessageAsync($"✅ `Moved permission:` \"{fromPerm.GetCommand(channel.Guild)}\" `from #{++from} to #{++to}.`").ConfigureAwait(false); return; } catch (Exception e) when (e is ArgumentOutOfRangeException || e is IndexOutOfRangeException) @@ -300,7 +300,7 @@ namespace NadekoBot.Modules.Permissions await uow.CompleteAsync().ConfigureAwait(false); } - await channel.SendMessageAsync($"{(action.Value ? "Allowed" : "Denied")} usage of `{command.Text}` command on this server.").ConfigureAwait(false); + await channel.SendMessageAsync($"{(action.Value ? "✅ Allowed" : "❎ Denied")} usage of `{command.Text}` command on this server.").ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] @@ -328,7 +328,7 @@ namespace NadekoBot.Modules.Permissions }, (id, old) => { old.RootPermission = config.RootPermission; return old; }); await uow.CompleteAsync().ConfigureAwait(false); } - await channel.SendMessageAsync($"{(action.Value ? "Allowed" : "Denied")} usage of `{module.Name}` module on this server.").ConfigureAwait(false); + await channel.SendMessageAsync($"{(action.Value ? "✅ Allowed" : "❎ Denied")} usage of **`{module.Name}`** module on this server.").ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] @@ -356,7 +356,7 @@ namespace NadekoBot.Modules.Permissions }, (id, old) => { old.RootPermission = config.RootPermission; return old; }); await uow.CompleteAsync().ConfigureAwait(false); } - await channel.SendMessageAsync($"{(action.Value ? "Allowed" : "Denied")} usage of `{command.Text}` command for `{user}` user.").ConfigureAwait(false); + await channel.SendMessageAsync($"{(action.Value ? "✅ Allowed" : "❎ Denied")} usage of `{command.Text}` command for `{user}` user.").ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] @@ -384,7 +384,7 @@ namespace NadekoBot.Modules.Permissions }, (id, old) => { old.RootPermission = config.RootPermission; return old; }); await uow.CompleteAsync().ConfigureAwait(false); } - await channel.SendMessageAsync($"{(action.Value ? "Allowed" : "Denied")} usage of `{module.Name}` module for `{user}` user.").ConfigureAwait(false); + await channel.SendMessageAsync($"{(action.Value ? "✅ Allowed" : "❎ Denied")} usage of `{module.Name}` module for `{user}` user.").ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] @@ -412,7 +412,7 @@ namespace NadekoBot.Modules.Permissions }, (id, old) => { old.RootPermission = config.RootPermission; return old; }); await uow.CompleteAsync().ConfigureAwait(false); } - await channel.SendMessageAsync($"{(action.Value ? "Allowed" : "Denied")} usage of `{command.Text}` command for `{role}` role.").ConfigureAwait(false); + await channel.SendMessageAsync($"{(action.Value ? "✅ Allowed" : "❎ Denied")} usage of `{command.Text}` command for `{role}` role.").ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] @@ -440,7 +440,7 @@ namespace NadekoBot.Modules.Permissions }, (id, old) => { old.RootPermission = config.RootPermission; return old; }); await uow.CompleteAsync().ConfigureAwait(false); } - await channel.SendMessageAsync($"{(action.Value ? "Allowed" : "Denied")} usage of `{module.Name}` module for `{role}` role.").ConfigureAwait(false); + await channel.SendMessageAsync($"{(action.Value ? "✅ Allowed" : "❎ Denied")} usage of `{module.Name}` module for `{role}` role.").ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] @@ -473,7 +473,7 @@ namespace NadekoBot.Modules.Permissions catch (Exception ex) { Console.WriteLine(ex); } - await channel.SendMessageAsync($"{(action.Value ? "Allowed" : "Denied")} usage of `{command.Text}` command for `{chnl}` channel.").ConfigureAwait(false); + await channel.SendMessageAsync($"{(action.Value ? "✅ Allowed" : "❎ Denied")} usage of `{command.Text}` command for `{chnl}` channel.").ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] @@ -501,7 +501,7 @@ namespace NadekoBot.Modules.Permissions }, (id, old) => { old.RootPermission = config.RootPermission; return old; }); await uow.CompleteAsync().ConfigureAwait(false); } - await channel.SendMessageAsync($"{(action.Value ? "Allowed" : "Denied")} usage of `{module.Name}` module for `{chnl}` channel.").ConfigureAwait(false); + await channel.SendMessageAsync($"{(action.Value ? "✅ Allowed" : "❎ Denied")} usage of `{module.Name}` module for `{chnl}` channel.").ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] @@ -529,7 +529,7 @@ namespace NadekoBot.Modules.Permissions }, (id, old) => { old.RootPermission = config.RootPermission; return old; }); await uow.CompleteAsync().ConfigureAwait(false); } - await channel.SendMessageAsync($"{(action.Value ? "Allowed" : "Denied")} usage of `ALL MODULES` for `{chnl}` channel.").ConfigureAwait(false); + await channel.SendMessageAsync($"{(action.Value ? "✅ Allowed" : "❎ Denied")} usage of `ALL MODULES` for `{chnl}` channel.").ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] @@ -557,7 +557,7 @@ namespace NadekoBot.Modules.Permissions }, (id, old) => { old.RootPermission = config.RootPermission; return old; }); await uow.CompleteAsync().ConfigureAwait(false); } - await channel.SendMessageAsync($"{(action.Value ? "Allowed" : "Denied")} usage of `ALL MODULES` for `{role}` role.").ConfigureAwait(false); + await channel.SendMessageAsync($"{(action.Value ? "✅ Allowed" : "❎ Denied")} usage of `ALL MODULES` for `{role}` role.").ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] @@ -585,7 +585,7 @@ namespace NadekoBot.Modules.Permissions }, (id, old) => { old.RootPermission = config.RootPermission; return old; }); await uow.CompleteAsync().ConfigureAwait(false); } - await channel.SendMessageAsync($"{(action.Value ? "Allowed" : "Denied")} usage of `ALL MODULES` for `{user}` user.").ConfigureAwait(false); + await channel.SendMessageAsync($"{(action.Value ? "✅ Allowed" : "❎ Denied")} usage of `ALL MODULES` for `{user}` user.").ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] @@ -624,7 +624,7 @@ namespace NadekoBot.Modules.Permissions }, (id, old) => { old.RootPermission = config.RootPermission; return old; }); await uow.CompleteAsync().ConfigureAwait(false); } - await channel.SendMessageAsync($"{(action.Value ? "Allowed" : "Denied")} usage of `ALL MODULES` on this server.").ConfigureAwait(false); + await channel.SendMessageAsync($"{(action.Value ? "✅ Allowed" : "❎ Denied")} usage of `ALL MODULES` on this server.").ConfigureAwait(false); } } } From 5998a8dc93411d5bf63631f92b2745e0ffd5d387 Mon Sep 17 00:00:00 2001 From: samvaio Date: Fri, 25 Nov 2016 17:42:54 +0530 Subject: [PATCH 2/8] Update FilterCommands.cs - emojis added --- .../Permissions/Commands/FilterCommands.cs | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/NadekoBot/Modules/Permissions/Commands/FilterCommands.cs b/src/NadekoBot/Modules/Permissions/Commands/FilterCommands.cs index bb6ddbab..c1e35d2d 100644 --- a/src/NadekoBot/Modules/Permissions/Commands/FilterCommands.cs +++ b/src/NadekoBot/Modules/Permissions/Commands/FilterCommands.cs @@ -76,12 +76,12 @@ namespace NadekoBot.Modules.Permissions if (enabled) { InviteFilteringServers.Add(channel.Guild.Id); - await channel.SendMessageAsync("`Invite filtering enabled on this server.`").ConfigureAwait(false); + await channel.SendMessageAsync("✅ `Invite filtering enabled on this server.`").ConfigureAwait(false); } else { InviteFilteringServers.TryRemove(channel.Guild.Id); - await channel.SendMessageAsync("`Invite filtering disabled on this server.`").ConfigureAwait(false); + await channel.SendMessageAsync("ℹ️ `Invite filtering disabled on this server.`").ConfigureAwait(false); } } @@ -109,12 +109,12 @@ namespace NadekoBot.Modules.Permissions if (removed == 0) { InviteFilteringChannels.Add(channel.Id); - await channel.SendMessageAsync("`Invite filtering enabled on this channel.`").ConfigureAwait(false); + await channel.SendMessageAsync("✅ `Invite filtering enabled on this channel.`").ConfigureAwait(false); } else { InviteFilteringChannels.TryRemove(channel.Id); - await channel.SendMessageAsync("`Invite filtering disabled on this channel.`").ConfigureAwait(false); + await channel.SendMessageAsync("ℹ️ `Invite filtering disabled on this channel.`").ConfigureAwait(false); } } @@ -135,12 +135,12 @@ namespace NadekoBot.Modules.Permissions if (enabled) { WordFilteringServers.Add(channel.Guild.Id); - await channel.SendMessageAsync("`Word filtering enabled on this server.`").ConfigureAwait(false); + await channel.SendMessageAsync("✅ `Word filtering enabled on this server.`").ConfigureAwait(false); } else { WordFilteringServers.TryRemove(channel.Guild.Id); - await channel.SendMessageAsync("`Word filtering disabled on this server.`").ConfigureAwait(false); + await channel.SendMessageAsync("ℹ️ `Word filtering disabled on this server.`").ConfigureAwait(false); } } @@ -168,12 +168,12 @@ namespace NadekoBot.Modules.Permissions if (removed == 0) { WordFilteringChannels.Add(channel.Id); - await channel.SendMessageAsync("`Word filtering enabled on this channel.`").ConfigureAwait(false); + await channel.SendMessageAsync("✅ `Word filtering enabled on this channel.`").ConfigureAwait(false); } else { WordFilteringChannels.TryRemove(channel.Id); - await channel.SendMessageAsync("`Word filtering disabled on this channel.`").ConfigureAwait(false); + await channel.SendMessageAsync("ℹ️ `Word filtering disabled on this channel.`").ConfigureAwait(false); } } @@ -206,13 +206,13 @@ namespace NadekoBot.Modules.Permissions if (removed == 0) { filteredWords.Add(word); - await channel.SendMessageAsync($"Word `{word}` successfully added to the list of filtered words.") + await channel.SendMessageAsync($"✅ Word `{word}` successfully added to the list of filtered words.") .ConfigureAwait(false); } else { filteredWords.TryRemove(word); - await channel.SendMessageAsync($"Word `{word}` removed from the list of filtered words.") + await channel.SendMessageAsync($"ℹ️ Word `{word}` removed from the list of filtered words.") .ConfigureAwait(false); } } @@ -226,7 +226,7 @@ namespace NadekoBot.Modules.Permissions ConcurrentHashSet filteredWords; ServerFilteredWords.TryGetValue(channel.Guild.Id, out filteredWords); - await channel.SendMessageAsync($"`List of banned words:`\n" + string.Join(",\n", filteredWords)) + await channel.SendMessageAsync($"ℹ️ `List of banned words:`\n" + string.Join(",\n", filteredWords)) .ConfigureAwait(false); } } From 046e0f34f6a0b048b3afb9359ea3cddf68efed12 Mon Sep 17 00:00:00 2001 From: samvaio Date: Fri, 25 Nov 2016 17:45:27 +0530 Subject: [PATCH 3/8] Update CmdCdsCommands.cs - emojis added --- .../Modules/Permissions/Commands/CmdCdsCommands.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/NadekoBot/Modules/Permissions/Commands/CmdCdsCommands.cs b/src/NadekoBot/Modules/Permissions/Commands/CmdCdsCommands.cs index 149c0e4f..28e3ec40 100644 --- a/src/NadekoBot/Modules/Permissions/Commands/CmdCdsCommands.cs +++ b/src/NadekoBot/Modules/Permissions/Commands/CmdCdsCommands.cs @@ -40,7 +40,7 @@ namespace NadekoBot.Modules.Permissions var channel = (ITextChannel)imsg.Channel; if (secs < 0 || secs > 3600) { - await channel.SendMessageAsync("Invalid second parameter. (Must be a number between 0 and 3600)").ConfigureAwait(false); + await channel.SendMessageAsync("⚠️ Invalid second parameter. (Must be a number between 0 and 3600)").ConfigureAwait(false); return; } @@ -67,10 +67,10 @@ namespace NadekoBot.Modules.Permissions { var activeCds = activeCooldowns.GetOrAdd(channel.Guild.Id, new ConcurrentHashSet()); activeCds.RemoveWhere(ac => ac.Command == command.Text.ToLowerInvariant()); - await channel.SendMessageAsync($"Command **{command}** has no coooldown now and all existing cooldowns have been cleared.").ConfigureAwait(false); + await channel.SendMessageAsync($"🚮 Command **{command}** has no coooldown now and all existing cooldowns have been cleared.").ConfigureAwait(false); } else - await channel.SendMessageAsync($"Command **{command}** now has a **{secs} {(secs == 1 ? "second" : "seconds")}** cooldown.").ConfigureAwait(false); + await channel.SendMessageAsync($"✅ Command **{command}** now has a **{secs} {(secs == 1 ? "second" : "seconds")}** cooldown.").ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] @@ -81,7 +81,7 @@ namespace NadekoBot.Modules.Permissions var localSet = commandCooldowns.GetOrAdd(channel.Guild.Id, new ConcurrentHashSet()); if (!localSet.Any()) - await channel.SendMessageAsync("`No command cooldowns set.`").ConfigureAwait(false); + await channel.SendMessageAsync("ℹ️ `No command cooldowns set.`").ConfigureAwait(false); else await channel.SendTableAsync("", localSet.Select(c => c.CommandName + ": " + c.Seconds + " secs"), s => $"{s,-30}", 2).ConfigureAwait(false); } From 8c1865a234e46bc43a2b780aead0db5010b6df0a Mon Sep 17 00:00:00 2001 From: samvaio Date: Fri, 25 Nov 2016 17:53:02 +0530 Subject: [PATCH 4/8] Update CommandHandler.cs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - changed `:warning:` to actual emoji ⚠️ --- src/NadekoBot/Services/CommandHandler.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NadekoBot/Services/CommandHandler.cs b/src/NadekoBot/Services/CommandHandler.cs index 73679395..08aa6fbd 100644 --- a/src/NadekoBot/Services/CommandHandler.cs +++ b/src/NadekoBot/Services/CommandHandler.cs @@ -185,7 +185,7 @@ namespace NadekoBot.Services if (guild != null && command != null && result.Error == CommandError.Exception) { if (permCache != null && permCache.Verbose) - try { await msg.Channel.SendMessageAsync(":warning: " + result.ErrorReason).ConfigureAwait(false); } catch { } + try { await msg.Channel.SendMessageAsync("⚠️ " + result.ErrorReason).ConfigureAwait(false); } catch { } } } else From 25f1d282ec0dce8d5b24a57aa0d97e3a3a8eef63 Mon Sep 17 00:00:00 2001 From: samvaio Date: Fri, 25 Nov 2016 18:11:33 +0530 Subject: [PATCH 5/8] Update Permissions.cs --- .../Modules/Permissions/Permissions.cs | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/NadekoBot/Modules/Permissions/Permissions.cs b/src/NadekoBot/Modules/Permissions/Permissions.cs index 0d959610..6b624257 100644 --- a/src/NadekoBot/Modules/Permissions/Permissions.cs +++ b/src/NadekoBot/Modules/Permissions/Permissions.cs @@ -300,7 +300,7 @@ namespace NadekoBot.Modules.Permissions await uow.CompleteAsync().ConfigureAwait(false); } - await channel.SendMessageAsync($"{(action.Value ? "✅ Allowed" : "❎ Denied")} usage of `{command.Text}` command on this server.").ConfigureAwait(false); + await channel.SendMessageAsync($"{(action.Value ? "✅ Allowed" : "🆗 Denied")} usage of `{command.Text}` command on this server.").ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] @@ -328,7 +328,7 @@ namespace NadekoBot.Modules.Permissions }, (id, old) => { old.RootPermission = config.RootPermission; return old; }); await uow.CompleteAsync().ConfigureAwait(false); } - await channel.SendMessageAsync($"{(action.Value ? "✅ Allowed" : "❎ Denied")} usage of **`{module.Name}`** module on this server.").ConfigureAwait(false); + await channel.SendMessageAsync($"{(action.Value ? "✅ Allowed" : "🆗 Denied")} usage of **`{module.Name}`** module on this server.").ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] @@ -356,7 +356,7 @@ namespace NadekoBot.Modules.Permissions }, (id, old) => { old.RootPermission = config.RootPermission; return old; }); await uow.CompleteAsync().ConfigureAwait(false); } - await channel.SendMessageAsync($"{(action.Value ? "✅ Allowed" : "❎ Denied")} usage of `{command.Text}` command for `{user}` user.").ConfigureAwait(false); + await channel.SendMessageAsync($"{(action.Value ? "✅ Allowed" : "🆗 Denied")} usage of `{command.Text}` command for `{user}` user.").ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] @@ -384,7 +384,7 @@ namespace NadekoBot.Modules.Permissions }, (id, old) => { old.RootPermission = config.RootPermission; return old; }); await uow.CompleteAsync().ConfigureAwait(false); } - await channel.SendMessageAsync($"{(action.Value ? "✅ Allowed" : "❎ Denied")} usage of `{module.Name}` module for `{user}` user.").ConfigureAwait(false); + await channel.SendMessageAsync($"{(action.Value ? "✅ Allowed" : "🆗 Denied")} usage of `{module.Name}` module for `{user}` user.").ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] @@ -412,7 +412,7 @@ namespace NadekoBot.Modules.Permissions }, (id, old) => { old.RootPermission = config.RootPermission; return old; }); await uow.CompleteAsync().ConfigureAwait(false); } - await channel.SendMessageAsync($"{(action.Value ? "✅ Allowed" : "❎ Denied")} usage of `{command.Text}` command for `{role}` role.").ConfigureAwait(false); + await channel.SendMessageAsync($"{(action.Value ? "✅ Allowed" : "🆗 Denied")} usage of `{command.Text}` command for `{role}` role.").ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] @@ -440,7 +440,7 @@ namespace NadekoBot.Modules.Permissions }, (id, old) => { old.RootPermission = config.RootPermission; return old; }); await uow.CompleteAsync().ConfigureAwait(false); } - await channel.SendMessageAsync($"{(action.Value ? "✅ Allowed" : "❎ Denied")} usage of `{module.Name}` module for `{role}` role.").ConfigureAwait(false); + await channel.SendMessageAsync($"{(action.Value ? "✅ Allowed" : "🆗 Denied")} usage of `{module.Name}` module for `{role}` role.").ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] @@ -473,7 +473,7 @@ namespace NadekoBot.Modules.Permissions catch (Exception ex) { Console.WriteLine(ex); } - await channel.SendMessageAsync($"{(action.Value ? "✅ Allowed" : "❎ Denied")} usage of `{command.Text}` command for `{chnl}` channel.").ConfigureAwait(false); + await channel.SendMessageAsync($"{(action.Value ? "✅ Allowed" : "🆗 Denied")} usage of `{command.Text}` command for `{chnl}` channel.").ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] @@ -501,7 +501,7 @@ namespace NadekoBot.Modules.Permissions }, (id, old) => { old.RootPermission = config.RootPermission; return old; }); await uow.CompleteAsync().ConfigureAwait(false); } - await channel.SendMessageAsync($"{(action.Value ? "✅ Allowed" : "❎ Denied")} usage of `{module.Name}` module for `{chnl}` channel.").ConfigureAwait(false); + await channel.SendMessageAsync($"{(action.Value ? "✅ Allowed" : "🆗 Denied")} usage of `{module.Name}` module for `{chnl}` channel.").ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] @@ -529,7 +529,7 @@ namespace NadekoBot.Modules.Permissions }, (id, old) => { old.RootPermission = config.RootPermission; return old; }); await uow.CompleteAsync().ConfigureAwait(false); } - await channel.SendMessageAsync($"{(action.Value ? "✅ Allowed" : "❎ Denied")} usage of `ALL MODULES` for `{chnl}` channel.").ConfigureAwait(false); + await channel.SendMessageAsync($"{(action.Value ? "✅ Allowed" : "🆗 Denied")} usage of `ALL MODULES` for `{chnl}` channel.").ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] @@ -557,7 +557,7 @@ namespace NadekoBot.Modules.Permissions }, (id, old) => { old.RootPermission = config.RootPermission; return old; }); await uow.CompleteAsync().ConfigureAwait(false); } - await channel.SendMessageAsync($"{(action.Value ? "✅ Allowed" : "❎ Denied")} usage of `ALL MODULES` for `{role}` role.").ConfigureAwait(false); + await channel.SendMessageAsync($"{(action.Value ? "✅ Allowed" : "🆗 Denied")} usage of `ALL MODULES` for `{role}` role.").ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] @@ -585,7 +585,7 @@ namespace NadekoBot.Modules.Permissions }, (id, old) => { old.RootPermission = config.RootPermission; return old; }); await uow.CompleteAsync().ConfigureAwait(false); } - await channel.SendMessageAsync($"{(action.Value ? "✅ Allowed" : "❎ Denied")} usage of `ALL MODULES` for `{user}` user.").ConfigureAwait(false); + await channel.SendMessageAsync($"{(action.Value ? "✅ Allowed" : "🆗 Denied")} usage of `ALL MODULES` for `{user}` user.").ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] @@ -624,7 +624,7 @@ namespace NadekoBot.Modules.Permissions }, (id, old) => { old.RootPermission = config.RootPermission; return old; }); await uow.CompleteAsync().ConfigureAwait(false); } - await channel.SendMessageAsync($"{(action.Value ? "✅ Allowed" : "❎ Denied")} usage of `ALL MODULES` on this server.").ConfigureAwait(false); + await channel.SendMessageAsync($"{(action.Value ? "✅ Allowed" : "🆗 Denied")} usage of `ALL MODULES` on this server.").ConfigureAwait(false); } } } From 9b5b6f95d17eefb21f5a8a60c238df92a8d1970c Mon Sep 17 00:00:00 2001 From: samvaio Date: Fri, 25 Nov 2016 18:43:08 +0530 Subject: [PATCH 6/8] Revert "update" --- src/NadekoBot/Modules/Gambling/Commands/DiceRollCommand.cs | 2 +- src/NadekoBot/Modules/Gambling/Commands/DrawCommand.cs | 2 +- src/NadekoBot/Modules/Gambling/Commands/FlipCoinCommand.cs | 2 +- src/NadekoBot/Modules/Searches/Searches.cs | 4 ++-- src/NadekoBot/_Extensions/Extensions.cs | 2 +- src/NadekoBot/project.json | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/NadekoBot/Modules/Gambling/Commands/DiceRollCommand.cs b/src/NadekoBot/Modules/Gambling/Commands/DiceRollCommand.cs index dc075964..39c1622b 100644 --- a/src/NadekoBot/Modules/Gambling/Commands/DiceRollCommand.cs +++ b/src/NadekoBot/Modules/Gambling/Commands/DiceRollCommand.cs @@ -1,6 +1,6 @@ using Discord; using Discord.Commands; -using ImageSharp; +using ImageProcessorCore; using NadekoBot.Attributes; using NadekoBot.Extensions; using NadekoBot.Services; diff --git a/src/NadekoBot/Modules/Gambling/Commands/DrawCommand.cs b/src/NadekoBot/Modules/Gambling/Commands/DrawCommand.cs index eca29d75..a5a20e6e 100644 --- a/src/NadekoBot/Modules/Gambling/Commands/DrawCommand.cs +++ b/src/NadekoBot/Modules/Gambling/Commands/DrawCommand.cs @@ -1,6 +1,6 @@ using Discord; using Discord.Commands; -using ImageSharp; +using ImageProcessorCore; using NadekoBot.Attributes; using NadekoBot.Extensions; using NadekoBot.Modules.Gambling.Models; diff --git a/src/NadekoBot/Modules/Gambling/Commands/FlipCoinCommand.cs b/src/NadekoBot/Modules/Gambling/Commands/FlipCoinCommand.cs index 0ea7bd5e..8a85f700 100644 --- a/src/NadekoBot/Modules/Gambling/Commands/FlipCoinCommand.cs +++ b/src/NadekoBot/Modules/Gambling/Commands/FlipCoinCommand.cs @@ -1,6 +1,6 @@ using Discord; using Discord.Commands; -using ImageSharp; +using ImageProcessorCore; using NadekoBot.Attributes; using NadekoBot.Extensions; using NadekoBot.Services; diff --git a/src/NadekoBot/Modules/Searches/Searches.cs b/src/NadekoBot/Modules/Searches/Searches.cs index 47429830..b460d08a 100644 --- a/src/NadekoBot/Modules/Searches/Searches.cs +++ b/src/NadekoBot/Modules/Searches/Searches.cs @@ -13,7 +13,7 @@ using System.Text.RegularExpressions; using System.Net; using NadekoBot.Modules.Searches.Models; using System.Collections.Generic; -using ImageSharp; +using ImageProcessorCore; using NadekoBot.Extensions; using System.IO; using NadekoBot.Modules.Searches.Commands.OMDB; @@ -434,7 +434,7 @@ $@"🌍 **Weather for** 【{obj["target"]}】 var green = Convert.ToInt32(color.Substring(2, 2), 16); var blue = Convert.ToInt32(color.Substring(4, 2), 16); - img.BackgroundColor(new ImageSharp.Color(color)); + img.BackgroundColor(new ImageProcessorCore.Color(color)); await channel.SendFileAsync(img.ToStream(), $"{color}.png"); } diff --git a/src/NadekoBot/_Extensions/Extensions.cs b/src/NadekoBot/_Extensions/Extensions.cs index 166e41b0..04159315 100644 --- a/src/NadekoBot/_Extensions/Extensions.cs +++ b/src/NadekoBot/_Extensions/Extensions.cs @@ -1,6 +1,6 @@ using Discord; using Discord.WebSocket; -using ImageSharp; +using ImageProcessorCore; using Newtonsoft.Json; using System; using System.Collections.Concurrent; diff --git a/src/NadekoBot/project.json b/src/NadekoBot/project.json index 12c76009..7017f62b 100644 --- a/src/NadekoBot/project.json +++ b/src/NadekoBot/project.json @@ -27,7 +27,7 @@ }, "Google.Apis.Urlshortener.v1": "1.19.0.138", "Google.Apis.YouTube.v3": "1.19.0.655", - "ImageSharp": "1.0.0-alpha-000079", + "ImageProcessorCore": "1.0.0-alpha1095", "Microsoft.EntityFrameworkCore": "1.1.0", "Microsoft.EntityFrameworkCore.Design": "1.1.0", "Microsoft.EntityFrameworkCore.Sqlite": "1.1.0", From 1373bfbb6eff1687706f9b24cb9c4b64a69c4aa2 Mon Sep 17 00:00:00 2001 From: samvaio Date: Fri, 25 Nov 2016 19:06:34 +0530 Subject: [PATCH 7/8] Revert "Revert "update"" --- src/NadekoBot/Modules/Gambling/Commands/DiceRollCommand.cs | 2 +- src/NadekoBot/Modules/Gambling/Commands/DrawCommand.cs | 2 +- src/NadekoBot/Modules/Gambling/Commands/FlipCoinCommand.cs | 2 +- src/NadekoBot/Modules/Searches/Searches.cs | 4 ++-- src/NadekoBot/_Extensions/Extensions.cs | 2 +- src/NadekoBot/project.json | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/NadekoBot/Modules/Gambling/Commands/DiceRollCommand.cs b/src/NadekoBot/Modules/Gambling/Commands/DiceRollCommand.cs index 39c1622b..dc075964 100644 --- a/src/NadekoBot/Modules/Gambling/Commands/DiceRollCommand.cs +++ b/src/NadekoBot/Modules/Gambling/Commands/DiceRollCommand.cs @@ -1,6 +1,6 @@ using Discord; using Discord.Commands; -using ImageProcessorCore; +using ImageSharp; using NadekoBot.Attributes; using NadekoBot.Extensions; using NadekoBot.Services; diff --git a/src/NadekoBot/Modules/Gambling/Commands/DrawCommand.cs b/src/NadekoBot/Modules/Gambling/Commands/DrawCommand.cs index a5a20e6e..eca29d75 100644 --- a/src/NadekoBot/Modules/Gambling/Commands/DrawCommand.cs +++ b/src/NadekoBot/Modules/Gambling/Commands/DrawCommand.cs @@ -1,6 +1,6 @@ using Discord; using Discord.Commands; -using ImageProcessorCore; +using ImageSharp; using NadekoBot.Attributes; using NadekoBot.Extensions; using NadekoBot.Modules.Gambling.Models; diff --git a/src/NadekoBot/Modules/Gambling/Commands/FlipCoinCommand.cs b/src/NadekoBot/Modules/Gambling/Commands/FlipCoinCommand.cs index 8a85f700..0ea7bd5e 100644 --- a/src/NadekoBot/Modules/Gambling/Commands/FlipCoinCommand.cs +++ b/src/NadekoBot/Modules/Gambling/Commands/FlipCoinCommand.cs @@ -1,6 +1,6 @@ using Discord; using Discord.Commands; -using ImageProcessorCore; +using ImageSharp; using NadekoBot.Attributes; using NadekoBot.Extensions; using NadekoBot.Services; diff --git a/src/NadekoBot/Modules/Searches/Searches.cs b/src/NadekoBot/Modules/Searches/Searches.cs index b460d08a..47429830 100644 --- a/src/NadekoBot/Modules/Searches/Searches.cs +++ b/src/NadekoBot/Modules/Searches/Searches.cs @@ -13,7 +13,7 @@ using System.Text.RegularExpressions; using System.Net; using NadekoBot.Modules.Searches.Models; using System.Collections.Generic; -using ImageProcessorCore; +using ImageSharp; using NadekoBot.Extensions; using System.IO; using NadekoBot.Modules.Searches.Commands.OMDB; @@ -434,7 +434,7 @@ $@"🌍 **Weather for** 【{obj["target"]}】 var green = Convert.ToInt32(color.Substring(2, 2), 16); var blue = Convert.ToInt32(color.Substring(4, 2), 16); - img.BackgroundColor(new ImageProcessorCore.Color(color)); + img.BackgroundColor(new ImageSharp.Color(color)); await channel.SendFileAsync(img.ToStream(), $"{color}.png"); } diff --git a/src/NadekoBot/_Extensions/Extensions.cs b/src/NadekoBot/_Extensions/Extensions.cs index 04159315..166e41b0 100644 --- a/src/NadekoBot/_Extensions/Extensions.cs +++ b/src/NadekoBot/_Extensions/Extensions.cs @@ -1,6 +1,6 @@ using Discord; using Discord.WebSocket; -using ImageProcessorCore; +using ImageSharp; using Newtonsoft.Json; using System; using System.Collections.Concurrent; diff --git a/src/NadekoBot/project.json b/src/NadekoBot/project.json index 7017f62b..12c76009 100644 --- a/src/NadekoBot/project.json +++ b/src/NadekoBot/project.json @@ -27,7 +27,7 @@ }, "Google.Apis.Urlshortener.v1": "1.19.0.138", "Google.Apis.YouTube.v3": "1.19.0.655", - "ImageProcessorCore": "1.0.0-alpha1095", + "ImageSharp": "1.0.0-alpha-000079", "Microsoft.EntityFrameworkCore": "1.1.0", "Microsoft.EntityFrameworkCore.Design": "1.1.0", "Microsoft.EntityFrameworkCore.Sqlite": "1.1.0", From 35a8010e445bd1be7143aade80dd23d7ff377b2d Mon Sep 17 00:00:00 2001 From: samvaio Date: Fri, 25 Nov 2016 20:38:33 +0530 Subject: [PATCH 8/8] Update NuGet.Config --- NuGet.Config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NuGet.Config b/NuGet.Config index 7c9568af..d40268d3 100644 --- a/NuGet.Config +++ b/NuGet.Config @@ -1,6 +1,6 @@  - + - \ No newline at end of file +