Remove welcome_user_id from Element and Schildichat

Ref:
- https://github.com/matrix-org/matrix-react-sdk/pull/12153
- https://github.com/element-hq/element-web/pull/26885

Technically, it may still work for Schildichat, because it's stuck in
the past. It will catch up soon anyway.
This commit is contained in:
Slavi Pantaleev 2024-02-27 19:29:53 +02:00
parent 86c1875b3e
commit 80f6f98ac4
7 changed files with 10 additions and 8 deletions

View File

@ -3901,8 +3901,6 @@ matrix_client_element_enable_presence_by_hs_url: |
else {matrix_client_element_default_hs_url: false} else {matrix_client_element_default_hs_url: false}
}} }}
matrix_client_element_welcome_user_id: ~
matrix_client_element_jitsi_preferred_domain: "{{ matrix_server_fqn_jitsi if jitsi_enabled else '' }}" matrix_client_element_jitsi_preferred_domain: "{{ matrix_server_fqn_jitsi if jitsi_enabled else '' }}"
###################################################################### ######################################################################
@ -4014,8 +4012,6 @@ matrix_client_schildichat_enable_presence_by_hs_url: |
else {matrix_client_schildichat_default_hs_url: false} else {matrix_client_schildichat_default_hs_url: false}
}} }}
matrix_client_schildichat_welcome_user_id: ~
matrix_client_schildichat_jitsi_preferred_domain: "{{ matrix_server_fqn_jitsi if jitsi_enabled else '' }}" matrix_client_schildichat_jitsi_preferred_domain: "{{ matrix_server_fqn_jitsi if jitsi_enabled else '' }}"
###################################################################### ######################################################################

View File

@ -151,7 +151,6 @@ matrix_client_element_bug_report_endpoint_url: "https://element.io/bugreports/su
matrix_client_element_show_lab_settings: true # noqa var-naming matrix_client_element_show_lab_settings: true # noqa var-naming
# Element public room directory server(s) # Element public room directory server(s)
matrix_client_element_room_directory_servers: ['matrix.org'] matrix_client_element_room_directory_servers: ['matrix.org']
matrix_client_element_welcome_user_id: ~
# Branding of Element # Branding of Element
matrix_client_element_brand: "Element" matrix_client_element_brand: "Element"

View File

@ -43,6 +43,7 @@
- {'old': 'matrix_client_element_branding_authHeaderLogoUrl', 'new': 'matrix_client_element_branding_auth_header_logo_url'} - {'old': 'matrix_client_element_branding_authHeaderLogoUrl', 'new': 'matrix_client_element_branding_auth_header_logo_url'}
- {'old': 'matrix_client_element_branding_welcomeBackgroundUrl', 'new': 'matrix_client_element_branding_welcome_background_url'} - {'old': 'matrix_client_element_branding_welcomeBackgroundUrl', 'new': 'matrix_client_element_branding_welcome_background_url'}
- {'old': 'matrix_client_element_jitsi_preferredDomain', 'new': 'matrix_client_element_jitsi_preferred_domain'} - {'old': 'matrix_client_element_jitsi_preferredDomain', 'new': 'matrix_client_element_jitsi_preferred_domain'}
- {'old': 'matrix_client_element_welcome_user_id', 'new': '<removed>'}
- when: matrix_client_element_container_labels_traefik_enabled | bool - when: matrix_client_element_container_labels_traefik_enabled | bool
block: block:

View File

@ -26,7 +26,6 @@
"room_directory": { "room_directory": {
"servers": {{ matrix_client_element_room_directory_servers | to_json }} "servers": {{ matrix_client_element_room_directory_servers | to_json }}
}, },
"welcome_user_id": {{ matrix_client_element_welcome_user_id | to_json }},
{% if matrix_client_element_enable_presence_by_hs_url is not none %} {% if matrix_client_element_enable_presence_by_hs_url is not none %}
"enable_presence_by_hs_url": {{ matrix_client_element_enable_presence_by_hs_url | to_json }}, "enable_presence_by_hs_url": {{ matrix_client_element_enable_presence_by_hs_url | to_json }},
{% endif %} {% endif %}

View File

@ -145,7 +145,6 @@ matrix_client_schildichat_bug_report_endpoint_url: "https://element.io/bugreport
matrix_client_schildichat_show_lab_settings: true # noqa var-naming matrix_client_schildichat_show_lab_settings: true # noqa var-naming
# schildichat public room directory server(s) # schildichat public room directory server(s)
matrix_client_schildichat_room_directory_servers: ['matrix.org'] matrix_client_schildichat_room_directory_servers: ['matrix.org']
matrix_client_schildichat_welcome_user_id: ~
# Branding of schildichat # Branding of schildichat
matrix_client_schildichat_brand: "schildichat" matrix_client_schildichat_brand: "schildichat"

View File

@ -1,5 +1,14 @@
--- ---
- name: (Deprecation) Catch and report renamed Schildichat settings
ansible.builtin.fail:
msg: >-
Your configuration contains a variable, which now has a different name.
Please change your configuration to rename the variable (`{{ item.old }}` -> `{{ item.new }}`).
when: "item.old in vars"
with_items:
- {'old': 'matrix_client_schildichat_welcome_user_id', 'new': '<removed>'}
- name: Fail if required schildichat settings not defined - name: Fail if required schildichat settings not defined
ansible.builtin.fail: ansible.builtin.fail:
msg: > msg: >

View File

@ -26,7 +26,6 @@
"room_directory": { "room_directory": {
"servers": {{ matrix_client_schildichat_room_directory_servers | to_json }} "servers": {{ matrix_client_schildichat_room_directory_servers | to_json }}
}, },
"welcome_user_id": {{ matrix_client_schildichat_welcome_user_id | to_json }},
{% if matrix_client_schildichat_enable_presence_by_hs_url is not none %} {% if matrix_client_schildichat_enable_presence_by_hs_url is not none %}
"enable_presence_by_hs_url": {{ matrix_client_schildichat_enable_presence_by_hs_url | to_json }}, "enable_presence_by_hs_url": {{ matrix_client_schildichat_enable_presence_by_hs_url | to_json }},
{% endif %} {% endif %}