From e23be75f6daf32db859cb9e7db912273962a7a1c Mon Sep 17 00:00:00 2001 From: benkuly Date: Sat, 30 Nov 2019 08:33:32 +0100 Subject: [PATCH 1/3] added vars for bot token in telegram bridge --- roles/matrix-bridge-mautrix-telegram/defaults/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/roles/matrix-bridge-mautrix-telegram/defaults/main.yml b/roles/matrix-bridge-mautrix-telegram/defaults/main.yml index 4f30d8fc..4e6adb26 100644 --- a/roles/matrix-bridge-mautrix-telegram/defaults/main.yml +++ b/roles/matrix-bridge-mautrix-telegram/defaults/main.yml @@ -14,6 +14,7 @@ matrix_mautrix_telegram_data_path: "{{ matrix_mautrix_telegram_base_path }}/data # Get your own API keys at https://my.telegram.org/apps matrix_mautrix_telegram_api_id: '' matrix_mautrix_telegram_api_hash: '' +matrix_mautrix_telegram_bot_token: disabled # Mautrix telegram public endpoint to log in to telegram # Use an uuid so it's not easily discoverable. @@ -297,7 +298,7 @@ matrix_mautrix_telegram_configuration_yaml: | api_id: {{ matrix_mautrix_telegram_api_id }} api_hash: {{ matrix_mautrix_telegram_api_hash }} # (Optional) Create your own bot at https://t.me/BotFather - bot_token: disabled + bot_token: {{ matrix_mautrix_telegram_bot_token }} # Telethon connection options. connection: From feb35486a085c7bb0a1673e33c9657962a657825 Mon Sep 17 00:00:00 2001 From: benkuly Date: Sat, 30 Nov 2019 08:36:53 +0100 Subject: [PATCH 2/3] added documentation for telegram relay bot feature --- docs/configuring-playbook-bridge-mautrix-telegram.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/configuring-playbook-bridge-mautrix-telegram.md b/docs/configuring-playbook-bridge-mautrix-telegram.md index f83a4dda..fbbfa479 100644 --- a/docs/configuring-playbook-bridge-mautrix-telegram.md +++ b/docs/configuring-playbook-bridge-mautrix-telegram.md @@ -13,3 +13,9 @@ matrix_mautrix_telegram_api_hash: YOUR_TELEGRAM_API_HASH ``` You then need to start a chat with `@telegrambot:YOUR_DOMAIN` (where `YOUR_DOMAIN` is your base domain, not the `matrix.` domain). + +If you want to use the relay-bot feature ([relay bot documentation](https://github.com/tulir/mautrix-telegram/wiki/Relay-bot)), which allows anonymous user to chat with telegram users, use the following addtional playbook configuration: + +```yaml +matrix_mautrix_telegram_bot_token: YOUT_TELEGRAM_BOT_TOKEN +``` From 10c2dfe58f48f7abf2cd2592dbdfc480961cbec4 Mon Sep 17 00:00:00 2001 From: benkuly Date: Mon, 2 Dec 2019 08:50:26 +0100 Subject: [PATCH 3/3] fixed typo --- docs/configuring-playbook-bridge-mautrix-telegram.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/configuring-playbook-bridge-mautrix-telegram.md b/docs/configuring-playbook-bridge-mautrix-telegram.md index fbbfa479..18bd630d 100644 --- a/docs/configuring-playbook-bridge-mautrix-telegram.md +++ b/docs/configuring-playbook-bridge-mautrix-telegram.md @@ -14,7 +14,7 @@ matrix_mautrix_telegram_api_hash: YOUR_TELEGRAM_API_HASH You then need to start a chat with `@telegrambot:YOUR_DOMAIN` (where `YOUR_DOMAIN` is your base domain, not the `matrix.` domain). -If you want to use the relay-bot feature ([relay bot documentation](https://github.com/tulir/mautrix-telegram/wiki/Relay-bot)), which allows anonymous user to chat with telegram users, use the following addtional playbook configuration: +If you want to use the relay-bot feature ([relay bot documentation](https://github.com/tulir/mautrix-telegram/wiki/Relay-bot)), which allows anonymous user to chat with telegram users, use the following additional playbook configuration: ```yaml matrix_mautrix_telegram_bot_token: YOUT_TELEGRAM_BOT_TOKEN