Merge no-show-image-url

README.md

@@ -43,6 +43,7 @@ First, copy config.json.example to config.json. Then fill in the fields:
 * `user_id_format`: A Python `str.format`-style string to format user IDs as
 * `db_url`: A SQLAlchemy URL for the database. See the [SQLAlchemy docs](http://docs.sqlalchemy.org/en/latest/core/engines.html).
 * `bot_owners`: A list of matrix users the bot won't use a `<username>` prefix for. Can be left blank to print a prefix for all matrix users. Useful if you would like the bridge to replace Telegram for yourself, but also want to allow others to use the Matrix room.
+* `print_url_with_image`: Set to `false` to disable sending the Matrix url of an image to Telegram.
 
 **Synapse configuration**
 

config.json.example

@@ -21,5 +21,7 @@
     "user_id_format": "@telegram_{}:DOMAIN.TLD",
     "db_url": "sqlite:///database.db",
 
+    "print_url_with_image": true
+
     "as_port": 5000
 }

telematrix/__init__.py

@@ -50,6 +50,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)
@@ -260,14 +262,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)
+                            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 + ')'
 
                             prefix = '<' + displayname + '> ' if displayname != ''
-                            caption = '{}{} ({})'.format(prefix,
+                            caption = '{}{}{}'.format(prefix,
                                                             content['body'], url_str)
                             response = await group.send_photo(img_file, caption=caption)
                     except: