satori-python 0.11.4__tar.gz → 0.12.0__tar.gz

{satori_python-0.11.4 → satori_python-0.12.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: satori-python
-Version: 0.11.4
+Version: 0.12.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>
@@ -20,7 +20,7 @@ Requires-Python: >=3.9
 Requires-Dist: aiohttp>=3.9.3
 Requires-Dist: loguru>=0.7.2
 Requires-Dist: launart>=0.8.2
-Requires-Dist: typing-extensions>=4.10.0
+Requires-Dist: typing-extensions>=4.7.0
 Requires-Dist: graia-amnesia>=0.9.0
 Requires-Dist: starlette>=0.37.2
 Requires-Dist: uvicorn[standard]>=0.28.0

{satori_python-0.11.4 → satori_python-0.12.0}/pyproject.toml

@@ -9,7 +9,7 @@ dependencies = [
     "aiohttp>=3.9.3",
     "loguru>=0.7.2",
     "launart>=0.8.2",
-    "typing-extensions>=4.10.0",
+    "typing-extensions>=4.7.0",
     "graia-amnesia>=0.9.0",
     "starlette>=0.37.2",
     "uvicorn[standard]>=0.28.0",
@@ -28,7 +28,7 @@ classifiers = [
     "Programming Language :: Python :: 3.12",
     "Operating System :: OS Independent",
 ]
-version = "0.11.4"
+version = "0.12.0"
 
 [project.license]
 text = "MIT"
@@ -46,9 +46,9 @@ build-backend = "mina.backend"
 [tool.pdm.dev-dependencies]
 dev = [
     "isort>=5.13.2",
-    "black>=24.2.0",
-    "ruff>=0.3.2",
-    "pre-commit>=3.6.2",
+    "black>=24.4.0",
+    "ruff>=0.4.1",
+    "pre-commit>=3.7.0",
     "fix-future-annotations>=0.5.0",
     "mina-build<0.6,>=0.5.1",
     "pdm-mina>=0.3.2",

{satori_python-0.11.4 → satori_python-0.12.0}/src/satori/__init__.py

@@ -39,4 +39,4 @@ from .model import MessageObject as MessageObject
 from .model import Role as Role
 from .model import User as User
 
-__version__ = "0.11.4"
+__version__ = "0.12.0"

{satori_python-0.11.4 → satori_python-0.12.0}/src/satori/client/__init__.py

@@ -5,13 +5,14 @@ import functools
 import signal
 import threading
 from functools import wraps
-from typing import Any, Awaitable, Callable, Iterable, Literal, TypeVar, overload
+from typing import TYPE_CHECKING, Any, Awaitable, Callable, Iterable, Literal, TypeVar, overload
 
 from creart import it
+from graia.amnesia.builtins.aiohttp import AiohttpClientService
 from launart import Launart, Service, any_completed
 from loguru import logger
 
-from satori import event
+from satori import event as events
 from satori.config import Config, WebhookInfo, WebsocketsInfo
 from satori.const import EventType
 from satori.model import Event, LoginStatus
@@ -33,7 +34,7 @@ MAPPING: dict[type[Config], type[BaseNetwork]] = {
 
 class App(Service):
     id = "satori-python.client"
-    required: set[str] = set()
+    required: set[str] = {"http.client/aiohttp"}
     stages: set[str] = {"preparing", "blocking", "cleanup"}
 
     accounts: dict[str, Account]
@@ -69,8 +70,8 @@ class App(Service):
 
     @overload
     def register_on(self, event_type: Literal[EventType.FRIEND_REQUEST]) -> Callable[
-        [Callable[[Account, event.UserEvent], Awaitable[Any]]],
-        Callable[[Account, event.UserEvent], Awaitable[Any]],
+        [Callable[[Account, events.UserEvent], Awaitable[Any]]],
+        Callable[[Account, events.UserEvent], Awaitable[Any]],
     ]: ...
 
     @overload
@@ -80,8 +81,8 @@ class App(Service):
             EventType.GUILD_ADDED, EventType.GUILD_REMOVED, EventType.GUILD_REQUEST, EventType.GUILD_UPDATED
         ],
     ) -> Callable[
-        [Callable[[Account, event.GuildEvent], Awaitable[Any]]],
-        Callable[[Account, event.GuildEvent], Awaitable[Any]],
+        [Callable[[Account, events.GuildEvent], Awaitable[Any]]],
+        Callable[[Account, events.GuildEvent], Awaitable[Any]],
     ]: ...
 
     @overload
@@ -94,8 +95,8 @@ class App(Service):
             EventType.GUILD_MEMBER_REQUEST,
         ],
     ) -> Callable[
-        [Callable[[Account, event.GuildMemberEvent], Awaitable[Any]]],
-        Callable[[Account, event.GuildMemberEvent], Awaitable[Any]],
+        [Callable[[Account, events.GuildMemberEvent], Awaitable[Any]]],
+        Callable[[Account, events.GuildMemberEvent], Awaitable[Any]],
     ]: ...
 
     @overload
@@ -105,16 +106,16 @@ class App(Service):
             EventType.GUILD_ROLE_CREATED, EventType.GUILD_ROLE_DELETED, EventType.GUILD_ROLE_UPDATED
         ],
     ) -> Callable[
-        [Callable[[Account, event.GuildRoleEvent], Awaitable[Any]]],
-        Callable[[Account, event.GuildRoleEvent], Awaitable[Any]],
+        [Callable[[Account, events.GuildRoleEvent], Awaitable[Any]]],
+        Callable[[Account, events.GuildRoleEvent], Awaitable[Any]],
     ]: ...
 
     @overload
     def register_on(
         self, event_type: Literal[EventType.LOGIN_ADDED, EventType.LOGIN_REMOVED, EventType.LOGIN_UPDATED]
     ) -> Callable[
-        [Callable[[Account, event.LoginEvent], Awaitable[Any]]],
-        Callable[[Account, event.LoginEvent], Awaitable[Any]],
+        [Callable[[Account, events.LoginEvent], Awaitable[Any]]],
+        Callable[[Account, events.LoginEvent], Awaitable[Any]],
     ]: ...
 
     @overload
@@ -122,34 +123,34 @@ class App(Service):
         self,
         event_type: Literal[EventType.MESSAGE_CREATED, EventType.MESSAGE_DELETED, EventType.MESSAGE_UPDATED],
     ) -> Callable[
-        [Callable[[Account, event.MessageEvent], Awaitable[Any]]],
-        Callable[[Account, event.MessageEvent], Awaitable[Any]],
+        [Callable[[Account, events.MessageEvent], Awaitable[Any]]],
+        Callable[[Account, events.MessageEvent], Awaitable[Any]],
     ]: ...
 
     @overload
     def register_on(
         self, event_type: Literal[EventType.REACTION_ADDED, EventType.REACTION_REMOVED]
     ) -> Callable[
-        [Callable[[Account, event.ReactionEvent], Awaitable[Any]]],
-        Callable[[Account, event.ReactionEvent], Awaitable[Any]],
+        [Callable[[Account, events.ReactionEvent], Awaitable[Any]]],
+        Callable[[Account, events.ReactionEvent], Awaitable[Any]],
     ]: ...
 
     @overload
     def register_on(self, event_type: Literal[EventType.INTERACTION_BUTTON]) -> Callable[
-        [Callable[[Account, event.ButtonInteractionEvent], Awaitable[Any]]],
-        Callable[[Account, event.ButtonInteractionEvent], Awaitable[Any]],
+        [Callable[[Account, events.ButtonInteractionEvent], Awaitable[Any]]],
+        Callable[[Account, events.ButtonInteractionEvent], Awaitable[Any]],
     ]: ...
 
     @overload
     def register_on(self, event_type: Literal[EventType.INTERACTION_COMMAND]) -> Callable[
-        [Callable[[Account, event.ArgvInteractionEvent | event.MessageEvent], Awaitable[Any]]],
-        Callable[[Account, event.ArgvInteractionEvent | event.MessageEvent], Awaitable[Any]],
+        [Callable[[Account, events.ArgvInteractionEvent | events.MessageEvent], Awaitable[Any]]],
+        Callable[[Account, events.ArgvInteractionEvent | events.MessageEvent], Awaitable[Any]],
     ]: ...
 
     @overload
     def register_on(self, event_type: Literal[EventType.INTERNAL]) -> Callable[
-        [Callable[[Account, event.InternalEvent], Awaitable[Any]]],
-        Callable[[Account, event.InternalEvent], Awaitable[Any]],
+        [Callable[[Account, events.InternalEvent], Awaitable[Any]]],
+        Callable[[Account, events.InternalEvent], Awaitable[Any]],
     ]: ...
 
     @overload
@@ -180,16 +181,56 @@ class App(Service):
         if self.lifecycle_callbacks:
             await asyncio.gather(*(callback(account, state) for callback in self.lifecycle_callbacks))
 
-    async def post(self, event: Event):
+    async def post(self, event: Event, conn: BaseNetwork):
         if not self.event_callbacks:
             return
         identity = f"{event.platform}/{event.self_id}"
         if identity not in self.accounts:
-            logger.warning(f"Received event for unknown account: {event}")
-            return
-        account = self.accounts[identity]
+            if event.type == EventType.LOGIN_ADDED:
+                if TYPE_CHECKING:
+                    assert isinstance(event, events.LoginEvent)
+                account = Account(
+                    event.platform,
+                    event.self_id,
+                    event.login,
+                    conn.config,
+                )
+                logger.info(f"account added: {account}")
+                (
+                    account.connected.set()
+                    if event.login.status == LoginStatus.ONLINE
+                    else account.connected.clear()
+                )
+                self.accounts[identity] = account
+                conn.accounts[identity] = account
+                await self.account_update(account, LoginStatus.ONLINE)
+                await self.account_update(account, LoginStatus.CONNECT)
+            else:
+                logger.warning(f"Received event for unknown account: {event}")
+                return
+        else:
+            account = self.accounts[identity]
+        if event.type == EventType.LOGIN_UPDATED:
+            if TYPE_CHECKING:
+                assert isinstance(event, events.LoginEvent)
+            logger.info(f"account updated: {account}")
+            (
+                account.connected.set()
+                if event.login.status in (LoginStatus.ONLINE, LoginStatus.CONNECT)
+                else account.connected.clear()
+            )
+
         await asyncio.gather(*(callback(account, event) for callback in self.event_callbacks))
 
+        if event.type == EventType.LOGIN_REMOVED:
+            if TYPE_CHECKING:
+                assert isinstance(event, events.LoginEvent)
+            logger.info(f"account removed: {account}")
+            account.connected.clear()
+            await self.account_update(account, LoginStatus.DISCONNECT)
+            del self.accounts[identity]
+            del conn.accounts[identity]
+
     async def launch(self, manager: Launart):
         for conn in self.connections:
             manager.add_component(conn)
@@ -217,6 +258,7 @@ class App(Service):
     ):
         if manager is None:
             manager = it(Launart)
+        manager.add_component(AiohttpClientService())
         manager.add_component(self)
         manager.launch_blocking(loop=loop, stop_signal=stop_signal)
 
@@ -227,6 +269,7 @@ class App(Service):
     ):
         if manager is None:
             manager = it(Launart)
+        manager.add_component(AiohttpClientService())
         manager.add_component(self)
         handled_signals: dict[signal.Signals, Any] = {}
         launch_task = asyncio.create_task(manager.launch(), name="amnesia-launch")

{satori_python-0.11.4 → satori_python-0.12.0}/src/satori/client/account.py

@@ -6,6 +6,8 @@ from typing import TypeVar
 
 from yarl import URL
 
+from satori.model import Login
+
 from .session import Session
 
 TS = TypeVar("TS", bound="Session")
@@ -28,9 +30,17 @@ class ApiInfo:
 
 
 class Account:
-    def __init__(self, platform: str, self_id: str, config: ApiInfo, session_cls: type[Session] = Session):
+    def __init__(
+        self,
+        platform: str,
+        self_id: str,
+        self_info: Login,
+        config: ApiInfo,
+        session_cls: type[Session] = Session,
+    ):
         self.platform = platform
         self.self_id = self_id
+        self.self_info = self_info
         self.config = config
         self.session = session_cls(self)  # type: ignore
         self.connected = asyncio.Event()

{satori_python-0.11.4 → satori_python-0.12.0}/src/satori/client/account.pyi

@@ -4,7 +4,20 @@ from typing import Any, Iterable, Protocol, TypeVar, overload
 from yarl import URL
 
 from satori.element import Element
-from satori.model import Channel, Event, Guild, Login, Member, MessageObject, PageResult, Role, User
+from satori.model import (
+    Channel,
+    Direction,
+    Event,
+    Guild,
+    Login,
+    Member,
+    MessageObject,
+    Order,
+    PageDequeResult,
+    PageResult,
+    Role,
+    User,
+)
 
 from .session import Session
 
@@ -24,11 +37,14 @@ class ApiInfo(Api):
 class Account:
     platform: str
     self_id: str
+    self_info: Login
     config: Api
     session: Session
     connected: asyncio.Event
 
-    def __init__(self, platform: str, self_id: str, config: Api, session_cls: type[Session] = Session): ...
+    def __init__(
+        self, platform: str, self_id: str, self_info: Login, config: Api, session_cls: type[Session] = Session
+    ): ...
     @property
     def identity(self) -> str: ...
     @overload
@@ -100,8 +116,13 @@ class Account:
         content: str,
     ) -> None: ...
     async def message_list(
-        self, *, channel_id: str, next_token: str | None = None
-    ) -> PageResult[MessageObject]: ...
+        self,
+        channel_id: str,
+        next_token: str | None = None,
+        direction: Direction = "before",
+        limit: int = 50,
+        order: Order = "asc",
+    ) -> PageDequeResult[MessageObject]: ...
     async def channel_get(self, *, channel_id: str) -> Channel: ...
     async def channel_list(self, *, guild_id: str, next_token: str | None = None) -> PageResult[Channel]: ...
     async def channel_create(self, *, guild_id: str, data: Channel) -> Channel: ...
@@ -112,6 +133,7 @@ class Account:
         data: Channel,
     ) -> None: ...
     async def channel_delete(self, *, channel_id: str) -> None: ...
+    async def channel_mute(self, *, channel_id: str, duration: float = 0) -> None: ...
     async def user_channel_create(self, *, user_id: str, guild_id: str | None = None) -> Channel: ...
     async def guild_get(self, *, guild_id: str) -> Guild: ...
     async def guild_list(self, *, next_token: str | None = None) -> PageResult[Guild]: ...
@@ -121,6 +143,7 @@ class Account:
     ) -> PageResult[Member]: ...
     async def guild_member_get(self, *, guild_id: str, user_id: str) -> Member: ...
     async def guild_member_kick(self, *, guild_id: str, user_id: str, permanent: bool = False) -> None: ...
+    async def guild_member_mute(self, *, guild_id: str, user_id: str, duration: float = 0) -> None: ...
     async def guild_member_approve(self, *, request_id: str, approve: bool, comment: str) -> None: ...
     async def guild_member_role_set(self, *, guild_id: str, user_id: str, role_id: str) -> None: ...
     async def guild_member_role_unset(self, *, guild_id: str, user_id: str, role_id: str) -> None: ...
@@ -179,3 +202,4 @@ class Account:
         action: str,
         **kwargs,
     ) -> Any: ...
+    async def admin_login_list(self) -> list[Login]: ...

{satori_python-0.11.4 → satori_python-0.12.0}/src/satori/client/network/base.py

@@ -43,6 +43,6 @@ class BaseNetwork(Generic[TConfig], Service):
                 logger.warning(f"Failed to parse event: {raw}\nCaused by {e!r}")
             else:
                 self.sequence = event.id
-                await self.app.post(event)
+                await self.app.post(event, self)
 
         return asyncio.create_task(event_parse_task(body))

satori_python-0.12.0/src/satori/client/network/util.py

@@ -0,0 +1,32 @@
+import json
+
+from aiohttp import ClientResponse
+
+from satori.exception import (
+    ApiNotImplementedException,
+    BadRequestException,
+    ForbiddenException,
+    MethodNotAllowedException,
+    NotFoundException,
+    UnauthorizedException,
+)
+
+
+async def validate_response(resp: ClientResponse):
+    if 200 <= resp.status < 300:
+        return json.loads(content) if (content := await resp.text()) else {}
+    elif resp.status == 400:
+        raise BadRequestException(await resp.text())
+    elif resp.status == 401:
+        raise UnauthorizedException(await resp.text())
+    elif resp.status == 403:
+        raise ForbiddenException(await resp.text())
+    elif resp.status == 404:
+        raise NotFoundException(await resp.text())
+    elif resp.status == 405:
+        raise MethodNotAllowedException(await resp.text())
+    elif resp.status == 500:
+        raise ApiNotImplementedException(await resp.text())
+    else:
+        resp.raise_for_status()
+        return json.loads(content) if (content := await resp.text()) else {}

{satori_python-0.11.4 → satori_python-0.12.0}/src/satori/client/network/webhook.py

@@ -3,15 +3,17 @@ from __future__ import annotations
 import asyncio
 
 from aiohttp import web
+from graia.amnesia.builtins.aiohttp import AiohttpClientService
 from launart.manager import Launart
 from launart.utilles import any_completed
 from loguru import logger
 
 from satori.config import WebhookInfo as WebhookInfo
-from satori.model import LoginStatus, Opcode
+from satori.model import Login, LoginStatus, Opcode
 
 from ..account import Account
 from .base import BaseNetwork
+from .util import validate_response
 
 
 class WebhookNetwork(BaseNetwork[WebhookInfo]):
@@ -40,12 +42,21 @@ class WebhookNetwork(BaseNetwork[WebhookInfo]):
             account.connected.set()
             account.config = self.config
         else:
-            account = Account(platform, self_id, self.config)
+            assert self.manager
+            aio = self.manager.get_component(AiohttpClientService)
+            async with aio.session.post(self.config.api_base / "admin/login.list") as resp:
+                logins = [Login.parse(i) for i in await validate_response(resp)]
+            login = next(
+                (i for i in logins if i.self_id == self_id and i.platform == platform),
+                Login(LoginStatus.CONNECT, self_id=self_id, platform=platform),
+            )
+            account = Account(platform, self_id, login, self.config)
             logger.info(f"account registered: {account}")
             account.connected.set()
             self.app.accounts[identity] = account
             self.accounts[identity] = account
             await self.app.account_update(account, LoginStatus.ONLINE)
+            await self.app.account_update(account, LoginStatus.CONNECT)
         data = await req.json()
         op = data["op"]
         if op != Opcode.EVENT:

{satori_python-0.11.4 → satori_python-0.12.0}/src/satori/client/network/websocket.py

@@ -11,7 +11,7 @@ from launart.utilles import any_completed
 from loguru import logger
 
 from satori.config import WebsocketsInfo as WebsocketsInfo
-from satori.model import LoginStatus, Opcode
+from satori.model import Login, LoginStatus, Opcode
 
 from ..account import Account
 from .base import BaseNetwork
@@ -99,7 +99,7 @@ class WsNetwork(BaseNetwork[WebsocketsInfo]):
                     account.connected.clear()
                 account.config = self.config
             else:
-                account = Account(platform, self_id, self.config)
+                account = Account(platform, self_id, Login.parse(login), self.config)
                 logger.info(f"account registered: {account}")
                 (
                     account.connected.set()

{satori_python-0.11.4 → satori_python-0.12.0}/src/satori/client/session.py

@@ -1,21 +1,28 @@
 from __future__ import annotations
 
-import json
 from typing import TYPE_CHECKING, Any, Iterable, List, cast
 
-import aiohttp
+from graia.amnesia.builtins.aiohttp import AiohttpClientService
+from launart import Launart
 
 from satori.const import Api
 from satori.element import Element
-from satori.exception import (
-    ApiNotImplementedException,
-    BadRequestException,
-    ForbiddenException,
-    MethodNotAllowedException,
-    NotFoundException,
-    UnauthorizedException,
+from satori.model import (
+    Channel,
+    Direction,
+    Event,
+    Guild,
+    Login,
+    Member,
+    MessageObject,
+    Order,
+    PageDequeResult,
+    PageResult,
+    Role,
+    User,
 )
-from satori.model import Channel, Event, Guild, Login, Member, MessageObject, PageResult, Role, User
+
+from .network.util import validate_response
 
 if TYPE_CHECKING:
     from .account import Account
@@ -33,29 +40,13 @@ class Session:
             "X-Platform": self.account.platform,
             "X-Self-ID": self.account.self_id,
         }
-        async with aiohttp.ClientSession() as session:
-            async with session.post(
-                endpoint,
-                json=params or {},
-                headers=headers,
-            ) as resp:
-                if 200 <= resp.status < 300:
-                    return json.loads(content) if (content := await resp.text()) else {}
-                elif resp.status == 400:
-                    raise BadRequestException(await resp.text())
-                elif resp.status == 401:
-                    raise UnauthorizedException(await resp.text())
-                elif resp.status == 403:
-                    raise ForbiddenException(await resp.text())
-                elif resp.status == 404:
-                    raise NotFoundException(await resp.text())
-                elif resp.status == 405:
-                    raise MethodNotAllowedException(await resp.text())
-                elif resp.status == 500:
-                    raise ApiNotImplementedException(await resp.text())
-                else:
-                    resp.raise_for_status()
-                    return json.loads(content) if (content := await resp.text()) else {}
+        aio = Launart.current().get_component(AiohttpClientService)
+        async with aio.session.post(
+            endpoint,
+            json=params or {},
+            headers=headers,
+        ) as resp:
+            return await validate_response(resp)
 
     async def send(
         self,
@@ -153,12 +144,27 @@ class Session:
             {"channel_id": channel_id, "message_id": message_id, "content": content},
         )
 
-    async def message_list(self, channel_id: str, next_token: str | None = None) -> PageResult[MessageObject]:
+    async def message_list(
+        self,
+        channel_id: str,
+        next_token: str | None = None,
+        direction: Direction = "before",
+        limit: int = 50,
+        order: Order = "asc",
+    ) -> PageDequeResult[MessageObject]:
+        if not next_token and direction != "before":
+            raise ValueError("Invalid direction")
         res = await self.call_api(
             Api.MESSAGE_LIST,
-            {"channel_id": channel_id, "next": next_token},
+            {
+                "channel_id": channel_id,
+                "next": next_token,
+                "direction": direction,
+                "limit": limit,
+                "order": order,
+            },
         )
-        return PageResult.parse(res, MessageObject.parse)
+        return PageDequeResult.parse(res, MessageObject.parse)
 
     async def channel_get(self, channel_id: str) -> Channel:
         res = await self.call_api(
@@ -197,6 +203,12 @@ class Session:
             {"channel_id": channel_id},
         )
 
+    async def channel_mute(self, channel_id: str, duration: float = 0) -> None:
+        await self.call_api(
+            Api.CHANNEL_MUTE,
+            {"channel_id": channel_id, "duration": duration},
+        )
+
     async def user_channel_create(self, user_id: str, guild_id: str | None = None) -> Channel:
         data = {"user_id": user_id}
         if guild_id is not None:
@@ -247,6 +259,12 @@ class Session:
             {"guild_id": guild_id, "user_id": user_id, "permanent": permanent},
         )
 
+    async def guild_member_mute(self, guild_id: str, user_id: str, duration: float = 0) -> None:
+        await self.call_api(
+            Api.GUILD_MEMBER_MUTE,
+            {"guild_id": guild_id, "user_id": user_id, "duration": duration},
+        )
+
     async def guild_member_approve(self, request_id: str, approve: bool, comment: str) -> None:
         await self.call_api(
             Api.GUILD_MEMBER_APPROVE,
@@ -382,3 +400,7 @@ class Session:
         **kwargs,
     ) -> Any:
         return await self.call_api(f"internal/{action}", kwargs)
+
+    async def admin_login_list(self) -> list[Login]:
+        res = await self.call_api("admin/login.list")
+        return [Login.parse(i) for i in res]

{satori_python-0.11.4 → satori_python-0.12.0}/src/satori/element.py

@@ -18,13 +18,17 @@ class Element:
 
     __names__: ClassVar[Tuple[str, ...]]
 
+    @property
+    def children(self) -> List["Element"]:
+        return self._children
+
     @property
     def tag(self) -> str:
         return self.__class__.__name__.lower()
 
     @classmethod
     def unpack(cls, attrs: Dict[str, Any]):
-        obj = cls(**{k: v for k, v in attrs.items() if k in cls.__names__})
+        obj = cls(**{k: v for k, v in attrs.items() if k in cls.__names__})  # type: ignore
         obj._attrs.update({k: v for k, v in attrs.items() if k not in cls.__names__})
         return obj
 
@@ -132,7 +136,7 @@ class Sharp(Element):
     name: Optional[str] = None
 
 
-@dataclass
+@dataclass(repr=False)
 class Link(Element):
     """<a> 元素用于显示一个链接。"""
 
@@ -163,7 +167,7 @@ class Resource(Element):
     title: Optional[str] = None
     extra: InitVar[Optional[Dict[str, Any]]] = None
     cache: Optional[bool] = None
-    timeout: Optional[str] = None
+    timeout: Optional[int] = None
 
     __names__ = ("src", "title")
 
@@ -178,7 +182,7 @@ class Resource(Element):
         poster: Optional[str] = None,
         extra: Optional[Dict[str, Any]] = None,
         cache: Optional[bool] = None,
-        timeout: Optional[str] = None,
+        timeout: Optional[int] = None,
         **kwargs,
     ):
         data: Dict[str, Any] = {"extra": extra}
@@ -537,7 +541,7 @@ def transform(elements: List[RawElement]) -> List[Element]:
         tag = elem.tag()
         if tag in ELEMENT_TYPE_MAP:
             seg_cls = ELEMENT_TYPE_MAP[tag]
-            msg.append(seg_cls.unpack(elem.attrs))
+            msg.append(seg_cls.unpack(elem.attrs)(*transform(elem.children)))
         elif tag in ("a", "link"):
             link = Link.unpack(elem.attrs)
             if elem.children:
@@ -547,6 +551,7 @@ def transform(elements: List[RawElement]) -> List[Element]:
             button = Button.unpack(elem.attrs)
             if elem.children:
                 button(*transform(elem.children))
+            msg.append(button)
         elif tag in STYLE_TYPE_MAP:
             seg_cls = STYLE_TYPE_MAP[tag]
             msg.append(seg_cls.unpack(elem.attrs)(*transform(elem.children)))