Merge from master, make presence intent default off

Author: Taaku18

CHANGELOG.md

@@ -9,10 +9,13 @@ however, insignificant breaking changes do not guarantee a major version bump, s
 
 # [Unreleased]
 
-### Fixed
+### Breaking
 
-- Bots without presence intent encountering RuntimeError on start.
+- Presence intent is now by-default OFF. You can turn it on by setting `ENABLE_PRESENCE_INTENT=true` in the environment variables.
 
+### Fixed
+
+- Resolved an issue where `?logs` doesn't work when the thread has no title. ([PR #3201](https://github.com/kyb3r/modmail/pull/3201))
 
 # v4.0.1
 
@@ -26,7 +29,6 @@ This is a hotfix release.
 
 - Thread cooldown
 
-
 # v4.0.0
 
 ### Breaking

bot.py

@@ -66,7 +66,13 @@
 
 class ModmailBot(commands.Bot):
     def __init__(self):
+        self.config = ConfigManager(self)
+        self.config.populate_cache()
+
         intents = discord.Intents.all()
+        if not self.config['enable_presence_intent']:
+            intents.presences = False
+
         super().__init__(command_prefix=None, intents=intents)  # implemented in `get_prefix`
         self.session = None
         self._api = None
@@ -76,9 +82,6 @@ def __init__(self):
         self.start_time = discord.utils.utcnow()
         self._started = False
 
-        self.config = ConfigManager(self)
-        self.config.populate_cache()
-
         self.threads = ThreadManager(self)
 
         self.log_file_name = os.path.join(temp_dir, f"{self.token.split('.')[0]}.log")
@@ -218,26 +221,14 @@ async def runner():
             async with self:
                 self._connected = asyncio.Event()
                 self.session = ClientSession(loop=self.loop)
+
+                if self.config['enable_presence_intent']:
+                    logger.info("Starting bot with presence intent.")
+                else:
+                    logger.info("Starting bot without presence intent.")
+
                 try:
-                    retry_intents = False
-                    try:
-                        await self.start(self.token)
-                    except discord.PrivilegedIntentsRequired:
-                        retry_intents = True
-                    if retry_intents:
-                        if self.ws is not None and self.ws.open:
-                            await self.ws.close(code=1000)
-                        self._ready.clear()
-
-                        intents = discord.Intents.default()
-                        intents.members = True
-                        intents.message_content = True
-                        # Try again with members intent
-                        self._connection._intents = intents
-                        logger.warning(
-                            "Attempting to reconnect with only the server members and message content privileged intent. Some plugins might not work correctly."
-                        )
-                        await self.connect(reconnect=True)
+                    await self.start(self.token)
                 except discord.PrivilegedIntentsRequired:
                     logger.critical(
                         "Privileged intents are not explicitly granted in the discord developers dashboard."

cogs/modmail.py

@@ -749,7 +749,7 @@ def format_log_embeds(self, logs, avatar_url):
             if entry["recipient"]["id"] != entry["creator"]["id"]:
                 embed.add_field(name="Created by", value=f"<@{entry['creator']['id']}>")
 
-            if entry["title"]:
+            if entry.get("title"):
                 embed.add_field(name="Title", value=entry["title"], inline=False)
 
             embed.add_field(name="Preview", value=format_preview(entry["messages"]), inline=False)

core/config.py

@@ -166,6 +166,7 @@ class ConfigManager:
         "database_type": "mongodb",
         "connection_uri": None,  # replace mongo uri in the future
         "owners": None,
+        "enable_presence_intent": False,
         # bot
         "token": None,
         "enable_plugins": True,
@@ -221,6 +222,7 @@ class ConfigManager:
         "thread_show_account_age",
         "thread_show_join_age",
         "use_hoisted_top_role",
+        "enable_presence_intent",
     }
 
     enums = {

plugins/registry.json

@@ -1,4 +1,31 @@
 {
+    "advanced-menu": {
+        "repository": "sebkuip/mm-plugins",
+        "branch": "master",
+        "description": "Advanced menu plugin using dropdown selectors. Supports submenus (and sub-submenus infinitely).",
+        "bot_version": "v4.0.0",
+        "title": "Advanced menu",
+        "icon_url": "https://raw.githubusercontent.com/sebkuip/mm-plugins/master/advanced-menu/logo.png",
+        "thumbnail_url": "https://raw.githubusercontent.com/sebkuip/mm-plugins/master/advanced-menu/logo.png"
+    },
+    "announcement": {
+        "repository": "Jerrie-Aries/modmail-plugins",
+        "branch": "master",
+        "description": "Create and post announcements. Supports both plain and embed. Also customisable using buttons and dropdown menus.",
+        "bot_version": "4.0.0",
+        "title": "Announcement",
+        "icon_url": "https://github.com/Jerrie-Aries.png",
+        "thumbnail_url": "https://raw.githubusercontent.com/Jerrie-Aries/modmail-plugins/master/.static/announcement.jpg"
+    },
+    "giveaway": {
+        "repository": "Jerrie-Aries/modmail-plugins",
+        "branch": "master",
+        "description": "Host giveaways on your server with this plugin.",
+        "bot_version": "4.0.0",
+        "title": "Giveaway",
+        "icon_url": "https://github.com/Jerrie-Aries.png",
+        "thumbnail_url": "https://raw.githubusercontent.com/Jerrie-Aries/modmail-plugins/master/.static/giveaway.jpg"
+    },
     "suggest": {
         "repository": "realcyguy/modmail-plugins",
         "branch": "v4",
@@ -7,5 +34,77 @@
         "title": "Suggest stuff.",
         "icon_url": "https://i.imgur.com/qtE7AH8.png",
         "thumbnail_url": "https://i.imgur.com/qtE7AH8.png"
+    },
+    "welcomer": {
+        "repository": "fourjr/modmail-plugins",
+        "branch": "v4",
+        "description": "Add messages to welcome new members! Allows for embedded messages as well. [Read more](https://github.com/fourjr/modmail-plugins/blob/master/welcomer/README.md)",
+        "bot_version": "4.0.0",
+        "title": "New member messages plugin",
+        "icon_url": "https://i.imgur.com/Mo60CdK.png",
+        "thumbnail_url": "https://i.imgur.com/Mo60CdK.png"
+    },
+    "countdowns": {
+        "repository": "fourjr/modmail-plugins",
+        "branch": "v4",
+        "description": "Setup a countdown voice channel in your server!",
+        "bot_version": "4.0.0",
+        "title": "Countdowns",
+        "icon_url": "https://i.imgur.com/Mo60CdK.png",
+        "thumbnail_url": "https://i.imgur.com/Mo60CdK.png"
+    },
+    "claim": {
+        "repository": "fourjr/modmail-plugins",
+        "branch": "v4",
+        "description": "Allows supporters to claim thread by sending ?claim in the thread channel",
+        "bot_version": "4.0.0",
+        "title": "Claim Thread",
+        "icon_url": "https://i.imgur.com/Mo60CdK.png",
+        "thumbnail_url": "https://i.imgur.com/Mo60CdK.png"
+    },
+    "emote-manager": {
+        "repository": "fourjr/modmail-plugins",
+        "branch": "v4",
+        "description": "Allows managing server emotes via ?emoji",
+        "bot_version": "4.0.0",        
+        "title": "Emote Manager",
+        "icon_url": "https://i.imgur.com/Mo60CdK.png",
+        "thumbnail_url": "https://i.imgur.com/Mo60CdK.png"
+    },
+     "gen-log": {
+        "repository": "fourjr/modmail-plugins",
+        "branch": "v4",
+        "description": "Outputs a text log of a thread in a specified channel",
+        "bot_version": "4.0.0",         
+        "title": "Log Generator",
+        "icon_url": "https://i.imgur.com/Mo60CdK.png",
+        "thumbnail_url": "https://i.imgur.com/Mo60CdK.png"
+    },
+     "media-logger": {
+        "repository": "fourjr/modmail-plugins",
+        "branch": "v4",
+        "description": "Re-posts detected media from all visible channels into a specified logging channel",
+        "bot_version": "4.0.0",         
+        "title": "Media Logger",
+        "icon_url": "https://i.imgur.com/Mo60CdK.png",
+        "thumbnail_url": "https://i.imgur.com/Mo60CdK.png"
+    },
+      "report": {
+        "repository": "fourjr/modmail-plugins",
+        "branch": "v4",
+        "description": "Specify an emoji to react with on messages. Generates a 'report' in specified logging channel upon react.",
+        "bot_version": "4.0.0",          
+        "title": "Report",
+        "icon_url": "https://i.imgur.com/Mo60CdK.png",
+        "thumbnail_url": "https://i.imgur.com/Mo60CdK.png"
+    },
+      "top-supporters": {
+        "repository": "fourjr/modmail-plugins",
+        "branch": "v4",
+        "description": "Gathers and prints the top supporters of handling threads.",
+        "bot_version": "4.0.0",          
+        "title": "Top Supporters",
+        "icon_url": "https://i.imgur.com/Mo60CdK.png",
+        "thumbnail_url": "https://i.imgur.com/Mo60CdK.png"
     }
-}
+}

runtime.txt

@@ -1 +1 @@
-python-3.10.3
+python-3.10.7