Messages.forward() now supports personal cards sent from self

youfou · Apr 15, 2017 · f0acc25 · f0acc25
1 parent 8ce6126
commit f0acc25
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/wxpy/api/messages/message.py b/wxpy/api/messages/message.py
@@ -223,7 +223,7 @@ def forward(self, chat, prefix=None, suffix=None, raise_for_unsupported=False):
 
             * 名片 (`CARD`)
 
-                * 仅支持公众号名片
+                * 仅支持公众号名片，以及自己发出的个人号名片
 
             * 分享 (`SHARING`)
 
@@ -344,9 +344,9 @@ def raise_properly(text):
             )
 
         elif self.type is CARD:
-            if self.card.raw.get('AttrStatus'):
-                # 为个人名片
-                raise_properly('Personal cards are unsupported:\n{}'.format(self))
+            if self.card.raw.get('AttrStatus') and self.sender != self.bot.self:
+                # 为个人名片，且不为自己所发出
+                raise_properly('Personal cards sent from others are unsupported:\n{}'.format(self))
             else:
                 return wrapped_send(
                     send_type='raw_msg',

diff --git a/wxpy/ext/sync_message_in_groups.py b/wxpy/ext/sync_message_in_groups.py
@@ -50,7 +50,7 @@ def sync_message_in_groups(
 
         * 名片 (`CARD`)
 
-            * 仅支持公众号名片
+            * 仅支持公众号名片，以及自己发出的个人号名片
 
         * 分享 (`SHARING`)
 
@@ -59,7 +59,7 @@ def sync_message_in_groups(
         * 语音 (`RECORDING`)
 
             * 会以文件方式发送
-                    
+
         * 地图 (`MAP`)
             
             * 会转化为 `位置名称 + 地图链接` 形式的文本消息