From f401725ab011bbec44f74448a8aed67b8f9159d6 Mon Sep 17 00:00:00 2001
From: luoshuijs <luoshuijs@outlook.com>
Date: Wed, 6 Sep 2023 11:21:54 +0800
Subject: [PATCH] :fire: Remove aiohttp

---
 plugins/system/errorhandler.py | 16 ----------------
 utils/patch/__init__.py        |  4 ++--
 utils/patch/aiohttp.py         | 21 ---------------------
 3 files changed, 2 insertions(+), 39 deletions(-)
 delete mode 100644 utils/patch/aiohttp.py

diff --git a/plugins/system/errorhandler.py b/plugins/system/errorhandler.py
index 689f1a9a..f709d136 100644
--- a/plugins/system/errorhandler.py
+++ b/plugins/system/errorhandler.py
@@ -4,7 +4,6 @@ import traceback
 from typing import Optional
 
 import aiofiles
-from aiohttp import ClientError, ClientConnectorError
 from httpx import HTTPError, TimeoutException
 from simnet.errors import (
     DataNotPublic,
@@ -33,7 +32,6 @@ from modules.errorpush import (
 )
 from plugins.tools.genshin import CookiesNotFoundError, PlayerNotFoundError as GenshinPlayerNotFoundError
 from utils.log import logger
-from utils.patch.aiohttp import AioHttpTimeoutException
 
 try:
     import ujson as jsonlib
@@ -235,20 +233,6 @@ class ErrorHandler(Plugin):
             self.create_notice_task(update, context, notice)
             raise ApplicationHandlerStop
 
-    @error_handler()
-    async def process_aiohttp_exception(self, update: object, context: CallbackContext):
-        if not isinstance(context.error, ClientError) or not isinstance(update, Update):
-            return
-        exc = context.error
-        notice: Optional[str] = None
-        if isinstance(exc, AioHttpTimeoutException):
-            notice = self.ERROR_MSG_PREFIX + " 服务器熟啦 ~ 请稍后再试"
-        elif isinstance(exc, ClientConnectorError):
-            notice = self.ERROR_MSG_PREFIX + " 连接服务器异常"
-        if notice:
-            self.create_notice_task(update, context, notice)
-            raise ApplicationHandlerStop
-
     @error_handler()
     async def process_player_and_cookie_not_found(self, update: object, context: CallbackContext):
         if not isinstance(
diff --git a/utils/patch/__init__.py b/utils/patch/__init__.py
index 2873e270..e83dfdd4 100644
--- a/utils/patch/__init__.py
+++ b/utils/patch/__init__.py
@@ -1,3 +1,3 @@
-from utils.patch import aiohttp, simnet
+from utils.patch import simnet
 
-__all__ = ["aiohttp", "simnet"]
+__all__ = ["simnet"]
diff --git a/utils/patch/aiohttp.py b/utils/patch/aiohttp.py
deleted file mode 100644
index d64ce0a0..00000000
--- a/utils/patch/aiohttp.py
+++ /dev/null
@@ -1,21 +0,0 @@
-import asyncio
-from typing import Optional
-
-import aiohttp  # pylint: disable=W0406
-from aiohttp import ClientError
-
-from utils.patch.methods import patch, patchable
-
-
-class AioHttpTimeoutException(ClientError):
-    pass
-
-
-@patch(aiohttp.helpers.TimerContext)
-class TimerContext:
-    @patchable
-    def __exit__(self, *args, **kwargs) -> Optional[bool]:
-        try:
-            return self.old___exit__(*args, **kwargs)
-        except asyncio.TimeoutError:
-            raise AioHttpTimeoutException from None