satori-python-core 0.18.1__tar.gz → 1.3.0__tar.gz

{satori_python_core-0.18.1 → satori_python_core-1.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: satori-python-core
-Version: 0.18.1
+Version: 1.3.0
 Summary: Satori Protocol SDK for python, specify common part
 Home-page: https://github.com/RF-Tar-Railt/satori-python
 Author-Email: RF-Tar-Railt <rf_tar_railt@qq.com>
@@ -72,13 +72,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.qq.main, satori.adapters.qq.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_core-0.18.1 → satori_python_core-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.qq.main, satori.adapters.qq.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_core-0.18.1 → satori_python_core-1.3.0}/pyproject.toml

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

{satori_python_core-0.18.1 → satori_python_core-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.1"
+__version__ = "1.3.0"
 
 
 MessageReceipt = MessageObject

{satori_python_core-0.18.1 → satori_python_core-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_core-0.18.1 → satori_python_core-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_core-0.18.1 → satori_python_core-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_core-0.18.1 → satori_python_core-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: