From af0f5736de47e07a7399104dbb133139b653c303 Mon Sep 17 00:00:00 2001
From: Chiizujin <chiizujin@gmail.com>
Date: Thu, 8 Dec 2022 14:12:46 +1100
Subject: [PATCH 1/5] Fix help typos

---
 evennia/commands/default/account.py         | 2 +-
 evennia/game_template/world/help_entries.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/evennia/commands/default/account.py b/evennia/commands/default/account.py
index af920a2325..1dbb7d8ecf 100644
--- a/evennia/commands/default/account.py
+++ b/evennia/commands/default/account.py
@@ -1024,7 +1024,7 @@ class CmdStyle(COMMAND_DEFAULT_CLASS):
       style <option> = <value>
 
     Configure stylings for in-game display elements like table borders, help
-    entriest etc. Use without arguments to see all available options.
+    entries etc. Use without arguments to see all available options.
 
     """
 
diff --git a/evennia/game_template/world/help_entries.py b/evennia/game_template/world/help_entries.py
index 368ed0e999..927888b170 100644
--- a/evennia/game_template/world/help_entries.py
+++ b/evennia/game_template/world/help_entries.py
@@ -31,7 +31,7 @@ HELP_ENTRY_DICTS = [
         "category": "General",
         "locks": "read:perm(Developer)",
         "text": """
-            Evennia is a MU-game server and frameworkdin Python. You can read more
+            Evennia is a MU-game server and framework written in Python. You can read more
             on https://www.evennia.com.
 
             # subtopics
@@ -60,7 +60,7 @@ HELP_ENTRY_DICTS = [
         "category": "building",
         "text": """
             Evennia comes with a bunch of default building commands. You can
-            find a beginner tutorial in the evennia documentation.
+            find a beginner tutorial in the Evennia documentation.
 
         """,
     },

From ca94d0136f2b32da8e5ead7f9067882f0fff6b5e Mon Sep 17 00:00:00 2001
From: InspectorCaracal <cal@clockworkcaracal.com>
Date: Sun, 11 Dec 2022 15:27:02 -0700
Subject: [PATCH 2/5] remove auto-reconnecting logic

---
 evennia/commands/default/comms.py |  9 ++++
 evennia/server/portal/discord.py  | 69 +++++++++----------------------
 2 files changed, 28 insertions(+), 50 deletions(-)

diff --git a/evennia/commands/default/comms.py b/evennia/commands/default/comms.py
index 329211744a..32a0a40b8d 100644
--- a/evennia/commands/default/comms.py
+++ b/evennia/commands/default/comms.py
@@ -1925,6 +1925,7 @@ class CmdDiscord2Chan(COMMAND_DEFAULT_CLASS):
         /delete  - alias to remove
         /guild   - toggle the Discord server tag on/off
         /channel - toggle the Evennia/Discord channel tags on/off
+        /start   - tell the bot to start, in case it lost its connection
 
     Example:
         discord2chan mydiscord = 555555555555555
@@ -1943,6 +1944,7 @@ class CmdDiscord2Chan(COMMAND_DEFAULT_CLASS):
         "guild",
         "list",
         "remove",
+        "start",
     )
     locks = "cmd:serversetting(DISCORD_ENABLED) and pperm(Developer)"
     help_category = "Comms"
@@ -1973,6 +1975,13 @@ class CmdDiscord2Chan(COMMAND_DEFAULT_CLASS):
                 f"WARNING: The Discord bot's typeclass is '{discord_bot.typeclass_path}'. This does not match {settings.DISCORD_BOT_CLASS} in settings!"
             )
 
+        if "start" in self.switches:
+            if discord_bot.sessions.all():
+                self.msg("The Discord bot is already running.")
+            else:
+                discord_bot.start()
+            return
+
         if "guild" in self.switches:
             discord_bot.db.tag_guild = not discord_bot.db.tag_guild
             self.msg(
diff --git a/evennia/server/portal/discord.py b/evennia/server/portal/discord.py
index eab9ca1a92..b49576bd08 100644
--- a/evennia/server/portal/discord.py
+++ b/evennia/server/portal/discord.py
@@ -84,17 +84,16 @@ def should_retry(status_code):
 
 class DiscordWebsocketServerFactory(WebSocketClientFactory, protocol.ReconnectingClientFactory):
     """
-    A variant of the websocket-factory that auto-reconnects.
+    A customized websocket client factory that navigates the Discord gateway process.
 
     """
-
     initialDelay = 1
     factor = 1.5
     maxDelay = 60
     noisy = False
     gateway = None
     resume_url = None
-    do_retry = True
+    is_connecting = False
 
     def __init__(self, sessionhandler, *args, **kwargs):
         self.uid = kwargs.get("uid")
@@ -122,8 +121,8 @@ class DiscordWebsocketServerFactory(WebSocketClientFactory, protocol.Reconnectin
                 d = readBody(response)
                 d.addCallback(self.websocket_init, *args, **kwargs)
                 return d
-            elif should_retry(response.code):
-                delay(300, self.get_gateway_url, *args, **kwargs)
+            else:
+                logger.log_warn("Discord gateway request failed.")
 
         d.addCallback(cbResponse)
 
@@ -132,6 +131,7 @@ class DiscordWebsocketServerFactory(WebSocketClientFactory, protocol.Reconnectin
         callback for when the URL is gotten
         """
         data = json.loads(str(payload, "utf-8"))
+        self.is_connecting = False
         if url := data.get("url"):
             self.gateway = f"{url}/?v={DISCORD_API_VERSION}&encoding=json".encode("utf-8")
             useragent = kwargs.pop("useragent", DISCORD_USER_AGENT)
@@ -179,30 +179,7 @@ class DiscordWebsocketServerFactory(WebSocketClientFactory, protocol.Reconnectin
             connector (Connector): Represents the connection.
 
         """
-        logger.log_info("Attempting connection to Discord...")
-
-    def clientConnectionFailed(self, connector, reason):
-        """
-        Called when Client failed to connect.
-
-        Args:
-            connector (Connection): Represents the connection.
-            reason (str): The reason for the failure.
-
-        """
-        protocol.ReconnectingClientFactory.clientConnectionLost(self, connector, reason)
-
-    def clientConnectionLost(self, connector, reason):
-        """
-        Called when Client loses connection.
-
-        Args:
-            connector (Connection): Represents the connection.
-            reason (str): The reason for the failure.
-
-        """
-        if self.do_retry and self.bot:
-            self.retry(connector)
+        logger.log_info("Connecting to Discord...")
 
     def reconnect(self):
         """
@@ -210,33 +187,27 @@ class DiscordWebsocketServerFactory(WebSocketClientFactory, protocol.Reconnectin
         de-registering the session and then reattaching a new one.
 
         """
-        # set the retry flag to False so it doesn't attempt an automatic retry
-        # and duplicate the connection
-        self.do_retry = False
-        # disconnect everything
-        self.bot.transport.loseConnection()
-        self.sessionhandler.server_disconnect(self.bot)
         # set up the reconnection
         if self.resume_url:
             self.url = self.resume_url
         elif self.gateway:
             self.url = self.gateway
         else:
-            # we don't know where to reconnect to! start from the beginning
-            self.get_gateway_url()
-            return
-        self.start()
+            # we don't know where to reconnect to! we'll start from the beginning
+            self.url = None
+        self.bot.sendClose()
+        self.sessionhandler.server_disconnect(self.bot)
 
     def start(self):
         "Connect protocol to remote server"
 
         if not self.gateway:
-            # we can't actually start yet
+            # we don't know where to connect to
             # get the gateway URL from Discord
+            self.is_connecting = True
             self.get_gateway_url()
-        else:
-            # set the retry flag so we maintain this connection
-            self.do_retry = True
+        elif not self.is_connecting:
+            # everything is good, connect
             connectWS(self)
 
 
@@ -255,7 +226,6 @@ class DiscordClient(WebSocketClientProtocol, _BASE_SESSION_CLASS):
     def __init__(self):
         WebSocketClientProtocol.__init__(self)
         _BASE_SESSION_CLASS.__init__(self)
-        self.restart_downtime = None
 
     def at_login(self):
         pass
@@ -265,8 +235,7 @@ class DiscordClient(WebSocketClientProtocol, _BASE_SESSION_CLASS):
         Called when connection is established.
 
         """
-        self.restart_downtime = None
-        self.restart_task = None
+        logger.log_msg("Discord connection established.")
         self.factory.bot = self
 
         self.init_session("discord", "discord.gg", self.factory.sessionhandler)
@@ -352,11 +321,11 @@ class DiscordClient(WebSocketClientProtocol, _BASE_SESSION_CLASS):
         """
         if self.nextHeartbeatCall:
             self.nextHeartbeatCall.cancel()
-        self.disconnect(reason)
-        if code >= 4000:
-            logger.log_err(f"Discord connection closed: {reason}")
+            self.nextHeartbeatCall = None
+        if wasClean:
+            logger.log_info(f"Discord connection closed ({code}) reason: {reason}")
         else:
-            logger.log_info(f"Discord disconnected: {reason}")
+            logger.log_info(f"Discord connection lost.")
 
     def _send_json(self, data):
         """

From 8c16252a4f2200d542e482ec6d919bf44761ef54 Mon Sep 17 00:00:00 2001
From: InspectorCaracal <51038201+InspectorCaracal@users.noreply.github.com>
Date: Tue, 13 Dec 2022 21:13:53 -0700
Subject: [PATCH 3/5] reset reconnecting factory's internal delay

---
 evennia/server/portal/discord.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/evennia/server/portal/discord.py b/evennia/server/portal/discord.py
index b49576bd08..018e957a79 100644
--- a/evennia/server/portal/discord.py
+++ b/evennia/server/portal/discord.py
@@ -195,6 +195,9 @@ class DiscordWebsocketServerFactory(WebSocketClientFactory, protocol.Reconnectin
         else:
             # we don't know where to reconnect to! we'll start from the beginning
             self.url = None
+        # reset the internal delay, since this is a deliberate disconnect
+        self.delay = self.initialDelay
+        # disconnect to allow the reconnection process to kick in
         self.bot.sendClose()
         self.sessionhandler.server_disconnect(self.bot)
 

From f37124c360ea83b7200719941b6b101fef123003 Mon Sep 17 00:00:00 2001
From: InspectorCaracal <cal@clockworkcaracal.com>
Date: Tue, 13 Dec 2022 21:16:34 -0700
Subject: [PATCH 4/5] run black

---
 evennia/server/portal/discord.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/evennia/server/portal/discord.py b/evennia/server/portal/discord.py
index 018e957a79..284e126e59 100644
--- a/evennia/server/portal/discord.py
+++ b/evennia/server/portal/discord.py
@@ -87,6 +87,7 @@ class DiscordWebsocketServerFactory(WebSocketClientFactory, protocol.Reconnectin
     A customized websocket client factory that navigates the Discord gateway process.
 
     """
+
     initialDelay = 1
     factor = 1.5
     maxDelay = 60

From 31255e2c97aaa8b8ce3d4020ff7a6111ab7d0d22 Mon Sep 17 00:00:00 2001
From: homeofpoe <1144217+homeofpoe@users.noreply.github.com>
Date: Wed, 14 Dec 2022 11:02:45 -0800
Subject: [PATCH 5/5] Update README.md

Fix a typo
---
 evennia/contrib/game_systems/crafting/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/evennia/contrib/game_systems/crafting/README.md b/evennia/contrib/game_systems/crafting/README.md
index 34869e4b66..7c5232dd95 100644
--- a/evennia/contrib/game_systems/crafting/README.md
+++ b/evennia/contrib/game_systems/crafting/README.md
@@ -42,7 +42,7 @@ is being combined instead):
 See the [sword example](evennia.contrib.game_systems.crafting.example_recipes) for an example
 of how to design a recipe tree for crafting a sword from base elements.
 
-## Intallation and Usage
+## Installation and Usage
 
 Import the `CmdCraft` command from evennia/contrib/crafting/crafting.py  and
 add it to your Character cmdset. Reload and the `craft` command will be