ProjectHentai/nonebot2
6
0
Fork 0
mirror of https://github.com/nonebot/nonebot2.git synced 2025-02-21 18:15:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allow "at" segment at the end of messages

Browse Source
This commit is contained in:
Richard Chien 2019-01-06 21:38:48 +08:00
parent f494e5db47
commit 3ab3904d60
1 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
nonebot/message.py
View File

@ -20,6 +20,9 @@ def message_preprocessor(func: Callable) -> Callable:
async def handle_message(bot: NoneBot, ctx: Context_T) -> None: async def handle_message(bot: NoneBot, ctx: Context_T) -> None:
_log_message(ctx) _log_message(ctx)
if not ctx['message']:
ctx['message'].append(MessageSegment.text(''))
coros = [] coros = []
for processor in _message_preprocessors: for processor in _message_preprocessors:
coros.append(processor(bot, ctx)) coros.append(processor(bot, ctx))
@ -27,17 +30,35 @@ async def handle_message(bot: NoneBot, ctx: Context_T) -> None:
await asyncio.wait(coros) await asyncio.wait(coros)
if 'to_me' not in ctx: if 'to_me' not in ctx:
if ctx['message_type'] != 'private': if ctx['message_type'] == 'private':
ctx['to_me'] = True
else:
# group or discuss # group or discuss
ctx['to_me'] = False ctx['to_me'] = False
first_message_seg = ctx['message'][0] at_me_seg = MessageSegment.at(ctx['self_id'])
if first_message_seg == MessageSegment.at(ctx['self_id']):
# check the first segment
first_msg_seg = ctx['message'][0]
if first_msg_seg == at_me_seg:
ctx['to_me'] = True ctx['to_me'] = True
del ctx['message'][0] del ctx['message'][0]
if not ctx['to_me']:
# check the last segment
i = -1
last_msg_seg = ctx['message'][i]
if last_msg_seg.type == 'text' and \
not last_msg_seg.data['text'].strip() and \
len(ctx['message']) >= 2:
i -= 1
last_msg_seg = ctx['message'][i]
if last_msg_seg == at_me_seg:
ctx['to_me'] = True
del ctx['message'][i:]
if not ctx['message']: if not ctx['message']:
ctx['message'].append(MessageSegment.text('')) ctx['message'].append(MessageSegment.text(''))
else:
ctx['to_me'] = True
while True: while True:
try: try: