Autisticats/mautrix-discord
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Try to fix discord file cache with postgres again

Browse Source
This commit is contained in:
Tulir Asokan
2023-01-28 16:01:47 +02:00
parent c365c1cf20
commit 9cc1666d2b
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
database/file.go
View File

@@ -103,19 +103,20 @@ func (f *File) Insert(txn dbutil.Execable) {
if txn == nil { if txn == nil {
txn = f.db txn = f.db
} }
var err error var decryptionInfoStr sql.NullString
var decryptionInfo []byte
if f.DecryptionInfo != nil { if f.DecryptionInfo != nil {
decryptionInfo, err = json.Marshal(f.DecryptionInfo) decryptionInfo, err := json.Marshal(f.DecryptionInfo)
if err != nil { if err != nil {
f.log.Warnfln("Failed to marshal decryption info of %v: %v", f.MXC, err) f.log.Warnfln("Failed to marshal decryption info of %v: %v", f.MXC, err)
panic(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, f.URL, f.Encrypted, strPtr(f.ID), f.MXC.String(), f.Size,
positiveIntToNullInt32(f.Width), positiveIntToNullInt32(f.Height), f.MimeType, positiveIntToNullInt32(f.Width), positiveIntToNullInt32(f.Height), f.MimeType,
string(decryptionInfo), f.Timestamp.UnixMilli(), decryptionInfoStr, f.Timestamp.UnixMilli(),
) )
if err != nil { if err != nil {
f.log.Warnfln("Failed to insert copied file %v: %v", f.MXC, err) f.log.Warnfln("Failed to insert copied file %v: %v", f.MXC, err)