From 307d98e3862b6e867eea524b81d5428b03e6607c Mon Sep 17 00:00:00 2001 From: tobi <31960611+tsmethurst@users.noreply.github.com> Date: Tue, 10 Sep 2024 14:34:49 +0200 Subject: [feature] Process `Reject` of interaction via fedi API, put rejected statuses in the "sin bin" 😈 (#3271) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [feature] Process `Reject` of interaction via fedi API, put rejected statuses in the "sin bin" * update test * move nil check back to `rejectStatusIRI` --- internal/cache/cache.go | 2 ++ internal/cache/db.go | 29 +++++++++++++++++++++++++++++ internal/cache/size.go | 23 +++++++++++++++++++++++ 3 files changed, 54 insertions(+) (limited to 'internal/cache') diff --git a/internal/cache/cache.go b/internal/cache/cache.go index f1c382d11..5554445b2 100644 --- a/internal/cache/cache.go +++ b/internal/cache/cache.go @@ -93,6 +93,7 @@ func (c *Caches) Init() { c.initPollVote() c.initPollVoteIDs() c.initReport() + c.initSinBinStatus() c.initStatus() c.initStatusBookmark() c.initStatusBookmarkIDs() @@ -170,6 +171,7 @@ func (c *Caches) Sweep(threshold float64) { c.DB.PollVote.Trim(threshold) c.DB.PollVoteIDs.Trim(threshold) c.DB.Report.Trim(threshold) + c.DB.SinBinStatus.Trim(threshold) c.DB.Status.Trim(threshold) c.DB.StatusBookmark.Trim(threshold) c.DB.StatusBookmarkIDs.Trim(threshold) diff --git a/internal/cache/db.go b/internal/cache/db.go index 5e86c92a2..7f54ee8c5 100644 --- a/internal/cache/db.go +++ b/internal/cache/db.go @@ -145,6 +145,9 @@ type DBCaches struct { // Report provides access to the gtsmodel Report database cache. Report StructCache[*gtsmodel.Report] + // SinBinStatus provides access to the gtsmodel SinBinStatus database cache. + SinBinStatus StructCache[*gtsmodel.SinBinStatus] + // Status provides access to the gtsmodel Status database cache. Status StructCache[*gtsmodel.Status] @@ -1170,6 +1173,32 @@ func (c *Caches) initReport() { }) } +func (c *Caches) initSinBinStatus() { + // Calculate maximum cache size. + cap := calculateResultCacheMax( + sizeofSinBinStatus(), // model in-mem size. + config.GetCacheSinBinStatusMemRatio(), + ) + + log.Infof(nil, "cache size = %d", cap) + + copyF := func(s1 *gtsmodel.SinBinStatus) *gtsmodel.SinBinStatus { + s2 := new(gtsmodel.SinBinStatus) + *s2 = *s1 + return s2 + } + + c.DB.SinBinStatus.Init(structr.CacheConfig[*gtsmodel.SinBinStatus]{ + Indices: []structr.IndexConfig{ + {Fields: "ID"}, + {Fields: "URI"}, + }, + MaxSize: cap, + IgnoreErr: ignoreErrors, + Copy: copyF, + }) +} + func (c *Caches) initStatus() { // Calculate maximum cache size. cap := calculateResultCacheMax( diff --git a/internal/cache/size.go b/internal/cache/size.go index 29ab77fbf..49c2f4318 100644 --- a/internal/cache/size.go +++ b/internal/cache/size.go @@ -593,6 +593,29 @@ func sizeofReport() uintptr { })) } +func sizeofSinBinStatus() uintptr { + return uintptr(size.Of(>smodel.SinBinStatus{ + ID: exampleID, + CreatedAt: exampleTime, + UpdatedAt: exampleTime, + URI: exampleURI, + URL: exampleURI, + Domain: exampleURI, + AccountURI: exampleURI, + InReplyToURI: exampleURI, + Content: exampleText, + AttachmentLinks: []string{exampleURI, exampleURI}, + MentionTargetURIs: []string{exampleURI}, + EmojiLinks: []string{exampleURI}, + PollOptions: []string{exampleTextSmall, exampleTextSmall, exampleTextSmall, exampleTextSmall}, + ContentWarning: exampleTextSmall, + Visibility: gtsmodel.VisibilityPublic, + Sensitive: util.Ptr(false), + Language: "en", + ActivityStreamsType: ap.ObjectNote, + })) +} + func sizeofStatus() uintptr { return uintptr(size.Of(>smodel.Status{ ID: exampleID, -- cgit v1.2.3