MirrorHub/mautrix-whatsapp
0
0
Fork 1
mirror of https://github.com/tulir/mautrix-whatsapp synced 2024-06-08 22:18:57 +02:00
Code Issues Projects Releases Wiki Activity

Stop ignoring errors deleting backfill queue stuff

Browse source
This commit is contained in:
Tulir Asokan 2022-05-19 11:45:08 +03:00
parent 68b2d663ac
commit d33f5aa3d2
3 changed files with 28 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
database/backfillqueue.go
View file

@ -106,19 +106,23 @@ func (bq *BackfillQuery) GetNext(userID id.UserID, backfillTypes []BackfillType)
return
}
func (bq *BackfillQuery) DeleteAll(userID id.UserID) error {
func (bq *BackfillQuery) DeleteAll(userID id.UserID) {
_, err := bq.db.Exec("DELETE FROM backfill_queue WHERE user_mxid=$1", userID)
return err
if err != nil {
bq.log.Warnfln("Failed to delete backfill queue items for %s: %v", userID, err)
}
}
func (bq *BackfillQuery) DeleteAllForPortal(userID id.UserID, portalKey PortalKey) error {
func (bq *BackfillQuery) DeleteAllForPortal(userID id.UserID, portalKey PortalKey) {
_, 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
if err != nil {
bq.log.Warnfln("Failed to delete backfill queue items for %s/%s: %v", userID, portalKey.JID, err)
}
}
type Backfill struct {

18
database/historysync.go
View file

@ -192,9 +192,11 @@ func (hsq *HistorySyncQuery) GetConversation(userID id.UserID, portalKey *Portal
return
}
func (hsq *HistorySyncQuery) DeleteAllConversations(userID id.UserID) error {
func (hsq *HistorySyncQuery) DeleteAllConversations(userID id.UserID) {
_, err := hsq.db.Exec("DELETE FROM history_sync_conversation WHERE user_mxid=$1", userID)
return err
if err != nil {
hsq.log.Warnfln("Failed to delete historical chat info for %s/%s: %v", userID, err)
}
}
const (
@ -301,15 +303,19 @@ func (hsq *HistorySyncQuery) DeleteMessages(userID id.UserID, conversationID str
return err
}
func (hsq *HistorySyncQuery) DeleteAllMessages(userID id.UserID) error {
func (hsq *HistorySyncQuery) DeleteAllMessages(userID id.UserID) {
_, err := hsq.db.Exec("DELETE FROM history_sync_message WHERE user_mxid=$1", userID)
return err
if err != nil {
hsq.log.Warnfln("Failed to delete historical messages for %s: %v", userID, err)
}
}
func (hsq *HistorySyncQuery) DeleteAllMessagesForPortal(userID id.UserID, portalKey PortalKey) error {
func (hsq *HistorySyncQuery) DeleteAllMessagesForPortal(userID id.UserID, portalKey PortalKey) {
_, err := hsq.db.Exec(`
DELETE FROM history_sync_message
WHERE user_mxid=$1 AND conversation_id=$2
`, userID, portalKey.JID)
return err
if err != nil {
hsq.log.Warnfln("Failed to delete historical messages for %s/%s: %v", userID, portalKey.JID, err)
}
}

14
database/mediabackfillrequest.go
View file

@ -111,19 +111,21 @@ func (mbr *MediaBackfillRequest) Scan(row Scannable) *MediaBackfillRequest {
return mbr
}
func (mbr *MediaBackfillRequestQuery) GetMediaBackfillRequestsForUser(userID id.UserID) (requests []*MediaBackfillRequest) {
rows, err := mbr.db.Query(getMediaBackfillRequestsForUser, userID)
func (mbrq *MediaBackfillRequestQuery) GetMediaBackfillRequestsForUser(userID id.UserID) (requests []*MediaBackfillRequest) {
rows, err := mbrq.db.Query(getMediaBackfillRequestsForUser, userID)
defer rows.Close()
if err != nil || rows == nil {
return nil
}
for rows.Next() {
requests = append(requests, mbr.newMediaBackfillRequest().Scan(rows))
requests = append(requests, mbrq.newMediaBackfillRequest().Scan(rows))
}
return
}
func (mbr *MediaBackfillRequestQuery) DeleteAllMediaBackfillRequests(userID id.UserID) error {
_, err := mbr.db.Exec("DELETE FROM media_backfill_requests WHERE user_mxid=$1", userID)
return err
func (mbrq *MediaBackfillRequestQuery) DeleteAllMediaBackfillRequests(userID id.UserID) {
_, err := mbrq.db.Exec("DELETE FROM media_backfill_requests WHERE user_mxid=$1", userID)
if err != nil {
mbrq.log.Warnfln("Failed to delete media backfill requests for %s: %v", userID, err)
}
}