From 93f7e12aba3005a78be74f21fc015252ff720272 Mon Sep 17 00:00:00 2001 From: "lxbpxylps@126.com" Date: Fri, 8 Oct 2021 16:44:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8C=87=E5=AE=9A=20open=20=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/plugins/bilibililive_checker/__init__.py | 4 ++-- src/plugins/bind_qq/__init__.py | 6 +++--- src/plugins/call_admin/__init__.py | 8 ++++---- src/plugins/cmd_register/__init__.py | 4 ++-- src/plugins/get_invitation/__init__.py | 8 ++++---- src/plugins/group_increase/__init__.py | 2 +- src/plugins/help/__init__.py | 4 ++-- src/plugins/issue_cmd/__init__.py | 6 +++--- src/plugins/mc_event/__init__.py | 14 +++++++------- src/plugins/prism_api/__init__.py | 2 +- src/plugins/query_online/__init__.py | 4 ++-- src/plugins/say_mc_msg/__init__.py | 8 ++++---- src/plugins/tell_mc_msg/__init__.py | 8 ++++---- src/plugins/utils/__init__.py | 2 +- src/plugins/welcome/__init__.py | 4 ++-- 15 files changed, 42 insertions(+), 42 deletions(-) diff --git a/src/plugins/bilibililive_checker/__init__.py b/src/plugins/bilibililive_checker/__init__.py index a60d264..52c80f8 100644 --- a/src/plugins/bilibililive_checker/__init__.py +++ b/src/plugins/bilibililive_checker/__init__.py @@ -8,9 +8,9 @@ from nonebot.adapters.cqhttp import Bot, MessageSegment import httpx -config = json.loads(open('./config/bilibililive_checker.json', 'r').read()) +config = json.loads(open('./config/bilibililive_checker.json', 'r', encoding='utf-8').read()) text: str = json.loads( - open('./config/text.json', 'r').read())['bilibililive_checker']['message'] + open('./config/text.json', 'r', encoding='utf-8').read())['bilibililive_checker']['message'] live_status = [False for i in range(len(config['liveroom']))] diff --git a/src/plugins/bind_qq/__init__.py b/src/plugins/bind_qq/__init__.py index d26e9ce..d1e05c9 100644 --- a/src/plugins/bind_qq/__init__.py +++ b/src/plugins/bind_qq/__init__.py @@ -8,9 +8,9 @@ import utils import prism_api -text: dict = json.loads(open('./config/text.json', 'r').read())['bind_qq'] +text: dict = json.loads(open('./config/text.json', 'r', encoding='utf-8').read())['bind_qq'] -cmd_set: dict = json.loads(open('./config/cmd_alias.json', 'r').read())['bind_qq'] +cmd_set: dict = json.loads(open('./config/cmd_alias.json', 'r', encoding='utf-8').read())['bind_qq'] bind_qq = on_command(cmd_set['cmd'], aliases=set(cmd_set['aliases'])) @@ -33,7 +33,7 @@ async def handle_bind_qq(bot: Bot, event: MessageEvent): # 检测是否绑定过 try: - record = json.loads(open('./data/bind_qq.json', 'r').read()) + record = json.loads(open('./data/bind_qq.json', 'r', encoding='utf-8').read()) except FileNotFoundError: record = {} diff --git a/src/plugins/call_admin/__init__.py b/src/plugins/call_admin/__init__.py index be34b42..49d2505 100644 --- a/src/plugins/call_admin/__init__.py +++ b/src/plugins/call_admin/__init__.py @@ -9,10 +9,10 @@ import prism_api not_bind_when_send_msg: str = json.loads( - open('./config/text.json', 'r').read())['bind_qq']['not_bind_when_send_msg'] -text: dict = json.loads(open('./config/text.json', 'r').read())['call_admin'] + open('./config/text.json', 'r', encoding='utf-8').read())['bind_qq']['not_bind_when_send_msg'] +text: dict = json.loads(open('./config/text.json', 'r', encoding='utf-8').read())['call_admin'] -cmd_set: dict = json.loads(open('./config/cmd_alias.json', 'r').read())['call_admin'] +cmd_set: dict = json.loads(open('./config/cmd_alias.json', 'r', encoding='utf-8').read())['call_admin'] call_admin = on_command(cmd_set['cmd'], aliases=set(cmd_set['aliases'])) @@ -35,7 +35,7 @@ async def handle_call_admin(bot: Bot, event: MessageEvent): # 检查发送者是否绑定账号 try: - record = json.loads(open('./data/bind_qq.json', 'r').read()) + record = json.loads(open('./data/bind_qq.json', 'r', encoding='utf-8').read()) except FileNotFoundError: record = {} diff --git a/src/plugins/cmd_register/__init__.py b/src/plugins/cmd_register/__init__.py index c588ce4..f680b75 100644 --- a/src/plugins/cmd_register/__init__.py +++ b/src/plugins/cmd_register/__init__.py @@ -9,8 +9,8 @@ import utils import prism_api -config: list = json.loads(open('./config/cmd_register.json', 'r').read()) -text: dict = json.loads(open('./config/text.json', 'r').read())['cmd_register'] +config: list = json.loads(open('./config/cmd_register.json', 'r', encoding='utf-8').read()) +text: dict = json.loads(open('./config/text.json', 'r', encoding='utf-8').read())['cmd_register'] cmd_list: list = [one_cmd['cmd'] for one_cmd in config] diff --git a/src/plugins/get_invitation/__init__.py b/src/plugins/get_invitation/__init__.py index c7d13ce..de571b4 100644 --- a/src/plugins/get_invitation/__init__.py +++ b/src/plugins/get_invitation/__init__.py @@ -11,11 +11,11 @@ import aiomysql import utils -config: dict = json.loads(open('./config/get_invitation.json', 'r').read()) +config: dict = json.loads(open('./config/get_invitation.json', 'r', encoding='utf-8').read()) text: dict = json.loads( - open('./config/text.json', 'r').read())['get_invitation'] + open('./config/text.json', 'r', encoding='utf-8').read())['get_invitation'] -cmd_set: dict = json.loads(open('./config/cmd_alias.json', 'r').read())['get_invitation'] +cmd_set: dict = json.loads(open('./config/cmd_alias.json', 'r', encoding='utf-8').read())['get_invitation'] get_invitation = on_command(cmd_set['cmd'], aliases=set(cmd_set['aliases'])) @@ -27,7 +27,7 @@ async def handle_get_invitation(bot: Bot, event: MessageEvent): # 鉴定发起者是否有剩余次数 try: - record = json.loads(open('./data/invitation.json', 'r').read()) + record = json.loads(open('./data/invitation.json', 'r', encoding='utf-8').read()) except FileNotFoundError: record = {} diff --git a/src/plugins/group_increase/__init__.py b/src/plugins/group_increase/__init__.py index f612209..7a36806 100644 --- a/src/plugins/group_increase/__init__.py +++ b/src/plugins/group_increase/__init__.py @@ -8,7 +8,7 @@ import utils welcome_msg: str = json.loads( - open('./config/text.json', 'r').read())['welcome']['message'] + open('./config/text.json', 'r', encoding='utf-8').read())['welcome']['message'] group_increase = on_notice() diff --git a/src/plugins/help/__init__.py b/src/plugins/help/__init__.py index eb78533..6f6276a 100644 --- a/src/plugins/help/__init__.py +++ b/src/plugins/help/__init__.py @@ -6,9 +6,9 @@ from nonebot import logger from nonebot.adapters.cqhttp import Bot, Message, MessageEvent -text: dict = json.loads(open('./config/text.json', 'r').read()) +text: dict = json.loads(open('./config/text.json', 'r', encoding='utf-8').read()) -cmd_set: dict = json.loads(open('./config/cmd_alias.json', 'r').read())['help'] +cmd_set: dict = json.loads(open('./config/cmd_alias.json', 'r', encoding='utf-8').read())['help'] help = on_command(cmd_set['cmd'], aliases=set(cmd_set['aliases'])) diff --git a/src/plugins/issue_cmd/__init__.py b/src/plugins/issue_cmd/__init__.py index 3add574..07b3ccf 100644 --- a/src/plugins/issue_cmd/__init__.py +++ b/src/plugins/issue_cmd/__init__.py @@ -7,11 +7,11 @@ from nonebot.adapters.cqhttp import Bot, MessageSegment, MessageEvent import prism_api -op_user: list = json.loads(open('./config/group.json', 'r').read())['op_user'] -text: dict = json.loads(open('./config/text.json', 'r').read())['issue_cmd'] +op_user: list = json.loads(open('./config/group.json', 'r', encoding='utf-8').read())['op_user'] +text: dict = json.loads(open('./config/text.json', 'r', encoding='utf-8').read())['issue_cmd'] cmd_set: dict = json.loads( - open('./config/cmd_alias.json', 'r').read())['issue_cmd'] + open('./config/cmd_alias.json', 'r', encoding='utf-8').read())['issue_cmd'] issue_cmd = on_command(cmd_set['cmd'], aliases=set(cmd_set['aliases'])) diff --git a/src/plugins/mc_event/__init__.py b/src/plugins/mc_event/__init__.py index ffa151d..3f5392f 100644 --- a/src/plugins/mc_event/__init__.py +++ b/src/plugins/mc_event/__init__.py @@ -9,11 +9,11 @@ from fastapi import Body, FastAPI import prism_api -config: dict = json.loads(open('./config/mc_event.json', 'r').read()) -group_config: dict = json.loads(open('./config/group.json', 'r').read()) -text: dict = json.loads(open('./config/text.json', 'r').read())['mc_event'] +config: dict = json.loads(open('./config/mc_event.json', 'r', encoding='utf-8').read()) +group_config: dict = json.loads(open('./config/group.json', 'r', encoding='utf-8').read()) +text: dict = json.loads(open('./config/text.json', 'r', encoding='utf-8').read())['mc_event'] not_bind_msg_in_game: str = json.loads( - open('./config/text.json', 'r').read())['bind_qq']['not_bind_msg_in_game'] + open('./config/text.json', 'r', encoding='utf-8').read())['bind_qq']['not_bind_msg_in_game'] app: FastAPI = nonebot.get_app() @@ -92,7 +92,7 @@ async def player_join_handler(bot: Bot, data: dict): # 检测玩家是否绑定账号 try: - record = json.loads(open('./data/bind_qq.json', 'r').read()) + record = json.loads(open('./data/bind_qq.json', 'r', encoding='utf-8').read()) players = list(record.values()) except FileNotFoundError: players = [] @@ -115,7 +115,7 @@ async def player_advancement_handler(bot: Bot, data: dict): # 检查成就翻译 try: tranlation = json.loads( - open('./data/advancement_translation.json', 'r').read()) + open('./data/advancement_translation.json', 'r', encoding='utf-8').read()) except FileNotFoundError: tranlation = {} @@ -180,7 +180,7 @@ async def player_quit_handler(bot: Bot, data: dict): if config['enable']['player_quit_private'] == True: # 向本人发送消息，提醒下线 try: - record = json.loads(open('./data/bind_qq.json', 'r').read()) + record = json.loads(open('./data/bind_qq.json', 'r', encoding='utf-8').read()) except FileNotFoundError: record = {} diff --git a/src/plugins/prism_api/__init__.py b/src/plugins/prism_api/__init__.py index 7c413cf..8992998 100644 --- a/src/plugins/prism_api/__init__.py +++ b/src/plugins/prism_api/__init__.py @@ -5,7 +5,7 @@ from nonebot.log import logger import httpx -config = json.loads(open('./config/mc_server.json', 'r').read()) +config = json.loads(open('./config/mc_server.json', 'r', encoding='utf-8').read()) async def get(api: str, server_tag: str = None): diff --git a/src/plugins/query_online/__init__.py b/src/plugins/query_online/__init__.py index a5f4d03..0b6e638 100644 --- a/src/plugins/query_online/__init__.py +++ b/src/plugins/query_online/__init__.py @@ -7,9 +7,9 @@ from nonebot.adapters.cqhttp import Bot, MessageSegment, MessageEvent import prism_api -text: dict = json.loads(open('./config/text.json', 'r').read())['query_online'] +text: dict = json.loads(open('./config/text.json', 'r', encoding='utf-8').read())['query_online'] -cmd_set: dict = json.loads(open('./config/cmd_alias.json', 'r').read())['query_online'] +cmd_set: dict = json.loads(open('./config/cmd_alias.json', 'r', encoding='utf-8').read())['query_online'] query_online = on_command(cmd_set['cmd'], aliases=set(cmd_set['aliases'])) diff --git a/src/plugins/say_mc_msg/__init__.py b/src/plugins/say_mc_msg/__init__.py index fc57b0c..9d780c0 100644 --- a/src/plugins/say_mc_msg/__init__.py +++ b/src/plugins/say_mc_msg/__init__.py @@ -8,10 +8,10 @@ import prism_api not_bind_when_send_msg: str = json.loads( - open('./config/text.json', 'r').read())['bind_qq']['not_bind_when_send_msg'] -text: dict = json.loads(open('./config/text.json', 'r').read())['say_mc_msg'] + open('./config/text.json', 'r', encoding='utf-8').read())['bind_qq']['not_bind_when_send_msg'] +text: dict = json.loads(open('./config/text.json', 'r', encoding='utf-8').read())['say_mc_msg'] -cmd_set: dict = json.loads(open('./config/cmd_alias.json', 'r').read())['say_mc_msg'] +cmd_set: dict = json.loads(open('./config/cmd_alias.json', 'r', encoding='utf-8').read())['say_mc_msg'] say_mc_msg = on_command(cmd_set['cmd'], aliases=set(cmd_set['aliases'])) @@ -23,7 +23,7 @@ async def handle_say_mc_msg(bot: Bot, event: MessageEvent): # 检查发送者是否绑定账号 try: - record = json.loads(open('./data/bind_qq.json', 'r').read()) + record = json.loads(open('./data/bind_qq.json', 'r', encoding='utf-8').read()) except FileNotFoundError: record = {} diff --git a/src/plugins/tell_mc_msg/__init__.py b/src/plugins/tell_mc_msg/__init__.py index 8a90da2..0531d22 100644 --- a/src/plugins/tell_mc_msg/__init__.py +++ b/src/plugins/tell_mc_msg/__init__.py @@ -8,10 +8,10 @@ import prism_api not_bind_when_send_msg: str = json.loads( - open('./config/text.json', 'r').read())['bind_qq']['not_bind_when_send_msg'] -text: dict = json.loads(open('./config/text.json', 'r').read())['tell_mc_msg'] + open('./config/text.json', 'r', encoding='utf-8').read())['bind_qq']['not_bind_when_send_msg'] +text: dict = json.loads(open('./config/text.json', 'r', encoding='utf-8').read())['tell_mc_msg'] -cmd_set: dict = json.loads(open('./config/cmd_alias.json', 'r').read())['tell_mc_msg'] +cmd_set: dict = json.loads(open('./config/cmd_alias.json', 'r', encoding='utf-8').read())['tell_mc_msg'] tell_mc_msg = on_command(cmd_set['cmd'], aliases=set(cmd_set['aliases'])) @@ -22,7 +22,7 @@ async def handle_tell_mc_msg(bot: Bot, event: MessageEvent): at_msg = MessageSegment.at(user_id) + '\n' # 检查发送者是否绑定账号 - record = json.loads(open('./data/bind_qq.json', 'r').read()) + record = json.loads(open('./data/bind_qq.json', 'r', encoding='utf-8').read()) if str(user_id) not in record: logger.info(f"{user_id}试图向服务器私聊消息但未绑定账号，已拒绝") diff --git a/src/plugins/utils/__init__.py b/src/plugins/utils/__init__.py index 5fbb281..9bc2f60 100644 --- a/src/plugins/utils/__init__.py +++ b/src/plugins/utils/__init__.py @@ -6,7 +6,7 @@ from nonebot import logger from nonebot.adapters.cqhttp import Bot -config = json.loads(open('./config/group.json', 'r').read()) +config = json.loads(open('./config/group.json', 'r', encoding='utf-8').read()) async def inform_admin(message: str, member_user_id: int = None): diff --git a/src/plugins/welcome/__init__.py b/src/plugins/welcome/__init__.py index ce433d1..2fb5eba 100644 --- a/src/plugins/welcome/__init__.py +++ b/src/plugins/welcome/__init__.py @@ -6,9 +6,9 @@ from nonebot.adapters.cqhttp import Bot, Message, MessageEvent welcome_msg: str = json.loads( - open('./config/text.json', 'r').read())['welcome']['message'] + open('./config/text.json', 'r', encoding='utf-8').read())['welcome']['message'] -cmd_set: dict = json.loads(open('./config/cmd_alias.json', 'r').read())['welcome'] +cmd_set: dict = json.loads(open('./config/cmd_alias.json', 'r', encoding='utf-8').read())['welcome'] welcome = on_command(cmd_set['cmd'], aliases=set(cmd_set['aliases']))