From a8afa113cfef80237031916e20df44bc11df2270 Mon Sep 17 00:00:00 2001 From: Kyomotoi <0w0@imki.moe> Date: Mon, 17 Oct 2022 23:46:00 +0800 Subject: =?UTF-8?q?=E2=99=BB=EF=B8=8F=20=E8=B7=9F=E8=BF=9B=20service=20?= =?UTF-8?q?=E7=9A=84=E5=8F=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ATRI/plugins/saucenao/__init__.py | 8 ++++++-- ATRI/plugins/saucenao/data_source.py | 6 +----- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'ATRI/plugins/saucenao') diff --git a/ATRI/plugins/saucenao/__init__.py b/ATRI/plugins/saucenao/__init__.py index 8850c9d..b653a13 100644 --- a/ATRI/plugins/saucenao/__init__.py +++ b/ATRI/plugins/saucenao/__init__.py @@ -5,14 +5,18 @@ from nonebot.adapters.onebot.v11.helpers import extract_image_urls, Cooldown from ATRI import conf from ATRI.log import log -from ATRI.service import ServiceTools +from ATRI.service import Service, ServiceTools from .data_source import SauceNao +plugin = Service("以图搜图").document("以图搜图,仅限二刺螈") +sau = SauceNao() + + _search_flmt_notice = choice(["慢...慢一..点❤", "冷静1下", "歇会歇会~~"]) -saucenao = SauceNao().on_command("以图搜图", "透过一张图搜索可能的来源") +saucenao = plugin.on_command("以图搜图", "透过一张图搜索可能的来源") @saucenao.got("saucenao_img", "图呢?", [Cooldown(5, prompt=_search_flmt_notice)]) diff --git a/ATRI/plugins/saucenao/data_source.py b/ATRI/plugins/saucenao/data_source.py index eaeafed..004d9de 100644 --- a/ATRI/plugins/saucenao/data_source.py +++ b/ATRI/plugins/saucenao/data_source.py @@ -1,7 +1,5 @@ from random import choice -from ATRI.service import Service -from ATRI.rule import is_in_service from ATRI.exceptions import RequestError from ATRI.utils import request @@ -9,7 +7,7 @@ from ATRI.utils import request URL = "https://saucenao.com/search.php" -class SauceNao(Service): +class SauceNao: def __init__( self, api_key: str = str(), @@ -19,8 +17,6 @@ class SauceNao(Service): db=5, numres=5, ): - Service.__init__(self, "以图搜图", "以图搜图,仅限二刺螈", rule=is_in_service("以图搜图")) - params = dict() params["api_key"] = api_key params["output_type"] = output_type -- cgit v1.2.3