Skip to content

Commit e7b4bdc

Browse files
authored
Merge pull request #1557 from GoliathLabs/telegram
Updated: telegram to v0.11.1
2 parents f9ad0df + 29668f4 commit e7b4bdc

File tree

3 files changed

+2
-22
lines changed

3 files changed

+2
-22
lines changed

roles/matrix-bridge-mautrix-telegram/defaults/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ matrix_telegram_lottieconverter_container_image_self_build: false
77
matrix_telegram_lottieconverter_container_image_self_build_mask_arch: false
88
matrix_telegram_lottieconverter_docker_repo: "https://mau.dev/tulir/lottieconverter.git"
99
matrix_telegram_lottieconverter_docker_src_files_path: "{{ matrix_base_data_path }}/lotticonverter/docker-src"
10-
matrix_telegram_lottieconverter_docker_image: "dock.mau.dev/tulir/lottieconverter:alpine-3.14" # needs to be ajusted according to FROM clause of Dockerfile of mautrix-telegram
10+
matrix_telegram_lottieconverter_docker_image: "dock.mau.dev/tulir/lottieconverter:alpine-3.15" # needs to be ajusted according to FROM clause of Dockerfile of mautrix-telegram
1111

1212
matrix_mautrix_telegram_container_image_self_build: false
1313
matrix_mautrix_telegram_docker_repo: "https://mau.dev/mautrix/telegram.git"
1414
matrix_mautrix_telegram_docker_src_files_path: "{{ matrix_base_data_path }}/mautrix-telegram/docker-src"
1515

16-
matrix_mautrix_telegram_version: v0.10.2
16+
matrix_mautrix_telegram_version: v0.11.1
1717
# See: https://mau.dev/mautrix/telegram/container_registry
1818
matrix_mautrix_telegram_docker_image: "dock.mau.dev/mautrix/telegram:{{ matrix_mautrix_telegram_version }}"
1919
matrix_mautrix_telegram_docker_image_force_pull: "{{ matrix_mautrix_telegram_docker_image.endswith(':latest') }}"

roles/matrix-bridge-mautrix-telegram/templates/config.yaml.j2

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -225,17 +225,6 @@ bridge:
225225
# notices from users listed here will be bridged.
226226
exceptions: []
227227

228-
# Some config options related to Telegram message deduplication.
229-
# The default values are usually fine, but some debug messages/warnings might recommend you
230-
# change these.
231-
deduplication:
232-
# Whether or not to check the database if the message about to be sent is a duplicate.
233-
pre_db_check: false
234-
# The number of latest events to keep when checking for duplicates.
235-
# You might need to increase this on high-traffic bridge instances.
236-
cache_queue_length: 20
237-
238-
239228
# The formats to use when sending messages to Telegram via the relay bot.
240229
#
241230
# Telegram doesn't have built-in emotes, so the m.emote format is also used for non-relaybot users.

roles/matrix-bridge-mautrix-telegram/templates/systemd/matrix-mautrix-telegram.service.j2

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,6 @@ Type=simple
1515
Environment="HOME={{ matrix_systemd_unit_home_path }}"
1616
ExecStartPre=-{{ matrix_host_command_sh }} -c '{{ matrix_host_command_docker }} kill matrix-mautrix-telegram 2>/dev/null'
1717
ExecStartPre=-{{ matrix_host_command_sh }} -c '{{ matrix_host_command_docker }} rm matrix-mautrix-telegram 2>/dev/null'
18-
ExecStartPre={{ matrix_host_command_docker }} run --rm --name matrix-mautrix-telegram-db \
19-
--log-driver=none \
20-
--user={{ matrix_user_uid }}:{{ matrix_user_gid }} \
21-
--cap-drop=ALL \
22-
--network={{ matrix_docker_network }} \
23-
-v {{ matrix_mautrix_telegram_config_path }}:/config:z \
24-
-v {{ matrix_mautrix_telegram_data_path }}:/data:z \
25-
{{ matrix_mautrix_telegram_docker_image }} \
26-
alembic -x config=/config/config.yaml upgrade head
2718

2819
# Intentional delay, so that the homeserver (we likely depend on) can manage to start.
2920
ExecStartPre={{ matrix_host_command_sleep }} 5

0 commit comments

Comments
 (0)