Pull mautrix config

- Include server name in discord channel room name
- Enable setting room info in gmessages
This commit is contained in:
Jade Ellis
2024-10-26 22:08:11 +01:00
parent 5cf2ca2400
commit d39001a081
6 changed files with 43 additions and 27 deletions
+11 -20
View File
@@ -2,10 +2,9 @@
homeserver:
# The address that this appservice can use to connect to the homeserver.
address: https://matrix.ellis.link
# address: http://conduwuit
# The domain of the homeserver (also known as server_name, used for MXIDs, etc).
domain: ellis.link
# What software is the homeserver running?
# Standard Matrix homeservers like Synapse, Dendrite and Conduit should just use "standard" here.
software: standard
@@ -16,7 +15,6 @@ homeserver:
# Endpoint for reporting per-message status.
message_send_checkpoint_endpoint: null
# Does the homeserver support https://github.com/matrix-org/matrix-spec-proposals/pull/2246?
# Doesn't seem to show up in conduwuit source as of 032b199
async_media: false
# Should the bridge use a websocket for connecting to the homeserver?
# The server side is currently not documented anywhere and is only implemented by mautrix-wsproxy,
@@ -30,12 +28,11 @@ homeserver:
appservice:
# The address that the homeserver can use to connect to this appservice.
address: https://mautrix-discord.ellis.link
# address: http://mautrix-discord
# The hostname and port where this appservice should listen.
hostname: 0.0.0.0
port: 29334
# Database config.
database:
# The database type. "sqlite3-fk-wal" and "postgres" are supported.
@@ -53,7 +50,7 @@ appservice:
# Parsed with https://pkg.go.dev/time#ParseDuration
max_conn_idle_time: null
max_conn_lifetime: null
# The unique ID of this appservice.
id: mautrix-discord
# Appservice bot details.
@@ -71,7 +68,7 @@ appservice:
# This may be necessary for large public instances with lots of messages going through.
# However, messages will not be guaranteed to be bridged in the same order they were sent in.
async_transactions: false
# Authentication tokens for AS <-> HS communication. Autogenerated; do not modify.
as_token: "BeqHdZlIs5kscUgQG03TxLO6dWjjuFKTL0T0T5CGoBNxUfsAaYMGuNONgzrvXSni"
hs_token: "IvmSDAdVFV63hR7hjQDEDOptyyNm81JRvkr3l5l653lWG0MLJKlOc7mbNm0extWA"
@@ -99,7 +96,7 @@ bridge:
# .GuildName - Guild name.
# .NSFW - Whether the channel is marked as NSFW.
# .Type - Channel type (see values at https://github.com/bwmarrin/discordgo/blob/v0.25.0/structs.go#L251-L267)
channel_name_template: '{{if or (eq .Type 3) (eq .Type 4)}}{{.Name}}{{else}}#{{.Name}}{{end}}'
channel_name_template: '{{if or (eq .Type 3) (eq .Type 1)}}{{.Name}}{{else}}#{{.Name}} ({{.GuildName}}){{end}}'
# Displayname template for Discord guilds (bridged as spaces).
# Available variables:
# .Name - Guild name
@@ -213,10 +210,10 @@ bridge:
login_shared_secret_map:
ellis.link: "as_token:fR52cysNJ2s7MbQ7PscEfHIyiW"
pissing.dev: "as_token:fR52cysNJ2s7MbQ7PscEfHIyiW"
# The prefix for commands. Only required in non-management rooms.
command_prefix: '!discord'
# Messages sent upon joining a management room.
# Markdown is supported. The defaults are listed below.
management_room_text:
@@ -251,7 +248,7 @@ bridge:
# This can be used as a rough heuristic to disable backfilling in channels that are too active.
# Currently only applies to missed message backfill.
max_guild_members: -1
# End-to-bridge encryption support options.
#
# See https://docs.mau.fi/bridges/general/end-to-bridge-encryption.html for more info.
@@ -328,7 +325,7 @@ bridge:
# Disable rotating keys when a user's devices change?
# You should not enable this option unless you understand all the implications.
disable_device_change_key_rotation: false
# Settings for provisioning API
provisioning:
# Prefix for the provisioning API paths.
@@ -338,7 +335,7 @@ bridge:
shared_secret: KC4cswhfFcp59TP0Bdv1IEuw8lVPk7GXcyigzF8UBNAkPavCuiV6Khdg9dmcxD0W
# Enable debug API at /debug with provisioning authentication.
debug_endpoints: false
# Permissions for using the bridge.
# Permitted values:
# relay - Talk through the relaybot (if enabled), no access otherwise
@@ -359,9 +356,3 @@ logging:
writers:
- type: stdout
format: pretty-colored
# - type: file
# format: json
# filename: ./logs/mautrix-discord.log
# max_size: 100
# max_backups: 10
# compress: true
+4 -4
View File
@@ -1,8 +1,8 @@
id: mautrix-discord
url: http://mautrix-discord
as_token: 5ngb86SSXij50hLfnt1BC0K7NVmxiXlagCtmcXXVFFTqh76zUkX3FI7NyERXaAFD
hs_token: 1ni0upPYy21f5GTLvCGCvTqdYrv7d6NWiRvMaC2XahWluAL6fjqLvSCd5S3PiMsv
sender_localpart: K3hPufeGniHhdywShci90i8ZGRYu0YRF
as_token: BeqHdZlIs5kscUgQG03TxLO6dWjjuFKTL0T0T5CGoBNxUfsAaYMGuNONgzrvXSni
hs_token: IvmSDAdVFV63hR7hjQDEDOptyyNm81JRvkr3l5l653lWG0MLJKlOc7mbNm0extWA
sender_localpart: zByRv7CUznpsLSEXztOuO05F3qhgRiqG
rate_limited: false
namespaces:
users:
@@ -11,4 +11,4 @@ namespaces:
- regex: ^@discord_mautrix_.*:ellis\.link$
exclusive: true
de.sorunome.msc2409.push_ephemeral: true
push_ephemeral: true
push_ephemeral: true