Merge remote-tracking branch 'refs/remotes/Kwoth/1.0' into 1.0-fearnlj01

This commit is contained in:
Jordan Fearnley 2016-10-25 16:13:48 +01:00
commit 818394ed58

View File

@ -19,7 +19,7 @@ namespace NadekoBot.Modules.Administration
[Group] [Group]
public class SelfAssignedRolesCommands public class SelfAssignedRolesCommands
{ {
[NadekoCommand, Usage, Description, Aliases] [NadekoCommand, Usage, Description, Aliases]
[RequireContext(ContextType.Guild)] [RequireContext(ContextType.Guild)]
[RequirePermission(GuildPermission.ManageMessages)] [RequirePermission(GuildPermission.ManageMessages)]
@ -183,9 +183,10 @@ namespace NadekoBot.Modules.Administration
{ {
await guildUser.AddRolesAsync(role).ConfigureAwait(false); await guildUser.AddRolesAsync(role).ConfigureAwait(false);
} }
catch (Exception) catch (Exception ex)
{ {
await channel.SendMessageAsync($":anger:`I am unable to add that role to you. I can't add roles to owners or other roles higher than my role in the role hierarchy.`").ConfigureAwait(false); await channel.SendMessageAsync($":anger:`I am unable to add that role to you. I can't add roles to owners or other roles higher than my role in the role hierarchy.`").ConfigureAwait(false);
Console.WriteLine(ex);
return; return;
} }
var msg = await channel.SendMessageAsync($":ok:You now have {role.Name} role.").ConfigureAwait(false); var msg = await channel.SendMessageAsync($":ok:You now have {role.Name} role.").ConfigureAwait(false);