Merge pull request #2 from Trickyyy/develop

1.0.3 merge
Trickyyy · Aug 18, 2019 · ca86251 · ca86251
2 parents 544ee8c + 5f69c68
commit ca86251
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 2 deletions.
diff --git a/Oxide.Ext.Discord/Discord.cs b/Oxide.Ext.Discord/Discord.cs
@@ -9,6 +9,8 @@ public class Discord
     {
         public static List<DiscordClient> Clients { get; private set; } = new List<DiscordClient>();
 
+        public static List<string> PendingTokens = new List<string>();
+
         public static void CreateClient(Plugin plugin, string apiKey)
         {
             if (plugin == null)

diff --git a/Oxide.Ext.Discord/DiscordClient.cs b/Oxide.Ext.Discord/DiscordClient.cs
@@ -56,6 +56,18 @@ public void Initialize(Plugin plugin, DiscordSettings settings)
                 throw new APIKeyException();
             }
 
+            if(Discord.PendingTokens.Contains(settings.ApiToken))
+            {
+                Interface.Oxide.LogError($"Connection with same token in short period.. Connection delayed for plugin {plugin.Name}");
+                Timer t = new Timer() { AutoReset = false, Interval = 5000f, Enabled = true};
+                t.Elapsed += (object sender, ElapsedEventArgs e) =>
+                {
+                    Interface.Oxide.LogError($"Delayed connection for plugin {plugin.Name} is being resumed..");
+                    Initialize(plugin, settings);
+                };
+                return;
+            }
+
             RegisterPlugin(plugin);
 
             Settings = settings;
@@ -75,6 +87,12 @@ public void Initialize(Plugin plugin, DiscordSettings settings)
 
                 _webSocket.Connect(WSSURL);
             });
+            Discord.PendingTokens.Add(settings.ApiToken);
+            Timer t2 = new Timer() { AutoReset = false, Interval = 5000f, Enabled = true };
+            t2.Elapsed += (object sender, ElapsedEventArgs e) =>
+            {
+                Discord.PendingTokens.Remove(settings.ApiToken);
+            };
         }
 
         public void Disconnect()

diff --git a/Oxide.Ext.Discord/DiscordExtension.cs b/Oxide.Ext.Discord/DiscordExtension.cs
@@ -18,7 +18,7 @@ public DiscordExtension(ExtensionManager manager) : base(manager)
 
         public override string Author => "PsychoTea & DylanSMR";
 
-        public override VersionNumber Version => new VersionNumber(1, 0, 2);
+        public override VersionNumber Version => new VersionNumber(1, 0, 3);
 
         public override void OnModLoad()
         {

diff --git a/Oxide.Ext.Discord/Oxide.Ext.Discord.csproj b/Oxide.Ext.Discord/Oxide.Ext.Discord.csproj
@@ -2,7 +2,7 @@
 <Project>
   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
   <PropertyGroup>
-    <Version>1.0.1.0</Version>
+    <Version>1.0.3.0</Version>
     <AssemblyName>Oxide.Ext.Discord</AssemblyName>
     <Authors>PsychoTea</Authors>
     <Description>An Oxide extension for Discord.</Description>