From 7dbbaea6c8d698b767d8dbf4121bcfb0aeadf07d Mon Sep 17 00:00:00 2001
From: felinae98 <731499577@qq.com>
Date: Sat, 12 Feb 2022 10:40:27 +0800
Subject: [PATCH] update config

---
 .pre-commit-config.yaml                          |  1 -
 pyproject.toml                                   | 13 +++++++++++++
 src/plugins/nonebot_bison/admin_page/__init__.py |  4 ++--
 src/plugins/nonebot_bison/config.py              |  2 +-
 src/plugins/nonebot_bison/config_manager.py      |  2 +-
 src/plugins/nonebot_bison/platform/arknights.py  |  2 +-
 src/plugins/nonebot_bison/platform/platform.py   |  2 +-
 src/plugins/nonebot_bison/platform/rss.py        |  2 +-
 src/plugins/nonebot_bison/platform/wechat.py     |  4 ++--
 src/plugins/nonebot_bison/platform/weibo.py      |  4 ++--
 src/plugins/nonebot_bison/post.py                |  2 +-
 src/plugins/nonebot_bison/scheduler.py           |  2 +-
 src/plugins/nonebot_bison/utils.py               |  6 +++---
 tests/platforms/test_arknights.py                |  2 +-
 tests/platforms/test_bilibili.py                 |  2 +-
 tests/platforms/test_ncm_artist.py               |  2 +-
 tests/platforms/test_ncm_radio.py                |  2 +-
 tests/platforms/test_weibo.py                    |  6 +++---
 18 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index baf2d35..6796996 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -9,7 +9,6 @@ repos:
     rev: 5.10.1
     hooks:
       - id: isort
-        args: ["--profile", "black", "--filter-files"]
 
   - repo: https://github.com/psf/black
     rev: 22.1.0
diff --git a/pyproject.toml b/pyproject.toml
index 9ae2ecc..f0e540d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -55,3 +55,16 @@ markers = [
     "compare: compare fetching result with rsshub",
     "render: render img by chrome"
 ]
+
+[tool.black]
+line-length = 88
+target-version = ["py39", "py310"]
+include = '\.pyi?$'
+extend-exclude = '''
+'''
+
+[tool.isort]
+profile = "black"
+line_length = 88
+skip_gitignore = true
+force_sort_within_sections = true
diff --git a/src/plugins/nonebot_bison/admin_page/__init__.py b/src/plugins/nonebot_bison/admin_page/__init__.py
index 0aba931..0d1733b 100644
--- a/src/plugins/nonebot_bison/admin_page/__init__.py
+++ b/src/plugins/nonebot_bison/admin_page/__init__.py
@@ -1,9 +1,8 @@
-import os
 from dataclasses import dataclass
+import os
 from pathlib import Path
 from typing import Union
 
-import socketio
 from fastapi.staticfiles import StaticFiles
 from nonebot import get_driver, on_command
 from nonebot.adapters.cqhttp.bot import Bot
@@ -12,6 +11,7 @@ from nonebot.drivers.fastapi import Driver
 from nonebot.log import logger
 from nonebot.rule import to_me
 from nonebot.typing import T_State
+import socketio
 
 from ..plugin_config import plugin_config
 from .api import (
diff --git a/src/plugins/nonebot_bison/config.py b/src/plugins/nonebot_bison/config.py
index a021aeb..3a98006 100644
--- a/src/plugins/nonebot_bison/config.py
+++ b/src/plugins/nonebot_bison/config.py
@@ -1,5 +1,5 @@
-import os
 from collections import defaultdict
+import os
 from os import path
 from typing import DefaultDict, Literal, Mapping, TypedDict
 
diff --git a/src/plugins/nonebot_bison/config_manager.py b/src/plugins/nonebot_bison/config_manager.py
index 8e96ea6..60569e4 100644
--- a/src/plugins/nonebot_bison/config_manager.py
+++ b/src/plugins/nonebot_bison/config_manager.py
@@ -204,7 +204,7 @@ def do_del_sub(del_sub: Type[Matcher]):
             config.del_subscribe(
                 state.get("_user_id") or event.group_id,
                 "group",
-                **state["sub_table"][index]
+                **state["sub_table"][index],
             )
         except Exception as e:
             await del_sub.reject("删除错误")
diff --git a/src/plugins/nonebot_bison/platform/arknights.py b/src/plugins/nonebot_bison/platform/arknights.py
index f7b0002..a4b80f5 100644
--- a/src/plugins/nonebot_bison/platform/arknights.py
+++ b/src/plugins/nonebot_bison/platform/arknights.py
@@ -1,8 +1,8 @@
 import json
 from typing import Any
 
-import httpx
 from bs4 import BeautifulSoup as bs
+import httpx
 
 from ..post import Post
 from ..types import Category, RawPost, Target
diff --git a/src/plugins/nonebot_bison/platform/platform.py b/src/plugins/nonebot_bison/platform/platform.py
index 1bec3d8..34cdb76 100644
--- a/src/plugins/nonebot_bison/platform/platform.py
+++ b/src/plugins/nonebot_bison/platform/platform.py
@@ -1,7 +1,7 @@
-import time
 from abc import ABC, abstractmethod
 from collections import defaultdict
 from dataclasses import dataclass
+import time
 from typing import Any, Collection, Literal, Optional
 
 import httpx
diff --git a/src/plugins/nonebot_bison/platform/rss.py b/src/plugins/nonebot_bison/platform/rss.py
index 330d93d..2adde67 100644
--- a/src/plugins/nonebot_bison/platform/rss.py
+++ b/src/plugins/nonebot_bison/platform/rss.py
@@ -1,9 +1,9 @@
 import calendar
 from typing import Any, Optional
 
+from bs4 import BeautifulSoup as bs
 import feedparser
 import httpx
-from bs4 import BeautifulSoup as bs
 
 from ..post import Post
 from ..types import RawPost, Target
diff --git a/src/plugins/nonebot_bison/platform/wechat.py b/src/plugins/nonebot_bison/platform/wechat.py
index d5f5487..b45839a 100644
--- a/src/plugins/nonebot_bison/platform/wechat.py
+++ b/src/plugins/nonebot_bison/platform/wechat.py
@@ -1,11 +1,11 @@
+from datetime import datetime
 import hashlib
 import json
 import re
-from datetime import datetime
 from typing import Any, Optional
 
-import httpx
 from bs4 import BeautifulSoup as bs
+import httpx
 
 from ..post import Post
 from ..types import *
diff --git a/src/plugins/nonebot_bison/platform/weibo.py b/src/plugins/nonebot_bison/platform/weibo.py
index 365e3b2..a69b3b2 100644
--- a/src/plugins/nonebot_bison/platform/weibo.py
+++ b/src/plugins/nonebot_bison/platform/weibo.py
@@ -1,10 +1,10 @@
+from datetime import datetime
 import json
 import re
-from datetime import datetime
 from typing import Any, Optional
 
-import httpx
 from bs4 import BeautifulSoup as bs
+import httpx
 from nonebot import logger
 
 from ..post import Post
diff --git a/src/plugins/nonebot_bison/post.py b/src/plugins/nonebot_bison/post.py
index 604295d..7122566 100644
--- a/src/plugins/nonebot_bison/post.py
+++ b/src/plugins/nonebot_bison/post.py
@@ -4,10 +4,10 @@ from functools import reduce
 from io import BytesIO
 from typing import Optional, Union
 
+from PIL import Image
 import httpx
 from nonebot import logger
 from nonebot.adapters.cqhttp.message import Message, MessageSegment
-from PIL import Image
 
 from .plugin_config import plugin_config
 from .utils import parse_text
diff --git a/src/plugins/nonebot_bison/scheduler.py b/src/plugins/nonebot_bison/scheduler.py
index 9e8eaf7..ba9cc2c 100644
--- a/src/plugins/nonebot_bison/scheduler.py
+++ b/src/plugins/nonebot_bison/scheduler.py
@@ -1,8 +1,8 @@
 import asyncio
 import logging
 
-import nonebot
 from apscheduler.schedulers.asyncio import AsyncIOScheduler
+import nonebot
 from nonebot import get_driver, logger
 from nonebot.log import LoguruHandler
 
diff --git a/src/plugins/nonebot_bison/utils.py b/src/plugins/nonebot_bison/utils.py
index 63774d7..5730a8b 100644
--- a/src/plugins/nonebot_bison/utils.py
+++ b/src/plugins/nonebot_bison/utils.py
@@ -1,17 +1,17 @@
 import asyncio
 import base64
+from html import escape
 import os
+from pathlib import Path
 import platform
 import re
 import subprocess
 import sys
-from html import escape
-from pathlib import Path
 from time import asctime
 from typing import Awaitable, Callable, Optional, Union
 
-import nonebot
 from bs4 import BeautifulSoup as bs
+import nonebot
 from nonebot.adapters.cqhttp.message import MessageSegment
 from nonebot.log import default_format, logger
 from playwright._impl._driver import compute_driver_executable
diff --git a/tests/platforms/test_arknights.py b/tests/platforms/test_arknights.py
index 7734791..a645c03 100644
--- a/tests/platforms/test_arknights.py
+++ b/tests/platforms/test_arknights.py
@@ -1,8 +1,8 @@
 import typing
 
+from httpx import Response
 import pytest
 import respx
-from httpx import Response
 
 if typing.TYPE_CHECKING:
     import sys
diff --git a/tests/platforms/test_bilibili.py b/tests/platforms/test_bilibili.py
index 4b99c83..3f6b5a3 100644
--- a/tests/platforms/test_bilibili.py
+++ b/tests/platforms/test_bilibili.py
@@ -1,7 +1,7 @@
 import typing
 
-import pytest
 from httpx import Response
+import pytest
 
 if typing.TYPE_CHECKING:
     import sys
diff --git a/tests/platforms/test_ncm_artist.py b/tests/platforms/test_ncm_artist.py
index 37242e5..e11bf84 100644
--- a/tests/platforms/test_ncm_artist.py
+++ b/tests/platforms/test_ncm_artist.py
@@ -1,9 +1,9 @@
 import time
 import typing
 
+from httpx import Response
 import pytest
 import respx
-from httpx import Response
 
 from .utils import get_json
 
diff --git a/tests/platforms/test_ncm_radio.py b/tests/platforms/test_ncm_radio.py
index 3ce6cfe..670a458 100644
--- a/tests/platforms/test_ncm_radio.py
+++ b/tests/platforms/test_ncm_radio.py
@@ -1,9 +1,9 @@
 import time
 import typing
 
+from httpx import Response
 import pytest
 import respx
-from httpx import Response
 
 from .utils import get_json
 
diff --git a/tests/platforms/test_weibo.py b/tests/platforms/test_weibo.py
index 68ee873..11b7d43 100644
--- a/tests/platforms/test_weibo.py
+++ b/tests/platforms/test_weibo.py
@@ -1,11 +1,11 @@
-import typing
 from datetime import datetime
+import typing
 
 import feedparser
-import pytest
-import respx
 from httpx import Response
+import pytest
 from pytz import timezone
+import respx
 
 if typing.TYPE_CHECKING:
     import sys