Merge branch 'development'

Author: fourjr

CHANGELOG.md

@@ -6,6 +6,21 @@ 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.7.8-dev1
+
+### Added
+
+- Added `thread_contact_silently` to allow opening threads silently by default
+
+### Fixed
+- Permission levels were not respected
+- `perms remove` was not working
+- `logs` and `block` would not recognise users in a seperate server setup.
+- Custom emojis were not working with `confirm_thread_creation`
+
+### Internal
+- Optimised `perms get`, bot should respond faster now
+
 # v3.7.7
 
 ### Added

bot.py

@@ -1,4 +1,4 @@
-__version__ = "3.7.7"
+__version__ = "3.7.8-dev1"
 
 
 import asyncio
@@ -1002,6 +1002,11 @@ async def update_perms(
             else:
                 if value in permissions[name]:
                     permissions[name].remove(value)
+
+        if isinstance(name, PermissionLevel):
+            self.config["level_permissions"] = permissions
+        else:
+            self.config["command_permissions"] = permissions
         logger.info("Updating permissions for %s, %s (add=%s).", name, value, add)
         await self.config.update()
 
@@ -1159,7 +1164,7 @@ async def handle_reaction_events(self, payload):
                 logger.warning("Failed to find linked message for reactions: %s", e)
                 return
 
-        if self.config["transfer_reactions"]:
+        if self.config["transfer_reactions"] and linked_message is not None:
             if payload.event_type == "REACTION_ADD":
                 if await self.add_reaction(linked_message, reaction):
                     await self.add_reaction(message, reaction)
@@ -1355,6 +1360,7 @@ async def on_error(self, event_method, *args, **kwargs):
 
     async def on_command_error(self, context, exception):
         if isinstance(exception, commands.BadUnionArgument):
+            logger.error("Expected exception:", exc_info=exception)
             msg = "Could not find the specified " + human_join(
                 [c.__name__ for c in exception.converters]
             )

cogs/modmail.py

@@ -989,7 +989,7 @@ async def contact(
             if self.bot.config["dm_disabled"] in (DMDisabled.NEW_THREADS, DMDisabled.ALL_THREADS):
                 logger.info("Contacting user %s when Modmail DM is disabled.", user)
 
-            if not silent:
+            if not silent and not self.bot.config.get("thread_contact_silently"):
                 if ctx.author.id == user.id:
                     description = "You have opened a Modmail thread."
                 else:

cogs/utility.py

@@ -345,7 +345,7 @@ async def about(self, ctx):
         embed.add_field(
             name="Want Modmail in Your Server?",
             value="Follow the installation guide on [GitHub](https://github.com/kyb3r/modmail/) "
-            "and join our [Discord server](https://discord.gg/F34cRU8/)!",
+            "and join our [Discord server](https://discord.gg/F34cRU8)!",
             inline=False,
         )
 
@@ -1496,23 +1496,23 @@ async def permissions_get(
         """
 
         if name is None and user_or_role not in {"command", "level", "override"}:
-            value = self._verify_user_or_role(user_or_role)
+            value = str(self._verify_user_or_role(user_or_role))
 
             cmds = []
             levels = []
 
             done = set()
+            command_permissions = self.bot.config["command_permissions"]
+            level_permissions = self.bot.config["level_permissions"]
             for command in self.bot.walk_commands():
                 if command not in done:
                     done.add(command)
-                    permissions = self.bot.config["command_permissions"].get(
-                        command.qualified_name, []
-                    )
+                    permissions = command_permissions.get(command.qualified_name, [])
                     if value in permissions:
                         cmds.append(command.qualified_name)
 
             for level in PermissionLevel:
-                permissions = self.bot.config["level_permissions"].get(level.name, [])
+                permissions = level_permissions.get(level.name, [])
                 if value in permissions:
                     levels.append(level.name)
 

core/checks.py

@@ -62,7 +62,7 @@ async def check_permissions(ctx, command_name) -> bool:
     if command_name in command_permissions:
         # -1 is for @everyone
         return -1 in command_permissions[command_name] or any(
-            check.id in command_permissions[command_name] for check in checkables
+            str(check.id) in command_permissions[command_name] for check in checkables
         )
 
     level_permissions = ctx.bot.config["level_permissions"]
@@ -71,7 +71,7 @@ async def check_permissions(ctx, command_name) -> bool:
         if level >= permission_level and level.name in level_permissions:
             # -1 is for @everyone
             if -1 in level_permissions[level.name] or any(
-                check.id in level_permissions[level.name] for check in checkables
+                str(check.id) in level_permissions[level.name] for check in checkables
             ):
                 return True
     return False

core/config.py

@@ -14,7 +14,7 @@
 from core._color_data import ALL_COLORS
 from core.models import DMDisabled, InvalidConfigError, Default, getLogger
 from core.time import UserFriendlyTimeSync
-from core.utils import strtobool
+from core.utils import strtobool, tryint
 
 logger = getLogger(__name__)
 load_dotenv()
@@ -53,6 +53,7 @@ class ConfigManager:
         "thread_auto_close_response": "This thread has been closed automatically due to inactivity after {timeout}.",
         "thread_creation_response": "The staff team will get back to you as soon as possible.",
         "thread_creation_footer": "Your message has been sent",
+        "thread_contact_silently": False,
         "thread_self_closable_creation_footer": "Click the lock to close the thread",
         "thread_creation_title": "Thread Created",
         "thread_close_footer": "Replying will create a new thread",
@@ -167,6 +168,7 @@ class ConfigManager:
         "data_collection",
         "enable_eval",
         "disable_autoupdates",
+        "thread_contact_silently",
     }
 
     enums = {
@@ -175,6 +177,8 @@ class ConfigManager:
         "activity_type": discord.ActivityType,
     }
 
+    force_str = {"command_permissions", "level_permissions"}
+
     defaults = {**public_keys, **private_keys, **protected_keys}
     all_keys = set(defaults.keys())
 
@@ -245,18 +249,19 @@ def __setitem__(self, key: str, item: typing.Any) -> None:
         self._cache[key] = item
 
     def __getitem__(self, key: str) -> typing.Any:
-        key = key.lower()
-        if key not in self.all_keys:
-            raise InvalidConfigError(f'Configuration "{key}" is invalid.')
-        if key not in self._cache:
-            self._cache[key] = deepcopy(self.defaults[key])
-        return self._cache[key]
+        # make use of the custom methods in func:get:
+        return self.get(key)
 
     def __delitem__(self, key: str) -> None:
         return self.remove(key)
 
     def get(self, key: str, convert=True) -> typing.Any:
-        value = self.__getitem__(key)
+        key = key.lower()
+        if key not in self.all_keys:
+            raise InvalidConfigError(f'Configuration "{key}" is invalid.')
+        if key not in self._cache:
+            self._cache[key] = deepcopy(self.defaults[key])
+        value = self._cache[key]
 
         if not convert:
             return value
@@ -295,6 +300,29 @@ def get(self, key: str, convert=True) -> typing.Any:
                 logger.warning("Invalid %s %s.", key, value)
                 value = self.remove(key)
 
+        elif key in self.force_str:
+            # Temporary: as we saved in int previously, leading to int32 overflow,
+            #            this is transitioning IDs to strings
+            new_value = {}
+            changed = False
+            for k, v in value.items():
+                new_v = v
+                if isinstance(v, list):
+                    new_v = []
+                    for n in v:
+                        print("x", n, v)
+                        if n != -1 and not isinstance(n, str):
+                            changed = True
+                            n = str(n)
+                        new_v.append(n)
+                new_value[k] = new_v
+
+            if changed:
+                # transition the database as well
+                self.set(key, new_value)
+
+            value = new_value
+
         return value
 
     def set(self, key: str, item: typing.Any, convert=True) -> None:

core/config_help.json

@@ -303,6 +303,17 @@
       "See also: `thread_creation_title`, `thread_creation_response`, `thread_self_closable_creation_footer`, `thread_close_footer`."
     ]
   },
+  "thread_contact_silently": {
+    "default": "No",
+    "description": "Setting this configuration will always open a new thread silently in contact.",
+    "examples": [
+      "`{prefix}config set thread_contact_silently yes`",
+      "`{prefix}config set thread_contact_silently no`"
+    ],
+    "notes": [
+      "Works like `{prefix}contact <user> silent` for every new thread."
+    ]
+  },
   "thread_self_closable_creation_footer": {
     "default": "\"Click the lock to close the thread\"",
     "description": "This is the message embed footer sent to the recipient upon the creation of a new thread.",
@@ -644,7 +655,7 @@
       "`{prefix}config set confirm_thread_creation yes`"
     ],
     "notes": [
-      "See also: `confirm_thread_creation_title`, `confirm_thread_response`, `confirm_thread_creation_accept`, confirm_thread_creation_deny`"
+      "See also: `confirm_thread_creation_title`, `confirm_thread_response`, `confirm_thread_creation_accept`, `confirm_thread_creation_deny``"
     ]
   },
   "confirm_thread_creation_title": {
@@ -654,7 +665,7 @@
       "`{prefix}config set confirm_thread_creation_title Are you sure you want to create a new thread?`"
     ],
     "notes": [
-      "See also: `confirm_thread_creation`, `confirm_thread_response`, `confirm_thread_creation_accept`, confirm_thread_creation_deny`"
+      "See also: `confirm_thread_creation`, `confirm_thread_response`, `confirm_thread_creation_accept`, `confirm_thread_creation_deny`"
     ]
   },
   "confirm_thread_response": {
@@ -664,7 +675,7 @@
       "`{prefix}config set confirm_thread_response React to confirm`"
     ],
     "notes": [
-      "See also: `confirm_thread_creation`, `confirm_thread_creation_title`, `confirm_thread_creation_accept`, confirm_thread_creation_deny`"
+      "See also: `confirm_thread_creation`, `confirm_thread_creation_title`, `confirm_thread_creation_accept`, `confirm_thread_creation_deny`"
     ]
   },
   "confirm_thread_creation_accept": {
@@ -675,7 +686,7 @@
     ],
     "notes": [
       "This has no effect unless `confirm_thread_creation` is set",
-      "See also: `confirm_thread_creation`, `confirm_thread_creation_title`, `confirm_thread_response`, confirm_thread_creation_deny`"
+      "See also: `confirm_thread_creation`, `confirm_thread_creation_title`, `confirm_thread_response`, `confirm_thread_creation_deny`"
     ]
   },
   "confirm_thread_creation_deny": {
@@ -686,7 +697,7 @@
     ],
     "notes": [
       "This has no effect unless `confirm_thread_creation` is set",
-      "See also: `confirm_thread_creation`, `confirm_thread_creation_title`, `confirm_thread_response`, confirm_thread_creation_accept`"
+      "See also: `confirm_thread_creation`, `confirm_thread_creation_title`, `confirm_thread_response`, `confirm_thread_creation_accept`"
     ]
   },
   "use_regex_autotrigger": {

core/thread.py

@@ -663,22 +663,23 @@ async def find_linked_message_from_dm(self, message, either_direction=False):
         else:
             compare_url = None
 
-        async for linked_message in self.channel.history():
-            if not linked_message.embeds:
-                continue
-            url = linked_message.embeds[0].author.url
-            if not url:
-                continue
-            if url == compare_url:
-                return linked_message
+        if self.channel is not None:
+            async for linked_message in self.channel.history():
+                if not linked_message.embeds:
+                    continue
+                url = linked_message.embeds[0].author.url
+                if not url:
+                    continue
+                if url == compare_url:
+                    return linked_message
 
-            msg_id = url.split("#")[-1]
-            if not msg_id.isdigit():
-                continue
-            msg_id = int(msg_id)
-            if int(msg_id) == message.id:
-                return linked_message
-        raise ValueError("Thread channel message not found.")
+                msg_id = url.split("#")[-1]
+                if not msg_id.isdigit():
+                    continue
+                msg_id = int(msg_id)
+                if int(msg_id) == message.id:
+                    return linked_message
+            raise ValueError("Thread channel message not found.")
 
     async def edit_dm_message(self, message: discord.Message, content: str) -> None:
         try:
@@ -1181,7 +1182,7 @@ async def create(
                     check=lambda r, u: u.id == message.author.id
                     and r.message.id == confirm.id
                     and r.message.channel.id == confirm.channel.id
-                    and r.emoji in (accept_emoji, deny_emoji),
+                    and str(r.emoji) in (accept_emoji, deny_emoji),
                     timeout=20,
                 )
             except asyncio.TimeoutError:

core/utils.py

@@ -56,11 +56,11 @@ class User(commands.IDConverter):
     # noinspection PyCallByClass,PyTypeChecker
     async def convert(self, ctx, argument):
         try:
-            return await commands.MemberConverter.convert(self, ctx, argument)
+            return await commands.MemberConverter().convert(ctx, argument)
         except commands.BadArgument:
             pass
         try:
-            return await commands.UserConverter.convert(self, ctx, argument)
+            return await commands.UserConverter().convert(ctx, argument)
         except commands.BadArgument:
             pass
         match = self._get_id_match(argument)