diff --git a/starbot/commands/builtin/at/dynamic_at_me.py b/starbot/commands/builtin/at/dynamic_at_me.py index d0f55e9..23cefae 100644 --- a/starbot/commands/builtin/at/dynamic_at_me.py +++ b/starbot/commands/builtin/at/dynamic_at_me.py @@ -6,6 +6,7 @@ from graia.ariadne.message.parser.twilight import Twilight, FullMatch, ElementMa from graia.ariadne.model import Member, Group from graia.saya import Channel from graia.saya.builtins.broadcast import ListenerSchema +from loguru import logger from ....core.datasource import DataSource from ....core.model import PushType @@ -27,6 +28,8 @@ channel = Channel.current() ) ) async def dynamic_at_me(app: Ariadne, source: Source, sender: Group, member: Member): + logger.info(f"群[{sender.id}] 触发命令 : 动态@我") + datasource: DataSource = app.options["StarBotDataSource"] ups = datasource.get_ups_by_target(sender.id, PushType.Group if isinstance(sender, Group) else PushType.Friend) diff --git a/starbot/commands/builtin/at/dynamic_at_me_cancel.py b/starbot/commands/builtin/at/dynamic_at_me_cancel.py index 2009fcb..c3e7e0b 100644 --- a/starbot/commands/builtin/at/dynamic_at_me_cancel.py +++ b/starbot/commands/builtin/at/dynamic_at_me_cancel.py @@ -6,6 +6,7 @@ from graia.ariadne.message.parser.twilight import Twilight, FullMatch, UnionMatc from graia.ariadne.model import Member, Group from graia.saya import Channel from graia.saya.builtins.broadcast import ListenerSchema +from loguru import logger from ....core.datasource import DataSource from ....core.model import PushType @@ -29,6 +30,8 @@ channel = Channel.current() ) ) async def dynamic_at_me_cancel(app: Ariadne, source: Source, sender: Group, member: Member): + logger.info(f"群[{sender.id}] 触发命令 : 取消动态@我") + datasource: DataSource = app.options["StarBotDataSource"] ups = datasource.get_ups_by_target(sender.id, PushType.Group if isinstance(sender, Group) else PushType.Friend) diff --git a/starbot/commands/builtin/at/dynamic_at_me_list.py b/starbot/commands/builtin/at/dynamic_at_me_list.py index 349a026..4f494c1 100644 --- a/starbot/commands/builtin/at/dynamic_at_me_list.py +++ b/starbot/commands/builtin/at/dynamic_at_me_list.py @@ -6,6 +6,7 @@ from graia.ariadne.message.parser.twilight import Twilight, FullMatch, UnionMatc from graia.ariadne.model import Group from graia.saya import Channel from graia.saya.builtins.broadcast import ListenerSchema +from loguru import logger from ....core.datasource import DataSource from ....core.model import PushType @@ -27,6 +28,8 @@ channel = Channel.current() ) ) async def dynamic_at_me_list(app: Ariadne, source: Source, sender: Group): + logger.info(f"群[{sender.id}] 触发命令 : 动态@列表") + datasource: DataSource = app.options["StarBotDataSource"] ups = datasource.get_ups_by_target(sender.id, PushType.Group if isinstance(sender, Group) else PushType.Friend) diff --git a/starbot/commands/builtin/at/live_on_at_me.py b/starbot/commands/builtin/at/live_on_at_me.py index 197e9ea..9f2969c 100644 --- a/starbot/commands/builtin/at/live_on_at_me.py +++ b/starbot/commands/builtin/at/live_on_at_me.py @@ -6,6 +6,7 @@ from graia.ariadne.message.parser.twilight import Twilight, FullMatch, UnionMatc from graia.ariadne.model import Member, Group from graia.saya import Channel from graia.saya.builtins.broadcast import ListenerSchema +from loguru import logger from ....core.datasource import DataSource from ....core.model import PushType @@ -27,6 +28,8 @@ channel = Channel.current() ) ) async def live_on_at_me(app: Ariadne, source: Source, sender: Group, member: Member): + logger.info(f"群[{sender.id}] 触发命令 : 开播@我") + datasource: DataSource = app.options["StarBotDataSource"] ups = datasource.get_ups_by_target(sender.id, PushType.Group if isinstance(sender, Group) else PushType.Friend) diff --git a/starbot/commands/builtin/at/live_on_at_me_cancel.py b/starbot/commands/builtin/at/live_on_at_me_cancel.py index 0a8dfaa..cb9cf67 100644 --- a/starbot/commands/builtin/at/live_on_at_me_cancel.py +++ b/starbot/commands/builtin/at/live_on_at_me_cancel.py @@ -6,6 +6,7 @@ from graia.ariadne.message.parser.twilight import Twilight, FullMatch, UnionMatc from graia.ariadne.model import Member, Group from graia.saya import Channel from graia.saya.builtins.broadcast import ListenerSchema +from loguru import logger from ....core.datasource import DataSource from ....core.model import PushType @@ -29,6 +30,8 @@ channel = Channel.current() ) ) async def live_on_at_me_cancel(app: Ariadne, source: Source, sender: Group, member: Member): + logger.info(f"群[{sender.id}] 触发命令 : 取消开播@我") + datasource: DataSource = app.options["StarBotDataSource"] ups = datasource.get_ups_by_target(sender.id, PushType.Group if isinstance(sender, Group) else PushType.Friend) diff --git a/starbot/commands/builtin/at/live_on_at_me_list.py b/starbot/commands/builtin/at/live_on_at_me_list.py index 5271ee2..f33fcac 100644 --- a/starbot/commands/builtin/at/live_on_at_me_list.py +++ b/starbot/commands/builtin/at/live_on_at_me_list.py @@ -6,6 +6,7 @@ from graia.ariadne.message.parser.twilight import Twilight, FullMatch, UnionMatc from graia.ariadne.model import Group from graia.saya import Channel from graia.saya.builtins.broadcast import ListenerSchema +from loguru import logger from ....core.datasource import DataSource from ....core.model import PushType @@ -27,6 +28,8 @@ channel = Channel.current() ) ) async def live_on_at_me_list(app: Ariadne, source: Source, sender: Group): + logger.info(f"群[{sender.id}] 触发命令 : 开播@列表") + datasource: DataSource = app.options["StarBotDataSource"] ups = datasource.get_ups_by_target(sender.id, PushType.Group if isinstance(sender, Group) else PushType.Friend) diff --git a/starbot/commands/builtin/data/bind.py b/starbot/commands/builtin/data/bind.py index 8ce80b3..07801be 100644 --- a/starbot/commands/builtin/data/bind.py +++ b/starbot/commands/builtin/data/bind.py @@ -9,6 +9,7 @@ from graia.ariadne.model import Friend, Member, Group from graia.ariadne.util.interrupt import FunctionWaiter from graia.saya import Channel from graia.saya.builtins.broadcast import ListenerSchema +from loguru import logger from ....utils import config, redis from ....utils.network import request @@ -35,6 +36,8 @@ async def bind(app: Ariadne, sender: Union[Friend, Group], member: Optional[Member], uid: MessageChain = ResultValue()): + logger.info(f"{'群' if isinstance(sender, Group) else '好友'}[{sender.id}] 触发命令 : 绑定") + if isinstance(sender, Group) and await redis.exists_disable_command("DenyBind", sender.id): await app.send_message(sender, MessageChain("此命令已被禁用~"), quote=source) return diff --git a/starbot/commands/builtin/data/room_data.py b/starbot/commands/builtin/data/room_data.py index becb0f0..4c02361 100644 --- a/starbot/commands/builtin/data/room_data.py +++ b/starbot/commands/builtin/data/room_data.py @@ -9,6 +9,7 @@ from graia.ariadne.message.parser.twilight import Twilight, FullMatch, ElementMa from graia.ariadne.model import Friend, Group from graia.saya import Channel from graia.saya.builtins.broadcast import ListenerSchema +from loguru import logger from ....core.datasource import DataSource from ....core.model import PushType @@ -32,6 +33,8 @@ channel = Channel.current() ) ) async def room_data(app: Ariadne, source: Source, sender: Union[Friend, Group]): + logger.info(f"{'群' if isinstance(sender, Group) else '好友'}[{sender.id}] 触发命令 : 直播间数据") + if isinstance(sender, Group) and await redis.exists_disable_command("DenyRoomData", sender.id): await app.send_message(sender, MessageChain("此命令已被禁用~"), quote=source) return diff --git a/starbot/commands/builtin/data/room_data_total.py b/starbot/commands/builtin/data/room_data_total.py index 1efadd1..f380f3e 100644 --- a/starbot/commands/builtin/data/room_data_total.py +++ b/starbot/commands/builtin/data/room_data_total.py @@ -9,6 +9,7 @@ from graia.ariadne.message.parser.twilight import Twilight, FullMatch, ElementMa from graia.ariadne.model import Friend, Group from graia.saya import Channel from graia.saya.builtins.broadcast import ListenerSchema +from loguru import logger from ....core.datasource import DataSource from ....core.model import PushType @@ -32,6 +33,8 @@ channel = Channel.current() ) ) async def room_data_total(app: Ariadne, source: Source, sender: Union[Friend, Group]): + logger.info(f"{'群' if isinstance(sender, Group) else '好友'}[{sender.id}] 触发命令 : 直播间总数据") + if isinstance(sender, Group) and await redis.exists_disable_command("DenyRoomDataTotal", sender.id): await app.send_message(sender, MessageChain("此命令已被禁用~"), quote=source) return diff --git a/starbot/commands/builtin/data/user_data.py b/starbot/commands/builtin/data/user_data.py index 4e9b1be..655b482 100644 --- a/starbot/commands/builtin/data/user_data.py +++ b/starbot/commands/builtin/data/user_data.py @@ -9,6 +9,7 @@ from graia.ariadne.message.parser.twilight import Twilight, FullMatch, ElementMa from graia.ariadne.model import Friend, Group, Member from graia.saya import Channel from graia.saya.builtins.broadcast import ListenerSchema +from loguru import logger from ....core.datasource import DataSource from ....core.model import PushType @@ -32,6 +33,8 @@ channel = Channel.current() ) ) async def user_data(app: Ariadne, source: Source, sender: Union[Friend, Group], member: Optional[Member]): + logger.info(f"{'群' if isinstance(sender, Group) else '好友'}[{sender.id}] 触发命令 : 我的数据") + if isinstance(sender, Group) and await redis.exists_disable_command("DenyUserData", sender.id): await app.send_message(sender, MessageChain("此命令已被禁用~"), quote=source) return diff --git a/starbot/commands/builtin/data/user_data_total.py b/starbot/commands/builtin/data/user_data_total.py index c83ae67..834a9e3 100644 --- a/starbot/commands/builtin/data/user_data_total.py +++ b/starbot/commands/builtin/data/user_data_total.py @@ -9,6 +9,7 @@ from graia.ariadne.message.parser.twilight import Twilight, FullMatch, ElementMa from graia.ariadne.model import Friend, Group, Member from graia.saya import Channel from graia.saya.builtins.broadcast import ListenerSchema +from loguru import logger from ....core.datasource import DataSource from ....core.model import PushType @@ -32,6 +33,8 @@ channel = Channel.current() ) ) async def user_data_total(app: Ariadne, source: Source, sender: Union[Friend, Group], member: Optional[Member]): + logger.info(f"{'群' if isinstance(sender, Group) else '好友'}[{sender.id}] 触发命令 : 我的总数据") + if isinstance(sender, Group) and await redis.exists_disable_command("DenyUserDataTotal", sender.id): await app.send_message(sender, MessageChain("此命令已被禁用~"), quote=source) return diff --git a/starbot/commands/builtin/disable_command.py b/starbot/commands/builtin/disable_command.py index 315132f..e7f2249 100644 --- a/starbot/commands/builtin/disable_command.py +++ b/starbot/commands/builtin/disable_command.py @@ -6,6 +6,7 @@ from graia.ariadne.message.parser.twilight import Twilight, FullMatch, UnionMatc from graia.ariadne.model import Group, Member, MemberPerm from graia.saya import Channel from graia.saya.builtins.broadcast import ListenerSchema +from loguru import logger from ...utils import config, redis from ...utils.utils import remove_command_param_placeholder @@ -51,6 +52,8 @@ async def disable_command(app: Ariadne, ) return + logger.info(f"群[{group.id}] 触发命令 : 禁用{name}") + if await redis.exists_disable_command(disable_map[name], group.id): await app.send_message(group, "此命令已经是禁用状态~", quote=source) return diff --git a/starbot/commands/builtin/enable_command.py b/starbot/commands/builtin/enable_command.py index 9d370ae..b24da18 100644 --- a/starbot/commands/builtin/enable_command.py +++ b/starbot/commands/builtin/enable_command.py @@ -6,6 +6,7 @@ from graia.ariadne.message.parser.twilight import Twilight, FullMatch, UnionMatc from graia.ariadne.model import Group, Member, MemberPerm from graia.saya import Channel from graia.saya.builtins.broadcast import ListenerSchema +from loguru import logger from ...utils import config, redis from ...utils.utils import remove_command_param_placeholder @@ -51,6 +52,8 @@ async def enable_command(app: Ariadne, ) return + logger.info(f"群[{group.id}] 触发命令 : 启用{name}") + if not (await redis.exists_disable_command(disable_map[name], group.id)): await app.send_message(group, "此命令已经是启用状态~", quote=source) return diff --git a/starbot/commands/builtin/help.py b/starbot/commands/builtin/help.py index fd6bcd2..971a2c6 100644 --- a/starbot/commands/builtin/help.py +++ b/starbot/commands/builtin/help.py @@ -8,6 +8,7 @@ from graia.ariadne.message.parser.twilight import Twilight, FullMatch, UnionMatc from graia.ariadne.model import Friend, Group from graia.saya import Channel from graia.saya.builtins.broadcast import ListenerSchema +from loguru import logger from ...painter.PicGenerator import PicGenerator, Color from ...utils import config, redis @@ -28,6 +29,8 @@ channel = Channel.current() ) ) async def _help(app: Ariadne, sender: Union[Friend, Group]): + logger.info(f"{'群' if isinstance(sender, Group) else '好友'}[{sender.id}] 触发命令 : 帮助") + disable_querys = ["DenyRoomData", "DenyRoomDataTotal", "DenyBind", "DenyUserData", "DenyUserDataTotal"] disabled = [False] * 5 if isinstance(sender, Group): diff --git a/starbot/commands/builtin/master/resend.py b/starbot/commands/builtin/master/resend.py index c08b5fd..3096d29 100644 --- a/starbot/commands/builtin/master/resend.py +++ b/starbot/commands/builtin/master/resend.py @@ -5,6 +5,7 @@ from graia.ariadne.message.parser.twilight import Twilight, FullMatch, UnionMatc from graia.ariadne.model import Friend from graia.saya import Channel from graia.saya.builtins.broadcast import ListenerSchema +from loguru import logger from ....core.datasource import DataSource from ....utils import config @@ -25,6 +26,8 @@ channel = Channel.current() ) ) async def resend(app: Ariadne, friend: Friend): + logger.info(f"好友[{friend.id}] 触发命令 : 补发") + if friend.id != master: return diff --git a/starbot/commands/builtin/master/resend_clear_queue.py b/starbot/commands/builtin/master/resend_clear_queue.py index 64048c9..33b430b 100644 --- a/starbot/commands/builtin/master/resend_clear_queue.py +++ b/starbot/commands/builtin/master/resend_clear_queue.py @@ -5,6 +5,7 @@ from graia.ariadne.message.parser.twilight import Twilight, FullMatch, UnionMatc from graia.ariadne.model import Friend from graia.saya import Channel from graia.saya.builtins.broadcast import ListenerSchema +from loguru import logger from ....core.datasource import DataSource from ....utils import config @@ -25,6 +26,8 @@ channel = Channel.current() ) ) async def resend_clear_queue(app: Ariadne, friend: Friend): + logger.info(f"好友[{friend.id}] 触发命令 : 清空补发队列") + if friend.id != master: return diff --git a/starbot/commands/builtin/ranking/ranking.py b/starbot/commands/builtin/ranking/ranking.py index 9b368c7..fcacd1f 100644 --- a/starbot/commands/builtin/ranking/ranking.py +++ b/starbot/commands/builtin/ranking/ranking.py @@ -11,6 +11,7 @@ from graia.ariadne.message.parser.twilight import Twilight, FullMatch, UnionMatc from graia.ariadne.model import Friend, Group from graia.saya import Channel from graia.saya.builtins.broadcast import ListenerSchema +from loguru import logger from ....core.datasource import DataSource from ....core.model import PushType @@ -62,6 +63,8 @@ async def ranking(app: Ariadne, if _type not in type_map: return + logger.info(f"{'群' if isinstance(sender, Group) else '好友'}[{sender.id}] 触发命令 : {_type}排行") + if page.matched: page = remove_command_param_placeholder(page.result.display) if not page.isdigit() or int(page) <= 0: diff --git a/starbot/commands/builtin/ranking/ranking_double.py b/starbot/commands/builtin/ranking/ranking_double.py index 968f84f..98f5cf9 100644 --- a/starbot/commands/builtin/ranking/ranking_double.py +++ b/starbot/commands/builtin/ranking/ranking_double.py @@ -11,6 +11,7 @@ from graia.ariadne.message.parser.twilight import Twilight, FullMatch, UnionMatc from graia.ariadne.model import Friend, Group from graia.saya import Channel from graia.saya.builtins.broadcast import ListenerSchema +from loguru import logger from ....core.datasource import DataSource from ....core.model import PushType @@ -52,6 +53,8 @@ async def ranking_double(app: Ariadne, if _type not in type_map: return + logger.info(f"{'群' if isinstance(sender, Group) else '好友'}[{sender.id}] 触发命令 : {_type}排行") + if page.matched: page = remove_command_param_placeholder(page.result.display) if not page.isdigit() or int(page) <= 0: