From 9cc1666d2be85c552404c952b3452b28b49458cc Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Sat, 28 Jan 2023 16:01:47 +0200 Subject: [PATCH] Try to fix discord file cache with postgres again --- database/file.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/database/file.go b/database/file.go index caeebe5..4da8571 100644 --- a/database/file.go +++ b/database/file.go @@ -103,19 +103,20 @@ func (f *File) Insert(txn dbutil.Execable) { if txn == nil { txn = f.db } - var err error - var decryptionInfo []byte + var decryptionInfoStr sql.NullString if f.DecryptionInfo != nil { - decryptionInfo, err = json.Marshal(f.DecryptionInfo) + decryptionInfo, err := json.Marshal(f.DecryptionInfo) if err != nil { f.log.Warnfln("Failed to marshal decryption info of %v: %v", f.MXC, err) panic(err) } + decryptionInfoStr.Valid = true + decryptionInfoStr.String = string(decryptionInfo) } - _, err = txn.Exec(fileInsert, + _, err := txn.Exec(fileInsert, f.URL, f.Encrypted, strPtr(f.ID), f.MXC.String(), f.Size, positiveIntToNullInt32(f.Width), positiveIntToNullInt32(f.Height), f.MimeType, - string(decryptionInfo), f.Timestamp.UnixMilli(), + decryptionInfoStr, f.Timestamp.UnixMilli(), ) if err != nil { f.log.Warnfln("Failed to insert copied file %v: %v", f.MXC, err)