nonebot-adapter-qq 1.2.0__py3-none-any.whl → 1.3.1__py3-none-any.whl

nonebot/adapters/qq/bot.py

@@ -313,12 +313,12 @@ class Bot(BaseBot):
         if image := message["image"]:
             kwargs["file_type"] = 1
             kwargs["url"] = image[-1].data["url"]
-        elif audio := message["audio"]:
-            kwargs["file_type"] = 2
-            kwargs["url"] = audio[-1].data["url"]
         elif video := message["video"]:
-            kwargs["file_type"] = 3
+            kwargs["file_type"] = 2
             kwargs["url"] = video[-1].data["url"]
+        elif audio := message["audio"]:
+            kwargs["file_type"] = 3
+            kwargs["url"] = audio[-1].data["url"]
         elif file := message["file"]:
             kwargs["file_type"] = 4
             kwargs["url"] = file[-1].data["url"]
@@ -370,7 +370,7 @@ class Bot(BaseBot):
 
     async def send_to_c2c(
         self,
-        user_id: str,
+        openid: str,
         message: Union[str, Message, MessageSegment],
         msg_id: Optional[str] = None,
         msg_seq: Optional[int] = None,
@@ -401,7 +401,7 @@ class Bot(BaseBot):
         media: Optional[Media] = None
         if msg_type == 7:
             media_info = await self.post_c2c_files(
-                user_id=user_id, srv_send_msg=False, **self._extract_qq_media(message)
+                openid=openid, srv_send_msg=False, **self._extract_qq_media(message)
             )
             media = (
                 Media(file_info=media_info.file_info) if media_info.file_info else None
@@ -409,7 +409,7 @@ class Bot(BaseBot):
         kwargs["media"] = media
 
         return await self.post_c2c_messages(
-            user_id=user_id,
+            openid=openid,
             msg_type=msg_type,
             msg_id=msg_id,
             msg_seq=msg_seq,
@@ -419,7 +419,7 @@ class Bot(BaseBot):
 
     async def send_to_group(
         self,
-        group_id: str,
+        group_openid: str,
         message: Union[str, Message, MessageSegment],
         msg_id: Optional[str] = None,
         msg_seq: Optional[int] = None,
@@ -450,7 +450,9 @@ class Bot(BaseBot):
         media: Optional[Media] = None
         if msg_type == 7:
             media_info = await self.post_group_files(
-                group_id=group_id, srv_send_msg=False, **self._extract_qq_media(message)
+                group_openid=group_openid,
+                srv_send_msg=False,
+                **self._extract_qq_media(message),
             )
             media = (
                 Media(file_info=media_info.file_info) if media_info.file_info else None
@@ -458,7 +460,7 @@ class Bot(BaseBot):
         kwargs["media"] = media
 
         return await self.post_group_messages(
-            group_id=group_id,
+            group_openid=group_openid,
             msg_type=msg_type,
             msg_id=msg_id,
             msg_seq=msg_seq,
@@ -490,7 +492,7 @@ class Bot(BaseBot):
         elif isinstance(event, C2CMessageCreateEvent):
             event._reply_seq += 1
             return await self.send_to_c2c(
-                user_id=event.author.id,
+                openid=event.author.id,
                 message=message,
                 msg_id=event.id,
                 msg_seq=event._reply_seq,
@@ -498,7 +500,7 @@ class Bot(BaseBot):
         elif isinstance(event, GroupAtMessageCreateEvent):
             event._reply_seq += 1
             return await self.send_to_group(
-                group_id=event.group_id,
+                group_openid=event.group_openid,
                 message=message,
                 msg_id=event.id,
                 msg_seq=event._reply_seq,
@@ -1606,7 +1608,7 @@ class Bot(BaseBot):
     async def post_c2c_messages(
         self,
         *,
-        user_id: str,
+        openid: str,
         msg_type: Literal[0, 1, 2, 3, 4, 7],
         content: Optional[str] = None,
         markdown: Optional[MessageMarkdown] = None,
@@ -1632,7 +1634,7 @@ class Bot(BaseBot):
 
         request = Request(
             "POST",
-            self.adapter.get_api_base().joinpath("v2", "users", user_id, "messages"),
+            self.adapter.get_api_base().joinpath("v2", "users", openid, "messages"),
             json=exclude_none(
                 {
                     "msg_type": msg_type,
@@ -1669,7 +1671,7 @@ class Bot(BaseBot):
     async def post_c2c_files(
         self,
         *,
-        user_id: str,
+        openid: str,
         file_type: Literal[1, 2, 3, 4],
         url: str,
         srv_send_msg: bool = True,
@@ -1677,7 +1679,7 @@ class Bot(BaseBot):
     ) -> PostC2CFilesReturn:
         request = Request(
             "POST",
-            self.adapter.get_api_base().joinpath("v2", "users", user_id, "files"),
+            self.adapter.get_api_base().joinpath("v2", "users", openid, "files"),
             json=exclude_none(
                 {
                     "file_type": file_type,
@@ -1694,7 +1696,7 @@ class Bot(BaseBot):
     async def post_group_messages(
         self,
         *,
-        group_id: str,
+        group_openid: str,
         msg_type: Literal[0, 1, 2, 3, 4, 7],
         content: Optional[str] = None,
         markdown: Optional[MessageMarkdown] = None,
@@ -1720,7 +1722,9 @@ class Bot(BaseBot):
 
         request = Request(
             "POST",
-            self.adapter.get_api_base().joinpath("v2", "groups", group_id, "messages"),
+            self.adapter.get_api_base().joinpath(
+                "v2", "groups", group_openid, "messages"
+            ),
             json=exclude_none(
                 {
                     "msg_type": msg_type,
@@ -1757,7 +1761,7 @@ class Bot(BaseBot):
     async def post_group_files(
         self,
         *,
-        group_id: str,
+        group_openid: str,
         file_type: Literal[1, 2, 3, 4],
         url: str,
         srv_send_msg: bool = True,
@@ -1765,7 +1769,7 @@ class Bot(BaseBot):
     ) -> PostGroupFilesReturn:
         request = Request(
             "POST",
-            self.adapter.get_api_base().joinpath("v2", "groups", group_id, "files"),
+            self.adapter.get_api_base().joinpath("v2", "groups", group_openid, "files"),
             json=exclude_none(
                 {
                     "file_type": file_type,

nonebot/adapters/qq/event.py

@@ -14,12 +14,14 @@ from .models import (
     RichText,
     QQMessage,
     AudioAction,
+    FriendAuthor,
     MessageDelete,
     MessageAudited,
     ForumSourceInfo,
     MessageReaction,
     ForumAuditResult,
     ButtonInteraction,
+    GroupMemberAuthor,
 )
 
 E = TypeVar("E", bound="Event")
@@ -348,14 +350,6 @@ class DirectMessageDeleteEvent(MessageDeleteEvent):
 class QQMessageEvent(MessageEvent, QQMessage):
     _reply_seq: int = -1
 
-    @override
-    def get_user_id(self) -> str:
-        return self.author.id
-
-    @override
-    def get_session_id(self) -> str:
-        return self.author.id
-
     @override
     def get_message(self) -> Message:
         if not hasattr(self, "_message"):
@@ -367,37 +361,48 @@ class QQMessageEvent(MessageEvent, QQMessage):
 class C2CMessageCreateEvent(QQMessageEvent):
     __type__ = EventType.C2C_MESSAGE_CREATE
 
+    author: FriendAuthor
     to_me: bool = True
 
+    @override
+    def get_user_id(self) -> str:
+        return self.author.user_openid
+
+    @override
+    def get_session_id(self) -> str:
+        return f"friend_{self.author.user_openid}"
+
     @override
     def get_event_description(self) -> str:
         return escape_tag(
             f"Message {self.id} from {self.author.id}: {self.get_message()!r}"
         )
 
-    @override
-    def get_session_id(self) -> str:
-        return f"friend_{self.author.id}"
-
 
 @register_event_class
 class GroupAtMessageCreateEvent(QQMessageEvent):
     __type__ = EventType.GROUP_AT_MESSAGE_CREATE
 
-    group_id: str
+    author: GroupMemberAuthor
+    group_openid: str
     to_me: bool = True
 
+    @override
+    def get_user_id(self) -> str:
+        return self.author.member_openid
+
+    @override
+    def get_session_id(self) -> str:
+        return f"group_{self.group_openid}_{self.author.member_openid}"
+
     @override
     def get_event_description(self) -> str:
         return escape_tag(
-            f"Message {self.id} from {self.author.id}@[Group:{self.group_id}]: "
+            f"Message {self.id} from "
+            f"{self.author.member_openid}@[Group:{self.group_openid}]: "
             f"{self.get_message()!r}"
         )
 
-    @override
-    def get_session_id(self) -> str:
-        return f"group_{self.group_id}_{self.author.id}"
-
 
 @register_event_class
 class InteractionCreateEvent(NoticeEvent, ButtonInteraction):
@@ -587,15 +592,15 @@ class OpenForumReplyDeleteEvent(OpenForumEvent):
 # Friend Robot Event
 class FriendRobotEvent(NoticeEvent):
     timestamp: datetime
-    open_id: str
+    openid: str
 
     @override
     def get_user_id(self) -> str:
-        return self.open_id
+        return self.openid
 
     @override
     def get_session_id(self) -> str:
-        return f"friend_{self.open_id}"
+        return f"friend_{self.openid}"
 
 
 @register_event_class

nonebot/adapters/qq/message.py

@@ -8,10 +8,11 @@ from typing import TYPE_CHECKING, Type, Union, Iterable, Optional, TypedDict, ov
 from nonebot.adapters import Message as BaseMessage
 from nonebot.adapters import MessageSegment as BaseMessageSegment
 
+from .models import QQMessage
 from .utils import escape, unescape
 from .models import Message as GuildMessage
+from .models import Attachment as QQAttachment
 from .models import (
-    QQMessage,
     MessageArk,
     MessageEmbed,
     MessageKeyboard,
@@ -401,15 +402,16 @@ class Message(BaseMessage[MessageSegment]):
         if message.content:
             msg.extend(Message(message.content))
         if message.attachments:
-            attachment_types = {
-                "图片": "image",
-                "语音": "audio",
-                "视频": "video",
-                "文件": "file",
-            }
+
+            def content_type(seg: QQAttachment):
+                ct = seg.content_type.split("/", maxsplit=1)[0]
+                if ct in {"image", "audio", "file", "video"}:
+                    return ct
+                return "file"
+
             msg.extend(
                 Attachment(
-                    attachment_types.get(seg.content_type, "file"),
+                    content_type(seg),
                     data={"url": seg.url},
                 )
                 for seg in message.attachments

nonebot/adapters/qq/models/common.py

@@ -1,12 +1,19 @@
 from typing import List, Optional
+from urllib.parse import urlparse
 
-from pydantic import BaseModel
+from pydantic import BaseModel, validator
 
 
 # Message Attachment
 class MessageAttachment(BaseModel):
     url: str
 
+    @validator("url", allow_reuse=True)
+    def check_url(cls, v: str):
+        if v and not urlparse(v).hostname:
+            return f"https://{v}"
+        return v
+
 
 # Message Embed
 class MessageEmbedThumbnail(BaseModel):

nonebot/adapters/qq/models/qq.py

@@ -1,11 +1,18 @@
 from datetime import datetime
+from urllib.parse import urlparse
 from typing import List, Literal, Optional
 
-from pydantic import BaseModel
+from pydantic import BaseModel, validator
 
 
-class Author(BaseModel):
+class FriendAuthor(BaseModel):
     id: str
+    user_openid: str
+
+
+class GroupMemberAuthor(BaseModel):
+    id: str
+    member_openid: str
 
 
 class Attachment(BaseModel):
@@ -16,6 +23,12 @@ class Attachment(BaseModel):
     size: Optional[str] = None
     url: Optional[str] = None
 
+    @validator("url", allow_reuse=True)
+    def check_url(cls, v: str):
+        if v and not urlparse(v).hostname:
+            return f"https://{v}"
+        return v
+
 
 class Media(BaseModel):
     file_info: str
@@ -23,7 +36,6 @@ class Media(BaseModel):
 
 class QQMessage(BaseModel):
     id: str
-    author: Author
     content: str
     timestamp: str
     attachments: Optional[List[Attachment]] = None
@@ -87,7 +99,8 @@ class ButtonInteraction(BaseModel):
 
 
 __all__ = [
-    "Author",
+    "FriendAuthor",
+    "GroupMemberAuthor",
     "Attachment",
     "Media",
     "QQMessage",

{nonebot_adapter_qq-1.2.0.dist-info → nonebot_adapter_qq-1.3.1.dist-info}/METADATA

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

{nonebot_adapter_qq-1.2.0.dist-info → nonebot_adapter_qq-1.3.1.dist-info}/RECORD

@@ -1,20 +1,20 @@
 nonebot/adapters/qq/__init__.py,sha256=u2bR9HLdgIEV22nu2VJeUFscklTUj8DN4650q0k5SHw,787
 nonebot/adapters/qq/adapter.py,sha256=NLEgraL3kMOjdoSysrpDiaWjgxlJIxDmCRyYBvTyKyI,14303
-nonebot/adapters/qq/bot.py,sha256=X6SZo_gZAIHj0iceR2UeCusnhvReXoEg-TRpDPQVBPA,58971
+nonebot/adapters/qq/bot.py,sha256=nz0D4qEwgAji3nLQgUCaETmOo15H9VHheEOH8fubjak,59068
 nonebot/adapters/qq/config.py,sha256=9EbzpCFnWyMNXWlTZmx1WYKbEl1I9KMrTf9bIf9r7dg,1979
-nonebot/adapters/qq/event.py,sha256=FMeQ5CQFQcNv6_qCD79bGsDgBiVMCUR0EtGA13nGO5c,17614
+nonebot/adapters/qq/event.py,sha256=iY8G4GlhzL8JvIiFdQT7R3-CmG1hsuK7kmBAH-_h2KI,17783
 nonebot/adapters/qq/exception.py,sha256=8Xa9NwYyO7Ih0owBAC_zmEiIRAA8GjgQcoJcF5ogo0g,2701
-nonebot/adapters/qq/message.py,sha256=fRD1R6rG8QY-mBbCXndv2wxzNgQEICiNj218o5B8k1o,11170
+nonebot/adapters/qq/message.py,sha256=IJu_sDUT2Hcd0-VfT-kzBxq3mMxbzOOSiNwfBjCcgQk,11254
 nonebot/adapters/qq/models/__init__.py,sha256=AahR-O5B_1c8dMXHpDH68o4qojhF3vf4UPDGyH2MKjA,537
 nonebot/adapters/qq/models/_transformer.py,sha256=Zrhno7aJKHkLnljFuyivndRKdrxtqZZaoiXOFx0JQdU,3416
-nonebot/adapters/qq/models/common.py,sha256=rAhR3gJVKJVgmFky1jL68H1RPCSQlbkZgIgXYDkVIuc,2817
+nonebot/adapters/qq/models/common.py,sha256=_5y9vhEexJaE7poS1ABALarpDdPCjvmNtRB-pWXeAOI,3029
 nonebot/adapters/qq/models/guild.py,sha256=4EZHvpzfPKwapCTAmI22zWaHtL0AZccIszQH3hTxoSo,11666
 nonebot/adapters/qq/models/payload.py,sha256=dg9AYDI3YjWZ3bT-mn9596glszBwmI8i751sMY_maSM,2281
-nonebot/adapters/qq/models/qq.py,sha256=5SFf2tjWG_MhrSjajd_M1s5I510Fxu9eyywUyNgNoiY,2101
+nonebot/adapters/qq/models/qq.py,sha256=JUMJy33lvzkiLPc9XaPtt8dQvuX0-_I0o12VeBiTfiY,2425
 nonebot/adapters/qq/permission.py,sha256=0aedypl6xymhAV3UkW0vlvHTBkJeDmOef3SxG2tPcHQ,988
 nonebot/adapters/qq/store.py,sha256=X-NeSVCrxngQDPo9IXKWehERNa4sefdrYrZn5-yucF4,874
 nonebot/adapters/qq/utils.py,sha256=vU0aNRIBtU4za8-2uVoRXjjcQsBw2i0SFFGX8KOuJjE,1570
-nonebot_adapter_qq-1.2.0.dist-info/LICENSE,sha256=4EZBnkZPQYBvtO2KFGaUQHTO8nZ26pGeaCFchdBq_AE,1064
-nonebot_adapter_qq-1.2.0.dist-info/METADATA,sha256=gTzGlA64_qtQsOl-I5UDLi0pg5D7NWYja8vKaYg7MUk,2768
-nonebot_adapter_qq-1.2.0.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-nonebot_adapter_qq-1.2.0.dist-info/RECORD,,
+nonebot_adapter_qq-1.3.1.dist-info/LICENSE,sha256=4EZBnkZPQYBvtO2KFGaUQHTO8nZ26pGeaCFchdBq_AE,1064
+nonebot_adapter_qq-1.3.1.dist-info/METADATA,sha256=eWrnLsYgG-7eAiU3dmq8uZEJNfvqzKhkjDrNUA6IEWM,2768
+nonebot_adapter_qq-1.3.1.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+nonebot_adapter_qq-1.3.1.dist-info/RECORD,,