minor refactor

server/base.py

@@ -8,8 +8,6 @@
 import asyncpg
 import httpx
 import litestar
-from litestar.exceptions import ClientException
-from litestar.status_codes import HTTP_400_BAD_REQUEST
 from redis.asyncio import Redis
 from sslog import logger
 
@@ -77,12 +75,6 @@ async def pg_pool_startup() -> None:
 AuthorizedRequest = litestar.Request[None, User, Any]
 
 
-class BadRequestException(ClientException):
-    """Server knows the request method, but the target resource doesn't support this method."""
-
-    status_code = HTTP_400_BAD_REQUEST
-
-
 patch_keys: Mapping[str, str] = {
     "name": "标题",
     "name_cn": "简体中文标题",

server/contrib.py

@@ -20,7 +20,6 @@
 from server.auth import require_user_login
 from server.base import (
     AuthorizedRequest,
-    BadRequestException,
     QueueItem,
     Request,
     http_client,
@@ -30,6 +29,7 @@
     subject_infobox_queue,
 )
 from server.config import TURNSTILE_SECRET_KEY, UTC
+from server.errors import BadRequestException
 from server.model import PatchState, SubjectPatch
 from server.router import Router
 from server.strings import check_invalid_input_str, contains_invalid_input_str

server/errors.py

@@ -0,0 +1,8 @@
+from litestar.exceptions import ClientException
+from litestar.status_codes import HTTP_400_BAD_REQUEST
+
+
+class BadRequestException(ClientException):
+    """Server knows the request method, but the target resource doesn't support this method."""
+
+    status_code = HTTP_400_BAD_REQUEST

server/index.py

@@ -10,8 +10,9 @@
 from litestar.response import Redirect, Template
 
 from server.auth import require_user_login
-from server.base import BadRequestException, Request, disable_cookies_opt, pg
+from server.base import Request, disable_cookies_opt, pg
 from server.db import fetch_users
+from server.errors import BadRequestException
 from server.model import PatchState, PatchType
 from server.router import Router
 

server/review.py

@@ -20,13 +20,13 @@
 from server.auth import require_user_editor
 from server.base import (
     AuthorizedRequest,
-    BadRequestException,
     User,
     http_client,
     pg,
     session_key_back_to,
 )
 from server.config import UTC
+from server.errors import BadRequestException
 from server.model import EpisodePatch, PatchState, PatchType, SubjectPatch
 from server.router import Router
 from server.strings import check_invalid_input_str

server/strings.py

@@ -1,12 +1,6 @@
 import regex
-from litestar.exceptions import ClientException
-from litestar.status_codes import HTTP_400_BAD_REQUEST
 
-
-class BadRequestException(ClientException):
-    """Server knows the request method, but the target resource doesn't support this method."""
-
-    status_code = HTTP_400_BAD_REQUEST
+from server.errors import BadRequestException
 
 
 # stdlib re doesn't support `\p`