Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

bots: Allow empty bot queries. 

This commit allows bots to be adressed with empty queries,
that is, by just @-mentioning them. @-mentioning is now the
only way to adress a bot.
This commit is contained in:
derAnfaenger 2017-05-23 01:14:30 +02:00 committed by Tim Abbott
parent e1f6b8135f
commit b90a5f60e2
1 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
contrib_bots/bot_lib.py
View File

@ -78,28 +78,13 @@ def run_message_handler_for_bot(lib_module, quiet, config_file):
if not quiet: if not quiet:
print(message_handler.usage()) print(message_handler.usage())
def extract_message_if_mentioned(message, client): def extract_message(message, client):
bot_mention = r'^@(\*\*{0}\*\*\s|{0}\s)(?=.*)'.format(client.full_name) bot_mention = r'^@(\*\*{0}\*\*)'.format(client.full_name)
start_with_mention = re.compile(bot_mention).match(message['content']) start_with_mention = re.compile(bot_mention).match(message['content'])
if start_with_mention: if start_with_mention is None:
query = message['content'][len(start_with_mention.group()):]
return query
else:
bot_response = 'Please mention me first, then type the query.'
if message['type'] == 'private':
client.send_message(dict(
type='private',
to=message['sender_email'],
content=bot_response,
))
else:
client.send_message(dict(
type='stream',
to=message['display_recipient'],
subject=message['subject'],
content=bot_response,
))
return None return None
query_without_mention = message['content'][len(start_with_mention.group()):]
return query_without_mention
def is_private(message, client): def is_private(message, client):
# bot will not reply if the sender name is the same as the bot name # bot will not reply if the sender name is the same as the bot name
@ -116,7 +101,7 @@ def run_message_handler_for_bot(lib_module, quiet, config_file):
# Strip at-mention botname from the message # Strip at-mention botname from the message
if is_mentioned: if is_mentioned:
message['content'] = extract_message_if_mentioned(message=message, client=restricted_client) message['content'] = extract_message(message=message, client=restricted_client)
if message['content'] is None: if message['content'] is None:
return return