From b4327ad5014fe94bb614b7db94155d9c005567b3 Mon Sep 17 00:00:00 2001 From: yupix Date: Fri, 9 Feb 2024 11:59:39 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20ParameterError=20=E3=81=8B=E3=82=89?= =?UTF-8?q?=20ValueError=E3=81=AB=20close=20#119?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mipac/actions/admins/ad.py | 5 ++-- mipac/actions/admins/announcement.py | 3 +- mipac/actions/admins/emoji.py | 6 ++-- mipac/actions/admins/roles.py | 15 +++++----- mipac/actions/antenna.py | 15 +++++----- mipac/actions/channel.py | 11 ++++--- mipac/actions/client.py | 3 +- mipac/actions/clip.py | 13 ++++---- mipac/actions/drive/files.py | 5 ++-- mipac/actions/favorite.py | 5 ++-- mipac/actions/federation.py | 11 ++++--- mipac/actions/note.py | 44 +++++++++++++--------------- mipac/actions/poll.py | 5 ++-- mipac/actions/user.py | 30 +++++++++---------- mipac/actions/users/list.py | 29 +++++++++--------- mipac/actions/users/mute.py | 5 ++-- 16 files changed, 95 insertions(+), 110 deletions(-) diff --git a/mipac/actions/admins/ad.py b/mipac/actions/admins/ad.py index a0870b7..f2199db 100644 --- a/mipac/actions/admins/ad.py +++ b/mipac/actions/admins/ad.py @@ -3,7 +3,6 @@ from __future__ import annotations from typing import TYPE_CHECKING, AsyncGenerator, Literal, override from mipac.abstract.action import AbstractAction -from mipac.errors.base import ParameterError from mipac.http import HTTPClient, Route from mipac.models.ad import Ad from mipac.types.ads import IAd @@ -23,7 +22,7 @@ class AdminAdvertisingModelActions(AbstractAction): ad_id = self._ad_id or id if ad_id is None: - raise ParameterError("ad id is required") + raise ValueError("ad id is required") res: bool = await self._session.request( Route("POST", "/api/admin/ad/delete"), json={"id": ad_id}, auth=True, lower=True ) @@ -45,7 +44,7 @@ class AdminAdvertisingModelActions(AbstractAction): ) -> bool: ad_id = self._ad_id or ad_id if ad_id is None: - raise ParameterError("ad id is required") + raise ValueError("ad id is required") data = { "id": ad_id, "memo": memo or "", diff --git a/mipac/actions/admins/announcement.py b/mipac/actions/admins/announcement.py index 929ffe1..f861d2f 100644 --- a/mipac/actions/admins/announcement.py +++ b/mipac/actions/admins/announcement.py @@ -3,7 +3,6 @@ from __future__ import annotations 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.announcement import Announcement, AnnouncementDetailed from mipac.types.announcement import IAnnouncement, IAnnouncementDetailed @@ -87,7 +86,7 @@ class AdminAnnouncementActions(AdminAnnouncementClientActions): get_all: bool = False, ) -> AsyncGenerator[AnnouncementDetailed, None]: if limit > 100: - raise ParameterError("limitは100以下である必要があります") + raise ValueError("limitは100以下である必要があります") if get_all: limit = 100 diff --git a/mipac/actions/admins/emoji.py b/mipac/actions/admins/emoji.py index 45b11d2..2a96efe 100644 --- a/mipac/actions/admins/emoji.py +++ b/mipac/actions/admins/emoji.py @@ -3,7 +3,7 @@ from __future__ import annotations from typing import TYPE_CHECKING, AsyncGenerator from mipac.abstract.action import AbstractAction -from mipac.errors.base import NotExistRequiredData, ParameterError +from mipac.errors.base import NotExistRequiredData from mipac.http import Route from mipac.models.emoji import CustomEmoji from mipac.types.emoji import ICustomEmoji @@ -66,7 +66,7 @@ class AdminEmojiActions(AbstractAction): get_all: bool = True, ) -> AsyncGenerator[CustomEmoji, None]: if limit > 100: - raise ParameterError("limitは100以下である必要があります") + raise ValueError("limitは100以下である必要があります") if get_all: limit = 100 @@ -100,7 +100,7 @@ class AdminEmojiActions(AbstractAction): get_all: bool = True, ) -> AsyncGenerator[CustomEmoji, None]: if limit > 100: - raise ParameterError("limitは100以下である必要があります") + raise ValueError("limitは100以下である必要があります") if get_all: limit = 100 diff --git a/mipac/actions/admins/roles.py b/mipac/actions/admins/roles.py index 65d1db8..3114a6d 100644 --- a/mipac/actions/admins/roles.py +++ b/mipac/actions/admins/roles.py @@ -3,7 +3,6 @@ from __future__ import annotations from typing import TYPE_CHECKING, Any, AsyncGenerator, Literal from mipac.abstract.action import AbstractAction -from mipac.errors.base import ParameterError from mipac.http import Route from mipac.models.roles import Role, RoleUser from mipac.types.meta import IPolicies @@ -39,7 +38,7 @@ class AdminRoleModelActions(AbstractAction): ) -> bool: role_id = self._role_id or role_id if role_id is None: - raise ParameterError("role_idは必須です") + raise ValueError("role_idは必須です") body = { "roleId": role_id, "name": name, @@ -67,7 +66,7 @@ class AdminRoleModelActions(AbstractAction): async def delete(self, role_id: str | None = None) -> bool: role_id = self._role_id or role_id if role_id is None: - raise ParameterError("role_idは必須です") + raise ValueError("role_idは必須です") res: bool = await self._session.request( Route("POST", "/api/admin/roles/delete"), auth=True, @@ -96,7 +95,7 @@ class AdminRoleModelActions(AbstractAction): 成功したか否か """ if role_id is None: - raise ParameterError("role_idは必須です") + raise ValueError("role_idは必須です") body = {"roleId": role_id, "userId": user_id, "expiresAt": expires_at} res: bool = await self._session.request( Route("POST", "/api/admin/roles/assign"), auth=True, json=body @@ -122,7 +121,7 @@ class AdminRoleModelActions(AbstractAction): """ role_id = self._role_id or role_id if role_id is None: - raise ParameterError("role_idは必須です") + raise ValueError("role_idは必須です") body = {"roleId": role_id, "userId": user_id} res: bool = await self._session.request( Route("POST", "/api/admin/roles/unassign"), auth=True, json=body @@ -132,7 +131,7 @@ class AdminRoleModelActions(AbstractAction): async def show(self, role_id: str | None = None) -> Role: role_id = self._role_id or role_id if role_id is None: - raise ParameterError("role_idは必須です") + raise ValueError("role_idは必須です") res: IRole = await self._session.request( Route("POST", "/api/admin/roles/show"), json={"roleId": role_id}, @@ -151,10 +150,10 @@ class AdminRoleModelActions(AbstractAction): ) -> AsyncGenerator[RoleUser, None]: role_id = self._role_id or role_id if role_id is None: - raise ParameterError("role_idは必須です") + raise ValueError("role_idは必須です") if limit > 100: - raise ParameterError("limitは100以下である必要があります") + raise ValueError("limitは100以下である必要があります") if get_all: limit = 100 diff --git a/mipac/actions/antenna.py b/mipac/actions/antenna.py index b5d8ffd..1155834 100644 --- a/mipac/actions/antenna.py +++ b/mipac/actions/antenna.py @@ -3,7 +3,6 @@ from __future__ import annotations 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.antenna import Antenna from mipac.models.note import Note @@ -45,7 +44,7 @@ class ClientAntennaActions(AbstractAction): """ antenna_id = antenna_id or self._antenna_id if antenna_id is None: - raise ParameterError("antenna id is required") + raise ValueError("antenna id is required") body = {"antennaId": antenna_id} res: bool = await self._session.request( @@ -73,7 +72,7 @@ class ClientAntennaActions(AbstractAction): """ antenna_id = antenna_id or self._antenna_id if antenna_id is None: - raise ParameterError("antenna id is required") + raise ValueError("antenna id is required") body = {"antennaId": antenna_id} res_antenna: IAntenna = await self._session.request( @@ -93,10 +92,10 @@ class ClientAntennaActions(AbstractAction): ) -> AsyncGenerator[Note, None]: antenna_id = antenna_id or self._antenna_id if antenna_id is None: - raise ParameterError("antenna id is required") + raise ValueError("antenna id is required") if limit > 100: - raise ParameterError("limit must be less than 100") + raise ValueError("limit must be less than 100") if get_all: limit = 100 @@ -171,7 +170,7 @@ class ClientAntennaActions(AbstractAction): antenna_id = antenna_id or self._antenna_id if antenna_id is None: - raise ParameterError("antenna id is required") + raise ValueError("antenna id is required") if ( all( @@ -183,7 +182,7 @@ class ClientAntennaActions(AbstractAction): ) is False ): - raise ParameterError("Required parameters are missing") + raise ValueError("Required parameters are missing") body = { "antennaId": antenna_id, "name": name, @@ -271,7 +270,7 @@ class AntennaActions(ClientAntennaActions): ) is False ): - raise ParameterError("Required parameters are missing") + raise ValueError("Required parameters are missing") body = remove_dict_missing( { "name": name, diff --git a/mipac/actions/channel.py b/mipac/actions/channel.py index a522f4d..811be2b 100644 --- a/mipac/actions/channel.py +++ b/mipac/actions/channel.py @@ -3,7 +3,6 @@ from __future__ import annotations from typing import TYPE_CHECKING, AsyncGenerator, Literal, override from mipac.abstract.action import AbstractAction -from mipac.errors.base import ParameterError from mipac.file import MiFile from mipac.http import HTTPClient, Route from mipac.models.channel import Channel @@ -149,7 +148,7 @@ class ClientChannelActions(AbstractAction): channel_id = channel_id or self._channel_id if channel_id is None: - raise ParameterError("channel_id is required") + raise ValueError("channel_id is required") data = {"channelId": channel_id} @@ -204,7 +203,7 @@ class ClientChannelActions(AbstractAction): channel_id = channel_id or self._channel_id if channel_id is None: - raise ParameterError("channel_id is required") + raise ValueError("channel_id is required") data = remove_dict_missing( { @@ -261,7 +260,7 @@ class ClientChannelActions(AbstractAction): channel_id = channel_id or self._channel_id if channel_id is None: - raise ParameterError("channel_id is required") + raise ValueError("channel_id is required") data = { "channelId": channel_id, @@ -313,7 +312,7 @@ class ClientChannelActions(AbstractAction): channel_id = channel_id or self._channel_id if channel_id is None: - raise ParameterError("channel_id is required") + raise ValueError("channel_id is required") data = { "channelId": channel_id, @@ -374,7 +373,7 @@ class ClientChannelActions(AbstractAction): channel_id = channel_id or self._channel_id if channel_id is None: - raise ParameterError("channel_id is required") + raise ValueError("channel_id is required") data = {"channelId": channel_id} diff --git a/mipac/actions/client.py b/mipac/actions/client.py index f2f6606..a7a09ce 100644 --- a/mipac/actions/client.py +++ b/mipac/actions/client.py @@ -3,7 +3,6 @@ from __future__ import annotations from typing import TYPE_CHECKING, AsyncGenerator, Literal, overload from mipac.abstract.action import AbstractAction -from mipac.errors.base import ParameterError from mipac.http import HTTPClient, Route from mipac.models.announcement import Announcement from mipac.models.lite.meta import PartialMeta @@ -52,7 +51,7 @@ class ClientActions(AbstractAction): get_all: bool = False, ) -> AsyncGenerator[Announcement, None]: if limit > 100: - raise ParameterError("limitは100以下である必要があります") + raise ValueError("limitは100以下である必要があります") if get_all: limit = 100 diff --git a/mipac/actions/clip.py b/mipac/actions/clip.py index b78fa9d..33440fe 100644 --- a/mipac/actions/clip.py +++ b/mipac/actions/clip.py @@ -3,7 +3,6 @@ from __future__ import annotations 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.clip import Clip from mipac.models.note import Note @@ -52,10 +51,10 @@ class ClientClipActions(AbstractAction): clip_id = self._clip_id or clip_id if clip_id is None: - raise ParameterError("clip_id is required") + raise ValueError("clip_id is required") if limit > 100: - raise ParameterError("limit must be less than 100") + raise ValueError("limit must be less than 100") if get_all: limit = 100 @@ -92,7 +91,7 @@ class ClientClipActions(AbstractAction): clip_id = self._clip_id or clip_id if clip_id is None: - raise ParameterError("clip_id is required") + raise ValueError("clip_id is required") body = {"clipId": clip_id, "noteId": note_id} result: bool = await self._session.request( @@ -118,7 +117,7 @@ class ClientClipActions(AbstractAction): clip_id = self._clip_id or clip_id if clip_id is None: - raise ParameterError("clip_id is required") + raise ValueError("clip_id is required") body = {"clipId": clip_id, "noteId": note_id} result: bool = await self._session.request( @@ -142,7 +141,7 @@ class ClientClipActions(AbstractAction): clip_id = self._clip_id or clip_id if clip_id is None: - raise ParameterError("clip_id is required") + raise ValueError("clip_id is required") body = {"clipId": clip_id} result: bool = await self._session.request( @@ -179,7 +178,7 @@ class ClientClipActions(AbstractAction): clip_id = self._clip_id or clip_id if clip_id is None: - raise ParameterError("clip_id is required") + raise ValueError("clip_id is required") body = {"clipId": clip_id, "name": name, "isPublic": is_public, "description": description} result: IClip = await self._session.request( diff --git a/mipac/actions/drive/files.py b/mipac/actions/drive/files.py index 3331af7..c7993bc 100644 --- a/mipac/actions/drive/files.py +++ b/mipac/actions/drive/files.py @@ -5,7 +5,6 @@ import os from typing import TYPE_CHECKING, Any, AsyncGenerator, override from mipac.abstract.action import AbstractAction -from mipac.errors.base import ParameterError from mipac.http import HTTPClient, Route from mipac.models.drive import File from mipac.models.note import Note @@ -57,7 +56,7 @@ class ClientFileActions(AbstractAction): file_id = file_id or self.__file_ids if file_id is None: - raise ParameterError("file_id is required") + raise ValueError("file_id is required") body = { "sinceId": since_id, @@ -82,7 +81,7 @@ class ClientFileActions(AbstractAction): file_id = file_id or self.__file_ids if file_id is None: - raise ParameterError("file_id is required") + raise ValueError("file_id is required") body = { "sinceId": since_id, diff --git a/mipac/actions/favorite.py b/mipac/actions/favorite.py index 8ab4a3e..cee3a27 100644 --- a/mipac/actions/favorite.py +++ b/mipac/actions/favorite.py @@ -3,7 +3,6 @@ from __future__ import annotations from typing import TYPE_CHECKING, override from mipac.abstract.action import AbstractAction -from mipac.errors.base import ParameterError from mipac.http import HTTPClient, Route from mipac.utils.util import deprecated @@ -21,7 +20,7 @@ class ClientFavoriteActions(AbstractAction): note_id = note_id or self.__note_id if note_id is None: - raise ParameterError("note_id is required") + raise ValueError("note_id is required") data = {"noteId": note_id} return bool( @@ -40,7 +39,7 @@ class ClientFavoriteActions(AbstractAction): note_id = note_id or self.__note_id if note_id is None: - raise ParameterError("note_id is required") + raise ValueError("note_id is required") data = {"noteId": note_id} return bool( diff --git a/mipac/actions/federation.py b/mipac/actions/federation.py index 91bd06e..c724c97 100644 --- a/mipac/actions/federation.py +++ b/mipac/actions/federation.py @@ -3,7 +3,6 @@ from __future__ import annotations from typing import TYPE_CHECKING, Any, AsyncGenerator from mipac.abstract.action import AbstractAction -from mipac.errors.base import ParameterError from mipac.http import HTTPClient, Route from mipac.models.instance import FederationInstance from mipac.models.user import MeDetailed, UserDetailedNotMe, packed_user @@ -48,7 +47,7 @@ class FederationActions(AbstractAction): get_all: bool = False, ): if limit > 100: - raise ParameterError("limitは100以下である必要があります") + raise ValueError("limitは100以下である必要があります") if get_all: limit = 100 @@ -76,7 +75,7 @@ class FederationActions(AbstractAction): get_all: bool = False, ): if limit > 100: - raise ParameterError("limitは100以下である必要があります") + raise ValueError("limitは100以下である必要があります") if get_all: limit = 100 @@ -109,7 +108,7 @@ class FederationActions(AbstractAction): sort: str | None = None, ) -> list[FederationInstance]: if limit > 100: - raise ParameterError("limitは100以下である必要があります") + raise ValueError("limitは100以下である必要があります") body = { "host": host, "blocked": blocked, @@ -157,7 +156,7 @@ class FederationActions(AbstractAction): get_all: bool = False, ) -> AsyncGenerator[UserDetailedNotMe | MeDetailed, None]: if limit > 100: - raise ParameterError("limitは100以下である必要があります") + raise ValueError("limitは100以下である必要があります") if get_all: limit = 100 @@ -178,7 +177,7 @@ class FederationActions(AbstractAction): async def get_stats(self, limit: int = 10) -> IFederationInstanceStat: if limit > 100: - raise ParameterError("limitは100以下である必要があります") + raise ValueError("limitは100以下である必要があります") res: IFederationInstanceStat = await self.__session.request( Route("POST", "/api/federation/stats"), auth=True, body={"limit": limit}, lower=True ) diff --git a/mipac/actions/note.py b/mipac/actions/note.py index 13fd263..b25f32f 100644 --- a/mipac/actions/note.py +++ b/mipac/actions/note.py @@ -3,7 +3,7 @@ from __future__ import annotations from typing import TYPE_CHECKING, AsyncGenerator, override from mipac.abstract.action import AbstractAction -from mipac.errors.base import APIError, ParameterError +from mipac.errors.base import APIError from mipac.file import MiFile from mipac.http import HTTPClient, Route from mipac.models.clip import Clip @@ -58,9 +58,7 @@ def create_note_body( "channelId": channel_id, } if not check_multi_arg(text, files, renote_id, poll): - raise ParameterError( - "To send a note, one of content, file_ids, renote_id or poll is required" - ) + raise ValueError("To send a note, one of content, file_ids, renote_id or poll is required") if poll and type(Poll): poll_data = remove_dict_empty( @@ -82,7 +80,7 @@ def create_note_body( elif isinstance(file, str): file_ids.append(file) else: - raise ParameterError("files must be MiFile or str or File") + raise ValueError("files must be MiFile or str or File") body["fileIds"] = file_ids return remove_dict_empty(body) @@ -109,12 +107,12 @@ class ClientNoteActions(AbstractAction): note_id: str | None = None, ) -> list[Note]: if limit > 100: - raise ParameterError("limit は100以下である必要があります") + raise ValueError("limit は100以下である必要があります") note_id = note_id or self._note_id if note_id is None: - raise ParameterError("note_id is required") + raise ValueError("note_id is required") data = { "noteId": note_id, @@ -191,7 +189,7 @@ class ClientNoteActions(AbstractAction): note_id = note_id or self._note_id if note_id is None: - raise ParameterError("note_id is required") + raise ValueError("note_id is required") data = { "noteId": note_id, @@ -228,7 +226,7 @@ class ClientNoteActions(AbstractAction): note_id = note_id or self._note_id if note_id is None: - raise ParameterError("note_id is required") + raise ValueError("note_id is required") data = {"noteId": note_id} res: list[IClip] = await self._session.request( @@ -260,7 +258,7 @@ class ClientNoteActions(AbstractAction): note_id = note_id or self._note_id if note_id is None: - raise ParameterError("note_id is required") + raise ValueError("note_id is required") data = {"noteId": note_id, "limit": limit, "offset": offset} res: list[INote] = await self._session.request( @@ -287,7 +285,7 @@ class ClientNoteActions(AbstractAction): note_id = note_id or self._note_id if note_id is None: - raise ParameterError("note_id is required") + raise ValueError("note_id is required") data = {"noteId": note_id} res = await self._session.request(Route("POST", "/api/notes/delete"), json=data, auth=True) @@ -305,7 +303,7 @@ class ClientNoteActions(AbstractAction): note_id = note_id or self._note_id if note_id is None: - raise ParameterError("note_id is required") + raise ValueError("note_id is required") return await self._client.note.reaction.action.get_reactions( type=type, note_id=note_id, limit=limit, since_id=since_id, until_id=until_id @@ -323,7 +321,7 @@ class ClientNoteActions(AbstractAction): note_id = note_id or self._note_id if note_id is None: - raise ParameterError("note_id is required") + raise ValueError("note_id is required") return await self._client.note.reaction.action.fetch_reactions( note_id=note_id, type=type, limit=limit, since_id=since_id, until_id=until_id @@ -360,7 +358,7 @@ class ClientNoteActions(AbstractAction): note_id = note_id or self._note_id if note_id is None: - raise ParameterError("note_id is required") + raise ValueError("note_id is required") data = { "noteId": note_id, @@ -446,7 +444,7 @@ class ClientNoteActions(AbstractAction): note_id = note_id or self._note_id if note_id is None: - raise ParameterError("note_id is required") + raise ValueError("note_id is required") body = {"noteId": note_id, "sinceId": since_id, "untilId": until_id, "limit": limit} @@ -481,7 +479,7 @@ class ClientNoteActions(AbstractAction): note_id = note_id or self._note_id if note_id is None: - raise ParameterError("note_id is required") + raise ValueError("note_id is required") data = {"noteId": note_id} res: INoteState = await self._session.request( @@ -531,7 +529,7 @@ class ClientNoteActions(AbstractAction): note_id = note_id or self._note_id if note_id is None: - raise ParameterError("note_id is required") + raise ValueError("note_id is required") data = {"noteId": note_id, "clipId": clip_id} return bool( @@ -557,7 +555,7 @@ class ClientNoteActions(AbstractAction): note_id = self._note_id or note_id if note_id is None: - raise ParameterError("note_id is required") + raise ValueError("note_id is required") body = create_note_body(renote_id=note_id) res: ICreatedNote = await self._session.request( @@ -660,7 +658,7 @@ class ClientNoteActions(AbstractAction): reply_id = reply_id or self._note_id if reply_id is None: - raise ParameterError("reply_id is required") + raise ValueError("reply_id is required") body = create_note_body( text=text, @@ -732,7 +730,7 @@ class ClientNoteActions(AbstractAction): note_id = note_id or self._note_id if note_id is None: - raise ParameterError("note_id is required") + raise ValueError("note_id is required") body = create_note_body( text=content, @@ -782,7 +780,7 @@ class ClientNoteActions(AbstractAction): note_id = note_id or self._note_id if note_id is None: - raise ParameterError("note_id is required") + raise ValueError("note_id is required") data = {"noteId": note_id, "targetLang": target_lang} res: INoteTranslateResult = await self._session.request( @@ -808,7 +806,7 @@ class ClientNoteActions(AbstractAction): note_id = note_id or self._note_id if note_id is None: - raise ParameterError("note_id is required") + raise ValueError("note_id is required") body = {"noteId": note_id} res: bool = await self._session.request( @@ -1337,7 +1335,7 @@ class NoteActions(ClientNoteActions): get_all: bool = False, ) -> AsyncGenerator[Note, None]: if limit > 100: - raise ParameterError("limit は100以下である必要があります") + raise ValueError("limit は100以下である必要があります") if get_all: limit = 100 diff --git a/mipac/actions/poll.py b/mipac/actions/poll.py index 285b820..bd96808 100644 --- a/mipac/actions/poll.py +++ b/mipac/actions/poll.py @@ -3,7 +3,6 @@ from __future__ import annotations from typing import TYPE_CHECKING, override from mipac.abstract.action import AbstractAction -from mipac.errors.base import ParameterError from mipac.http import HTTPClient, Route from mipac.models.note import Note from mipac.types.note import INote @@ -24,7 +23,7 @@ class ClientPollActions(AbstractAction): note_id = note_id or self._note_id if note_id is None: - raise ParameterError("note_id is required") + raise ValueError("note_id is required") data = {"noteId": note_id, "choice": choice} res: bool = await self._session.request( @@ -40,7 +39,7 @@ class PollActions(ClientPollActions): @credentials_required async def recommendation(self, limit: int = 100, offset: int = 0): if limit > 100: - raise ParameterError("limit must be less than 100") + raise ValueError("limit must be less than 100") data = {"limit": limit, "offset": offset} diff --git a/mipac/actions/user.py b/mipac/actions/user.py index 8e36aa1..b86514b 100644 --- a/mipac/actions/user.py +++ b/mipac/actions/user.py @@ -3,7 +3,7 @@ from __future__ import annotations from typing import TYPE_CHECKING, AsyncGenerator, Literal, Optional, overload, override from mipac.abstract.action import AbstractAction -from mipac.errors.base import NotExistRequiredData, ParameterError +from mipac.errors.base import NotExistRequiredData from mipac.http import HTTPClient, Route from mipac.models.clip import Clip from mipac.models.gallery import GalleryPost @@ -66,7 +66,7 @@ class ClientUserActions(AbstractAction): user_id = user_id or self._user and self._user.id if check_multi_arg(user_id, self._user) is False: - raise ParameterError("missing required argument: user_id", user_id, self._user) + raise ValueError("missing required argument: user_id", user_id, self._user) data = { "userId": user_id, @@ -155,7 +155,7 @@ class ClientUserActions(AbstractAction): user_id = user_id or self._user and self._user.id if user_id is None: - raise ParameterError("user_id is required") + raise ValueError("user_id is required") data = {"userId": user_id, "limit": limit, "sinceId": since_id, "untilId": until_id} @@ -206,7 +206,7 @@ class ClientUserActions(AbstractAction): user_id = user_id or self._user and self._user.id if user_id is None: - raise ParameterError("user_id is required") + raise ValueError("user_id is required") data = { "userId": user_id, "sinceId": since_id, @@ -234,7 +234,7 @@ class ClientUserActions(AbstractAction): user_id = user_id or self._user and self._user.id if user_id is None: - raise ParameterError("user_id is required") + raise ValueError("user_id is required") data = { "userId": user_id, "sinceId": since_id, @@ -290,7 +290,7 @@ class ClientUserActions(AbstractAction): user_id = user_id or self._user and self._user.id if user_id is None: - raise ParameterError("user_id is required") + raise ValueError("user_id is required") data = { "userId": user_id, @@ -322,7 +322,7 @@ class ClientUserActions(AbstractAction): user_id = user_id or self._user and self._user.id if user_id is None: - raise ParameterError("user_id is required") + raise ValueError("user_id is required") data = { "userId": user_id, @@ -374,7 +374,7 @@ class ClientUserActions(AbstractAction): user_id = user_id or self._user and self._user.id if user_id is None: - raise ParameterError("user_id is required") + raise ValueError("user_id is required") data = { "userId": user_id, @@ -403,7 +403,7 @@ class ClientUserActions(AbstractAction): user_id = user_id or self._user and self._user.id if user_id is None: - raise ParameterError("user_id is required") + raise ValueError("user_id is required") data = { "userId": user_id, @@ -443,7 +443,7 @@ class ClientUserActions(AbstractAction): user_id = user_id or self._user and self._user.id if user_id is None: - raise ParameterError("user_id is required") + raise ValueError("user_id is required") data = { "userId": user_id, @@ -482,7 +482,7 @@ class ClientUserActions(AbstractAction): user_id = user_id or self._user and self._user.id if user_id is None: - raise ParameterError("user_id is required") + raise ValueError("user_id is required") data = { "userId": user_id, @@ -522,7 +522,7 @@ class ClientUserActions(AbstractAction): user_id = user_id or self._user and self._user.id if user_id is None: - raise ParameterError("user_id is required") + raise ValueError("user_id is required") data = { "userId": user_id, @@ -544,7 +544,7 @@ class ClientUserActions(AbstractAction): user_id = user_id or self._user and self._user.id if user_id is None: - raise ParameterError("user_id is required") + raise ValueError("user_id is required") data = { "userId": user_id, @@ -872,7 +872,7 @@ class UserActions(ClientUserActions): """ if limit > 100: - raise ParameterError("limit は100以下である必要があります") + raise ValueError("limit は100以下である必要があります") body = remove_dict_empty( {"username": username, "host": host, "limit": limit, "detail": detail} @@ -947,7 +947,7 @@ class UserActions(ClientUserActions): """ if limit > 100: - raise ParameterError("limit は100以下である必要があります") + raise ValueError("limit は100以下である必要があります") if get_all: limit = 100 diff --git a/mipac/actions/users/list.py b/mipac/actions/users/list.py index 208f086..5276da1 100644 --- a/mipac/actions/users/list.py +++ b/mipac/actions/users/list.py @@ -3,7 +3,6 @@ from __future__ import annotations from typing import TYPE_CHECKING, override from mipac.abstract.action import AbstractAction -from mipac.errors.base import ParameterError from mipac.http import HTTPClient, Route from mipac.models.note import Note from mipac.models.user import UserList, UserListMembership @@ -43,7 +42,7 @@ class ClientPartialUserListActions(AbstractAction): user_id = user_id or self.__user_id if user_id is None: - raise ParameterError("required parameter user_id is missing") + raise ValueError("required parameter user_id is missing") raw_user_lists: list[IUserList] = await self._session.request( Route("POST", "/api/users/lists/list"), json={"userId": user_id}, auth=True @@ -71,7 +70,7 @@ class ClientPartialUserListActions(AbstractAction): user_id = user_id or self.__user_id if user_id is None: - raise ParameterError("required parameter user_id is missing") + raise ValueError("required parameter user_id is missing") res: bool = await self._session.request( Route("POST", "/api/users/lists/pull"), @@ -100,7 +99,7 @@ class ClientPartialUserListActions(AbstractAction): user_id = user_id or self.__user_id if user_id is None: - raise ParameterError("required parameter user_id is missing") + raise ValueError("required parameter user_id is missing") res: bool = await self._session.request( Route("POST", "/api/users/lists/push"), @@ -115,7 +114,7 @@ class ClientPartialUserListActions(AbstractAction): user_id = user_id or self.__user_id if user_id is None: - raise ParameterError("required parameter user_id is missing") + raise ValueError("required parameter user_id is missing") data = remove_dict_missing( {"listId": list_id, "userId": user_id, "withReplies": with_replies} @@ -172,7 +171,7 @@ class ClientUserListActions(ClientPartialUserListActions): list_id = list_id or self.__list_id if list_id is None: - raise ParameterError("required parameter list_id is missing") + raise ValueError("required parameter list_id is missing") return await super().pull(list_id=list_id, user_id=user_id) @@ -181,7 +180,7 @@ class ClientUserListActions(ClientPartialUserListActions): list_id = list_id or self.__list_id if list_id is None: - raise ParameterError("required parameter list_id is missing") + raise ValueError("required parameter list_id is missing") return await super().push(list_id=list_id, user_id=user_id) @@ -205,7 +204,7 @@ class ClientUserListActions(ClientPartialUserListActions): list_id = list_id or self.__list_id if list_id is None: - raise ParameterError("required parameter list_id is missing") + raise ValueError("required parameter list_id is missing") raw_user_list: IUserList = await self._session.request( Route("POST", "/api/users/lists/show"), @@ -282,7 +281,7 @@ class ClientUserListActions(ClientPartialUserListActions): list_id = list_id or self.__list_id if list_id is None: - raise ParameterError("required parameter list_id is missing") + raise ValueError("required parameter list_id is missing") data = remove_dict_missing({"listId": list_id, "name": name, "public": is_public}) @@ -297,7 +296,7 @@ class ClientUserListActions(ClientPartialUserListActions): list_id = list_id or self.__list_id if list_id is None: - raise ParameterError("required parameter list_id is missing") + raise ValueError("required parameter list_id is missing") res: IUserList = await self._session.request( Route("POST", "/api/users/lists/create-from-public"), @@ -313,7 +312,7 @@ class ClientUserListActions(ClientPartialUserListActions): list_id = list_id or self.__list_id if list_id is None: - raise ParameterError("required parameter list_id is missing") + raise ValueError("required parameter list_id is missing") return await super().update_membership( user_id=user_id, with_replies=with_replies, list_id=list_id ) @@ -330,7 +329,7 @@ class ClientUserListActions(ClientPartialUserListActions): list_id = list_id or self.__list_id if list_id is None: - raise ParameterError("required parameter list_id is missing") + raise ValueError("required parameter list_id is missing") data = { "listId": list_id, @@ -363,7 +362,7 @@ class ClientUserListActions(ClientPartialUserListActions): list_id = list_id or self.__list_id if list_id is None: - raise ParameterError("required parameter list_id is missing") + raise ValueError("required parameter list_id is missing") data = { "listId": list_id, @@ -402,7 +401,7 @@ class ClientUserListActions(ClientPartialUserListActions): list_id = list_id or self.__list_id if list_id is None: - raise ParameterError("required parameter list_id is missing") + raise ValueError("required parameter list_id is missing") return await self._client.note.action.get_time_line( list_id=list_id, @@ -434,7 +433,7 @@ class ClientUserListActions(ClientPartialUserListActions): list_id = list_id or self.__list_id if list_id is None: - raise ParameterError("required parameter list_id is missing") + raise ValueError("required parameter list_id is missing") async for i in self._client.note.action.get_all_time_line( list_id=list_id, diff --git a/mipac/actions/users/mute.py b/mipac/actions/users/mute.py index 186045a..e2357d6 100644 --- a/mipac/actions/users/mute.py +++ b/mipac/actions/users/mute.py @@ -3,7 +3,6 @@ from __future__ import annotations from typing import TYPE_CHECKING, override from mipac.abstract.action import AbstractAction -from mipac.errors.base import ParameterError from mipac.http import HTTPClient, Route from mipac.models.mute import MutedUser from mipac.types.mute import IMutedUser @@ -36,7 +35,7 @@ class ClientMuteActions(AbstractAction): """ if user_id or self.__user_id: - raise ParameterError("Parameter 'user_id' is required.") + raise ValueError("Parameter 'user_id' is required.") body = {"userId": user_id, "expiresAt": expires_at} @@ -59,7 +58,7 @@ class ClientMuteActions(AbstractAction): """ if user_id or self.__user_id: - raise ParameterError("Parameter 'user_id' is required.") + raise ValueError("Parameter 'user_id' is required.") res: bool = await self._session.request( route=Route("POST", "/api/mute/delete"), json={"userId": user_id}