update

plugins/send_setu/__init__.py

@@ -3,7 +3,7 @@ from nonebot import on_command, on_regex
 from nonebot.permission import SUPERUSER
 from services.log import logger
 from models.sigin_group_user import SignGroupUser
-from util.utils import FreqLimiter, UserExistLimiter, is_number, get_message_text, get_message_imgs
+from utils.utils import FreqLimiter, UserExistLimiter, is_number, get_message_text, get_message_imgs
 from nonebot.typing import T_State
 from nonebot.adapters.cqhttp import Bot, MessageEvent, GroupMessageEvent, PrivateMessageEvent
 from .data_source import get_setu, get_luoxiang, search_online_setu, get_setu_urls, \
@@ -154,6 +154,7 @@ async def _(bot: Bot, event: PrivateMessageEvent, state: T_State):
             urls, text_list, code = await get_setu_urls(keyword, num, r18=r18)
         except ClientConnectorError:
             await UserCount.add_count(event.user_id, 'setu_r18', count=-1)
+            _ulmt.set_False(event.user_id)
             await setu.finish('网络失败了..别担心！这次搜索不算数喔', at_sender=True)
         else:
             count = 0

plugins/send_setu/data_source.py

@@ -1,13 +1,13 @@
 from configs.path_config import IMAGE_PATH, TXT_PATH
 import os
 import random
-from util.init_result import image
+from utils.init_result import image
 from configs.config import LOLICON_KEY
 import aiohttp
 import aiofiles
 from services.log import logger
-from util.img_utils import get_img_hash
-from util.utils import get_local_proxy, is_number
+from utils.img_utils import get_img_hash
+from utils.utils import get_local_proxy, is_number
 from asyncio.exceptions import TimeoutError
 from models.count_user import UserCount
 from configs.config import DOWNLOAD_SETU
@@ -54,7 +54,8 @@ async def get_setu_urls(keyword: str, num: int = 1, r18: int = 0):
                     if response.status == 200:
                         data = await response.json()
                         if data['code'] == 0:
-                            for i in range(len(data['data'])):
+                            lens = len(data['data'])
+                            for i in range(lens):
                                 img_url = data['data'][i]['url']
                                 title = data['data'][i]['title']
                                 author = data['data'][i]['author']
@@ -77,6 +78,7 @@ async def get_setu_urls(keyword: str, num: int = 1, r18: int = 0):
                             if DOWNLOAD_SETU:
                                 with open(TXT_PATH + file_name, 'w', encoding='utf8') as f:
                                     json.dump(txt_data, f, ensure_ascii=False, indent=4)
+                            num = lens if num > lens else num
                             random_idx = random.sample(range(len(data['data'])), num)
                             x_urls = []
                             x_text_lst = []
@@ -123,7 +125,6 @@ def get_setu(index: str, setu_data: dict, tag: str = None):
         index = random.randint(0, length - 1)
     if tag:
         all_tag_setu = [x for x in setu_data.keys() if tag in setu_data[x]['tags']]
-        print(all_tag_setu)
         if all_tag_setu:
             index = random.choice(all_tag_setu)
     if is_number(index):