[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

4 files changed, 7 insertions, 7 deletions

diff --git a/internal/processing/account/delete.go b/internal/processing/account/delete.go
index 3758a4000..3cc3bb143 100644
--- a/internal/processing/account/delete.go
+++ b/internal/processing/account/delete.go
@@ -273,7 +273,7 @@ selectStatusesLoop:
 	account.SuspendedAt = time.Now()
 	account.SuspensionOrigin = origin
 
-	account, err := p.db.UpdateAccount(ctx, account)
+	err := p.db.UpdateAccount(ctx, account)
 	if err != nil {
 		return gtserror.NewErrorInternalError(err)
 	}
diff --git a/internal/processing/account/update.go b/internal/processing/account/update.go
index bce82d6ca..bc4570c76 100644
--- a/internal/processing/account/update.go
+++ b/internal/processing/account/update.go
@@ -164,7 +164,7 @@ func (p *processor) Update(ctx context.Context, account *gtsmodel.Account, form
 		account.EnableRSS = form.EnableRSS
 	}
 
-	updatedAccount, err := p.db.UpdateAccount(ctx, account)
+	err := p.db.UpdateAccount(ctx, account)
 	if err != nil {
 		return nil, gtserror.NewErrorInternalError(fmt.Errorf("could not update account %s: %s", account.ID, err))
 	}
@@ -172,11 +172,11 @@ func (p *processor) Update(ctx context.Context, account *gtsmodel.Account, form
 	p.clientWorker.Queue(messages.FromClientAPI{
 		APObjectType:   ap.ObjectProfile,
 		APActivityType: ap.ActivityUpdate,
-		GTSModel:       updatedAccount,
-		OriginAccount:  updatedAccount,
+		GTSModel:       account,
+		OriginAccount:  account,
 	})
 
-	acctSensitive, err := p.tc.AccountToAPIAccountSensitive(ctx, updatedAccount)
+	acctSensitive, err := p.tc.AccountToAPIAccountSensitive(ctx, account)
 	if err != nil {
 		return nil, gtserror.NewErrorInternalError(fmt.Errorf("could not convert account into apisensitive account: %s", err))
 	}
diff --git a/internal/processing/fromclientapi_test.go b/internal/processing/fromclientapi_test.go
index 0e620c9e9..c4e06ea62 100644
--- a/internal/processing/fromclientapi_test.go
+++ b/internal/processing/fromclientapi_test.go
@@ -129,7 +129,7 @@ func (suite *FromClientAPITestSuite) TestProcessStatusDelete() {
 	suite.NoError(errWithCode)
 
 	// delete the status from the db first, to mimic what would have already happened earlier up the flow
-	err := suite.db.DeleteByID(ctx, deletedStatus.ID, &gtsmodel.Status{})
+	err := suite.db.DeleteStatusByID(ctx, deletedStatus.ID)
 	suite.NoError(err)
 
 	// process the status delete
diff --git a/internal/processing/instance.go b/internal/processing/instance.go
index 1d7bdb377..14ff1de5a 100644
--- a/internal/processing/instance.go
+++ b/internal/processing/instance.go
@@ -235,7 +235,7 @@ func (p *processor) InstancePatch(ctx context.Context, form *apimodel.InstanceSe
 	if updateInstanceAccount {
 		// if either avatar or header is updated, we need
 		// to update the instance account that stores them
-		if _, err := p.db.UpdateAccount(ctx, ia); err != nil {
+		if err := p.db.UpdateAccount(ctx, ia); err != nil {
 			return nil, gtserror.NewErrorInternalError(fmt.Errorf("db error updating instance account: %s", err))
 		}
 	}