Alexander/gomuks
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ignore edits where the sender is different

Browse Source 
Closes #217
This commit is contained in:
Tulir Asokan 2020-09-04 19:37:00 +03:00
parent 8996deb090
commit 5257d55114
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
matrix/matrix.go
View File

@ -499,14 +499,22 @@ func (c *Container) HandleRedaction(source mautrix.EventSource, evt *event.Event
} }
} }
var ErrCantEditOthersMessage = errors.New("can't edit message sent by someone else")
func (c *Container) HandleEdit(room *rooms.Room, editsID id.EventID, editEvent *muksevt.Event) { func (c *Container) HandleEdit(room *rooms.Room, editsID id.EventID, editEvent *muksevt.Event) {
var origEvt *muksevt.Event var origEvt *muksevt.Event
err := c.history.Update(room, editsID, func(evt *muksevt.Event) error { err := c.history.Update(room, editsID, func(evt *muksevt.Event) error {
if editEvent.Sender != evt.Sender {
return ErrCantEditOthersMessage
}
evt.Gomuks.Edits = append(evt.Gomuks.Edits, editEvent) evt.Gomuks.Edits = append(evt.Gomuks.Edits, editEvent)
origEvt = evt origEvt = evt
return nil return nil
}) })
if err != nil { if err == ErrCantEditOthersMessage {
debug.Printf("Ignoring edit %s of %s by %s in %s: original event was sent by someone else", editEvent.ID, editsID, editEvent.Sender, editEvent.RoomID)
return
} else if err != nil {
debug.Print("Failed to store edit in history db:", err) debug.Print("Failed to store edit in history db:", err)
return return
} else if !c.config.AuthCache.InitialSyncDone || !room.Loaded() { } else if !c.config.AuthCache.InitialSyncDone || !room.Loaded() {