Merge pull request zhayujie#2114 from 6vision/fix_dingtalk_group_chat

fix: dingtalk channel group chat bug

channel/chat_channel.py

@@ -117,6 +117,7 @@ def _compose_context(self, ctype: ContextType, content, **kwargs):
                         logger.info("[chat_channel]receive group at")
                         if not conf().get("group_at_off", False):
                             flag = True
+                        self.name = self.name if self.name is not None else ""  # 部分渠道self.name可能没有赋值
                         pattern = f"@{re.escape(self.name)}(\u2005|\u0020)"
                         subtract_res = re.sub(pattern, r"", content)
                         if isinstance(context["msg"].at_list, list):

channel/dingtalk/dingtalk_channel.py

@@ -163,7 +163,7 @@ def handle_group(self, cmsg: DingTalkMessage):
         elif cmsg.ctype == ContextType.PATPAT:
             logger.debug("[DingTalk]receive patpat msg: {}".format(cmsg.content))
         elif cmsg.ctype == ContextType.TEXT:
-            logger.debug("[DingTalk]receive patpat msg: {}".format(cmsg.content))
+            logger.debug("[DingTalk]receive text msg: {}".format(cmsg.content))
         else:
             logger.debug("[DingTalk]receive other msg: {}".format(cmsg.content))
         context = self._compose_context(cmsg.ctype, cmsg.content, isgroup=True, msg=cmsg)

channel/dingtalk/dingtalk_message.py

@@ -49,6 +49,7 @@ def __init__(self, event: ChatbotMessage, image_download_handler):
         if self.is_group:
             self.from_user_id = event.conversation_id
             self.actual_user_id = event.sender_id
+            self.is_at = True
         else:
             self.from_user_id = event.sender_id
             self.actual_user_id = event.sender_id