Fix GuildPermission Modify, Add Missing Permission to AllowAll (#866)
* Use named parameters in GuildPermission constructor, fix ordering of parmeters in Modify constructor call * fix missing constructor parameter * Added missing Webhook permission for the all text permissions value * Resolves #869 Add UseExternalEmojis permission to GuildPermissions.All
This commit is contained in:
committed by
Christopher F
parent
e30fd29085
commit
dec7cb2b5b
@@ -10,7 +10,7 @@ namespace Discord
|
|||||||
/// <summary> Gets a blank ChannelPermissions that grants no permissions. </summary>
|
/// <summary> Gets a blank ChannelPermissions that grants no permissions. </summary>
|
||||||
public static readonly ChannelPermissions None = new ChannelPermissions();
|
public static readonly ChannelPermissions None = new ChannelPermissions();
|
||||||
/// <summary> Gets a ChannelPermissions that grants all permissions for text channels. </summary>
|
/// <summary> Gets a ChannelPermissions that grants all permissions for text channels. </summary>
|
||||||
public static readonly ChannelPermissions Text = new ChannelPermissions(0b00100_0000000_1111111110001_010001);
|
public static readonly ChannelPermissions Text = new ChannelPermissions(0b01100_0000000_1111111110001_010001);
|
||||||
/// <summary> Gets a ChannelPermissions that grants all permissions for voice channels. </summary>
|
/// <summary> Gets a ChannelPermissions that grants all permissions for voice channels. </summary>
|
||||||
public static readonly ChannelPermissions Voice = new ChannelPermissions(0b00100_1111110_0000000000000_010001);
|
public static readonly ChannelPermissions Voice = new ChannelPermissions(0b00100_1111110_0000000000000_010001);
|
||||||
/// <summary> Gets a ChannelPermissions that grants all permissions for direct message channels. </summary>
|
/// <summary> Gets a ChannelPermissions that grants all permissions for direct message channels. </summary>
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ namespace Discord
|
|||||||
/// <summary> Gets a GuildPermissions that grants all guild permissions for webhook users. </summary>
|
/// <summary> Gets a GuildPermissions that grants all guild permissions for webhook users. </summary>
|
||||||
public static readonly GuildPermissions Webhook = new GuildPermissions(0b00000_0000000_0001101100000_000000);
|
public static readonly GuildPermissions Webhook = new GuildPermissions(0b00000_0000000_0001101100000_000000);
|
||||||
/// <summary> Gets a GuildPermissions that grants all guild permissions. </summary>
|
/// <summary> Gets a GuildPermissions that grants all guild permissions. </summary>
|
||||||
public static readonly GuildPermissions All = new GuildPermissions(0b11111_1111110_0111111110011_111111);
|
public static readonly GuildPermissions All = new GuildPermissions(0b11111_1111110_11111111110011_111111);
|
||||||
|
|
||||||
/// <summary> Gets a packed value representing all the permissions in this GuildPermissions. </summary>
|
/// <summary> Gets a packed value representing all the permissions in this GuildPermissions. </summary>
|
||||||
public ulong RawValue { get; }
|
public ulong RawValue { get; }
|
||||||
@@ -132,9 +132,14 @@ namespace Discord
|
|||||||
bool useExternalEmojis = false, bool connect = false, bool speak = false, bool muteMembers = false, bool deafenMembers = false,
|
bool useExternalEmojis = false, bool connect = false, bool speak = false, bool muteMembers = false, bool deafenMembers = false,
|
||||||
bool moveMembers = false, bool useVoiceActivation = false, bool? changeNickname = false, bool? manageNicknames = false,
|
bool moveMembers = false, bool useVoiceActivation = false, bool? changeNickname = false, bool? manageNicknames = false,
|
||||||
bool manageRoles = false, bool manageWebhooks = false, bool manageEmojis = false)
|
bool manageRoles = false, bool manageWebhooks = false, bool manageEmojis = false)
|
||||||
: this(0, createInstantInvite, manageRoles, kickMembers, banMembers, manageChannels, manageGuild, addReactions, viewAuditLog,
|
: this(0, createInstantInvite: createInstantInvite, manageRoles: manageRoles, kickMembers: kickMembers, banMembers: banMembers,
|
||||||
readMessages, sendMessages, sendTTSMessages, manageMessages, embedLinks, attachFiles, mentionEveryone, useExternalEmojis, connect,
|
administrator: administrator, manageChannels: manageChannels, manageGuild: manageGuild, addReactions: addReactions,
|
||||||
manageWebhooks, manageEmojis) { }
|
viewAuditLog: viewAuditLog, readMessages: readMessages, sendMessages: sendMessages, sendTTSMessages: sendTTSMessages,
|
||||||
|
manageMessages: manageMessages, embedLinks: embedLinks, attachFiles: attachFiles, readMessageHistory: readMessageHistory,
|
||||||
|
mentionEveryone: mentionEveryone, useExternalEmojis: useExternalEmojis, connect: connect, speak: speak, muteMembers: muteMembers,
|
||||||
|
deafenMembers: deafenMembers, moveMembers: moveMembers, useVoiceActivation: useVoiceActivation, changeNickname: changeNickname,
|
||||||
|
manageNicknames: manageNicknames, manageWebhooks: manageWebhooks, manageEmojis: manageEmojis)
|
||||||
|
{ }
|
||||||
|
|
||||||
/// <summary> Creates a new GuildPermissions from this one, changing the provided non-null permissions. </summary>
|
/// <summary> Creates a new GuildPermissions from this one, changing the provided non-null permissions. </summary>
|
||||||
public GuildPermissions Modify(bool? createInstantInvite = null, bool? kickMembers = null,
|
public GuildPermissions Modify(bool? createInstantInvite = null, bool? kickMembers = null,
|
||||||
@@ -145,10 +150,10 @@ namespace Discord
|
|||||||
bool? useExternalEmojis = null, bool? connect = null, bool? speak = null, bool? muteMembers = null, bool? deafenMembers = null,
|
bool? useExternalEmojis = null, bool? connect = null, bool? speak = null, bool? muteMembers = null, bool? deafenMembers = null,
|
||||||
bool? moveMembers = null, bool? useVoiceActivation = null, bool? changeNickname = null, bool? manageNicknames = null,
|
bool? moveMembers = null, bool? useVoiceActivation = null, bool? changeNickname = null, bool? manageNicknames = null,
|
||||||
bool? manageRoles = null, bool? manageWebhooks = null, bool? manageEmojis = null)
|
bool? manageRoles = null, bool? manageWebhooks = null, bool? manageEmojis = null)
|
||||||
=> new GuildPermissions(RawValue, createInstantInvite, manageRoles, kickMembers, banMembers, manageChannels, manageGuild, addReactions, viewAuditLog,
|
=> new GuildPermissions(RawValue, createInstantInvite, kickMembers, banMembers, administrator, manageChannels, manageGuild, addReactions,
|
||||||
readMessages, sendMessages, sendTTSMessages, manageMessages, embedLinks, attachFiles, mentionEveryone, useExternalEmojis, connect,
|
viewAuditLog, readMessages, sendMessages, sendTTSMessages, manageMessages, embedLinks, attachFiles,
|
||||||
speak, muteMembers, deafenMembers, moveMembers, useVoiceActivation, changeNickname, manageNicknames, manageRoles,
|
readMessageHistory, mentionEveryone, useExternalEmojis, connect, speak, muteMembers, deafenMembers, moveMembers,
|
||||||
manageWebhooks, manageEmojis);
|
useVoiceActivation, changeNickname, manageNicknames, manageRoles, manageWebhooks, manageEmojis);
|
||||||
|
|
||||||
public bool Has(GuildPermission permission) => Permissions.GetValue(RawValue, permission);
|
public bool Has(GuildPermission permission) => Permissions.GetValue(RawValue, permission);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user