Merge branch 'release/v3.2.1'

Author: yupix

CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [v3.2.1] 2022-01-24
+
+### Fixed
+
+- `mention_command` が複数登録できない不具合を修正しました
+
 ## [v3.2.0] 2022-01-24
 
 ### Added

mi/__init__.py

@@ -4,7 +4,7 @@
 __copyright__ = "Copyright 2021-present yupix"
 __author_email__ = "[email protected]"
 __url__ = "https://github.com/yupix/Mi.py"
-__version__ = "3.2.0"
+__version__ = "3.2.1"
 
 __path__ = __import__("pkgutil").extend_path(__path__, __name__)
 

mi/client.py

@@ -158,15 +158,16 @@ async def __on_error(event_method: str) -> None:
         traceback.print_exc()
 
     async def progress_command(self, message):
-        for key, command in self.all_commands.items():
-            if key == 'regex':
-                if re.search(command[0], message.content):
-                    hit_list = re.findall(command[0], message.content)
+        for cmd in self.all_commands:
+            print(cmd)
+            if cmd.cmd_type == 'regex':
+                if re.search(cmd.key, message.content):
+                    hit_list = re.findall(cmd.key, message.content)
                     if isinstance(hit_list, tuple):
                         hit_list = hit_list[0]
-                    await command[1].invoke(message, *hit_list)
-            elif message.content.find(command[0]) != -1:
-                await command[1].invoke(message)
+                    await cmd.func.invoke(message, *hit_list)
+            elif message.content.find(cmd.key) != -1:
+                await cmd.func.invoke(message)
             else:
                 continue
 

mi/ext/commands/core.py

@@ -1,20 +1,27 @@
 import asyncio
-from typing import Dict, List, Optional
+from typing import List, Optional
 
 from mi.ext.commands._types import _BaseCommand
 
 
+class CMD:
+    def __init__(self, cmd_type: str, key: str, func: 'Command'):
+        self.cmd_type = cmd_type
+        self.key = key
+        self.func = func
+
+
 class CommandManager:
     def __init__(self, *args, **kwargs):
-        self.all_commands: Dict[str, List[str, Command]] = {}
+        self.all_commands: List[CMD] = []
         super().__init__(*args, **kwargs)  # Clientクラスを初期化する
 
     def add_command(self, command: 'Command'):
         if not isinstance(command, Command):
             raise TypeError(f'{command}はCommandクラスである必要があります')
         command_type = 'regex' if command.regex else 'text'
         command_key = command.regex or command.text
-        self.all_commands[command_type] = [command_key,  command]
+        self.all_commands.append(CMD(command_type, command_key, command))
 
 
 class Command(_BaseCommand):

setup.py

@@ -38,7 +38,7 @@
 
 setup(
     name="mi.py",
-    version="3.2.0",
+    version="3.2.1",
     install_requires=["emoji", 'aiocache', 'aiohttp'],
     url="https://github.com/yupix/mi.py",
     author="yupix",