Autisticats/mautrix-discord
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add options to improve handling of webhook messages sent by other bridges

Browse Source
This commit is contained in:
Tulir Asokan
2023-05-27 13:01:24 +03:00
parent 824dea4745
commit 4393772ccc
6 changed files with 58 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
config/bridge.go
View File

@@ -51,6 +51,8 @@ type BridgeConfig struct {
DeletePortalOnChannelDelete bool `yaml:"delete_portal_on_channel_delete"`
DeleteGuildOnLeave bool `yaml:"delete_guild_on_leave"`
FederateRooms bool `yaml:"federate_rooms"`
PrefixWebhookMessages bool `yaml:"prefix_webhook_messages"`
EnableWebhookAvatars bool `yaml:"enable_webhook_avatars"`
UseDiscordCDNUpload bool `yaml:"use_discord_cdn_upload"`
CacheMedia string `yaml:"cache_media"`
@@ -287,9 +289,14 @@ func (bc BridgeConfig) FormatUsername(userID string) string {
return buffer.String()
}
func (bc BridgeConfig) FormatDisplayname(user *discordgo.User) string {
type DisplaynameParams struct {
*discordgo.User
Webhook bool
}
func (bc BridgeConfig) FormatDisplayname(user *discordgo.User, webhook bool) string {
var buffer strings.Builder
_ = bc.displaynameTemplate.Execute(&buffer, user)
_ = bc.displaynameTemplate.Execute(&buffer, &DisplaynameParams{user, webhook})
return buffer.String()
}

2
config/upgrade.go
View File

@@ -55,6 +55,8 @@ func DoUpgrade(helper *up.Helper) {
helper.Copy(up.Bool, "bridge", "delete_portal_on_channel_delete")
helper.Copy(up.Bool, "bridge", "delete_guild_on_leave")
helper.Copy(up.Bool, "bridge", "federate_rooms")
helper.Copy(up.Bool, "bridge", "prefix_webhook_messages")
helper.Copy(up.Bool, "bridge", "enable_webhook_avatars")
helper.Copy(up.Bool, "bridge", "use_discord_cdn_upload")
helper.Copy(up.Bool, "bridge", "media_patterns", "enabled")
helper.Copy(up.Str, "bridge", "cache_media")