feat: user周りを最新のMisskeyに追従 #148

mipac/models/user.py

@@ -257,22 +257,14 @@ def following_visibility(self) -> IFfVisibility:
     def followers_visibility(self) -> IFfVisibility:
         return self._raw_user["followers_visibility"]
 
-    @property
-    def two_factor_enabled(self) -> bool:
-        return self._raw_user["two_factor_enabled"]
-
-    @property
-    def use_password_less_login(self) -> bool:
-        return self._raw_user["use_password_less_login"]
-
-    @property
-    def security_keys(self) -> bool:
-        return self._raw_user["security_keys"]
-
     @property
     def roles(self) -> list[PartialRole]:
         return [PartialRole(i, client=self._client) for i in self._raw_user["roles"]]
 
+    @property
+    def followed_message(self) -> str | None:
+        return self._raw_user.get("followed_message")
+
     @property
     def memo(self) -> str | None:
         return self._raw_user["memo"]
@@ -281,6 +273,18 @@ def memo(self) -> str | None:
     def moderation_note(self) -> str | None:
         return self._raw_user.get("moderation_note")
 
+    @property
+    def two_factor_enabled(self) -> bool | None:
+        return self._raw_user.get("two_factor_enabled")
+
+    @property
+    def use_password_less_login(self) -> bool | None:
+        return self._raw_user.get("use_password_less_login")
+
+    @property
+    def security_keys(self) -> bool | None:
+        return self._raw_user.get("security_keys")
+
     @property
     def is_following(self) -> bool | None:
         return self._raw_user.get("is_following")
@@ -334,6 +338,10 @@ def avatar_id(self) -> str | None:
     @property
     def banner_id(self) -> str | None:
         return self._raw_user["banner_id"]
+
+    @property
+    def followed_message(self) -> str | None:
+        return self._raw_user["followed_message"]
 
     @property
     def is_moderator(self) -> bool | None:
@@ -461,6 +469,18 @@ def logged_in_days(self) -> int:
     def policies(self) -> IPolicies:  # TODO: モデル化
         return self._raw_user["policies"]
 
+    @property
+    def two_factor_enabled(self) -> bool:
+        return self._raw_user["two_factor_enabled"]
+
+    @property
+    def use_password_less_login(self) -> bool:
+        return self._raw_user["use_password_less_login"]
+
+    @property
+    def security_keys(self) -> bool:
+        return self._raw_user["security_keys"]
+
     @property
     def email(self) -> str | None:
         return self._raw_user.get("email")

mipac/types/user.py

@@ -145,11 +145,12 @@ class IUserDetailedNotMeOnlySchema(TypedDict):
     public_reactions: bool
     following_visibility: IFfVisibility
     followers_visibility: IFfVisibility
-    two_factor_enabled: bool
-    use_password_less_login: bool
-    security_keys: bool
     roles: list[IPartialRole]
+    followed_message: NotRequired[str | None]
     memo: str | None
+    two_factor_enabled: NotRequired[bool]
+    use_password_less_login: NotRequired[bool]
+    security_keys: NotRequired[bool]
     moderation_note: NotRequired[str]
     is_following: NotRequired[bool]
     is_followed: NotRequired[bool]
@@ -166,7 +167,10 @@ class IUserDetailedNotMeOnlySchema(TypedDict):
 class IMeDetailedOnlySchema(TypedDict):
     avatar_id: str | None
     banner_id: str | None
-    is_moderator: bool | None  # entities/UserEntityService.ts で roleServiceを用いて判断してるからNoneの場合がある?
+    followed_message: str | None
+    is_moderator: (
+        bool | None
+    )  # entities/UserEntityService.ts で roleServiceを用いて判断してるからNoneの場合がある?
     is_admin: bool | None
     inject_featured_note: bool
     receive_announcement_email: bool
@@ -197,6 +201,9 @@ class IMeDetailedOnlySchema(TypedDict):
     achievements: list[IAchievement]
     logged_in_days: int
     policies: IPolicies
+    two_factor_enabled: bool
+    use_password_less_login: bool
+    security_keys: bool
     email: NotRequired[str | None]
     email_verified: NotRequired[bool]
     security_keys_list: NotRequired[list[IUserSecurityKey]]  # セキュリティー