MirrorHub/mautrix-whatsapp
0
0
Fork 1
mirror of https://github.com/tulir/mautrix-whatsapp synced 2024-12-13 17:13:11 +01:00
Code Issues Projects Releases Wiki Activity

Remove option to disable edit bridging

Browse source
This commit is contained in:
Tulir Asokan 2023-04-07 12:22:04 +03:00
parent 67f27c9baf
commit 139b89cd66
4 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
config/bridge.go
View file

@ -117,7 +117,6 @@ type BridgeConfig struct {
URLPreviews bool `yaml:"url_previews"` URLPreviews bool `yaml:"url_previews"`
CaptionInMessage bool `yaml:"caption_in_message"` CaptionInMessage bool `yaml:"caption_in_message"`
ExtEvPolls bool `yaml:"extev_polls"` ExtEvPolls bool `yaml:"extev_polls"`
SendWhatsAppEdits bool `yaml:"send_whatsapp_edits"`
CrossRoomReplies bool `yaml:"cross_room_replies"` CrossRoomReplies bool `yaml:"cross_room_replies"`
MessageHandlingTimeout struct { MessageHandlingTimeout struct {

1
config/upgrade.go
View file

@ -106,7 +106,6 @@ func DoUpgrade(helper *up.Helper) {
} else { } else {
helper.Copy(up.Bool, "bridge", "extev_polls") helper.Copy(up.Bool, "bridge", "extev_polls")
} }
helper.Copy(up.Bool, "bridge", "send_whatsapp_edits")
helper.Copy(up.Bool, "bridge", "cross_room_replies") helper.Copy(up.Bool, "bridge", "cross_room_replies")
helper.Copy(up.Str|up.Null, "bridge", "message_handling_timeout", "error_after") helper.Copy(up.Str|up.Null, "bridge", "message_handling_timeout", "error_after")
helper.Copy(up.Str|up.Null, "bridge", "message_handling_timeout", "deadline") helper.Copy(up.Str|up.Null, "bridge", "message_handling_timeout", "deadline")

3
example-config.yaml
View file

@ -309,9 +309,6 @@ bridge:
caption_in_message: false caption_in_message: false
# Should polls be sent using MSC3381 event types? # Should polls be sent using MSC3381 event types?
extev_polls: false extev_polls: false
# Should Matrix edits be bridged to WhatsApp edits?
# Official WhatsApp clients don't render edits yet, but once they do, the bridge should work with them right away.
send_whatsapp_edits: false
# Should cross-chat replies from WhatsApp be bridged? Most servers and clients don't support this. # Should cross-chat replies from WhatsApp be bridged? Most servers and clients don't support this.
cross_room_replies: false cross_room_replies: false
# Maximum time for handling Matrix events. Duration strings formatted for https://pkg.go.dev/time#ParseDuration # Maximum time for handling Matrix events. Duration strings formatted for https://pkg.go.dev/time#ParseDuration

2
portal.go
View file

@ -3801,7 +3801,7 @@ func (portal *Portal) convertMatrixMessage(ctx context.Context, sender *User, ev
} }
extraMeta := &extraConvertMeta{} extraMeta := &extraConvertMeta{}
var editRootMsg *database.Message var editRootMsg *database.Message
if editEventID := content.RelatesTo.GetReplaceID(); editEventID != "" && portal.bridge.Config.Bridge.SendWhatsAppEdits { if editEventID := content.RelatesTo.GetReplaceID(); editEventID != "" {
editRootMsg = portal.bridge.DB.Message.GetByMXID(editEventID) editRootMsg = portal.bridge.DB.Message.GetByMXID(editEventID)
if editErr := getEditError(editRootMsg, sender); editErr != nil { if editErr := getEditError(editRootMsg, sender); editErr != nil {
return nil, sender, extraMeta, editErr return nil, sender, extraMeta, editErr