From a81c9262c3ee713738355d8d0ce311f77c1ba149 Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Fri, 14 Jul 2023 15:40:19 +0800
Subject: [PATCH] fix

---
 app/chain/message.py             | 7 ++++---
 app/command.py                   | 6 ++++--
 app/modules/telegram/__init__.py | 2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/chain/message.py b/app/chain/message.py
index 88994c3a..a53bf3ed 100644
--- a/app/chain/message.py
+++ b/app/chain/message.py
@@ -65,7 +65,8 @@ class MessageChain(ChainBase):
                 EventType.CommandExcute,
                 {
                     "cmd": text,
-                    "user": userid
+                    "user": userid,
+                    "channel": channel
                 }
             )
 
@@ -230,7 +231,7 @@ class MessageChain(ChainBase):
             else:
                 # 发送媒体数据
                 self.__post_medias_message(channel=channel,
-                                           title=self._current_media.title,
+                                           title=self._current_meta.name,
                                            items=cache_list[start:end],
                                            userid=userid,
                                            total=len(cache_list))
@@ -263,7 +264,7 @@ class MessageChain(ChainBase):
                 else:
                     # 发送媒体数据
                     self.__post_medias_message(channel=channel,
-                                               title=self._current_media.title,
+                                               title=self._current_meta.name,
                                                items=cache_list, userid=userid, total=total)
 
         else:
diff --git a/app/command.py b/app/command.py
index b5863ffe..852ca2a0 100644
--- a/app/command.py
+++ b/app/command.py
@@ -191,7 +191,7 @@ class Command(metaclass=Singleton):
                     elif args_num == 2:
                         # 没有输入参数，只输入渠道和用户ID
                         command['func'](channel, userid)
-                    else:
+                    elif args_num > 2:
                         # 多个输入参数：用户输入、用户ID
                         command['func'](data_str, channel, userid)
                 else:
@@ -219,10 +219,12 @@ class Command(metaclass=Singleton):
         """
         # 命令参数
         event_str = event.event_data.get('cmd')
+        # 消息渠道
+        event_channel = event.event_data.get('channel')
         # 消息用户
         event_user = event.event_data.get('user')
         if event_str:
             cmd = event_str.split()[0]
             args = " ".join(event_str.split()[1:])
             if self.get(cmd):
-                self.execute(cmd, args, event_user)
+                self.execute(cmd, args, event_channel, event_user)
diff --git a/app/modules/telegram/__init__.py b/app/modules/telegram/__init__.py
index c94c8c8d..068fbe03 100644
--- a/app/modules/telegram/__init__.py
+++ b/app/modules/telegram/__init__.py
@@ -87,7 +87,7 @@ class TelegramModule(_ModuleBase):
                         self.telegram.send_msg(title="你不在用户白名单中，无法使用此机器人", userid=user_id)
                         return CommingMessage(channel=MessageChannel.Wechat,
                                               userid=user_id, username=user_id, text="")
-                return CommingMessage(channel=MessageChannel.Wechat,
+                return CommingMessage(channel=MessageChannel.Telegram,
                                       userid=user_id, username=user_id, text=text)
         return None