Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

修复了消息文本中出现和指令相同的字符串会错误激活指令的问题 #164

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

修复了消息文本中出现和指令相同的字符串会错误激活指令的问题 #164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
163c2c7
fix: 修复了GroupMessage.__repr__()返回字符串缺少author和group_openid信息的问题
CheckeyZerone Dec 10, 2023
572ab01
feat: 发送单聊和群聊的请求时可以使用msg_seq参数
CheckeyZerone Dec 10, 2023
de4e96f
Merge branch 'tencent-connect:master' into master
CheckeyZerone Dec 11, 2023
5f10bb7
fix: 修复了消息文本中出现指令会错误激活指令的问题
CheckeyZerone Dec 12, 2023
9b3c9af
fix: 修复了频道@机器人时若@消息在消息文本开头无法触发指令的问题
CheckeyZerone Dec 19, 2023
796f5b0
Merge branch 'master' into master
CheckeyZerone Dec 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions botpy/ext/command_util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,14 @@ async def decorated(*args, **kwargs):
message: BaseMessage = kwargs["message"]
for command in self.commands:
if command in message.content:
# 分割指令后面的指令参数
params = message.content.split(command)[1].strip()
kwargs["params"] = params
return await func(*args, **kwargs)
# 剔除消息文本中@机器人的字符串
content = message.content.replace(f"<@!{(await message.api.me())['id']}>", "")
content_split = content.lstrip().split(command)
# 当指令出现在消息文本（已剔除@机器人的信息）的开头执行指令
if len(content_split[0]) == 0:
# 分割指令后面的指令参数
kwargs["params"] = content_split[1].strip()
return await func(*args, **kwargs)
return False

return decorated
Expand Down
6 changes: 6 additions & 0 deletions botpy/message.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,12 @@ def __repr__(self):
return str(self.__dict__)


@property
def api(self):
return self._api



class GroupMessage(BaseMessage):
__slots__ = (
"author",
Expand Down