From 406c8ac747110b2fb19ef7cf1a58f3804bd93992 Mon Sep 17 00:00:00 2001
From: Kyomotoi <0w0@imki.moe>
Date: Thu, 13 Oct 2022 15:16:03 +0800
Subject: =?UTF-8?q?=F0=9F=8E=A8=20=E4=BC=98=E5=8C=96=E5=8C=85=E5=AF=BC?=
=?UTF-8?q?=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ATRI/plugins/anti_effort/data_source.py | 2 +-
ATRI/plugins/bilibili_dynamic/__init__.py | 2 +-
ATRI/plugins/console/data_source.py | 2 +-
ATRI/plugins/console/driver/__init__.py | 2 +-
ATRI/plugins/essential.py | 2 +-
ATRI/plugins/funny/data_source.py | 6 +++---
ATRI/plugins/kimo/data_source.py | 2 +-
ATRI/plugins/polaroid/data_source.py | 2 +-
ATRI/plugins/rss/rss_mikanan/__init__.py | 2 +-
ATRI/plugins/rss/rss_rsshub/__init__.py | 2 +-
ATRI/plugins/saucenao/__init__.py | 2 +-
ATRI/plugins/setu/nsfw_checker.py | 2 +-
ATRI/plugins/status/__init__.py | 2 +-
ATRI/plugins/thesaurus/listener.py | 2 +-
ATRI/plugins/twitter/__init__.py | 2 +-
ATRI/utils/check_update.py | 2 +-
ATRI/utils/request.py | 2 +-
17 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/ATRI/plugins/anti_effort/data_source.py b/ATRI/plugins/anti_effort/data_source.py
index 8393dde..02bdb82 100644
--- a/ATRI/plugins/anti_effort/data_source.py
+++ b/ATRI/plugins/anti_effort/data_source.py
@@ -9,7 +9,7 @@ from ATRI import driver
from ATRI.service import Service, ServiceTools
from ATRI.rule import is_in_service
from ATRI.utils import request
-from ATRI.log import logger as log
+from ATRI.log import log
from .image_dealer import image_dealer
from .models import AntiEffortModel, AntiEffortUserModel
diff --git a/ATRI/plugins/bilibili_dynamic/__init__.py b/ATRI/plugins/bilibili_dynamic/__init__.py
index 9d44831..ec62540 100644
--- a/ATRI/plugins/bilibili_dynamic/__init__.py
+++ b/ATRI/plugins/bilibili_dynamic/__init__.py
@@ -14,7 +14,7 @@ from nonebot.params import CommandArg, ArgPlainText
from nonebot.permission import Permission, SUPERUSER
from nonebot.adapters.onebot.v11 import Message, MessageSegment, GroupMessageEvent
-from ATRI.log import logger as log
+from ATRI.log import log
from ATRI.utils import timestamp2datetime
from ATRI.utils.apscheduler import scheduler
from ATRI.database import BilibiliSubscription
diff --git a/ATRI/plugins/console/data_source.py b/ATRI/plugins/console/data_source.py
index 2b0090b..4d97a30 100644
--- a/ATRI/plugins/console/data_source.py
+++ b/ATRI/plugins/console/data_source.py
@@ -11,7 +11,7 @@ from ATRI.service import Service
from ATRI.utils import request
from ATRI.rule import is_in_service
from ATRI.exceptions import WriteFileError
-from ATRI.log import logger as log
+from ATRI.log import log
CONSOLE_DIR = Path(".") / "data" / "plugins" / "console"
diff --git a/ATRI/plugins/console/driver/__init__.py b/ATRI/plugins/console/driver/__init__.py
index 62b4aab..970c91a 100644
--- a/ATRI/plugins/console/driver/__init__.py
+++ b/ATRI/plugins/console/driver/__init__.py
@@ -3,7 +3,7 @@ from nonebot.drivers.fastapi import Driver
from fastapi.staticfiles import StaticFiles
from fastapi.middleware.cors import CORSMiddleware
-from ATRI.log import logger as log
+from ATRI.log import log
from ATRI.log import BotSelfConfig
from ATRI.plugins.console.data_source import FRONTEND_DIR
from .view import (
diff --git a/ATRI/plugins/essential.py b/ATRI/plugins/essential.py
index c533a9f..d40856d 100644
--- a/ATRI/plugins/essential.py
+++ b/ATRI/plugins/essential.py
@@ -29,7 +29,7 @@ from nonebot.adapters.onebot.v11 import (
from ATRI.service import Service
-from ATRI.log import logger as log
+from ATRI.log import log
from ATRI.config import BotSelfConfig
from ATRI.utils import MessageChecker
diff --git a/ATRI/plugins/funny/data_source.py b/ATRI/plugins/funny/data_source.py
index 6144b11..18e0503 100644
--- a/ATRI/plugins/funny/data_source.py
+++ b/ATRI/plugins/funny/data_source.py
@@ -5,7 +5,7 @@ from random import choice, randint
from nonebot.adapters.onebot.v11 import unescape
from ATRI.service import Service
-from ATRI.log import logger
+from ATRI.log import log
from ATRI.exceptions import RequestError
from ATRI.utils import request
from ATRI.utils import request, Translate
@@ -27,13 +27,13 @@ class Funny(Service):
file_name = "laugh.txt"
path = FUNNY_DIR / file_name
if not path.is_file():
- logger.warning("未发现笑话相关数据，正在下载并保存...")
+ log.warning("未发现笑话相关数据，正在下载并保存...")
url = "https://jsd.imki.moe/gh/Kyomotoi/CDN@master/project/ATRI/laugh.txt"
res = await request.get(url)
context = res.text
with open(path, "w", encoding="utf-8") as w:
w.write(context)
- logger.warning("完成")
+ log.warning("完成")
with open(path, "r", encoding="utf-8") as r:
for line in r:
diff --git a/ATRI/plugins/kimo/data_source.py b/ATRI/plugins/kimo/data_source.py
index 2135a01..3e4f56b 100644
--- a/ATRI/plugins/kimo/data_source.py
+++ b/ATRI/plugins/kimo/data_source.py
@@ -5,7 +5,7 @@ from random import choice, shuffle
from ATRI.service import Service
from ATRI.rule import to_bot, is_in_service
-from ATRI.log import logger as log
+from ATRI.log import log
from ATRI.utils import request
from ATRI.exceptions import ReadFileError, WriteFileError
diff --git a/ATRI/plugins/polaroid/data_source.py b/ATRI/plugins/polaroid/data_source.py
index 866b6da..a48b5eb 100644
--- a/ATRI/plugins/polaroid/data_source.py
+++ b/ATRI/plugins/polaroid/data_source.py
@@ -2,7 +2,7 @@ from ATRI import driver
from ATRI.service import Service, ServiceTools
from ATRI.rule import is_in_service
from ATRI.utils import request
-from ATRI.log import logger as log
+from ATRI.log import log
from ATRI.exceptions import RequestError
from .image_dealer import image_dealer
diff --git a/ATRI/plugins/rss/rss_mikanan/__init__.py b/ATRI/plugins/rss/rss_mikanan/__init__.py
index 4d49857..a04f5cd 100644
--- a/ATRI/plugins/rss/rss_mikanan/__init__.py
+++ b/ATRI/plugins/rss/rss_mikanan/__init__.py
@@ -13,7 +13,7 @@ from nonebot.params import CommandArg, ArgPlainText
from nonebot.permission import Permission
from nonebot.adapters.onebot.v11 import Message, GroupMessageEvent
-from ATRI.log import logger as log
+from ATRI.log import log
from ATRI.plugins.rss.rss_rsshub.data_source import RssHubSubscriptor
from ATRI.utils import timestamp2datetime
from ATRI.utils.apscheduler import scheduler
diff --git a/ATRI/plugins/rss/rss_rsshub/__init__.py b/ATRI/plugins/rss/rss_rsshub/__init__.py
index eaac2e7..54d0502 100644
--- a/ATRI/plugins/rss/rss_rsshub/__init__.py
+++ b/ATRI/plugins/rss/rss_rsshub/__init__.py
@@ -13,7 +13,7 @@ from nonebot.params import CommandArg, ArgPlainText
from nonebot.permission import Permission
from nonebot.adapters.onebot.v11 import Message, GroupMessageEvent
-from ATRI.log import logger as log
+from ATRI.log import log
from ATRI.utils import timestamp2datetime
from ATRI.utils.apscheduler import scheduler
from ATRI.database import RssRsshubSubcription
diff --git a/ATRI/plugins/saucenao/__init__.py b/ATRI/plugins/saucenao/__init__.py
index bf9e06b..c3d2d16 100644
--- a/ATRI/plugins/saucenao/__init__.py
+++ b/ATRI/plugins/saucenao/__init__.py
@@ -3,7 +3,7 @@ from random import choice
from nonebot.adapters.onebot.v11 import MessageEvent, Message, MessageSegment
from nonebot.adapters.onebot.v11.helpers import extract_image_urls, Cooldown
-from ATRI.log import logger as log
+from ATRI.log import log
from ATRI.config import SauceNAO as sn
from ATRI.service import ServiceTools
from .data_source import SauceNao
diff --git a/ATRI/plugins/setu/nsfw_checker.py b/ATRI/plugins/setu/nsfw_checker.py
index 2f045c1..c0bd2ba 100644
--- a/ATRI/plugins/setu/nsfw_checker.py
+++ b/ATRI/plugins/setu/nsfw_checker.py
@@ -7,7 +7,7 @@ from PIL import Image
from pathlib import Path
from sys import getsizeof
-from ATRI.log import logger as log
+from ATRI.log import log
from ATRI.utils import request
from ATRI.exceptions import RequestError, WriteFileError
diff --git a/ATRI/plugins/status/__init__.py b/ATRI/plugins/status/__init__.py
index a34fff3..9c43973 100644
--- a/ATRI/plugins/status/__init__.py
+++ b/ATRI/plugins/status/__init__.py
@@ -1,6 +1,6 @@
from nonebot import get_bot
-from ATRI.log import logger as log
+from ATRI.log import log
from ATRI.config import BotSelfConfig
from ATRI.utils.apscheduler import scheduler
diff --git a/ATRI/plugins/thesaurus/listener.py b/ATRI/plugins/thesaurus/listener.py
index 5cf0baa..1a49b35 100644
--- a/ATRI/plugins/thesaurus/listener.py
+++ b/ATRI/plugins/thesaurus/listener.py
@@ -9,7 +9,7 @@ from apscheduler.triggers.base import BaseTrigger
from apscheduler.triggers.combining import AndTrigger
from apscheduler.triggers.interval import IntervalTrigger
-from ATRI.log import logger as log
+from ATRI.log import log
from ATRI.utils.apscheduler import scheduler
from .data_source import ThesaurusManager, ThesaurusListener, ThesaurusStoragor
diff --git a/ATRI/plugins/twitter/__init__.py b/ATRI/plugins/twitter/__init__.py
index ebf673d..3cfa142 100644
--- a/ATRI/plugins/twitter/__init__.py
+++ b/ATRI/plugins/twitter/__init__.py
@@ -14,7 +14,7 @@ from nonebot.params import CommandArg, ArgPlainText
from nonebot.permission import Permission, SUPERUSER
from nonebot.adapters.onebot.v11 import Message, MessageSegment, GroupMessageEvent
-from ATRI.log import logger as log
+from ATRI.log import log
from ATRI.utils import timestamp2datetime
from ATRI.utils.apscheduler import scheduler
from ATRI.database import TwitterSubscription
diff --git a/ATRI/utils/check_update.py b/ATRI/utils/check_update.py
index 49a8f06..95fe50c 100644
--- a/ATRI/utils/check_update.py
+++ b/ATRI/utils/check_update.py
@@ -1,4 +1,4 @@
-from ATRI.log import logger as log
+from ATRI.log import log
from . import request
diff --git a/ATRI/utils/request.py b/ATRI/utils/request.py
index d8f7be5..db7614f 100644
--- a/ATRI/utils/request.py
+++ b/ATRI/utils/request.py
@@ -1,7 +1,7 @@
import httpx
from ATRI.config import BotSelfConfig
-from ATRI.log import logger as log
+from ATRI.log import log
timeout = BotSelfConfig.request_timeout
if timeout:
--
cgit v1.2.3