nonebot-adapter-qq 1.0.0__tar.gz → 1.0.1__tar.gz

{nonebot_adapter_qq-1.0.0 → nonebot_adapter_qq-1.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nonebot-adapter-qq
-Version: 1.0.0
+Version: 1.0.1
 Summary: QQ adapter for nonebot2
 Home-page: https://github.com/nonebot/adapter-qq
 License: MIT
@@ -21,6 +21,7 @@ Classifier: Programming Language :: Python :: 3.11
 Requires-Dist: nonebot2 (>=2.1.0,<3.0.0)
 Requires-Dist: pydantic (>=1.9.0,<2.0.0)
 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: Repository, https://github.com/nonebot/adapter-qq
 Description-Content-Type: text/markdown

nonebot_adapter_qq-1.0.1/nonebot/adapters/qq/__init__.py

@@ -0,0 +1,17 @@
+from .event import *
+from .permission import *
+from .bot import Bot as Bot
+from .utils import log as log
+from .utils import escape as escape
+from .adapter import Adapter as Adapter
+from .message import Message as Message
+from .utils import unescape as unescape
+from .exception import ActionFailed as ActionFailed
+from .exception import NetworkError as NetworkError
+from .message import MessageSegment as MessageSegment
+from .exception import AuditException as AuditException
+from .exception import NoLogException as NoLogException
+from .exception import ApiNotAvailable as ApiNotAvailable
+from .exception import QQAdapterException as QQAdapterException
+from .exception import RateLimitException as RateLimitException
+from .exception import UnauthorizedException as UnauthorizedException

{nonebot_adapter_qq-1.0.0 → nonebot_adapter_qq-1.0.1}/nonebot/adapters/qq/bot.py

@@ -77,6 +77,7 @@ from .models import (
     PostGroupFilesReturn,
     PostC2CMessagesReturn,
     GetReactionUsersReturn,
+    PostGroupMembersReturn,
     PostGroupMessagesReturn,
     APIPermissionDemandIdentify,
     GetGuildAPIPermissionReturn,
@@ -100,10 +101,10 @@ async def _check_reply(
         return
     try:
         event.reply = await bot.get_message_of_id(
-            channel_id=event.channel_id,  # type: ignore
-            message_id=event.message_reference.message_id,  # type: ignore
+            channel_id=event.channel_id,
+            message_id=event.message_reference.message_id,
         )
-        if event.reply.message.author.id == bot.self_info.id:  # type: ignore
+        if event.reply.author.id == bot.self_info.id:
             event.to_me = True
     except Exception as e:
         log("WARNING", f"Error when getting message reply info: {repr(e)}", e)
@@ -116,13 +117,14 @@ def _check_at_me(
     if (
         isinstance(event, GuildMessageEvent)
         and event.mentions is not None
-        and bot.self_info.id in [user.id for user in event.mentions]
+        and bot.self_info.id in {user.id for user in event.mentions}
     ):
         event.to_me = True
 
     def _is_at_me_seg(segment: MessageSegment) -> bool:
-        return segment.type == "mention_user" and segment.data.get("user_id") == str(
-            bot.self_info.id
+        return (
+            segment.type == "mention_user"
+            and segment.data.get("user_id") == bot.self_info.id
         )
 
     message = event.get_message()
@@ -135,6 +137,7 @@ def _check_at_me(
     if _is_at_me_seg(message[0]):
         message.pop(0)
         deleted = True
+        event.to_me = True
         if message and message[0].type == "text":
             message[0].data["text"] = message[0].data["text"].lstrip("\xa0").lstrip()
             if not message[0].data["text"]:
@@ -154,6 +157,7 @@ def _check_at_me(
 
         if _is_at_me_seg(last_msg_seg):
             deleted = True
+            event.to_me = True
             del message[i:]
 
     if not message:
@@ -1666,3 +1670,18 @@ class Bot(BaseBot):
             ),
         )
         return parse_obj_as(PostGroupFilesReturn, await self._request(request))
+
+    @API
+    async def post_group_members(
+        self,
+        *,
+        group_id: str,
+        limit: Optional[int] = None,
+        start_index: Optional[int] = None,
+    ) -> PostGroupMembersReturn:
+        request = Request(
+            "POST",
+            self.adapter.get_api_base().joinpath("v2", "groups", group_id, "members"),
+            json=exclude_none({"limit": limit, "start_index": start_index}),
+        )
+        return parse_obj_as(PostGroupMembersReturn, await self._request(request))

{nonebot_adapter_qq-1.0.0 → nonebot_adapter_qq-1.0.1}/nonebot/adapters/qq/event.py

@@ -1,4 +1,5 @@
 from enum import Enum
+from datetime import datetime
 from typing_extensions import override
 from typing import Dict, Type, Tuple, TypeVar, Optional
 
@@ -97,6 +98,18 @@ class EventType(str, Enum):
     AT_MESSAGE_CREATE = "AT_MESSAGE_CREATE"
     PUBLIC_MESSAGE_DELETE = "PUBLIC_MESSAGE_DELETE"
 
+    # FRIEND_ROBOT_EVENT
+    FRIEND_ADD = "FRIEND_ADD"
+    FRIEND_DEL = "FRIEND_DEL"
+    C2C_MSG_REJECT = "C2C_MSG_REJECT"
+    C2C_MSG_RECEIVE = "C2C_MSG_RECEIVE"
+
+    # GROUP_ROBOT_EVENT
+    GROUP_ADD_ROBOT = "GROUP_ADD_ROBOT"
+    GROUP_DEL_ROBOT = "GROUP_DEL_ROBOT"
+    GROUP_MSG_REJECT = "GROUP_MSG_REJECT"
+    GROUP_MSG_RECEIVE = "GROUP_MSG_RECEIVE"
+
 
 class Event(BaseEvent):
     __type__: EventType
@@ -574,6 +587,75 @@ class OpenForumReplyDeleteEvent(OpenForumEvent):
     __type__ = EventType.OPEN_FORUM_REPLY_DELETE
 
 
+# Friend Robot Event
+class FriendRobotEvent(NoticeEvent):
+    timestamp: datetime
+    open_id: str
+
+    @override
+    def get_user_id(self) -> str:
+        return self.open_id
+
+    @override
+    def get_session_id(self) -> str:
+        return self.open_id
+
+
+@register_event_class
+class FriendAddEvent(FriendRobotEvent):
+    __type__ = EventType.FRIEND_ADD
+
+
+@register_event_class
+class FriendDelEvent(FriendRobotEvent):
+    __type__ = EventType.FRIEND_DEL
+
+
+@register_event_class
+class C2CMsgRejectEvent(FriendRobotEvent):
+    __type__ = EventType.C2C_MSG_REJECT
+
+
+@register_event_class
+class C2CMsgReceiveEvent(FriendRobotEvent):
+    __type__ = EventType.C2C_MSG_RECEIVE
+
+
+# Group Robot Event
+class GroupRobotEvent(NoticeEvent):
+    timestamp: datetime
+    group_openid: str
+    op_member_openid: str
+
+    @override
+    def get_user_id(self) -> str:
+        return self.op_member_openid
+
+    @override
+    def get_session_id(self) -> str:
+        return self.op_member_openid
+
+
+@register_event_class
+class GroupAddRobotEvent(GroupRobotEvent):
+    __type__ = EventType.GROUP_ADD_ROBOT
+
+
+@register_event_class
+class GroupDelRobotEvent(GroupRobotEvent):
+    __type__ = EventType.GROUP_DEL_ROBOT
+
+
+@register_event_class
+class GroupMsgRejectEvent(GroupRobotEvent):
+    __type__ = EventType.GROUP_MSG_REJECT
+
+
+@register_event_class
+class GroupMsgReceiveEvent(GroupRobotEvent):
+    __type__ = EventType.GROUP_MSG_RECEIVE
+
+
 __all__ = [
     "EVENT_CLASSES",
     "EventType",
@@ -595,12 +677,16 @@ __all__ = [
     "GuildMemberUpdateEvent",
     "GuildMemberRemoveEvent",
     "MessageEvent",
+    "GuildMessageEvent",
     "MessageCreateEvent",
     "MessageDeleteEvent",
     "AtMessageCreateEvent",
     "PublicMessageDeleteEvent",
     "DirectMessageCreateEvent",
     "DirectMessageDeleteEvent",
+    "C2CMessageCreateEvent",
+    "GroupAtMessageCreateEvent",
+    "InteractionCreateEvent",
     "MessageAuditEvent",
     "MessageAuditPassEvent",
     "MessageAuditRejectEvent",
@@ -632,4 +718,14 @@ __all__ = [
     "OpenForumPostDeleteEvent",
     "OpenForumReplyCreateEvent",
     "OpenForumReplyDeleteEvent",
+    "FriendRobotEvent",
+    "FriendAddEvent",
+    "FriendDelEvent",
+    "C2CMsgRejectEvent",
+    "C2CMsgReceiveEvent",
+    "GroupRobotEvent",
+    "GroupAddRobotEvent",
+    "GroupDelRobotEvent",
+    "GroupMsgRejectEvent",
+    "GroupMsgReceiveEvent",
 ]

{nonebot_adapter_qq-1.0.0 → nonebot_adapter_qq-1.0.1}/nonebot/adapters/qq/message.py

@@ -34,11 +34,11 @@ class MessageSegment(BaseMessageSegment["Message"]):
         return Emoji("emoji", data={"id": id})
 
     @staticmethod
-    def mention_user(user_id: int) -> "MentionUser":
+    def mention_user(user_id: str) -> "MentionUser":
         return MentionUser("mention_user", {"user_id": str(user_id)})
 
     @staticmethod
-    def mention_channel(channel_id: int) -> "MentionChannel":
+    def mention_channel(channel_id: str) -> "MentionChannel":
         return MentionChannel("mention_channel", {"channel_id": str(channel_id)})
 
     @staticmethod
@@ -106,6 +106,22 @@ class MessageSegment(BaseMessageSegment["Message"]):
             },
         )
 
+    @override
+    def __add__(
+        self, other: Union[str, "MessageSegment", Iterable["MessageSegment"]]
+    ) -> "Message":
+        return Message(self) + (
+            MessageSegment.text(other) if isinstance(other, str) else other
+        )
+
+    @override
+    def __radd__(
+        self, other: Union[str, "MessageSegment", Iterable["MessageSegment"]]
+    ) -> "Message":
+        return (
+            MessageSegment.text(other) if isinstance(other, str) else Message(other)
+        ) + self
+
     @override
     def is_text(self) -> bool:
         return self.type == "text"

{nonebot_adapter_qq-1.0.0 → nonebot_adapter_qq-1.0.1}/nonebot/adapters/qq/models/guild.py

@@ -73,8 +73,8 @@ class Channel(BaseModel):
     position: int
     parent_id: Optional[str] = None
     owner_id: Optional[str] = None
-    private_type: Union[PrivateType, int]
-    speak_permission: Union[SpeakPermission, int]
+    private_type: Optional[Union[PrivateType, int]] = None
+    speak_permission: Optional[Union[SpeakPermission, int]] = None
     application_id: Optional[str] = None
     permissions: Optional[int] = None
 
@@ -83,7 +83,7 @@ class Channel(BaseModel):
 class Member(BaseModel):
     user: Optional[User] = None
     nick: Optional[str] = None
-    roles: List[str]
+    roles: Optional[List[str]] = None
     joined_at: datetime
 
 
@@ -300,8 +300,16 @@ class TextElem(BaseModel):
     props: Optional[TextProps] = None
 
 
+class PlatImage(BaseModel):
+    url: Optional[str] = None
+    width: Optional[int] = None
+    height: Optional[int] = None
+    image_id: Optional[str] = None
+
+
 class ImageElem(BaseModel):
-    third_url: str
+    plat_image: Optional[PlatImage] = None
+    third_url: Optional[str] = None
     width_percent: Optional[float] = None
 
 

{nonebot_adapter_qq-1.0.0 → nonebot_adapter_qq-1.0.1}/nonebot/adapters/qq/models/qq.py

@@ -1,5 +1,5 @@
 from datetime import datetime
-from typing import Literal, Optional
+from typing import List, Literal, Optional
 
 from pydantic import BaseModel
 
@@ -28,6 +28,16 @@ class PostGroupFilesReturn(BaseModel):
     timestamp: Optional[datetime] = None
 
 
+class GroupMember(BaseModel):
+    member_openid: str
+    join_timestamp: datetime
+
+
+class PostGroupMembersReturn(BaseModel):
+    members: List[GroupMember]
+    next_index: Optional[int] = None
+
+
 # Interaction Event
 class ButtonInteractionContent(BaseModel):
     user_id: str
@@ -58,6 +68,8 @@ __all__ = [
     "PostC2CMessagesReturn",
     "PostGroupMessagesReturn",
     "PostC2CFilesReturn",
+    "GroupMember",
+    "PostGroupMembersReturn",
     "PostGroupFilesReturn",
     "ButtonInteractionContent",
     "ButtonInteractionData",

{nonebot_adapter_qq-1.0.0 → nonebot_adapter_qq-1.0.1}/nonebot/adapters/qq/permission.py

@@ -8,15 +8,15 @@ from .event import MessageCreateEvent, AtMessageCreateEvent
 async def _guild_channel_admin(
     event: Union[AtMessageCreateEvent, MessageCreateEvent]
 ) -> bool:
-    return 5 in getattr(event.member, "roles", ())
+    return "5" in getattr(event.member, "roles", ())
 
 
 async def _guild_admin(event: Union[AtMessageCreateEvent, MessageCreateEvent]) -> bool:
-    return 2 in getattr(event.member, "roles", ())
+    return "2" in getattr(event.member, "roles", ())
 
 
 async def _guild_owner(event: Union[AtMessageCreateEvent, MessageCreateEvent]) -> bool:
-    return 4 in getattr(event.member, "roles", ())
+    return "4" in getattr(event.member, "roles", ())
 
 
 GUILD_CHANNEL_ADMIN: Permission = Permission(_guild_channel_admin)

{nonebot_adapter_qq-1.0.0 → nonebot_adapter_qq-1.0.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "nonebot-adapter-qq"
-version = "1.0.0"
+version = "1.0.1"
 description = "QQ adapter for nonebot2"
 authors = ["yanyongyu <yyy@nonebot.dev>"]
 license = "MIT"
@@ -20,16 +20,17 @@ packages = [{ include = "nonebot" }]
 
 [tool.poetry.dependencies]
 python = "^3.8"
+yarl = "^1.9.0"
 pydantic = "^1.9.0"
 nonebot2 = "^2.1.0"
 typing-extensions = ">=4.4.0, <5.0.0"
 
 [tool.poetry.group.dev.dependencies]
+ruff = "^0.1.0"
 isort = "^5.10.1"
 black = "^23.1.0"
 nonemoji = "^0.1.3"
 pre-commit = "^3.3.0"
-ruff = ">=0.0.282, <0.1.0"
 
 [tool.black]
 line-length = 88

nonebot_adapter_qq-1.0.0/nonebot/adapters/qq/__init__.py

@@ -1,7 +0,0 @@
-from .event import *
-from .permission import *
-from .bot import Bot as Bot
-from .utils import log as log
-from .adapter import Adapter as Adapter
-from .message import Message as Message
-from .message import MessageSegment as MessageSegment