diff --git a/mipac/actions/admins/ad.py b/mipac/actions/admins/ad.py index 0fb41ec..add1466 100644 --- a/mipac/actions/admins/ad.py +++ b/mipac/actions/admins/ad.py @@ -3,7 +3,7 @@ from __future__ import annotations from typing import TYPE_CHECKING, AsyncGenerator, Literal from mipac.abstract.action import AbstractAction -from mipac.errors.base import NotSupportVersion, NotSupportVersionText, ParameterError +from mipac.errors.base import ParameterError from mipac.http import HTTPClient, Route from mipac.models.ad import Ad from mipac.types.ads import IAd diff --git a/mipac/actions/admins/admin.py b/mipac/actions/admins/admin.py index 86e0a2a..3538956 100644 --- a/mipac/actions/admins/admin.py +++ b/mipac/actions/admins/admin.py @@ -7,8 +7,8 @@ from mipac.config import config from mipac.errors.base import ParameterError from mipac.http import HTTPClient, Route from mipac.models.admin import IndexStat, ModerationLog, ServerInfo, UserIP -from mipac.models.user import MeDetailed, UserDetailed from mipac.models.meta import AdminMeta +from mipac.models.user import MeDetailed, UserDetailed from mipac.types.admin import IIndexStat, IModerationLog, IServerInfo, ITableStats, IUserIP from mipac.types.meta import IAdminMeta, IUpdateMetaBody from mipac.types.user import IMeDetailed, IUserDetailed, is_me_detailed diff --git a/mipac/actions/admins/emoji.py b/mipac/actions/admins/emoji.py index a0e7d8c..45b11d2 100644 --- a/mipac/actions/admins/emoji.py +++ b/mipac/actions/admins/emoji.py @@ -32,7 +32,6 @@ class AdminEmojiActions(AbstractAction): is_sensitive: bool = False, local_only: bool = False, role_ids_that_can_be_used_this_emoji_as_reaction: list[str] | None = None, - ) -> bool: data = { "fileId": file_id, @@ -42,7 +41,7 @@ class AdminEmojiActions(AbstractAction): "license": license, "isSensitive": is_sensitive, "localOnly": local_only, - "roleIdsThatCanBeUsedThisEmojiAsReaction": role_ids_that_can_be_used_this_emoji_as_reaction, + "roleIdsThatCanBeUsedThisEmojiAsReaction": role_ids_that_can_be_used_this_emoji_as_reaction, # noqa: E501 } if not check_multi_arg(file_id, name): diff --git a/mipac/actions/admins/roles.py b/mipac/actions/admins/roles.py index d0829fb..0be23ac 100644 --- a/mipac/actions/admins/roles.py +++ b/mipac/actions/admins/roles.py @@ -3,7 +3,7 @@ from __future__ import annotations from typing import TYPE_CHECKING, Any, AsyncGenerator, Literal from mipac.abstract.action import AbstractAction -from mipac.errors.base import NotSupportVersion, NotSupportVersionText, ParameterError +from mipac.errors.base import ParameterError from mipac.http import Route from mipac.models.roles import Role, RoleUser from mipac.types.meta import IPolicies diff --git a/mipac/actions/channel.py b/mipac/actions/channel.py index 4f6335e..08b1855 100644 --- a/mipac/actions/channel.py +++ b/mipac/actions/channel.py @@ -3,7 +3,7 @@ from __future__ import annotations from typing import TYPE_CHECKING, AsyncGenerator, Literal from mipac.abstract.action import AbstractAction -from mipac.errors.base import NotSupportVersion, NotSupportVersionText, ParameterError +from mipac.errors.base import ParameterError from mipac.http import HTTPClient, Route from mipac.models.channel import Channel from mipac.models.lite.channel import ChannelLite diff --git a/mipac/actions/emoji.py b/mipac/actions/emoji.py index 3c0319d..240cd03 100644 --- a/mipac/actions/emoji.py +++ b/mipac/actions/emoji.py @@ -3,7 +3,6 @@ from __future__ import annotations from typing import TYPE_CHECKING from mipac.abstract.action import AbstractAction -from mipac.errors.base import NotSupportVersion, NotSupportVersionText from mipac.http import HTTPClient, Route from mipac.models.emoji import CustomEmoji from mipac.types.emoji import ICustomEmoji diff --git a/mipac/actions/my.py b/mipac/actions/my.py index 7dadf96..7a2cdb7 100644 --- a/mipac/actions/my.py +++ b/mipac/actions/my.py @@ -3,7 +3,6 @@ from __future__ import annotations from typing import TYPE_CHECKING from mipac.abstract.action import AbstractAction -from mipac.errors.base import NotSupportVersion, NotSupportVersionText from mipac.http import HTTPClient, Route from mipac.models.follow import FollowRequest from mipac.types.achievement import IT_ACHIEVEMENT_NAME diff --git a/mipac/actions/reaction.py b/mipac/actions/reaction.py index 01ef591..68f9fa0 100644 --- a/mipac/actions/reaction.py +++ b/mipac/actions/reaction.py @@ -3,8 +3,6 @@ from __future__ import annotations from typing import TYPE_CHECKING from mipac.abstract.action import AbstractAction -from mipac.config import config -from mipac.errors.base import NotSupportVersion from mipac.http import Route from mipac.models.emoji import CustomEmoji from mipac.models.note import NoteReaction diff --git a/mipac/actions/role.py b/mipac/actions/role.py index b243e3e..6fca266 100644 --- a/mipac/actions/role.py +++ b/mipac/actions/role.py @@ -2,9 +2,8 @@ from __future__ import annotations from typing import TYPE_CHECKING, AsyncGenerator -from mipac.config import config from mipac.abstract.action import AbstractAction -from mipac.errors.base import NotSupportVersion +from mipac.config import config from mipac.http import HTTPClient, Route from mipac.models.note import Note from mipac.models.roles import MeRole, Role, RoleUser diff --git a/mipac/actions/user.py b/mipac/actions/user.py index a60b67c..b278a4a 100644 --- a/mipac/actions/user.py +++ b/mipac/actions/user.py @@ -2,13 +2,7 @@ from __future__ import annotations from typing import TYPE_CHECKING, AsyncGenerator, Literal, Optional, TypeVar, Union, overload -from mipac.config import config -from mipac.errors.base import ( - NotExistRequiredData, - NotSupportVersion, - NotSupportVersionText, - ParameterError, -) +from mipac.errors.base import NotExistRequiredData, ParameterError from mipac.http import HTTPClient, Route from mipac.models.clip import Clip from mipac.models.note import Note diff --git a/mipac/client.py b/mipac/client.py index c5dcc5f..099ae26 100644 --- a/mipac/client.py +++ b/mipac/client.py @@ -1,6 +1,6 @@ from typing import Self -from mipac.config import Config, IMisskeyVersions, config +from mipac.config import Config, config from mipac.http import HTTPClient from mipac.manager.client import ClientManager from mipac.utils.log import LOGING_LEVEL_TYPE, setup_logging diff --git a/mipac/manager/role.py b/mipac/manager/role.py index ae80023..fb51cb4 100644 --- a/mipac/manager/role.py +++ b/mipac/manager/role.py @@ -1,9 +1,10 @@ from __future__ import annotations + from typing import TYPE_CHECKING from mipac.abstract.manager import AbstractManager -from mipac.http import HTTPClient from mipac.actions.role import RoleActions +from mipac.http import HTTPClient if TYPE_CHECKING: from mipac.manager.client import ClientManager diff --git a/mipac/models/lite/ad.py b/mipac/models/lite/ad.py index 56f4dba..50aab53 100644 --- a/mipac/models/lite/ad.py +++ b/mipac/models/lite/ad.py @@ -1,8 +1,9 @@ from __future__ import annotations -from typing import TYPE_CHECKING, TypeVar, Generic +from typing import TYPE_CHECKING, Generic, TypeVar + from mipac.abstract.model import AbstractModel -from mipac.types.ads import IPartialAd, IAdPlaces +from mipac.types.ads import IAdPlaces, IPartialAd if TYPE_CHECKING: from mipac.manager.client import ClientManager diff --git a/mipac/models/lite/meta.py b/mipac/models/lite/meta.py index 90b0c23..dda695d 100644 --- a/mipac/models/lite/meta.py +++ b/mipac/models/lite/meta.py @@ -4,7 +4,7 @@ from typing import TYPE_CHECKING, Generic, TypeVar from mipac.abstract.model import AbstractModel from mipac.models.lite.ad import PartialAd -from mipac.types.meta import IPolicies, IPartialMeta, IFeatures +from mipac.types.meta import IPartialMeta, IPolicies if TYPE_CHECKING: from mipac.manager.client import ClientManager @@ -108,6 +108,7 @@ class Policies(AbstractModel): def rate_limit_factor(self) -> int: return self.__raw_policies["rate_limit_factor"] + class PartialMeta(AbstractModel, Generic[T]): def __init__(self, raw_meta: T, *, client: ClientManager) -> None: self._raw_meta: T = raw_meta diff --git a/mipac/models/meta.py b/mipac/models/meta.py index 8ce64b6..98add74 100644 --- a/mipac/models/meta.py +++ b/mipac/models/meta.py @@ -3,7 +3,6 @@ from __future__ import annotations from typing import TYPE_CHECKING from mipac.abstract.model import AbstractModel -from mipac.manager.client import ClientManager from mipac.models.lite.meta import PartialMeta from mipac.types.meta import ( IAdminMeta, diff --git a/mipac/types/ads.py b/mipac/types/ads.py index 31fd2af..c442877 100644 --- a/mipac/types/ads.py +++ b/mipac/types/ads.py @@ -1,8 +1,8 @@ from typing import Literal, TypedDict - IAdPlaces = Literal["square" "horizontal" "horizontal-big"] + class IPartialAd(TypedDict): id: str url: str diff --git a/mipac/types/meta.py b/mipac/types/meta.py index a56f326..17918ef 100644 --- a/mipac/types/meta.py +++ b/mipac/types/meta.py @@ -2,8 +2,9 @@ from typing import Any, Literal, NotRequired, TypedDict from mipac.types.ads import IPartialAd -ISensitiveMediaDetectionSentivity = Literal['medium', 'low', 'high', 'veryLow', 'veryHigh'] -ISensitiveMediaDetection = Literal['none', 'all', 'local', 'remote'] +ISensitiveMediaDetectionSentivity = Literal["medium", "low", "high", "veryLow", "veryHigh"] +ISensitiveMediaDetection = Literal["none", "all", "local", "remote"] + class IFeatures(TypedDict): registration: bool @@ -99,7 +100,7 @@ class IAdminMeta(TypedDict): # IMetaに含まれる物が多くあるけど、 name: str | None short_name: str | None uri: str - description: str |None + description: str | None langs: list[str] tos_url: str repository_url: str @@ -116,13 +117,13 @@ class IAdminMeta(TypedDict): # IMetaに含まれる物が多くあるけど、 theme_color: str mascot_image_url: str banner_url: str | None - server_error_image_url: str | None + server_error_image_url: str | None not_found_image_url: str | None - info_image_url: str | None + info_image_url: str | None icon_url: str | None appint_icon_url: str | None appint_icon_url: str | None - background_image_url: str | None + background_image_url: str | None logo_image_url: str | None default_light_theme: str | None default_dark_theme: str | None diff --git a/mipac/types/roles.py b/mipac/types/roles.py index b211933..1c9a584 100644 --- a/mipac/types/roles.py +++ b/mipac/types/roles.py @@ -1,6 +1,6 @@ from __future__ import annotations -from typing import TYPE_CHECKING, NotRequired, TypeGuard, TypedDict +from typing import TYPE_CHECKING, NotRequired, TypedDict, TypeGuard if TYPE_CHECKING: from mipac.types.user import IMeDetailed, IUserDetailed diff --git a/mipac/types/user.py b/mipac/types/user.py index ee0e454..2f8a676 100644 --- a/mipac/types/user.py +++ b/mipac/types/user.py @@ -1,7 +1,6 @@ from __future__ import annotations -from typing import TYPE_CHECKING, List, Literal, TypeGuard, TypedDict, Any - +from typing import TYPE_CHECKING, Any, List, Literal, TypedDict, TypeGuard if TYPE_CHECKING: from mipac.types.announcement import IAnnouncement