diff --git a/src/NadekoBot/Modules/Administration/Administration.cs b/src/NadekoBot/Modules/Administration/Administration.cs index 5c3489ec..0231f8d4 100644 --- a/src/NadekoBot/Modules/Administration/Administration.cs +++ b/src/NadekoBot/Modules/Administration/Administration.cs @@ -275,6 +275,7 @@ namespace NadekoBot.Modules.Administration [NadekoCommand, Usage, Description, Aliases] [RequireContext(ContextType.Guild)] + [RequirePermission(GuildPermission.KickMembers)] public async Task Kick(IUserMessage umsg, IGuildUser user, [Remainder] string msg = null) { var channel = (ITextChannel)umsg.Channel; @@ -695,6 +696,7 @@ namespace NadekoBot.Modules.Administration [NadekoCommand, Usage, Description, Aliases] [RequireContext(ContextType.Guild)] + [OwnerOnly] public async Task Donadd(IUserMessage umsg, IUser donator, int amount) { var channel = (ITextChannel)umsg.Channel; diff --git a/src/NadekoBot/Modules/CustomReactions/CustomReactions.cs b/src/NadekoBot/Modules/CustomReactions/CustomReactions.cs index 42199af1..e634921f 100644 --- a/src/NadekoBot/Modules/CustomReactions/CustomReactions.cs +++ b/src/NadekoBot/Modules/CustomReactions/CustomReactions.cs @@ -49,9 +49,16 @@ namespace NadekoBot.Modules.CustomReactions var reaction = reactions.Where(cr => cr.Trigger == umsg.Content).Shuffle().FirstOrDefault(); if (reaction != null) { - await channel.SendMessageAsync(reaction.Response).ConfigureAwait(false); + try { await channel.SendMessageAsync(reaction.Response).ConfigureAwait(false); } catch { } + return; } } + var greaction = GlobalReactions.Where(cr => cr.Trigger == umsg.Content).Shuffle().FirstOrDefault(); + if (greaction != null) + { + try { await channel.SendMessageAsync(greaction.Response).ConfigureAwait(false); } catch { } + return; + } }); return Task.CompletedTask; };