Merge branch 'dev'

Author: kakeruzoku

docs/changelog.rst

@@ -7,6 +7,11 @@
 3.x.x
 -----
 
+3.2.1
+^^^^^
+- :attr:`scapi.User.membership_avatar_badge`, :attr:`scapi.User.membership_label` を追加
+- メンバーシップ追加によるHTMLパースが失敗する問題を修正
+
 3.2.0
 ^^^^^
 - :attr:`scapi.User.get_activities` を追加

scapi/sites/activity.py

@@ -570,6 +570,12 @@ def _create_from_html(cls,data:bs4.Tag,client_or_session:"HTTPClient|Session",us
             user = User(_user_tag.text.strip(),client_or_session,True)
         activity.actor = user
         _activity_action:Tag = _user_tag.next_sibling
+        while True:
+            if isinstance(_activity_action,bs4.element.NavigableString) and str(_activity_action).strip():
+                break
+            _activity_action:Tag = _activity_action.next_sibling
+            if _activity_action is None:
+                return activity
         activity_action = str(_activity_action).strip()
         _target1:Tag|None = None if _activity_action is None else _activity_action.next_sibling
         _text:Tag|None = None if _target1 is None else _target1.next_sibling

scapi/sites/user.py

@@ -74,6 +74,9 @@ class User(_BaseSiteAPI[str]):
 
         educator_can_unban (MAYBE_UNKNOWN[bool]):
         is_banned (MAYBE_UNKNOWN[bool]):
+
+        membership_avatar_badge (MAYBE_UNKNOWN[bool|None]): メンバーシップバッチを表示するか
+        membership_label (MAYBE_UNKNOWN[int|None]): メンバーシップのラベル?
     """
     def __repr__(self) -> str:
         return f"<User username:{self.username} id:{self.id} session:{self.session}>"
@@ -108,6 +111,9 @@ def __init__(self,username:str,client_or_session:"HTTPClient|Session|None"=None,
         self.status:MAYBE_UNKNOWN[str] = UNKNOWN
         self.country:MAYBE_UNKNOWN[str] = UNKNOWN
         self.scratchteam:MAYBE_UNKNOWN[bool] = UNKNOWN
+        
+        self.membership_avatar_badge:MAYBE_UNKNOWN[bool|None] = UNKNOWN
+        self.membership_label:MAYBE_UNKNOWN[int|None] = UNKNOWN
 
         #teacher only
         self.educator_can_unban:MAYBE_UNKNOWN[bool] = UNKNOWN
@@ -138,7 +144,9 @@ def _update_from_data(self, data:UserPayload):
                 profile_id=_profile.get("id"),
                 status=_profile.get("status"),
                 bio=_profile.get("bio"),
-                country=_profile.get("country")
+                country=_profile.get("country"),
+                membership_avatar_badge=_profile.get("membership_avatar_badge",None),
+                membership_label=_profile.get("membership_label",None),
             )
 
     def _update_from_old_data(self, data:OldUserPayload):

scapi/utils/common.py

@@ -17,7 +17,7 @@
     from .client import HTTPClient
     from ..sites.session import Session
 
-__version__ = "3.2.0"
+__version__ = "3.2.1"
 
 _KT = TypeVar("_KT")
 _VT = TypeVar("_VT")

scapi/utils/types.py

@@ -103,6 +103,8 @@ class UserProfilePayload(TypedDict,total=False):
     status:str
     bio:str
     country:str
+    membership_avatar_badge:bool
+    membership_label:bool
 
 class UserPayload(TypedDict,total=False):
     id:int