Update message timestamp when editing

database/message.go

@@ -74,6 +74,9 @@ const (
         DELETE FROM message
         WHERE sender=$1 AND timestamp=$2 AND part_index=$3 AND signal_receiver=$4
 	`
+	updateMessageTimestampQuery = `
+		UPDATE message SET timestamp=$4 WHERE sender=$1 AND timestamp=$2 AND signal_receiver=$3
+	`
 )
 
 type MessageQuery struct {
@@ -161,3 +164,7 @@ func (msg *Message) Insert(ctx context.Context) error {
 func (msg *Message) Delete(ctx context.Context) error {
 	return msg.qh.Exec(ctx, deleteMessageQuery, msg.Sender, msg.Timestamp, msg.PartIndex, msg.SignalReceiver)
 }
+
+func (msg *Message) SetTimestamp(ctx context.Context, editTime uint64) error {
+	return msg.qh.Exec(ctx, updateMessageTimestampQuery, msg.Sender, msg.Timestamp, msg.SignalReceiver, editTime)
+}

portal.go

@@ -1242,6 +1242,7 @@ func (portal *Portal) handleSignalEditMessage(sender *Puppet, timestamp uint64,
 		Str("action", "handle signal edit").
 		Str("sender_uuid", sender.SignalID.String()).
 		Uint64("target_msg_ts", timestamp).
+		Uint64("edit_msg_ts", msg.GetTimestamp()).
 		Logger()
 	if portal.MXID == "" {
 		log.Debug().Msg("Dropping edit message in chat with no portal")
@@ -1253,7 +1254,7 @@ func (portal *Portal) handleSignalEditMessage(sender *Puppet, timestamp uint64,
 		log.Err(err).Msg("Failed to get target message")
 		return
 	} else if len(targetMessage) == 0 {
-		log.Warn().Msg("Target message not found")
+		log.Debug().Msg("Target message not found (edit may have been already handled)")
 		return
 	}
 
@@ -1282,6 +1283,10 @@ func (portal *Portal) handleSignalEditMessage(sender *Puppet, timestamp uint64,
 			log.Err(err).Int("part_index", i).Msg("Failed to send edit to Matrix")
 		}
 	}
+	err = targetMessage[0].SetTimestamp(ctx, msg.GetTimestamp())
+	if err != nil {
+		log.Err(err).Msg("Failed to update message edit timestamp in database")
+	}
 }
 
 const SignalTypingTimeout = 15 * time.Second