From c277bc37cdbd0ad149337a0bb1daf85adad582ac Mon Sep 17 00:00:00 2001 From: yupix Date: Wed, 6 Dec 2023 14:25:32 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20followee=E3=81=A8follower=E3=81=AF?= =?UTF-8?q?=E7=84=A1=E3=81=84=E5=A0=B4=E5=90=88=E3=81=8C=E3=81=82=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mipac/models/user.py | 10 ++++++---- mipac/types/follow.py | 6 +++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/mipac/models/user.py b/mipac/models/user.py index 1a52886..9f79154 100644 --- a/mipac/models/user.py +++ b/mipac/models/user.py @@ -61,16 +61,18 @@ class FollowCommon(Generic[FFC]): return self._raw_follow["follower_id"] @property - def follower(self) -> UserDetailedNotMe | MeDetailed: - return packed_user(self._raw_follow["follower"], client=self._client) + def follower(self) -> UserDetailedNotMe | MeDetailed | None: + raw_follower = self._raw_follow.get("follower") + return packed_user(raw_follower, client=self._client) if raw_follower else None @property def followee_id(self) -> str: return self._raw_follow["followee_id"] @property - def followee(self) -> UserDetailedNotMe | MeDetailed: - return packed_user(self._raw_follow["followee"], client=self._client) + def followee(self) -> UserDetailedNotMe | MeDetailed | None: + raw_followee = self._raw_follow.get("followee") + return packed_user(raw_followee, client=self._client) if raw_followee else None class Follower(FollowCommon[IFederationFollower]): diff --git a/mipac/types/follow.py b/mipac/types/follow.py index 7fdc05d..fd1f986 100644 --- a/mipac/types/follow.py +++ b/mipac/types/follow.py @@ -1,4 +1,4 @@ -from typing import TypedDict +from typing import NotRequired, TypedDict from mipac.types.user import IPartialUser, IUserDetailed @@ -7,9 +7,9 @@ class IFederationFollowCommon(TypedDict): id: str created_at: str followee_id: str - followee: IUserDetailed + followee: NotRequired[IUserDetailed] follower_id: str - follower: IUserDetailed + follower: NotRequired[IUserDetailed] class IFederationFollower(IFederationFollowCommon):