diff --git a/roles/custom/matrix-bridge-beeper-line/defaults/main.yml b/roles/custom/matrix-bridge-beeper-line/defaults/main.yml index 4b5a3f672..57a69cdbe 100644 --- a/roles/custom/matrix-bridge-beeper-line/defaults/main.yml +++ b/roles/custom/matrix-bridge-beeper-line/defaults/main.yml @@ -38,7 +38,7 @@ matrix_bridge_beeper_line_appservice_address: "http://matrix-beeper-line:29322" matrix_bridge_beeper_line_scheme: https # The public base URL at which this bridge's HTTP API is reachable from outside (when exposed). -# Used for the provisioning API's external-server (OpenID) flow and for public media links. +# Used for the provisioning API's external-server (OpenID) flow. matrix_bridge_beeper_line_bridge_public_address: "{{ (matrix_bridge_beeper_line_scheme + '://' + matrix_bridge_beeper_line_exposure_hostname + matrix_bridge_beeper_line_exposure_path_prefix) if matrix_bridge_beeper_line_exposure_enabled else '' }}" matrix_bridge_beeper_line_msc4190_enabled: "{{ matrix_bridges_msc4190_enabled }}" @@ -48,7 +48,6 @@ matrix_bridge_beeper_line_backfill_enabled: false matrix_bridge_beeper_line_backfill_max_initial_messages: 50 matrix_bridge_beeper_line_backfill_max_catchup_messages: 500 matrix_bridge_beeper_line_backfill_unread_hours_threshold: 720 -matrix_bridge_beeper_line_backfill_threads_max_initial_messages: 50 matrix_bridge_beeper_line_command_prefix: "!line" @@ -162,8 +161,6 @@ matrix_bridge_beeper_line_bridge_encryption_pickle_key: mautrix.bridge.e2ee matrix_bridge_beeper_line_appservice_username_template: "{% raw %}line_{{.}}{% endraw %}" -matrix_bridge_beeper_line_public_media_signing_key: '' - # Shared secret for authentication of provisioning API requests. # If set to "disable", the provisioning API will be disabled. matrix_bridge_beeper_line_provisioning_shared_secret: disable @@ -203,7 +200,6 @@ matrix_bridge_beeper_line_registration_yaml: | url: {{ matrix_bridge_beeper_line_appservice_address }} as_token: "{{ matrix_bridge_beeper_line_appservice_token }}" hs_token: "{{ matrix_bridge_beeper_line_homeserver_token }}" - # See https://github.com/mautrix/signal/issues/43 sender_localpart: _bot_{{ matrix_bridge_beeper_line_appservice_bot_username }} rate_limited: false namespaces: diff --git a/roles/custom/matrix-bridge-beeper-line/templates/config.yaml.j2 b/roles/custom/matrix-bridge-beeper-line/templates/config.yaml.j2 index 4d57c0fa2..7d7485315 100644 --- a/roles/custom/matrix-bridge-beeper-line/templates/config.yaml.j2 +++ b/roles/custom/matrix-bridge-beeper-line/templates/config.yaml.j2 @@ -62,8 +62,6 @@ bridge: # Should the bridge listen to com.beeper.state_request events? # This is not necessary for anything outside of Beeper. enable_send_state_requests: false - # Should the com.beeper.bridge.identifiers list in global ghost profiles include phone numbers? - phone_numbers_in_profile: false # What should be done to portal rooms when a user logs out or is logged out? # Permitted values: @@ -127,10 +125,6 @@ bridge: m.audio: "{% raw %}{{ .Sender.DisambiguatedName }} sent an audio file{{ if .Caption }}: {{ .Caption }}{{ end }}{% endraw %}" m.video: "{% raw %}{{ .Sender.DisambiguatedName }} sent a video{{ if .Caption }}: {{ .Caption }}{{ end }}{% endraw %}" m.location: "{% raw %}{{ .Sender.DisambiguatedName }} sent a location{{ if .Caption }}: {{ .Caption }}{{ end }}{% endraw %}" - # For networks that support per-message displaynames (i.e. Slack and Discord), the template for those names. - # This has all the Sender variables available under message_formats (but without the .Sender prefix). - # Note that you need to manually remove the displayname from message_formats above. - displayname_format: "{% raw %}{{ .DisambiguatedName }}{% endraw %}" # Filter for automatically creating portals. portal_create_filter: @@ -216,7 +210,7 @@ appservice: # If you want to use https, you need to use a reverse proxy. The bridge does not have TLS support built in. address: {{ matrix_bridge_beeper_line_appservice_address | to_json }} # A public address that external services can use to reach this appservice. - # This is only needed for things like public media. A reverse proxy is generally necessary when using this field. + # A reverse proxy is generally necessary when using this field. # This value doesn't affect the registration file. public_address: {{ matrix_bridge_beeper_line_bridge_public_address | to_json }} @@ -296,51 +290,6 @@ provisioning: # auth before passing live network client credentials down in the response. enable_session_transfers: false -# Some networks require publicly accessible media download links (e.g. for user avatars when using Discord webhooks). -# These settings control whether the bridge will provide such public media access. -public_media: - # Should public media be enabled at all? - # The public_address field under the appservice section MUST be set when enabling public media. - enabled: false - # A key for signing public media URLs. - # If set to "generate", a random key will be generated. - signing_key: {{ matrix_bridge_beeper_line_public_media_signing_key | to_json }} - # Number of seconds that public media URLs are valid for. - # If set to 0, URLs will never expire. - expiry: 0 - # Length of hash to use for public media URLs. Must be between 0 and 32. - hash_length: 32 - # The path prefix for generated URLs. Note that this will NOT change the path where media is actually served. - # If you change this, you must configure your reverse proxy to rewrite the path accordingly. - path_prefix: /_mautrix/publicmedia - # Should the bridge store media metadata in the database in order to support encrypted media and generate shorter URLs? - # If false, the generated URLs will just have the MXC URI and a HMAC signature. - # The hash_length field will be used to decide the length of the generated URL. - # This also allows invalidating URLs by deleting the database entry. - use_database: false - -# Settings for converting remote media to custom mxc:// URIs instead of reuploading. -# More details can be found at https://docs.mau.fi/bridges/go/discord/direct-media.html -direct_media: - # Should custom mxc:// URIs be used instead of reuploading media? - enabled: false - # The server name to use for the custom mxc:// URIs. - # This server name will effectively be a real Matrix server, it just won't implement anything other than media. - # You must either set up .well-known delegation from this domain to the bridge, or proxy the domain directly to the bridge. - server_name: media.example.com - # Optionally a custom .well-known response. This defaults to `server_name:443` - well_known_response: - # Optionally specify a custom prefix for the media ID part of the MXC URI. - media_id_prefix: - # If the remote network supports media downloads over HTTP, then the bridge will use MSC3860/MSC3916 - # media download redirects if the requester supports it. Optionally, you can force redirects - # and not allow proxying at all by setting this to false. - # This option does nothing if the remote network does not support media downloads over HTTP. - allow_proxy: true - # Matrix server signing key to make the federation tester pass, same format as synapse's .signing.key file. - # This key is also used to sign the mxc:// URIs to ensure only the bridge can generate them. - server_key: generate - # Settings for backfilling messages. # Note that the exact way settings are applied depends on the network connector. # See https://docs.mau.fi/bridges/general/backfill.html for more details. @@ -355,10 +304,6 @@ backfill: # If a backfilled chat is older than this number of hours, # mark it as read even if it's unread on the remote network. unread_hours_threshold: {{ matrix_bridge_beeper_line_backfill_unread_hours_threshold | to_json }} - # Settings for backfilling threads within other backfills. - threads: - # Maximum number of messages to backfill in a new thread. - max_initial_messages: {{ matrix_bridge_beeper_line_backfill_threads_max_initial_messages | to_json }} # Settings for the backwards backfill queue. This only applies when connecting to # Beeper as standard Matrix servers don't support inserting messages into history. queue: