diff --git a/src/Discord.Net.Core/Entities/Permissions/ChannelPermission.cs b/src/Discord.Net.Core/Entities/Permissions/ChannelPermission.cs index 8c58145ad..d802ac9e3 100644 --- a/src/Discord.Net.Core/Entities/Permissions/ChannelPermission.cs +++ b/src/Discord.Net.Core/Entities/Permissions/ChannelPermission.cs @@ -2,28 +2,28 @@ { public enum ChannelPermission : ulong { - CREATE_INSTANT_INVITE = 0x00000001, - MANAGE_CHANNELS = 0x00000010, - - ADD_REACTIONS = 0x00000040, - READ_MESSAGES = 0x00000400, - SEND_MESSAGES = 0x00000800, - SEND_TTS_MESSAGES = 0x00001000, - MANAGE_MESSAGES = 0x00002000, - EMBED_LINKS = 0x00004000, - ATTACH_FILES = 0x00008000, - READ_MESSAGE_HISTORY = 0x00010000, - MENTION_EVERYONE = 0x00020000, - USE_EXTERNAL_EMOJIS = 0x00040000, + CreateInstantInvite = 0x00000001, + ManageChannels = 0x00000010, - CONNECT = 0x00100000, - SPEAK = 0x00200000, - MUTE_MEMBERS = 0x00400000, - DEAFEN_MEMBERS = 0x00800000, - MOVE_MEMBERS = 0x01000000, - USE_VAD = 0x02000000, + AddReactions = 0x00000040, + ReadMessages = 0x00000400, + SendMessages = 0x00000800, + SendTTSMessages = 0x00001000, + ManageMessages = 0x00002000, + EmbedLinks = 0x00004000, + AttachFiles = 0x00008000, + ReadMessageHistory = 0x00010000, + MentionEveryone = 0x00020000, + UseExternalEmojis = 0x00040000, - MANAGE_ROLES = 0x10000000, - MANAGE_WEBHOOKS = 0x20000000, + Connect = 0x00100000, + Speak = 0x00200000, + MuteMembers = 0x00400000, + DeafenMembers = 0x00800000, + MoveMembers = 0x01000000, + UseVAD = 0x02000000, + + ManageRoles = 0x10000000, + ManageWebhooks = 0x20000000, } } diff --git a/src/Discord.Net.Core/Entities/Permissions/ChannelPermissions.cs b/src/Discord.Net.Core/Entities/Permissions/ChannelPermissions.cs index d5fd52f3a..f441bd8b3 100644 --- a/src/Discord.Net.Core/Entities/Permissions/ChannelPermissions.cs +++ b/src/Discord.Net.Core/Entities/Permissions/ChannelPermissions.cs @@ -34,48 +34,48 @@ namespace Discord public ulong RawValue { get; } /// If True, a user may create invites. - public bool CreateInstantInvite => Permissions.GetValue(RawValue, ChannelPermission.CREATE_INSTANT_INVITE); + public bool CreateInstantInvite => Permissions.GetValue(RawValue, ChannelPermission.CreateInstantInvite); /// If True, a user may create, delete and modify this channel. - public bool ManageChannel => Permissions.GetValue(RawValue, ChannelPermission.MANAGE_CHANNELS); + public bool ManageChannel => Permissions.GetValue(RawValue, ChannelPermission.ManageChannels); /// If true, a user may add reactions. - public bool AddReactions => Permissions.GetValue(RawValue, ChannelPermission.ADD_REACTIONS); + public bool AddReactions => Permissions.GetValue(RawValue, ChannelPermission.AddReactions); /// If True, a user may join channels. - public bool ReadMessages => Permissions.GetValue(RawValue, ChannelPermission.READ_MESSAGES); + public bool ReadMessages => Permissions.GetValue(RawValue, ChannelPermission.ReadMessages); /// If True, a user may send messages. - public bool SendMessages => Permissions.GetValue(RawValue, ChannelPermission.SEND_MESSAGES); + public bool SendMessages => Permissions.GetValue(RawValue, ChannelPermission.SendMessages); /// If True, a user may send text-to-speech messages. - public bool SendTTSMessages => Permissions.GetValue(RawValue, ChannelPermission.SEND_TTS_MESSAGES); + public bool SendTTSMessages => Permissions.GetValue(RawValue, ChannelPermission.SendTTSMessages); /// If True, a user may delete messages. - public bool ManageMessages => Permissions.GetValue(RawValue, ChannelPermission.MANAGE_MESSAGES); + public bool ManageMessages => Permissions.GetValue(RawValue, ChannelPermission.ManageMessages); /// If True, Discord will auto-embed links sent by this user. - public bool EmbedLinks => Permissions.GetValue(RawValue, ChannelPermission.EMBED_LINKS); + public bool EmbedLinks => Permissions.GetValue(RawValue, ChannelPermission.EmbedLinks); /// If True, a user may send files. - public bool AttachFiles => Permissions.GetValue(RawValue, ChannelPermission.ATTACH_FILES); + public bool AttachFiles => Permissions.GetValue(RawValue, ChannelPermission.AttachFiles); /// If True, a user may read previous messages. - public bool ReadMessageHistory => Permissions.GetValue(RawValue, ChannelPermission.READ_MESSAGE_HISTORY); + public bool ReadMessageHistory => Permissions.GetValue(RawValue, ChannelPermission.ReadMessageHistory); /// If True, a user may mention @everyone. - public bool MentionEveryone => Permissions.GetValue(RawValue, ChannelPermission.MENTION_EVERYONE); + public bool MentionEveryone => Permissions.GetValue(RawValue, ChannelPermission.MentionEveryone); /// If True, a user may use custom emoji from other guilds. - public bool UseExternalEmojis => Permissions.GetValue(RawValue, ChannelPermission.USE_EXTERNAL_EMOJIS); + public bool UseExternalEmojis => Permissions.GetValue(RawValue, ChannelPermission.UseExternalEmojis); /// If True, a user may connect to a voice channel. - public bool Connect => Permissions.GetValue(RawValue, ChannelPermission.CONNECT); + public bool Connect => Permissions.GetValue(RawValue, ChannelPermission.Connect); /// If True, a user may speak in a voice channel. - public bool Speak => Permissions.GetValue(RawValue, ChannelPermission.SPEAK); + public bool Speak => Permissions.GetValue(RawValue, ChannelPermission.Speak); /// If True, a user may mute users. - public bool MuteMembers => Permissions.GetValue(RawValue, ChannelPermission.MUTE_MEMBERS); + public bool MuteMembers => Permissions.GetValue(RawValue, ChannelPermission.MuteMembers); /// If True, a user may deafen users. - public bool DeafenMembers => Permissions.GetValue(RawValue, ChannelPermission.DEAFEN_MEMBERS); + public bool DeafenMembers => Permissions.GetValue(RawValue, ChannelPermission.DeafenMembers); /// If True, a user may move other users between voice channels. - public bool MoveMembers => Permissions.GetValue(RawValue, ChannelPermission.MOVE_MEMBERS); + public bool MoveMembers => Permissions.GetValue(RawValue, ChannelPermission.MoveMembers); /// If True, a user may use voice-activity-detection rather than push-to-talk. - public bool UseVAD => Permissions.GetValue(RawValue, ChannelPermission.USE_VAD); + public bool UseVAD => Permissions.GetValue(RawValue, ChannelPermission.UseVAD); /// If True, a user may adjust permissions. This also implictly grants all other permissions. - public bool ManagePermissions => Permissions.GetValue(RawValue, ChannelPermission.MANAGE_ROLES); + public bool ManagePermissions => Permissions.GetValue(RawValue, ChannelPermission.ManageRoles); /// If True, a user may edit the webhooks for this channel. - public bool ManageWebhooks => Permissions.GetValue(RawValue, ChannelPermission.MANAGE_WEBHOOKS); + public bool ManageWebhooks => Permissions.GetValue(RawValue, ChannelPermission.ManageWebhooks); /// Creates a new ChannelPermissions with the provided packed value. public ChannelPermissions(ulong rawValue) { RawValue = rawValue; } @@ -89,26 +89,26 @@ namespace Discord { ulong value = initialValue; - Permissions.SetValue(ref value, createInstantInvite, ChannelPermission.CREATE_INSTANT_INVITE); - Permissions.SetValue(ref value, manageChannel, ChannelPermission.MANAGE_CHANNELS); - Permissions.SetValue(ref value, addReactions, ChannelPermission.ADD_REACTIONS); - Permissions.SetValue(ref value, readMessages, ChannelPermission.READ_MESSAGES); - Permissions.SetValue(ref value, sendMessages, ChannelPermission.SEND_MESSAGES); - Permissions.SetValue(ref value, sendTTSMessages, ChannelPermission.SEND_TTS_MESSAGES); - Permissions.SetValue(ref value, manageMessages, ChannelPermission.MANAGE_MESSAGES); - Permissions.SetValue(ref value, embedLinks, ChannelPermission.EMBED_LINKS); - Permissions.SetValue(ref value, attachFiles, ChannelPermission.ATTACH_FILES); - Permissions.SetValue(ref value, readMessageHistory, ChannelPermission.READ_MESSAGE_HISTORY); - Permissions.SetValue(ref value, mentionEveryone, ChannelPermission.MENTION_EVERYONE); - Permissions.SetValue(ref value, useExternalEmojis, ChannelPermission.USE_EXTERNAL_EMOJIS); - Permissions.SetValue(ref value, connect, ChannelPermission.CONNECT); - Permissions.SetValue(ref value, speak, ChannelPermission.SPEAK); - Permissions.SetValue(ref value, muteMembers, ChannelPermission.MUTE_MEMBERS); - Permissions.SetValue(ref value, deafenMembers, ChannelPermission.DEAFEN_MEMBERS); - Permissions.SetValue(ref value, moveMembers, ChannelPermission.MOVE_MEMBERS); - Permissions.SetValue(ref value, useVoiceActivation, ChannelPermission.USE_VAD); - Permissions.SetValue(ref value, managePermissions, ChannelPermission.MANAGE_ROLES); - Permissions.SetValue(ref value, manageWebhooks, ChannelPermission.MANAGE_WEBHOOKS); + Permissions.SetValue(ref value, createInstantInvite, ChannelPermission.CreateInstantInvite); + Permissions.SetValue(ref value, manageChannel, ChannelPermission.ManageChannels); + Permissions.SetValue(ref value, addReactions, ChannelPermission.AddReactions); + Permissions.SetValue(ref value, readMessages, ChannelPermission.ReadMessages); + Permissions.SetValue(ref value, sendMessages, ChannelPermission.SendMessages); + Permissions.SetValue(ref value, sendTTSMessages, ChannelPermission.SendTTSMessages); + Permissions.SetValue(ref value, manageMessages, ChannelPermission.ManageMessages); + Permissions.SetValue(ref value, embedLinks, ChannelPermission.EmbedLinks); + Permissions.SetValue(ref value, attachFiles, ChannelPermission.AttachFiles); + Permissions.SetValue(ref value, readMessageHistory, ChannelPermission.ReadMessageHistory); + Permissions.SetValue(ref value, mentionEveryone, ChannelPermission.MentionEveryone); + Permissions.SetValue(ref value, useExternalEmojis, ChannelPermission.UseExternalEmojis); + Permissions.SetValue(ref value, connect, ChannelPermission.Connect); + Permissions.SetValue(ref value, speak, ChannelPermission.Speak); + Permissions.SetValue(ref value, muteMembers, ChannelPermission.MuteMembers); + Permissions.SetValue(ref value, deafenMembers, ChannelPermission.DeafenMembers); + Permissions.SetValue(ref value, moveMembers, ChannelPermission.MoveMembers); + Permissions.SetValue(ref value, useVoiceActivation, ChannelPermission.UseVAD); + Permissions.SetValue(ref value, managePermissions, ChannelPermission.ManageRoles); + Permissions.SetValue(ref value, manageWebhooks, ChannelPermission.ManageWebhooks); RawValue = value; } diff --git a/src/Discord.Net.Core/Entities/Permissions/GuildPermission.cs b/src/Discord.Net.Core/Entities/Permissions/GuildPermission.cs index a73bd62a4..9d945c40d 100644 --- a/src/Discord.Net.Core/Entities/Permissions/GuildPermission.cs +++ b/src/Discord.Net.Core/Entities/Permissions/GuildPermission.cs @@ -2,33 +2,33 @@ { public enum GuildPermission : ulong { - CREATE_INSTANT_INVITE = 0x00000001, - KICK_MEMBERS = 0x00000002, - BAN_MEMBERS = 0x00000004, - ADMINISTRATOR = 0x00000008, - MANAGE_CHANNELS = 0x00000010, - MANAGE_GUILD = 0x00000020, - ADD_REACTIONS = 0x00000040, - VIEW_AUDIT_LOG = 0x00000080, - READ_MESSAGES = 0x00000400, - SEND_MESSAGES = 0x00000800, - SEND_TTS_MESSAGES = 0x00001000, - MANAGE_MESSAGES = 0x00002000, - EMBED_LINKS = 0x00004000, - ATTACH_FILES = 0x00008000, - READ_MESSAGE_HISTORY = 0x00010000, - MENTION_EVERYONE = 0x00020000, - USE_EXTERNAL_EMOJIS = 0x00040000, - CONNECT = 0x00100000, - SPEAK = 0x00200000, - MUTE_MEMBERS = 0x00400000, - DEAFEN_MEMBERS = 0x00800000, - MOVE_MEMBERS = 0x01000000, - USE_VAD = 0x02000000, - CHANGE_NICKNAME = 0x04000000, - MANAGE_NICKNAMES = 0x08000000, - MANAGE_ROLES = 0x10000000, - MANAGE_WEBHOOKS = 0x20000000, - MANAGE_EMOJIS = 0x40000000 + CreateInstantInvite = 0x00000001, + KickMembers = 0x00000002, + BanMembers = 0x00000004, + Administrator = 0x00000008, + ManageChannels = 0x00000010, + ManageGuild = 0x00000020, + AddReactions = 0x00000040, + ViewAuditLog = 0x00000080, + ReadMessages = 0x00000400, + SendMessages = 0x00000800, + SendTTSMessages = 0x00001000, + ManageMessages = 0x00002000, + EmbedLinks = 0x00004000, + AttachFiles = 0x00008000, + ReadMessageHistory = 0x00010000, + MentionEveryone = 0x00020000, + UseExternalEmojis = 0x00040000, + Connect = 0x00100000, + Speak = 0x00200000, + MuteMembers = 0x00400000, + DeafenMembers = 0x00800000, + MoveMembers = 0x01000000, + UseVAD = 0x02000000, + ChangeNickname = 0x04000000, + ManageNicknames = 0x08000000, + ManageRoles = 0x10000000, + ManageWebhooks = 0x20000000, + ManageEmojis = 0x40000000 } } diff --git a/src/Discord.Net.Core/Entities/Permissions/GuildPermissions.cs b/src/Discord.Net.Core/Entities/Permissions/GuildPermissions.cs index 4e835624d..417d8e349 100644 --- a/src/Discord.Net.Core/Entities/Permissions/GuildPermissions.cs +++ b/src/Discord.Net.Core/Entities/Permissions/GuildPermissions.cs @@ -18,65 +18,65 @@ namespace Discord public ulong RawValue { get; } /// If True, a user may create invites. - public bool CreateInstantInvite => Permissions.GetValue(RawValue, GuildPermission.CREATE_INSTANT_INVITE); + public bool CreateInstantInvite => Permissions.GetValue(RawValue, GuildPermission.CreateInstantInvite); /// If True, a user may ban users from the guild. - public bool BanMembers => Permissions.GetValue(RawValue, GuildPermission.BAN_MEMBERS); + public bool BanMembers => Permissions.GetValue(RawValue, GuildPermission.BanMembers); /// If True, a user may kick users from the guild. - public bool KickMembers => Permissions.GetValue(RawValue, GuildPermission.KICK_MEMBERS); + public bool KickMembers => Permissions.GetValue(RawValue, GuildPermission.KickMembers); /// If True, a user is granted all permissions, and cannot have them revoked via channel permissions. - public bool Administrator => Permissions.GetValue(RawValue, GuildPermission.ADMINISTRATOR); + public bool Administrator => Permissions.GetValue(RawValue, GuildPermission.Administrator); /// If True, a user may create, delete and modify channels. - public bool ManageChannels => Permissions.GetValue(RawValue, GuildPermission.MANAGE_CHANNELS); + public bool ManageChannels => Permissions.GetValue(RawValue, GuildPermission.ManageChannels); /// If True, a user may adjust guild properties. - public bool ManageGuild => Permissions.GetValue(RawValue, GuildPermission.MANAGE_GUILD); + public bool ManageGuild => Permissions.GetValue(RawValue, GuildPermission.ManageGuild); /// If true, a user may add reactions. - public bool AddReactions => Permissions.GetValue(RawValue, GuildPermission.ADD_REACTIONS); + public bool AddReactions => Permissions.GetValue(RawValue, GuildPermission.AddReactions); /// If true, a user may view the audit log. - public bool ViewAuditLog => Permissions.GetValue(RawValue, GuildPermission.VIEW_AUDIT_LOG); + public bool ViewAuditLog => Permissions.GetValue(RawValue, GuildPermission.ViewAuditLog); /// If True, a user may join channels. - public bool ReadMessages => Permissions.GetValue(RawValue, GuildPermission.READ_MESSAGES); + public bool ReadMessages => Permissions.GetValue(RawValue, GuildPermission.ReadMessages); /// If True, a user may send messages. - public bool SendMessages => Permissions.GetValue(RawValue, GuildPermission.SEND_MESSAGES); + public bool SendMessages => Permissions.GetValue(RawValue, GuildPermission.SendMessages); /// If True, a user may send text-to-speech messages. - public bool SendTTSMessages => Permissions.GetValue(RawValue, GuildPermission.SEND_TTS_MESSAGES); + public bool SendTTSMessages => Permissions.GetValue(RawValue, GuildPermission.SendTTSMessages); /// If True, a user may delete messages. - public bool ManageMessages => Permissions.GetValue(RawValue, GuildPermission.MANAGE_MESSAGES); + public bool ManageMessages => Permissions.GetValue(RawValue, GuildPermission.ManageMessages); /// If True, Discord will auto-embed links sent by this user. - public bool EmbedLinks => Permissions.GetValue(RawValue, GuildPermission.EMBED_LINKS); + public bool EmbedLinks => Permissions.GetValue(RawValue, GuildPermission.EmbedLinks); /// If True, a user may send files. - public bool AttachFiles => Permissions.GetValue(RawValue, GuildPermission.ATTACH_FILES); + public bool AttachFiles => Permissions.GetValue(RawValue, GuildPermission.AttachFiles); /// If True, a user may read previous messages. - public bool ReadMessageHistory => Permissions.GetValue(RawValue, GuildPermission.READ_MESSAGE_HISTORY); + public bool ReadMessageHistory => Permissions.GetValue(RawValue, GuildPermission.ReadMessageHistory); /// If True, a user may mention @everyone. - public bool MentionEveryone => Permissions.GetValue(RawValue, GuildPermission.MENTION_EVERYONE); + public bool MentionEveryone => Permissions.GetValue(RawValue, GuildPermission.MentionEveryone); /// If True, a user may use custom emoji from other guilds. - public bool UseExternalEmojis => Permissions.GetValue(RawValue, GuildPermission.USE_EXTERNAL_EMOJIS); + public bool UseExternalEmojis => Permissions.GetValue(RawValue, GuildPermission.UseExternalEmojis); /// If True, a user may connect to a voice channel. - public bool Connect => Permissions.GetValue(RawValue, GuildPermission.CONNECT); + public bool Connect => Permissions.GetValue(RawValue, GuildPermission.Connect); /// If True, a user may speak in a voice channel. - public bool Speak => Permissions.GetValue(RawValue, GuildPermission.SPEAK); + public bool Speak => Permissions.GetValue(RawValue, GuildPermission.Speak); /// If True, a user may mute users. - public bool MuteMembers => Permissions.GetValue(RawValue, GuildPermission.MUTE_MEMBERS); + public bool MuteMembers => Permissions.GetValue(RawValue, GuildPermission.MuteMembers); /// If True, a user may deafen users. - public bool DeafenMembers => Permissions.GetValue(RawValue, GuildPermission.DEAFEN_MEMBERS); + public bool DeafenMembers => Permissions.GetValue(RawValue, GuildPermission.DeafenMembers); /// If True, a user may move other users between voice channels. - public bool MoveMembers => Permissions.GetValue(RawValue, GuildPermission.MOVE_MEMBERS); + public bool MoveMembers => Permissions.GetValue(RawValue, GuildPermission.MoveMembers); /// If True, a user may use voice-activity-detection rather than push-to-talk. - public bool UseVAD => Permissions.GetValue(RawValue, GuildPermission.USE_VAD); + public bool UseVAD => Permissions.GetValue(RawValue, GuildPermission.UseVAD); /// If True, a user may change their own nickname. - public bool ChangeNickname => Permissions.GetValue(RawValue, GuildPermission.CHANGE_NICKNAME); + public bool ChangeNickname => Permissions.GetValue(RawValue, GuildPermission.ChangeNickname); /// If True, a user may change the nickname of other users. - public bool ManageNicknames => Permissions.GetValue(RawValue, GuildPermission.MANAGE_NICKNAMES); + public bool ManageNicknames => Permissions.GetValue(RawValue, GuildPermission.ManageNicknames); /// If True, a user may adjust roles. - public bool ManageRoles => Permissions.GetValue(RawValue, GuildPermission.MANAGE_ROLES); + public bool ManageRoles => Permissions.GetValue(RawValue, GuildPermission.ManageRoles); /// If True, a user may edit the webhooks for this guild. - public bool ManageWebhooks => Permissions.GetValue(RawValue, GuildPermission.MANAGE_WEBHOOKS); + public bool ManageWebhooks => Permissions.GetValue(RawValue, GuildPermission.ManageWebhooks); /// If True, a user may edit the emojis for this guild. - public bool ManageEmojis => Permissions.GetValue(RawValue, GuildPermission.MANAGE_EMOJIS); + public bool ManageEmojis => Permissions.GetValue(RawValue, GuildPermission.ManageEmojis); /// Creates a new GuildPermissions with the provided packed value. public GuildPermissions(ulong rawValue) { RawValue = rawValue; } @@ -92,34 +92,34 @@ namespace Discord { ulong value = initialValue; - Permissions.SetValue(ref value, createInstantInvite, GuildPermission.CREATE_INSTANT_INVITE); - Permissions.SetValue(ref value, banMembers, GuildPermission.BAN_MEMBERS); - Permissions.SetValue(ref value, kickMembers, GuildPermission.KICK_MEMBERS); - Permissions.SetValue(ref value, administrator, GuildPermission.ADMINISTRATOR); - Permissions.SetValue(ref value, manageChannels, GuildPermission.MANAGE_CHANNELS); - Permissions.SetValue(ref value, manageGuild, GuildPermission.MANAGE_GUILD); - Permissions.SetValue(ref value, addReactions, GuildPermission.ADD_REACTIONS); - Permissions.SetValue(ref value, viewAuditLog, GuildPermission.VIEW_AUDIT_LOG); - Permissions.SetValue(ref value, readMessages, GuildPermission.READ_MESSAGES); - Permissions.SetValue(ref value, sendMessages, GuildPermission.SEND_MESSAGES); - Permissions.SetValue(ref value, sendTTSMessages, GuildPermission.SEND_TTS_MESSAGES); - Permissions.SetValue(ref value, manageMessages, GuildPermission.MANAGE_MESSAGES); - Permissions.SetValue(ref value, embedLinks, GuildPermission.EMBED_LINKS); - Permissions.SetValue(ref value, attachFiles, GuildPermission.ATTACH_FILES); - Permissions.SetValue(ref value, readMessageHistory, GuildPermission.READ_MESSAGE_HISTORY); - Permissions.SetValue(ref value, mentionEveryone, GuildPermission.MENTION_EVERYONE); - Permissions.SetValue(ref value, useExternalEmojis, GuildPermission.USE_EXTERNAL_EMOJIS); - Permissions.SetValue(ref value, connect, GuildPermission.CONNECT); - Permissions.SetValue(ref value, speak, GuildPermission.SPEAK); - Permissions.SetValue(ref value, muteMembers, GuildPermission.MUTE_MEMBERS); - Permissions.SetValue(ref value, deafenMembers, GuildPermission.DEAFEN_MEMBERS); - Permissions.SetValue(ref value, moveMembers, GuildPermission.MOVE_MEMBERS); - Permissions.SetValue(ref value, useVoiceActivation, GuildPermission.USE_VAD); - Permissions.SetValue(ref value, changeNickname, GuildPermission.CHANGE_NICKNAME); - Permissions.SetValue(ref value, manageNicknames, GuildPermission.MANAGE_NICKNAMES); - Permissions.SetValue(ref value, manageRoles, GuildPermission.MANAGE_ROLES); - Permissions.SetValue(ref value, manageWebhooks, GuildPermission.MANAGE_WEBHOOKS); - Permissions.SetValue(ref value, manageEmojis, GuildPermission.MANAGE_EMOJIS); + Permissions.SetValue(ref value, createInstantInvite, GuildPermission.CreateInstantInvite); + Permissions.SetValue(ref value, banMembers, GuildPermission.BanMembers); + Permissions.SetValue(ref value, kickMembers, GuildPermission.KickMembers); + Permissions.SetValue(ref value, administrator, GuildPermission.Administrator); + Permissions.SetValue(ref value, manageChannels, GuildPermission.ManageChannels); + Permissions.SetValue(ref value, manageGuild, GuildPermission.ManageGuild); + Permissions.SetValue(ref value, addReactions, GuildPermission.AddReactions); + Permissions.SetValue(ref value, viewAuditLog, GuildPermission.ViewAuditLog); + Permissions.SetValue(ref value, readMessages, GuildPermission.ReadMessages); + Permissions.SetValue(ref value, sendMessages, GuildPermission.SendMessages); + Permissions.SetValue(ref value, sendTTSMessages, GuildPermission.SendTTSMessages); + Permissions.SetValue(ref value, manageMessages, GuildPermission.ManageMessages); + Permissions.SetValue(ref value, embedLinks, GuildPermission.EmbedLinks); + Permissions.SetValue(ref value, attachFiles, GuildPermission.AttachFiles); + Permissions.SetValue(ref value, readMessageHistory, GuildPermission.ReadMessageHistory); + Permissions.SetValue(ref value, mentionEveryone, GuildPermission.MentionEveryone); + Permissions.SetValue(ref value, useExternalEmojis, GuildPermission.UseExternalEmojis); + Permissions.SetValue(ref value, connect, GuildPermission.Connect); + Permissions.SetValue(ref value, speak, GuildPermission.Speak); + Permissions.SetValue(ref value, muteMembers, GuildPermission.MuteMembers); + Permissions.SetValue(ref value, deafenMembers, GuildPermission.DeafenMembers); + Permissions.SetValue(ref value, moveMembers, GuildPermission.MoveMembers); + Permissions.SetValue(ref value, useVoiceActivation, GuildPermission.UseVAD); + Permissions.SetValue(ref value, changeNickname, GuildPermission.ChangeNickname); + Permissions.SetValue(ref value, manageNicknames, GuildPermission.ManageNicknames); + Permissions.SetValue(ref value, manageRoles, GuildPermission.ManageRoles); + Permissions.SetValue(ref value, manageWebhooks, GuildPermission.ManageWebhooks); + Permissions.SetValue(ref value, manageEmojis, GuildPermission.ManageEmojis); RawValue = value; } diff --git a/src/Discord.Net.Core/Entities/Permissions/OverwritePermissions.cs b/src/Discord.Net.Core/Entities/Permissions/OverwritePermissions.cs index f648951d9..992c301da 100644 --- a/src/Discord.Net.Core/Entities/Permissions/OverwritePermissions.cs +++ b/src/Discord.Net.Core/Entities/Permissions/OverwritePermissions.cs @@ -22,47 +22,47 @@ namespace Discord public ulong DenyValue { get; } /// If Allowed, a user may create invites. - public PermValue CreateInstantInvite => Permissions.GetValue(AllowValue, DenyValue, ChannelPermission.CREATE_INSTANT_INVITE); + public PermValue CreateInstantInvite => Permissions.GetValue(AllowValue, DenyValue, ChannelPermission.CreateInstantInvite); /// If Allowed, a user may create, delete and modify this channel. - public PermValue ManageChannel => Permissions.GetValue(AllowValue, DenyValue, ChannelPermission.MANAGE_CHANNELS); + public PermValue ManageChannel => Permissions.GetValue(AllowValue, DenyValue, ChannelPermission.ManageChannels); /// If Allowed, a user may add reactions. - public PermValue AddReactions => Permissions.GetValue(AllowValue, DenyValue, ChannelPermission.ADD_REACTIONS); + public PermValue AddReactions => Permissions.GetValue(AllowValue, DenyValue, ChannelPermission.AddReactions); /// If Allowed, a user may join channels. - public PermValue ReadMessages => Permissions.GetValue(AllowValue, DenyValue, ChannelPermission.READ_MESSAGES); + public PermValue ReadMessages => Permissions.GetValue(AllowValue, DenyValue, ChannelPermission.ReadMessages); /// If Allowed, a user may send messages. - public PermValue SendMessages => Permissions.GetValue(AllowValue, DenyValue, ChannelPermission.SEND_MESSAGES); + public PermValue SendMessages => Permissions.GetValue(AllowValue, DenyValue, ChannelPermission.SendMessages); /// If Allowed, a user may send text-to-speech messages. - public PermValue SendTTSMessages => Permissions.GetValue(AllowValue, DenyValue, ChannelPermission.SEND_TTS_MESSAGES); + public PermValue SendTTSMessages => Permissions.GetValue(AllowValue, DenyValue, ChannelPermission.SendTTSMessages); /// If Allowed, a user may delete messages. - public PermValue ManageMessages => Permissions.GetValue(AllowValue, DenyValue, ChannelPermission.MANAGE_MESSAGES); + public PermValue ManageMessages => Permissions.GetValue(AllowValue, DenyValue, ChannelPermission.ManageMessages); /// If Allowed, Discord will auto-embed links sent by this user. - public PermValue EmbedLinks => Permissions.GetValue(AllowValue, DenyValue, ChannelPermission.EMBED_LINKS); + public PermValue EmbedLinks => Permissions.GetValue(AllowValue, DenyValue, ChannelPermission.EmbedLinks); /// If Allowed, a user may send files. - public PermValue AttachFiles => Permissions.GetValue(AllowValue, DenyValue, ChannelPermission.ATTACH_FILES); + public PermValue AttachFiles => Permissions.GetValue(AllowValue, DenyValue, ChannelPermission.AttachFiles); /// If Allowed, a user may read previous messages. - public PermValue ReadMessageHistory => Permissions.GetValue(AllowValue, DenyValue, ChannelPermission.READ_MESSAGE_HISTORY); + public PermValue ReadMessageHistory => Permissions.GetValue(AllowValue, DenyValue, ChannelPermission.ReadMessageHistory); /// If Allowed, a user may mention @everyone. - public PermValue MentionEveryone => Permissions.GetValue(AllowValue, DenyValue, ChannelPermission.MENTION_EVERYONE); + public PermValue MentionEveryone => Permissions.GetValue(AllowValue, DenyValue, ChannelPermission.MentionEveryone); /// If Allowed, a user may use custom emoji from other guilds. - public PermValue UseExternalEmojis => Permissions.GetValue(AllowValue, DenyValue, ChannelPermission.USE_EXTERNAL_EMOJIS); + public PermValue UseExternalEmojis => Permissions.GetValue(AllowValue, DenyValue, ChannelPermission.UseExternalEmojis); /// If Allowed, a user may connect to a voice channel. - public PermValue Connect => Permissions.GetValue(AllowValue, DenyValue, ChannelPermission.CONNECT); + public PermValue Connect => Permissions.GetValue(AllowValue, DenyValue, ChannelPermission.Connect); /// If Allowed, a user may speak in a voice channel. - public PermValue Speak => Permissions.GetValue(AllowValue, DenyValue, ChannelPermission.SPEAK); + public PermValue Speak => Permissions.GetValue(AllowValue, DenyValue, ChannelPermission.Speak); /// If Allowed, a user may mute users. - public PermValue MuteMembers => Permissions.GetValue(AllowValue, DenyValue, ChannelPermission.MUTE_MEMBERS); + public PermValue MuteMembers => Permissions.GetValue(AllowValue, DenyValue, ChannelPermission.MuteMembers); /// If Allowed, a user may deafen users. - public PermValue DeafenMembers => Permissions.GetValue(AllowValue, DenyValue, ChannelPermission.DEAFEN_MEMBERS); + public PermValue DeafenMembers => Permissions.GetValue(AllowValue, DenyValue, ChannelPermission.DeafenMembers); /// If Allowed, a user may move other users between voice channels. - public PermValue MoveMembers => Permissions.GetValue(AllowValue, DenyValue, ChannelPermission.MOVE_MEMBERS); + public PermValue MoveMembers => Permissions.GetValue(AllowValue, DenyValue, ChannelPermission.MoveMembers); /// If Allowed, a user may use voice-activity-detection rather than push-to-talk. - public PermValue UseVAD => Permissions.GetValue(AllowValue, DenyValue, ChannelPermission.USE_VAD); + public PermValue UseVAD => Permissions.GetValue(AllowValue, DenyValue, ChannelPermission.UseVAD); /// If Allowed, a user may adjust permissions. This also implictly grants all other permissions. - public PermValue ManagePermissions => Permissions.GetValue(AllowValue, DenyValue, ChannelPermission.MANAGE_ROLES); + public PermValue ManagePermissions => Permissions.GetValue(AllowValue, DenyValue, ChannelPermission.ManageRoles); /// If True, a user may edit the webhooks for this channel. - public PermValue ManageWebhooks => Permissions.GetValue(AllowValue, DenyValue, ChannelPermission.MANAGE_WEBHOOKS); + public PermValue ManageWebhooks => Permissions.GetValue(AllowValue, DenyValue, ChannelPermission.ManageWebhooks); /// Creates a new OverwritePermissions with the provided allow and deny packed values. public OverwritePermissions(ulong allowValue, ulong denyValue) @@ -79,26 +79,26 @@ namespace Discord PermValue? deafenMembers = null, PermValue? moveMembers = null, PermValue? useVoiceActivation = null, PermValue? managePermissions = null, PermValue? manageWebhooks = null) { - Permissions.SetValue(ref allowValue, ref denyValue, createInstantInvite, ChannelPermission.CREATE_INSTANT_INVITE); - Permissions.SetValue(ref allowValue, ref denyValue, manageChannel, ChannelPermission.MANAGE_CHANNELS); - Permissions.SetValue(ref allowValue, ref denyValue, addReactions, ChannelPermission.ADD_REACTIONS); - Permissions.SetValue(ref allowValue, ref denyValue, readMessages, ChannelPermission.READ_MESSAGES); - Permissions.SetValue(ref allowValue, ref denyValue, sendMessages, ChannelPermission.SEND_MESSAGES); - Permissions.SetValue(ref allowValue, ref denyValue, sendTTSMessages, ChannelPermission.SEND_TTS_MESSAGES); - Permissions.SetValue(ref allowValue, ref denyValue, manageMessages, ChannelPermission.MANAGE_MESSAGES); - Permissions.SetValue(ref allowValue, ref denyValue, embedLinks, ChannelPermission.EMBED_LINKS); - Permissions.SetValue(ref allowValue, ref denyValue, attachFiles, ChannelPermission.ATTACH_FILES); - Permissions.SetValue(ref allowValue, ref denyValue, readMessageHistory, ChannelPermission.READ_MESSAGE_HISTORY); - Permissions.SetValue(ref allowValue, ref denyValue, mentionEveryone, ChannelPermission.MENTION_EVERYONE); - Permissions.SetValue(ref allowValue, ref denyValue, useExternalEmojis, ChannelPermission.USE_EXTERNAL_EMOJIS); - Permissions.SetValue(ref allowValue, ref denyValue, connect, ChannelPermission.CONNECT); - Permissions.SetValue(ref allowValue, ref denyValue, speak, ChannelPermission.SPEAK); - Permissions.SetValue(ref allowValue, ref denyValue, muteMembers, ChannelPermission.MUTE_MEMBERS); - Permissions.SetValue(ref allowValue, ref denyValue, deafenMembers, ChannelPermission.DEAFEN_MEMBERS); - Permissions.SetValue(ref allowValue, ref denyValue, moveMembers, ChannelPermission.MOVE_MEMBERS); - Permissions.SetValue(ref allowValue, ref denyValue, useVoiceActivation, ChannelPermission.USE_VAD); - Permissions.SetValue(ref allowValue, ref denyValue, managePermissions, ChannelPermission.MANAGE_ROLES); - Permissions.SetValue(ref allowValue, ref denyValue, manageWebhooks, ChannelPermission.MANAGE_WEBHOOKS); + Permissions.SetValue(ref allowValue, ref denyValue, createInstantInvite, ChannelPermission.CreateInstantInvite); + Permissions.SetValue(ref allowValue, ref denyValue, manageChannel, ChannelPermission.ManageChannels); + Permissions.SetValue(ref allowValue, ref denyValue, addReactions, ChannelPermission.AddReactions); + Permissions.SetValue(ref allowValue, ref denyValue, readMessages, ChannelPermission.ReadMessages); + Permissions.SetValue(ref allowValue, ref denyValue, sendMessages, ChannelPermission.SendMessages); + Permissions.SetValue(ref allowValue, ref denyValue, sendTTSMessages, ChannelPermission.SendTTSMessages); + Permissions.SetValue(ref allowValue, ref denyValue, manageMessages, ChannelPermission.ManageMessages); + Permissions.SetValue(ref allowValue, ref denyValue, embedLinks, ChannelPermission.EmbedLinks); + Permissions.SetValue(ref allowValue, ref denyValue, attachFiles, ChannelPermission.AttachFiles); + Permissions.SetValue(ref allowValue, ref denyValue, readMessageHistory, ChannelPermission.ReadMessageHistory); + Permissions.SetValue(ref allowValue, ref denyValue, mentionEveryone, ChannelPermission.MentionEveryone); + Permissions.SetValue(ref allowValue, ref denyValue, useExternalEmojis, ChannelPermission.UseExternalEmojis); + Permissions.SetValue(ref allowValue, ref denyValue, connect, ChannelPermission.Connect); + Permissions.SetValue(ref allowValue, ref denyValue, speak, ChannelPermission.Speak); + Permissions.SetValue(ref allowValue, ref denyValue, muteMembers, ChannelPermission.MuteMembers); + Permissions.SetValue(ref allowValue, ref denyValue, deafenMembers, ChannelPermission.DeafenMembers); + Permissions.SetValue(ref allowValue, ref denyValue, moveMembers, ChannelPermission.MoveMembers); + Permissions.SetValue(ref allowValue, ref denyValue, useVoiceActivation, ChannelPermission.UseVAD); + Permissions.SetValue(ref allowValue, ref denyValue, managePermissions, ChannelPermission.ManageRoles); + Permissions.SetValue(ref allowValue, ref denyValue, manageWebhooks, ChannelPermission.ManageWebhooks); AllowValue = allowValue; DenyValue = denyValue; diff --git a/src/Discord.Net.Core/Utils/Permissions.cs b/src/Discord.Net.Core/Utils/Permissions.cs index 05a0c89b1..a7de90623 100644 --- a/src/Discord.Net.Core/Utils/Permissions.cs +++ b/src/Discord.Net.Core/Utils/Permissions.cs @@ -100,7 +100,7 @@ namespace Discord { foreach (var roleId in user.RoleIds) resolvedPermissions |= guild.GetRole(roleId)?.Permissions.RawValue ?? 0; - if (GetValue(resolvedPermissions, GuildPermission.ADMINISTRATOR)) + if (GetValue(resolvedPermissions, GuildPermission.Administrator)) resolvedPermissions = GuildPermissions.All.RawValue; //Administrators always have all permissions } return resolvedPermissions; @@ -115,7 +115,7 @@ namespace Discord ulong resolvedPermissions = 0; ulong mask = ChannelPermissions.All(channel).RawValue; - if (GetValue(guildPermissions, GuildPermission.ADMINISTRATOR)) //Includes owner + if (GetValue(guildPermissions, GuildPermission.Administrator)) //Includes owner resolvedPermissions = mask; //Owners and administrators always have all permissions else { @@ -152,18 +152,18 @@ namespace Discord if (channel is ITextChannel textChannel) { - if (!GetValue(resolvedPermissions, ChannelPermission.READ_MESSAGES)) + if (!GetValue(resolvedPermissions, ChannelPermission.ReadMessages)) { //No read permission on a text channel removes all other permissions resolvedPermissions = 0; } - else if (!GetValue(resolvedPermissions, ChannelPermission.SEND_MESSAGES)) + else if (!GetValue(resolvedPermissions, ChannelPermission.SendMessages)) { //No send permissions on a text channel removes all send-related permissions - resolvedPermissions &= ~(1UL << (int)ChannelPermission.SEND_TTS_MESSAGES); - resolvedPermissions &= ~(1UL << (int)ChannelPermission.MENTION_EVERYONE); - resolvedPermissions &= ~(1UL << (int)ChannelPermission.EMBED_LINKS); - resolvedPermissions &= ~(1UL << (int)ChannelPermission.ATTACH_FILES); + resolvedPermissions &= ~(1UL << (int)ChannelPermission.SendTTSMessages); + resolvedPermissions &= ~(1UL << (int)ChannelPermission.MentionEveryone); + resolvedPermissions &= ~(1UL << (int)ChannelPermission.EmbedLinks); + resolvedPermissions &= ~(1UL << (int)ChannelPermission.AttachFiles); } } resolvedPermissions &= mask; //Ensure we didnt get any permissions this channel doesnt support (from guildPerms, for example) diff --git a/src/Discord.Net.WebSocket/Entities/Channels/SocketTextChannel.cs b/src/Discord.Net.WebSocket/Entities/Channels/SocketTextChannel.cs index f20e9d69d..c22523e00 100644 --- a/src/Discord.Net.WebSocket/Entities/Channels/SocketTextChannel.cs +++ b/src/Discord.Net.WebSocket/Entities/Channels/SocketTextChannel.cs @@ -22,7 +22,7 @@ namespace Discord.WebSocket public override IReadOnlyCollection Users => Guild.Users.Where(x => Permissions.GetValue( Permissions.ResolveChannel(Guild, x, this, Permissions.ResolveGuild(Guild, x)), - ChannelPermission.READ_MESSAGES)).ToImmutableArray(); + ChannelPermission.ReadMessages)).ToImmutableArray(); internal SocketTextChannel(DiscordSocketClient discord, ulong id, SocketGuild guild) : base(discord, id, guild) @@ -103,7 +103,7 @@ namespace Discord.WebSocket { var guildPerms = Permissions.ResolveGuild(Guild, user); var channelPerms = Permissions.ResolveChannel(Guild, user, this, guildPerms); - if (Permissions.GetValue(channelPerms, ChannelPermission.READ_MESSAGES)) + if (Permissions.GetValue(channelPerms, ChannelPermission.ReadMessages)) return user; } return null;