satori-python 0.18.0__tar.gz → 1.3.0__tar.gz

{satori_python-0.18.0 → satori_python-1.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: satori-python
-Version: 0.18.0
+Version: 1.3.0
 Summary: Satori Protocol SDK for python
 Home-page: https://github.com/RF-Tar-Railt/satori-python
 Author-Email: RF-Tar-Railt <rf_tar_railt@qq.com>
@@ -81,13 +81,13 @@ pip install satori-python-server
 
 ### 官方适配器
 
-| 适配器        | 安装                                           | 路径                                                                 |
-|------------|----------------------------------------------|--------------------------------------------------------------------|
-| Satori     | `pip install satori-python-adapter-satori`   | satori.adapters.satori                                             |
-| OneBot V11 | `pip install satori-python-adapter-onebot11` | satori.adapters.onebot11.forward, satori.adapters.onebot11.reverse |
-| Console    | `pip install satori-python-adapter-console`  | satori.adapters.console                                            |
-| Milky      | `pip install satori-python-adapter-milky`    | satori.adapters.milky.main, satori.adapters.milky.webhook          |
-| QQ         | `pip install satori-python-adapter-qq`       | satori.adapters.milky.main, satori.adapters.milky.websocket        |
+| 适配器        | 安装                                           | 路径                                                                                   |
+|------------|----------------------------------------------|--------------------------------------------------------------------------------------|
+| Satori     | `pip install satori-python-adapter-satori`   | satori.adapters.satori                                                               |
+| OneBot V11 | `pip install satori-python-adapter-onebot11` | satori.adapters.onebot11.forward, satori.adapters.onebot11.reverse                   |
+| Console    | `pip install satori-python-adapter-console`  | satori.adapters.console                                                              |
+| Milky      | `pip install satori-python-adapter-milky`    | satori.adapters.milky.main, satori.adapters.milky.webhook, satori.adapters.milky.sse |
+| QQ         | `pip install satori-python-adapter-qq`       | satori.adapters.qq.main, satori.adapters.qq.websocket                                |
 
 ### 社区适配器
 

{satori_python-0.18.0 → satori_python-1.3.0}/README.md

@@ -48,13 +48,13 @@ pip install satori-python-server
 
 ### 官方适配器
 
-| 适配器        | 安装                                           | 路径                                                                 |
-|------------|----------------------------------------------|--------------------------------------------------------------------|
-| Satori     | `pip install satori-python-adapter-satori`   | satori.adapters.satori                                             |
-| OneBot V11 | `pip install satori-python-adapter-onebot11` | satori.adapters.onebot11.forward, satori.adapters.onebot11.reverse |
-| Console    | `pip install satori-python-adapter-console`  | satori.adapters.console                                            |
-| Milky      | `pip install satori-python-adapter-milky`    | satori.adapters.milky.main, satori.adapters.milky.webhook          |
-| QQ         | `pip install satori-python-adapter-qq`       | satori.adapters.milky.main, satori.adapters.milky.websocket        |
+| 适配器        | 安装                                           | 路径                                                                                   |
+|------------|----------------------------------------------|--------------------------------------------------------------------------------------|
+| Satori     | `pip install satori-python-adapter-satori`   | satori.adapters.satori                                                               |
+| OneBot V11 | `pip install satori-python-adapter-onebot11` | satori.adapters.onebot11.forward, satori.adapters.onebot11.reverse                   |
+| Console    | `pip install satori-python-adapter-console`  | satori.adapters.console                                                              |
+| Milky      | `pip install satori-python-adapter-milky`    | satori.adapters.milky.main, satori.adapters.milky.webhook, satori.adapters.milky.sse |
+| QQ         | `pip install satori-python-adapter-qq`       | satori.adapters.qq.main, satori.adapters.qq.websocket                                |
 
 ### 社区适配器
 

{satori_python-0.18.0 → satori_python-1.3.0}/pyproject.toml

@@ -30,7 +30,7 @@ classifiers = [
     "Programming Language :: Python :: 3.12",
     "Operating System :: OS Independent",
 ]
-version = "0.18.0"
+version = "1.3.0"
 
 [project.license]
 text = "MIT"

{satori_python-0.18.0 → satori_python-1.3.0}/src/satori/__init__.py

@@ -8,6 +8,7 @@ from .element import Button as Button
 from .element import Code as Code
 from .element import E as E
 from .element import Element as Element
+from .element import Emoji as Emoji
 from .element import File as File
 from .element import Image as Image
 from .element import Italic as Italic
@@ -30,7 +31,9 @@ from .model import ArgvInteraction as ArgvInteraction
 from .model import ButtonInteraction as ButtonInteraction
 from .model import Channel as Channel
 from .model import ChannelType as ChannelType
+from .model import EmojiObject as EmojiObject
 from .model import Event as Event
+from .model import Friend as Friend
 from .model import Guild as Guild
 from .model import Login as Login
 from .model import LoginStatus as LoginStatus
@@ -42,7 +45,7 @@ from .model import Role as Role
 from .model import Upload as Upload
 from .model import User as User
 
-__version__ = "0.18.0"
+__version__ = "1.3.0"
 
 
 MessageReceipt = MessageObject

{satori_python-0.18.0 → satori_python-1.3.0}/src/satori/client/__init__.py

@@ -152,6 +152,15 @@ class App(Service):
         Callable[[Account, events.GuildRoleEvent], Awaitable[Any]],
     ]: ...
 
+    @overload
+    def register_on(
+        self,
+        event_type: Literal[EventType.GUILD_EMOJI_ADDED, EventType.GUILD_EMOJI_REMOVED, EventType.GUILD_EMOJI_UPDATED],
+    ) -> Callable[
+        [Callable[[Account, events.GuildEmojiEvent], Awaitable[Any]]],
+        Callable[[Account, events.GuildEmojiEvent], Awaitable[Any]],
+    ]: ...
+
     @overload
     def register_on(
         self, event_type: Literal[EventType.LOGIN_ADDED, EventType.LOGIN_REMOVED, EventType.LOGIN_UPDATED]

{satori_python-0.18.0 → satori_python-1.3.0}/src/satori/client/account.py

@@ -20,13 +20,14 @@ class ApiInfo:
     port: int = 5140
     path: str = ""
     token: str | None = None
+    secure: bool = False
     timeout: float | None = None
     api_base: URL = field(init=False)
 
     def __post_init__(self):
         if self.path and not self.path.startswith("/"):
             self.path = f"/{self.path}"
-        self.api_base = URL(f"http://{self.host}:{self.port}{self.path}") / "v1"
+        self.api_base = URL(f"http{'s' if self.secure else ''}://{self.host}:{self.port}{self.path}") / "v1"
 
 
 class Account(Generic[TP]):

{satori_python-0.18.0 → satori_python-1.3.0}/src/satori/client/account.pyi

@@ -10,6 +10,7 @@ from satori.model import (
     Channel,
     Direction,
     Event,
+    Friend,
     Guild,
     IterablePageResult,
     Login,
@@ -40,6 +41,7 @@ class ApiInfo(Api):
         port: int = 5140,
         path: str = "",
         token: str | None = None,
+        secure: bool = False,
         timeout: float | None = None,
     ):
         self.api_base: URL = ...
@@ -450,19 +452,21 @@ class Account(Generic[TP]):
             None: 该方法无返回值
         """
 
-    async def reaction_create(self, channel_id: str, message_id: str, emoji: str) -> None:
+    async def reaction_create(self, channel_id: str, message_id: str, emoji_id: str) -> None:
         """向特定消息添加表态。
 
         Args:
             channel_id (str): 频道 ID
             message_id (str): 消息 ID
-            emoji (str): 表态名称
+            emoji_id (str): 表情 ID
 
         Returns:
             None: 该方法无返回值
         """
 
-    async def reaction_delete(self, channel_id: str, message_id: str, emoji: str, user_id: str | None = None) -> None:
+    async def reaction_delete(
+        self, channel_id: str, message_id: str, emoji_id: str, user_id: str | None = None
+    ) -> None:
         """从特定消息删除某个用户添加的特定表态。
 
         如果没有传入用户 ID 则表示删除自己的表态。
@@ -470,14 +474,14 @@ class Account(Generic[TP]):
         Args:
             channel_id (str): 频道 ID
             message_id (str): 消息 ID
-            emoji (str): 表态名称
+            emoji_id (str): 表情 ID
             user_id (str | None, optional): 用户 ID，默认为 None
 
         Returns:
             None: 该方法无返回值
         """
 
-    async def reaction_clear(self, channel_id: str, message_id: str, emoji: str | None = None) -> None:
+    async def reaction_clear(self, channel_id: str, message_id: str, emoji_id: str | None = None) -> None:
         """从特定消息清除某个特定表态。
 
         如果没有传入表态名称则表示清除所有表态。
@@ -485,21 +489,21 @@ class Account(Generic[TP]):
         Args:
             channel_id (str): 频道 ID
             message_id (str): 消息 ID
-            emoji (str | None, optional): 表态名称，默认为 None
+            emoji_id (str | None, optional): 表情 ID，默认为 None
 
         Returns:
             None: 该方法无返回值
         """
 
     def reaction_list(
-        self, channel_id: str, message_id: str, emoji: str, next_token: str | None = None
+        self, channel_id: str, message_id: str, emoji_id: str, next_token: str | None = None
     ) -> IterablePageResult[User]:
         """获取添加特定消息的特定表态的用户列表。返回一个 User 的分页列表。
 
         Args:
             channel_id (str): 频道 ID
             message_id (str): 消息 ID
-            emoji (str): 表态名称
+            emoji_id (str): 表情 ID
             next_token (str | None, optional): 分页令牌，默认为空
 
         Returns:
@@ -513,24 +517,24 @@ class Account(Generic[TP]):
             Login: `Login` 对象
         """
 
-    async def user_get(self, user_id: str) -> User:
-        """获取用户信息。返回一个 `User` 对象。
+    def friend_list(self, next_token: str | None = None) -> IterablePageResult[Friend]:
+        """获取好友列表。返回一个 Friend 的分页列表。
 
         Args:
-            user_id (str): 用户 ID
+            next_token (str | None, optional): 分页令牌，默认为空
 
         Returns:
-            User: `User` 对象
+            IterablePageResult[Friend]: `Friend` 的分页列表
         """
 
-    def friend_list(self, next_token: str | None = None) -> IterablePageResult[User]:
-        """获取好友列表。返回一个 User 的分页列表。
+    async def friend_delete(self, user_id: str) -> None:
+        """删除好友。
 
         Args:
-            next_token (str | None, optional): 分页令牌，默认为空
+            user_id (str): 用户 ID
 
         Returns:
-            IterablePageResult[User]: `User` 的分页列表
+            None: 该方法无返回值
         """
 
     async def friend_approve(self, request_id: str, approve: bool, comment: str) -> None:
@@ -545,6 +549,16 @@ class Account(Generic[TP]):
             None: 该方法无返回值
         """
 
+    async def user_get(self, user_id: str) -> User:
+        """获取用户信息。返回一个 `User` 对象。
+
+        Args:
+            user_id (str): 用户 ID
+
+        Returns:
+            User: `User` 对象
+        """
+
     async def internal(self, action: str, method: str = "POST", **kwargs) -> Any:
         """内部接口调用。
 

{satori_python-0.18.0 → satori_python-1.3.0}/src/satori/client/config.py

@@ -23,6 +23,7 @@ class WebsocketsInfo(Config):
     port: int = 5140
     path: str = ""
     token: str | None = None
+    secure: bool = False
     timeout: float | None = None
     identity: str = None  # type: ignore
     api_base: URL = None  # type: ignore
@@ -31,11 +32,11 @@ class WebsocketsInfo(Config):
         if self.path and not self.path.startswith("/"):
             self.path = f"/{self.path}"
         self.identity = f"{self.host}:{self.port}"
-        self.api_base = URL(f"http://{self.host}:{self.port}{self.path}") / "v1"
+        self.api_base = URL(f"http{'s' if self.secure else ''}://{self.host}:{self.port}{self.path}") / "v1"
 
     @property
     def ws_base(self):
-        return URL(f"ws://{self.host}:{self.port}{self.path}") / "v1"
+        return URL(f"ws{'s' if self.secure else ''}://{self.host}:{self.port}{self.path}") / "v1"
 
 
 @dataclass
@@ -44,6 +45,7 @@ class WebhookInfo(Config):
     port: int = 8080
     path: str = "v1/events"
     token: str | None = None
+    secure: bool = False
     server_host: str = "localhost"
     server_port: int = 5140
     server_path: str = ""
@@ -57,4 +59,6 @@ class WebhookInfo(Config):
         if self.server_path and not self.server_path.startswith("/"):
             self.server_path = f"/{self.server_path}"
         self.identity = f"{self.host}:{self.port}{self.path}"
-        self.api_base = URL(f"http://{self.server_host}:{self.server_port}{self.server_path}") / "v1"
+        self.api_base = (
+            URL(f"http{'s' if self.secure else ''}://{self.server_host}:{self.server_port}{self.server_path}") / "v1"
+        )

{satori_python-0.18.0 → satori_python-1.3.0}/src/satori/client/protocol.py

@@ -29,6 +29,7 @@ from satori.model import (
     User,
 )
 
+from .. import Friend
 from .network.util import validate_response
 
 if TYPE_CHECKING:
@@ -632,23 +633,25 @@ class ApiProtocol:
             {"guild_id": guild_id, "role_id": role_id},
         )
 
-    async def reaction_create(self, channel_id: str, message_id: str, emoji: str) -> None:
+    async def reaction_create(self, channel_id: str, message_id: str, emoji_id: str) -> None:
         """向特定消息添加表态。
 
         Args:
             channel_id (str): 频道 ID
             message_id (str): 消息 ID
-            emoji (str): 表态名称
+            emoji_id (str): 表情 ID
 
         Returns:
             None: 该方法无返回值
         """
         await self.call_api(
             Api.REACTION_CREATE,
-            {"channel_id": channel_id, "message_id": message_id, "emoji": emoji},
+            {"channel_id": channel_id, "message_id": message_id, "emoji_id": emoji_id},
         )
 
-    async def reaction_delete(self, channel_id: str, message_id: str, emoji: str, user_id: str | None = None) -> None:
+    async def reaction_delete(
+        self, channel_id: str, message_id: str, emoji_id: str, user_id: str | None = None
+    ) -> None:
         """从特定消息删除某个用户添加的特定表态。
 
         如果没有传入用户 ID 则表示删除自己的表态。
@@ -656,13 +659,13 @@ class ApiProtocol:
         Args:
             channel_id (str): 频道 ID
             message_id (str): 消息 ID
-            emoji (str): 表态名称
+            emoji_id (str): 表情 ID
             user_id (str | None, optional): 用户 ID，默认为 None
 
         Returns:
             None: 该方法无返回值
         """
-        data = {"channel_id": channel_id, "message_id": message_id, "emoji": emoji}
+        data = {"channel_id": channel_id, "message_id": message_id, "emoji_id": emoji_id}
         if user_id is not None:
             data["user_id"] = user_id
         await self.call_api(
@@ -670,7 +673,7 @@ class ApiProtocol:
             data,
         )
 
-    async def reaction_clear(self, channel_id: str, message_id: str, emoji: str | None = None) -> None:
+    async def reaction_clear(self, channel_id: str, message_id: str, emoji_id: str | None = None) -> None:
         """从特定消息清除某个特定表态。
 
         如果没有传入表态名称则表示清除所有表态。
@@ -678,28 +681,28 @@ class ApiProtocol:
         Args:
             channel_id (str): 频道 ID
             message_id (str): 消息 ID
-            emoji (str | None, optional): 表态名称，默认为 None
+            emoji_id (str | None, optional): 表情 ID，默认为 None
 
         Returns:
             None: 该方法无返回值
         """
         data = {"channel_id": channel_id, "message_id": message_id}
-        if emoji is not None:
-            data["emoji"] = emoji
+        if emoji_id is not None:
+            data["emoji_id"] = emoji_id
         await self.call_api(
             Api.REACTION_CLEAR,
             data,
         )
 
     def reaction_list(
-        self, channel_id: str, message_id: str, emoji: str, next_token: str | None = None
+        self, channel_id: str, message_id: str, emoji_id: str, next_token: str | None = None
     ) -> IterablePageResult[User]:
         """获取添加特定消息的特定表态的用户列表。返回一个 User 的分页列表。
 
         Args:
             channel_id (str): 频道 ID
             message_id (str): 消息 ID
-            emoji (str): 表态名称
+            emoji_id (str): 表情 ID
             next_token (str | None, optional): 分页令牌，默认为空
 
         Returns:
@@ -712,7 +715,7 @@ class ApiProtocol:
                 {
                     "channel_id": channel_id,
                     "message_id": message_id,
-                    "emoji": emoji,
+                    "emoji_id": emoji_id,
                     "next": token,
                 },
             )
@@ -729,34 +732,33 @@ class ApiProtocol:
         res = await self.call_api(Api.LOGIN_GET, {})
         return Login.parse(res)
 
-    async def user_get(self, user_id: str) -> User:
-        """获取用户信息。返回一个 `User` 对象。
-
-        Args:
-            user_id (str): 用户 ID
-
-        Returns:
-            User: `User` 对象
-        """
-        res = await self.call_api(Api.USER_GET, {"user_id": user_id})
-        return User.parse(res)
-
-    def friend_list(self, next_token: str | None = None) -> IterablePageResult[User]:
+    def friend_list(self, next_token: str | None = None) -> IterablePageResult[Friend]:
         """获取好友列表。返回一个 User 的分页列表。
 
         Args:
             next_token (str | None, optional): 分页令牌，默认为空
 
         Returns:
-            IterablePageResult[User]: `User` 的分页列表
+            IterablePageResult[Friend]: `Friend` 的分页列表
         """
 
         async def _(token: str | None):
             res = await self.call_api(Api.FRIEND_LIST, {"next": token})
-            return PageResult.parse(res, User.parse)
+            return PageResult.parse(res, Friend.parse)
 
         return IterablePageResult(_, next_token)
 
+    async def friend_delete(self, user_id: str) -> None:
+        """删除好友。
+
+        Args:
+            user_id (str): 用户 ID
+
+        Returns:
+            None: 该方法无返回值
+        """
+        await self.call_api(Api.FRIEND_DELETE, {"user_id": user_id})
+
     async def friend_approve(self, request_id: str, approve: bool, comment: str) -> None:
         """处理好友申请。
 
@@ -773,6 +775,18 @@ class ApiProtocol:
             {"message_id": request_id, "approve": approve, "comment": comment},
         )
 
+    async def user_get(self, user_id: str) -> User:
+        """获取用户信息。返回一个 `User` 对象。
+
+        Args:
+            user_id (str): 用户 ID
+
+        Returns:
+            User: `User` 对象
+        """
+        res = await self.call_api(Api.USER_GET, {"user_id": user_id})
+        return User.parse(res)
+
     async def internal(self, action: str, method: str = "POST", **kwargs) -> Any:
         """内部接口调用。
 

{satori_python-0.18.0 → satori_python-1.3.0}/src/satori/const.py

@@ -40,10 +40,11 @@ class Api(str, Enum):
 
     LOGIN_GET = "login.get"
 
-    USER_GET = "user.get"
     FRIEND_LIST = "friend.list"
+    FRIEND_DELETE = "friend.delete"
     FRIEND_APPROVE = "friend.approve"
 
+    USER_GET = "user.get"
     UPLOAD_CREATE = "upload.create"
 
 
@@ -65,6 +66,9 @@ class EventType(str, Enum):
     GUILD_ROLE_CREATED = "guild-role-created"
     GUILD_ROLE_DELETED = "guild-role-deleted"
     GUILD_ROLE_UPDATED = "guild-role-updated"
+    GUILD_EMOJI_ADDED = "guild-emoji-added"
+    GUILD_EMOJI_REMOVED = "guild-emoji-removed"
+    GUILD_EMOJI_UPDATED = "guild-emoji-updated"
     LOGIN_ADDED = "login-added"
     LOGIN_REMOVED = "login-removed"
     LOGIN_UPDATED = "login-updated"

{satori_python-0.18.0 → satori_python-1.3.0}/src/satori/element.py

@@ -5,7 +5,7 @@ from io import BytesIO
 from pathlib import Path
 from types import UnionType
 from typing import Any, ClassVar, Final, TypeVar, Union, final, get_args, get_origin, overload
-from typing_extensions import override
+from typing_extensions import Self, override
 
 from ._vendor.fleep import get
 from .parser import Element as RawElement
@@ -157,6 +157,19 @@ class At(Element):
         return At(type="here" if here else "all")
 
 
+@dataclass(repr=False)
+class Emoji(Element):
+    """<emoji> 元素用于表示一个表情。"""
+
+    id: str
+    name: str | None = None
+
+    def to_model(self):
+        from .model import EmojiObject
+
+        return EmojiObject(self.id, self.name)
+
+
 @dataclass(repr=False)
 class Sharp(Element):
     """<sharp> 元素用于提及某个频道。"""
@@ -200,7 +213,7 @@ class Resource(Element):
 
     @classmethod
     def of(
-        cls,
+        cls: type[Self],
         url: str | None = None,
         path: str | Path | None = None,
         raw: bytes | BytesIO | None = None,
@@ -212,7 +225,7 @@ class Resource(Element):
         cache: bool | None = None,
         timeout: int | None = None,
         **kwargs,
-    ):
+    ) -> Self:
         data: dict[str, Any] = {"extra": extra, **kwargs}
         if url is not None:
             data |= {"src": url}
@@ -537,6 +550,7 @@ def register_element(cls: type[TE], tag: str | None = None) -> type[TE]:
 ELEMENT_TYPE_MAP = {
     "text": Text,
     "at": At,
+    "emoji": Emoji,
     "sharp": Sharp,
     "img": Image,
     "image": Image,
@@ -637,6 +651,7 @@ class _E:
         self.at = At
         self.at_role = At.role_
         self.at_all = At.all
+        self.emoji = Emoji
         self.sharp = Sharp
         self.link = Link
         self.image = Image.of

{satori_python-0.18.0 → satori_python-1.3.0}/src/satori/event.py

@@ -2,6 +2,7 @@ from satori.model import (
     ArgvInteraction,
     ButtonInteraction,
     Channel,
+    EmojiObject,
     Event,
     Guild,
     LoginPartial,
@@ -40,6 +41,10 @@ class GuildRoleEvent(GuildEvent):
     role: Role
 
 
+class GuildEmojiEvent(GuildEvent):
+    emoji: EmojiObject
+
+
 class LoginEvent(Event):
     login: LoginPartial
 
@@ -48,6 +53,7 @@ class ReactionEvent(Event):
     channel: Channel
     user: User
     message: MessageObject
+    emoji: EmojiObject
 
 
 class ButtonInteractionEvent(Event):

{satori_python-0.18.0 → satori_python-1.3.0}/src/satori/model.py

@@ -8,7 +8,7 @@ from pathlib import Path
 from typing import IO, Any, ClassVar, Generic, Literal, TypeAlias, TypeVar
 from typing_extensions import Self
 
-from .element import Element, transform
+from .element import Element, Emoji, transform
 from .parser import Element as RawElement
 from .parser import parse
 
@@ -98,13 +98,15 @@ class User(ModelBase):
 
 
 @dataclass
-class Member(ModelBase):
+class Friend(ModelBase):
     user: User | None = None
     nick: str | None = None
-    avatar: str | None = None
-    joined_at: datetime | None = None
 
-    __converter__ = {"user": User.parse, "joined_at": lambda ts: datetime.fromtimestamp(int(ts) / 1000)}
+    @property
+    def remark(self) -> str | None:
+        return self.nick
+
+    __converter__ = {"user": User.parse}
 
     def dump(self):
         res = {}
@@ -112,10 +114,6 @@ class Member(ModelBase):
             res["user"] = self.user.dump()
         if self.nick:
             res["nick"] = self.nick
-        if self.avatar:
-            res["avatar"] = self.avatar
-        if self.joined_at:
-            res["joined_at"] = int(self.joined_at.timestamp() * 1000)
         return res
 
 
@@ -131,6 +129,35 @@ class Role(ModelBase):
         return res
 
 
+@dataclass
+class Member(ModelBase):
+    user: User | None = None
+    nick: str | None = None
+    avatar: str | None = None
+    joined_at: datetime | None = None
+    roles: list[Role] = field(default_factory=list)
+
+    __converter__ = {
+        "user": User.parse,
+        "joined_at": lambda ts: datetime.fromtimestamp(int(ts) / 1000),
+        "roles": lambda raw: [Role.parse(role) for role in raw],
+    }  # noqa: E501
+
+    def dump(self):
+        res = {}
+        if self.user:
+            res["user"] = self.user.dump()
+        if self.nick:
+            res["nick"] = self.nick
+        if self.avatar:
+            res["avatar"] = self.avatar
+        if self.joined_at:
+            res["joined_at"] = int(self.joined_at.timestamp() * 1000)
+        if self.roles:
+            res["roles"] = [role.dump() for role in self.roles]
+        return res
+
+
 class LoginStatus(IntEnum):
     OFFLINE = 0
     """离线"""
@@ -282,6 +309,21 @@ class Meta(ModelBase):
         return {"logins": [login.dump() for login in self.logins], "proxy_urls": self.proxy_urls}
 
 
+@dataclass
+class EmojiObject(ModelBase):
+    id: str
+    name: str | None = None
+
+    def dump(self):
+        res = {"id": self.id}
+        if self.name:
+            res["name"] = self.name
+        return res
+
+    def to_element(self) -> Emoji:
+        return Emoji(self.id, self.name)
+
+
 @dataclass
 class MessageObject(ModelBase):
     id: str
@@ -373,6 +415,7 @@ class Event(ModelBase):
     role: Role | None = None
     user: User | None = None
     referrer: dict | None = None
+    emoji: EmojiObject | None = None
 
     _type: str | None = None
     _data: dict | None = None
@@ -391,6 +434,7 @@ class Event(ModelBase):
         "operator": User.parse,
         "role": Role.parse,
         "user": User.parse,
+        "emoji": EmojiObject.parse,
     }
 
     @classmethod
@@ -447,6 +491,8 @@ class Event(ModelBase):
             res["user"] = self.user.dump()
         if self.referrer:
             res["referrer"] = self.referrer
+        if self.emoji:
+            res["emoji"] = self.emoji.dump()
         if self._type:
             res["_type"] = self._type
         if self._data:

{satori_python-0.18.0 → satori_python-1.3.0}/src/satori/server/__init__.py

@@ -97,6 +97,10 @@ async def _request_handler(action: str, request: StarletteRequest, func: RouteCa
                 self_id=self_id,
             )
         )
+    except asyncio.CancelledError:
+        return Response(status_code=503, content="Request cancelled")
+    except asyncio.TimeoutError:
+        return Response(status_code=504, content="Request timeout")
     except ActionFailed as ae:
         logger.warning(ae)
         return Response(status_code=ae.CODE, content=str(ae))

{satori_python-0.18.0 → satori_python-1.3.0}/src/satori/server/route.py

@@ -7,6 +7,7 @@ from starlette.datastructures import FormData
 from satori.model import (
     Channel,
     Direction,
+    Friend,
     Guild,
     Login,
     Member,
@@ -207,7 +208,7 @@ GUILD_ROLE_DELETE: TypeAlias = RouteCall[GuildRoleDeleteParam, None]
 class ReactionCreateParam(TypedDict):
     channel_id: str
     message_id: str
-    emoji: str
+    emoji_id: str
 
 
 REACTION_CREATE: TypeAlias = RouteCall[ReactionCreateParam, None]
@@ -216,7 +217,7 @@ REACTION_CREATE: TypeAlias = RouteCall[ReactionCreateParam, None]
 class ReactionDeleteParam(TypedDict):
     channel_id: str
     message_id: str
-    emoji: str
+    emoji_id: str
     user_id: NotRequired[str]
 
 
@@ -226,7 +227,7 @@ REACTION_DELETE: TypeAlias = RouteCall[ReactionDeleteParam, None]
 class ReactionClearParam(TypedDict):
     channel_id: str
     message_id: str
-    emoji: NotRequired[str]
+    emoji_id: NotRequired[str]
 
 
 REACTION_CLEAR: TypeAlias = RouteCall[ReactionClearParam, None]
@@ -235,7 +236,7 @@ REACTION_CLEAR: TypeAlias = RouteCall[ReactionClearParam, None]
 class ReactionListParam(TypedDict):
     channel_id: str
     message_id: str
-    emoji: str
+    emoji_id: str
     next: NotRequired[str]
 
 
@@ -243,18 +244,19 @@ REACTION_LIST: TypeAlias = RouteCall[ReactionListParam, PageResult[User] | dict[
 LOGIN_GET: TypeAlias = RouteCall[Any, Login | dict[str, Any]]
 
 
-class UserGetParam(TypedDict):
+class UserOpParam(TypedDict):
     user_id: str
 
 
-USER_GET: TypeAlias = RouteCall[UserGetParam, User | dict[str, Any]]
+USER_GET: TypeAlias = RouteCall[UserOpParam, User | dict[str, Any]]
+FRIEND_DELETE: TypeAlias = RouteCall[UserOpParam, None]
 
 
 class FriendListParam(TypedDict):
     next: NotRequired[str]
 
 
-FRIEND_LIST: TypeAlias = RouteCall[FriendListParam, PageResult[User] | dict[str, Any]]
+FRIEND_LIST: TypeAlias = RouteCall[FriendListParam, PageResult[Friend] | dict[str, Any]]
 
 
 class ApproveParam(TypedDict):