re-use dependency from game lib

NikkyAI · Jan 8, 2021 · 234c49c · 234c49c
1 parent 0f1f301
commit 234c49c
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 4 deletions.
diff --git a/Matterbridge.csproj b/Matterbridge.csproj
@@ -31,10 +31,17 @@
 			<Private>False</Private>
 		</Reference>
 -->
+		<Reference Include="Newtonsoft.Json">
+			<HintPath>$(VINTAGE_STORY)/Lib/Newtonsoft.Json.dll</HintPath>
+			<Private>False</Private>
+		</Reference>
+		<Reference Include="websocket-sharp">
+			<HintPath>$(VINTAGE_STORY)/Lib/websocket-sharp.dll</HintPath>
+			<Private>False</Private>
+		</Reference>
 	</ItemGroup>
 
 	<ItemGroup>
-	  	<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
 		<PackageReference Include="WebSocket4Net" Version="0.15.2" />
 	</ItemGroup>
 

diff --git a/modinfo.json b/modinfo.json
@@ -5,7 +5,7 @@
   "version": "$Version$",
 
   "description" : "$Description$",
-  "website": "https://github.com/NikkyAI/vs-matterbridge",
+  "website": "$Website$",
   "authors": [ "$Author$" ],
 
   "side": "Server",

diff --git a/src/MatterbridgeMod.cs b/src/MatterbridgeMod.cs
@@ -95,7 +95,7 @@ public override void StartServerSide(ICoreServerAPI api)
 
         public override void Dispose()
         {
-            WebsocketHandler.Close();
+            WebsocketHandler.Dispose();
             base.Dispose();
         }
 

diff --git a/src/WebsocketHandler.cs b/src/WebsocketHandler.cs
@@ -11,7 +11,7 @@
 
 namespace Matterbridge
 {
-    internal class WebsocketHandler
+    internal class WebsocketHandler : IDisposable
     {
         private readonly ICoreServerAPI _api;
         private readonly Mod _mod;
@@ -236,5 +236,14 @@ private void websocket_MessageReceived(object sender, MessageReceivedEventArgs e
                 }
             }
         }
+
+        public void Dispose()
+        {
+            if (_websocket != null)
+            {
+                _websocket.Close();
+                ((IDisposable) _websocket).Dispose();
+            }
+        }
     }
 }