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
---
 internal/api/client/status/statuscreate.go      | 9 +++++++++
 internal/api/client/status/statuscreate_test.go | 8 ++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

(limited to 'internal/api/client/status')

diff --git a/internal/api/client/status/statuscreate.go b/internal/api/client/status/statuscreate.go
index 3b2ee1e05..c1427411d 100644
--- a/internal/api/client/status/statuscreate.go
+++ b/internal/api/client/status/statuscreate.go
@@ -90,6 +90,15 @@ func (m *Module) StatusCreatePOSTHandler(c *gin.Context) {
 		return
 	}
 
+	// DO NOT COMMIT THIS UNCOMMENTED, IT WILL CAUSE MASS CHAOS.
+	// this is being left in as an ode to kim's shitposting.
+	//
+	// user := authed.Account.DisplayName
+	// if user == "" {
+	// 	user = authed.Account.Username
+	// }
+	// form.Status += "\n\nsent from " + user + "'s iphone\n"
+
 	if err := validateCreateStatus(form); err != nil {
 		api.ErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGet)
 		return
diff --git a/internal/api/client/status/statuscreate_test.go b/internal/api/client/status/statuscreate_test.go
index 78d025be1..9b570ba18 100644
--- a/internal/api/client/status/statuscreate_test.go
+++ b/internal/api/client/status/statuscreate_test.go
@@ -106,8 +106,9 @@ func (suite *StatusCreateTestSuite) TestPostNewStatusMarkdown() {
 	// set default post language of account 1 to markdown
 	testAccount := suite.testAccounts["local_account_1"]
 	testAccount.StatusFormat = "markdown"
+	a := testAccount
 
-	a, err := suite.db.UpdateAccount(context.Background(), testAccount)
+	err := suite.db.UpdateAccount(context.Background(), a)
 	if err != nil {
 		suite.FailNow(err.Error())
 	}
@@ -149,9 +150,8 @@ func (suite *StatusCreateTestSuite) TestPostNewStatusMarkdown() {
 func (suite *StatusCreateTestSuite) TestMentionUnknownAccount() {
 	// first remove remote account 1 from the database so it gets looked up again
 	remoteAccount := suite.testAccounts["remote_account_1"]
-	if err := suite.db.DeleteByID(context.Background(), remoteAccount.ID, &gtsmodel.Account{}); err != nil {
-		panic(err)
-	}
+	err := suite.db.DeleteAccount(context.Background(), remoteAccount.ID)
+	suite.NoError(err)
 
 	t := suite.testTokens["local_account_1"]
 	oauthToken := oauth.DBTokenToToken(t)
-- 
cgit v1.2.3