diff --git a/telematrix/__init__.py b/telematrix/__init__.py index 1e2113e..d4f8783 100644 --- a/telematrix/__init__.py +++ b/telematrix/__init__.py @@ -45,6 +45,8 @@ try: DATABASE_URL = CONFIG['db_url'] AS_PORT = CONFIG['as_port'] if 'as_port' in CONFIG else 5000 + + PRINT_URL_WITH_IMAGE = CONFIG['print_url_with_image'] if 'print_url_with_image' in CONFIG else True except (OSError, IOError) as exception: print('Error opening config file:') print(exception) @@ -249,13 +251,17 @@ async def matrix_transaction(request): # Download the file await download_matrix_file(url, content['body']) with open('/tmp/{}'.format(content['body']), 'rb') as img_file: - # Create the URL and shorten it - url_str = MATRIX_HOST_EXT + \ - '_matrix/media/r0/download/{}{}' \ - .format(url.netloc, quote(url.path)) - url_str = await shorten_url(url_str) + if PRINT_URL_WITH_IMAGE: + # Create the URL and shorten it + url_str = MATRIX_HOST_EXT + \ + '_matrix/media/r0/download/{}{}' \ + .format(url.netloc, quote(url.path)) + url_str = await shorten_url(url_str) + url_str = ' (' + url_str + ')' + else: + url_str = '' - caption = '<{}> {} ({})'.format(displayname, + caption = '<{}> {}{}'.format(displayname, content['body'], url_str) response = await group.send_photo(img_file, caption=caption) except: