nonebot-adapter-qq 1.6.0__py3-none-any.whl → 1.6.2__py3-none-any.whl

nonebot/adapters/qq/adapter.py

@@ -92,10 +92,7 @@ class Adapter(BaseAdapter):
         self.driver.on_shutdown(self.shutdown)
 
     async def startup(self) -> None:
-        log(
-            "DEBUG",
-            ("QQ run in sandbox mode: " f"<y>{self.qq_config.qq_is_sandbox}</y>"),
-        )
+        log("DEBUG", f"QQ run in sandbox mode: <y>{self.qq_config.qq_is_sandbox}</y>")
 
         try:
             api_base = self.get_api_base()
@@ -464,6 +461,10 @@ class Adapter(BaseAdapter):
         ):
             return response
 
+        # ensure bot self info
+        if not bot._self_info:
+            bot.self_info = await bot.me()
+
         if bot.self_id not in self.bots:
             self.bot_connect(bot)
 

nonebot/adapters/qq/bot.py

@@ -200,6 +200,10 @@ class Bot(BaseBot):
             raise RuntimeError(f"Bot {self.bot_info} is not connected!")
         return self._self_info
 
+    @self_info.setter
+    def self_info(self, info: User):
+        self._self_info = info
+
     @property
     def ready(self) -> bool:
         """Bot 是否已经准备就绪"""
@@ -281,9 +285,11 @@ class Bot(BaseBot):
         return _message
 
     @staticmethod
-    def _extract_send_message(message: Message) -> dict[str, Any]:
+    def _extract_send_message(
+        message: Message, escape_text: bool = True
+    ) -> dict[str, Any]:
         kwargs = {}
-        content = message.extract_content() or None
+        content = message.extract_content(escape_text) or None
         kwargs["content"] = content
         if embed := (message["embed"] or None):
             kwargs["embed"] = embed[-1].data["embed"]
@@ -347,7 +353,7 @@ class Bot(BaseBot):
             guild_id=guild_id,
             msg_id=msg_id,
             event_id=event_id,
-            **self._extract_send_message(message=message),
+            **self._extract_send_message(message=message, escape_text=True),
             **self._extract_guild_image(message=message),
         )
 
@@ -363,7 +369,7 @@ class Bot(BaseBot):
             channel_id=channel_id,
             msg_id=msg_id,
             event_id=event_id,
-            **self._extract_send_message(message=message),
+            **self._extract_send_message(message=message, escape_text=True),
             **self._extract_guild_image(message=message),
         )
 
@@ -376,12 +382,12 @@ class Bot(BaseBot):
         event_id: Optional[str] = None,
     ) -> Union[PostC2CMessagesReturn, PostC2CFilesReturn]:
         message = self._prepare_message(message)
-        kwargs = self._extract_send_message(message=message)
+        kwargs = self._extract_send_message(message=message, escape_text=False)
         if kwargs.get("embed"):
             msg_type = 4
         elif kwargs.get("ark"):
             msg_type = 3
-        elif kwargs.get("markdown"):
+        elif kwargs.get("markdown") or kwargs.get("keyboard"):
             msg_type = 2
         elif (
             message["image"]
@@ -425,7 +431,7 @@ class Bot(BaseBot):
         event_id: Optional[str] = None,
     ) -> Union[PostGroupMessagesReturn, PostGroupFilesReturn]:
         message = self._prepare_message(message)
-        kwargs = self._extract_send_message(message=message)
+        kwargs = self._extract_send_message(message=message, escape_text=False)
         if kwargs.get("embed"):
             msg_type = 4
         elif kwargs.get("ark"):
@@ -1674,7 +1680,11 @@ class Bot(BaseBot):
                         embed.dict(exclude_none=True) if embed is not None else None
                     ),
                     "image": image,
-                    "message_reference": message_reference,
+                    "message_reference": (
+                        message_reference.dict(exclude_none=True)
+                        if message_reference is not None
+                        else None
+                    ),
                     "event_id": event_id,
                     "msg_id": msg_id,
                     "msg_seq": msg_seq,
@@ -1776,7 +1786,11 @@ class Bot(BaseBot):
                         embed.dict(exclude_none=True) if embed is not None else None
                     ),
                     "image": image,
-                    "message_reference": message_reference,
+                    "message_reference": (
+                        message_reference.dict(exclude_none=True)
+                        if message_reference is not None
+                        else None
+                    ),
                     "event_id": event_id,
                     "msg_id": msg_id,
                     "msg_seq": msg_seq,

nonebot/adapters/qq/message.py

@@ -532,9 +532,9 @@ class Message(BaseMessage[MessageSegment]):
             )
         return msg
 
-    def extract_content(self) -> str:
+    def extract_content(self, escape_text: bool = True) -> str:
         return "".join(
-            str(seg)
+            seg.data["text"] if not escape_text and seg.type == "text" else str(seg)
             for seg in self
             if seg.type
             in ("text", "emoji", "mention_user", "mention_everyone", "mention_channel")

nonebot/adapters/qq/models/qq.py

@@ -10,11 +10,13 @@ from nonebot.adapters.qq.compat import field_validator
 class FriendAuthor(BaseModel):
     id: str
     user_openid: str
+    union_openid: Optional[str] = None
 
 
 class GroupMemberAuthor(BaseModel):
     id: str
     member_openid: str
+    union_openid: Optional[str] = None
 
 
 class Attachment(BaseModel):

{nonebot_adapter_qq-1.6.0.dist-info → nonebot_adapter_qq-1.6.2.dist-info}/METADATA

@@ -1,8 +1,7 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: nonebot-adapter-qq
-Version: 1.6.0
+Version: 1.6.2
 Summary: QQ adapter for nonebot2
-Home-page: https://github.com/nonebot/adapter-qq
 License: MIT
 Keywords: bot,qq,qqbot,qqguild
 Author: yanyongyu
@@ -25,6 +24,7 @@ Requires-Dist: pydantic (>=1.10.0,<3.0.0,!=2.5.0,!=2.5.1)
 Requires-Dist: typing-extensions (>=4.4.0,<5.0.0)
 Requires-Dist: yarl (>=1.9.0,<2.0.0)
 Project-URL: Documentation, https://github.com/nonebot/adapter-qq#readme
+Project-URL: Homepage, https://github.com/nonebot/adapter-qq
 Project-URL: Repository, https://github.com/nonebot/adapter-qq
 Description-Content-Type: text/markdown
 

{nonebot_adapter_qq-1.6.0.dist-info → nonebot_adapter_qq-1.6.2.dist-info}/RECORD

@@ -1,20 +1,20 @@
 nonebot/adapters/qq/__init__.py,sha256=jm1QxHfhcYIrWhkXxF9gE4G3lkagrLCWsmVqKBTQSOw,815
-nonebot/adapters/qq/adapter.py,sha256=-wtvqeK-LmqhTkWtTwwjdh6K84GGEAmLrbUNfnbXMRY,21177
-nonebot/adapters/qq/bot.py,sha256=A3nrkdgXj_AtzN1kebgkhfOjmAyI-s6f0ShQxJVu3wc,61167
+nonebot/adapters/qq/adapter.py,sha256=UwAjO168oWmvb3frjay4CTC54xq3hsCiVbeFxRwaGxI,21243
+nonebot/adapters/qq/bot.py,sha256=dU84L8bjg3DWb5B8f_pX9xS5Y7dY8dL0mM-bHFl_3vg,61735
 nonebot/adapters/qq/compat.py,sha256=Fr96IgBHHiEqGm8DVmlTekuaNdI5EPxti7J7HDwOHwg,767
 nonebot/adapters/qq/config.py,sha256=YRVpGNvslGcNHNbbFN9LOjZ98-yon5x9GMF98FVJ2xo,1974
 nonebot/adapters/qq/event.py,sha256=3A78iz-G6wC-KsW5gYQM16veqgCtjWWsb8AysXhDOK4,18802
 nonebot/adapters/qq/exception.py,sha256=8Xa9NwYyO7Ih0owBAC_zmEiIRAA8GjgQcoJcF5ogo0g,2701
-nonebot/adapters/qq/message.py,sha256=q4dhlpuQ-Fyiqj2_cL1TCaZutdF41fcyGXpiI6RucVg,15526
+nonebot/adapters/qq/message.py,sha256=74H7L3FTpZu5GAm4j3wnVYf7wJQ_kP9HHjqaXn3uRTQ,15616
 nonebot/adapters/qq/models/__init__.py,sha256=q2OhopcTn0UD2wuep_86dXMVhF_wQBzBDhyGLN1q0OE,631
 nonebot/adapters/qq/models/common.py,sha256=Hoot6Qr3PGj13G4Cz2Eyr-liaLiJXBpxpeM59IXBri0,4539
 nonebot/adapters/qq/models/guild.py,sha256=uKvSijWFMJ0x26Gd04b8QbUr8IOIn3U3m1d-I6xTrcI,11686
 nonebot/adapters/qq/models/payload.py,sha256=IhAx2W5rN8ihg2NchQ9rJMfcxDecwnnJ-5_N-ky8deM,3261
-nonebot/adapters/qq/models/qq.py,sha256=giLeCJ17YDoP8tdjlL99jr5WUguvRJVabQPriV8kmFc,1853
+nonebot/adapters/qq/models/qq.py,sha256=JH-1tC7ujwHpuJtPefGOJh2NQjrxAL7L-aRyu7xqplU,1931
 nonebot/adapters/qq/permission.py,sha256=Jw00btklCMviP001MBlLQmqThb9OsjJwHO1nTEDFRWM,989
 nonebot/adapters/qq/store.py,sha256=GKVbto6K7jI-oK9tSbw_xLxDiSA6Y9QnNQStKJU7mEY,868
 nonebot/adapters/qq/utils.py,sha256=bzJwm1zWyHjFILr-bHrBKpKlkiveph9S4pLAXMcW9AY,1538
-nonebot_adapter_qq-1.6.0.dist-info/LICENSE,sha256=4EZBnkZPQYBvtO2KFGaUQHTO8nZ26pGeaCFchdBq_AE,1064
-nonebot_adapter_qq-1.6.0.dist-info/METADATA,sha256=IqQhCethVtQJt4_AuEyX1gHfs0cdWPX-bwx-pDh8ZHw,3383
-nonebot_adapter_qq-1.6.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-nonebot_adapter_qq-1.6.0.dist-info/RECORD,,
+nonebot_adapter_qq-1.6.2.dist-info/LICENSE,sha256=4EZBnkZPQYBvtO2KFGaUQHTO8nZ26pGeaCFchdBq_AE,1064
+nonebot_adapter_qq-1.6.2.dist-info/METADATA,sha256=x4uMaiMSnl-yCX16FWdRuCTzm9XeUroid3HmDTPX_oc,3395
+nonebot_adapter_qq-1.6.2.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+nonebot_adapter_qq-1.6.2.dist-info/RECORD,,

{nonebot_adapter_qq-1.6.0.dist-info → nonebot_adapter_qq-1.6.2.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.9.1
+Generator: poetry-core 2.0.1
 Root-Is-Purelib: true
 Tag: py3-none-any