Skip to content

Commit

Permalink
Remove welcome_user_id from Element and Schildichat
Browse files Browse the repository at this point in the history
Ref:
- matrix-org/matrix-react-sdk#12153
- element-hq/element-web#26885

Technically, it may still work for Schildichat, because it's stuck in
the past. It will catch up soon anyway.
  • Loading branch information
spantaleev authored and Chasethechicken committed Jul 6, 2024
1 parent fd288ce commit 2aa7516
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 8 deletions.
4 changes: 0 additions & 4 deletions group_vars/matrix_servers
Original file line number Diff line number Diff line change
Expand Up @@ -3901,8 +3901,6 @@ matrix_client_element_enable_presence_by_hs_url: |
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 '' }}"

######################################################################
Expand Down Expand Up @@ -4014,8 +4012,6 @@ matrix_client_schildichat_enable_presence_by_hs_url: |
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 '' }}"

######################################################################
Expand Down
1 change: 0 additions & 1 deletion roles/custom/matrix-client-element/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
# Element public room directory server(s)
matrix_client_element_room_directory_servers: ['matrix.org']
matrix_client_element_welcome_user_id: ~
# Branding of Element
matrix_client_element_brand: "Element"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
- {'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_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
block:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
"room_directory": {
"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 %}
"enable_presence_by_hs_url": {{ matrix_client_element_enable_presence_by_hs_url | to_json }},
{% endif %}
Expand Down
1 change: 0 additions & 1 deletion roles/custom/matrix-client-schildichat/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
# schildichat public room directory server(s)
matrix_client_schildichat_room_directory_servers: ['matrix.org']
matrix_client_schildichat_welcome_user_id: ~
# Branding of schildichat
matrix_client_schildichat_brand: "schildichat"

Expand Down
Original file line number Diff line number Diff line change
@@ -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
ansible.builtin.fail:
msg: >
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
"room_directory": {
"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 %}
"enable_presence_by_hs_url": {{ matrix_client_schildichat_enable_presence_by_hs_url | to_json }},
{% endif %}
Expand Down

0 comments on commit 2aa7516

Please sign in to comment.