mirror of
https://github.com/langbot-app/LangBot.git
synced 2026-08-30 14:17:14 +00:00
fix: replace message_chain.has usage
This commit is contained in:
@@ -16,17 +16,26 @@ class AtBotRule(rule_model.GroupRespondRule):
|
|||||||
rule_dict: dict,
|
rule_dict: dict,
|
||||||
query: pipeline_query.Query,
|
query: pipeline_query.Query,
|
||||||
) -> entities.RuleJudgeResult:
|
) -> entities.RuleJudgeResult:
|
||||||
if message_chain.has(platform_message.At(query.adapter.bot_account_id)) and rule_dict['at']:
|
def remove_at(message_chain: platform_message.MessageChain):
|
||||||
message_chain.remove(platform_message.At(query.adapter.bot_account_id))
|
for component in message_chain.root:
|
||||||
|
if isinstance(component, platform_message.At) and component.target == query.adapter.bot_account_id:
|
||||||
|
message_chain.remove(component)
|
||||||
|
break
|
||||||
|
|
||||||
if message_chain.has(
|
remove_at(message_chain)
|
||||||
platform_message.At(query.adapter.bot_account_id)
|
remove_at(message_chain) # 回复消息时会at两次,检查并删除重复的
|
||||||
): # 回复消息时会at两次,检查并删除重复的
|
|
||||||
message_chain.remove(platform_message.At(query.adapter.bot_account_id))
|
|
||||||
|
|
||||||
return entities.RuleJudgeResult(
|
# if message_chain.has(platform_message.At(query.adapter.bot_account_id)) and rule_dict['at']:
|
||||||
matching=True,
|
# message_chain.remove(platform_message.At(query.adapter.bot_account_id))
|
||||||
replacement=message_chain,
|
|
||||||
)
|
# if message_chain.has(
|
||||||
|
# platform_message.At(query.adapter.bot_account_id)
|
||||||
|
# ): # 回复消息时会at两次,检查并删除重复的
|
||||||
|
# message_chain.remove(platform_message.At(query.adapter.bot_account_id))
|
||||||
|
|
||||||
|
# return entities.RuleJudgeResult(
|
||||||
|
# matching=True,
|
||||||
|
# replacement=message_chain,
|
||||||
|
# )
|
||||||
|
|
||||||
return entities.RuleJudgeResult(matching=False, replacement=message_chain)
|
return entities.RuleJudgeResult(matching=False, replacement=message_chain)
|
||||||
|
|||||||
@@ -1034,7 +1034,14 @@ class DiscordAdapter(abstract_platform_adapter.AbstractMessagePlatformAdapter):
|
|||||||
if quote_origin:
|
if quote_origin:
|
||||||
args['reference'] = message_source.source_platform_object
|
args['reference'] = message_source.source_platform_object
|
||||||
|
|
||||||
if message.has(platform_message.At):
|
has_at = False
|
||||||
|
|
||||||
|
for component in message.root:
|
||||||
|
if isinstance(component, platform_message.At):
|
||||||
|
has_at = True
|
||||||
|
break
|
||||||
|
|
||||||
|
if has_at:
|
||||||
args['mention_author'] = True
|
args['mention_author'] = True
|
||||||
|
|
||||||
await message_source.source_platform_object.channel.send(**args)
|
await message_source.source_platform_object.channel.send(**args)
|
||||||
|
|||||||
Reference in New Issue
Block a user