From fc4ea379bcc30fb16a5e5ae2f83901357d9df1cd Mon Sep 17 00:00:00 2001 From: Marvin Witt Date: Tue, 9 Nov 2021 21:04:43 +0100 Subject: [PATCH 01/21] Document `communication_disabled_until` on guild member object --- docs/resources/Guild.md | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/docs/resources/Guild.md b/docs/resources/Guild.md index f03a97ba94..ed702ea9b7 100644 --- a/docs/resources/Guild.md +++ b/docs/resources/Guild.md @@ -278,18 +278,19 @@ A partial [guild](#DOCS_RESOURCES_GUILD/guild-object) object. Represents an Offl ###### Guild Member Structure -| Field | Type | Description | -| -------------- | ----------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------- | -| user? | [user](#DOCS_RESOURCES_USER/user-object) object | the user this guild member represents | -| nick? | ?string | this users guild nickname | -| avatar? | ?string | the member's [guild avatar hash](#DOCS_REFERENCE/image-formatting) | -| roles | array of snowflakes | array of [role](#DOCS_TOPICS_PERMISSIONS/role-object) object ids | -| joined_at | ISO8601 timestamp | when the user joined the guild | -| premium_since? | ?ISO8601 timestamp | when the user started [boosting](https://support.discord.com/hc/en-us/articles/360028038352-Server-Boosting-) the guild | -| deaf | boolean | whether the user is deafened in voice channels | -| mute | boolean | whether the user is muted in voice channels | -| pending? | boolean | whether the user has not yet passed the guild's [Membership Screening](#DOCS_RESOURCES_GUILD/membership-screening-object) requirements | -| permissions? | string | total permissions of the member in the channel, including overwrites, returned when in the interaction object | +| Field | Type | Description | +| ----------------------------- | ----------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------- | +| user? | [user](#DOCS_RESOURCES_USER/user-object) object | the user this guild member represents | +| nick? | ?string | this users guild nickname | +| avatar? | ?string | the member's [guild avatar hash](#DOCS_REFERENCE/image-formatting) | +| roles | array of snowflakes | array of [role](#DOCS_TOPICS_PERMISSIONS/role-object) object ids | +| joined_at | ISO8601 timestamp | when the user joined the guild | +| premium_since? | ?ISO8601 timestamp | when the user started [boosting](https://support.discord.com/hc/en-us/articles/360028038352-Server-Boosting-) the guild | +| deaf | boolean | whether the user is deafened in voice channels | +| mute | boolean | whether the user is muted in voice channels | +| pending? | boolean | whether the user has not yet passed the guild's [Membership Screening](#DOCS_RESOURCES_GUILD/membership-screening-object) requirements | +| permissions? | string | total permissions of the member in the channel, including overwrites, returned when in the interaction object | +| communication_disabled_until? | ?ISO8601 timestamp | till when the user is time-outed. This will leave the user completely unable to interact with the server till this time has been reached | > info > The field `user` won't be included in the member object attached to `MESSAGE_CREATE` and `MESSAGE_UPDATE` gateway events. From bc423c8dbf0567be33429d6a3495bf905c83ab4d Mon Sep 17 00:00:00 2001 From: Marvin Witt Date: Tue, 9 Nov 2021 21:19:57 +0100 Subject: [PATCH 02/21] Fix wording Co-authored-by: Jake Ward --- docs/resources/Guild.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/resources/Guild.md b/docs/resources/Guild.md index ed702ea9b7..2e66426c72 100644 --- a/docs/resources/Guild.md +++ b/docs/resources/Guild.md @@ -290,7 +290,7 @@ A partial [guild](#DOCS_RESOURCES_GUILD/guild-object) object. Represents an Offl | mute | boolean | whether the user is muted in voice channels | | pending? | boolean | whether the user has not yet passed the guild's [Membership Screening](#DOCS_RESOURCES_GUILD/membership-screening-object) requirements | | permissions? | string | total permissions of the member in the channel, including overwrites, returned when in the interaction object | -| communication_disabled_until? | ?ISO8601 timestamp | till when the user is time-outed. This will leave the user completely unable to interact with the server till this time has been reached | +| communication_disabled_until? | ?ISO8601 timestamp | timestamp of when the time out will be removed. until then, they cannot interact with the server | > info > The field `user` won't be included in the member object attached to `MESSAGE_CREATE` and `MESSAGE_UPDATE` gateway events. From 5bea5adb3a5709f14da77879e226d3a7c6337810 Mon Sep 17 00:00:00 2001 From: Marvin Witt Date: Tue, 9 Nov 2021 22:23:34 +0100 Subject: [PATCH 03/21] Fix punctuation Co-authored-by: Vitor --- docs/resources/Guild.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/resources/Guild.md b/docs/resources/Guild.md index 2e66426c72..870a69abdd 100644 --- a/docs/resources/Guild.md +++ b/docs/resources/Guild.md @@ -290,7 +290,7 @@ A partial [guild](#DOCS_RESOURCES_GUILD/guild-object) object. Represents an Offl | mute | boolean | whether the user is muted in voice channels | | pending? | boolean | whether the user has not yet passed the guild's [Membership Screening](#DOCS_RESOURCES_GUILD/membership-screening-object) requirements | | permissions? | string | total permissions of the member in the channel, including overwrites, returned when in the interaction object | -| communication_disabled_until? | ?ISO8601 timestamp | timestamp of when the time out will be removed. until then, they cannot interact with the server | +| communication_disabled_until? | ?ISO8601 timestamp | timestamp of when the time out will be removed; until then, they cannot interact with the server | > info > The field `user` won't be included in the member object attached to `MESSAGE_CREATE` and `MESSAGE_UPDATE` gateway events. From eba451ff36a1aa05a0c58f928a947bfd52263428 Mon Sep 17 00:00:00 2001 From: Marvin Witt Date: Thu, 11 Nov 2021 16:48:07 +0100 Subject: [PATCH 04/21] Update docs/resources/Guild.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Josey Wörmann --- docs/resources/Guild.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/resources/Guild.md b/docs/resources/Guild.md index 870a69abdd..53d59ff1f6 100644 --- a/docs/resources/Guild.md +++ b/docs/resources/Guild.md @@ -290,7 +290,7 @@ A partial [guild](#DOCS_RESOURCES_GUILD/guild-object) object. Represents an Offl | mute | boolean | whether the user is muted in voice channels | | pending? | boolean | whether the user has not yet passed the guild's [Membership Screening](#DOCS_RESOURCES_GUILD/membership-screening-object) requirements | | permissions? | string | total permissions of the member in the channel, including overwrites, returned when in the interaction object | -| communication_disabled_until? | ?ISO8601 timestamp | timestamp of when the time out will be removed; until then, they cannot interact with the server | +| communication_disabled_until? | ?ISO8601 timestamp | timestamp of when the time out will be removed; until then, they cannot interact with the guild | > info > The field `user` won't be included in the member object attached to `MESSAGE_CREATE` and `MESSAGE_UPDATE` gateway events. From dd7535e1b6dd84b04cb9b10ca5fc091783e96818 Mon Sep 17 00:00:00 2001 From: Lala Sabathil Date: Fri, 12 Nov 2021 01:00:30 +0100 Subject: [PATCH 05/21] Add modify payload for timeouts The needed permission is `KICK_MEMBERS` --- docs/resources/Guild.md | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/docs/resources/Guild.md b/docs/resources/Guild.md index 53d59ff1f6..5c7deb54d0 100644 --- a/docs/resources/Guild.md +++ b/docs/resources/Guild.md @@ -278,19 +278,19 @@ A partial [guild](#DOCS_RESOURCES_GUILD/guild-object) object. Represents an Offl ###### Guild Member Structure -| Field | Type | Description | -| ----------------------------- | ----------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------- | -| user? | [user](#DOCS_RESOURCES_USER/user-object) object | the user this guild member represents | -| nick? | ?string | this users guild nickname | -| avatar? | ?string | the member's [guild avatar hash](#DOCS_REFERENCE/image-formatting) | -| roles | array of snowflakes | array of [role](#DOCS_TOPICS_PERMISSIONS/role-object) object ids | -| joined_at | ISO8601 timestamp | when the user joined the guild | -| premium_since? | ?ISO8601 timestamp | when the user started [boosting](https://support.discord.com/hc/en-us/articles/360028038352-Server-Boosting-) the guild | -| deaf | boolean | whether the user is deafened in voice channels | -| mute | boolean | whether the user is muted in voice channels | -| pending? | boolean | whether the user has not yet passed the guild's [Membership Screening](#DOCS_RESOURCES_GUILD/membership-screening-object) requirements | -| permissions? | string | total permissions of the member in the channel, including overwrites, returned when in the interaction object | -| communication_disabled_until? | ?ISO8601 timestamp | timestamp of when the time out will be removed; until then, they cannot interact with the guild | +| Field | Type | Description | +| ----------------------------- | ----------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------- | +| user? | [user](#DOCS_RESOURCES_USER/user-object) object | the user this guild member represents | +| nick? | ?string | this users guild nickname | +| avatar? | ?string | the member's [guild avatar hash](#DOCS_REFERENCE/image-formatting) | +| roles | array of snowflakes | array of [role](#DOCS_TOPICS_PERMISSIONS/role-object) object ids | +| joined_at | ISO8601 timestamp | when the user joined the guild | +| premium_since? | ?ISO8601 timestamp | when the user started [boosting](https://support.discord.com/hc/en-us/articles/360028038352-Server-Boosting-) the guild | +| deaf | boolean | whether the user is deafened in voice channels | +| mute | boolean | whether the user is muted in voice channels | +| pending? | boolean | whether the user has not yet passed the guild's [Membership Screening](#DOCS_RESOURCES_GUILD/membership-screening-object) requirements | +| permissions? | string | total permissions of the member in the channel, including overwrites, returned when in the interaction object | +| communication_disabled_until? | ?ISO8601 timestamp | timestamp of when the time out will be removed; until then, they cannot interact with the guild | > info > The field `user` won't be included in the member object attached to `MESSAGE_CREATE` and `MESSAGE_UPDATE` gateway events. @@ -775,13 +775,14 @@ Modify attributes of a [guild member](#DOCS_RESOURCES_GUILD/guild-member-object) ###### JSON Params -| Field | Type | Description | Permission | -| ---------- | ------------------- | ------------------------------------------------------------------------------------------------------ | ---------------- | -| nick | string | value to set users nickname to | MANAGE_NICKNAMES | -| roles | array of snowflakes | array of role ids the member is assigned | MANAGE_ROLES | -| mute | boolean | whether the user is muted in voice channels. Will throw a 400 if the user is not in a voice channel | MUTE_MEMBERS | -| deaf | boolean | whether the user is deafened in voice channels. Will throw a 400 if the user is not in a voice channel | DEAFEN_MEMBERS | -| channel_id | snowflake | id of channel to move user to (if they are connected to voice) | MOVE_MEMBERS | +| Field | Type | Description | Permission | +| ---------------------------- | ------------------- | ------------------------------------------------------------------------------------------------------ | ---------------- | +| nick | string | value to set users nickname to | MANAGE_NICKNAMES | +| roles | array of snowflakes | array of role ids the member is assigned | MANAGE_ROLES | +| mute | boolean | whether the user is muted in voice channels. Will throw a 400 if the user is not in a voice channel | MUTE_MEMBERS | +| deaf | boolean | whether the user is deafened in voice channels. Will throw a 400 if the user is not in a voice channel | DEAFEN_MEMBERS | +| channel_id | snowflake | id of channel to move user to (if they are connected to voice) | MOVE_MEMBERS | +| communication_disabled_until | ?ISO8601 timestamp | how long the user can not interact with the guild; set to null to remove timeout | KICK_MEMBERS | ## Modify Current Member % PATCH /guilds/{guild.id#DOCS_RESOURCES_GUILD/guild-object}/members/@me From 033c61271696cd915ded307f452fd625b9b03940 Mon Sep 17 00:00:00 2001 From: Lala Sabathil Date: Fri, 12 Nov 2021 05:27:41 +0100 Subject: [PATCH 06/21] Add Guild Member Update field --- docs/topics/Gateway.md | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/docs/topics/Gateway.md b/docs/topics/Gateway.md index b5ee1a9d9c..4320d85940 100644 --- a/docs/topics/Gateway.md +++ b/docs/topics/Gateway.md @@ -991,18 +991,19 @@ Sent when a guild member is updated. This will also fire when the user object of ###### Guild Member Update Event Fields -| Field | Type | Description | -|----------------|---------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------| -| guild_id | snowflake | the id of the guild | -| roles | array of snowflakes | user role ids | -| user | a [user](#DOCS_RESOURCES_USER/user-object) object | the user | -| nick? | ?string | nickname of the user in the guild | -| avatar | ?string | the member's [guild avatar hash](#DOCS_REFERENCE/image-formatting) -| joined_at | ?ISO8601 timestamp | when the user joined the guild | -| premium_since? | ?ISO8601 timestamp | when the user starting [boosting](https://support.discord.com/hc/en-us/articles/360028038352-Server-Boosting-) the guild | -| deaf? | boolean | whether the user is deafened in voice channels | -| mute? | boolean | whether the user is muted in voice channels | -| pending? | boolean | whether the user has not yet passed the guild's [Membership Screening](#DOCS_RESOURCES_GUILD/membership-screening-object) requirements | +| Field | Type | Description | +| ----------------------------- | ------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------- | +| guild_id | snowflake | the id of the guild | +| roles | array of snowflakes | user role ids | +| user | a [user](#DOCS_RESOURCES_USER/user-object) object | the user | +| nick? | ?string | nickname of the user in the guild | +| avatar | ?string | the member's [guild avatar hash](#DOCS_REFERENCE/image-formatting) | +| joined_at | ?ISO8601 timestamp | when the user joined the guild | +| premium_since? | ?ISO8601 timestamp | when the user starting [boosting](https://support.discord.com/hc/en-us/articles/360028038352-Server-Boosting-) the guild | +| deaf? | boolean | whether the user is deafened in voice channels | +| mute? | boolean | whether the user is muted in voice channels | +| pending? | boolean | whether the user has not yet passed the guild's [Membership Screening](#DOCS_RESOURCES_GUILD/membership-screening-object) requirements | +| communication_disabled_until? | ?ISO8601 timestamp | whether and how long the user can not interact with the guild | #### Guild Members Chunk From 00fcb6fc5e2885bc1f7f589df96c7de8eb8bbf27 Mon Sep 17 00:00:00 2001 From: Marvin Witt Date: Sat, 20 Nov 2021 18:40:10 +0100 Subject: [PATCH 07/21] Add disclaimer for 28 day limit Co-authored-by: Advaith --- docs/resources/Guild.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/resources/Guild.md b/docs/resources/Guild.md index 5c7deb54d0..ac07a32c61 100644 --- a/docs/resources/Guild.md +++ b/docs/resources/Guild.md @@ -775,14 +775,14 @@ Modify attributes of a [guild member](#DOCS_RESOURCES_GUILD/guild-member-object) ###### JSON Params -| Field | Type | Description | Permission | -| ---------------------------- | ------------------- | ------------------------------------------------------------------------------------------------------ | ---------------- | -| nick | string | value to set users nickname to | MANAGE_NICKNAMES | -| roles | array of snowflakes | array of role ids the member is assigned | MANAGE_ROLES | -| mute | boolean | whether the user is muted in voice channels. Will throw a 400 if the user is not in a voice channel | MUTE_MEMBERS | -| deaf | boolean | whether the user is deafened in voice channels. Will throw a 400 if the user is not in a voice channel | DEAFEN_MEMBERS | -| channel_id | snowflake | id of channel to move user to (if they are connected to voice) | MOVE_MEMBERS | -| communication_disabled_until | ?ISO8601 timestamp | how long the user can not interact with the guild; set to null to remove timeout | KICK_MEMBERS | +| Field | Type | Description | Permission | +| ---------------------------- | ------------------- | -------------------------------------------------------------------------------------------------------------------------- | ---------------- | +| nick | string | value to set users nickname to | MANAGE_NICKNAMES | +| roles | array of snowflakes | array of role ids the member is assigned | MANAGE_ROLES | +| mute | boolean | whether the user is muted in voice channels. Will throw a 400 if the user is not in a voice channel | MUTE_MEMBERS | +| deaf | boolean | whether the user is deafened in voice channels. Will throw a 400 if the user is not in a voice channel | DEAFEN_MEMBERS | +| channel_id | snowflake | id of channel to move user to (if they are connected to voice) | MOVE_MEMBERS | +| communication_disabled_until | ?ISO8601 timestamp | when the user should be able to interact with the guild again (up to 28 days in the future); set to null to remove timeout | KICK_MEMBERS | ## Modify Current Member % PATCH /guilds/{guild.id#DOCS_RESOURCES_GUILD/guild-object}/members/@me From a425614a41c3656fa86576071b58543cc830bf57 Mon Sep 17 00:00:00 2001 From: Lala Sabathil Date: Fri, 17 Dec 2021 21:49:25 +0100 Subject: [PATCH 08/21] Fix wording, add permission --- docs/resources/Guild.md | 18 ++++----- docs/topics/Gateway.md | 2 +- docs/topics/Permissions.md | 83 +++++++++++++++++++------------------- 3 files changed, 52 insertions(+), 51 deletions(-) diff --git a/docs/resources/Guild.md b/docs/resources/Guild.md index ac07a32c61..e115c123d9 100644 --- a/docs/resources/Guild.md +++ b/docs/resources/Guild.md @@ -290,7 +290,7 @@ A partial [guild](#DOCS_RESOURCES_GUILD/guild-object) object. Represents an Offl | mute | boolean | whether the user is muted in voice channels | | pending? | boolean | whether the user has not yet passed the guild's [Membership Screening](#DOCS_RESOURCES_GUILD/membership-screening-object) requirements | | permissions? | string | total permissions of the member in the channel, including overwrites, returned when in the interaction object | -| communication_disabled_until? | ?ISO8601 timestamp | timestamp of when the time out will be removed; until then, they cannot interact with the guild | +| communication_disabled_until? | ?ISO8601 timestamp | when the user's timeout will expire and the user's interaction in the guild is re-enabled, null if the user is not timed out | > info > The field `user` won't be included in the member object attached to `MESSAGE_CREATE` and `MESSAGE_UPDATE` gateway events. @@ -775,14 +775,14 @@ Modify attributes of a [guild member](#DOCS_RESOURCES_GUILD/guild-member-object) ###### JSON Params -| Field | Type | Description | Permission | -| ---------------------------- | ------------------- | -------------------------------------------------------------------------------------------------------------------------- | ---------------- | -| nick | string | value to set users nickname to | MANAGE_NICKNAMES | -| roles | array of snowflakes | array of role ids the member is assigned | MANAGE_ROLES | -| mute | boolean | whether the user is muted in voice channels. Will throw a 400 if the user is not in a voice channel | MUTE_MEMBERS | -| deaf | boolean | whether the user is deafened in voice channels. Will throw a 400 if the user is not in a voice channel | DEAFEN_MEMBERS | -| channel_id | snowflake | id of channel to move user to (if they are connected to voice) | MOVE_MEMBERS | -| communication_disabled_until | ?ISO8601 timestamp | when the user should be able to interact with the guild again (up to 28 days in the future); set to null to remove timeout | KICK_MEMBERS | +| Field | Type | Description | Permission | +| ---------------------------- | ------------------- | ---------------------------------------------------------------------------------------------------------------------------- | ---------------- | +| nick | string | value to set users nickname to | MANAGE_NICKNAMES | +| roles | array of snowflakes | array of role ids the member is assigned | MANAGE_ROLES | +| mute | boolean | whether the user is muted in voice channels. Will throw a 400 if the user is not in a voice channel | MUTE_MEMBERS | +| deaf | boolean | whether the user is deafened in voice channels. Will throw a 400 if the user is not in a voice channel | DEAFEN_MEMBERS | +| channel_id | snowflake | id of channel to move user to (if they are connected to voice) | MOVE_MEMBERS | +| communication_disabled_until | ?ISO8601 timestamp | when the user's timeout will expire and the user's interaction in the guild is re-enabled, null if the user is not timed out | MODERATE_MEMBERS | ## Modify Current Member % PATCH /guilds/{guild.id#DOCS_RESOURCES_GUILD/guild-object}/members/@me diff --git a/docs/topics/Gateway.md b/docs/topics/Gateway.md index 4320d85940..c6a3ade6b8 100644 --- a/docs/topics/Gateway.md +++ b/docs/topics/Gateway.md @@ -1003,7 +1003,7 @@ Sent when a guild member is updated. This will also fire when the user object of | deaf? | boolean | whether the user is deafened in voice channels | | mute? | boolean | whether the user is muted in voice channels | | pending? | boolean | whether the user has not yet passed the guild's [Membership Screening](#DOCS_RESOURCES_GUILD/membership-screening-object) requirements | -| communication_disabled_until? | ?ISO8601 timestamp | whether and how long the user can not interact with the guild | +| communication_disabled_until? | ?ISO8601 timestamp | when the user's timeout will expire and the user's interaction in the guild is re-enabled, null if the user is not timed out | #### Guild Members Chunk diff --git a/docs/topics/Permissions.md b/docs/topics/Permissions.md index b653155491..13e5a4b4b1 100644 --- a/docs/topics/Permissions.md +++ b/docs/topics/Permissions.md @@ -26,47 +26,48 @@ Below is a table of all current permissions, their integer values in hexadecimal ###### Bitwise Permission Flags -| Permission | Value | Description | Channel Type | -| ----------------------------- | -------------------------- | ---------------------------------------------------------------------------------------------------------------------------------- | ------------ | -| CREATE_INSTANT_INVITE | `0x0000000001` `(1 << 0)` | Allows creation of instant invites | T, V, S | -| KICK_MEMBERS \* | `0x0000000002` `(1 << 1)` | Allows kicking members | | -| BAN_MEMBERS \* | `0x0000000004` `(1 << 2)` | Allows banning members | | -| ADMINISTRATOR \* | `0x0000000008` `(1 << 3)` | Allows all permissions and bypasses channel permission overwrites | | -| MANAGE_CHANNELS \* | `0x0000000010` `(1 << 4)` | Allows management and editing of channels | T, V, S | -| MANAGE_GUILD \* | `0x0000000020` `(1 << 5)` | Allows management and editing of the guild | | -| ADD_REACTIONS | `0x0000000040` `(1 << 6)` | Allows for the addition of reactions to messages | T | -| VIEW_AUDIT_LOG | `0x0000000080` `(1 << 7)` | Allows for viewing of audit logs | | -| PRIORITY_SPEAKER | `0x0000000100` `(1 << 8)` | Allows for using priority speaker in a voice channel | V | -| STREAM | `0x0000000200` `(1 << 9)` | Allows the user to go live | V | -| VIEW_CHANNEL | `0x0000000400` `(1 << 10)` | Allows guild members to view a channel, which includes reading messages in text channels | T, V, S | -| SEND_MESSAGES | `0x0000000800` `(1 << 11)` | Allows for sending messages in a channel (does not allow sending messages in threads) | T | -| SEND_TTS_MESSAGES | `0x0000001000` `(1 << 12)` | Allows for sending of `/tts` messages | T | -| MANAGE_MESSAGES \* | `0x0000002000` `(1 << 13)` | Allows for deletion of other users messages | T | -| EMBED_LINKS | `0x0000004000` `(1 << 14)` | Links sent by users with this permission will be auto-embedded | T | -| ATTACH_FILES | `0x0000008000` `(1 << 15)` | Allows for uploading images and files | T | -| READ_MESSAGE_HISTORY | `0x0000010000` `(1 << 16)` | Allows for reading of message history | T | -| MENTION_EVERYONE | `0x0000020000` `(1 << 17)` | Allows for using the `@everyone` tag to notify all users in a channel, and the `@here` tag to notify all online users in a channel | T | -| USE_EXTERNAL_EMOJIS | `0x0000040000` `(1 << 18)` | Allows the usage of custom emojis from other servers | T | -| VIEW_GUILD_INSIGHTS | `0x0000080000` `(1 << 19)` | Allows for viewing guild insights | | -| CONNECT | `0x0000100000` `(1 << 20)` | Allows for joining of a voice channel | V, S | -| SPEAK | `0x0000200000` `(1 << 21)` | Allows for speaking in a voice channel | V | -| MUTE_MEMBERS | `0x0000400000` `(1 << 22)` | Allows for muting members in a voice channel | V, S | -| DEAFEN_MEMBERS | `0x0000800000` `(1 << 23)` | Allows for deafening of members in a voice channel | V, S | -| MOVE_MEMBERS | `0x0001000000` `(1 << 24)` | Allows for moving of members between voice channels | V, S | -| USE_VAD | `0x0002000000` `(1 << 25)` | Allows for using voice-activity-detection in a voice channel | V | -| CHANGE_NICKNAME | `0x0004000000` `(1 << 26)` | Allows for modification of own nickname | | -| MANAGE_NICKNAMES | `0x0008000000` `(1 << 27)` | Allows for modification of other users nicknames | | -| MANAGE_ROLES \* | `0x0010000000` `(1 << 28)` | Allows management and editing of roles | T, V, S | -| MANAGE_WEBHOOKS \* | `0x0020000000` `(1 << 29)` | Allows management and editing of webhooks | T | -| MANAGE_EMOJIS_AND_STICKERS \* | `0x0040000000` `(1 << 30)` | Allows management and editing of emojis and stickers | | -| USE_APPLICATION_COMMANDS | `0x0080000000` `(1 << 31)` | Allows members to use application commands, including slash commands and context menu commands. | T | -| REQUEST_TO_SPEAK | `0x0100000000` `(1 << 32)` | Allows for requesting to speak in stage channels. (_This permission is under active development and may be changed or removed._) | S | -| MANAGE_THREADS \* | `0x0400000000` `(1 << 34)` | Allows for deleting and archiving threads, and viewing all private threads | T | -| CREATE_PUBLIC_THREADS | `0x0800000000` `(1 << 35)` | Allows for creating threads | T | -| CREATE_PRIVATE_THREADS | `0x1000000000` `(1 << 36)` | Allows for creating private threads | T | -| USE_EXTERNAL_STICKERS | `0x2000000000` `(1 << 37)` | Allows the usage of custom stickers from other servers | T | -| SEND_MESSAGES_IN_THREADS | `0x4000000000` `(1 << 38)` | Allows for sending messages in threads | T | -| START_EMBEDDED_ACTIVITIES | `0x8000000000` `(1 << 39)` | Allows for launching activities (applications with the `EMBEDDED` flag) in a voice channel | V | +| Permission | Value | Description | Channel Type | +| ----------------------------- | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------ | +| CREATE_INSTANT_INVITE | `0x0000000001` `(1 << 0)` | Allows creation of instant invites | T, V, S | +| KICK_MEMBERS \* | `0x0000000002` `(1 << 1)` | Allows kicking members | | +| BAN_MEMBERS \* | `0x0000000004` `(1 << 2)` | Allows banning members | | +| ADMINISTRATOR \* | `0x0000000008` `(1 << 3)` | Allows all permissions and bypasses channel permission overwrites | | +| MANAGE_CHANNELS \* | `0x0000000010` `(1 << 4)` | Allows management and editing of channels | T, V, S | +| MANAGE_GUILD \* | `0x0000000020` `(1 << 5)` | Allows management and editing of the guild | | +| ADD_REACTIONS | `0x0000000040` `(1 << 6)` | Allows for the addition of reactions to messages | T | +| VIEW_AUDIT_LOG | `0x0000000080` `(1 << 7)` | Allows for viewing of audit logs | | +| PRIORITY_SPEAKER | `0x0000000100` `(1 << 8)` | Allows for using priority speaker in a voice channel | V | +| STREAM | `0x0000000200` `(1 << 9)` | Allows the user to go live | V | +| VIEW_CHANNEL | `0x0000000400` `(1 << 10)` | Allows guild members to view a channel, which includes reading messages in text channels | T, V, S | +| SEND_MESSAGES | `0x0000000800` `(1 << 11)` | Allows for sending messages in a channel (does not allow sending messages in threads) | T | +| SEND_TTS_MESSAGES | `0x0000001000` `(1 << 12)` | Allows for sending of `/tts` messages | T | +| MANAGE_MESSAGES \* | `0x0000002000` `(1 << 13)` | Allows for deletion of other users messages | T | +| EMBED_LINKS | `0x0000004000` `(1 << 14)` | Links sent by users with this permission will be auto-embedded | T | +| ATTACH_FILES | `0x0000008000` `(1 << 15)` | Allows for uploading images and files | T | +| READ_MESSAGE_HISTORY | `0x0000010000` `(1 << 16)` | Allows for reading of message history | T | +| MENTION_EVERYONE | `0x0000020000` `(1 << 17)` | Allows for using the `@everyone` tag to notify all users in a channel, and the `@here` tag to notify all online users in a channel | T | +| USE_EXTERNAL_EMOJIS | `0x0000040000` `(1 << 18)` | Allows the usage of custom emojis from other servers | T | +| VIEW_GUILD_INSIGHTS | `0x0000080000` `(1 << 19)` | Allows for viewing guild insights | | +| CONNECT | `0x0000100000` `(1 << 20)` | Allows for joining of a voice channel | V, S | +| SPEAK | `0x0000200000` `(1 << 21)` | Allows for speaking in a voice channel | V | +| MUTE_MEMBERS | `0x0000400000` `(1 << 22)` | Allows for muting members in a voice channel | V, S | +| DEAFEN_MEMBERS | `0x0000800000` `(1 << 23)` | Allows for deafening of members in a voice channel | V, S | +| MOVE_MEMBERS | `0x0001000000` `(1 << 24)` | Allows for moving of members between voice channels | V, S | +| USE_VAD | `0x0002000000` `(1 << 25)` | Allows for using voice-activity-detection in a voice channel | V | +| CHANGE_NICKNAME | `0x0004000000` `(1 << 26)` | Allows for modification of own nickname | | +| MANAGE_NICKNAMES | `0x0008000000` `(1 << 27)` | Allows for modification of other users nicknames | | +| MANAGE_ROLES \* | `0x0010000000` `(1 << 28)` | Allows management and editing of roles | T, V, S | +| MANAGE_WEBHOOKS \* | `0x0020000000` `(1 << 29)` | Allows management and editing of webhooks | T | +| MANAGE_EMOJIS_AND_STICKERS \* | `0x0040000000` `(1 << 30)` | Allows management and editing of emojis and stickers | | +| USE_APPLICATION_COMMANDS | `0x0080000000` `(1 << 31)` | Allows members to use application commands, including slash commands and context menu commands. | T | +| REQUEST_TO_SPEAK | `0x0100000000` `(1 << 32)` | Allows for requesting to speak in stage channels. (_This permission is under active development and may be changed or removed._) | S | +| MANAGE_THREADS \* | `0x0400000000` `(1 << 34)` | Allows for deleting and archiving threads, and viewing all private threads | T | +| CREATE_PUBLIC_THREADS | `0x0800000000` `(1 << 35)` | Allows for creating threads | T | +| CREATE_PRIVATE_THREADS | `0x1000000000` `(1 << 36)` | Allows for creating private threads | T | +| USE_EXTERNAL_STICKERS | `0x2000000000` `(1 << 37)` | Allows the usage of custom stickers from other servers | T | +| SEND_MESSAGES_IN_THREADS | `0x4000000000` `(1 << 38)` | Allows for sending messages in threads | T | +| START_EMBEDDED_ACTIVITIES | `0x8000000000` `(1 << 39)` | Allows for launching activities (applications with the `EMBEDDED` flag) in a voice channel | V | +| MODERATE_MEMBERS | `1x0000000001` `(1 << 40)` | When you put a user in timeout they will not be able to send messages in chat, reply within threads, react to messages, or speak in voice or stage channels | | **\* These permissions require the owner account to use [two-factor authentication](#DOCS_TOPICS_OAUTH2/twofactor-authentication-requirement) when used on a guild that has server-wide 2FA enabled.** From 29da1cd40c66132841888fb27b76f4953239dcfd Mon Sep 17 00:00:00 2001 From: Lala Sabathil Date: Fri, 17 Dec 2021 21:53:53 +0100 Subject: [PATCH 09/21] Fix permissions..? --- docs/topics/Permissions.md | 84 +++++++++++++++++++------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/docs/topics/Permissions.md b/docs/topics/Permissions.md index 13e5a4b4b1..b27d59f7be 100644 --- a/docs/topics/Permissions.md +++ b/docs/topics/Permissions.md @@ -26,48 +26,48 @@ Below is a table of all current permissions, their integer values in hexadecimal ###### Bitwise Permission Flags -| Permission | Value | Description | Channel Type | -| ----------------------------- | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------ | -| CREATE_INSTANT_INVITE | `0x0000000001` `(1 << 0)` | Allows creation of instant invites | T, V, S | -| KICK_MEMBERS \* | `0x0000000002` `(1 << 1)` | Allows kicking members | | -| BAN_MEMBERS \* | `0x0000000004` `(1 << 2)` | Allows banning members | | -| ADMINISTRATOR \* | `0x0000000008` `(1 << 3)` | Allows all permissions and bypasses channel permission overwrites | | -| MANAGE_CHANNELS \* | `0x0000000010` `(1 << 4)` | Allows management and editing of channels | T, V, S | -| MANAGE_GUILD \* | `0x0000000020` `(1 << 5)` | Allows management and editing of the guild | | -| ADD_REACTIONS | `0x0000000040` `(1 << 6)` | Allows for the addition of reactions to messages | T | -| VIEW_AUDIT_LOG | `0x0000000080` `(1 << 7)` | Allows for viewing of audit logs | | -| PRIORITY_SPEAKER | `0x0000000100` `(1 << 8)` | Allows for using priority speaker in a voice channel | V | -| STREAM | `0x0000000200` `(1 << 9)` | Allows the user to go live | V | -| VIEW_CHANNEL | `0x0000000400` `(1 << 10)` | Allows guild members to view a channel, which includes reading messages in text channels | T, V, S | -| SEND_MESSAGES | `0x0000000800` `(1 << 11)` | Allows for sending messages in a channel (does not allow sending messages in threads) | T | -| SEND_TTS_MESSAGES | `0x0000001000` `(1 << 12)` | Allows for sending of `/tts` messages | T | -| MANAGE_MESSAGES \* | `0x0000002000` `(1 << 13)` | Allows for deletion of other users messages | T | -| EMBED_LINKS | `0x0000004000` `(1 << 14)` | Links sent by users with this permission will be auto-embedded | T | -| ATTACH_FILES | `0x0000008000` `(1 << 15)` | Allows for uploading images and files | T | -| READ_MESSAGE_HISTORY | `0x0000010000` `(1 << 16)` | Allows for reading of message history | T | -| MENTION_EVERYONE | `0x0000020000` `(1 << 17)` | Allows for using the `@everyone` tag to notify all users in a channel, and the `@here` tag to notify all online users in a channel | T | -| USE_EXTERNAL_EMOJIS | `0x0000040000` `(1 << 18)` | Allows the usage of custom emojis from other servers | T | -| VIEW_GUILD_INSIGHTS | `0x0000080000` `(1 << 19)` | Allows for viewing guild insights | | -| CONNECT | `0x0000100000` `(1 << 20)` | Allows for joining of a voice channel | V, S | -| SPEAK | `0x0000200000` `(1 << 21)` | Allows for speaking in a voice channel | V | -| MUTE_MEMBERS | `0x0000400000` `(1 << 22)` | Allows for muting members in a voice channel | V, S | -| DEAFEN_MEMBERS | `0x0000800000` `(1 << 23)` | Allows for deafening of members in a voice channel | V, S | -| MOVE_MEMBERS | `0x0001000000` `(1 << 24)` | Allows for moving of members between voice channels | V, S | -| USE_VAD | `0x0002000000` `(1 << 25)` | Allows for using voice-activity-detection in a voice channel | V | -| CHANGE_NICKNAME | `0x0004000000` `(1 << 26)` | Allows for modification of own nickname | | -| MANAGE_NICKNAMES | `0x0008000000` `(1 << 27)` | Allows for modification of other users nicknames | | -| MANAGE_ROLES \* | `0x0010000000` `(1 << 28)` | Allows management and editing of roles | T, V, S | -| MANAGE_WEBHOOKS \* | `0x0020000000` `(1 << 29)` | Allows management and editing of webhooks | T | -| MANAGE_EMOJIS_AND_STICKERS \* | `0x0040000000` `(1 << 30)` | Allows management and editing of emojis and stickers | | -| USE_APPLICATION_COMMANDS | `0x0080000000` `(1 << 31)` | Allows members to use application commands, including slash commands and context menu commands. | T | -| REQUEST_TO_SPEAK | `0x0100000000` `(1 << 32)` | Allows for requesting to speak in stage channels. (_This permission is under active development and may be changed or removed._) | S | -| MANAGE_THREADS \* | `0x0400000000` `(1 << 34)` | Allows for deleting and archiving threads, and viewing all private threads | T | -| CREATE_PUBLIC_THREADS | `0x0800000000` `(1 << 35)` | Allows for creating threads | T | -| CREATE_PRIVATE_THREADS | `0x1000000000` `(1 << 36)` | Allows for creating private threads | T | -| USE_EXTERNAL_STICKERS | `0x2000000000` `(1 << 37)` | Allows the usage of custom stickers from other servers | T | -| SEND_MESSAGES_IN_THREADS | `0x4000000000` `(1 << 38)` | Allows for sending messages in threads | T | -| START_EMBEDDED_ACTIVITIES | `0x8000000000` `(1 << 39)` | Allows for launching activities (applications with the `EMBEDDED` flag) in a voice channel | V | -| MODERATE_MEMBERS | `1x0000000001` `(1 << 40)` | When you put a user in timeout they will not be able to send messages in chat, reply within threads, react to messages, or speak in voice or stage channels | | +| Permission | Value | Description | Channel Type | +| ----------------------------- | --------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------ | +| CREATE_INSTANT_INVITE | `0x0000000000000001` `(1L << 0)` | Allows creation of instant invites | T, V, S | +| KICK_MEMBERS \* | `0x0000000000000002` `(1L << 1)` | Allows kicking members | | +| BAN_MEMBERS \* | `0x0000000000000004` `(1L << 2)` | Allows banning members | | +| ADMINISTRATOR \* | `0x0000000000000008` `(1L << 3)` | Allows all permissions and bypasses channel permission overwrites | | +| MANAGE_CHANNELS \* | `0x0000000000000010` `(1L << 4)` | Allows management and editing of channels | T, V, S | +| MANAGE_GUILD \* | `0x0000000000000020` `(1L << 5)` | Allows management and editing of the guild | | +| ADD_REACTIONS | `0x0000000000000040` `(1L << 6)` | Allows for the addition of reactions to messages | T | +| VIEW_AUDIT_LOG | `0x0000000000000080` `(1L << 7)` | Allows for viewing of audit logs | | +| PRIORITY_SPEAKER | `0x0000000000000100` `(1L << 8)` | Allows for using priority speaker in a voice channel | V | +| STREAM | `0x0000000000000200` `(1L << 9)` | Allows the user to go live | V | +| VIEW_CHANNEL | `0x0000000000000400` `(1L << 10)` | Allows guild members to view a channel, which includes reading messages in text channels | T, V, S | +| SEND_MESSAGES | `0x0000000000000800` `(1L << 11)` | Allows for sending messages in a channel (does not allow sending messages in threads) | T | +| SEND_TTS_MESSAGES | `0x0000000000001000` `(1L << 12)` | Allows for sending of `/tts` messages | T | +| MANAGE_MESSAGES \* | `0x0000000000002000` `(1L << 13)` | Allows for deletion of other users messages | T | +| EMBED_LINKS | `0x0000000000004000` `(1L << 14)` | Links sent by users with this permission will be auto-embedded | T | +| ATTACH_FILES | `0x0000000000008000` `(1L << 15)` | Allows for uploading images and files | T | +| READ_MESSAGE_HISTORY | `0x0000000000010000` `(1L << 16)` | Allows for reading of message history | T | +| MENTION_EVERYONE | `0x0000000000020000` `(1L << 17)` | Allows for using the `@everyone` tag to notify all users in a channel, and the `@here` tag to notify all online users in a channel | T | +| USE_EXTERNAL_EMOJIS | `0x0000000000040000` `(1L << 18)` | Allows the usage of custom emojis from other servers | T | +| VIEW_GUILD_INSIGHTS | `0x0000000000080000` `(1L << 19)` | Allows for viewing guild insights | | +| CONNECT | `0x0000000000100000` `(1L << 20)` | Allows for joining of a voice channel | V, S | +| SPEAK | `0x0000000000200000` `(1L << 21)` | Allows for speaking in a voice channel | V | +| MUTE_MEMBERS | `0x0000000000400000` `(1L << 22)` | Allows for muting members in a voice channel | V, S | +| DEAFEN_MEMBERS | `0x0000000000800000` `(1L << 23)` | Allows for deafening of members in a voice channel | V, S | +| MOVE_MEMBERS | `0x0000000001000000` `(1L << 24)` | Allows for moving of members between voice channels | V, S | +| USE_VAD | `0x0000000002000000` `(1L << 25)` | Allows for using voice-activity-detection in a voice channel | V | +| CHANGE_NICKNAME | `0x0000000004000000` `(1L << 26)` | Allows for modification of own nickname | | +| MANAGE_NICKNAMES | `0x0000000008000000` `(1L << 27)` | Allows for modification of other users nicknames | | +| MANAGE_ROLES \* | `0x0000000010000000` `(1L << 28)` | Allows management and editing of roles | T, V, S | +| MANAGE_WEBHOOKS \* | `0x0000000020000000` `(1L << 29)` | Allows management and editing of webhooks | T | +| MANAGE_EMOJIS_AND_STICKERS \* | `0x0000000040000000` `(1L << 30)` | Allows management and editing of emojis and stickers | | +| USE_APPLICATION_COMMANDS | `0x0000000080000000` `(1L << 31)` | Allows members to use application commands, including slash commands and context menu commands. | T | +| REQUEST_TO_SPEAK | `0x0000000100000000` `(1L << 32)` | Allows for requesting to speak in stage channels. (_This permission is under active development and may be changed or removed._) | S | +| MANAGE_THREADS \* | `0x0000000400000000` `(1L << 34)` | Allows for deleting and archiving threads, and viewing all private threads | T | +| CREATE_PUBLIC_THREADS | `0x0000000800000000` `(1L << 35)` | Allows for creating threads | T | +| CREATE_PRIVATE_THREADS | `0x0000001000000000` `(1L << 36)` | Allows for creating private threads | T | +| USE_EXTERNAL_STICKERS | `0x0000002000000000` `(1L << 37)` | Allows the usage of custom stickers from other servers | T | +| SEND_MESSAGES_IN_THREADS | `0x0000004000000000` `(1L << 38)` | Allows for sending messages in threads | T | +| START_EMBEDDED_ACTIVITIES | `0x0000008000000000` `(1L << 39)` | Allows for launching activities (applications with the `EMBEDDED` flag) in a voice channel | V | +| MODERATE_MEMBERS | `0x0000010000000000` `(1L << 40)` | When you put a user in timeout they will not be able to send messages in chat, reply within threads, react to messages, or speak in voice or stage channels | | **\* These permissions require the owner account to use [two-factor authentication](#DOCS_TOPICS_OAUTH2/twofactor-authentication-requirement) when used on a guild that has server-wide 2FA enabled.** From 53c7290ccce9cbabda92607f8a894e68252c39ca Mon Sep 17 00:00:00 2001 From: Lala Sabathil Date: Fri, 17 Dec 2021 21:57:59 +0100 Subject: [PATCH 10/21] Update Permissions.md --- docs/topics/Permissions.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/topics/Permissions.md b/docs/topics/Permissions.md index cfd33d0c01..e68d7c27c7 100644 --- a/docs/topics/Permissions.md +++ b/docs/topics/Permissions.md @@ -61,6 +61,7 @@ Below is a table of all current permissions, their integer values in hexadecimal | MANAGE_EMOJIS_AND_STICKERS \* | `0x0000000040000000` `(1L << 30)` | Allows management and editing of emojis and stickers | | | USE_APPLICATION_COMMANDS | `0x0000000080000000` `(1L << 31)` | Allows members to use application commands, including slash commands and context menu commands. | T | | REQUEST_TO_SPEAK | `0x0000000100000000` `(1L << 32)` | Allows for requesting to speak in stage channels. (_This permission is under active development and may be changed or removed._) | S | + | MANAGE_EVENTS | `0x0000000200000000` `(1L << 33)` | Allows for creating, editing, and deleting scheduled events | V, S | | MANAGE_THREADS \* | `0x0000000400000000` `(1L << 34)` | Allows for deleting and archiving threads, and viewing all private threads | T | | CREATE_PUBLIC_THREADS | `0x0000000800000000` `(1L << 35)` | Allows for creating threads | T | | CREATE_PRIVATE_THREADS | `0x0000001000000000` `(1L << 36)` | Allows for creating private threads | T | From 05c57d2ff9a9f24d5d210b57b929b52052826835 Mon Sep 17 00:00:00 2001 From: Lala Sabathil Date: Fri, 17 Dec 2021 22:56:08 +0100 Subject: [PATCH 11/21] Fix description of permission 1L<<40 Co-Authored-By: Hemu <1871299+hemu@users.noreply.github.com> --- docs/topics/Permissions.md | 84 +++++++++++++++++++------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/docs/topics/Permissions.md b/docs/topics/Permissions.md index b27d59f7be..78d4ab58cb 100644 --- a/docs/topics/Permissions.md +++ b/docs/topics/Permissions.md @@ -26,48 +26,48 @@ Below is a table of all current permissions, their integer values in hexadecimal ###### Bitwise Permission Flags -| Permission | Value | Description | Channel Type | -| ----------------------------- | --------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------ | -| CREATE_INSTANT_INVITE | `0x0000000000000001` `(1L << 0)` | Allows creation of instant invites | T, V, S | -| KICK_MEMBERS \* | `0x0000000000000002` `(1L << 1)` | Allows kicking members | | -| BAN_MEMBERS \* | `0x0000000000000004` `(1L << 2)` | Allows banning members | | -| ADMINISTRATOR \* | `0x0000000000000008` `(1L << 3)` | Allows all permissions and bypasses channel permission overwrites | | -| MANAGE_CHANNELS \* | `0x0000000000000010` `(1L << 4)` | Allows management and editing of channels | T, V, S | -| MANAGE_GUILD \* | `0x0000000000000020` `(1L << 5)` | Allows management and editing of the guild | | -| ADD_REACTIONS | `0x0000000000000040` `(1L << 6)` | Allows for the addition of reactions to messages | T | -| VIEW_AUDIT_LOG | `0x0000000000000080` `(1L << 7)` | Allows for viewing of audit logs | | -| PRIORITY_SPEAKER | `0x0000000000000100` `(1L << 8)` | Allows for using priority speaker in a voice channel | V | -| STREAM | `0x0000000000000200` `(1L << 9)` | Allows the user to go live | V | -| VIEW_CHANNEL | `0x0000000000000400` `(1L << 10)` | Allows guild members to view a channel, which includes reading messages in text channels | T, V, S | -| SEND_MESSAGES | `0x0000000000000800` `(1L << 11)` | Allows for sending messages in a channel (does not allow sending messages in threads) | T | -| SEND_TTS_MESSAGES | `0x0000000000001000` `(1L << 12)` | Allows for sending of `/tts` messages | T | -| MANAGE_MESSAGES \* | `0x0000000000002000` `(1L << 13)` | Allows for deletion of other users messages | T | -| EMBED_LINKS | `0x0000000000004000` `(1L << 14)` | Links sent by users with this permission will be auto-embedded | T | -| ATTACH_FILES | `0x0000000000008000` `(1L << 15)` | Allows for uploading images and files | T | -| READ_MESSAGE_HISTORY | `0x0000000000010000` `(1L << 16)` | Allows for reading of message history | T | -| MENTION_EVERYONE | `0x0000000000020000` `(1L << 17)` | Allows for using the `@everyone` tag to notify all users in a channel, and the `@here` tag to notify all online users in a channel | T | -| USE_EXTERNAL_EMOJIS | `0x0000000000040000` `(1L << 18)` | Allows the usage of custom emojis from other servers | T | -| VIEW_GUILD_INSIGHTS | `0x0000000000080000` `(1L << 19)` | Allows for viewing guild insights | | -| CONNECT | `0x0000000000100000` `(1L << 20)` | Allows for joining of a voice channel | V, S | -| SPEAK | `0x0000000000200000` `(1L << 21)` | Allows for speaking in a voice channel | V | -| MUTE_MEMBERS | `0x0000000000400000` `(1L << 22)` | Allows for muting members in a voice channel | V, S | -| DEAFEN_MEMBERS | `0x0000000000800000` `(1L << 23)` | Allows for deafening of members in a voice channel | V, S | -| MOVE_MEMBERS | `0x0000000001000000` `(1L << 24)` | Allows for moving of members between voice channels | V, S | -| USE_VAD | `0x0000000002000000` `(1L << 25)` | Allows for using voice-activity-detection in a voice channel | V | -| CHANGE_NICKNAME | `0x0000000004000000` `(1L << 26)` | Allows for modification of own nickname | | -| MANAGE_NICKNAMES | `0x0000000008000000` `(1L << 27)` | Allows for modification of other users nicknames | | -| MANAGE_ROLES \* | `0x0000000010000000` `(1L << 28)` | Allows management and editing of roles | T, V, S | -| MANAGE_WEBHOOKS \* | `0x0000000020000000` `(1L << 29)` | Allows management and editing of webhooks | T | -| MANAGE_EMOJIS_AND_STICKERS \* | `0x0000000040000000` `(1L << 30)` | Allows management and editing of emojis and stickers | | -| USE_APPLICATION_COMMANDS | `0x0000000080000000` `(1L << 31)` | Allows members to use application commands, including slash commands and context menu commands. | T | -| REQUEST_TO_SPEAK | `0x0000000100000000` `(1L << 32)` | Allows for requesting to speak in stage channels. (_This permission is under active development and may be changed or removed._) | S | -| MANAGE_THREADS \* | `0x0000000400000000` `(1L << 34)` | Allows for deleting and archiving threads, and viewing all private threads | T | -| CREATE_PUBLIC_THREADS | `0x0000000800000000` `(1L << 35)` | Allows for creating threads | T | -| CREATE_PRIVATE_THREADS | `0x0000001000000000` `(1L << 36)` | Allows for creating private threads | T | -| USE_EXTERNAL_STICKERS | `0x0000002000000000` `(1L << 37)` | Allows the usage of custom stickers from other servers | T | -| SEND_MESSAGES_IN_THREADS | `0x0000004000000000` `(1L << 38)` | Allows for sending messages in threads | T | -| START_EMBEDDED_ACTIVITIES | `0x0000008000000000` `(1L << 39)` | Allows for launching activities (applications with the `EMBEDDED` flag) in a voice channel | V | -| MODERATE_MEMBERS | `0x0000010000000000` `(1L << 40)` | When you put a user in timeout they will not be able to send messages in chat, reply within threads, react to messages, or speak in voice or stage channels | | +| Permission | Value | Description | Channel Type | +| ----------------------------- | --------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------- | ------------ | +| CREATE_INSTANT_INVITE | `0x0000000000000001` `(1L << 0)` | Allows creation of instant invites | T, V, S | +| KICK_MEMBERS \* | `0x0000000000000002` `(1L << 1)` | Allows kicking members | | +| BAN_MEMBERS \* | `0x0000000000000004` `(1L << 2)` | Allows banning members | | +| ADMINISTRATOR \* | `0x0000000000000008` `(1L << 3)` | Allows all permissions and bypasses channel permission overwrites | | +| MANAGE_CHANNELS \* | `0x0000000000000010` `(1L << 4)` | Allows management and editing of channels | T, V, S | +| MANAGE_GUILD \* | `0x0000000000000020` `(1L << 5)` | Allows management and editing of the guild | | +| ADD_REACTIONS | `0x0000000000000040` `(1L << 6)` | Allows for the addition of reactions to messages | T | +| VIEW_AUDIT_LOG | `0x0000000000000080` `(1L << 7)` | Allows for viewing of audit logs | | +| PRIORITY_SPEAKER | `0x0000000000000100` `(1L << 8)` | Allows for using priority speaker in a voice channel | V | +| STREAM | `0x0000000000000200` `(1L << 9)` | Allows the user to go live | V | +| VIEW_CHANNEL | `0x0000000000000400` `(1L << 10)` | Allows guild members to view a channel, which includes reading messages in text channels | T, V, S | +| SEND_MESSAGES | `0x0000000000000800` `(1L << 11)` | Allows for sending messages in a channel (does not allow sending messages in threads) | T | +| SEND_TTS_MESSAGES | `0x0000000000001000` `(1L << 12)` | Allows for sending of `/tts` messages | T | +| MANAGE_MESSAGES \* | `0x0000000000002000` `(1L << 13)` | Allows for deletion of other users messages | T | +| EMBED_LINKS | `0x0000000000004000` `(1L << 14)` | Links sent by users with this permission will be auto-embedded | T | +| ATTACH_FILES | `0x0000000000008000` `(1L << 15)` | Allows for uploading images and files | T | +| READ_MESSAGE_HISTORY | `0x0000000000010000` `(1L << 16)` | Allows for reading of message history | T | +| MENTION_EVERYONE | `0x0000000000020000` `(1L << 17)` | Allows for using the `@everyone` tag to notify all users in a channel, and the `@here` tag to notify all online users in a channel | T | +| USE_EXTERNAL_EMOJIS | `0x0000000000040000` `(1L << 18)` | Allows the usage of custom emojis from other servers | T | +| VIEW_GUILD_INSIGHTS | `0x0000000000080000` `(1L << 19)` | Allows for viewing guild insights | | +| CONNECT | `0x0000000000100000` `(1L << 20)` | Allows for joining of a voice channel | V, S | +| SPEAK | `0x0000000000200000` `(1L << 21)` | Allows for speaking in a voice channel | V | +| MUTE_MEMBERS | `0x0000000000400000` `(1L << 22)` | Allows for muting members in a voice channel | V, S | +| DEAFEN_MEMBERS | `0x0000000000800000` `(1L << 23)` | Allows for deafening of members in a voice channel | V, S | +| MOVE_MEMBERS | `0x0000000001000000` `(1L << 24)` | Allows for moving of members between voice channels | V, S | +| USE_VAD | `0x0000000002000000` `(1L << 25)` | Allows for using voice-activity-detection in a voice channel | V | +| CHANGE_NICKNAME | `0x0000000004000000` `(1L << 26)` | Allows for modification of own nickname | | +| MANAGE_NICKNAMES | `0x0000000008000000` `(1L << 27)` | Allows for modification of other users nicknames | | +| MANAGE_ROLES \* | `0x0000000010000000` `(1L << 28)` | Allows management and editing of roles | T, V, S | +| MANAGE_WEBHOOKS \* | `0x0000000020000000` `(1L << 29)` | Allows management and editing of webhooks | T | +| MANAGE_EMOJIS_AND_STICKERS \* | `0x0000000040000000` `(1L << 30)` | Allows management and editing of emojis and stickers | | +| USE_APPLICATION_COMMANDS | `0x0000000080000000` `(1L << 31)` | Allows members to use application commands, including slash commands and context menu commands. | T | +| REQUEST_TO_SPEAK | `0x0000000100000000` `(1L << 32)` | Allows for requesting to speak in stage channels. (_This permission is under active development and may be changed or removed._) | S | +| MANAGE_THREADS \* | `0x0000000400000000` `(1L << 34)` | Allows for deleting and archiving threads, and viewing all private threads | T | +| CREATE_PUBLIC_THREADS | `0x0000000800000000` `(1L << 35)` | Allows for creating threads | T | +| CREATE_PRIVATE_THREADS | `0x0000001000000000` `(1L << 36)` | Allows for creating private threads | T | +| USE_EXTERNAL_STICKERS | `0x0000002000000000` `(1L << 37)` | Allows the usage of custom stickers from other servers | T | +| SEND_MESSAGES_IN_THREADS | `0x0000004000000000` `(1L << 38)` | Allows for sending messages in threads | T | +| START_EMBEDDED_ACTIVITIES | `0x0000008000000000` `(1L << 39)` | Allows for launching activities (applications with the `EMBEDDED` flag) in a voice channel | V | +| MODERATE_MEMBERS | `0x0000010000000000` `(1L << 40)` | Allows for timing out users to prevent them from sending or reacting to messages in chat and threads, and from speaking in voice and stage channels | | **\* These permissions require the owner account to use [two-factor authentication](#DOCS_TOPICS_OAUTH2/twofactor-authentication-requirement) when used on a guild that has server-wide 2FA enabled.** From 1585f10a9ff8dc1d7bba2f3aea4feb00347b3141 Mon Sep 17 00:00:00 2001 From: Lala Sabathil Date: Sat, 18 Dec 2021 08:10:01 +0100 Subject: [PATCH 12/21] Update Permissions.md --- docs/topics/Permissions.md | 87 +++++++++++++++++++------------------- 1 file changed, 43 insertions(+), 44 deletions(-) diff --git a/docs/topics/Permissions.md b/docs/topics/Permissions.md index 1818772f19..f051f267fe 100644 --- a/docs/topics/Permissions.md +++ b/docs/topics/Permissions.md @@ -26,50 +26,49 @@ Below is a table of all current permissions, their integer values in hexadecimal ###### Bitwise Permission Flags -| Permission | Value | Description | Channel Type | -| ----------------------------- | --------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------- | ------------ | -| CREATE_INSTANT_INVITE | `0x0000000000000001` `(1L << 0)` | Allows creation of instant invites | T, V, S | -| KICK_MEMBERS \* | `0x0000000000000002` `(1L << 1)` | Allows kicking members | | -| BAN_MEMBERS \* | `0x0000000000000004` `(1L << 2)` | Allows banning members | | -| ADMINISTRATOR \* | `0x0000000000000008` `(1L << 3)` | Allows all permissions and bypasses channel permission overwrites | | -| MANAGE_CHANNELS \* | `0x0000000000000010` `(1L << 4)` | Allows management and editing of channels | T, V, S | -| MANAGE_GUILD \* | `0x0000000000000020` `(1L << 5)` | Allows management and editing of the guild | | -| ADD_REACTIONS | `0x0000000000000040` `(1L << 6)` | Allows for the addition of reactions to messages | T | -| VIEW_AUDIT_LOG | `0x0000000000000080` `(1L << 7)` | Allows for viewing of audit logs | | -| PRIORITY_SPEAKER | `0x0000000000000100` `(1L << 8)` | Allows for using priority speaker in a voice channel | V | -| STREAM | `0x0000000000000200` `(1L << 9)` | Allows the user to go live | V | -| VIEW_CHANNEL | `0x0000000000000400` `(1L << 10)` | Allows guild members to view a channel, which includes reading messages in text channels | T, V, S | -| SEND_MESSAGES | `0x0000000000000800` `(1L << 11)` | Allows for sending messages in a channel (does not allow sending messages in threads) | T | -| SEND_TTS_MESSAGES | `0x0000000000001000` `(1L << 12)` | Allows for sending of `/tts` messages | T | -| MANAGE_MESSAGES \* | `0x0000000000002000` `(1L << 13)` | Allows for deletion of other users messages | T | -| EMBED_LINKS | `0x0000000000004000` `(1L << 14)` | Links sent by users with this permission will be auto-embedded | T | -| ATTACH_FILES | `0x0000000000008000` `(1L << 15)` | Allows for uploading images and files | T | -| READ_MESSAGE_HISTORY | `0x0000000000010000` `(1L << 16)` | Allows for reading of message history | T | -| MENTION_EVERYONE | `0x0000000000020000` `(1L << 17)` | Allows for using the `@everyone` tag to notify all users in a channel, and the `@here` tag to notify all online users in a channel | T | -| USE_EXTERNAL_EMOJIS | `0x0000000000040000` `(1L << 18)` | Allows the usage of custom emojis from other servers | T | -| VIEW_GUILD_INSIGHTS | `0x0000000000080000` `(1L << 19)` | Allows for viewing guild insights | | -| CONNECT | `0x0000000000100000` `(1L << 20)` | Allows for joining of a voice channel | V, S | -| SPEAK | `0x0000000000200000` `(1L << 21)` | Allows for speaking in a voice channel | V | -| MUTE_MEMBERS | `0x0000000000400000` `(1L << 22)` | Allows for muting members in a voice channel | V, S | -| DEAFEN_MEMBERS | `0x0000000000800000` `(1L << 23)` | Allows for deafening of members in a voice channel | V, S | -| MOVE_MEMBERS | `0x0000000001000000` `(1L << 24)` | Allows for moving of members between voice channels | V, S | -| USE_VAD | `0x0000000002000000` `(1L << 25)` | Allows for using voice-activity-detection in a voice channel | V | -| CHANGE_NICKNAME | `0x0000000004000000` `(1L << 26)` | Allows for modification of own nickname | | -| MANAGE_NICKNAMES | `0x0000000008000000` `(1L << 27)` | Allows for modification of other users nicknames | | -| MANAGE_ROLES \* | `0x0000000010000000` `(1L << 28)` | Allows management and editing of roles | T, V, S | -| MANAGE_WEBHOOKS \* | `0x0000000020000000` `(1L << 29)` | Allows management and editing of webhooks | T | -| MANAGE_EMOJIS_AND_STICKERS \* | `0x0000000040000000` `(1L << 30)` | Allows management and editing of emojis and stickers | | -| USE_APPLICATION_COMMANDS | `0x0000000080000000` `(1L << 31)` | Allows members to use application commands, including slash commands and context menu commands. | T | -| REQUEST_TO_SPEAK | `0x0000000100000000` `(1L << 32)` | Allows for requesting to speak in stage channels. (_This permission is under active development and may be changed or removed._) | S | -| MANAGE_EVENTS | `0x0000000200000000` `(1L << 33)` | Allows for creating, editing, and deleting scheduled events | V, S | -| MANAGE_THREADS \* | `0x0000000400000000` `(1L << 34)` | Allows for deleting and archiving threads, and viewing all private threads | T | -| CREATE_PUBLIC_THREADS | `0x0000000800000000` `(1L << 35)` | Allows for creating threads | T | -| CREATE_PRIVATE_THREADS | `0x0000001000000000` `(1L << 36)` | Allows for creating private threads | T | -| USE_EXTERNAL_STICKERS | `0x0000002000000000` `(1L << 37)` | Allows the usage of custom stickers from other servers | T | -| SEND_MESSAGES_IN_THREADS | `0x0000004000000000` `(1L << 38)` | Allows for sending messages in threads | T | -| START_EMBEDDED_ACTIVITIES | `0x0000008000000000` `(1L << 39)` | Allows for launching activities (applications with the `EMBEDDED` flag) in a voice channel | V | -| MODERATE_MEMBERS | `0x0000010000000000` `(1L << 40)` | Allows for timing out users to prevent them from sending or reacting to messages in chat and threads, and from speaking in voice and stage channels | | - +| Permission | Value | Description | Channel Type | +| ----------------------------- | -------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------- | ------------ | +| CREATE_INSTANT_INVITE | `0x0000000000000001` `(1 << 0)` | Allows creation of instant invites | T, V, S | +| KICK_MEMBERS \* | `0x0000000000000002` `(1 << 1)` | Allows kicking members | | +| BAN_MEMBERS \* | `0x0000000000000004` `(1 << 2)` | Allows banning members | | +| ADMINISTRATOR \* | `0x0000000000000008` `(1 << 3)` | Allows all permissions and bypasses channel permission overwrites | | +| MANAGE_CHANNELS \* | `0x0000000000000010` `(1 << 4)` | Allows management and editing of channels | T, V, S | +| MANAGE_GUILD \* | `0x0000000000000020` `(1 << 5)` | Allows management and editing of the guild | | +| ADD_REACTIONS | `0x0000000000000040` `(1 << 6)` | Allows for the addition of reactions to messages | T | +| VIEW_AUDIT_LOG | `0x0000000000000080` `(1 << 7)` | Allows for viewing of audit logs | | +| PRIORITY_SPEAKER | `0x0000000000000100` `(1 << 8)` | Allows for using priority speaker in a voice channel | V | +| STREAM | `0x0000000000000200` `(1 << 9)` | Allows the user to go live | V | +| VIEW_CHANNEL | `0x0000000000000400` `(1 << 10)` | Allows guild members to view a channel, which includes reading messages in text channels | T, V, S | +| SEND_MESSAGES | `0x0000000000000800` `(1 << 11)` | Allows for sending messages in a channel (does not allow sending messages in threads) | T | +| SEND_TTS_MESSAGES | `0x0000000000001000` `(1 << 12)` | Allows for sending of `/tts` messages | T | +| MANAGE_MESSAGES \* | `0x0000000000002000` `(1 << 13)` | Allows for deletion of other users messages | T | +| EMBED_LINKS | `0x0000000000004000` `(1 << 14)` | Links sent by users with this permission will be auto-embedded | T | +| ATTACH_FILES | `0x0000000000008000` `(1 << 15)` | Allows for uploading images and files | T | +| READ_MESSAGE_HISTORY | `0x0000000000010000` `(1 << 16)` | Allows for reading of message history | T | +| MENTION_EVERYONE | `0x0000000000020000` `(1 << 17)` | Allows for using the `@everyone` tag to notify all users in a channel, and the `@here` tag to notify all online users in a channel | T | +| USE_EXTERNAL_EMOJIS | `0x0000000000040000` `(1 << 18)` | Allows the usage of custom emojis from other servers | T | +| VIEW_GUILD_INSIGHTS | `0x0000000000080000` `(1 << 19)` | Allows for viewing guild insights | | +| CONNECT | `0x0000000000100000` `(1 << 20)` | Allows for joining of a voice channel | V, S | +| SPEAK | `0x0000000000200000` `(1 << 21)` | Allows for speaking in a voice channel | V | +| MUTE_MEMBERS | `0x0000000000400000` `(1 << 22)` | Allows for muting members in a voice channel | V, S | +| DEAFEN_MEMBERS | `0x0000000000800000` `(1 << 23)` | Allows for deafening of members in a voice channel | V, S | +| MOVE_MEMBERS | `0x0000000001000000` `(1 << 24)` | Allows for moving of members between voice channels | V, S | +| USE_VAD | `0x0000000002000000` `(1 << 25)` | Allows for using voice-activity-detection in a voice channel | V | +| CHANGE_NICKNAME | `0x0000000004000000` `(1 << 26)` | Allows for modification of own nickname | | +| MANAGE_NICKNAMES | `0x0000000008000000` `(1 << 27)` | Allows for modification of other users nicknames | | +| MANAGE_ROLES \* | `0x0000000010000000` `(1 << 28)` | Allows management and editing of roles | T, V, S | +| MANAGE_WEBHOOKS \* | `0x0000000020000000` `(1 << 29)` | Allows management and editing of webhooks | T | +| MANAGE_EMOJIS_AND_STICKERS \* | `0x0000000040000000` `(1 << 30)` | Allows management and editing of emojis and stickers | | +| USE_APPLICATION_COMMANDS | `0x0000000080000000` `(1 << 31)` | Allows members to use application commands, including slash commands and context menu commands. | T | +| REQUEST_TO_SPEAK | `0x0000000100000000` `(1 << 32)` | Allows for requesting to speak in stage channels. (_This permission is under active development and may be changed or removed._) | S | +| MANAGE_EVENTS | `0x0000000200000000` `(1 << 33)` | Allows for creating, editing, and deleting scheduled events | V, S | +| MANAGE_THREADS \* | `0x0000000400000000` `(1 << 34)` | Allows for deleting and archiving threads, and viewing all private threads | T | +| CREATE_PUBLIC_THREADS | `0x0000000800000000` `(1 << 35)` | Allows for creating threads | T | +| CREATE_PRIVATE_THREADS | `0x0000001000000000` `(1 << 36)` | Allows for creating private threads | T | +| USE_EXTERNAL_STICKERS | `0x0000002000000000` `(1 << 37)` | Allows the usage of custom stickers from other servers | T | +| SEND_MESSAGES_IN_THREADS | `0x0000004000000000` `(1 << 38)` | Allows for sending messages in threads | T | +| START_EMBEDDED_ACTIVITIES | `0x0000008000000000` `(1 << 39)` | Allows for launching activities (applications with the `EMBEDDED` flag) in a voice channel | V | +| MODERATE_MEMBERS | `0x0000010000000000` `(1 << 40)` | Allows for timing out users to prevent them from sending or reacting to messages in chat and threads, and from speaking in voice and stage channels | | **\* These permissions require the owner account to use [two-factor authentication](#DOCS_TOPICS_OAUTH2/twofactor-authentication-requirement) when used on a guild that has server-wide 2FA enabled.** From 2acfd85e6a2e94ec8ee3b57ea94a8a8803cb42f9 Mon Sep 17 00:00:00 2001 From: Marvin Witt Date: Mon, 20 Dec 2021 19:28:41 +0100 Subject: [PATCH 13/21] chore: reference support article --- docs/resources/Guild.md | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/resources/Guild.md b/docs/resources/Guild.md index cd3a924394..21ca89c81f 100644 --- a/docs/resources/Guild.md +++ b/docs/resources/Guild.md @@ -280,19 +280,19 @@ A partial [guild](#DOCS_RESOURCES_GUILD/guild-object) object. Represents an Offl ###### Guild Member Structure -| Field | Type | Description | -| ----------------------------- | ----------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------- | -| user? | [user](#DOCS_RESOURCES_USER/user-object) object | the user this guild member represents | -| nick? | ?string | this users guild nickname | -| avatar? | ?string | the member's [guild avatar hash](#DOCS_REFERENCE/image-formatting) | -| roles | array of snowflakes | array of [role](#DOCS_TOPICS_PERMISSIONS/role-object) object ids | -| joined_at | ISO8601 timestamp | when the user joined the guild | -| premium_since? | ?ISO8601 timestamp | when the user started [boosting](https://support.discord.com/hc/en-us/articles/360028038352-Server-Boosting-) the guild | -| deaf | boolean | whether the user is deafened in voice channels | -| mute | boolean | whether the user is muted in voice channels | -| pending? | boolean | whether the user has not yet passed the guild's [Membership Screening](#DOCS_RESOURCES_GUILD/membership-screening-object) requirements | -| permissions? | string | total permissions of the member in the channel, including overwrites, returned when in the interaction object | -| communication_disabled_until? | ?ISO8601 timestamp | when the user's timeout will expire and the user's interaction in the guild is re-enabled, null if the user is not timed out | +| Field | Type | Description | +| ----------------------------- | ----------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | +| user? | [user](#DOCS_RESOURCES_USER/user-object) object | the user this guild member represents | +| nick? | ?string | this users guild nickname | +| avatar? | ?string | the member's [guild avatar hash](#DOCS_REFERENCE/image-formatting) | +| roles | array of snowflakes | array of [role](#DOCS_TOPICS_PERMISSIONS/role-object) object ids | +| joined_at | ISO8601 timestamp | when the user joined the guild | +| premium_since? | ?ISO8601 timestamp | when the user started [boosting](https://support.discord.com/hc/en-us/articles/360028038352-Server-Boosting-) the guild | +| deaf | boolean | whether the user is deafened in voice channels | +| mute | boolean | whether the user is muted in voice channels | +| pending? | boolean | whether the user has not yet passed the guild's [Membership Screening](#DOCS_RESOURCES_GUILD/membership-screening-object) requirements | +| permissions? | string | total permissions of the member in the channel, including overwrites, returned when in the interaction object | +| communication_disabled_until? | ?ISO8601 timestamp | when the user's [timeout](https://support.discord.com/hc/en-us/articles/4413305239191-Time-Out-FAQ) will expire and the user's interaction in the guild is re-enabled, null if the user is not timed out | > info > The field `user` won't be included in the member object attached to `MESSAGE_CREATE` and `MESSAGE_UPDATE` gateway events. From be51418fde6848131a6d9d5f68b47807f12370cc Mon Sep 17 00:00:00 2001 From: Lala Sabathil Date: Mon, 20 Dec 2021 20:12:48 +0100 Subject: [PATCH 14/21] Update docs/resources/Guild.md Co-authored-by: Advaith --- docs/resources/Guild.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/resources/Guild.md b/docs/resources/Guild.md index 21ca89c81f..116da3fbe4 100644 --- a/docs/resources/Guild.md +++ b/docs/resources/Guild.md @@ -778,14 +778,14 @@ Modify attributes of a [guild member](#DOCS_RESOURCES_GUILD/guild-member-object) ###### JSON Params -| Field | Type | Description | Permission | -| ---------------------------- | ------------------- | ---------------------------------------------------------------------------------------------------------------------------- | ---------------- | -| nick | string | value to set users nickname to | MANAGE_NICKNAMES | -| roles | array of snowflakes | array of role ids the member is assigned | MANAGE_ROLES | -| mute | boolean | whether the user is muted in voice channels. Will throw a 400 if the user is not in a voice channel | MUTE_MEMBERS | -| deaf | boolean | whether the user is deafened in voice channels. Will throw a 400 if the user is not in a voice channel | DEAFEN_MEMBERS | -| channel_id | snowflake | id of channel to move user to (if they are connected to voice) | MOVE_MEMBERS | -| communication_disabled_until | ?ISO8601 timestamp | when the user's timeout will expire and the user's interaction in the guild is re-enabled, null if the user is not timed out | MODERATE_MEMBERS | +| Field | Type | Description | Permission | +| ---------------------------- | ------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------ | ---------------- | +| nick | string | value to set users nickname to | MANAGE_NICKNAMES | +| roles | array of snowflakes | array of role ids the member is assigned | MANAGE_ROLES | +| mute | boolean | whether the user is muted in voice channels. Will throw a 400 if the user is not in a voice channel | MUTE_MEMBERS | +| deaf | boolean | whether the user is deafened in voice channels. Will throw a 400 if the user is not in a voice channel | DEAFEN_MEMBERS | +| channel_id | snowflake | id of channel to move user to (if they are connected to voice) | MOVE_MEMBERS | +| communication_disabled_until | ?ISO8601 timestamp | when the user's timeout will expire and the user's interaction in the guild is re-enabled (up to 28 days in the future), set to null to remove timeout | MODERATE_MEMBERS | ## Modify Current Member % PATCH /guilds/{guild.id#DOCS_RESOURCES_GUILD/guild-object}/members/@me From 6c934c1565307fe18702055733772e825c73776c Mon Sep 17 00:00:00 2001 From: Marvin Witt Date: Mon, 20 Dec 2021 20:14:37 +0100 Subject: [PATCH 15/21] chore: add `MODERATE_MEMBERS` to list of internal names with different names in the client --- docs/topics/Permissions.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/topics/Permissions.md b/docs/topics/Permissions.md index f051f267fe..13f37f5704 100644 --- a/docs/topics/Permissions.md +++ b/docs/topics/Permissions.md @@ -72,7 +72,7 @@ Below is a table of all current permissions, their integer values in hexadecimal **\* These permissions require the owner account to use [two-factor authentication](#DOCS_TOPICS_OAUTH2/twofactor-authentication-requirement) when used on a guild that has server-wide 2FA enabled.** -Note that these internal permission names may be referred to differently by the Discord client. For example, "Manage Permissions" refers to MANAGE_ROLES and "Use Voice Activity" refers to USE_VAD. +Note that these internal permission names may be referred to differently by the Discord client. For example, "Manage Permissions" refers to MANAGE_ROLES, "Use Voice Activity" refers to USE_VAD and "Timeout Members" refers to MODERATE_MEMBERS. ## Permission Hierarchy From 95e71b03bb440609b1120abc8334e8d0bb85cf62 Mon Sep 17 00:00:00 2001 From: Marvin Witt Date: Mon, 20 Dec 2021 20:18:49 +0100 Subject: [PATCH 16/21] fix: punctuation Co-authored-by: Advaith --- docs/topics/Permissions.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/topics/Permissions.md b/docs/topics/Permissions.md index 13f37f5704..c5e0cccde4 100644 --- a/docs/topics/Permissions.md +++ b/docs/topics/Permissions.md @@ -72,7 +72,7 @@ Below is a table of all current permissions, their integer values in hexadecimal **\* These permissions require the owner account to use [two-factor authentication](#DOCS_TOPICS_OAUTH2/twofactor-authentication-requirement) when used on a guild that has server-wide 2FA enabled.** -Note that these internal permission names may be referred to differently by the Discord client. For example, "Manage Permissions" refers to MANAGE_ROLES, "Use Voice Activity" refers to USE_VAD and "Timeout Members" refers to MODERATE_MEMBERS. +Note that these internal permission names may be referred to differently by the Discord client. For example, "Manage Permissions" refers to MANAGE_ROLES, "Use Voice Activity" refers to USE_VAD, and "Timeout Members" refers to MODERATE_MEMBERS. ## Permission Hierarchy From 65bbb107eded0452d1dafdc229999b38c99e0caf Mon Sep 17 00:00:00 2001 From: Lala Sabathil Date: Mon, 20 Dec 2021 20:27:59 +0100 Subject: [PATCH 17/21] Update docs/resources/Guild.md Co-authored-by: Advaith --- docs/resources/Guild.md | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/resources/Guild.md b/docs/resources/Guild.md index 116da3fbe4..a76f3f2e10 100644 --- a/docs/resources/Guild.md +++ b/docs/resources/Guild.md @@ -280,19 +280,19 @@ A partial [guild](#DOCS_RESOURCES_GUILD/guild-object) object. Represents an Offl ###### Guild Member Structure -| Field | Type | Description | -| ----------------------------- | ----------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -| user? | [user](#DOCS_RESOURCES_USER/user-object) object | the user this guild member represents | -| nick? | ?string | this users guild nickname | -| avatar? | ?string | the member's [guild avatar hash](#DOCS_REFERENCE/image-formatting) | -| roles | array of snowflakes | array of [role](#DOCS_TOPICS_PERMISSIONS/role-object) object ids | -| joined_at | ISO8601 timestamp | when the user joined the guild | -| premium_since? | ?ISO8601 timestamp | when the user started [boosting](https://support.discord.com/hc/en-us/articles/360028038352-Server-Boosting-) the guild | -| deaf | boolean | whether the user is deafened in voice channels | -| mute | boolean | whether the user is muted in voice channels | -| pending? | boolean | whether the user has not yet passed the guild's [Membership Screening](#DOCS_RESOURCES_GUILD/membership-screening-object) requirements | -| permissions? | string | total permissions of the member in the channel, including overwrites, returned when in the interaction object | -| communication_disabled_until? | ?ISO8601 timestamp | when the user's [timeout](https://support.discord.com/hc/en-us/articles/4413305239191-Time-Out-FAQ) will expire and the user's interaction in the guild is re-enabled, null if the user is not timed out | +| Field | Type | Description | +| ----------------------------- | ----------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | +| user? | [user](#DOCS_RESOURCES_USER/user-object) object | the user this guild member represents | +| nick? | ?string | this users guild nickname | +| avatar? | ?string | the member's [guild avatar hash](#DOCS_REFERENCE/image-formatting) | +| roles | array of snowflakes | array of [role](#DOCS_TOPICS_PERMISSIONS/role-object) object ids | +| joined_at | ISO8601 timestamp | when the user joined the guild | +| premium_since? | ?ISO8601 timestamp | when the user started [boosting](https://support.discord.com/hc/en-us/articles/360028038352-Server-Boosting-) the guild | +| deaf | boolean | whether the user is deafened in voice channels | +| mute | boolean | whether the user is muted in voice channels | +| pending? | boolean | whether the user has not yet passed the guild's [Membership Screening](#DOCS_RESOURCES_GUILD/membership-screening-object) requirements | +| permissions? | string | total permissions of the member in the channel, including overwrites, returned when in the interaction object | +| communication_disabled_until? | ?ISO8601 timestamp | when the user's [timeout](https://support.discord.com/hc/en-us/articles/4413305239191-Time-Out-FAQ) will expire and the user will be able to communicate in the guild again, null or a time in the past if the user is not timed out | > info > The field `user` won't be included in the member object attached to `MESSAGE_CREATE` and `MESSAGE_UPDATE` gateway events. From d3635096b023ee3137d9968a2d6616fcd7a2f938 Mon Sep 17 00:00:00 2001 From: Lala Sabathil Date: Mon, 20 Dec 2021 20:35:32 +0100 Subject: [PATCH 18/21] Update docs/topics/Gateway.md Co-authored-by: Advaith --- docs/topics/Gateway.md | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/topics/Gateway.md b/docs/topics/Gateway.md index 8c4bee4f2e..503202da9e 100644 --- a/docs/topics/Gateway.md +++ b/docs/topics/Gateway.md @@ -1010,19 +1010,19 @@ Sent when a guild member is updated. This will also fire when the user object of ###### Guild Member Update Event Fields -| Field | Type | Description | -| ----------------------------- | ------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------- | -| guild_id | snowflake | the id of the guild | -| roles | array of snowflakes | user role ids | -| user | a [user](#DOCS_RESOURCES_USER/user-object) object | the user | -| nick? | ?string | nickname of the user in the guild | -| avatar | ?string | the member's [guild avatar hash](#DOCS_REFERENCE/image-formatting) | -| joined_at | ?ISO8601 timestamp | when the user joined the guild | -| premium_since? | ?ISO8601 timestamp | when the user starting [boosting](https://support.discord.com/hc/en-us/articles/360028038352-Server-Boosting-) the guild | -| deaf? | boolean | whether the user is deafened in voice channels | -| mute? | boolean | whether the user is muted in voice channels | -| pending? | boolean | whether the user has not yet passed the guild's [Membership Screening](#DOCS_RESOURCES_GUILD/membership-screening-object) requirements | -| communication_disabled_until? | ?ISO8601 timestamp | when the user's timeout will expire and the user's interaction in the guild is re-enabled, null if the user is not timed out | +| Field | Type | Description | +| ----------------------------- | ------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | +| guild_id | snowflake | the id of the guild | +| roles | array of snowflakes | user role ids | +| user | a [user](#DOCS_RESOURCES_USER/user-object) object | the user | +| nick? | ?string | nickname of the user in the guild | +| avatar | ?string | the member's [guild avatar hash](#DOCS_REFERENCE/image-formatting) | +| joined_at | ?ISO8601 timestamp | when the user joined the guild | +| premium_since? | ?ISO8601 timestamp | when the user starting [boosting](https://support.discord.com/hc/en-us/articles/360028038352-Server-Boosting-) the guild | +| deaf? | boolean | whether the user is deafened in voice channels | +| mute? | boolean | whether the user is muted in voice channels | +| pending? | boolean | whether the user has not yet passed the guild's [Membership Screening](#DOCS_RESOURCES_GUILD/membership-screening-object) requirements | +| communication_disabled_until? | ?ISO8601 timestamp | when the user's [timeout](https://support.discord.com/hc/en-us/articles/4413305239191-Time-Out-FAQ) will expire and the user will be able to communicate in the guild again, null or a time in the past if the user is not timed out | #### Guild Members Chunk From 8da728b209305d650504d821d8cc34537ef8998c Mon Sep 17 00:00:00 2001 From: Lala Sabathil Date: Mon, 20 Dec 2021 20:35:38 +0100 Subject: [PATCH 19/21] Update docs/resources/Guild.md Co-authored-by: Advaith --- docs/resources/Guild.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/resources/Guild.md b/docs/resources/Guild.md index a76f3f2e10..9c820e31cd 100644 --- a/docs/resources/Guild.md +++ b/docs/resources/Guild.md @@ -778,14 +778,14 @@ Modify attributes of a [guild member](#DOCS_RESOURCES_GUILD/guild-member-object) ###### JSON Params -| Field | Type | Description | Permission | -| ---------------------------- | ------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------ | ---------------- | -| nick | string | value to set users nickname to | MANAGE_NICKNAMES | -| roles | array of snowflakes | array of role ids the member is assigned | MANAGE_ROLES | -| mute | boolean | whether the user is muted in voice channels. Will throw a 400 if the user is not in a voice channel | MUTE_MEMBERS | -| deaf | boolean | whether the user is deafened in voice channels. Will throw a 400 if the user is not in a voice channel | DEAFEN_MEMBERS | -| channel_id | snowflake | id of channel to move user to (if they are connected to voice) | MOVE_MEMBERS | -| communication_disabled_until | ?ISO8601 timestamp | when the user's timeout will expire and the user's interaction in the guild is re-enabled (up to 28 days in the future), set to null to remove timeout | MODERATE_MEMBERS | +| Field | Type | Description | Permission | +| ---------------------------- | ------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------- | +| nick | string | value to set users nickname to | MANAGE_NICKNAMES | +| roles | array of snowflakes | array of role ids the member is assigned | MANAGE_ROLES | +| mute | boolean | whether the user is muted in voice channels. Will throw a 400 if the user is not in a voice channel | MUTE_MEMBERS | +| deaf | boolean | whether the user is deafened in voice channels. Will throw a 400 if the user is not in a voice channel | DEAFEN_MEMBERS | +| channel_id | snowflake | id of channel to move user to (if they are connected to voice) | MOVE_MEMBERS | +| communication_disabled_until | ?ISO8601 timestamp | when the user's [timeout](https://support.discord.com/hc/en-us/articles/4413305239191-Time-Out-FAQ) will expire and the user will be able to communicate in the guild again (up to 28 days in the future), set to null to remove timeout | MODERATE_MEMBERS | ## Modify Current Member % PATCH /guilds/{guild.id#DOCS_RESOURCES_GUILD/guild-object}/members/@me From 6ba9994def83bd61792cadcfbfc640b272de0376 Mon Sep 17 00:00:00 2001 From: Ian Webster Date: Mon, 20 Dec 2021 14:43:43 -0500 Subject: [PATCH 20/21] add apostrophe --- docs/resources/Guild.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/resources/Guild.md b/docs/resources/Guild.md index 9c820e31cd..4d69112564 100644 --- a/docs/resources/Guild.md +++ b/docs/resources/Guild.md @@ -283,7 +283,7 @@ A partial [guild](#DOCS_RESOURCES_GUILD/guild-object) object. Represents an Offl | Field | Type | Description | | ----------------------------- | ----------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | | user? | [user](#DOCS_RESOURCES_USER/user-object) object | the user this guild member represents | -| nick? | ?string | this users guild nickname | +| nick? | ?string | this user's guild nickname | | avatar? | ?string | the member's [guild avatar hash](#DOCS_REFERENCE/image-formatting) | | roles | array of snowflakes | array of [role](#DOCS_TOPICS_PERMISSIONS/role-object) object ids | | joined_at | ISO8601 timestamp | when the user joined the guild | From ff789a4e1fdeb0accb088bd3d7eae3279748060a Mon Sep 17 00:00:00 2001 From: Ian Webster Date: Mon, 20 Dec 2021 14:47:27 -0500 Subject: [PATCH 21/21] more apostrophes!! --- docs/resources/Guild.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/resources/Guild.md b/docs/resources/Guild.md index 4d69112564..5c91c884b4 100644 --- a/docs/resources/Guild.md +++ b/docs/resources/Guild.md @@ -758,7 +758,7 @@ For guilds with [Membership Screening](#DOCS_RESOURCES_GUILD/membership-screenin | Field | Type | Description | Permission | | ------------ | ------------------- | ------------------------------------------------------------------------------------------------------------------------ | ---------------- | | access_token | string | an oauth2 access token granted with the `guilds.join` to the bot's application for the user you want to add to the guild | | -| nick | string | value to set users nickname to | MANAGE_NICKNAMES | +| nick | string | value to set user's nickname to | MANAGE_NICKNAMES | | roles | array of snowflakes | array of role ids the member is assigned | MANAGE_ROLES | | mute | boolean | whether the user is muted in voice channels | MUTE_MEMBERS | | deaf | boolean | whether the user is deafened in voice channels | DEAFEN_MEMBERS | @@ -780,7 +780,7 @@ Modify attributes of a [guild member](#DOCS_RESOURCES_GUILD/guild-member-object) | Field | Type | Description | Permission | | ---------------------------- | ------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------- | -| nick | string | value to set users nickname to | MANAGE_NICKNAMES | +| nick | string | value to set user's nickname to | MANAGE_NICKNAMES | | roles | array of snowflakes | array of role ids the member is assigned | MANAGE_ROLES | | mute | boolean | whether the user is muted in voice channels. Will throw a 400 if the user is not in a voice channel | MUTE_MEMBERS | | deaf | boolean | whether the user is deafened in voice channels. Will throw a 400 if the user is not in a voice channel | DEAFEN_MEMBERS | @@ -796,9 +796,9 @@ Modifies the current member in a guild. Returns a 200 with the updated member ob ###### JSON Params -| Field | Type | Description | Permission | -| ----- | ------- | ------------------------------ | --------------- | -| nick? | ?string | value to set users nickname to | CHANGE_NICKNAME | +| Field | Type | Description | Permission | +| ----- | ------- | ------------------------------- | --------------- | +| nick? | ?string | value to set user's nickname to | CHANGE_NICKNAME | ## Modify Current User Nick % PATCH /guilds/{guild.id#DOCS_RESOURCES_GUILD/guild-object}/members/@me/nick @@ -812,9 +812,9 @@ Modifies the nickname of the current user in a guild. Returns a 200 with the nic ###### JSON Params -| Field | Type | Description | Permission | -| ----- | ------- | ------------------------------ | --------------- | -| nick? | ?string | value to set users nickname to | CHANGE_NICKNAME | +| Field | Type | Description | Permission | +| ----- | ------- | ------------------------------- | --------------- | +| nick? | ?string | value to set user's nickname to | CHANGE_NICKNAME | ## Add Guild Member Role % PUT /guilds/{guild.id#DOCS_RESOURCES_GUILD/guild-object}/members/{user.id#DOCS_RESOURCES_USER/user-object}/roles/{role.id#DOCS_TOPICS_PERMISSIONS/role-object}