Merge branch 'bot-owners' into develop

This commit is contained in:
Austen Adler 2017-10-30 10:32:19 -04:00
commit 532c3af254

View File

@ -271,7 +271,7 @@ async def matrix_transaction(request):
url_str = await shorten_url(url_str)
url_str = ' (' + url_str + ')'
prefix = '<' + displayname + '> ' if displayname != ''
prefix = '' if displayname == '' else '<' + displayname + '> '
caption = '{}{}{}'.format(prefix,
content['body'], url_str)
response = await group.send_photo(img_file, caption=caption)