Merge branch 'master' into synapse-workers
This commit is contained in:
@ -69,6 +69,8 @@ matrix_mautrix_facebook_login_shared_secret: ''
|
||||
|
||||
matrix_mautrix_facebook_bridge_login_shared_secret_map: "{{ {matrix_mautrix_facebook_homeserver_domain: matrix_mautrix_facebook_login_shared_secret} if matrix_mautrix_facebook_login_shared_secret else {} }}"
|
||||
|
||||
matrix_mautrix_facebook_appservice_bot_username: facebookbot
|
||||
|
||||
matrix_mautrix_facebook_bridge_presence: true
|
||||
|
||||
# Default configuration template which covers the generic use case.
|
||||
@ -101,8 +103,11 @@ matrix_mautrix_facebook_registration_yaml: |
|
||||
users:
|
||||
- exclusive: true
|
||||
regex: '^@facebook_.+:{{ matrix_mautrix_facebook_homeserver_domain|regex_escape }}$'
|
||||
- exclusive: true
|
||||
regex: '^@{{ matrix_mautrix_facebook_appservice_bot_username|regex_escape }}:{{ matrix_mautrix_facebook_homeserver_domain|regex_escape }}$'
|
||||
url: {{ matrix_mautrix_facebook_appservice_address }}
|
||||
sender_localpart: facebookbot
|
||||
# See https://github.com/tulir/mautrix-signal/issues/43
|
||||
sender_localpart: _bot_{{ matrix_mautrix_facebook_appservice_bot_username|to_json }}
|
||||
rate_limited: false
|
||||
|
||||
matrix_mautrix_facebook_registration: "{{ matrix_mautrix_facebook_registration_yaml|from_yaml }}"
|
||||
|
@ -46,7 +46,7 @@ appservice:
|
||||
# The unique ID of this appservice.
|
||||
id: facebook
|
||||
# Username of the appservice bot.
|
||||
bot_username: facebookbot
|
||||
bot_username: {{ matrix_mautrix_facebook_appservice_bot_username|to_json }}
|
||||
# Display name and avatar for bot. Set to "remove" to remove display name/avatar, leave empty
|
||||
# to leave display name/avatar as-is.
|
||||
bot_displayname: Facebook bridge bot
|
||||
|
Reference in New Issue
Block a user