Discord: Allow changing presence status

ClassiCube · Jun 11, 2021 · 7cf4748 · 7cf4748
1 parent fdf5379
commit 7cf4748
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/MCGalaxy/Modules/Relay/Discord/DiscordBot.cs b/MCGalaxy/Modules/Relay/Discord/DiscordBot.cs
@@ -55,7 +55,8 @@ public sealed class DiscordBot : RelayBot {
         protected override void DoConnect() {
             socket = new DiscordWebsocket(); 
             socket.Token     = Config.BotToken;
-            socket.GetStatus = GetStatus;
+            socket.Status    = Config.Status;
+            socket.GetStatus = GetStatusMessage;
 
             socket.OnReady         = HandleReadyEvent;
             socket.OnMessageCreate = HandleMessageEvent;
@@ -197,9 +198,9 @@ public sealed class DiscordBot : RelayBot {
             return sb.ToString();
         }
 
-        string GetStatus() {
+        string GetStatusMessage() {
             string online = PlayerInfo.NonHiddenCount().ToString();
-            return Config.Status.Replace("{PLAYERS}", online);
+            return Config.StatusMessage.Replace("{PLAYERS}", online);
         }
 
         void UpdateDiscordStatus() {

diff --git a/MCGalaxy/Modules/Relay/Discord/DiscordPlugin.cs b/MCGalaxy/Modules/Relay/Discord/DiscordPlugin.cs
@@ -28,7 +28,7 @@ public sealed class DiscordConfig {
         [ConfigString("bot-token", null, "", true)]
         public string BotToken = "";
         [ConfigString("status-message", null, "with {PLAYERS} players")]
-        public string Status = "with {PLAYERS} players";
+        public string StatusMessage = "with {PLAYERS} players";
         [ConfigBool("use-nicknames", null, true)]
         public bool UseNicks = true;
 
@@ -39,6 +39,9 @@ public sealed class DiscordConfig {
         [ConfigString("ignored-user-ids", null, "", true)]
         public string IgnoredUsers = "";
 
+        [ConfigEnum("presence-status", null, PresenceStatus.online, typeof(PresenceStatus))]
+        public PresenceStatus Status = PresenceStatus.online;
+
         const string file = "properties/discordbot.properties";
         static ConfigElement[] cfg;
 
@@ -56,6 +59,8 @@ public sealed class DiscordConfig {
         }
     }
 
+    public enum PresenceStatus { online, dnd, idle, invisible }
+
     public sealed class DiscordPlugin : Plugin {
         public override string creator { get { return Server.SoftwareName + " team"; } }
         public override string MCGalaxy_Version { get { return Server.Version; } }

diff --git a/MCGalaxy/Modules/Relay/Discord/DiscordWebsocket.cs b/MCGalaxy/Modules/Relay/Discord/DiscordWebsocket.cs
@@ -34,6 +34,8 @@ public sealed class DiscordWebsocket : ClientWebSocket {
 
         /// <summary> Authorisation token for the bot account </summary>
         public string Token;
+        /// <summary> Presence status (E.g. online) </summary>
+        public PresenceStatus Status;
         /// <summary> Callback function to retrieve the activity status message </summary>
         public Func<string> GetStatus;
         public bool CanReconnect = true;
@@ -237,7 +239,7 @@ public sealed class DiscordWebsocket : ClientWebSocket {
             {
                 { "since",      null },
                 { "activities", new JsonArray() { activity } },
-                { "status",     "online" },
+                { "status",     Status.ToString() },
                 { "afk",        false }
             };
             return obj;