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

Use strings for decryption info in DB

Browse Source
This commit is contained in:
Tulir Asokan
2023-01-28 15:57:34 +02:00
parent e9249d6ff9
commit c365c1cf20
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
database/file.go
View File

@@ -60,8 +60,7 @@ type File struct {
} }
func (f *File) Scan(row dbutil.Scannable) *File { func (f *File) Scan(row dbutil.Scannable) *File {
var fileID sql.NullString var fileID, decryptionInfo sql.NullString
var decryptionInfo []byte
var width, height sql.NullInt32 var width, height sql.NullInt32
var timestamp int64 var timestamp int64
var mxc string var mxc string
@@ -82,8 +81,8 @@ func (f *File) Scan(row dbutil.Scannable) *File {
f.log.Errorfln("Failed to parse content URI %s: %v", mxc, err) f.log.Errorfln("Failed to parse content URI %s: %v", mxc, err)
panic(err) panic(err)
} }
if decryptionInfo != nil { if decryptionInfo.Valid {
err = json.Unmarshal(decryptionInfo, &f.DecryptionInfo) err = json.Unmarshal([]byte(decryptionInfo.String), &f.DecryptionInfo)
if err != nil { if err != nil {
f.log.Errorfln("Failed to unmarshal decryption info of %v: %v", f.MXC, err) f.log.Errorfln("Failed to unmarshal decryption info of %v: %v", f.MXC, err)
panic(err) panic(err)
@@ -116,7 +115,7 @@ func (f *File) Insert(txn dbutil.Execable) {
_, 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,
decryptionInfo, f.Timestamp.UnixMilli(), string(decryptionInfo), 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)