fix(pins)_: remove pins when the og message is deleted

protocol/message_persistence.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"database/sql"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"sort"
 	"strings"
@@ -1768,17 +1769,41 @@ func (db sqlitePersistence) SavePinMessage(message *common.PinMessage) (inserted
 
 func (db sqlitePersistence) DeleteMessage(id string) error {
 	_, err := db.db.Exec(`DELETE FROM user_messages WHERE id = ?`, id)
+
+	if err != nil {
+		return err
+	}
+
+	_, err = db.db.Exec("DELETE FROM pin_messages WHERE message_id = ?", id)
+
 	return err
 }
 
-func (db sqlitePersistence) DeleteMessages(ids []string) error {
+func (db sqlitePersistence) DeleteMessages(ids []string) (err error) {
 	idsArgs := make([]interface{}, 0, len(ids))
 	for _, id := range ids {
 		idsArgs = append(idsArgs, id)
 	}
 	inVector := strings.Repeat("?, ", len(ids)-1) + "?"
 
-	_, err := db.db.Exec("DELETE FROM user_messages WHERE id IN ("+inVector+")", idsArgs...) // nolint: gosec
+	tx, err := db.db.BeginTx(context.Background(), &sql.TxOptions{})
+	if err != nil {
+		return err
+	}
+	defer func() {
+		if err == nil {
+			err = tx.Commit()
+			return
+		}
+		err = errors.Join(err, tx.Rollback())
+	}()
+
+	_, err = tx.Exec("DELETE FROM user_messages WHERE id IN ("+inVector+")", idsArgs...) // nolint: gosec
+	if err != nil {
+		return err
+	}
+
+	_, err = tx.Exec("DELETE FROM pin_messages WHERE message_id IN ("+inVector+")", idsArgs...) // nolint: gosec
 
 	return err
 }

protocol/migrations/sqlite/1733428521_pinned_messages_add_on_delete_clause.up.sql

@@ -1,19 +1,8 @@
-CREATE TABLE pin_messages_new (
-  id VARCHAR PRIMARY KEY NOT NULL,
-  message_id VARCHAR NOT NULL,
-  whisper_timestamp INTEGER NOT NULL,
-  chat_id VARCHAR NOT NULL,
-  local_chat_id VARCHAR NOT NULL,
-  clock_value INT NOT NULL,
-  pinned BOOLEAN NOT NULL,
-  pinned_by TEXT,
-  FOREIGN KEY (message_id) REFERENCES user_messages(id) ON DELETE CASCADE
-);
-
-INSERT INTO pin_messages_new (id, message_id, whisper_timestamp, chat_id, local_chat_id, clock_value, pinned, pinned_by)
-SELECT id, message_id, whisper_timestamp, chat_id, local_chat_id, clock_value, pinned, pinned_by
-FROM pin_messages;
-
-DROP TABLE pin_messages;
-
-ALTER TABLE pin_messages_new RENAME TO pin_messages;
+-- Leave this migration empty
+-- This used to be a migration to add ON DELETE CASCADE to the pinned_messages table
+-- However, we found that it had the side effect of preventing pinned messages to arrive before the messages they are pinned to
+-- Leaving this migration here to prevent the migration from being run again
+-- People that ran the migraiton already will have the wrong behavior on edge cases, but we can't fix that easily
+-- People that didn't run this migration will have the correct behavior
+-- This was never run on a release
+-- See more info here: https://github.com/status-im/status-go/pull/6231#discussion_r1904038990