nonebot-adapter-qq 1.6.0__tar.gz → 1.6.1__tar.gz

{nonebot_adapter_qq-1.6.0 → nonebot_adapter_qq-1.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: nonebot-adapter-qq
-Version: 1.6.0
+Version: 1.6.1
 Summary: QQ adapter for nonebot2
 Home-page: https://github.com/nonebot/adapter-qq
 License: MIT

{nonebot_adapter_qq-1.6.0 → nonebot_adapter_qq-1.6.1}/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_adapter_qq-1.6.0 → nonebot_adapter_qq-1.6.1}/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,7 +382,7 @@ 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"):
@@ -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"):

{nonebot_adapter_qq-1.6.0 → nonebot_adapter_qq-1.6.1}/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_adapter_qq-1.6.0 → nonebot_adapter_qq-1.6.1}/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 → nonebot_adapter_qq-1.6.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "nonebot-adapter-qq"
-version = "1.6.0"
+version = "1.6.1"
 description = "QQ adapter for nonebot2"
 authors = ["yanyongyu <yyy@nonebot.dev>"]
 license = "MIT"
@@ -27,7 +27,7 @@ typing-extensions = ">=4.4.0, <5.0.0"
 pydantic = ">=1.10.0,<3.0.0,!=2.5.0,!=2.5.1"
 
 [tool.poetry.group.dev.dependencies]
-ruff = "^0.8.0"
+ruff = "^0.9.0"
 isort = "^5.10.1"
 nonemoji = "^0.1.3"
 pre-commit = "^4.0.0"