fix: Fixed disabled commands not working @ bot not triggering commands

starbot/commands/builtin/at/dynamic_at_me.py

@@ -1,8 +1,8 @@
 from graia.ariadne import Ariadne
 from graia.ariadne.event.message import GroupMessage
 from graia.ariadne.message.chain import MessageChain
-from graia.ariadne.message.element import Source
-from graia.ariadne.message.parser.twilight import Twilight, FullMatch
+from graia.ariadne.message.element import Source, At
+from graia.ariadne.message.parser.twilight import Twilight, FullMatch, ElementMatch
 from graia.ariadne.model import Member, Group
 from graia.saya import Channel
 from graia.saya.builtins.broadcast import ListenerSchema
@@ -20,6 +20,7 @@ channel = Channel.current()
     ListenerSchema(
         listening_events=[GroupMessage],
         inline_dispatchers=[Twilight(
+            ElementMatch(At, optional=True),
             FullMatch(prefix),
             FullMatch("动态@我")
         )],

starbot/commands/builtin/at/dynamic_at_me_cancel.py

@@ -1,8 +1,8 @@
 from graia.ariadne import Ariadne
 from graia.ariadne.event.message import GroupMessage
 from graia.ariadne.message.chain import MessageChain
-from graia.ariadne.message.element import Source
-from graia.ariadne.message.parser.twilight import Twilight, FullMatch, UnionMatch
+from graia.ariadne.message.element import Source, At
+from graia.ariadne.message.parser.twilight import Twilight, FullMatch, UnionMatch, ElementMatch
 from graia.ariadne.model import Member, Group
 from graia.saya import Channel
 from graia.saya.builtins.broadcast import ListenerSchema
@@ -20,6 +20,7 @@ channel = Channel.current()
     ListenerSchema(
         listening_events=[GroupMessage],
         inline_dispatchers=[Twilight(
+            ElementMatch(At, optional=True),
             FullMatch(prefix),
             UnionMatch(
                 "取消动态@我", "退出动态@我", "动态不@我", "动态别@我"

starbot/commands/builtin/at/dynamic_at_me_list.py

@@ -1,8 +1,8 @@
 from graia.ariadne import Ariadne
 from graia.ariadne.event.message import GroupMessage
 from graia.ariadne.message.chain import MessageChain
-from graia.ariadne.message.element import Source
-from graia.ariadne.message.parser.twilight import Twilight, FullMatch, UnionMatch
+from graia.ariadne.message.element import Source, At
+from graia.ariadne.message.parser.twilight import Twilight, FullMatch, UnionMatch, ElementMatch
 from graia.ariadne.model import Group
 from graia.saya import Channel
 from graia.saya.builtins.broadcast import ListenerSchema
@@ -20,6 +20,7 @@ channel = Channel.current()
     ListenerSchema(
         listening_events=[GroupMessage],
         inline_dispatchers=[Twilight(
+            ElementMatch(At, optional=True),
             FullMatch(prefix),
             UnionMatch("动态@列表", "动态@名单")
         )],

starbot/commands/builtin/at/live_on_at_me.py

@@ -1,8 +1,8 @@
 from graia.ariadne import Ariadne
 from graia.ariadne.event.message import GroupMessage
 from graia.ariadne.message.chain import MessageChain
-from graia.ariadne.message.element import Source
-from graia.ariadne.message.parser.twilight import Twilight, FullMatch, UnionMatch
+from graia.ariadne.message.element import Source, At
+from graia.ariadne.message.parser.twilight import Twilight, FullMatch, UnionMatch, ElementMatch
 from graia.ariadne.model import Member, Group
 from graia.saya import Channel
 from graia.saya.builtins.broadcast import ListenerSchema
@@ -20,6 +20,7 @@ channel = Channel.current()
     ListenerSchema(
         listening_events=[GroupMessage],
         inline_dispatchers=[Twilight(
+            ElementMatch(At, optional=True),
             FullMatch(prefix),
             UnionMatch("开播@我", "直播@我")
         )],

starbot/commands/builtin/at/live_on_at_me_cancel.py

@@ -1,8 +1,8 @@
 from graia.ariadne import Ariadne
 from graia.ariadne.event.message import GroupMessage
 from graia.ariadne.message.chain import MessageChain
-from graia.ariadne.message.element import Source
-from graia.ariadne.message.parser.twilight import Twilight, FullMatch, UnionMatch
+from graia.ariadne.message.element import Source, At
+from graia.ariadne.message.parser.twilight import Twilight, FullMatch, UnionMatch, ElementMatch
 from graia.ariadne.model import Member, Group
 from graia.saya import Channel
 from graia.saya.builtins.broadcast import ListenerSchema
@@ -20,6 +20,7 @@ channel = Channel.current()
     ListenerSchema(
         listening_events=[GroupMessage],
         inline_dispatchers=[Twilight(
+            ElementMatch(At, optional=True),
             FullMatch(prefix),
             UnionMatch(
                 "取消开播@我", "取消直播@我", "退出开播@我", "退出直播@我", "开播不@我", "直播不@我", "开播别@我", "直播别@我"

starbot/commands/builtin/at/live_on_at_me_list.py

@@ -1,8 +1,8 @@
 from graia.ariadne import Ariadne
 from graia.ariadne.event.message import GroupMessage
 from graia.ariadne.message.chain import MessageChain
-from graia.ariadne.message.element import Source
-from graia.ariadne.message.parser.twilight import Twilight, FullMatch, UnionMatch
+from graia.ariadne.message.element import Source, At
+from graia.ariadne.message.parser.twilight import Twilight, FullMatch, UnionMatch, ElementMatch
 from graia.ariadne.model import Group
 from graia.saya import Channel
 from graia.saya.builtins.broadcast import ListenerSchema
@@ -20,6 +20,7 @@ channel = Channel.current()
     ListenerSchema(
         listening_events=[GroupMessage],
         inline_dispatchers=[Twilight(
+            ElementMatch(At, optional=True),
             FullMatch(prefix),
             UnionMatch("开播@列表", "直播@列表", "开播@名单", "直播@名单")
         )],

starbot/commands/builtin/data/bind.py

@@ -3,8 +3,8 @@ from typing import Union, Optional
 from graia.ariadne import Ariadne
 from graia.ariadne.event.message import FriendMessage, GroupMessage
 from graia.ariadne.message.chain import MessageChain
-from graia.ariadne.message.element import Source
-from graia.ariadne.message.parser.twilight import Twilight, FullMatch, UnionMatch, ParamMatch, ResultValue
+from graia.ariadne.message.element import Source, At
+from graia.ariadne.message.parser.twilight import Twilight, FullMatch, UnionMatch, ParamMatch, ResultValue, ElementMatch
 from graia.ariadne.model import Friend, Member, Group
 from graia.ariadne.util.interrupt import FunctionWaiter
 from graia.saya import Channel
@@ -23,6 +23,7 @@ channel = Channel.current()
     ListenerSchema(
         listening_events=[FriendMessage, GroupMessage],
         inline_dispatchers=[Twilight(
+            ElementMatch(At, optional=True),
             FullMatch(prefix),
             UnionMatch("绑定", "bind"),
             "uid" @ ParamMatch()

starbot/commands/builtin/data/room_data.py

@@ -4,8 +4,8 @@ from typing import Union
 from graia.ariadne import Ariadne
 from graia.ariadne.event.message import FriendMessage, GroupMessage
 from graia.ariadne.message.chain import MessageChain
-from graia.ariadne.message.element import Image, Source
-from graia.ariadne.message.parser.twilight import Twilight, FullMatch
+from graia.ariadne.message.element import Image, Source, At
+from graia.ariadne.message.parser.twilight import Twilight, FullMatch, ElementMatch
 from graia.ariadne.model import Friend, Group
 from graia.saya import Channel
 from graia.saya.builtins.broadcast import ListenerSchema
@@ -25,6 +25,7 @@ channel = Channel.current()
     ListenerSchema(
         listening_events=[FriendMessage, GroupMessage],
         inline_dispatchers=[Twilight(
+            ElementMatch(At, optional=True),
             FullMatch(prefix),
             FullMatch("直播间数据")
         )],

starbot/commands/builtin/data/room_data_total.py

@@ -4,8 +4,8 @@ from typing import Union
 from graia.ariadne import Ariadne
 from graia.ariadne.event.message import FriendMessage, GroupMessage
 from graia.ariadne.message.chain import MessageChain
-from graia.ariadne.message.element import Image, Source
-from graia.ariadne.message.parser.twilight import Twilight, FullMatch
+from graia.ariadne.message.element import Image, Source, At
+from graia.ariadne.message.parser.twilight import Twilight, FullMatch, ElementMatch
 from graia.ariadne.model import Friend, Group
 from graia.saya import Channel
 from graia.saya.builtins.broadcast import ListenerSchema
@@ -25,6 +25,7 @@ channel = Channel.current()
     ListenerSchema(
         listening_events=[FriendMessage, GroupMessage],
         inline_dispatchers=[Twilight(
+            ElementMatch(At, optional=True),
             FullMatch(prefix),
             FullMatch("直播间总数据")
         )],

starbot/commands/builtin/data/user_data.py

@@ -4,8 +4,8 @@ from typing import Union, Optional
 from graia.ariadne import Ariadne
 from graia.ariadne.event.message import FriendMessage, GroupMessage
 from graia.ariadne.message.chain import MessageChain
-from graia.ariadne.message.element import Image, Source
-from graia.ariadne.message.parser.twilight import Twilight, FullMatch
+from graia.ariadne.message.element import Image, Source, At
+from graia.ariadne.message.parser.twilight import Twilight, FullMatch, ElementMatch
 from graia.ariadne.model import Friend, Group, Member
 from graia.saya import Channel
 from graia.saya.builtins.broadcast import ListenerSchema
@@ -25,6 +25,7 @@ channel = Channel.current()
     ListenerSchema(
         listening_events=[FriendMessage, GroupMessage],
         inline_dispatchers=[Twilight(
+            ElementMatch(At, optional=True),
             FullMatch(prefix),
             FullMatch("我的数据")
         )],

starbot/commands/builtin/data/user_data_total.py

@@ -4,8 +4,8 @@ from typing import Union, Optional
 from graia.ariadne import Ariadne
 from graia.ariadne.event.message import FriendMessage, GroupMessage
 from graia.ariadne.message.chain import MessageChain
-from graia.ariadne.message.element import Image, Source
-from graia.ariadne.message.parser.twilight import Twilight, FullMatch
+from graia.ariadne.message.element import Image, Source, At
+from graia.ariadne.message.parser.twilight import Twilight, FullMatch, ElementMatch
 from graia.ariadne.model import Friend, Group, Member
 from graia.saya import Channel
 from graia.saya.builtins.broadcast import ListenerSchema
@@ -25,6 +25,7 @@ channel = Channel.current()
     ListenerSchema(
         listening_events=[FriendMessage, GroupMessage],
         inline_dispatchers=[Twilight(
+            ElementMatch(At, optional=True),
             FullMatch(prefix),
             FullMatch("我的总数据")
         )],

starbot/commands/builtin/disable_command.py

@@ -1,8 +1,8 @@
 from graia.ariadne import Ariadne
 from graia.ariadne.event.message import GroupMessage
 from graia.ariadne.message.chain import MessageChain
-from graia.ariadne.message.element import Source
-from graia.ariadne.message.parser.twilight import Twilight, FullMatch, UnionMatch, ParamMatch, ResultValue
+from graia.ariadne.message.element import Source, At
+from graia.ariadne.message.parser.twilight import Twilight, FullMatch, UnionMatch, ParamMatch, ResultValue, ElementMatch
 from graia.ariadne.model import Group, Member, MemberPerm
 from graia.saya import Channel
 from graia.saya.builtins.broadcast import ListenerSchema
@@ -28,6 +28,7 @@ channel = Channel.current()
     ListenerSchema(
         listening_events=[GroupMessage],
         inline_dispatchers=[Twilight(
+            ElementMatch(At, optional=True),
             FullMatch(prefix),
             UnionMatch("禁用", "disable"),
             "name" @ ParamMatch()
@@ -50,7 +51,7 @@ async def disable_command(app: Ariadne,
         )
         return
 
-    if redis.exists_disable_command(disable_map[name], group.id):
+    if await redis.exists_disable_command(disable_map[name], group.id):
         await app.send_message(group, "此命令已经是禁用状态~", quote=source)
         return
 

starbot/commands/builtin/enable_command.py

@@ -1,8 +1,8 @@
 from graia.ariadne import Ariadne
 from graia.ariadne.event.message import GroupMessage
 from graia.ariadne.message.chain import MessageChain
-from graia.ariadne.message.element import Source
-from graia.ariadne.message.parser.twilight import Twilight, FullMatch, UnionMatch, ParamMatch, ResultValue
+from graia.ariadne.message.element import Source, At
+from graia.ariadne.message.parser.twilight import Twilight, FullMatch, UnionMatch, ParamMatch, ResultValue, ElementMatch
 from graia.ariadne.model import Group, Member, MemberPerm
 from graia.saya import Channel
 from graia.saya.builtins.broadcast import ListenerSchema
@@ -28,6 +28,7 @@ channel = Channel.current()
     ListenerSchema(
         listening_events=[GroupMessage],
         inline_dispatchers=[Twilight(
+            ElementMatch(At, optional=True),
             FullMatch(prefix),
             UnionMatch("启用", "enable"),
             "name" @ ParamMatch()
@@ -50,7 +51,7 @@ async def enable_command(app: Ariadne,
         )
         return
 
-    if not redis.exists_disable_command(disable_map[name], group.id):
+    if not (await redis.exists_disable_command(disable_map[name], group.id)):
         await app.send_message(group, "此命令已经是启用状态~", quote=source)
         return
 

starbot/commands/builtin/help.py

@@ -3,8 +3,8 @@ from typing import Union
 from graia.ariadne import Ariadne
 from graia.ariadne.event.message import FriendMessage, GroupMessage
 from graia.ariadne.message.chain import MessageChain
-from graia.ariadne.message.element import Image
-from graia.ariadne.message.parser.twilight import Twilight, FullMatch, UnionMatch
+from graia.ariadne.message.element import Image, At
+from graia.ariadne.message.parser.twilight import Twilight, FullMatch, UnionMatch, ElementMatch
 from graia.ariadne.model import Friend, Group
 from graia.saya import Channel
 from graia.saya.builtins.broadcast import ListenerSchema
@@ -21,6 +21,7 @@ channel = Channel.current()
     ListenerSchema(
         listening_events=[FriendMessage, GroupMessage],
         inline_dispatchers=[Twilight(
+            ElementMatch(At, optional=True),
             FullMatch(prefix),
             UnionMatch("帮助", "菜单", "功能", "命令", "指令", "help")
         )],

starbot/commands/builtin/ranking/ranking.py

@@ -5,8 +5,9 @@ from typing import Union
 from graia.ariadne import Ariadne
 from graia.ariadne.event.message import FriendMessage, GroupMessage
 from graia.ariadne.message.chain import MessageChain
-from graia.ariadne.message.element import Source, Image
-from graia.ariadne.message.parser.twilight import Twilight, FullMatch, UnionMatch, ParamMatch, RegexResult, ResultValue
+from graia.ariadne.message.element import Source, Image, At
+from graia.ariadne.message.parser.twilight import Twilight, FullMatch, UnionMatch, ParamMatch, RegexResult, ResultValue, \
+    ElementMatch
 from graia.ariadne.model import Friend, Group
 from graia.saya import Channel
 from graia.saya.builtins.broadcast import ListenerSchema
@@ -44,6 +45,7 @@ channel = Channel.current()
     ListenerSchema(
         listening_events=[FriendMessage, GroupMessage],
         inline_dispatchers=[Twilight(
+            ElementMatch(At, optional=True),
             FullMatch(prefix),
             "_type" @ ParamMatch(),
             UnionMatch("榜", "排行", "排行榜"),

starbot/commands/builtin/ranking/ranking_double.py

@@ -5,8 +5,9 @@ from typing import Union
 from graia.ariadne import Ariadne
 from graia.ariadne.event.message import FriendMessage, GroupMessage
 from graia.ariadne.message.chain import MessageChain
-from graia.ariadne.message.element import Source, Image
-from graia.ariadne.message.parser.twilight import Twilight, FullMatch, UnionMatch, ParamMatch, RegexResult, ResultValue
+from graia.ariadne.message.element import Source, Image, At
+from graia.ariadne.message.parser.twilight import Twilight, FullMatch, UnionMatch, ParamMatch, RegexResult, ResultValue, \
+    ElementMatch
 from graia.ariadne.model import Friend, Group
 from graia.saya import Channel
 from graia.saya.builtins.broadcast import ListenerSchema
@@ -34,6 +35,7 @@ channel = Channel.current()
     ListenerSchema(
         listening_events=[FriendMessage, GroupMessage],
         inline_dispatchers=[Twilight(
+            ElementMatch(At, optional=True),
             FullMatch(prefix),
             "_type" @ ParamMatch(),
             UnionMatch("榜", "排行", "排行榜"),