Merge branch 'main' into nonebot-b1

This commit is contained in:
felinae98
2022-02-12 11:21:20 +08:00
52 changed files with 959 additions and 708 deletions
@@ -1,9 +1,9 @@
from pathlib import Path
from pkgutil import iter_modules
from collections import defaultdict
from importlib import import_module
from pathlib import Path
from pkgutil import iter_modules
from .platform import Platform, NoTargetGroup
from .platform import NoTargetGroup, Platform
_package_dir = str(Path(__file__).resolve().parent)
for (_, module_name, _) in iter_modules([_package_dir]):
@@ -4,8 +4,8 @@ from typing import Any, Optional
import httpx
from ..post import Post
from ..types import Tag, Target, RawPost, Category
from .platform import NewMessage, CategoryNotSupport
from ..types import Category, RawPost, Tag, Target
from .platform import CategoryNotSupport, NewMessage
class Bilibili(NewMessage):
@@ -3,8 +3,8 @@ from typing import Any, Optional
import httpx
from ..post import Post
from ..types import RawPost, Target
from .platform import NewMessage
from ..types import Target, RawPost
class NcmArtist(NewMessage):
@@ -3,8 +3,8 @@ from typing import Any, Optional
import httpx
from ..post import Post
from ..types import RawPost, Target
from .platform import NewMessage
from ..types import Target, RawPost
class NcmRadio(NewMessage):
@@ -1,15 +1,15 @@
import time
from dataclasses import dataclass
from abc import ABC, abstractmethod
from collections import defaultdict
from typing import Any, Literal, Optional, Collection
from dataclasses import dataclass
import time
from typing import Any, Collection, Literal, Optional
import httpx
from nonebot import logger
from ..post import Post
from ..plugin_config import plugin_config
from ..types import Tag, User, Target, RawPost, Category, UserSubInfo
from ..post import Post
from ..types import Category, RawPost, Tag, Target, User, UserSubInfo
class CategoryNotSupport(Exception):
+3 -3
View File
@@ -1,13 +1,13 @@
import calendar
from typing import Any, Optional
import httpx
import feedparser
from bs4 import BeautifulSoup as bs
import feedparser
import httpx
from ..post import Post
from ..types import RawPost, Target
from .platform import NewMessage
from ..types import Target, RawPost
class Rss(NewMessage):
+4 -5
View File
@@ -1,14 +1,13 @@
import re
import json
import hashlib
from datetime import datetime
import hashlib
import json
import re
from typing import Any, Optional
import httpx
from bs4 import BeautifulSoup as bs
import httpx
from ..types import *
from ..post import Post
# from .platform import Platform