Merge pull request #41 from Mooling0602/dev

merge: dev -> main

Author: Mooling0602

.github/workflows/build.yml

@@ -1,6 +1,5 @@
 - 中文
-- [English](https://github.com/Mooling0602/MatrixSync-MCDR/blob/main/README_en_us.md)
-> 为避免合并入主分支后链接指向错误，URL一律使用主分支的地址。如果你正在访问其他分支，请注意自行定位链接跳转位置。
+- [English](README_en_us.md)
 
 # MatrixSync-MCDR
 一个MCDR（全称[MCDReforged](https://mcdreforged.com/)）插件，用于同步Matrix群组和《我的世界》服务器的线上游戏之间的消息。

README.md

@@ -1,6 +1,5 @@
-- [中文](https://github.com/Mooling0602/MatrixSync-MCDR/blob/main/README.md)
+- [简体中文](README.md)
 - English
-> To avoid incorrect links after merging into the main branch, all URLs should use the main branch's address. If you are accessing other branches, please make sure to manually adjust the link's target location.
 
 # MatrixSync-MCDR
 A MCDR (full name [MCDReforged](https://mcdreforged.com/)) plugin, can sync messages between Matrix groups and online gaming in Minecraft servers.

README_en_us.md

@@ -2,8 +2,8 @@
 [framework]
 ver=1
 [main]
-ver=2.5.3
+ver=2.5.4
 [release]
-test=0
+test=1
 [ci]
 plugin=1

config.ini

@@ -15,6 +15,7 @@ matrix_sync:
     failed: Failed to login your bot
     success: Login by password successfully!
     save_token: Saving token for the bot account...
+  no_permission: Permission level is too low!
   on_receiver_cancelled: Receiver task was cancelled.
   on_send_command:
     sending: Message is sending to matrix...

lang/en_us.yml

@@ -15,6 +15,7 @@ matrix_sync:
     failed: 无法登录你的机器人
     success: 成功使用密码完成登录！
     save_token: 正在为机器人账号保存Token...
+  no_permission: 权限等级过低！
   on_receiver_cancelled: 接收器任务已经取消。
   on_send_command:
     sending: 消息正在发送到Matrix...
@@ -30,6 +31,6 @@ matrix_sync:
   settings_comp_check:
     failed: "兼容性检查失败！旧有的设置项将备份为\"settings.json.bak\"。"
   sync_status:
-    running: "[MSync] 消息同步正在运行..."
-    not_running: "[MSync] 消息同步未在运行！"
+    running: "消息同步正在运行..."
+    not_running: "消息同步未在运行！"
   token_mismatch: Token和现有的账号不匹配！同步任务将不会继续进行。

lang/zh_cn.yml

@@ -5,7 +5,7 @@
 
 def get_homeserver(url: str):
     correct_url = url
-    if not url.startswith("https://") or url.startswith("http://"):
+    if not (url.startswith("https://") or url.startswith("http://")):
         correct_url = "https://" + url
     return correct_url
 

matrix_sync/client/__init__.py

@@ -3,12 +3,12 @@
 import sys
 import aiofiles
 from matrix_sync.commands import start_sync
-import matrix_sync.logger.get_logger as get_logger
 import matrix_sync.plg_globals as plg_globals
 
 from . import *
 from ..utils import configDir, tr
 from ..utils.token import getToken
+from ..utils.get_logger import console_logger
 from nio import LoginResponse
 from mcdreforged.api.decorator import new_thread
 
@@ -21,7 +21,7 @@ async def cache_token(resp: LoginResponse):
         }))
 
 async def login_by_password():
-    logger = get_logger()
+    logger = console_logger()
     client = AsyncClient(
         get_homeserver(plg_globals.config["homeserver"]),
         plg_globals.config["user_id"],

matrix_sync/client/init.py

@@ -1,10 +1,10 @@
 # thread MatrixReceiver
 import asyncio
-import matrix_sync.logger.get_logger as get_logger
 import matrix_sync.plg_globals as plg_globals
 
 from . import *
 from ..utils.token import getToken
+from ..utils.get_logger import console_logger
 from ..utils import tr
 from ..event import *
 from nio import MatrixRoom, RoomMessageText, SyncError, UploadFilterError
@@ -21,14 +21,14 @@ async def message_callback(room: MatrixRoom, event: RoomMessageText) -> None:
         event_dispatcher(MatrixMessageEvent, event.body, room.user_name(event.sender), room_info)
 
 def on_sync_error(response: SyncError):
-    logger = get_logger()
+    logger = console_logger()
     global homeserver_online
     logger.error(f"Sync error: {response.status_code}", "Receiver")
     if response.status_code >= 500:
         homeserver_online = False
 
 async def get_messages() -> None:
-    logger = get_logger()
+    logger = console_logger()
     global receiver
     resp = None
     client = AsyncClient(homeserver=get_homeserver(plg_globals.config["homeserver"]))

matrix_sync/client/receiver.py

@@ -1,13 +1,12 @@
 import asyncio
 import threading
-import matrix_sync.logger.get_logger as get_logger
 import matrix_sync.plg_globals as plg_globals
 
 from mcdreforged.api.all import *
+from ..utils.get_logger import console_logger, reply_logger
 from ..client.reporter import send_to_matrix
 from ..client.receiver import get_messages, stop_sync
-from ..client import *
-from ..utils import *
+from ..utils import psi, plgSelf, tr
 from .help import *
 
 
@@ -16,15 +15,15 @@
 plg_globals.tLock = threading.Lock()
 
 def start_sync():
-    logger = get_logger()
+    logger = console_logger()
     if not plg_globals.tLock.locked():
         run_sync_task()
     else:
         logger.warning(tr("on_sync_running"))
 
 @new_thread('MatrixReceiver')
 def run_sync_task():
-    logger = get_logger()
+    logger = console_logger()
     plg_globals.sync = True
     if plg_globals.token_vaild:
         with plg_globals.tLock:
@@ -52,42 +51,72 @@ def command_register(server: PluginServerInterface):
     builder.register(server)
 
 @builder.command("!!msync start")
-def on_command_start():
-    start_sync()
+def on_command_start(src: CommandSource):
+    if src.has_permission_higher_than(2):
+        start_sync()
+    else:
+        src.reply(tr("no_permission"))
 
 @builder.command("!!msync stop")
-async def on_command_stop():
-    await stop_sync()
+async def on_command_stop(src: CommandSource):
+    if src.has_permission_higher_than(2):
+        await stop_sync()
+    else:
+        src.reply(tr("no_permission"))
 
 @builder.command("!!msync status")
-def show_status():
-    logger = get_logger()
-    logger.info(f"Receiver: {plg_globals.sync}")
-    if plg_globals.sync:
-        logger.info(tr("sync_status.running"))
-    else:
-        logger.info(tr("sync_status.not_running"))
+def show_status(src: CommandSource):
+    logger = console_logger()
+    def return_result():
+        if plg_globals.sync:
+            logger.info(tr("sync_status.running"))
+        else:
+            logger.info(tr("sync_status.not_running"))
+    if src.is_console:
+        logger = console_logger()
+        logger.info(f"Receiver: {plg_globals.sync}")
+        return_result()
+    if src.is_player:
+        reply = reply_logger()
+        reply.log(src, f"Receiver: {plg_globals.sync}", logger)
+        if plg_globals.sync:
+            reply.log(src, tr("sync_status.running"), logger)
+        else:
+            reply.log(src, tr("sync_status.not_running"), logger)
 
 @builder.command("!!msync send <message>")
 def on_command_send(src: CommandSource, ctx: CommandContext):
-    if plg_globals.token_vaild:
-        matrix_reporter(ctx["message"])
-        src.reply(tr("on_send_command.sending"))
+    if src.has_permission_higher_than(2):
+        if plg_globals.token_vaild:
+            matrix_reporter(ctx["message"])
+            src.reply(tr("on_send_command.sending"))
+        else:
+            src.reply(tr("on_send_command.failed") + ": " + tr("token_mismatch"))
     else:
-        src.reply(tr("on_send_command.failed") + ": " + tr("token_mismatch"))
+        src.reply(tr("no_permission"))
 
 @builder.command("!!msync reload")
-def on_command_reload():
-    psi.reload_plugin(plgSelf.id)
+def on_command_reload(src: CommandSource):
+    if src.has_permission_higher_than(2):
+        psi.reload_plugin(plgSelf.id)
+    else:
+        reply = reply_logger()
+        logger = console_logger()
+        reply.log(src, tr("no_permission"), logger)
 
 @builder.command("!!msync reload <pack_name>")
 def on_command_reload_subpack(src: CommandSource, ctx: CommandContext):
-    plugin_list = psi.get_plugin_list()
-    subpack_id = "msync_" + ctx["pack_name"]
-    if subpack_id in plugin_list:
-        psi.reload_plugin(subpack_id)
+    if src.has_permission_higher_than(2):
+        plugin_list = psi.get_plugin_list()
+        subpack_id = ctx["pack_name"]
+        if not subpack_id.startswith("msync_"):
+            subpack_id = "msync_" + ctx["pack_name"]
+        if subpack_id in plugin_list:
+            psi.reload_plugin(subpack_id)
+        else:
+            src.reply("Reload subpack error: Invaild name or target subpack is not loaded!")
     else:
-        src.reply("Reload subpack error: Invaild name!")
+        src.reply(tr("no_permission"))
 
 @builder.command("!!msync")
 @builder.command("!!msync help")