diff --git a/mipac/models/lite/user.py b/mipac/models/lite/user.py index 838aaacd..8c3d2db0 100644 --- a/mipac/models/lite/user.py +++ b/mipac/models/lite/user.py @@ -2,14 +2,14 @@ from mipac.models.lite.instance import LiteInstance from mipac.types.emoji import ICustomEmojiLite -from mipac.types.user import IUserLite +from mipac.types.user import ILiteUser class LiteUser: __slots__ = ('__user',) - def __init__(self, user: IUserLite) -> None: - self.__user: IUserLite = user + def __init__(self, user: ILiteUser) -> None: + self.__user: ILiteUser = user @property def id(self) -> str: diff --git a/mipac/types/chat.py b/mipac/types/chat.py index b82b50f2..198832e5 100644 --- a/mipac/types/chat.py +++ b/mipac/types/chat.py @@ -4,7 +4,7 @@ if TYPE_CHECKING: from mipac.types import IDriveFile - from mipac.types.user import IUserLite + from mipac.types.user import ILiteUser __all__ = ('IChatGroup', 'IChatMessage') @@ -23,7 +23,7 @@ class IChatMessage(TypedDict): file: IDriveFile text: str | None user_id: str - user: IUserLite + user: ILiteUser recipient_id: str recipient: str group_id: str diff --git a/mipac/types/follow.py b/mipac/types/follow.py index cc18a542..33c09a01 100644 --- a/mipac/types/follow.py +++ b/mipac/types/follow.py @@ -1,9 +1,9 @@ from typing import TypedDict -from mipac.types.user import IUserLite +from mipac.types.user import ILiteUser class IFollowRequest(TypedDict): id: str - follower: IUserLite - followee: IUserLite + follower: ILiteUser + followee: ILiteUser diff --git a/mipac/types/note.py b/mipac/types/note.py index bb5068d0..453af4ec 100644 --- a/mipac/types/note.py +++ b/mipac/types/note.py @@ -3,7 +3,7 @@ from .drive import IDriveFile from .emoji import ICustomEmojiLite from .poll import IPoll -from .user import IUserLite +from .user import ILiteUser class GeoPayload(TypedDict): @@ -24,7 +24,7 @@ class INoteRequired(TypedDict): created_at: str text: str | None cw: str | None - user: IUserLite + user: ILiteUser user_id: str reply_id: str renote_id: str @@ -56,5 +56,5 @@ class INote(INoteRequired, total=False): class INoteReaction(TypedDict): id: str created_at: str - user: IUserLite + user: ILiteUser type: str diff --git a/mipac/types/notification.py b/mipac/types/notification.py index b883d668..dba78bac 100644 --- a/mipac/types/notification.py +++ b/mipac/types/notification.py @@ -10,7 +10,7 @@ if TYPE_CHECKING: from mipac.types.note import INote - from mipac.types.user import IUserLite + from mipac.types.user import ILiteUser class Notification(TypedDict): @@ -22,6 +22,6 @@ class Notification(TypedDict): class IReactionNf(Notification): type: str reaction: str - user: IUserLite + user: ILiteUser user_id: str note: INote diff --git a/mipac/types/page.py b/mipac/types/page.py index b81d2460..7e1a7039 100644 --- a/mipac/types/page.py +++ b/mipac/types/page.py @@ -3,11 +3,11 @@ from typing import TYPE_CHECKING, Any, Optional, TypedDict from mipac.types.drive import IDriveFile -from mipac.types.user import IUserLite +from mipac.types.user import ILiteUser if TYPE_CHECKING: from mipac.types.drive import IFileProperties - from mipac.types.user import IUserLite + from mipac.types.user import ILiteUser __all__ = ( 'PageContentPayload', @@ -25,7 +25,7 @@ class IPageRequired(TypedDict): createdAt: str updatedAt: str userId: str - user: IUserLite + user: ILiteUser content: list[dict[str, Any]] variables: list[dict[str, Any]] title: str @@ -109,7 +109,7 @@ class PagePayload(TypedDict): created_at: str updated_at: str user_id: str - user: IUserLite + user: ILiteUser content: list[PageContentPayload] variable: list[VariablePayload] title: str diff --git a/mipac/types/reaction.py b/mipac/types/reaction.py index 9efc92ed..11193c61 100644 --- a/mipac/types/reaction.py +++ b/mipac/types/reaction.py @@ -4,7 +4,7 @@ if TYPE_CHECKING: - from mipac.types.user import IUserLite + from mipac.types.user import ILiteUser __all__ = ('NoteReactionPayload',) @@ -12,5 +12,5 @@ class NoteReactionPayload(TypedDict): id: str created_at: str - user: IUserLite + user: ILiteUser type: str diff --git a/mipac/types/user.py b/mipac/types/user.py index aaca6e85..597229ad 100644 --- a/mipac/types/user.py +++ b/mipac/types/user.py @@ -10,13 +10,13 @@ from mipac.types.page import IPage __all__ = ( 'IChannel', - 'IUserLite', + 'ILiteUser', 'IUserDetailed', 'IUserDetailedField', ) -class IUserLite(TypedDict): +class ILiteUser(TypedDict): id: str username: str host: str | None @@ -33,7 +33,7 @@ class IUserDetailedField(TypedDict): value: str -class IUserDetailedRequired(IUserLite): +class IUserDetailedRequired(ILiteUser): fields: list[IUserDetailedField] followers_count: int following_count: int @@ -79,5 +79,5 @@ class IUserDetailed(IUserDetailedRequired, total=False): class IFollowRequest(TypedDict): id: str - follower: IUserLite - followee: IUserLite + follower: ILiteUser + followee: ILiteUser