Merge pull request #51 from dassjosh/2.1-bug-fixes

2.1 bug fixes
Kirollos · Aug 25, 2022 · 7058b14 · 7058b14
2 parents 7b8a051 + 484b0f6
commit 7058b14
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/Oxide.Ext.Discord/DiscordClient.cs b/Oxide.Ext.Discord/DiscordClient.cs
@@ -19,7 +19,7 @@ public class DiscordClient
     {
         internal static readonly Hash<string, DiscordClient> Clients = new Hash<string, DiscordClient>();
 
-        private static readonly Regex TokenValidator = new Regex(@"^[\w-]{24}\.[\w-]{6}\.[\w-]+$", RegexOptions.Compiled);
+        private static readonly Regex TokenValidator = new Regex(@"^[\w-]+\.[\w-]+\.[\w-]+$", RegexOptions.Compiled);
 
         /// <summary>
         /// Which plugin is the owner of this client

diff --git a/Oxide.Ext.Discord/DiscordExtension.cs b/Oxide.Ext.Discord/DiscordExtension.cs
@@ -34,7 +34,7 @@ public class DiscordExtension : Extension
         /// <summary>
         /// Version number of the extension
         /// </summary>
-        private static readonly VersionNumber ExtensionVersion = new VersionNumber(2, 1, 5);
+        private static readonly VersionNumber ExtensionVersion = new VersionNumber(2, 1, 6);
 
         /// <summary>
         /// Global logger for areas that aren't part of a client connection

diff --git a/Oxide.Ext.Discord/Entities/Api/RateLimit.cs b/Oxide.Ext.Discord/Entities/Api/RateLimit.cs
@@ -18,7 +18,7 @@ public class RateLimit
         /// The number of seconds to wait before submitting another request.
         /// </summary>
         [JsonProperty("retry_after")]
-        public int RetryAfter { get; set; }
+        public float RetryAfter { get; set; }
 
         /// <summary>
         /// A value indicating if you are being globally rate limited or not

diff --git a/Oxide.Ext.Discord/Oxide.Ext.Discord.csproj b/Oxide.Ext.Discord/Oxide.Ext.Discord.csproj
@@ -2,16 +2,16 @@
 <Project>
   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
   <PropertyGroup>
-    <Version>2.0.3.0</Version>
+    <Version>2.1.6.0</Version>
     <AssemblyName>Oxide.Ext.Discord</AssemblyName>
     <Authors>Kirollos</Authors>
     <Description>An Oxide extension for Discord.</Description>
     <RepositoryUrl>https://github.com/Kirollos/Oxide.Ext.Discord</RepositoryUrl>
     <TargetFrameworks>net46;net48</TargetFrameworks>
     <LangVersion>7.0</LangVersion>
-    <PackageVersion>2.1.5.0</PackageVersion>
-    <AssemblyVersion>2.1.5</AssemblyVersion>
-    <FileVersion>2.1.5</FileVersion>
+    <PackageVersion>2.1.6.0</PackageVersion>
+    <AssemblyVersion>2.1.6</AssemblyVersion>
+    <FileVersion>2.1.6</FileVersion>
   </PropertyGroup>
   <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
   <PropertyGroup />

diff --git a/Oxide.Ext.Discord/Rest/RateLimitHandler.cs b/Oxide.Ext.Discord/Rest/RateLimitHandler.cs
@@ -29,7 +29,7 @@ public class RateLimitHandler
         /// </summary>
         public RateLimitHandler()
         {
-            _timer = new Timer(ResetInterval);
+            _timer = new Timer(ResetInterval * 1000);
             _timer.Elapsed += ResetGlobal;
             _timer.Start();
             _lastReset = Time.TimeSinceEpoch();

diff --git a/Oxide.Ext.Discord/WebSockets/SocketListener.cs b/Oxide.Ext.Discord/WebSockets/SocketListener.cs
@@ -895,6 +895,7 @@ private void HandleDispatchGuildMemberRemove(EventPayload payload)
                 if (member != null)
                 {
                     guild.Members.Remove(remove.User.Id);
+                    _client.CallHook(DiscordExtHooks.OnDiscordGuildMemberRemoved, member, guild);
                 }
 
                 _logger.Verbose($"{nameof(SocketListener)}.{nameof(HandleDispatchGuildMemberRemove)} Guild ID: {remove.GuildId.ToString()} Guild Name: {guild.Name} User ID: {member?.User.Id.ToString()} User Name: {member?.User.GetFullUserName}");