Merge branch 'development'

Author: fourjr

CHANGELOG.md

@@ -6,6 +6,16 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 This project mostly adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html);
 however, insignificant breaking changes do not guarantee a major version bump, see the reasoning [here](https://github.com/kyb3r/modmail/issues/319). If you're a plugin developer, note the "BREAKING" section.
 
+# v3.9.2
+
+### Improved
+
+- Additional HostingMethods (i.e. DOCKER, PM2, SCREEN). Autoupdates are now disabled on all docker instances. ([GH #2977](https://github.com/kyb3r/modmail/issues/2977), [PR #2988](https://github.com/kyb3r/modmail/pull/2988))
+
+### Fixed
+
+- `user_typing` default in the config help is now correct.
+
 # v3.9.1
 
 ### Internal

Dockerfile

@@ -1,4 +1,5 @@
 FROM python:3.7-alpine
+ENV USING_DOCKER yes
 WORKDIR /modmailbot
 COPY . /modmailbot
 RUN  export PIP_NO_CACHE_DIR=false \

bot.py

@@ -1,4 +1,4 @@
-__version__ = "3.9.1"
+__version__ = "3.9.2"
 
 
 import asyncio
@@ -109,6 +109,18 @@ def hosting_method(self) -> HostingMethod:
         if os.environ.get("pm_id"):
             return HostingMethod.PM2
 
+        if os.environ.get("INVOCATION_ID"):
+            return HostingMethod.SYSTEMD
+
+        if os.environ.get("USING_DOCKER"):
+            return HostingMethod.DOCKER
+
+        if os.environ.get("INVOCATION_ID"):
+            return HostingMethod.SYSTEMD
+
+        if os.environ.get("TERM"):
+            return HostingMethod.SCREEN
+
         return HostingMethod.OTHER
 
     def startup(self):
@@ -242,39 +254,41 @@ def _cancel_tasks():
             if not tasks:
                 return
 
-            logger.info('Cleaning up after %d tasks.', len(tasks))
+            logger.info("Cleaning up after %d tasks.", len(tasks))
             for task in tasks:
                 task.cancel()
 
             loop.run_until_complete(asyncio.gather(*tasks, return_exceptions=True))
-            logger.info('All tasks finished cancelling.')
+            logger.info("All tasks finished cancelling.")
 
             for task in tasks:
                 if task.cancelled():
                     continue
                 if task.exception() is not None:
-                    loop.call_exception_handler({
-                        'message': 'Unhandled exception during Client.run shutdown.',
-                        'exception': task.exception(),
-                        'task': task
-                    })
+                    loop.call_exception_handler(
+                        {
+                            "message": "Unhandled exception during Client.run shutdown.",
+                            "exception": task.exception(),
+                            "task": task,
+                        }
+                    )
 
         future = asyncio.ensure_future(runner(), loop=loop)
         future.add_done_callback(stop_loop_on_completion)
         try:
             loop.run_forever()
         except KeyboardInterrupt:
-            logger.info('Received signal to terminate bot and event loop.')
+            logger.info("Received signal to terminate bot and event loop.")
         finally:
             future.remove_done_callback(stop_loop_on_completion)
-            logger.info('Cleaning up tasks.')
+            logger.info("Cleaning up tasks.")
 
             try:
                 _cancel_tasks()
                 if sys.version_info >= (3, 6):
                     loop.run_until_complete(loop.shutdown_asyncgens())
             finally:
-                logger.info('Closing the event loop.')
+                logger.info("Closing the event loop.")
                 loop.close()
 
         if not future.cancelled():
@@ -1635,7 +1649,7 @@ async def autoupdate(self):
                 elif res != "Already up to date.":
                     logger.info("Bot has been updated.")
                     channel = self.update_channel
-                    if self.hosting_method == HostingMethod.PM2:
+                    if self.hosting_method in (HostingMethod.PM2, HostingMethod.SYSTEMD):
                         embed = discord.Embed(title="Bot has been updated", color=self.main_color)
                         embed.set_footer(
                             text=f"Updating Modmail v{self.version} " f"-> v{latest.version}"
@@ -1663,6 +1677,10 @@ async def before_autoupdate(self):
             logger.warning("Autoupdates disabled.")
             self.autoupdate_loop.cancel()
 
+        if self.hosting_method == HostingMethod.DOCKER:
+            logger.warning("Autoupdates disabled as using Docker.")
+            self.autoupdate_loop.cancel()
+
         if not self.config.get("github_token") and self.hosting_method == HostingMethod.HEROKU:
             logger.warning("GitHub access token not found.")
             logger.warning("Autoupdates disabled.")

core/config_help.json

@@ -86,7 +86,7 @@
     "thumbnail": "https://placehold.it/100/e74c3c?text=+"
   },
   "user_typing": {
-    "default": "Disabled",
+    "default": "Enabled",
     "description": "When this is set to `yes`, whenever the recipient user starts to type in their DM channel, the moderator will see “{bot.user.display_name} is typing…” in the thread channel.",
     "examples": [
       "`{prefix}config set user_typing yes`",

core/models.py

@@ -276,4 +276,7 @@ class DMDisabled(IntEnum):
 class HostingMethod(IntEnum):
     HEROKU = 0
     PM2 = 1
-    OTHER = 2
+    SYSTEMD = 2
+    SCREEN = 3
+    DOCKER = 4
+    OTHER = 5

pyproject.toml

@@ -21,7 +21,7 @@ exclude = '''
 
 [tool.poetry]
 name = 'Modmail'
-version = '3.9.1'
+version = '3.9.2'
 description = "Modmail is similar to Reddit's Modmail, both in functionality and purpose. It serves as a shared inbox for server staff to communicate with their users in a seamless way."
 license = 'AGPL-3.0-only'
 authors = [