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/web/etag.go | 4 ++--
 internal/web/rss.go  | 2 +-
 internal/web/web.go  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'internal/web')

diff --git a/internal/web/etag.go b/internal/web/etag.go
index 37c1cb423..4fe3f7cac 100644
--- a/internal/web/etag.go
+++ b/internal/web/etag.go
@@ -27,11 +27,11 @@ import (
 
 	"github.com/superseriousbusiness/gotosocial/internal/log"
 
-	"codeberg.org/gruf/go-cache/v2"
+	"codeberg.org/gruf/go-cache/v3"
 )
 
 func newETagCache() cache.Cache[string, eTagCacheEntry] {
-	eTagCache := cache.New[string, eTagCacheEntry]()
+	eTagCache := cache.New[string, eTagCacheEntry](0, 1000, 0)
 	eTagCache.SetTTL(time.Hour, false)
 	if !eTagCache.Start(time.Minute) {
 		log.Panic("could not start eTagCache")
diff --git a/internal/web/rss.go b/internal/web/rss.go
index 64be7685c..827a19e87 100644
--- a/internal/web/rss.go
+++ b/internal/web/rss.go
@@ -123,7 +123,7 @@ func (m *Module) rssFeedGETHandler(c *gin.Context) {
 
 		cacheEntry.lastModified = accountLastPostedPublic
 		cacheEntry.eTag = eTag
-		m.eTagCache.Put(cacheKey, cacheEntry)
+		m.eTagCache.Set(cacheKey, cacheEntry)
 	}
 
 	c.Header(eTagHeader, cacheEntry.eTag)
diff --git a/internal/web/web.go b/internal/web/web.go
index cdcf7422f..16be8a71d 100644
--- a/internal/web/web.go
+++ b/internal/web/web.go
@@ -22,7 +22,7 @@ import (
 	"errors"
 	"net/http"
 
-	"codeberg.org/gruf/go-cache/v2"
+	"codeberg.org/gruf/go-cache/v3"
 	"github.com/gin-gonic/gin"
 	"github.com/superseriousbusiness/gotosocial/internal/api"
 	"github.com/superseriousbusiness/gotosocial/internal/gtserror"
-- 
cgit v1.3