satori-python 1.3.8__py3-none-any.whl → 1.3.9__py3-none-any.whl

satori/__init__.py

@@ -45,7 +45,7 @@ from .model import Role as Role
 from .model import Upload as Upload
 from .model import User as User
 
-__version__ = "1.3.8"
+__version__ = "1.3.9"
 
 
 MessageReceipt = MessageObject

satori/model.py

@@ -32,7 +32,7 @@ class ModelBase:
     @classmethod
     def parse(cls: type[Self], raw: dict) -> Self:
         data = {}
-        cls.before_parse(data)
+        cls.before_parse(raw)
         for name in cls.__dataclass_fields__:
             if name in raw and raw[name] is not None:
                 if name in cls.__converter__:
@@ -46,13 +46,13 @@ class ModelBase:
     def __init_subclass__(cls, **kwargs):
         has_converter = False
         keys = set()
-        for c in cls.__mro__:
+        for c in cls.__mro__[-1:0:-1]:
             if c is Generic:
                 _generic_init_subclass(cls, **kwargs)
             if getattr(c, "__converter__", None):
                 has_converter = True
             keys.update(getattr(c, "__annotations__", {}).keys())
-        keys = frozenset(k for k in keys if not k.startswith("_"))
+        keys = frozenset({k for k in keys if not (k.startswith("_") and k not in {"_type", "_data"})})
 
         def parse1(cls_: type[Self], raw: dict, _keys=keys) -> Self:
             data = {k: v for k, v in raw.items() if k in _keys and v is not None}
@@ -62,7 +62,7 @@ class ModelBase:
 
         def parse2(cls_: type[Self], raw: dict, _keys=keys) -> Self:
             data = {}
-            cls_.before_parse(data)
+            cls_.before_parse(raw)
             for name in _keys:
                 if name in raw and raw[name] is not None:
                     if name in cls_.__converter__:
@@ -101,9 +101,9 @@ class Channel(ModelBase):
 
     def dump(self):
         res = {"id": self.id, "type": self.type.value}
-        if self.name:
+        if self.name is not None:
             res["name"] = self.name
-        if self.parent_id:
+        if self.parent_id is not None:
             res["parent_id"] = self.parent_id
         return res
 
@@ -116,9 +116,9 @@ class Guild(ModelBase):
 
     def dump(self):
         res = {"id": self.id}
-        if self.name:
+        if self.name is not None:
             res["name"] = self.name
-        if self.avatar:
+        if self.avatar is not None:
             res["avatar"] = self.avatar
         return res
 
@@ -133,13 +133,13 @@ class User(ModelBase):
 
     def dump(self):
         res: dict[str, Any] = {"id": self.id}
-        if self.name:
+        if self.name is not None:
             res["name"] = self.name
-        if self.nick:
+        if self.nick is not None:
             res["nick"] = self.nick
-        if self.avatar:
+        if self.avatar is not None:
             res["avatar"] = self.avatar
-        if self.is_bot:
+        if self.is_bot is not None:
             res["is_bot"] = self.is_bot
         return res
 
@@ -157,9 +157,9 @@ class Friend(ModelBase):
 
     def dump(self):
         res = {}
-        if self.user:
+        if self.user is not None:
             res["user"] = self.user.dump()
-        if self.nick:
+        if self.nick is not None:
             res["nick"] = self.nick
         return res
 
@@ -177,7 +177,7 @@ class Role(ModelBase):
 
     def dump(self):
         res = {"id": self.id}
-        if self.name:
+        if self.name is not None:
             res["name"] = self.name
         return res
 
@@ -200,11 +200,11 @@ class Member(ModelBase):
         res = {}
         if self.user:
             res["user"] = self.user.dump()
-        if self.nick:
+        if self.nick is not None:
             res["nick"] = self.nick
-        if self.avatar:
+        if self.avatar is not None:
             res["avatar"] = self.avatar
-        if self.joined_at:
+        if self.joined_at is not None:
             res["joined_at"] = int(self.joined_at.timestamp() * 1000)
         if self.roles:
             res["roles"] = [role.dump() for role in self.roles]
@@ -282,7 +282,7 @@ class ButtonInteraction(ModelBase):
 
     def dump(self):
         res = {"id": self.id}
-        if self.data:
+        if self.data is not None:
             res["data"] = self.data
         return res
 
@@ -362,7 +362,7 @@ class EmojiObject(ModelBase):
 
     def dump(self):
         res = {"id": self.id}
-        if self.name:
+        if self.name is not None:
             res["name"] = self.name
         return res
 
@@ -438,11 +438,11 @@ class MessageObject(ModelBase):
             res["member"] = self.member.dump()
         if self.user:
             res["user"] = self.user.dump()
-        if self.created_at:
+        if self.created_at is not None:
             res["created_at"] = int(self.created_at.timestamp() * 1000)
-        if self.updated_at:
+        if self.updated_at is not None:
             res["updated_at"] = int(self.updated_at.timestamp() * 1000)
-        if self.referrer:
+        if self.referrer is not None:
             res["referrer"] = self.referrer
         return res
 
@@ -535,13 +535,13 @@ class Event(ModelBase):
             res["role"] = self.role.dump()
         if self.user:
             res["user"] = self.user.dump()
-        if self.referrer:
+        if self.referrer is not None:
             res["referrer"] = self.referrer
         if self.emoji:
             res["emoji"] = self.emoji.dump()
-        if self._type:
+        if self._type is not None:
             res["_type"] = self._type
-        if self._data:
+        if self._data is not None:
             res["_data"] = self._data
         return res
 
@@ -561,7 +561,7 @@ class PageResult(ModelBase, Generic[T]):
 
     def dump(self):
         res: dict = {"data": [item.dump() for item in self.data]}
-        if self.next:
+        if self.next is not None:
             res["next"] = self.next
         return res
 
@@ -577,9 +577,9 @@ class PageDequeResult(PageResult[T]):
 
     def dump(self):
         res: dict = {"data": [item.dump() for item in self.data]}
-        if self.next:
+        if self.next is not None:
             res["next"] = self.next
-        if self.prev:
+        if self.prev is not None:
             res["prev"] = self.prev
         return res
 

{satori_python-1.3.8.dist-info → satori_python-1.3.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: satori-python
-Version: 1.3.8
+Version: 1.3.9
 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>

{satori_python-1.3.8.dist-info → satori_python-1.3.9.dist-info}/RECORD

@@ -1,4 +1,4 @@
-satori/__init__.py,sha256=gzKo9sSVvK-ievs6_yV1j96p_m3UTojchviX4kdw1Z8,1888
+satori/__init__.py,sha256=W3VE3ojOL3zNBdrhvOWvZB_9X_7FlsG6811Gh7wVZk0,1888
 satori/_vendor/fleep.py,sha256=_zKP7iY3mMQr0rC5KbgkbkMorT3KVLeIsWPLIUa0Y34,16347
 satori/client/__init__.py,sha256=KZB5Ta5KzxdfCO8Ey5AuG7l4dzI0KnkqlaBVuyrfEMA,14481
 satori/client/account.py,sha256=HP7BJWkN69SB9ldNIjHxWlXcrmB-IPnTnYqm3lBMvl8,2742
@@ -14,7 +14,7 @@ satori/const.py,sha256=6TQAIlgNq7fHLiadxGUU-mzkffOcpRrEvq5yrWYMuGc,2738
 satori/element.py,sha256=JjF_flhH1GpJlSLEA1mHUvxLugn47L5KlHK8kt5Sp4k,21510
 satori/event.py,sha256=yC6rKaa7JbeOZ4Un1rX-Isvm3EcR7e782nxYf1j6JdM,1060
 satori/exception.py,sha256=edKeuLRZAQxyCdw1_XCgOtv5tIHkfHw0Die9B818_HM,545
-satori/model.py,sha256=tY47aOsb6HrpPAvGA6IHLNthVCwoUB8c2w1XeDFFmvQ,17684
+satori/model.py,sha256=s_H2PiM2Oqiu6az8tVVd6wDMcAFbtJraj1a8RDqlOAs,18027
 satori/parser.py,sha256=EyKitj39OewGhZuNIvrd8nWJiL5EJAVy7mtcv8Zk6v0,14658
 satori/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 satori/server/__init__.py,sha256=SumWaENrpRiZL7hLZpk8zcOJ-wvphHPMJjKwyhVzhDQ,24338
@@ -25,7 +25,7 @@ satori/server/model.py,sha256=zzjNa3iBFkd8crZIVTrEisPaB0g8JsxV4fA2rRU0maw,1105
 satori/server/route.py,sha256=kpelAX0kYQbJncp5biWi8pWRcEIez9m9sJN8NF3sjn4,10654
 satori/server/utils.py,sha256=hMNqLzbzcwyLJO-sGncO5kuviiW5Y6k34fj4AS2iVWQ,910
 satori/utils.py,sha256=N8HEw-DOXxOBwFHmmXgqPdMh6AXjiGR0ZGa1zBPH6EI,822
-satori_python-1.3.8.dist-info/METADATA,sha256=GaRExW9GyUj81eVGnfFxhaugCbH_LB-U4TsuByfUc-M,5511
-satori_python-1.3.8.dist-info/WHEEL,sha256=rSwsxJWe3vzyR5HCwjWXQruDgschpei4h_giTm0dJVE,90
-satori_python-1.3.8.dist-info/licenses/LICENSE,sha256=2EDswKd1M1648judap8BEEwp3Jz6IpfFP2wYVdU0Y2o,1069
-satori_python-1.3.8.dist-info/RECORD,,
+satori_python-1.3.9.dist-info/METADATA,sha256=VY_HweaopR88LS97qLXNtlSJtXTreFM6BUNEuG_m6lU,5511
+satori_python-1.3.9.dist-info/WHEEL,sha256=rSwsxJWe3vzyR5HCwjWXQruDgschpei4h_giTm0dJVE,90
+satori_python-1.3.9.dist-info/licenses/LICENSE,sha256=2EDswKd1M1648judap8BEEwp3Jz6IpfFP2wYVdU0Y2o,1069
+satori_python-1.3.9.dist-info/RECORD,,