ProjectHentai/nonebot2
6
0
Fork 0
mirror of https://github.com/nonebot/nonebot2.git synced 2024-12-04 11:04:50 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Add only_short_message option

Browse Source
This commit is contained in:
Richard Chien 2018-07-27 22:53:38 +08:00
parent 086ac57c21
commit 7b96decf53
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
none/default_config.py
View File

@ -30,5 +30,6 @@ COMMAND_START = {'/', '!', '／', '！'}
COMMAND_SEP = {'/', '.'} COMMAND_SEP = {'/', '.'}
SESSION_EXPIRE_TIMEOUT = timedelta(minutes=5) SESSION_EXPIRE_TIMEOUT = timedelta(minutes=5)
SESSION_RUNNING_EXPRESSION = '您有命令正在执行，请稍后再试' SESSION_RUNNING_EXPRESSION = '您有命令正在执行，请稍后再试'
SHORT_MESSAGE_MAX_LENGTH = 50
DATA_FOLDER = os.path.join(os.getcwd(), 'data') DATA_FOLDER = os.path.join(os.getcwd(), 'data')

26
none/natural_language.py
View File

@ -14,31 +14,36 @@ _nl_processors = set()
class NLProcessor: class NLProcessor:
__slots__ = ('func', 'keywords', 'permission', 'only_to_me') __slots__ = ('func', 'keywords', 'permission',
'only_to_me', 'only_short_message')
def __init__(self, *, func: Callable, keywords: Optional[Iterable], def __init__(self, *, func: Callable, keywords: Optional[Iterable],
permission: int, only_to_me: bool): permission: int, only_to_me: bool, only_short_message: bool):
self.func = func self.func = func
self.keywords = keywords self.keywords = keywords
self.permission = permission self.permission = permission
self.only_to_me = only_to_me self.only_to_me = only_to_me
self.only_short_message = only_short_message
def on_natural_language(keywords: Union[Optional[Iterable], Callable] = None, def on_natural_language(keywords: Union[Optional[Iterable], Callable] = None,
*, permission: int = perm.EVERYBODY, *, permission: int = perm.EVERYBODY,
only_to_me: bool = True) -> Callable: only_to_me: bool = True,
only_short_message: bool = True) -> Callable:
""" """
Decorator to register a function as a natural language processor. Decorator to register a function as a natural language processor.
:param keywords: keywords to respond, if None, respond to all messages :param keywords: keywords to respond, if None, respond to all messages
:param permission: permission required by the processor :param permission: permission required by the processor
:param only_to_me: only handle messages to me :param only_to_me: only handle messages to me
:param only_short_message: only handle short message
""" """
def deco(func: Callable) -> Callable: def deco(func: Callable) -> Callable:
nl_processor = NLProcessor(func=func, keywords=keywords, nl_processor = NLProcessor(func=func, keywords=keywords,
permission=permission, permission=permission,
only_to_me=only_to_me) only_to_me=only_to_me,
only_short_message=only_short_message)
_nl_processors.add(nl_processor) _nl_processors.add(nl_processor)
return func return func
@ -95,8 +100,19 @@ async def handle_natural_language(bot: NoneBot, ctx: Dict[str, Any]) -> bool:
session = NLPSession(bot, ctx, msg) session = NLPSession(bot, ctx, msg)
# use msg_text here because CQ code "share" may be very long,
# at the same time some plugins may want to handle it
msg_text_length = len(session.msg_text)
coros = [] coros = []
for p in _nl_processors: for p in _nl_processors:
if p.only_short_message and \
msg_text_length > bot.config.SHORT_MESSAGE_MAX_LENGTH:
continue
if p.only_to_me and not ctx['to_me']:
continue
should_run = await perm.check_permission(bot, ctx, p.permission) should_run = await perm.check_permission(bot, ctx, p.permission)
if should_run and p.keywords: if should_run and p.keywords:
for kw in p.keywords: for kw in p.keywords:
@ -105,8 +121,6 @@ async def handle_natural_language(bot: NoneBot, ctx: Dict[str, Any]) -> bool:
else: else:
# no keyword matches # no keyword matches
should_run = False should_run = False
if should_run and p.only_to_me and not ctx['to_me']:
should_run = False
if should_run: if should_run:
coros.append(p.func(session)) coros.append(p.func(session))