From 0070a3efef1c7e6165f62ad39a9be53b65b12a29 Mon Sep 17 00:00:00 2001
From: Kyomotoi <kyomotoiowo@gmail.com>
Date: Tue, 10 Aug 2021 20:02:17 +0800
Subject: =?UTF-8?q?=F0=9F=9A=91=EF=B8=8F=20=E8=84=B1=E7=A6=BB=E5=AF=B9=20U?=
 =?UTF-8?q?buntu=20paste=20=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ATRI/plugins/saucenao/data_source.py | 34 ++++++++++------------------------
 1 file changed, 10 insertions(+), 24 deletions(-)

(limited to 'ATRI/plugins/saucenao')

diff --git a/ATRI/plugins/saucenao/data_source.py b/ATRI/plugins/saucenao/data_source.py
index 6e72c98..58b031b 100644
--- a/ATRI/plugins/saucenao/data_source.py
+++ b/ATRI/plugins/saucenao/data_source.py
@@ -1,5 +1,4 @@
 from random import choice
-from aiohttp import FormData
 
 from ATRI.service import Service
 from ATRI.rule import is_in_service
@@ -16,15 +15,8 @@ __doc__ = """
 
 
 class SaouceNao(Service):
-    def __init__(
-        self,
-        api_key: str = None,
-        output_type=2,
-        testmode=1,
-        dbmaski=32768,
-        db=5,
-        numres=5,
-    ):
+    
+    def __init__(self, api_key: str = None, output_type=2, testmode=1, dbmaski=32768, db=5, numres=5):
         Service.__init__(self, "以图搜图", __doc__, rule=is_in_service("以图搜图"))
 
         params = dict()
@@ -35,31 +27,31 @@ class SaouceNao(Service):
         params["db"] = db
         params["numres"] = numres
         self.params = params
-
+    
     async def _request(self, url: str):
         self.params["url"] = url
-
+        
         try:
             res = await request.post(URL, params=self.params)
         except RequestError:
             raise RequestError("Request failed!")
         data = await res.json()
         return data
-
+    
     async def search(self, url: str) -> str:
         data = await self._request(url)
         res = data["results"]
-
+        
         result = list()
         for i in range(len(res)):
             data = res[i]
-
+            
             _result = dict()
             _result["similarity"] = data["header"]["similarity"]
             _result["index_name"] = data["header"]["index_name"]
             _result["url"] = choice(data["data"].get("ext_urls", ["None"]))
             result.append(_result)
-
+        
         msg0 = str()
         for i in result:
             msg0 += (
@@ -68,15 +60,9 @@ class SaouceNao(Service):
                 f"Name: {i['index_name']}\n"
                 f"URL: {i['url'].replace('https://', '')}"
             )
-
+        
         if len(res) <= 3:
             return msg0
         else:
-            data = FormData()
-            data.add_field("poster", "ATRI running log")
-            data.add_field("syntax", "text")
-            data.add_field("expiration", "day")
-            data.add_field("content", msg0)
-
-            repo = f"\n详细请移步此处~\n{await UbuntuPaste(data).paste()}"
+            repo = f"\n详细请移步此处~\n{await UbuntuPaste(content=msg0).paste()}"
             return repo
-- 
cgit v1.2.3