diff --git a/.env.dev b/.env.dev index c99defd1..b81a776a 100644 --- a/.env.dev +++ b/.env.dev @@ -1,10 +1,18 @@ +<<<<<<< HEAD SUPERUSERS=[""] +======= +SUPERUSERS=["775757368"] +>>>>>>> master COMMAND_START=[""] SESSION_RUNNING_EXPRESSION="别急呀,小真寻要宕机了!QAQ" +<<<<<<< HEAD NICKNAME=["真寻", "小真寻", "绪山真寻", "小寻子"] +======= +NICKNAME=["A"] +>>>>>>> master SESSION_EXPIRE_TIMEOUT=30 diff --git a/.gitgignore b/.gitgignore new file mode 100644 index 00000000..45d71f23 --- /dev/null +++ b/.gitgignore @@ -0,0 +1,2 @@ +*/__pycache__/ +/.idea/ diff --git a/bot.py b/bot.py index 2244a30a..512afdb0 100644 --- a/bot.py +++ b/bot.py @@ -1,3 +1,7 @@ +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> master import nonebot from nonebot.adapters.cqhttp import Bot as CQHTTPBot from services.db_context import init, disconnect @@ -70,7 +74,11 @@ if __name__ == "__main__": # "role": "member/admin/owner", "title": ""}, "to_me": true, "reply": null, "group_id": 863633108, "anonymous": null} # bilibili转发 +<<<<<<< HEAD # {"app":"com.tencent.miniapp_01","configs":{"autoSize":0,"ctime":1613992391,"forward":1,"height":0," +======= +# {"app":"com.tencent.miniapp_01","config":{"autoSize":0,"ctime":1613992391,"forward":1,"height":0," +>>>>>>> master # token":"f7f529900be6af62f4d864f8a92c94c9","type":"normal","width":0},"desc":"哔哩哔哩", # "extra":{"app_type":1,"appid":100951776,"uin":775757368},"meta":{"detail_1":{"appid":"1109937557", # "desc":"B 站 用 户 三 连 现 状","gamePoints":"","gamePointsUrl":"","host":{"nick":"这里是","uin":775757368}, @@ -92,3 +100,102 @@ if __name__ == "__main__": +<<<<<<< HEAD +======= +======= +import nonebot +from nonebot.adapters.cqhttp import Bot as CQHTTPBot +from services.db_context import init, disconnect +nonebot.init() +driver = nonebot.get_driver() +driver.register_adapter("cqhttp", CQHTTPBot) +config = driver.config +driver.on_startup(init) +driver.on_shutdown(disconnect) +nonebot.load_builtin_plugins() +nonebot.load_plugins("plugins") +nonebot.load_plugins("plugins/shop") +nonebot.load_plugins("plugins/genshin") + + +if __name__ == "__main__": + nonebot.run() + + + + + + + + + + + + + + +# None +# --------------------- +# 775757368 print(event.get_user_id()) +# 775757368 print(event.get_session_id()) +# 天气 print(event.get_message()) +# message.group.normal print(event.get_event_name()) +# 天气 print(event.get_plaintext()) +# ------- +# 863633108 print(event.group_id) +# 775757368 print(event.user_id) +# 1851212230 print(event.message_id) + +# event +# [request.group.invite]: { +# 'time': 1612430661, 'self_id': 3054557284, 'post_type': 'request', 'request_type': 'group', 'sub_type': 'invite', +# 'group_id': 863633108, 'user_id': 775757368, 'comment': '', 'flag': '1612430661235986'} + +# [request.friend]: {'time': 1612431762, 'self_id': 3054557284, 'post_type': 'request', +# 'request_type': 'friend', 'user_id': 3238573864, 'comment': '', 'flag': '1612431762000000'} + + +# [notice.group_decrease.leave]: {'time': 1612620312, +# 'self_id': 3054557284, 'post_type': 'notice', 'notice_type': 'group_decrease', +# 'sub_type': 'leave', 'user_id': 3238573864, 'group_id': 863633108, 'operator_id': 3238573864} + +# [notice.group_increase.approve]: {'time': 1612620506, +# 'self_id': 3054557284, 'post_type': 'notice', 'notice_type': 'group_increase', +# 'sub_type': 'approve', 'user_id': 3238573864, 'group_id': 863633108, 'operator_id': 0} + +# get_group_list +# [{'group_id': 210287674, 'group_name': '豪爹头号粉丝⑧群', 'max_member_count': 200, 'member_count': 14}, +# {'group_id': 863633108, 'group_name': 'Amireux、这里是、可…', 'max_member_count': 200, 'member_count': 4}] + +# 消息event +# {"time": 1613886297, "self_id": 3054557284, "post_type": "message", "sub_type": "normal", "user_id": 3238573864, +# "message_type": "group", "message_id": 1933353523, "message": [{"type": "text", "data": {"text": "666"}}], +# "raw_message": "A666", "font": 0, "sender": {"user_id": 3238573864, "nickname": +# "\u53ef\u7231\u7684\u5c0f\u771f\u5bfb", "sex": "unknown", "age": 0, "card": "", "area": "", "level": "", +# "role": "member/admin/owner", "title": ""}, "to_me": true, "reply": null, "group_id": 863633108, "anonymous": null} + +# bilibili转发 +# {"app":"com.tencent.miniapp_01","config":{"autoSize":0,"ctime":1613992391,"forward":1,"height":0," +# token":"f7f529900be6af62f4d864f8a92c94c9","type":"normal","width":0},"desc":"哔哩哔哩", +# "extra":{"app_type":1,"appid":100951776,"uin":775757368},"meta":{"detail_1":{"appid":"1109937557", +# "desc":"B 站 用 户 三 连 现 状","gamePoints":"","gamePointsUrl":"","host":{"nick":"这里是","uin":775757368}, +# "icon":"http://miniapp.gtimg.cn/public/appicon/432b76be3a548fc128acaa6c1ec90131_200.jpg", +# "preview":"pubminishare-30161.picsz.qpic.cn/4f5a19fb-42d5-4bb5-bc0a-b92fa5a06519", +# "qqdocurl":"https://b23.tv/qDvchc?share_medium=android&share_source=qq&bbid=XYDEA6CD35717661AE594D9DD99A5E852E414&ts=1613992387314", +# "scene":1036,"shareTemplateData":{},"shareTemplateId":"8C8E89B49BE609866298ADDFF2DBABA4","showLittleTail":"","title":"哔哩哔哩", +# "url":"m.q.qq.com/a/s/130c1f9c2af58430805ebfda192caa9a"}},"needShareCallBack":false,"prompt":"[QQ小程序]哔哩哔哩","ver":"1.0.0.19", +# "view":"view_8C8E89B49BE609866298ADDFF2DBABA4"} + +#event +# [notice.group_decrease.kick_me]: {'time': 1614143313, 'self_id': 3054557284, 'post_type': 'notice', +# 'notice_type': 'group_decrease', 'sub_type': 'kick_me', 'user_id': 3054557284, 'group_id': 863633108, +# 'operator_id': 775757368} + +# [request.group.add]: {'time': 1614851972, 'self_id': 3238573864, 'post_type': 'request', 'request_type': 'group', +# 'sub_type': 'add', 'group_id': 774261838, 'user_id': 3054557284, 'comment': '问题:为啥加群鸭?\n答案:哈哈哈', +# 'flag': '1614851972274444'} + + + +>>>>>>> master +>>>>>>> master diff --git a/configs/config.py b/configs/config.py index 509b0151..8d36185b 100644 --- a/configs/config.py +++ b/configs/config.py @@ -6,6 +6,7 @@ except ModuleNotFoundError: # 是否使用配置文件 +<<<<<<< HEAD USE_CONFIG_FILE = True @@ -24,6 +25,9 @@ password = '' address = '' port = '' database = '' +======= +USE_CONFIG_FILE = False +>>>>>>> master # 公开图库列表 @@ -32,6 +36,7 @@ IMAGE_DIR_LIST = ["色图", "美图", "萝莉", "壁纸"] # 对被ban用户发送的消息 BAN_RESULT = "才不会给你发消息." +<<<<<<< HEAD # 插件配置 MAXINFO_REIMU: int = 7 # 上车(reimu)功能查找目的地的最大数 @@ -39,11 +44,22 @@ COUNT_PER_DAY_REIMU: int = 5 # 每日上车(reimu)次数限制 MAXINFO_BT: int = 10 # bt功能单次查找最大数 MAXINFO_PRIVATE_ANIME: int = 20 # 私聊搜索动漫返回的最大数量 MAXINFO_GROUP_ANIME: int = 5 # 群搜索动漫返回的最大数量 +======= +MAXINFO_REIMU: int = 7 # 上车功能查找目的地的最大数 +COUNT_PER_DAY_REIMU: int = 5 # 每日上车次数限制 +MAXINFO_BT: int = 10 # bt功能单次查找最大数 +MAXINFO_PRIVATE_ANIME: int = 20 # 私聊单词搜索动漫最大数 +MAXINFO_GROUP_ANIME: int = 5 # 群单词搜索动漫最大数 +>>>>>>> master MAX_FIND_IMG_COUNT = 3 # 识图最大返回数 ADMIN_DEFAULT_AUTH = 5 # 默认群管理员权限 +<<<<<<< HEAD MAX_SIGN_GOLD = 200 # 签到好感度加成额外获得的最大金币数 +======= +MAX_SIGN_GOLD = 200 # 好感度加成额外获得的最大金币数 +>>>>>>> master INITIAL_SETU_PROBABILITY = 0.7 # 色图概率 FUDU_PROBABILITY = 0.7 # 复读概率 @@ -54,6 +70,7 @@ MUTE_DEFAULT_TIME = 7 # 刷屏检测默认规定时间 MUTE_DEFAULT_DURATION = 10 # 刷屏检测默禁言时长(分钟) +<<<<<<< HEAD # 注:即在 MALICIOUS_CHECK_TIME 时间内触发相同命令 MALICIOUS_BAN_COUNT 将被ban MALICIOUS_BAN_TIME 分钟 MALICIOUS_BAN_TIME = 30 # 恶意命令触发检测触发后ban的时长(分钟) MALICIOUS_BAN_COUNT = 4 # 恶意命令触发检测最大触发次数 @@ -71,6 +88,25 @@ MUTE_LEVEL: int = 5 # 更改禁言设置权限 # 示例:[434995955, 239483248] UPDATE_GOCQ_GROUP = [] +======= +# 注:即在 MALICIOUS_BAN_COUNT 时间内触发相同命令 MALICIOUS_CHECK_TIME 将被ban MALICIOUS_BAN_TIME 分钟 +MALICIOUS_BAN_TIME = 30 # 恶意命令触发检测触发后ban的时长(分钟) +MALICIOUS_BAN_COUNT = 4 # 恶意命令触发检测规定时间内(秒) +MALICIOUS_CHECK_TIME = 5 # 恶意命令触发检测最大触发次数 + +# LEVEL +DELETE_IMG_LEVEL: int = 7 +MOVE_IMG_LEVEL: int = 7 +UPLOAD_LEVEL: int = 6 +BAN_LEVEL: int = 5 +OC_LEVEL: int = 2 +MUTE_LEVEL: int = 5 + +# 需要更新gocq吗? +UPDATE_GOCQ_GROUP = [] + + +>>>>>>> master # 代理 system_proxy = 'http://127.0.0.1:7890' buff_proxy = '' @@ -83,8 +119,28 @@ LOCAL_SETU = True AUTO_ADD_FRIEND = True +<<<<<<< HEAD # 模块与对应命令 # 用于生成帮助图片 和 开关功能 +======= +# API KEY +LOLICON_KEY: str = "336595836015174952daa2" # lolicon +RSSHUBAPP: str = "https://docs.rsshub.app/" # rsshub +# 图灵 +TL_KEY = ["4474710fabbf4540bfaa569c192bb457", "6f4c0920d2ff4962b5cbd8148aef771b", + "f5595738894042fb9fad88ecdc4acf41", "c24400595fed48f9a5c5bc3ff03a3267", "efab135b75d84b02a59115f5b571f277"] + +# 数据库 +bind = 'postgresql://hibiki:KEWang130123@hibiki0v0.cn:5432/hibikibot' +sql_name = '' +user = '' +password = '' +address = '' +port = '' +database = '' + + +>>>>>>> master plugins2name_dict = { 'sign_in': ['签到'], 'send_img': ['发送图片', '萝莉', '美图', '壁纸'], @@ -123,7 +179,11 @@ plugins2name_dict = { 'query_resource_points': ['原神资源查询', '原神资源列表'], } +<<<<<<< HEAD # 群管理员功能 与 对应权限 +======= + +>>>>>>> master admin_plugins_auth = { 'admin_bot_manage': OC_LEVEL, 'ban': BAN_LEVEL, @@ -134,16 +194,23 @@ admin_plugins_auth = { 'mute': MUTE_LEVEL, } +<<<<<<< HEAD # 配置文件应用 +======= + +>>>>>>> master if USE_CONFIG_FILE: config = get_config_data() if config: for key in config.keys(): if isinstance(config[key], str): config[key] = config[key].strip() +<<<<<<< HEAD if key.find('proxy') != -1: if not config[key]: config[key] = None +======= +>>>>>>> master # if not configs[key] and key.find("PATH") == -1: # configs[key] = None globals().update(config) diff --git a/configs/utils/__pycache__/util.cpython-39.pyc b/configs/utils/__pycache__/util.cpython-39.pyc new file mode 100644 index 00000000..3ec6590c Binary files /dev/null and b/configs/utils/__pycache__/util.cpython-39.pyc differ diff --git a/plugins/aconfig/__pycache__/__init__.cpython-38.pyc b/plugins/aconfig/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 00000000..42dacef3 Binary files /dev/null and b/plugins/aconfig/__pycache__/__init__.cpython-38.pyc differ diff --git a/plugins/aconfig/__pycache__/__init__.cpython-39.pyc b/plugins/aconfig/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 00000000..11dcfb37 Binary files /dev/null and b/plugins/aconfig/__pycache__/__init__.cpython-39.pyc differ diff --git a/plugins/admin_bot_manage/__pycache__/__init__.cpython-38.pyc b/plugins/admin_bot_manage/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 00000000..5a1526bb Binary files /dev/null and b/plugins/admin_bot_manage/__pycache__/__init__.cpython-38.pyc differ diff --git a/plugins/admin_bot_manage/__pycache__/__init__.cpython-39.pyc b/plugins/admin_bot_manage/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 00000000..098a4cde Binary files /dev/null and b/plugins/admin_bot_manage/__pycache__/__init__.cpython-39.pyc differ diff --git a/plugins/admin_bot_manage/__pycache__/data_source.cpython-38.pyc b/plugins/admin_bot_manage/__pycache__/data_source.cpython-38.pyc new file mode 100644 index 00000000..6f9fd211 Binary files /dev/null and b/plugins/admin_bot_manage/__pycache__/data_source.cpython-38.pyc differ diff --git a/plugins/admin_bot_manage/__pycache__/data_source.cpython-39.pyc b/plugins/admin_bot_manage/__pycache__/data_source.cpython-39.pyc new file mode 100644 index 00000000..5437c578 Binary files /dev/null and b/plugins/admin_bot_manage/__pycache__/data_source.cpython-39.pyc differ diff --git a/plugins/admin_help/__pycache__/__init__.cpython-38.pyc b/plugins/admin_help/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 00000000..2a943938 Binary files /dev/null and b/plugins/admin_help/__pycache__/__init__.cpython-38.pyc differ diff --git a/plugins/admin_help/__pycache__/__init__.cpython-39.pyc b/plugins/admin_help/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 00000000..569123fd Binary files /dev/null and b/plugins/admin_help/__pycache__/__init__.cpython-39.pyc differ diff --git a/plugins/ai/__pycache__/__init__.cpython-38.pyc b/plugins/ai/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 00000000..c8ad1e1f Binary files /dev/null and b/plugins/ai/__pycache__/__init__.cpython-38.pyc differ diff --git a/plugins/ai/__pycache__/__init__.cpython-39.pyc b/plugins/ai/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 00000000..f3e1b82b Binary files /dev/null and b/plugins/ai/__pycache__/__init__.cpython-39.pyc differ diff --git a/plugins/ai/__pycache__/data_source.cpython-38.pyc b/plugins/ai/__pycache__/data_source.cpython-38.pyc new file mode 100644 index 00000000..43b03ebe Binary files /dev/null and b/plugins/ai/__pycache__/data_source.cpython-38.pyc differ diff --git a/plugins/ai/__pycache__/data_source.cpython-39.pyc b/plugins/ai/__pycache__/data_source.cpython-39.pyc new file mode 100644 index 00000000..4eaa7fd0 Binary files /dev/null and b/plugins/ai/__pycache__/data_source.cpython-39.pyc differ diff --git a/plugins/auto_invite/__pycache__/__init__.cpython-38.pyc b/plugins/auto_invite/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 00000000..bc01b25a Binary files /dev/null and b/plugins/auto_invite/__pycache__/__init__.cpython-38.pyc differ diff --git a/plugins/auto_invite/__pycache__/__init__.cpython-39.pyc b/plugins/auto_invite/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 00000000..9a9a1a90 Binary files /dev/null and b/plugins/auto_invite/__pycache__/__init__.cpython-39.pyc differ diff --git a/plugins/ban/__pycache__/__init__.cpython-38.pyc b/plugins/ban/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 00000000..e38a327f Binary files /dev/null and b/plugins/ban/__pycache__/__init__.cpython-38.pyc differ diff --git a/plugins/ban/__pycache__/__init__.cpython-39.pyc b/plugins/ban/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 00000000..3bb7d493 Binary files /dev/null and b/plugins/ban/__pycache__/__init__.cpython-39.pyc differ diff --git a/plugins/broadcast/__pycache__/__init__.cpython-38.pyc b/plugins/broadcast/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 00000000..4afd8a50 Binary files /dev/null and b/plugins/broadcast/__pycache__/__init__.cpython-38.pyc differ diff --git a/plugins/broadcast/__pycache__/__init__.cpython-39.pyc b/plugins/broadcast/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 00000000..b196d44e Binary files /dev/null and b/plugins/broadcast/__pycache__/__init__.cpython-39.pyc differ diff --git a/plugins/bt/__pycache__/__init__.cpython-38.pyc b/plugins/bt/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 00000000..01bdabee Binary files /dev/null and b/plugins/bt/__pycache__/__init__.cpython-38.pyc differ diff --git a/plugins/bt/__pycache__/__init__.cpython-39.pyc b/plugins/bt/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 00000000..58d50e12 Binary files /dev/null and b/plugins/bt/__pycache__/__init__.cpython-39.pyc differ diff --git a/plugins/bt/__pycache__/data_source.cpython-38.pyc b/plugins/bt/__pycache__/data_source.cpython-38.pyc new file mode 100644 index 00000000..0d4af9b7 Binary files /dev/null and b/plugins/bt/__pycache__/data_source.cpython-38.pyc differ diff --git a/plugins/bt/__pycache__/data_source.cpython-39.pyc b/plugins/bt/__pycache__/data_source.cpython-39.pyc new file mode 100644 index 00000000..f7c47d95 Binary files /dev/null and b/plugins/bt/__pycache__/data_source.cpython-39.pyc differ diff --git a/plugins/check/__pycache__/__init__.cpython-38.pyc b/plugins/check/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 00000000..0735d60d Binary files /dev/null and b/plugins/check/__pycache__/__init__.cpython-38.pyc differ diff --git a/plugins/check/__pycache__/__init__.cpython-39.pyc b/plugins/check/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 00000000..5bfd5f68 Binary files /dev/null and b/plugins/check/__pycache__/__init__.cpython-39.pyc differ diff --git a/plugins/check/__pycache__/data_source.cpython-38.pyc b/plugins/check/__pycache__/data_source.cpython-38.pyc new file mode 100644 index 00000000..279d1374 Binary files /dev/null and b/plugins/check/__pycache__/data_source.cpython-38.pyc differ diff --git a/plugins/check/__pycache__/data_source.cpython-39.pyc b/plugins/check/__pycache__/data_source.cpython-39.pyc new file mode 100644 index 00000000..dcfa2938 Binary files /dev/null and b/plugins/check/__pycache__/data_source.cpython-39.pyc differ diff --git a/plugins/coser/__pycache__/__init__.cpython-38.pyc b/plugins/coser/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 00000000..45df0634 Binary files /dev/null and b/plugins/coser/__pycache__/__init__.cpython-38.pyc differ diff --git a/plugins/coser/__pycache__/__init__.cpython-39.pyc b/plugins/coser/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 00000000..fd08ed41 Binary files /dev/null and b/plugins/coser/__pycache__/__init__.cpython-39.pyc differ diff --git a/plugins/delete_img/__pycache__/__init__.cpython-38.pyc b/plugins/delete_img/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 00000000..bf87c76e Binary files /dev/null and b/plugins/delete_img/__pycache__/__init__.cpython-38.pyc differ diff --git a/plugins/delete_img/__pycache__/__init__.cpython-39.pyc b/plugins/delete_img/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 00000000..e6418283 Binary files /dev/null and b/plugins/delete_img/__pycache__/__init__.cpython-39.pyc differ diff --git a/plugins/dialogue/__pycache__/__init__.cpython-38.pyc b/plugins/dialogue/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 00000000..07fc0cb6 Binary files /dev/null and b/plugins/dialogue/__pycache__/__init__.cpython-38.pyc differ diff --git a/plugins/dialogue/__pycache__/__init__.cpython-39.pyc b/plugins/dialogue/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 00000000..8ee41a1a Binary files /dev/null and b/plugins/dialogue/__pycache__/__init__.cpython-39.pyc differ diff --git a/plugins/draw_card/__pycache__/__init__.cpython-38.pyc b/plugins/draw_card/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 00000000..228a0662 Binary files /dev/null and b/plugins/draw_card/__pycache__/__init__.cpython-38.pyc differ diff --git a/plugins/draw_card/__pycache__/__init__.cpython-39.pyc b/plugins/draw_card/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 00000000..c8e3c911 Binary files /dev/null and b/plugins/draw_card/__pycache__/__init__.cpython-39.pyc differ diff --git a/plugins/draw_card/__pycache__/announcement.cpython-39.pyc b/plugins/draw_card/__pycache__/announcement.cpython-39.pyc new file mode 100644 index 00000000..f8f5af29 Binary files /dev/null and b/plugins/draw_card/__pycache__/announcement.cpython-39.pyc differ diff --git a/plugins/draw_card/__pycache__/config.cpython-38.pyc b/plugins/draw_card/__pycache__/config.cpython-38.pyc new file mode 100644 index 00000000..a1980fc3 Binary files /dev/null and b/plugins/draw_card/__pycache__/config.cpython-38.pyc differ diff --git a/plugins/draw_card/__pycache__/config.cpython-39.pyc b/plugins/draw_card/__pycache__/config.cpython-39.pyc new file mode 100644 index 00000000..4dd03ded Binary files /dev/null and b/plugins/draw_card/__pycache__/config.cpython-39.pyc differ diff --git a/plugins/draw_card/__pycache__/genshin_handle.cpython-38.pyc b/plugins/draw_card/__pycache__/genshin_handle.cpython-38.pyc new file mode 100644 index 00000000..fbc3ba8d Binary files /dev/null and b/plugins/draw_card/__pycache__/genshin_handle.cpython-38.pyc differ diff --git a/plugins/draw_card/__pycache__/genshin_handle.cpython-39.pyc b/plugins/draw_card/__pycache__/genshin_handle.cpython-39.pyc new file mode 100644 index 00000000..eec4add5 Binary files /dev/null and b/plugins/draw_card/__pycache__/genshin_handle.cpython-39.pyc differ diff --git a/plugins/draw_card/__pycache__/init_card_pool.cpython-39.pyc b/plugins/draw_card/__pycache__/init_card_pool.cpython-39.pyc new file mode 100644 index 00000000..02d57fa4 Binary files /dev/null and b/plugins/draw_card/__pycache__/init_card_pool.cpython-39.pyc differ diff --git a/plugins/draw_card/__pycache__/pretty_handle.cpython-39.pyc b/plugins/draw_card/__pycache__/pretty_handle.cpython-39.pyc new file mode 100644 index 00000000..8774e41b Binary files /dev/null and b/plugins/draw_card/__pycache__/pretty_handle.cpython-39.pyc differ diff --git a/plugins/draw_card/__pycache__/prts_handle.cpython-38.pyc b/plugins/draw_card/__pycache__/prts_handle.cpython-38.pyc new file mode 100644 index 00000000..8e4f77e7 Binary files /dev/null and b/plugins/draw_card/__pycache__/prts_handle.cpython-38.pyc differ diff --git a/plugins/draw_card/__pycache__/prts_handle.cpython-39.pyc b/plugins/draw_card/__pycache__/prts_handle.cpython-39.pyc new file mode 100644 index 00000000..db3503ce Binary files /dev/null and b/plugins/draw_card/__pycache__/prts_handle.cpython-39.pyc differ diff --git a/plugins/draw_card/__pycache__/update_game_info.cpython-38.pyc b/plugins/draw_card/__pycache__/update_game_info.cpython-38.pyc new file mode 100644 index 00000000..429d5438 Binary files /dev/null and b/plugins/draw_card/__pycache__/update_game_info.cpython-38.pyc differ diff --git a/plugins/draw_card/__pycache__/update_game_info.cpython-39.pyc b/plugins/draw_card/__pycache__/update_game_info.cpython-39.pyc new file mode 100644 index 00000000..95e4b678 Binary files /dev/null and b/plugins/draw_card/__pycache__/update_game_info.cpython-39.pyc differ diff --git a/plugins/draw_card/__pycache__/util.cpython-38.pyc b/plugins/draw_card/__pycache__/util.cpython-38.pyc new file mode 100644 index 00000000..9345c928 Binary files /dev/null and b/plugins/draw_card/__pycache__/util.cpython-38.pyc differ diff --git a/plugins/draw_card/__pycache__/util.cpython-39.pyc b/plugins/draw_card/__pycache__/util.cpython-39.pyc new file mode 100644 index 00000000..4f102f4c Binary files /dev/null and b/plugins/draw_card/__pycache__/util.cpython-39.pyc differ diff --git a/plugins/epic/__pycache__/__init__.cpython-38.pyc b/plugins/epic/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 00000000..d34d9136 Binary files /dev/null and b/plugins/epic/__pycache__/__init__.cpython-38.pyc differ diff --git a/plugins/epic/__pycache__/__init__.cpython-39.pyc b/plugins/epic/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 00000000..08ef01d7 Binary files /dev/null and b/plugins/epic/__pycache__/__init__.cpython-39.pyc differ diff --git a/plugins/epic/__pycache__/data_source.cpython-38.pyc b/plugins/epic/__pycache__/data_source.cpython-38.pyc new file mode 100644 index 00000000..825f6e02 Binary files /dev/null and b/plugins/epic/__pycache__/data_source.cpython-38.pyc differ diff --git a/plugins/epic/__pycache__/data_source.cpython-39.pyc b/plugins/epic/__pycache__/data_source.cpython-39.pyc new file mode 100644 index 00000000..4c17f0c8 Binary files /dev/null and b/plugins/epic/__pycache__/data_source.cpython-39.pyc differ diff --git a/plugins/genshin/almanac/__pycache__/__init__.cpython-39.pyc b/plugins/genshin/almanac/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 00000000..45815d12 Binary files /dev/null and b/plugins/genshin/almanac/__pycache__/__init__.cpython-39.pyc differ diff --git a/plugins/genshin/almanac/__pycache__/alc.cpython-39.pyc b/plugins/genshin/almanac/__pycache__/alc.cpython-39.pyc new file mode 100644 index 00000000..00560e4b Binary files /dev/null and b/plugins/genshin/almanac/__pycache__/alc.cpython-39.pyc differ diff --git a/plugins/genshin/material_remind/__pycache__/__init__.cpython-39.pyc b/plugins/genshin/material_remind/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 00000000..75200979 Binary files /dev/null and b/plugins/genshin/material_remind/__pycache__/__init__.cpython-39.pyc differ diff --git a/plugins/genshin/qiu_qiu_translation/__pycache__/__init__.cpython-39.pyc b/plugins/genshin/qiu_qiu_translation/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 00000000..c9e8e5b0 Binary files /dev/null and b/plugins/genshin/qiu_qiu_translation/__pycache__/__init__.cpython-39.pyc differ diff --git a/plugins/genshin/qiu_qiu_translation/__pycache__/qiu_translation.cpython-39.pyc b/plugins/genshin/qiu_qiu_translation/__pycache__/qiu_translation.cpython-39.pyc new file mode 100644 index 00000000..45faf564 Binary files /dev/null and b/plugins/genshin/qiu_qiu_translation/__pycache__/qiu_translation.cpython-39.pyc differ diff --git a/plugins/genshin/query_resource_points/__pycache__/__init__.cpython-39.pyc b/plugins/genshin/query_resource_points/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 00000000..7a715786 Binary files /dev/null and b/plugins/genshin/query_resource_points/__pycache__/__init__.cpython-39.pyc differ diff --git a/plugins/genshin/query_resource_points/__pycache__/query_resource.cpython-39.pyc b/plugins/genshin/query_resource_points/__pycache__/query_resource.cpython-39.pyc new file mode 100644 index 00000000..7515ff1f Binary files /dev/null and b/plugins/genshin/query_resource_points/__pycache__/query_resource.cpython-39.pyc differ diff --git a/plugins/group_handle/__pycache__/__init__.cpython-38.pyc b/plugins/group_handle/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 00000000..052dcad8 Binary files /dev/null and b/plugins/group_handle/__pycache__/__init__.cpython-38.pyc differ diff --git a/plugins/group_handle/__pycache__/__init__.cpython-39.pyc b/plugins/group_handle/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 00000000..18c53520 Binary files /dev/null and b/plugins/group_handle/__pycache__/__init__.cpython-39.pyc differ diff --git a/plugins/help/__pycache__/__init__.cpython-38.pyc b/plugins/help/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 00000000..5799dfe6 Binary files /dev/null and b/plugins/help/__pycache__/__init__.cpython-38.pyc differ diff --git a/plugins/help/__pycache__/__init__.cpython-39.pyc b/plugins/help/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 00000000..960f0cb7 Binary files /dev/null and b/plugins/help/__pycache__/__init__.cpython-39.pyc differ diff --git a/plugins/help/__pycache__/config.cpython-38.pyc b/plugins/help/__pycache__/config.cpython-38.pyc new file mode 100644 index 00000000..8549f4cf Binary files /dev/null and b/plugins/help/__pycache__/config.cpython-38.pyc differ diff --git a/plugins/help/__pycache__/config.cpython-39.pyc b/plugins/help/__pycache__/config.cpython-39.pyc new file mode 100644 index 00000000..e6e147c1 Binary files /dev/null and b/plugins/help/__pycache__/config.cpython-39.pyc differ diff --git a/plugins/help/__pycache__/data_source.cpython-38.pyc b/plugins/help/__pycache__/data_source.cpython-38.pyc new file mode 100644 index 00000000..07934ed1 Binary files /dev/null and b/plugins/help/__pycache__/data_source.cpython-38.pyc differ diff --git a/plugins/help/__pycache__/data_source.cpython-39.pyc b/plugins/help/__pycache__/data_source.cpython-39.pyc new file mode 100644 index 00000000..31015e7c Binary files /dev/null and b/plugins/help/__pycache__/data_source.cpython-39.pyc differ diff --git a/plugins/last_chat/__pycache__/__init__.cpython-38.pyc b/plugins/last_chat/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 00000000..ed75ce66 Binary files /dev/null and b/plugins/last_chat/__pycache__/__init__.cpython-38.pyc differ diff --git a/plugins/last_chat/__pycache__/__init__.cpython-39.pyc b/plugins/last_chat/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 00000000..57db412d Binary files /dev/null and b/plugins/last_chat/__pycache__/__init__.cpython-39.pyc differ diff --git a/plugins/last_chat/__pycache__/data_source.cpython-38.pyc b/plugins/last_chat/__pycache__/data_source.cpython-38.pyc new file mode 100644 index 00000000..64b24a31 Binary files /dev/null and b/plugins/last_chat/__pycache__/data_source.cpython-38.pyc differ diff --git a/plugins/last_chat/__pycache__/data_source.cpython-39.pyc b/plugins/last_chat/__pycache__/data_source.cpython-39.pyc new file mode 100644 index 00000000..b6d809c2 Binary files /dev/null and b/plugins/last_chat/__pycache__/data_source.cpython-39.pyc differ diff --git a/plugins/luxun/__pycache__/__init__.cpython-38.pyc b/plugins/luxun/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 00000000..a35c3560 Binary files /dev/null and b/plugins/luxun/__pycache__/__init__.cpython-38.pyc differ diff --git a/plugins/luxun/__pycache__/__init__.cpython-39.pyc b/plugins/luxun/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 00000000..d808d7ad Binary files /dev/null and b/plugins/luxun/__pycache__/__init__.cpython-39.pyc differ diff --git a/plugins/move_img/__pycache__/__init__.cpython-38.pyc b/plugins/move_img/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 00000000..b3d09ef1 Binary files /dev/null and b/plugins/move_img/__pycache__/__init__.cpython-38.pyc differ diff --git a/plugins/move_img/__pycache__/__init__.cpython-39.pyc b/plugins/move_img/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 00000000..94716921 Binary files /dev/null and b/plugins/move_img/__pycache__/__init__.cpython-39.pyc differ diff --git a/plugins/nonebot_plugin_cocdicer/__pycache__/__init__.cpython-38.pyc b/plugins/nonebot_plugin_cocdicer/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 00000000..0bd616db Binary files /dev/null and b/plugins/nonebot_plugin_cocdicer/__pycache__/__init__.cpython-38.pyc differ diff --git a/plugins/nonebot_plugin_cocdicer/__pycache__/__init__.cpython-39.pyc b/plugins/nonebot_plugin_cocdicer/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 00000000..4c10f4a5 Binary files /dev/null and b/plugins/nonebot_plugin_cocdicer/__pycache__/__init__.cpython-39.pyc differ diff --git a/plugins/nonebot_plugin_cocdicer/__pycache__/create.cpython-38.pyc b/plugins/nonebot_plugin_cocdicer/__pycache__/create.cpython-38.pyc new file mode 100644 index 00000000..ecabf908 Binary files /dev/null and b/plugins/nonebot_plugin_cocdicer/__pycache__/create.cpython-38.pyc differ diff --git a/plugins/nonebot_plugin_cocdicer/__pycache__/create.cpython-39.pyc b/plugins/nonebot_plugin_cocdicer/__pycache__/create.cpython-39.pyc new file mode 100644 index 00000000..3a1b2aca Binary files /dev/null and b/plugins/nonebot_plugin_cocdicer/__pycache__/create.cpython-39.pyc differ diff --git a/plugins/nonebot_plugin_cocdicer/__pycache__/data_source.cpython-38.pyc b/plugins/nonebot_plugin_cocdicer/__pycache__/data_source.cpython-38.pyc new file mode 100644 index 00000000..cab8de52 Binary files /dev/null and b/plugins/nonebot_plugin_cocdicer/__pycache__/data_source.cpython-38.pyc differ diff --git a/plugins/nonebot_plugin_cocdicer/__pycache__/data_source.cpython-39.pyc b/plugins/nonebot_plugin_cocdicer/__pycache__/data_source.cpython-39.pyc new file mode 100644 index 00000000..5fde385e Binary files /dev/null and b/plugins/nonebot_plugin_cocdicer/__pycache__/data_source.cpython-39.pyc differ diff --git a/plugins/nonebot_plugin_cocdicer/__pycache__/madness.cpython-38.pyc b/plugins/nonebot_plugin_cocdicer/__pycache__/madness.cpython-38.pyc new file mode 100644 index 00000000..c657a445 Binary files /dev/null and b/plugins/nonebot_plugin_cocdicer/__pycache__/madness.cpython-38.pyc differ diff --git a/plugins/nonebot_plugin_cocdicer/__pycache__/madness.cpython-39.pyc b/plugins/nonebot_plugin_cocdicer/__pycache__/madness.cpython-39.pyc new file mode 100644 index 00000000..78cd6f2a Binary files /dev/null and b/plugins/nonebot_plugin_cocdicer/__pycache__/madness.cpython-39.pyc differ diff --git a/plugins/nonebot_plugin_cocdicer/__pycache__/messages.cpython-38.pyc b/plugins/nonebot_plugin_cocdicer/__pycache__/messages.cpython-38.pyc new file mode 100644 index 00000000..513aca28 Binary files /dev/null and b/plugins/nonebot_plugin_cocdicer/__pycache__/messages.cpython-38.pyc differ diff --git a/plugins/nonebot_plugin_cocdicer/__pycache__/messages.cpython-39.pyc b/plugins/nonebot_plugin_cocdicer/__pycache__/messages.cpython-39.pyc new file mode 100644 index 00000000..c024f9ff Binary files /dev/null and b/plugins/nonebot_plugin_cocdicer/__pycache__/messages.cpython-39.pyc differ diff --git a/plugins/nonebot_plugin_cocdicer/__pycache__/san_check.cpython-38.pyc b/plugins/nonebot_plugin_cocdicer/__pycache__/san_check.cpython-38.pyc new file mode 100644 index 00000000..9086d936 Binary files /dev/null and b/plugins/nonebot_plugin_cocdicer/__pycache__/san_check.cpython-38.pyc differ diff --git a/plugins/nonebot_plugin_cocdicer/__pycache__/san_check.cpython-39.pyc b/plugins/nonebot_plugin_cocdicer/__pycache__/san_check.cpython-39.pyc new file mode 100644 index 00000000..0538a8a1 Binary files /dev/null and b/plugins/nonebot_plugin_cocdicer/__pycache__/san_check.cpython-39.pyc differ diff --git a/plugins/nonebot_plugin_manager/__pycache__/__init__.cpython-38.pyc b/plugins/nonebot_plugin_manager/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 00000000..ce945162 Binary files /dev/null and b/plugins/nonebot_plugin_manager/__pycache__/__init__.cpython-38.pyc differ diff --git a/plugins/nonebot_plugin_manager/__pycache__/__init__.cpython-39.pyc b/plugins/nonebot_plugin_manager/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 00000000..6d7a0f8c Binary files /dev/null and b/plugins/nonebot_plugin_manager/__pycache__/__init__.cpython-39.pyc differ diff --git a/plugins/nonebot_plugin_manager/__pycache__/data.cpython-38.pyc b/plugins/nonebot_plugin_manager/__pycache__/data.cpython-38.pyc new file mode 100644 index 00000000..adcdae69 Binary files /dev/null and b/plugins/nonebot_plugin_manager/__pycache__/data.cpython-38.pyc differ diff --git a/plugins/nonebot_plugin_manager/__pycache__/data.cpython-39.pyc b/plugins/nonebot_plugin_manager/__pycache__/data.cpython-39.pyc new file mode 100644 index 00000000..4fcf6459 Binary files /dev/null and b/plugins/nonebot_plugin_manager/__pycache__/data.cpython-39.pyc differ diff --git a/plugins/nonebot_plugin_manager/__pycache__/handle.cpython-38.pyc b/plugins/nonebot_plugin_manager/__pycache__/handle.cpython-38.pyc new file mode 100644 index 00000000..4f9dc5cf Binary files /dev/null and b/plugins/nonebot_plugin_manager/__pycache__/handle.cpython-38.pyc differ diff --git a/plugins/nonebot_plugin_manager/__pycache__/handle.cpython-39.pyc b/plugins/nonebot_plugin_manager/__pycache__/handle.cpython-39.pyc new file mode 100644 index 00000000..681d10ea Binary files /dev/null and b/plugins/nonebot_plugin_manager/__pycache__/handle.cpython-39.pyc differ diff --git a/plugins/nonebot_plugin_manager/__pycache__/parser.cpython-38.pyc b/plugins/nonebot_plugin_manager/__pycache__/parser.cpython-38.pyc new file mode 100644 index 00000000..1dabebd2 Binary files /dev/null and b/plugins/nonebot_plugin_manager/__pycache__/parser.cpython-38.pyc differ diff --git a/plugins/nonebot_plugin_manager/__pycache__/parser.cpython-39.pyc b/plugins/nonebot_plugin_manager/__pycache__/parser.cpython-39.pyc new file mode 100644 index 00000000..301f46fc Binary files /dev/null and b/plugins/nonebot_plugin_manager/__pycache__/parser.cpython-39.pyc differ diff --git a/plugins/nonebot_plugin_picsearcher/__pycache__/__init__.cpython-39.pyc b/plugins/nonebot_plugin_picsearcher/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 00000000..44e61484 Binary files /dev/null and b/plugins/nonebot_plugin_picsearcher/__pycache__/__init__.cpython-39.pyc differ diff --git a/plugins/nonebot_plugin_picsearcher/__pycache__/ascii2d.cpython-39.pyc b/plugins/nonebot_plugin_picsearcher/__pycache__/ascii2d.cpython-39.pyc new file mode 100644 index 00000000..d4e82141 Binary files /dev/null and b/plugins/nonebot_plugin_picsearcher/__pycache__/ascii2d.cpython-39.pyc differ diff --git a/plugins/nonebot_plugin_picsearcher/__pycache__/ex.cpython-39.pyc b/plugins/nonebot_plugin_picsearcher/__pycache__/ex.cpython-39.pyc new file mode 100644 index 00000000..0fda775b Binary files /dev/null and b/plugins/nonebot_plugin_picsearcher/__pycache__/ex.cpython-39.pyc differ diff --git a/plugins/nonebot_plugin_picsearcher/__pycache__/formdata.cpython-39.pyc b/plugins/nonebot_plugin_picsearcher/__pycache__/formdata.cpython-39.pyc new file mode 100644 index 00000000..42824c48 Binary files /dev/null and b/plugins/nonebot_plugin_picsearcher/__pycache__/formdata.cpython-39.pyc differ diff --git a/plugins/nonebot_plugin_picsearcher/__pycache__/iqdb.cpython-39.pyc b/plugins/nonebot_plugin_picsearcher/__pycache__/iqdb.cpython-39.pyc new file mode 100644 index 00000000..76b42d3e Binary files /dev/null and b/plugins/nonebot_plugin_picsearcher/__pycache__/iqdb.cpython-39.pyc differ diff --git a/plugins/nonebot_plugin_picsearcher/__pycache__/saucenao.cpython-39.pyc b/plugins/nonebot_plugin_picsearcher/__pycache__/saucenao.cpython-39.pyc new file mode 100644 index 00000000..838941ff Binary files /dev/null and b/plugins/nonebot_plugin_picsearcher/__pycache__/saucenao.cpython-39.pyc differ diff --git a/plugins/nonebot_plugin_picsearcher/__pycache__/trace.cpython-39.pyc b/plugins/nonebot_plugin_picsearcher/__pycache__/trace.cpython-39.pyc new file mode 100644 index 00000000..2b5c289a Binary files /dev/null and b/plugins/nonebot_plugin_picsearcher/__pycache__/trace.cpython-39.pyc differ diff --git a/plugins/nonebot_plugin_picsearcher/__pycache__/yandex.cpython-39.pyc b/plugins/nonebot_plugin_picsearcher/__pycache__/yandex.cpython-39.pyc new file mode 100644 index 00000000..f2797bf1 Binary files /dev/null and b/plugins/nonebot_plugin_picsearcher/__pycache__/yandex.cpython-39.pyc differ diff --git a/plugins/one_friend/__pycache__/__init__.cpython-38.pyc b/plugins/one_friend/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 00000000..4f995113 Binary files /dev/null and b/plugins/one_friend/__pycache__/__init__.cpython-38.pyc differ diff --git a/plugins/one_friend/__pycache__/__init__.cpython-39.pyc b/plugins/one_friend/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 00000000..e8a92ca1 Binary files /dev/null and b/plugins/one_friend/__pycache__/__init__.cpython-39.pyc differ diff --git a/plugins/open_cases/__pycache__/__init__.cpython-38.pyc b/plugins/open_cases/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 00000000..39862d4d Binary files /dev/null and b/plugins/open_cases/__pycache__/__init__.cpython-38.pyc differ diff --git a/plugins/open_cases/__pycache__/__init__.cpython-39.pyc b/plugins/open_cases/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 00000000..88e0a41d Binary files /dev/null and b/plugins/open_cases/__pycache__/__init__.cpython-39.pyc differ diff --git a/plugins/open_cases/__pycache__/config.cpython-38.pyc b/plugins/open_cases/__pycache__/config.cpython-38.pyc new file mode 100644 index 00000000..fe783ec3 Binary files /dev/null and b/plugins/open_cases/__pycache__/config.cpython-38.pyc differ diff --git a/plugins/open_cases/__pycache__/config.cpython-39.pyc b/plugins/open_cases/__pycache__/config.cpython-39.pyc new file mode 100644 index 00000000..2c42809d Binary files /dev/null and b/plugins/open_cases/__pycache__/config.cpython-39.pyc differ diff --git a/plugins/open_cases/__pycache__/open_cases_c.cpython-38.pyc b/plugins/open_cases/__pycache__/open_cases_c.cpython-38.pyc new file mode 100644 index 00000000..801f85d5 Binary files /dev/null and b/plugins/open_cases/__pycache__/open_cases_c.cpython-38.pyc differ diff --git a/plugins/open_cases/__pycache__/open_cases_c.cpython-39.pyc b/plugins/open_cases/__pycache__/open_cases_c.cpython-39.pyc new file mode 100644 index 00000000..f57de18c Binary files /dev/null and b/plugins/open_cases/__pycache__/open_cases_c.cpython-39.pyc differ diff --git a/plugins/open_cases/__pycache__/utils.cpython-38.pyc b/plugins/open_cases/__pycache__/utils.cpython-38.pyc new file mode 100644 index 00000000..ac76c69e Binary files /dev/null and b/plugins/open_cases/__pycache__/utils.cpython-38.pyc differ diff --git a/plugins/open_cases/__pycache__/utils.cpython-39.pyc b/plugins/open_cases/__pycache__/utils.cpython-39.pyc new file mode 100644 index 00000000..bf1fefef Binary files /dev/null and b/plugins/open_cases/__pycache__/utils.cpython-39.pyc differ diff --git a/plugins/open_cases/utils.py b/plugins/open_cases/utils.py index 8b28f162..29638363 100644 --- a/plugins/open_cases/utils.py +++ b/plugins/open_cases/utils.py @@ -14,7 +14,10 @@ from util.utils import get_cookie_text from asyncio.exceptions import TimeoutError import pypinyin from nonebot.adapters.cqhttp.exception import ActionFailed +<<<<<<< HEAD from configs.config import buff_proxy +======= +>>>>>>> master url = "https://buff.163.com/api/market/goods" # proxies = 'http://49.75.59.242:3128' @@ -60,7 +63,11 @@ async def util_get_buff_price(case_name: str = "狂牙大行动") -> str: "search": skin } try: +<<<<<<< HEAD async with session.get(url, proxy=buff_proxy, params=parameter, timeout=20) as response: +======= + async with session.get(url, params=parameter, timeout=20) as response: +>>>>>>> master if response.status == 200: data = (await response.json())["data"] total_page = data["total_page"] @@ -168,7 +175,11 @@ async def util_get_buff_img(case_name: str = "狂牙大行动") -> str: print(skin) skin_name = '' # try: +<<<<<<< HEAD async with session.get(url, proxy=buff_proxy, params=parameter, timeout=20) as response: +======= + async with session.get(url, params=parameter, timeout=20) as response: +>>>>>>> master if response.status == 200: data = (await response.json())["data"] total_page = data["total_page"] diff --git a/plugins/pixiv/__pycache__/__init__.cpython-38.pyc b/plugins/pixiv/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 00000000..7cbf7fe4 Binary files /dev/null and b/plugins/pixiv/__pycache__/__init__.cpython-38.pyc differ diff --git a/plugins/pixiv/__pycache__/__init__.cpython-39.pyc b/plugins/pixiv/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 00000000..061d6060 Binary files /dev/null and b/plugins/pixiv/__pycache__/__init__.cpython-39.pyc differ diff --git a/plugins/pixiv/__pycache__/data_source.cpython-38.pyc b/plugins/pixiv/__pycache__/data_source.cpython-38.pyc new file mode 100644 index 00000000..ab89cbec Binary files /dev/null and b/plugins/pixiv/__pycache__/data_source.cpython-38.pyc differ diff --git a/plugins/pixiv/__pycache__/data_source.cpython-39.pyc b/plugins/pixiv/__pycache__/data_source.cpython-39.pyc new file mode 100644 index 00000000..48f809bb Binary files /dev/null and b/plugins/pixiv/__pycache__/data_source.cpython-39.pyc differ diff --git a/plugins/poke/__pycache__/__init__.cpython-38.pyc b/plugins/poke/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 00000000..75ef2c42 Binary files /dev/null and b/plugins/poke/__pycache__/__init__.cpython-38.pyc differ diff --git a/plugins/poke/__pycache__/__init__.cpython-39.pyc b/plugins/poke/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 00000000..8890b3dc Binary files /dev/null and b/plugins/poke/__pycache__/__init__.cpython-39.pyc differ diff --git a/plugins/reimu/__pycache__/__init__.cpython-38.pyc b/plugins/reimu/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 00000000..e151d6f6 Binary files /dev/null and b/plugins/reimu/__pycache__/__init__.cpython-38.pyc differ diff --git a/plugins/reimu/__pycache__/__init__.cpython-39.pyc b/plugins/reimu/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 00000000..550ca6b3 Binary files /dev/null and b/plugins/reimu/__pycache__/__init__.cpython-39.pyc differ diff --git a/plugins/reimu/__pycache__/data_source.cpython-38.pyc b/plugins/reimu/__pycache__/data_source.cpython-38.pyc new file mode 100644 index 00000000..20057281 Binary files /dev/null and b/plugins/reimu/__pycache__/data_source.cpython-38.pyc differ diff --git a/plugins/reimu/__pycache__/data_source.cpython-39.pyc b/plugins/reimu/__pycache__/data_source.cpython-39.pyc new file mode 100644 index 00000000..984b9878 Binary files /dev/null and b/plugins/reimu/__pycache__/data_source.cpython-39.pyc differ diff --git a/plugins/remind/__pycache__/__init__.cpython-38.pyc b/plugins/remind/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 00000000..66b01987 Binary files /dev/null and b/plugins/remind/__pycache__/__init__.cpython-38.pyc differ diff --git a/plugins/remind/__pycache__/__init__.cpython-39.pyc b/plugins/remind/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 00000000..0bdff1fb Binary files /dev/null and b/plugins/remind/__pycache__/__init__.cpython-39.pyc differ diff --git a/plugins/search_anime/__pycache__/__init__.cpython-38.pyc b/plugins/search_anime/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 00000000..d76b6f08 Binary files /dev/null and b/plugins/search_anime/__pycache__/__init__.cpython-38.pyc differ diff --git a/plugins/search_anime/__pycache__/__init__.cpython-39.pyc b/plugins/search_anime/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 00000000..fe2b4e6d Binary files /dev/null and b/plugins/search_anime/__pycache__/__init__.cpython-39.pyc differ diff --git a/plugins/search_anime/__pycache__/data_source.cpython-38.pyc b/plugins/search_anime/__pycache__/data_source.cpython-38.pyc new file mode 100644 index 00000000..d8695b62 Binary files /dev/null and b/plugins/search_anime/__pycache__/data_source.cpython-38.pyc differ diff --git a/plugins/search_anime/__pycache__/data_source.cpython-39.pyc b/plugins/search_anime/__pycache__/data_source.cpython-39.pyc new file mode 100644 index 00000000..523f3a71 Binary files /dev/null and b/plugins/search_anime/__pycache__/data_source.cpython-39.pyc differ diff --git a/plugins/search_buff_skin_price/__pycache__/__init__.cpython-38.pyc b/plugins/search_buff_skin_price/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 00000000..ed820bdf Binary files /dev/null and b/plugins/search_buff_skin_price/__pycache__/__init__.cpython-38.pyc differ diff --git a/plugins/search_buff_skin_price/__pycache__/__init__.cpython-39.pyc b/plugins/search_buff_skin_price/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 00000000..dd938c3f Binary files /dev/null and b/plugins/search_buff_skin_price/__pycache__/__init__.cpython-39.pyc differ diff --git a/plugins/search_buff_skin_price/__pycache__/data_source.cpython-38.pyc b/plugins/search_buff_skin_price/__pycache__/data_source.cpython-38.pyc new file mode 100644 index 00000000..98aff86a Binary files /dev/null and b/plugins/search_buff_skin_price/__pycache__/data_source.cpython-38.pyc differ diff --git a/plugins/search_buff_skin_price/__pycache__/data_source.cpython-39.pyc b/plugins/search_buff_skin_price/__pycache__/data_source.cpython-39.pyc new file mode 100644 index 00000000..ad827da6 Binary files /dev/null and b/plugins/search_buff_skin_price/__pycache__/data_source.cpython-39.pyc differ diff --git a/plugins/send_dinggong_voice/__pycache__/__init__.cpython-38.pyc b/plugins/send_dinggong_voice/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 00000000..23a3bd0f Binary files /dev/null and b/plugins/send_dinggong_voice/__pycache__/__init__.cpython-38.pyc differ diff --git a/plugins/send_dinggong_voice/__pycache__/__init__.cpython-39.pyc b/plugins/send_dinggong_voice/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 00000000..a68a0c8e Binary files /dev/null and b/plugins/send_dinggong_voice/__pycache__/__init__.cpython-39.pyc differ diff --git a/plugins/send_img/__pycache__/__init__.cpython-38.pyc b/plugins/send_img/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 00000000..3b704098 Binary files /dev/null and b/plugins/send_img/__pycache__/__init__.cpython-38.pyc differ diff --git a/plugins/send_img/__pycache__/__init__.cpython-39.pyc b/plugins/send_img/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 00000000..b273a113 Binary files /dev/null and b/plugins/send_img/__pycache__/__init__.cpython-39.pyc differ diff --git a/plugins/send_setu/__pycache__/__init__.cpython-38.pyc b/plugins/send_setu/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 00000000..5be3bf33 Binary files /dev/null and b/plugins/send_setu/__pycache__/__init__.cpython-38.pyc differ diff --git a/plugins/send_setu/__pycache__/__init__.cpython-39.pyc b/plugins/send_setu/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 00000000..e338e02f Binary files /dev/null and b/plugins/send_setu/__pycache__/__init__.cpython-39.pyc differ diff --git a/plugins/send_setu/__pycache__/data_source.cpython-38.pyc b/plugins/send_setu/__pycache__/data_source.cpython-38.pyc new file mode 100644 index 00000000..a8fdc4be Binary files /dev/null and b/plugins/send_setu/__pycache__/data_source.cpython-38.pyc differ diff --git a/plugins/send_setu/__pycache__/data_source.cpython-39.pyc b/plugins/send_setu/__pycache__/data_source.cpython-39.pyc new file mode 100644 index 00000000..579aaa8a Binary files /dev/null and b/plugins/send_setu/__pycache__/data_source.cpython-39.pyc differ diff --git a/plugins/shop/__pycache__/__init__.cpython-38.pyc b/plugins/shop/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 00000000..3cf9d4e4 Binary files /dev/null and b/plugins/shop/__pycache__/__init__.cpython-38.pyc differ diff --git a/plugins/shop/__pycache__/__init__.cpython-39.pyc b/plugins/shop/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 00000000..bc7edeb0 Binary files /dev/null and b/plugins/shop/__pycache__/__init__.cpython-39.pyc differ diff --git a/plugins/shop/__pycache__/buy.cpython-38.pyc b/plugins/shop/__pycache__/buy.cpython-38.pyc new file mode 100644 index 00000000..5e1525e8 Binary files /dev/null and b/plugins/shop/__pycache__/buy.cpython-38.pyc differ diff --git a/plugins/shop/__pycache__/buy.cpython-39.pyc b/plugins/shop/__pycache__/buy.cpython-39.pyc new file mode 100644 index 00000000..de8a0300 Binary files /dev/null and b/plugins/shop/__pycache__/buy.cpython-39.pyc differ diff --git a/plugins/shop/__pycache__/my_gold.cpython-38.pyc b/plugins/shop/__pycache__/my_gold.cpython-38.pyc new file mode 100644 index 00000000..995594e6 Binary files /dev/null and b/plugins/shop/__pycache__/my_gold.cpython-38.pyc differ diff --git a/plugins/shop/__pycache__/my_gold.cpython-39.pyc b/plugins/shop/__pycache__/my_gold.cpython-39.pyc new file mode 100644 index 00000000..209a70a7 Binary files /dev/null and b/plugins/shop/__pycache__/my_gold.cpython-39.pyc differ diff --git a/plugins/shop/__pycache__/my_props.cpython-38.pyc b/plugins/shop/__pycache__/my_props.cpython-38.pyc new file mode 100644 index 00000000..252321fe Binary files /dev/null and b/plugins/shop/__pycache__/my_props.cpython-38.pyc differ diff --git a/plugins/shop/__pycache__/my_props.cpython-39.pyc b/plugins/shop/__pycache__/my_props.cpython-39.pyc new file mode 100644 index 00000000..eb865329 Binary files /dev/null and b/plugins/shop/__pycache__/my_props.cpython-39.pyc differ diff --git a/plugins/shop/__pycache__/reset_today_gold.cpython-38.pyc b/plugins/shop/__pycache__/reset_today_gold.cpython-38.pyc new file mode 100644 index 00000000..6f89e622 Binary files /dev/null and b/plugins/shop/__pycache__/reset_today_gold.cpython-38.pyc differ diff --git a/plugins/shop/__pycache__/reset_today_gold.cpython-39.pyc b/plugins/shop/__pycache__/reset_today_gold.cpython-39.pyc new file mode 100644 index 00000000..b463febb Binary files /dev/null and b/plugins/shop/__pycache__/reset_today_gold.cpython-39.pyc differ diff --git a/plugins/shop/__pycache__/shop_help.cpython-38.pyc b/plugins/shop/__pycache__/shop_help.cpython-38.pyc new file mode 100644 index 00000000..ceb8081a Binary files /dev/null and b/plugins/shop/__pycache__/shop_help.cpython-38.pyc differ diff --git a/plugins/shop/__pycache__/shop_help.cpython-39.pyc b/plugins/shop/__pycache__/shop_help.cpython-39.pyc new file mode 100644 index 00000000..f0727ef6 Binary files /dev/null and b/plugins/shop/__pycache__/shop_help.cpython-39.pyc differ diff --git a/plugins/shop/use/__pycache__/__init__.cpython-38.pyc b/plugins/shop/use/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 00000000..e07bac44 Binary files /dev/null and b/plugins/shop/use/__pycache__/__init__.cpython-38.pyc differ diff --git a/plugins/shop/use/__pycache__/__init__.cpython-39.pyc b/plugins/shop/use/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 00000000..20c5b6d7 Binary files /dev/null and b/plugins/shop/use/__pycache__/__init__.cpython-39.pyc differ diff --git a/plugins/shop/use/__pycache__/data_source.cpython-38.pyc b/plugins/shop/use/__pycache__/data_source.cpython-38.pyc new file mode 100644 index 00000000..4409ecf9 Binary files /dev/null and b/plugins/shop/use/__pycache__/data_source.cpython-38.pyc differ diff --git a/plugins/shop/use/__pycache__/data_source.cpython-39.pyc b/plugins/shop/use/__pycache__/data_source.cpython-39.pyc new file mode 100644 index 00000000..c134c79a Binary files /dev/null and b/plugins/shop/use/__pycache__/data_source.cpython-39.pyc differ diff --git a/plugins/sign_in/__pycache__/__init__.cpython-38.pyc b/plugins/sign_in/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 00000000..bc5c2af5 Binary files /dev/null and b/plugins/sign_in/__pycache__/__init__.cpython-38.pyc differ diff --git a/plugins/sign_in/__pycache__/__init__.cpython-39.pyc b/plugins/sign_in/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 00000000..a78968c1 Binary files /dev/null and b/plugins/sign_in/__pycache__/__init__.cpython-39.pyc differ diff --git a/plugins/sign_in/__pycache__/group_user_checkin.cpython-38.pyc b/plugins/sign_in/__pycache__/group_user_checkin.cpython-38.pyc new file mode 100644 index 00000000..84bce2f2 Binary files /dev/null and b/plugins/sign_in/__pycache__/group_user_checkin.cpython-38.pyc differ diff --git a/plugins/sign_in/__pycache__/group_user_checkin.cpython-39.pyc b/plugins/sign_in/__pycache__/group_user_checkin.cpython-39.pyc new file mode 100644 index 00000000..63a19b98 Binary files /dev/null and b/plugins/sign_in/__pycache__/group_user_checkin.cpython-39.pyc differ diff --git a/plugins/songpicker2/__pycache__/__init__.cpython-38.pyc b/plugins/songpicker2/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 00000000..5d305878 Binary files /dev/null and b/plugins/songpicker2/__pycache__/__init__.cpython-38.pyc differ diff --git a/plugins/songpicker2/__pycache__/__init__.cpython-39.pyc b/plugins/songpicker2/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 00000000..ccf46987 Binary files /dev/null and b/plugins/songpicker2/__pycache__/__init__.cpython-39.pyc differ diff --git a/plugins/songpicker2/__pycache__/data_source.cpython-38.pyc b/plugins/songpicker2/__pycache__/data_source.cpython-38.pyc new file mode 100644 index 00000000..7a3c32ab Binary files /dev/null and b/plugins/songpicker2/__pycache__/data_source.cpython-38.pyc differ diff --git a/plugins/songpicker2/__pycache__/data_source.cpython-39.pyc b/plugins/songpicker2/__pycache__/data_source.cpython-39.pyc new file mode 100644 index 00000000..5b07d814 Binary files /dev/null and b/plugins/songpicker2/__pycache__/data_source.cpython-39.pyc differ diff --git a/plugins/super_cmd/__pycache__/__init__.cpython-38.pyc b/plugins/super_cmd/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 00000000..e66c1331 Binary files /dev/null and b/plugins/super_cmd/__pycache__/__init__.cpython-38.pyc differ diff --git a/plugins/super_cmd/__pycache__/__init__.cpython-39.pyc b/plugins/super_cmd/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 00000000..ab671aa2 Binary files /dev/null and b/plugins/super_cmd/__pycache__/__init__.cpython-39.pyc differ diff --git a/plugins/super_cmd/__pycache__/data_source.cpython-38.pyc b/plugins/super_cmd/__pycache__/data_source.cpython-38.pyc new file mode 100644 index 00000000..8fd1428b Binary files /dev/null and b/plugins/super_cmd/__pycache__/data_source.cpython-38.pyc differ diff --git a/plugins/super_cmd/__pycache__/data_source.cpython-39.pyc b/plugins/super_cmd/__pycache__/data_source.cpython-39.pyc new file mode 100644 index 00000000..3622359d Binary files /dev/null and b/plugins/super_cmd/__pycache__/data_source.cpython-39.pyc differ diff --git a/plugins/super_help/__pycache__/__init__.cpython-38.pyc b/plugins/super_help/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 00000000..6755e6d4 Binary files /dev/null and b/plugins/super_help/__pycache__/__init__.cpython-38.pyc differ diff --git a/plugins/super_help/__pycache__/__init__.cpython-39.pyc b/plugins/super_help/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 00000000..5487f85a Binary files /dev/null and b/plugins/super_help/__pycache__/__init__.cpython-39.pyc differ diff --git a/plugins/translate/__pycache__/__init__.cpython-38.pyc b/plugins/translate/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 00000000..a9261592 Binary files /dev/null and b/plugins/translate/__pycache__/__init__.cpython-38.pyc differ diff --git a/plugins/translate/__pycache__/__init__.cpython-39.pyc b/plugins/translate/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 00000000..336f5431 Binary files /dev/null and b/plugins/translate/__pycache__/__init__.cpython-39.pyc differ diff --git a/plugins/translate/__pycache__/data_source.cpython-38.pyc b/plugins/translate/__pycache__/data_source.cpython-38.pyc new file mode 100644 index 00000000..006b8c7e Binary files /dev/null and b/plugins/translate/__pycache__/data_source.cpython-38.pyc differ diff --git a/plugins/translate/__pycache__/data_source.cpython-39.pyc b/plugins/translate/__pycache__/data_source.cpython-39.pyc new file mode 100644 index 00000000..f181e919 Binary files /dev/null and b/plugins/translate/__pycache__/data_source.cpython-39.pyc differ diff --git a/plugins/update_gocqhttp/__pycache__/__init__.cpython-38.pyc b/plugins/update_gocqhttp/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 00000000..d5285901 Binary files /dev/null and b/plugins/update_gocqhttp/__pycache__/__init__.cpython-38.pyc differ diff --git a/plugins/update_gocqhttp/__pycache__/__init__.cpython-39.pyc b/plugins/update_gocqhttp/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 00000000..fa5e7fbe Binary files /dev/null and b/plugins/update_gocqhttp/__pycache__/__init__.cpython-39.pyc differ diff --git a/plugins/update_gocqhttp/__pycache__/data_source.cpython-38.pyc b/plugins/update_gocqhttp/__pycache__/data_source.cpython-38.pyc new file mode 100644 index 00000000..0c5aa246 Binary files /dev/null and b/plugins/update_gocqhttp/__pycache__/data_source.cpython-38.pyc differ diff --git a/plugins/update_gocqhttp/__pycache__/data_source.cpython-39.pyc b/plugins/update_gocqhttp/__pycache__/data_source.cpython-39.pyc new file mode 100644 index 00000000..534c95d4 Binary files /dev/null and b/plugins/update_gocqhttp/__pycache__/data_source.cpython-39.pyc differ diff --git a/plugins/update_setu/__pycache__/__init__.cpython-38.pyc b/plugins/update_setu/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 00000000..487f7d7b Binary files /dev/null and b/plugins/update_setu/__pycache__/__init__.cpython-38.pyc differ diff --git a/plugins/update_setu/__pycache__/__init__.cpython-39.pyc b/plugins/update_setu/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 00000000..e7f2f438 Binary files /dev/null and b/plugins/update_setu/__pycache__/__init__.cpython-39.pyc differ diff --git a/plugins/update_setu/__pycache__/data_source.cpython-38.pyc b/plugins/update_setu/__pycache__/data_source.cpython-38.pyc new file mode 100644 index 00000000..5e57ef3b Binary files /dev/null and b/plugins/update_setu/__pycache__/data_source.cpython-38.pyc differ diff --git a/plugins/update_setu/__pycache__/data_source.cpython-39.pyc b/plugins/update_setu/__pycache__/data_source.cpython-39.pyc new file mode 100644 index 00000000..6e349f93 Binary files /dev/null and b/plugins/update_setu/__pycache__/data_source.cpython-39.pyc differ diff --git a/plugins/upload_img/__pycache__/__init__.cpython-38.pyc b/plugins/upload_img/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 00000000..4722abc2 Binary files /dev/null and b/plugins/upload_img/__pycache__/__init__.cpython-38.pyc differ diff --git a/plugins/upload_img/__pycache__/__init__.cpython-39.pyc b/plugins/upload_img/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 00000000..fabac69a Binary files /dev/null and b/plugins/upload_img/__pycache__/__init__.cpython-39.pyc differ diff --git a/plugins/weather/__pycache__/__init__.cpython-38.pyc b/plugins/weather/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 00000000..02657382 Binary files /dev/null and b/plugins/weather/__pycache__/__init__.cpython-38.pyc differ diff --git a/plugins/weather/__pycache__/__init__.cpython-39.pyc b/plugins/weather/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 00000000..4cb3d4d7 Binary files /dev/null and b/plugins/weather/__pycache__/__init__.cpython-39.pyc differ diff --git a/plugins/weather/__pycache__/config.cpython-38.pyc b/plugins/weather/__pycache__/config.cpython-38.pyc new file mode 100644 index 00000000..0189b6b1 Binary files /dev/null and b/plugins/weather/__pycache__/config.cpython-38.pyc differ diff --git a/plugins/weather/__pycache__/config.cpython-39.pyc b/plugins/weather/__pycache__/config.cpython-39.pyc new file mode 100644 index 00000000..21697e90 Binary files /dev/null and b/plugins/weather/__pycache__/config.cpython-39.pyc differ diff --git a/plugins/weather/__pycache__/data_source.cpython-38.pyc b/plugins/weather/__pycache__/data_source.cpython-38.pyc new file mode 100644 index 00000000..0be8a36e Binary files /dev/null and b/plugins/weather/__pycache__/data_source.cpython-38.pyc differ diff --git a/plugins/weather/__pycache__/data_source.cpython-39.pyc b/plugins/weather/__pycache__/data_source.cpython-39.pyc new file mode 100644 index 00000000..b90430cc Binary files /dev/null and b/plugins/weather/__pycache__/data_source.cpython-39.pyc differ diff --git a/plugins/what_anime/__pycache__/__init__.cpython-38.pyc b/plugins/what_anime/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 00000000..539fb2be Binary files /dev/null and b/plugins/what_anime/__pycache__/__init__.cpython-38.pyc differ diff --git a/plugins/what_anime/__pycache__/__init__.cpython-39.pyc b/plugins/what_anime/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 00000000..8e75f115 Binary files /dev/null and b/plugins/what_anime/__pycache__/__init__.cpython-39.pyc differ diff --git a/plugins/what_anime/__pycache__/data_source.cpython-38.pyc b/plugins/what_anime/__pycache__/data_source.cpython-38.pyc new file mode 100644 index 00000000..a4ed989e Binary files /dev/null and b/plugins/what_anime/__pycache__/data_source.cpython-38.pyc differ diff --git a/plugins/what_anime/__pycache__/data_source.cpython-39.pyc b/plugins/what_anime/__pycache__/data_source.cpython-39.pyc new file mode 100644 index 00000000..a5e20255 Binary files /dev/null and b/plugins/what_anime/__pycache__/data_source.cpython-39.pyc differ diff --git a/plugins/yiqing/__pycache__/__init__.cpython-38.pyc b/plugins/yiqing/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 00000000..ad52899d Binary files /dev/null and b/plugins/yiqing/__pycache__/__init__.cpython-38.pyc differ diff --git a/plugins/yiqing/__pycache__/__init__.cpython-39.pyc b/plugins/yiqing/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 00000000..48f76158 Binary files /dev/null and b/plugins/yiqing/__pycache__/__init__.cpython-39.pyc differ diff --git a/plugins/yiqing/__pycache__/config.cpython-38.pyc b/plugins/yiqing/__pycache__/config.cpython-38.pyc new file mode 100644 index 00000000..35048ce2 Binary files /dev/null and b/plugins/yiqing/__pycache__/config.cpython-38.pyc differ diff --git a/plugins/yiqing/__pycache__/config.cpython-39.pyc b/plugins/yiqing/__pycache__/config.cpython-39.pyc new file mode 100644 index 00000000..98558138 Binary files /dev/null and b/plugins/yiqing/__pycache__/config.cpython-39.pyc differ diff --git a/plugins/yiqing/__pycache__/data_source.cpython-38.pyc b/plugins/yiqing/__pycache__/data_source.cpython-38.pyc new file mode 100644 index 00000000..3192db06 Binary files /dev/null and b/plugins/yiqing/__pycache__/data_source.cpython-38.pyc differ diff --git a/plugins/yiqing/__pycache__/data_source.cpython-39.pyc b/plugins/yiqing/__pycache__/data_source.cpython-39.pyc new file mode 100644 index 00000000..406f2258 Binary files /dev/null and b/plugins/yiqing/__pycache__/data_source.cpython-39.pyc differ diff --git a/resources/img/genshin/seek_god_eye/__init__.py b/resources/img/genshin/seek_god_eye/__init__.py index 291ca8f2..2d0e19ff 100644 --- a/resources/img/genshin/seek_god_eye/__init__.py +++ b/resources/img/genshin/seek_god_eye/__init__.py @@ -1,6 +1,10 @@ from hoshino import Service from nonebot import on_command +<<<<<<< HEAD # from ..configs import ALLOW_PRIVATE_CHAT +======= +# from ..config import ALLOW_PRIVATE_CHAT +>>>>>>> master import random from .seek_god_eye import (JSON_LIST, GOD_EYE_INFO, diff --git a/services/init_config.py b/services/init_config.py index 55c6b1f9..86ee3f0e 100644 --- a/services/init_config.py +++ b/services/init_config.py @@ -16,6 +16,7 @@ def init_config(): if not base_config.exists(): base_config.parent.mkdir(parents=True, exist_ok=True) config_dict = { +<<<<<<< HEAD 'apikey': { 'LOLICON_KEY': '', 'TL_KEY': [], @@ -29,6 +30,8 @@ def init_config(): 'port': '', 'database': '', }, +======= +>>>>>>> master 'path': { 'IMAGE_PATH': '', 'VOICE_PATH': '', @@ -42,9 +45,28 @@ def init_config(): 'system_proxy': '', 'buff_proxy': '' }, +<<<<<<< HEAD 'rsshub': { 'RSSHUBAPP': 'https://docs.rsshub.app/', }, +======= + 'apikey': { + 'LOLICON_KEY': '', + 'TL_KEY': [], + }, + 'rsshub': { + 'RSSHUBAPP': 'https://docs.rsshub.app/', + }, + 'sql': { + 'bind': '', + 'sql_name': '', + 'user': '', + 'password': '', + 'address': '', + 'port': '', + 'database': '', + }, +>>>>>>> master 'level': { 'DELETE_IMG_LEVEL': 7, 'MOVE_IMG_LEVEL': 7,