Bläddra i källkod

backfill: delete messages for rooms the user is not in

If the chat turns out to be not bridgable due to the user not being in
the room, delete the messages, and stop trying to backfill it.
Sumner Evans 3 år sedan
förälder
incheckning
caf0a363c9
3 ändrade filer med 22 tillägg och 0 borttagningar
  1. 10 0
      database/backfillqueue.go
  2. 10 0
      database/historysync.go
  3. 2 0
      portal.go

+ 10 - 0
database/backfillqueue.go

@@ -106,6 +106,16 @@ func (bq *BackfillQuery) DeleteAll(userID id.UserID) error {
 	return err
 	return err
 }
 }
 
 
+func (bq *BackfillQuery) DeleteAllForPortal(userID id.UserID, portalKey PortalKey) error {
+	_, err := bq.db.Exec(`
+		DELETE FROM backfill_queue
+		WHERE user_mxid=$1
+			AND portal_jid=$2
+			AND portal_receiver=$3
+	`, userID, portalKey.JID, portalKey.Receiver)
+	return err
+}
+
 type Backfill struct {
 type Backfill struct {
 	db  *Database
 	db  *Database
 	log log.Logger
 	log log.Logger

+ 10 - 0
database/historysync.go

@@ -314,3 +314,13 @@ func (hsq *HistorySyncQuery) DeleteAllMessages(userID id.UserID) error {
 	_, err := hsq.db.Exec("DELETE FROM history_sync_message WHERE user_mxid=$1", userID)
 	_, err := hsq.db.Exec("DELETE FROM history_sync_message WHERE user_mxid=$1", userID)
 	return err
 	return err
 }
 }
+
+func (hsq *HistorySyncQuery) DeleteAllMessagesForPortal(userID id.UserID, portalKey PortalKey) error {
+	_, err := hsq.db.Exec(`
+		DELETE FROM history_sync_message
+		WHERE user_mxid=$1
+			AND portal_jid=$2
+			AND portal_receiver=$3
+	`, userID, portalKey.JID, portalKey.Receiver)
+	return err
+}

+ 2 - 0
portal.go

@@ -1226,6 +1226,8 @@ func (portal *Portal) CreateMatrixRoom(user *User, groupInfo *types.GroupInfo, i
 			// before creating the matrix room
 			// before creating the matrix room
 			if errors.Is(err, whatsmeow.ErrNotInGroup) {
 			if errors.Is(err, whatsmeow.ErrNotInGroup) {
 				user.log.Debugfln("Skipping creating matrix room for %s because the user is not a participant", portal.Key.JID)
 				user.log.Debugfln("Skipping creating matrix room for %s because the user is not a participant", portal.Key.JID)
+				user.bridge.DB.BackfillQuery.DeleteAllForPortal(user.MXID, portal.Key)
+				user.bridge.DB.HistorySyncQuery.DeleteAllMessagesForPortal(user.MXID, portal.Key)
 				return err
 				return err
 			} else if err != nil {
 			} else if err != nil {
 				portal.log.Warnfln("Failed to get group info through %s: %v", user.JID, err)
 				portal.log.Warnfln("Failed to get group info through %s: %v", user.JID, err)