Unseal Discord/IRC bot classes

ClassiCube · Jul 25, 2024 · 0bb1e53 · 0bb1e53
1 parent 9dec181
commit 0bb1e53
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/MCGalaxy/Modules/Relay/Discord/DiscordApiClient.cs b/MCGalaxy/Modules/Relay/Discord/DiscordApiClient.cs
@@ -28,7 +28,7 @@ namespace MCGalaxy.Modules.Relay.Discord
     /// <summary> Implements a basic web client for sending messages to the Discord API </summary>
     /// <remarks> https://discord.com/developers/docs/reference </remarks>
     /// <remarks> https://discord.com/developers/docs/resources/channel#create-message </remarks>
-    public sealed class DiscordApiClient : AsyncWorker<DiscordApiMessage>
+    public class DiscordApiClient : AsyncWorker<DiscordApiMessage>
     {
         public string Token;
         public string Host;

diff --git a/MCGalaxy/Modules/Relay/Discord/DiscordBot.cs b/MCGalaxy/Modules/Relay/Discord/DiscordBot.cs
@@ -38,7 +38,7 @@ public override string GetMessagePrefix() {
         }
     }
 
-    public sealed class DiscordBot : RelayBot 
+    public class DiscordBot : RelayBot 
     {
         DiscordApiClient api;
         DiscordWebsocket socket;

diff --git a/MCGalaxy/Modules/Relay/Discord/DiscordWebsocket.cs b/MCGalaxy/Modules/Relay/Discord/DiscordWebsocket.cs
@@ -28,7 +28,7 @@ permissions and limitations under the Licenses.
 
 namespace MCGalaxy.Modules.Relay.Discord 
 {    
-    public sealed class DiscordSession 
+    public class DiscordSession 
     { 
         public string ID, LastSeq;
         public int Intents;
@@ -39,7 +39,7 @@ public sealed class DiscordSession
     /// <summary> Implements a basic websocket for communicating with Discord's gateway </summary>
     /// <remarks> https://discord.com/developers/docs/topics/gateway </remarks>
     /// <remarks> https://i.imgur.com/Lwc5Wde.png </remarks>
-    public sealed class DiscordWebsocket : ClientWebSocket 
+    public class DiscordWebsocket : ClientWebSocket 
     {       
         /// <summary> Authorisation token for the bot account </summary>
         public string Token;

diff --git a/MCGalaxy/Modules/Relay/IRC/IRCBot.cs b/MCGalaxy/Modules/Relay/IRC/IRCBot.cs
@@ -26,7 +26,7 @@ namespace MCGalaxy.Modules.Relay.IRC
     public enum IRCControllerVerify { None, HalfOp, OpChannel };
 
     /// <summary> Manages a connection to an IRC server, and handles associated events. </summary>
-    public sealed class IRCBot : RelayBot 
+    public class IRCBot : RelayBot 
     {
         internal Connection conn;
         string botNick;

diff --git a/MCGalaxy/util/OperatingSystem.cs b/MCGalaxy/util/OperatingSystem.cs
@@ -188,11 +188,11 @@ protected virtual void RestartInPlace() {
             execvp(runtime, new string[] { runtime, exePath, null });
             Console.WriteLine("execvp {0} failed: {1}", runtime, Marshal.GetLastWin32Error());
 
-#if !MCG_DOTNET
-            // .. and fallback to mono if that doesn't work for some reason
-            execvp("mono", new string[] { "mono", exePath, null });
-            Console.WriteLine("execvp mono failed: {0}", Marshal.GetLastWin32Error());
-#endif
+            if (Server.RunningOnMono()) {
+                // .. and fallback to mono if that doesn't work for some reason
+                execvp("mono", new string[] { "mono", exePath, null });
+                Console.WriteLine("execvp mono failed: {0}", Marshal.GetLastWin32Error());
+            }
         }
 
         [DllImport("libc", SetLastError = true)]