feat: MuteUserをMutedUserに変更

pull/109/head
yupix 7 months ago
parent 3a9707f5f2
commit d6f494d1f5
No known key found for this signature in database
GPG Key ID: 2FF705F5C56D9C06

@ -5,8 +5,8 @@ from typing import TYPE_CHECKING, AsyncGenerator
from mipac.abstract.action import AbstractAction
from mipac.errors.base import ParameterError
from mipac.http import HTTPClient, Route
from mipac.models.mute import MuteUser
from mipac.types.mute import IMuteUser
from mipac.models.mute import MutedUser
from mipac.types.mute import IMutedUser
from mipac.utils.format import remove_dict_empty
from mipac.utils.pagination import Pagination
@ -70,7 +70,7 @@ class MuteActions(AbstractAction):
since_id: str | None = None,
until_id: str | None = None,
get_all: bool = True,
) -> AsyncGenerator[MuteUser, None]:
) -> AsyncGenerator[MutedUser, None]:
if limit > 100:
raise ParameterError("limit は100以下である必要があります")
@ -79,14 +79,14 @@ class MuteActions(AbstractAction):
body = remove_dict_empty({"limit": limit, "sinceId": since_id, "untilId": until_id})
pagination = Pagination[IMuteUser](
pagination = Pagination[IMutedUser](
self._session, Route("POST", "/api/mute/list"), json=body
)
while True:
raw_mute_users = await pagination.next()
for raw_mute_user in raw_mute_users:
yield MuteUser(raw_mute_user, client=self._client)
yield MutedUser(raw_mute_user, client=self._client)
if get_all is False or pagination.is_final:
break

@ -4,16 +4,16 @@ from datetime import datetime
from typing import TYPE_CHECKING
from mipac.models.user import UserDetailedNotMe
from mipac.types.mute import IMuteUser
from mipac.types.mute import IMutedUser
from mipac.utils.format import str_to_datetime
if TYPE_CHECKING:
from mipac.manager.client import ClientManager
class MuteUser:
def __init__(self, raw_mute_user: IMuteUser, *, client: ClientManager) -> None:
self.__raw_mute_user: IMuteUser = raw_mute_user
class MutedUser:
def __init__(self, raw_mute_user: IMutedUser, *, client: ClientManager) -> None:
self.__raw_mute_user: IMutedUser = raw_mute_user
self.__client: ClientManager = client
@property
@ -40,8 +40,8 @@ class MuteUser:
def mutee(self) -> UserDetailedNotMe:
return UserDetailedNotMe(self.__raw_mute_user["mutee"], client=self.__client)
def __eq__(self, __value: MuteUser) -> bool:
return isinstance(__value, MuteUser) and self.id == __value.id
def __eq__(self, __value: MutedUser) -> bool:
return isinstance(__value, MutedUser) and self.id == __value.id
def __ne__(self, __value: MuteUser) -> bool:
def __ne__(self, __value: MutedUser) -> bool:
return not self.__eq__(__value)

@ -6,7 +6,7 @@ if TYPE_CHECKING:
from mipac.types.user import IUserDetailed
class IMuteUser(TypedDict):
class IMutedUser(TypedDict):
id: str
created_at: str
expires_at: str | None

Loading…
Cancel
Save