From e4d0e2988552b25a76b6e5f5d722947b59459848 Mon Sep 17 00:00:00 2001
From: quin lynch <lynchquin@gmail.com>
Date: Sat, 3 Jul 2021 12:10:16 -0300
Subject: [PATCH] Fix #25

---
 .../Discord.Net.Commands.csproj               |   4 +-
 src/Discord.Net.Core/Discord.Net.Core.xml     |   2 +-
 .../Entities/Permissions/ChannelPermission.cs |  80 ++++++++++----
 src/Discord.Net.Rest/Discord.Net.Rest.csproj  |   2 +-
 src/Discord.Net.Rest/Discord.Net.Rest.xml     |   9 +-
 .../Discord.Net.WebSocket.csproj              |   2 +-
 .../Discord.Net.WebSocket.xml                 | 101 +-----------------
 .../Discord.Net.Webhook.csproj                |   4 +-
 src/Discord.Net/Discord.Net.nuspec            |  32 +++---
 9 files changed, 87 insertions(+), 149 deletions(-)

diff --git a/src/Discord.Net.Commands/Discord.Net.Commands.csproj b/src/Discord.Net.Commands/Discord.Net.Commands.csproj
index 3a189d2bf..1d786bae4 100644
--- a/src/Discord.Net.Commands/Discord.Net.Commands.csproj
+++ b/src/Discord.Net.Commands/Discord.Net.Commands.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="../../Discord.Net.targets" />
   <Import Project="../../StyleAnalyzer.targets" />
   <PropertyGroup>
@@ -7,7 +7,7 @@
     <Description>A Discord.Net Labs extension adding support for bot commands.</Description>
     <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net461;netstandard2.0;netstandard2.1</TargetFrameworks>
     <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netstandard2.0;netstandard2.1</TargetFrameworks>
-    <Version>2.3.4</Version>
+    <Version>2.3.5</Version>
     <PackageId>Discord.Net.Labs.Commands</PackageId>
     <PackageProjectUrl>https://github.com/Discord-Net-Labs/Discord.Net-Labs</PackageProjectUrl>
     <RepositoryUrl>https://github.com/Discord-Net-Labs/Discord.Net-Labs</RepositoryUrl>
diff --git a/src/Discord.Net.Core/Discord.Net.Core.xml b/src/Discord.Net.Core/Discord.Net.Core.xml
index e33891477..6b58a53eb 100644
--- a/src/Discord.Net.Core/Discord.Net.Core.xml
+++ b/src/Discord.Net.Core/Discord.Net.Core.xml
@@ -6414,7 +6414,7 @@
         </member>
         <member name="P:Discord.IMessage.Type">
             <summary>
-                Gets the type of this system message.
+                Gets the type of this message.
             </summary>
         </member>
         <member name="P:Discord.IMessage.Source">
diff --git a/src/Discord.Net.Core/Entities/Permissions/ChannelPermission.cs b/src/Discord.Net.Core/Entities/Permissions/ChannelPermission.cs
index bf08887bd..99e74bd48 100644
--- a/src/Discord.Net.Core/Entities/Permissions/ChannelPermission.cs
+++ b/src/Discord.Net.Core/Entities/Permissions/ChannelPermission.cs
@@ -10,94 +10,130 @@ namespace Discord
         /// <summary>
         ///     Allows creation of instant invites.
         /// </summary>
-        CreateInstantInvite	= 0x00_00_00_01,
+        CreateInstantInvite	= 0x00_00_00_00_01,
         /// <summary>
         ///     Allows management and editing of channels.
         /// </summary>
-        ManageChannels		= 0x00_00_00_10,
+        ManageChannels		= 0x00_00_00_00_10,
 
         // Text
         /// <summary>
         ///     Allows for the addition of reactions to messages.
         /// </summary>
-        AddReactions		= 0x00_00_00_40,
+        AddReactions		= 0x00_00_00_00_40,
         /// <summary>
         ///     Allows guild members to view a channel, which includes reading messages in text channels.
         /// </summary>
-        ViewChannel			= 0x00_00_04_00,
+        ViewChannel			= 0x00_00_00_04_00,
         /// <summary>
         ///     Allows for sending messages in a channel.
         /// </summary>
-        SendMessages		= 0x00_00_08_00,
+        SendMessages		= 0x00_00_00_08_00,
         /// <summary>
         ///     Allows for sending of text-to-speech messages.
         /// </summary>
-        SendTTSMessages		= 0x00_00_10_00,
+        SendTTSMessages		= 0x00_00_00_10_00,
         /// <summary>
         ///     Allows for deletion of other users messages.
         /// </summary>
-        ManageMessages		= 0x00_00_20_00,
+        ManageMessages		= 0x00_00_00_20_00,
         /// <summary>
         ///     Allows links sent by users with this permission will be auto-embedded.
         /// </summary>
-        EmbedLinks			= 0x00_00_40_00,
+        EmbedLinks			= 0x00_00_00_40_00,
         /// <summary>
         ///     Allows for uploading images and files.
         /// </summary>
-        AttachFiles         = 0x00_00_80_00,
+        AttachFiles         = 0x00_00_00_80_00,
         /// <summary>
         ///     Allows for reading of message history.
         /// </summary>
-        ReadMessageHistory	= 0x00_01_00_00,
+        ReadMessageHistory	= 0x00_00_01_00_00,
         /// <summary>
         ///     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.
         /// </summary>
-        MentionEveryone     = 0x00_02_00_00,
+        MentionEveryone     = 0x00_00_02_00_00,
         /// <summary>
         ///     Allows the usage of custom emojis from other servers.
         /// </summary>
-        UseExternalEmojis   = 0x00_04_00_00,
+        UseExternalEmojis   = 0x00_00_04_00_00,
 
         // Voice
         /// <summary>
         ///     Allows for joining of a voice channel.
         /// </summary>
-        Connect				= 0x00_10_00_00,
+        Connect				= 0x00_00_10_00_00,
         /// <summary>
         ///     Allows for speaking in a voice channel.
         /// </summary>
-        Speak				= 0x00_20_00_00,
+        Speak				= 0x00_00_20_00_00,
         /// <summary>
         ///     Allows for muting members in a voice channel.
         /// </summary>
-        MuteMembers			= 0x00_40_00_00,
+        MuteMembers			= 0x00_00_40_00_00,
         /// <summary>
         ///     Allows for deafening of members in a voice channel.
         /// </summary>
-        DeafenMembers		= 0x00_80_00_00,
+        DeafenMembers		= 0x00_00_80_00_00,
         /// <summary>
         ///     Allows for moving of members between voice channels.
         /// </summary>
-        MoveMembers         = 0x01_00_00_00,
+        MoveMembers         = 0x00_01_00_00_00,
         /// <summary>
         ///     Allows for using voice-activity-detection in a voice channel.
         /// </summary>
-        UseVAD         		= 0x02_00_00_00,
-        PrioritySpeaker     = 0x00_00_01_00,
+        UseVAD         		= 0x00_02_00_00_00,
+
+        /// <summary>
+        ///     Allows for using priority speaker in a voice channel.
+        /// </summary>
+        PrioritySpeaker     = 0x00_00_00_01_00,
+
         /// <summary>
         ///     Allows video streaming in a voice channel.
         /// </summary>
-        Stream              = 0x00_00_02_00,
+        Stream              = 0x00_00_00_02_00,
 
         // More General
         /// <summary>
         ///     Allows management and editing of roles.
         /// </summary>
-        ManageRoles         = 0x10_00_00_00,
+        ManageRoles         = 0x00_10_00_00_00,
         /// <summary>
         ///     Allows management and editing of webhooks.
         /// </summary>
-        ManageWebhooks		= 0x20_00_00_00,
+        ManageWebhooks		= 0x00_20_00_00_00,
+
+        /// <summary>
+        ///     Allows management and editing of emojis.
+        /// </summary>
+        ManageEmojis        = 0x00_40_00_00_00,
+
+        /// <summary>
+        ///     Allows members to use slash commands in text channels.
+        /// </summary>
+        UseSlashCommands    = 0x00_80_00_00_00,
+
+        /// <summary>
+        ///     Allows for requesting to speak in stage channels. (This permission is under active development and may be changed or removed.)
+        /// </summary>
+        RequesToSpeak       = 0x01_00_00_00_00,
+
+        /// <summary>
+        ///     Allows for deleting and archiving threads, and viewing all private threads
+        /// </summary>
+        ManageThreads       = 0x04_00_00_00_00,
+
+        /// <summary>
+        ///     Allows for creating and participating in threads
+        /// </summary>
+        UsePublicThreads    = 0x08_00_00_00_00,
+
+        /// <summary>
+        ///     Allows for creating and participating in private threads
+        /// </summary>
+        UsePrivateThreads   = 0x10_00_00_00_00,
+
     }
 }
diff --git a/src/Discord.Net.Rest/Discord.Net.Rest.csproj b/src/Discord.Net.Rest/Discord.Net.Rest.csproj
index 3793f680e..b61ee4955 100644
--- a/src/Discord.Net.Rest/Discord.Net.Rest.csproj
+++ b/src/Discord.Net.Rest/Discord.Net.Rest.csproj
@@ -9,7 +9,7 @@
     <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netstandard2.0;netstandard2.1</TargetFrameworks>
     <PackageIcon>Temporary.png</PackageIcon>
     <PackageProjectUrl>https://github.com/Discord-Net-Labs/Discord.Net-Labs</PackageProjectUrl>
-    <Version>2.3.9-dev</Version>
+    <Version>2.4.0</Version>
     <PackageId>Discord.Net.Labs.Rest</PackageId>
     <RepositoryUrl>https://github.com/Discord-Net-Labs/Discord.Net-Labs</RepositoryUrl>
     <AssemblyVersion>2.3.4</AssemblyVersion>
diff --git a/src/Discord.Net.Rest/Discord.Net.Rest.xml b/src/Discord.Net.Rest/Discord.Net.Rest.xml
index 3e0948f7b..35622a349 100644
--- a/src/Discord.Net.Rest/Discord.Net.Rest.xml
+++ b/src/Discord.Net.Rest/Discord.Net.Rest.xml
@@ -3718,6 +3718,9 @@
         <member name="P:Discord.Rest.RestMessage.Flags">
             <inheritdoc />
         </member>
+        <member name="P:Discord.Rest.RestMessage.Type">
+            <inheritdoc/>
+        </member>
         <member name="P:Discord.Rest.RestMessage.Components">
             <inheritdoc/>
         </member>
@@ -3735,9 +3738,6 @@
                 A string that is the <see cref="P:Discord.Rest.RestMessage.Content"/> of the message.
             </returns>
         </member>
-        <member name="P:Discord.Rest.RestMessage.Discord#IMessage#Type">
-            <inheritdoc />
-        </member>
         <member name="P:Discord.Rest.RestMessage.Discord#IMessage#Attachments">
             <inheritdoc />
         </member>
@@ -3797,9 +3797,6 @@
                 Represents a REST-based system message.
             </summary>
         </member>
-        <member name="P:Discord.Rest.RestSystemMessage.Type">
-            <inheritdoc />
-        </member>
         <member name="T:Discord.Rest.RestUserMessage">
             <summary>
                 Represents a REST-based message sent by a user.
diff --git a/src/Discord.Net.WebSocket/Discord.Net.WebSocket.csproj b/src/Discord.Net.WebSocket/Discord.Net.WebSocket.csproj
index 56bb5a902..53fcfb92e 100644
--- a/src/Discord.Net.WebSocket/Discord.Net.WebSocket.csproj
+++ b/src/Discord.Net.WebSocket/Discord.Net.WebSocket.csproj
@@ -8,7 +8,7 @@
     <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net461;netstandard2.0;netstandard2.1</TargetFrameworks>
     <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netstandard2.0;netstandard2.1</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Version>2.3.10</Version>
+    <Version>2.4.0</Version>
     <RepositoryUrl>https://github.com/Discord-Net-Labs/Discord.Net-Labs</RepositoryUrl>
     <PackageProjectUrl>https://github.com/Discord-Net-Labs/Discord.Net-Labs</PackageProjectUrl>
     <PackageIcon>Temporary.png</PackageIcon>
diff --git a/src/Discord.Net.WebSocket/Discord.Net.WebSocket.xml b/src/Discord.Net.WebSocket/Discord.Net.WebSocket.xml
index 8dcbd0fcf..7a4eaf364 100644
--- a/src/Discord.Net.WebSocket/Discord.Net.WebSocket.xml
+++ b/src/Discord.Net.WebSocket/Discord.Net.WebSocket.xml
@@ -3441,98 +3441,6 @@
                 A task that represents the asynchronous operation of acknowledging the interaction.
             </returns>
         </member>
-        <member name="P:Discord.WebSocket.ISocketInvite.Code">
-            <summary>
-                Gets the unique identifier for this invite.
-            </summary>
-            <returns>
-                A string containing the invite code (e.g. <c>FTqNnyS</c>).
-            </returns>
-        </member>
-        <member name="P:Discord.WebSocket.ISocketInvite.Url">
-            <summary>
-                Gets the URL used to accept this invite
-            </summary>
-            <returns>
-                A string containing the full invite URL (e.g. <c>https://discord.gg/FTqNnyS</c>).
-            </returns>
-        </member>
-        <member name="P:Discord.WebSocket.ISocketInvite.Channel">
-            <summary>
-                Gets the channel this invite is linked to.
-            </summary>
-            <returns>
-                A generic channel that the invite points to.
-            </returns>
-        </member>
-        <member name="P:Discord.WebSocket.ISocketInvite.Guild">
-            <summary>
-                Gets the guild this invite is linked to.
-            </summary>
-            <returns>
-                A guild object representing the guild that the invite points to.
-            </returns>
-        </member>
-        <member name="T:Discord.WebSocket.SocketGuildInvite">
-            <summary>
-            Represents a guild invite
-            </summary>
-        </member>
-        <member name="P:Discord.WebSocket.SocketGuildInvite.Id">
-            <summary>
-            Gets the unique invite code
-            <returns>
-                Returns the unique invite code
-            </returns>
-            </summary>
-        </member>
-        <member name="P:Discord.WebSocket.SocketGuildInvite.Inviter">
-            <summary>
-            Gets the user who created the invite
-            <returns>
-                Returns the user who created the invite
-            </returns>
-            </summary>
-        </member>
-        <member name="P:Discord.WebSocket.SocketGuildInvite.MaxUses">
-            <summary>
-            Gets the maximum number of times the invite can be used, if there is no limit then the value will be 0
-            <returns>
-                Returns the maximum number of times the invite can be used,  if there is no limit then the value will be 0
-            </returns>
-            </summary>
-        </member>
-        <member name="P:Discord.WebSocket.SocketGuildInvite.Temporary">
-            <summary>
-            Gets whether or not the invite is temporary (invited users will be kicked on disconnect unless they're assigned a role)
-            <returns>
-                Returns whether or not the invite is temporary (invited users will be kicked on disconnect unless they're assigned a role)
-            </returns>
-            </summary>
-        </member>
-        <member name="P:Discord.WebSocket.SocketGuildInvite.CreatedAt">
-            <summary>
-            Gets the time at which the invite was created
-            <returns>
-                Returns the time at which the invite was created
-            </returns>
-            </summary>
-        </member>
-        <member name="P:Discord.WebSocket.SocketGuildInvite.MaxAge">
-            <summary>
-            Gets how long the invite is valid for 
-            <returns>
-                Returns how long the invite is valid for (in seconds)
-            </returns>
-            </summary>
-        </member>
-        <member name="M:Discord.WebSocket.SocketGuildInvite.DeleteAsync(Discord.RequestOptions)">
-            <summary>
-            Deletes the invite
-            </summary>
-            <param name="options"></param>
-            <returns></returns>
-        </member>
         <member name="P:Discord.WebSocket.SocketInvite.ChannelId">
             <inheritdoc />
         </member>
@@ -3706,6 +3614,9 @@
         <member name="P:Discord.WebSocket.SocketMessage.Flags">
             <inheritdoc />
         </member>
+        <member name="P:Discord.WebSocket.SocketMessage.Type">
+            <inheritdoc/>
+        </member>
         <member name="P:Discord.WebSocket.SocketMessage.Attachments">
             <summary>
                 Returns all attachments included in this message.
@@ -3775,9 +3686,6 @@
         <member name="P:Discord.WebSocket.SocketMessage.Discord#IMessage#Channel">
             <inheritdoc />
         </member>
-        <member name="P:Discord.WebSocket.SocketMessage.Discord#IMessage#Type">
-            <inheritdoc />
-        </member>
         <member name="P:Discord.WebSocket.SocketMessage.Discord#IMessage#Attachments">
             <inheritdoc />
         </member>
@@ -3895,9 +3803,6 @@
                 Represents a WebSocket-based message sent by the system.
             </summary>
         </member>
-        <member name="P:Discord.WebSocket.SocketSystemMessage.Type">
-            <inheritdoc />
-        </member>
         <member name="T:Discord.WebSocket.SocketUserMessage">
             <summary>
                 Represents a WebSocket-based message sent by a user.
diff --git a/src/Discord.Net.Webhook/Discord.Net.Webhook.csproj b/src/Discord.Net.Webhook/Discord.Net.Webhook.csproj
index 295e981aa..13e5cf111 100644
--- a/src/Discord.Net.Webhook/Discord.Net.Webhook.csproj
+++ b/src/Discord.Net.Webhook/Discord.Net.Webhook.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="../../Discord.Net.targets" />
   <Import Project="../../StyleAnalyzer.targets" />
   <PropertyGroup>
@@ -6,7 +6,7 @@
     <RootNamespace>Discord.Webhook</RootNamespace>
     <Description>A core Discord.Net Labs library containing the Webhook client and models.</Description>
     <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
-    <Version>2.3.3</Version>
+    <Version>2.3.4</Version>
     <PackageId>Discord.Net.Labs.Webhook</PackageId>
     <PackageProjectUrl>https://github.com/Discord-Net-Labs/Discord.Net-Labs</PackageProjectUrl>
     <RepositoryUrl>https://github.com/Discord-Net-Labs/Discord.Net-Labs</RepositoryUrl>
diff --git a/src/Discord.Net/Discord.Net.nuspec b/src/Discord.Net/Discord.Net.nuspec
index 2aaa72d02..a8b21ad21 100644
--- a/src/Discord.Net/Discord.Net.nuspec
+++ b/src/Discord.Net/Discord.Net.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Discord.Net.Labs</id>
-    <version>2.3.8-dev$suffix$</version>
+    <version>2.4.0$suffix$</version>
     <title>Discord.Net Labs</title>
     <authors>Discord.Net Contributors</authors>
     <owners>quinchs</owners>
@@ -14,25 +14,25 @@
     <iconUrl>https://avatars.githubusercontent.com/u/84047264</iconUrl>
     <dependencies>
         <group targetFramework="net461">
-            <dependency id="Discord.Net.Labs.Core" version="2.3.9-dev$suffix$" />
-            <dependency id="Discord.Net.Labs.Rest" version="2.3.9-dev$suffix$" />
-            <dependency id="Discord.Net.Labs.WebSocket" version="2.3.9-dev$suffix$" />
-            <dependency id="Discord.Net.Labs.Commands" version="2.3.4$suffix$" />
-            <dependency id="Discord.Net.Labs.Webhook" version="2.3.3$suffix$" />
+            <dependency id="Discord.Net.Labs.Core" version="2.4.0$suffix$" />
+            <dependency id="Discord.Net.Labs.Rest" version="2.4.0$suffix$" />
+            <dependency id="Discord.Net.Labs.WebSocket" version="2.4.0$suffix$" />
+            <dependency id="Discord.Net.Labs.Commands" version="2.3.5$suffix$" />
+            <dependency id="Discord.Net.Labs.Webhook" version="2.3.4$suffix$" />
         </group>       
         <group targetFramework="netstandard2.0">
-            <dependency id="Discord.Net.Labs.Core" version="2.3.9-dev$suffix$" />
-            <dependency id="Discord.Net.Labs.Rest" version="2.3.9-dev$suffix$" />
-            <dependency id="Discord.Net.Labs.WebSocket" version="2.3.9-dev$suffix$" />
-            <dependency id="Discord.Net.Labs.Commands" version="2.3.4$suffix$" />
-            <dependency id="Discord.Net.Labs.Webhook" version="2.3.3$suffix$" />
+            <dependency id="Discord.Net.Labs.Core" version="2.4.0$suffix$" />
+            <dependency id="Discord.Net.Labs.Rest" version="2.4.0$suffix$" />
+            <dependency id="Discord.Net.Labs.WebSocket" version="2.4.0$suffix$" />
+            <dependency id="Discord.Net.Labs.Commands" version="2.3.5$suffix$" />
+            <dependency id="Discord.Net.Labs.Webhook" version="2.3.4$suffix$" />
         </group>
 		<group targetFramework="netstandard2.1">
-            <dependency id="Discord.Net.Labs.Core" version="2.3.9-dev$suffix$" />
-            <dependency id="Discord.Net.Labs.Rest" version="2.3.9-dev$suffix$" />
-            <dependency id="Discord.Net.Labs.WebSocket" version="2.3.9-dev$suffix$" />
-            <dependency id="Discord.Net.Labs.Commands" version="2.3.4$suffix$" />
-            <dependency id="Discord.Net.Labs.Webhook" version="2.3.3$suffix$" />
+            <dependency id="Discord.Net.Labs.Core" version="2.4.0$suffix$" />
+            <dependency id="Discord.Net.Labs.Rest" version="2.4.0$suffix$" />
+            <dependency id="Discord.Net.Labs.WebSocket" version="2.4.0$suffix$" />
+            <dependency id="Discord.Net.Labs.Commands" version="2.3.5$suffix$" />
+            <dependency id="Discord.Net.Labs.Webhook" version="2.3.4$suffix$" />
         </group>
     </dependencies>
   </metadata>