💥 feat!: ClientActionsをClientManagerに改名

chore: 新しく別にClientActionsを追加

CHANGELOG.md

@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## Added
 
+- added new `ClientActions` class.
 - added `avatar_color` property at `LiteUser` class.
     - Note: Since avatar_color is deprecated in v13, only None is returned for v13 instances.
 - added `un_renote` method at `ClientNoteActions` class.
@@ -73,6 +74,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - CustomEmoji now inherits PartialCustomEmoji.
 - PartialCustomEmoji url has been changed to return `str | None` to match v13.
 - AdminManager's `get_invite` method has been moved to `AdminActions.
+- **BREAKING CHANGE** `ClientActions` has been changed to `ClientManager`
 - **BREAKING CHANGE** Some paths will be changed as follows
     - `manager.admin` -> `manager.admins`
     - `manager.admin.manager` -> `manager.admins.admin`

mipac/abstract/action.py

@@ -6,12 +6,12 @@ from typing import TYPE_CHECKING
 from mipac.http import HTTPClient
 
 if TYPE_CHECKING:
-    from mipac.manager.client import ClientActions
+    from mipac.manager.client import ClientManager
 
 __all__ = ('AbstractAction',)
 
 
 class AbstractAction(ABC):
     @abstractmethod
-    def __init__(self, session: HTTPClient, client: ClientActions):
+    def __init__(self, session: HTTPClient, client: ClientManager):
         pass

mipac/abstract/manager.py

@@ -6,12 +6,12 @@ from typing import TYPE_CHECKING
 from mipac.http import HTTPClient
 
 if TYPE_CHECKING:
-    from mipac.manager.client import ClientActions
+    from mipac.manager.client import ClientManager
 
 __all__ = ('AbstractManager',)
 
 
 class AbstractManager(ABC):
     @abstractmethod
-    def __init__(self, *, session: HTTPClient, client: ClientActions):
+    def __init__(self, *, session: HTTPClient, client: ClientManager):
         pass

mipac/actions/admins/admin.py

@@ -8,11 +8,11 @@ from mipac.models.meta import AdminMeta
 from mipac.types.meta import IAdminMeta
 
 if TYPE_CHECKING:
-    from mipac.manager.client import ClientActions
+    from mipac.manager.client import ClientManager
 
 
 class AdminActions(AbstractAction):
-    def __init__(self, *, session: HTTPClient, client: ClientActions):
+    def __init__(self, *, session: HTTPClient, client: ClientManager):
         self.__session = session
         self.__client = client
 

mipac/actions/admins/emoji.py

@@ -11,7 +11,7 @@ from mipac.util import check_multi_arg
 
 if TYPE_CHECKING:
     from mipac.http import HTTPClient
-    from mipac.manager.client import ClientActions
+    from mipac.manager.client import ClientManager
 
 
 class AdminEmojiActions(AbstractAction):
@@ -20,7 +20,7 @@ class AdminEmojiActions(AbstractAction):
         emoji_id: None | str = None,
         *,
         session: HTTPClient,
-        client: ClientActions
+        client: ClientManager
     ):
         self.__emoji_id = emoji_id
         self.__session = session

mipac/actions/admins/moderator.py

@@ -7,7 +7,7 @@ from mipac.http import Route
 
 if TYPE_CHECKING:
     from mipac.http import HTTPClient
-    from mipac.manager.client import ClientActions
+    from mipac.manager.client import ClientManager
 
 
 class AdminModeratorActions(AbstractAction):
@@ -16,10 +16,10 @@ class AdminModeratorActions(AbstractAction):
         user_id: str | None = None,
         *,
         session: HTTPClient,
-        client: ClientActions
+        client: ClientManager
     ):
         self.__session: HTTPClient = session
-        self.__client: ClientActions = client
+        self.__client: ClientManager = client
         self.__user_id: str | None = user_id
 
     async def add(self, user_id: str | None = None) -> bool:

mipac/actions/chart.py

@@ -7,11 +7,11 @@ from mipac.http import HTTPClient, Route
 from mipac.models.chart import ActiveUsersChart, DriveChart
 
 if TYPE_CHECKING:
-    from mipac.manager.client import ClientActions
+    from mipac.manager.client import ClientManager
 
 
 class ChartActions(AbstractAction):
-    def __init__(self, session: HTTPClient, client: ClientActions):
+    def __init__(self, session: HTTPClient, client: ClientManager):
         self.__session = session
         self.__client = client
 

mipac/actions/chat.py

@@ -10,14 +10,14 @@ from mipac.types.chat import IChatMessage
 from mipac.util import check_multi_arg
 
 if TYPE_CHECKING:
-    from mipac.manager.client import ClientActions
+    from mipac.manager.client import ClientManager
 
 
 class BaseChatAction(AbstractAction):
     def __init__(
         self,
         session: HTTPClient,
-        client: ClientActions,
+        client: ClientManager,
         *,
         user_id: str | None = None,
         message_id: str | None = None,
@@ -85,7 +85,7 @@ class ChatAction(BaseChatAction):
     def __init__(
         self,
         session: HTTPClient,
-        client: ClientActions,
+        client: ClientManager,
         *,
         user_id: str | None = None,
         message_id: str | None = None,

mipac/actions/client.py

@@ -0,0 +1,39 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Literal, overload
+
+from mipac.abstract.action import AbstractAction
+from mipac.http import HTTPClient, Route
+from mipac.models.lite.meta import LiteMeta
+from mipac.models.meta import Meta
+from mipac.types.meta import ILiteMeta, IMeta
+
+if TYPE_CHECKING:
+    from mipac.manager.client import ClientManager
+
+
+class ClientActions(AbstractAction):
+    def __init__(self, *, session: HTTPClient, client: ClientManager) -> None:
+        self.__session: HTTPClient = session
+        self.__client: ClientManager = client
+
+    @overload
+    async def get_meta(self, detail: Literal[False] = ...) -> LiteMeta:
+        ...
+
+    @overload
+    async def get_meta(self, detail: Literal[True] = ...) -> Meta:
+        ...
+
+    async def get_meta(self, detail: bool = False):
+        params = {
+            'route': Route('POST', '/api/meta'),
+            'json': {'detail': detail},
+            'auth': True,
+            'lower': True,
+        }
+        if detail is True:
+            meta: IMeta = await self.__session.request(**params)
+            return Meta(meta, client=self.__client)
+        lite_meta: ILiteMeta = await self.__session.request(**params)
+        return LiteMeta(lite_meta, client=self.__client)

mipac/actions/drive.py

@@ -10,7 +10,7 @@ from mipac.types.drive import IDriveFile
 from mipac.util import bool_to_string, remove_dict_empty
 
 if TYPE_CHECKING:
-    from mipac.manager.client import ClientActions
+    from mipac.manager.client import ClientManager
 
 __all__ = ('DriveActions', 'FileActions', 'FolderActions')
 
@@ -21,10 +21,10 @@ class FileActions(AbstractAction):
         file_id: str | None = None,
         *,
         session: HTTPClient,
-        client: ClientActions
+        client: ClientManager
     ) -> None:
         self.__session: HTTPClient = session
-        self.__client: ClientActions = client
+        self.__client: ClientManager = client
         self.__file_id = file_id
 
     async def show_file(self, file_id: str | None, url: str | None) -> File:
@@ -172,11 +172,11 @@ class FolderActions(AbstractAction):
         folder_id: str | None = None,
         *,
         session: HTTPClient,
-        client: ClientActions
+        client: ClientManager
     ):
         self.__folder_id = folder_id
         self.__session: HTTPClient = session
-        self.__client: ClientActions = client
+        self.__client: ClientManager = client
 
     async def create(self, name: str, parent_id: str | None = None) -> bool:
         """
@@ -269,9 +269,9 @@ class FolderActions(AbstractAction):
 
 
 class DriveActions(AbstractAction):
-    def __init__(self, session: HTTPClient, client: ClientActions):
+    def __init__(self, session: HTTPClient, client: ClientManager):
         self.__session: HTTPClient = session
-        self.__client: ClientActions = client
+        self.__client: ClientManager = client
 
     async def get_folders(
         self,

mipac/actions/favorite.py

@@ -7,7 +7,7 @@ from mipac.http import Route
 
 if TYPE_CHECKING:
     from mipac.http import HTTPClient
-    from mipac.manager.client import ClientActions
+    from mipac.manager.client import ClientManager
 
 
 class FavoriteActions(AbstractAction):
@@ -16,11 +16,11 @@ class FavoriteActions(AbstractAction):
         note_id: str | None = None,
         *,
         session: HTTPClient,
-        client: ClientActions
+        client: ClientManager
     ):
         self.__note_id: str | None = note_id
         self.__session: HTTPClient = session
-        self.__client: ClientActions = client
+        self.__client: ClientManager = client
 
     async def add(self, note_id: str | None = None) -> bool:
         note_id = note_id or self.__note_id

mipac/actions/follow.py

@@ -10,7 +10,7 @@ from mipac.types.follow import IFollowRequest
 
 if TYPE_CHECKING:
     from mipac.http import HTTPClient
-    from mipac.manager.client import ClientActions
+    from mipac.manager.client import ClientManager
     from mipac.types.user import ILiteUser
 
 
@@ -20,7 +20,7 @@ class FollowActions(AbstractAction):
         user_id: str | None = None,
         *,
         session: HTTPClient,
-        client: ClientActions
+        client: ClientManager
     ):
         self.__user_id: str | None = user_id
         self.__session = session
@@ -90,7 +90,7 @@ class FollowRequestActions(AbstractAction):
         user_id: str | None = None,
         *,
         session: HTTPClient,
-        client: ClientActions
+        client: ClientManager
     ):
         self.__user_id: str | None = user_id
         self.__session = session

mipac/actions/mute.py

@@ -10,7 +10,7 @@ from mipac.types.mute import IMuteUser
 from mipac.util import remove_dict_empty
 
 if TYPE_CHECKING:
-    from mipac.manager.client import ClientActions
+    from mipac.manager.client import ClientManager
 
 
 class MuteActions(AbstractAction):
@@ -19,11 +19,11 @@ class MuteActions(AbstractAction):
         user_id: str | None = None,
         *,
         session: HTTPClient,
-        client: ClientActions
+        client: ClientManager
     ):
         self._user_id: str | None = user_id
         self._session: HTTPClient = session
-        self._client: ClientActions = client
+        self._client: ClientManager = client
 
     async def add(self, user_id: str | None = None) -> bool:
         """

mipac/actions/my.py

@@ -8,11 +8,11 @@ from mipac.models.follow import FollowRequest
 from mipac.types.follow import IFollowRequest
 
 if TYPE_CHECKING:
-    from mipac.manager.client import ClientActions
+    from mipac.manager.client import ClientManager
 
 
 class MyActions(AbstractAction):
-    def __init__(self, session: HTTPClient, client: ClientActions):
+    def __init__(self, session: HTTPClient, client: ClientManager):
         self.__session = session
         self.__client = client
 

mipac/actions/note.py

@@ -23,7 +23,7 @@ from mipac.types.note import (
 from mipac.util import cache, check_multi_arg, remove_dict_empty
 
 if TYPE_CHECKING:
-    from mipac.client import ClientActions
+    from mipac.client import ClientManager
 
 __all__ = ['NoteActions']
 
@@ -93,11 +93,11 @@ class ClientNoteActions(AbstractAction):
         note_id: str | None = None,
         *,
         session: HTTPClient,
-        client: ClientActions,
+        client: ClientManager,
     ):
         self._note_id: str | None = note_id
         self._session: HTTPClient = session
-        self._client: ClientActions = client
+        self._client: ClientManager = client
 
     async def un_renote(self, note_id: str | None = None) -> bool:
         """
@@ -398,7 +398,7 @@ class NoteActions(ClientNoteActions):
         note_id: str | None = None,
         *,
         session: HTTPClient,
-        client: ClientActions,
+        client: ClientManager,
     ):
 
         super().__init__(note_id=note_id, session=session, client=client)

mipac/actions/poll.py

@@ -9,7 +9,7 @@ from mipac.models.note import Note
 from mipac.types.note import INote
 
 if TYPE_CHECKING:
-    from mipac.manager.client import ClientActions
+    from mipac.manager.client import ClientManager
 
 
 class PollActions(AbstractAction):
@@ -18,11 +18,11 @@ class PollActions(AbstractAction):
         note_id: str | None = None,
         *,
         session: HTTPClient,
-        client: ClientActions
+        client: ClientManager
     ):
         self.__note_id: str | None = note_id
         self.__session: HTTPClient = session
-        self.__client: ClientActions = client
+        self.__client: ClientManager = client
 
     async def vote(self, choice: int, note_id: str | None = None) -> bool:
         note_id = note_id or self.__note_id

mipac/actions/reaction.py

@@ -14,7 +14,7 @@ from mipac.util import remove_dict_empty
 
 if TYPE_CHECKING:
     from mipac.http import HTTPClient
-    from mipac.manager.client import ClientActions
+    from mipac.manager.client import ClientManager
 
 
 class ReactionActions(AbstractAction):
@@ -23,11 +23,11 @@ class ReactionActions(AbstractAction):
         note_id: str | None = None,
         *,
         session: HTTPClient,
-        client: ClientActions
+        client: ClientManager
     ):
         self.__note_id: str | None = note_id
         self.__session: HTTPClient = session
-        self.__client: ClientActions = client
+        self.__client: ClientManager = client
 
     async def add(self, reaction: str, note_id: str | None = None) -> bool:
         """

mipac/actions/user.py

@@ -8,7 +8,7 @@ from mipac.models.user import LiteUser, UserDetailed
 from mipac.util import cache, check_multi_arg, remove_dict_empty
 
 if TYPE_CHECKING:
-    from mipac.manager.client import ClientActions
+    from mipac.manager.client import ClientManager
     from mipac.models.note import Note
 
 __all__ = ['UserActions']
@@ -18,12 +18,12 @@ class UserActions:
     def __init__(
         self,
         session: HTTPClient,
-        client: ClientActions,
+        client: ClientManager,
         user: Optional[LiteUser] = None,
     ):
         self.__session: HTTPClient = session
         self.__user: Optional[LiteUser] = user
-        self.__client: ClientActions = client
+        self.__client: ClientManager = client
 
     async def get_me(self) -> UserDetailed:
         """

mipac/client.py

@@ -1,6 +1,6 @@
 from mipac.config import Config, config
 from mipac.http import HTTPClient
-from mipac.manager.client import ClientActions
+from mipac.manager.client import ClientManager
 
 
 class Client:
@@ -11,8 +11,8 @@ class Client:
         self.http: HTTPClient = HTTPClient(url, token)
 
     @property
-    def api(self) -> ClientActions:
-        return ClientActions(self.http, self.config)
+    def api(self) -> ClientManager:
+        return ClientManager(self.http, self.config)
 
     async def close_session(self) -> None:
         await self.http.close_session()

mipac/manager/ad.py

@@ -6,15 +6,15 @@ from mipac.abstract.manager import AbstractManager
 from mipac.http import HTTPClient, Route
 
 if TYPE_CHECKING:
-    from mipac.client import ClientActions
+    from mipac.client import ClientManager
 
 __all__ = ('AdminAdvertisingManager',)
 
 
 class AdminAdvertisingManager(AbstractManager):
-    def __init__(self, *, session: HTTPClient, client: ClientActions):
+    def __init__(self, *, session: HTTPClient, client: ClientManager):
         self.__session: HTTPClient = session
-        self.__client: ClientActions = client
+        self.__client: ClientManager = client
 
     async def create(
         self,

mipac/manager/admins/admin.py

@@ -11,13 +11,13 @@ from mipac.manager.admins.moderator import AdminModeratorManager
 from mipac.manager.admins.user import AdminUserManager
 
 if TYPE_CHECKING:
-    from mipac.client import ClientActions
+    from mipac.client import ClientManager
 
 
 class AdminManager(AbstractManager):
-    def __init__(self, session: HTTPClient, client: ClientActions):
+    def __init__(self, session: HTTPClient, client: ClientManager):
         self.__session: HTTPClient = session
-        self.__client: ClientActions = client
+        self.__client: ClientManager = client
         self.emoji = AdminEmojiManager(session=session, client=client)
         self.user = AdminUserManager(session=session, client=client)
         self.ad = AdminAdvertisingManager(session=session, client=client)

mipac/manager/admins/emoji.py

@@ -7,13 +7,13 @@ from mipac.actions.admins.emoji import AdminEmojiActions
 from mipac.http import HTTPClient
 
 if TYPE_CHECKING:
-    from mipac.client import ClientActions
+    from mipac.client import ClientManager
 
 
 class AdminEmojiManager(AbstractManager):
-    def __init__(self, session: HTTPClient, client: ClientActions):
+    def __init__(self, session: HTTPClient, client: ClientManager):
         self.__session: HTTPClient = session
-        self.__client: ClientActions = client
+        self.__client: ClientManager = client
 
     @property
     def action(self) -> AdminEmojiActions:

mipac/manager/admins/moderator.py

@@ -7,7 +7,7 @@ from mipac.actions.admins.moderator import AdminModeratorActions
 from mipac.http import HTTPClient
 
 if TYPE_CHECKING:
-    from mipac.client import ClientActions
+    from mipac.client import ClientManager
 
 __all__ = ('AdminModeratorManager',)
 
@@ -18,11 +18,11 @@ class AdminModeratorManager(AbstractManager):
         user_id: str | None = None,
         *,
         session: HTTPClient,
-        client: ClientActions
+        client: ClientManager
     ):
         self.__user_id: str | None = user_id
         self.__session: HTTPClient = session
-        self.__client: ClientActions = client
+        self.__client: ClientManager = client
 
     @property
     def action(self) -> AdminModeratorActions:

mipac/manager/admins/user.py

@@ -5,7 +5,7 @@ from typing import TYPE_CHECKING
 from mipac.http import HTTPClient, Route
 
 if TYPE_CHECKING:
-    from mipac.client import ClientActions
+    from mipac.client import ClientManager
     from mipac.models.user import UserDetailed
 
 
@@ -15,11 +15,11 @@ class AdminUserManager:
         user_id: str | None = None,
         *,
         session: HTTPClient,
-        client: ClientActions
+        client: ClientManager
     ):
         self.__user_id = user_id
         self.__session: HTTPClient = session
-        self.__client: ClientActions = client
+        self.__client: ClientManager = client
 
     async def delete_account(self, user_id: str | None = None) -> bool:
         """

mipac/manager/chart.py

@@ -6,16 +6,16 @@ from mipac.abstract.manager import AbstractManager
 from mipac.actions.chart import ChartActions
 
 if TYPE_CHECKING:
-    from mipac.client import ClientActions
+    from mipac.client import ClientManager
     from mipac.http import HTTPClient
 
 __all__ = ('ChartManager',)
 
 
 class ChartManager(AbstractManager):
-    def __init__(self, *, session: HTTPClient, client: ClientActions):
+    def __init__(self, *, session: HTTPClient, client: ClientManager):
         self.__session: HTTPClient = session
-        self.__client: ClientActions = client
+        self.__client: ClientManager = client
 
     @property
     def action(self) -> ChartActions:

mipac/manager/chat.py

@@ -6,17 +6,17 @@ from mipac.actions.chat import BaseChatAction, ChatAction
 from mipac.http import HTTPClient
 
 if TYPE_CHECKING:
-    from mipac.manager.client import ClientActions
+    from mipac.manager.client import ClientManager
 
 __all__ = ('ChatManager',)
 
 
 class ChatManager:
     def __init__(
-        self, session: HTTPClient, client: ClientActions,
+        self, session: HTTPClient, client: ClientManager,
     ):
         self.__session: HTTPClient = session
-        self.__client: ClientActions = client
+        self.__client: ClientManager = client
 
     @property
     def action(self) -> ChatAction:

mipac/manager/client.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 from typing import TYPE_CHECKING
+from mipac.actions.client import ClientActions
 
 from mipac.http import HTTPClient
 from mipac.manager.admins.admin import AdminManager
@@ -18,10 +19,10 @@ if TYPE_CHECKING:
     from mipac.models.user import UserDetailed
 
 
-__all__ = ('ClientActions',)
+__all__ = ('ClientManager',)
 
 
-class ClientActions:
+class ClientManager:
     def __init__(self, session: HTTPClient, config: Config):
         self.__session: HTTPClient = session
         self.i = MyManager(session=session, client=self)
@@ -39,6 +40,10 @@ class ClientActions:
         )
         self._config: Config = config
 
+    @property
+    def action(self) -> ClientActions:
+        return ClientActions(session=self.__session, client=self)
+
     def _create_user_instance(self, user: LiteUser) -> UserManager:
         return UserManager(session=self.__session, client=self, user=user)
 

mipac/manager/drive.py

@@ -7,7 +7,7 @@ from mipac.actions.drive import DriveActions, FileActions, FolderActions
 from mipac.http import HTTPClient
 
 if TYPE_CHECKING:
-    from mipac.client import ClientActions
+    from mipac.client import ClientManager
 
 __all__ = ['FolderManager', 'FileManager', 'DriveManager']
 
@@ -18,10 +18,10 @@ class FileManager(AbstractManager):
         file_id: str | None = None,
         *,
         session: HTTPClient,
-        client: ClientActions
+        client: ClientManager
     ):
         self.__session: HTTPClient = session
-        self.__client: ClientActions = client
+        self.__client: ClientManager = client
         self.__file_id = file_id
 
     @property
@@ -47,11 +47,11 @@ class FolderManager(AbstractManager):
         folder_id: str | None = None,
         *,
         session: HTTPClient,
-        client: ClientActions
+        client: ClientManager
     ):
         self.__folder_id = folder_id
         self.__session: HTTPClient = session
-        self.__client: ClientActions = client
+        self.__client: ClientManager = client
         self.file: FileManager = FileManager(session=session, client=client)
 
     @property
@@ -77,9 +77,9 @@ class FolderManager(AbstractManager):
 
 
 class DriveManager(AbstractManager):
-    def __init__(self, *, session: HTTPClient, client: ClientActions):
+    def __init__(self, *, session: HTTPClient, client: ClientManager):
         self.__session: HTTPClient = session
-        self.__client: ClientActions = client
+        self.__client: ClientManager = client
         self.folder: FolderManager = FolderManager(
             session=session, client=client
         )

mipac/manager/favorite.py

@@ -7,7 +7,7 @@ from mipac.actions.favorite import FavoriteActions
 from mipac.http import HTTPClient
 
 if TYPE_CHECKING:
-    from mipac.client import ClientActions
+    from mipac.client import ClientManager
 
 
 class FavoriteManager(AbstractManager):
@@ -16,11 +16,11 @@ class FavoriteManager(AbstractManager):
         note_id: str | None = None,
         *,
         session: HTTPClient,
-        client: ClientActions
+        client: ClientManager
     ):
         self.__note_id = note_id
         self.__session: HTTPClient = session
-        self.__client: ClientActions = client
+        self.__client: ClientManager = client
 
     @property
     def action(self) -> FavoriteActions:

mipac/manager/follow.py

@@ -7,7 +7,7 @@ from mipac.actions.follow import FollowActions, FollowRequestActions
 from mipac.http import HTTPClient
 
 if TYPE_CHECKING:
-    from mipac.client import ClientActions
+    from mipac.client import ClientManager
 
 __all__ = ('FollowManager', 'FollowRequestManager')
 
@@ -18,11 +18,11 @@ class FollowManager(AbstractManager):
         user_id: str | None = None,
         *,
         session: HTTPClient,
-        client: ClientActions
+        client: ClientManager
     ):
         self.__user_id: str | None = user_id
         self.__session: HTTPClient = session
-        self.__client: ClientActions = client
+        self.__client: ClientManager = client
         self.request: FollowRequestManager = FollowRequestManager(
             user_id=user_id, session=session, client=client
         )
@@ -42,11 +42,11 @@ class FollowRequestManager(AbstractManager):
         user_id: str | None = None,
         *,
         session: HTTPClient,
-        client: ClientActions
+        client: ClientManager
     ):
         self.__user_id: str | None = user_id
         self.__session: HTTPClient = session
-        self.__client: ClientActions = client
+        self.__client: ClientManager = client
 
     @property
     def action(self) -> FollowRequestActions:

mipac/manager/mute.py

@@ -7,7 +7,7 @@ from mipac.actions.mute import MuteActions
 from mipac.http import HTTPClient
 
 if TYPE_CHECKING:
-    from mipac.manager.client import ClientActions
+    from mipac.manager.client import ClientManager
 
 
 class MuteManager(AbstractManager):
@@ -16,11 +16,11 @@ class MuteManager(AbstractManager):
         user_id: str | None = None,
         *,
         session: HTTPClient,
-        client: ClientActions
+        client: ClientManager
     ) -> None:
         self._user_id: str | None = user_id
         self._session: HTTPClient = session
-        self._client: ClientActions = client
+        self._client: ClientManager = client
 
     @property
     def action(self) -> MuteActions:

mipac/manager/my.py

@@ -7,11 +7,11 @@ from mipac.actions.my import MyActions
 from mipac.http import HTTPClient
 
 if TYPE_CHECKING:
-    from mipac.manager.client import ClientActions
+    from mipac.manager.client import ClientManager
 
 
 class MyManager(AbstractManager):
-    def __init__(self, *, session: HTTPClient, client: ClientActions):
+    def __init__(self, *, session: HTTPClient, client: ClientManager):
         self.__session = session
         self.__client = client
 

mipac/manager/note.py

@@ -10,7 +10,7 @@ from mipac.manager.poll import PollManager
 from mipac.manager.reaction import ReactionManager
 
 if TYPE_CHECKING:
-    from mipac.manager.client import ClientActions
+    from mipac.manager.client import ClientManager
 
 
 class ClientNoteManager(AbstractManager):
@@ -19,11 +19,11 @@ class ClientNoteManager(AbstractManager):
         note_id: str | None = None,
         *,
         session: HTTPClient,
-        client: ClientActions
+        client: ClientManager
     ):
         self.__note_id = note_id
         self.__session: HTTPClient = session
-        self.__client: ClientActions = client
+        self.__client: ClientManager = client
         self.reaction: ReactionManager = ReactionManager(
             note_id=note_id, session=session, client=client
         )
@@ -51,11 +51,11 @@ class NoteManager(AbstractManager):
         note_id: str | None = None,
         *,
         session: HTTPClient,
-        client: ClientActions
+        client: ClientManager
     ):
         self.__note_id: str | None = note_id
         self.__session: HTTPClient = session
-        self.__client: ClientActions = client
+        self.__client: ClientManager = client
         self.reaction: ReactionManager = ReactionManager(
             note_id=note_id, session=session, client=client
         )

mipac/manager/page.py

@@ -6,13 +6,13 @@ from mipac.abstract.manager import AbstractManager
 from mipac.http import HTTPClient, Route
 
 if TYPE_CHECKING:
-    from mipac.client import ClientActions
+    from mipac.client import ClientManager
 
 
 class PagesManager(AbstractManager):
-    def __init__(self, *, session: HTTPClient, client: ClientActions):
+    def __init__(self, *, session: HTTPClient, client: ClientManager):
         self.__session: HTTPClient = session
-        self.__client: ClientActions = client
+        self.__client: ClientManager = client
 
     async def get_pages(
         self,

mipac/manager/poll.py

@@ -7,7 +7,7 @@ from mipac.actions.poll import PollActions
 
 if TYPE_CHECKING:
     from mipac.http import HTTPClient
-    from mipac.manager.client import ClientActions
+    from mipac.manager.client import ClientManager
 
 
 class PollManager(AbstractManager):
@@ -16,11 +16,11 @@ class PollManager(AbstractManager):
         note_id: str | None = None,
         *,
         session: HTTPClient,
-        client: ClientActions
+        client: ClientManager
     ):
         self.__note_id: str | None = note_id
         self.__session: HTTPClient = session
-        self.__client: ClientActions = client
+        self.__client: ClientManager = client
 
     @property
     def action(self) -> PollActions:

mipac/manager/reaction.py

@@ -7,7 +7,7 @@ from mipac.actions.reaction import ReactionActions
 from mipac.http import HTTPClient
 
 if TYPE_CHECKING:
-    from mipac.client import ClientActions
+    from mipac.client import ClientManager
 
 
 class ReactionManager(AbstractManager):
@@ -16,11 +16,11 @@ class ReactionManager(AbstractManager):
         note_id: str | None = None,
         *,
         session: HTTPClient,
-        client: ClientActions
+        client: ClientManager
     ):
         self.__note_id: str | None = note_id
         self.__session: HTTPClient = session
-        self.__client: ClientActions = client
+        self.__client: ClientManager = client
 
     @property
     def action(self) -> ReactionActions:

mipac/manager/user.py

@@ -9,7 +9,7 @@ from mipac.manager.follow import FollowManager
 from mipac.manager.mute import MuteManager
 
 if TYPE_CHECKING:
-    from mipac.manager.client import ClientActions
+    from mipac.manager.client import ClientManager
     from mipac.models.lite.user import LiteUser
 
 
@@ -22,11 +22,11 @@ class UserManager(AbstractManager):
         user: LiteUser | None = None,
         *,
         session: HTTPClient,
-        client: ClientActions
+        client: ClientManager
     ):
         user_id: str | None = user.id if user else None
         self.__session: HTTPClient = session
-        self.__client: ClientActions = client
+        self.__client: ClientManager = client
         self.user: LiteUser | None = user
         self.follow: FollowManager = FollowManager(
             user_id=user_id, session=session, client=client

mipac/models/channel.py

@@ -5,13 +5,13 @@ from typing import TYPE_CHECKING
 from mipac.types.channel import IChannel
 
 if TYPE_CHECKING:
-    from mipac.manager import ClientActions
+    from mipac.manager import ClientManager
 
 
 class Channel:
-    def __init__(self, channel: IChannel, *, client: ClientActions) -> None:
+    def __init__(self, channel: IChannel, *, client: ClientManager) -> None:
         self.__channel: IChannel = channel
-        self.__client: ClientActions = client
+        self.__client: ClientManager = client
 
     @property
     def id(self) -> str:

mipac/models/chat.py

@@ -7,16 +7,16 @@ from mipac.models.lite.user import LiteUser
 
 if TYPE_CHECKING:
     from mipac.actions.chat import BaseChatAction
-    from mipac.manager.client import ClientActions
+    from mipac.manager.client import ClientManager
     from mipac.types.chat import IChatGroup, IChatMessage
 
 __all__ = ['ChatGroup', 'ChatMessage']
 
 
 class ChatGroup:
-    def __init__(self, group: IChatGroup, *, client: ClientActions):
+    def __init__(self, group: IChatGroup, *, client: ClientManager):
         self.__group: IChatGroup = group
-        self.__client: ClientActions = client
+        self.__client: ClientManager = client
 
     @property
     def id(self) -> str:
@@ -48,9 +48,9 @@ class ChatMessage:
     チャットオブジェクト
     """
 
-    def __init__(self, chat: IChatMessage, *, client: ClientActions):
+    def __init__(self, chat: IChatMessage, *, client: ClientManager):
         self.__chat: IChatMessage = chat
-        self.__client: ClientActions = client
+        self.__client: ClientManager = client
 
     @property
     def id(self) -> str:

mipac/models/drive.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 from typing import TYPE_CHECKING, Any
 
 if TYPE_CHECKING:
-    from mipac.manager.client import ClientActions
+    from mipac.manager.client import ClientManager
     from mipac.types import FolderPayload, IDriveFile, IFileProperties
 
 __all__ = ['FileProperties', 'File', 'Folder']
@@ -27,9 +27,9 @@ class FileProperties:
 
 
 class Folder:
-    def __init__(self, folder: FolderPayload, client: ClientActions):
+    def __init__(self, folder: FolderPayload, client: ClientManager):
         self.__folder: FolderPayload = folder
-        self.__client: ClientActions = client
+        self.__client: ClientManager = client
 
     @property
     def id(self) -> str:
@@ -66,9 +66,9 @@ class Folder:
 
 
 class File:
-    def __init__(self, file: IDriveFile, *, client: ClientActions):
+    def __init__(self, file: IDriveFile, *, client: ClientManager):
         self.__file: IDriveFile = file
-        self.__client: ClientActions = client
+        self.__client: ClientManager = client
 
     @property
     def id(self) -> str:

mipac/models/emoji.py

@@ -6,7 +6,7 @@ from mipac.models.lite.emoji import PartialCustomEmoji
 from mipac.types.emoji import ICustomEmoji
 
 if TYPE_CHECKING:
-    from mipac.client import ClientActions
+    from mipac.client import ClientManager
 
 __all__ = ('CustomEmoji',)
 
@@ -25,7 +25,7 @@ class CustomEmoji(PartialCustomEmoji):
         絵文字のホスト
     """
 
-    def __init__(self, emoji: ICustomEmoji, *, client: ClientActions):
+    def __init__(self, emoji: ICustomEmoji, *, client: ClientManager):
         super().__init__(emoji, client=client)
         self.__emoji: ICustomEmoji = emoji
 

mipac/models/follow.py

@@ -6,13 +6,13 @@ from mipac.models.lite.user import LiteUser
 from mipac.types.follow import IFollowRequest
 
 if TYPE_CHECKING:
-    from mipac.manager.client import ClientActions
+    from mipac.manager.client import ClientManager
     from mipac.manager.follow import FollowRequestManager
 
 
 class FollowRequest:
     def __init__(
-        self, follow_request: IFollowRequest, *, client: ClientActions
+        self, follow_request: IFollowRequest, *, client: ClientManager
     ) -> None:
         self.__follow_request = follow_request
         self.__client = client

mipac/models/instance.py

@@ -5,15 +5,15 @@ from typing import TYPE_CHECKING
 from mipac.types.instance import IFederationInstance
 
 if TYPE_CHECKING:
-    from mipac.client import ClientActions
+    from mipac.client import ClientManager
 
 
 class FederationInstance:
     def __init__(
-        self, instance: IFederationInstance, *, client: ClientActions
+        self, instance: IFederationInstance, *, client: ClientManager
     ) -> None:
         self.__instance: IFederationInstance = instance
-        self.__client: ClientActions = client
+        self.__client: ClientManager = client
 
     @property
     def id(self) -> str:

mipac/models/lite/emoji.py

@@ -5,15 +5,15 @@ from mipac.types.emoji import ICustomEmojiLite
 from mipac.config import config
 
 if TYPE_CHECKING:
-    from mipac.manager.client import ClientActions
+    from mipac.manager.client import ClientManager
 
 
 class PartialCustomEmoji:
     def __init__(
-        self, emoji: ICustomEmojiLite, *, client: ClientActions
+        self, emoji: ICustomEmojiLite, *, client: ClientManager
     ) -> None:
         self.__emoji = emoji
-        self.__client: ClientActions = client
+        self.__client: ClientManager = client
 
     @property
     def name(self) -> str:

mipac/models/lite/meta.py

@@ -12,7 +12,7 @@ from mipac.types.meta import (
 )
 
 if TYPE_CHECKING:
-    from mipac.manager.client import ClientActions
+    from mipac.manager.client import ClientManager
 
 
 class CPU:
@@ -30,7 +30,7 @@ class CPU:
 
 class MetaCommon:
     def __init__(
-        self, meta_common: IMetaCommon, *, client: ClientActions
+        self, meta_common: IMetaCommon, *, client: ClientManager
     ) -> None:
         self.__meta_common: IMetaCommon = meta_common
         self.__client = client
@@ -151,7 +151,7 @@ class MetaCommon:
 
 
 class LiteMeta(MetaCommon):
-    def __init__(self, meta: ILiteMeta, *, client: ClientActions) -> None:
+    def __init__(self, meta: ILiteMeta, *, client: ClientManager) -> None:
         super().__init__(meta, client=client)
 
         self.__lite_meta: ILiteMeta = meta

mipac/models/lite/user.py

@@ -8,16 +8,16 @@ from mipac.types.user import ILiteUser
 from mipac.util import deprecated
 
 if TYPE_CHECKING:
-    from mipac.manager.client import ClientActions
+    from mipac.manager.client import ClientManager
     from mipac.manager.user import UserManager
 
 
 class LiteUser:
     __slots__ = ('__user', '__client')
 
-    def __init__(self, user: ILiteUser, *, client: ClientActions) -> None:
+    def __init__(self, user: ILiteUser, *, client: ClientManager) -> None:
         self.__user: ILiteUser = user
-        self.__client: ClientActions = client
+        self.__client: ClientManager = client
 
     @property
     def id(self) -> str:

mipac/models/meta.py

@@ -10,7 +10,7 @@ from mipac.types.meta import (
 )
 
 if TYPE_CHECKING:
-    from mipac.manager.client import ClientActions
+    from mipac.manager.client import ClientManager
 
 
 class Policies:
@@ -140,7 +140,7 @@ class Features:
 
 
 class Meta(LiteMeta):
-    def __init__(self, meta: IMeta, *, client: ClientActions) -> None:
+    def __init__(self, meta: IMeta, *, client: ClientManager) -> None:
         super().__init__(meta, client=client)
         self.__meta = meta
 
@@ -175,7 +175,7 @@ class Meta(LiteMeta):
 
 class AdminMeta(MetaCommon):
     def __init__(
-        self, admin_meta: IAdminMeta, *, client: ClientActions
+        self, admin_meta: IAdminMeta, *, client: ClientManager
     ) -> None:
         super().__init__(admin_meta, client=client)
         self.__admin_meta = admin_meta

mipac/models/mute.py

@@ -6,13 +6,13 @@ from mipac.models.user import UserDetailed
 from mipac.types.mute import IMuteUser
 
 if TYPE_CHECKING:
-    from mipac.manager.client import ClientActions
+    from mipac.manager.client import ClientManager
 
 
 class MuteUser:
-    def __init__(self, data: IMuteUser, *, client: ClientActions) -> None:
+    def __init__(self, data: IMuteUser, *, client: ClientManager) -> None:
         self.__data: IMuteUser = data
-        self.__client: ClientActions = client
+        self.__client: ClientManager = client
 
     @property
     def id(self) -> str:

mipac/models/note.py

@@ -15,7 +15,7 @@ from mipac.types.note import (
 from mipac.util import str_to_datetime
 
 if TYPE_CHECKING:
-    from mipac.manager.client import ClientActions
+    from mipac.manager.client import ClientManager
     from mipac.manager.note import ClientNoteManager
     from mipac.models.user import UserDetailed
     from mipac.types.drive import IDriveFile
@@ -116,9 +116,9 @@ class Header:
 class NoteReaction:
     __slots__ = ('__reaction', '__client')
 
-    def __init__(self, reaction: INoteReaction, *, client: ClientActions):
+    def __init__(self, reaction: INoteReaction, *, client: ClientManager):
         self.__reaction: INoteReaction = reaction
-        self.__client: ClientActions = client
+        self.__client: ClientManager = client
 
     @property
     def id(self) -> str | None:
@@ -151,12 +151,12 @@ class Note:
     ----------
     note: INote
         アクションを持たないNoteクラス
-    client: ClientActions
+    client: ClientManager
     """
 
-    def __init__(self, note: INote, client: ClientActions):
+    def __init__(self, note: INote, client: ClientManager):
         self.__note = note
-        self._client: ClientActions = client
+        self._client: ClientManager = client
 
     @property
     def id(self) -> str:

mipac/models/notification.py

@@ -7,7 +7,7 @@ from mipac.models.lite.user import LiteUser
 from mipac.models.note import Note
 
 if TYPE_CHECKING:
-    from mipac.manager.client import ClientActions
+    from mipac.manager.client import ClientManager
     from mipac.manager.follow import FollowManager, FollowRequestManager
     from mipac.types.notification import (
         INotification,
@@ -20,10 +20,10 @@ if TYPE_CHECKING:
 
 class Notification:
     def __init__(
-        self, notification: INotification, *, client: ClientActions,
+        self, notification: INotification, *, client: ClientManager,
     ) -> None:
         self.__notification: INotification = notification
-        self.__client: ClientActions = client
+        self.__client: ClientManager = client
 
     @property
     def id(self) -> str:
@@ -46,11 +46,11 @@ class Notification:
 
 class NotificationFollow(Notification):
     def __init__(
-        self, notification: IUserNf, *, client: ClientActions,
+        self, notification: IUserNf, *, client: ClientManager,
     ) -> None:
         super().__init__(notification, client=client)
         self.__notification: IUserNf = notification
-        self.__client: ClientActions = client
+        self.__client: ClientManager = client
 
     @property
     def user(self) -> LiteUser:
@@ -67,11 +67,11 @@ class NotificationFollow(Notification):
 
 class NotificationFollowRequest(Notification):
     def __init__(
-        self, notification: IUserNf, *, client: ClientActions,
+        self, notification: IUserNf, *, client: ClientManager,
     ) -> None:
         super().__init__(notification, client=client)
         self.__notification: IUserNf = notification
-        self.__client: ClientActions = client
+        self.__client: ClientManager = client
 
     @property
     def user(self) -> LiteUser:
@@ -90,11 +90,11 @@ class NotificationFollowRequest(Notification):
 
 class NotificationNote(Notification):
     def __init__(
-        self, notification: INoteNf, *, client: ClientActions,
+        self, notification: INoteNf, *, client: ClientManager,
     ) -> None:
         super().__init__(notification, client=client)
         self.__notification: INoteNf = notification
-        self.__client: ClientActions = client
+        self.__client: ClientManager = client
 
     @property
     def user(self) -> LiteUser:
@@ -111,11 +111,11 @@ class NotificationNote(Notification):
 
 class NotificationPollEnd(Notification):
     def __init__(
-        self, notification: IPollEndNf, *, client: ClientActions,
+        self, notification: IPollEndNf, *, client: ClientManager,
     ) -> None:
         super().__init__(notification, client=client)
         self.__notification: IPollEndNf = notification
-        self.__client: ClientActions = client
+        self.__client: ClientManager = client
 
     @property
     def note(self) -> Note:
@@ -124,11 +124,11 @@ class NotificationPollEnd(Notification):
 
 class NotificationReaction(Notification):
     def __init__(
-        self, reaction: IReactionNf, *, client: ClientActions
+        self, reaction: IReactionNf, *, client: ClientManager
     ) -> None:
         super().__init__(reaction, client=client)
         self.__notification: IReactionNf = reaction
-        self.__client: ClientActions = client
+        self.__client: ClientManager = client
 
     @property
     def user(self) -> LiteUser:

mipac/models/poll.py

@@ -5,7 +5,7 @@ from typing import TYPE_CHECKING
 from mipac.types.poll import ICreatePoll, IPoll, IPollChoice
 
 if TYPE_CHECKING:
-    from mipac.manager import ClientActions
+    from mipac.manager import ClientManager
 
 
 class MiPoll:
@@ -17,9 +17,9 @@ class MiPoll:
 
 
 class PollChoice:
-    def __init__(self, choice: IPollChoice, *, client: ClientActions):
+    def __init__(self, choice: IPollChoice, *, client: ClientManager):
         self.__choice: IPollChoice = choice
-        self.__client: ClientActions = client
+        self.__client: ClientManager = client
 
     @property
     def is_voted(self) -> bool:
@@ -35,9 +35,9 @@ class PollChoice:
 
 
 class Poll:
-    def __init__(self, poll: IPoll, *, client: ClientActions):
+    def __init__(self, poll: IPoll, *, client: ClientManager):
         self.__poll: IPoll = poll
-        self.__client: ClientActions = client
+        self.__client: ClientManager = client
 
     @property
     def multiple(self) -> bool:

mipac/models/user.py

@@ -8,15 +8,15 @@ from mipac.types.page import IPage
 from mipac.types.user import IFollowRequest, IUserDetailed, IUserDetailedField
 
 if TYPE_CHECKING:
-    from mipac.manager.client import ClientActions
+    from mipac.manager.client import ClientManager
 
 __all__ = ('UserDetailed', 'FollowRequest', 'LiteUser')
 
 
 class FollowRequest:
-    def __init__(self, request: IFollowRequest, *, client: ClientActions):
+    def __init__(self, request: IFollowRequest, *, client: ClientManager):
         self.__request: IFollowRequest = request
-        self.__client: ClientActions = client
+        self.__client: ClientManager = client
 
     @property
     def id(self) -> str:
@@ -37,7 +37,7 @@ class UserDetailed(LiteUser):
         '__client',
     )
 
-    def __init__(self, user: IUserDetailed, *, client: ClientActions):
+    def __init__(self, user: IUserDetailed, *, client: ClientManager):
         super().__init__(user=user, client=client)
         self.__detail = user