1
1
import json
2
2
import re
3
- from typing import Optional
4
3
5
4
import aiohttp
6
5
import chinese2digits as c2d
22
21
}
23
22
24
23
25
- async def fetch_and_save_image (tag : list , num : int = 1 ) -> Optional [ list ] :
24
+ async def fetch_and_save_image (tag : list , num : int = 1 ) -> list :
26
25
params = storage ['param' ].copy ()
27
26
params ["num" ] = num if 1 < num <= 5 else 1
28
27
if tag :
@@ -34,13 +33,9 @@ async def fetch_and_save_image(tag: list, num: int = 1) -> Optional[list]:
34
33
datas = await response .json ()
35
34
logger .info (datas )
36
35
37
- # 检查是否有数据返回
38
- if not datas ["data" ]:
39
- return None
40
-
41
36
img_url_list = []
42
- for i_url in range ( num ) :
43
- img_url = datas [ " data" ][ i_url ][ " urls" ][ "original" ]
37
+ for data in datas [ 'data' ] :
38
+ img_url = data [ ' urls' ][ 'origin' ]
44
39
img_url = img_url .replace ('i.pixiv.cat' , 'i.pixiv.re' )
45
40
img_url_list .append (img_url )
46
41
return img_url_list
@@ -63,7 +58,7 @@ async def handle_message(event: MessageEvent):
63
58
tag = parts [1 :] # 获取所有的标签
64
59
logger .info (tag )
65
60
img_url = await fetch_and_save_image (tag )
66
- if img_url is None :
61
+ if not img_url :
67
62
await event .reply ("图库查找无结果" , quote = True )
68
63
else :
69
64
await event .reply (Image (img_url [0 ]), quote = False )
@@ -78,7 +73,7 @@ async def handle_message(event: MessageEvent):
78
73
tag = match .group (2 )
79
74
logger .info (f"数量: { num } , 标签: { tag } " )
80
75
img_url = await fetch_and_save_image (tag , num )
81
- if img_url is None :
76
+ if not img_url :
82
77
await event .reply ("图库查找无结果" , quote = True )
83
78
else :
84
79
images = [Image (url ) for url in img_url ]
0 commit comments