bugfixing and optimisations

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.7.8
+
+### Fixed
+- Permission levels were not respected
+- `perms remove` was not working
+- `logs` and `block` would not recognise users in a seperate server setup.
+
+### 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"
 
 
 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()
 
@@ -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/utility.py

@@ -1496,23 +1496,25 @@ 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(
+                    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()
@@ -175,6 +175,11 @@ 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 +250,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 +301,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/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)