From 8598dea98b872647393117704659878d9b38d4fc Mon Sep 17 00:00:00 2001
From: kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com>
Date: Tue, 15 Nov 2022 18:45:15 +0000
Subject: [chore] update database caching library (#1040)

* convert most of the caches to use result.Cache{}

* add caching of emojis

* fix issues causing failing tests

* update go-cache/v2 instances with v3

* fix getnotification

* add a note about the left-in StatusCreate comment

* update EmojiCategory db access to use new result.Cache{}

* fix possible panic in getstatusparents

* further proof that kim is not stinky
---
 cmd/gotosocial/action/admin/account/account.go | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'cmd')

diff --git a/cmd/gotosocial/action/admin/account/account.go b/cmd/gotosocial/action/admin/account/account.go
index 3306b8dbe..070e1fdcb 100644
--- a/cmd/gotosocial/action/admin/account/account.go
+++ b/cmd/gotosocial/action/admin/account/account.go
@@ -149,11 +149,10 @@ var Promote action.GTSAction = func(ctx context.Context) error {
 		return err
 	}
 
-	updatingColumns := []string{"admin", "updated_at"}
 	admin := true
 	u.Admin = &admin
 	u.UpdatedAt = time.Now()
-	if _, err := dbConn.UpdateUser(ctx, u, updatingColumns...); err != nil {
+	if err := dbConn.UpdateUser(ctx, u); err != nil {
 		return err
 	}
 
@@ -185,11 +184,10 @@ var Demote action.GTSAction = func(ctx context.Context) error {
 		return err
 	}
 
-	updatingColumns := []string{"admin", "updated_at"}
 	admin := false
 	u.Admin = &admin
 	u.UpdatedAt = time.Now()
-	if _, err := dbConn.UpdateUser(ctx, u, updatingColumns...); err != nil {
+	if err := dbConn.UpdateUser(ctx, u); err != nil {
 		return err
 	}
 
@@ -221,11 +219,10 @@ var Disable action.GTSAction = func(ctx context.Context) error {
 		return err
 	}
 
-	updatingColumns := []string{"disabled", "updated_at"}
 	disabled := true
 	u.Disabled = &disabled
 	u.UpdatedAt = time.Now()
-	if _, err := dbConn.UpdateUser(ctx, u, updatingColumns...); err != nil {
+	if err := dbConn.UpdateUser(ctx, u); err != nil {
 		return err
 	}
 
@@ -270,10 +267,9 @@ var Password action.GTSAction = func(ctx context.Context) error {
 		return fmt.Errorf("error hashing password: %s", err)
 	}
 
-	updatingColumns := []string{"encrypted_password", "updated_at"}
 	u.EncryptedPassword = string(pw)
 	u.UpdatedAt = time.Now()
-	if _, err := dbConn.UpdateUser(ctx, u, updatingColumns...); err != nil {
+	if err := dbConn.UpdateUser(ctx, u); err != nil {
 		return err
 	}
 
-- 
cgit v1.3