From 996da6e0291b158093d917ca76933584f464d668 Mon Sep 17 00:00:00 2001 From: kim Date: Tue, 24 Jun 2025 17:24:34 +0200 Subject: [performance] filter model and database table improvements (#4277) - removes unnecessary fields / columns (created_at, updated_at) - replaces filter.context_* columns with singular filter.contexts bit field which should save both struct memory and database space - replaces filter.action string with integer enum type which should save both struct memory and database space - adds links from filter to filter_* tables with Filter{}.KeywordIDs and Filter{}.StatusIDs fields (this also means we now have those ID slices cached, which reduces some lookups) - removes account_id fields from filter_* tables, since there's a more direct connection between filter and filter_* tables, and filter.account_id already exists - refactors a bunch of the filter processor logic to save on code repetition, factor in the above changes, fix a few bugs with missed error returns and bring it more in-line with some of our newer code Reviewed-on: https://codeberg.org/superseriousbusiness/gotosocial/pulls/4277 Co-authored-by: kim Co-committed-by: kim --- internal/processing/status/context.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'internal/processing/status/context.go') diff --git a/internal/processing/status/context.go b/internal/processing/status/context.go index 6f3e7a4fd..531dff1d6 100644 --- a/internal/processing/status/context.go +++ b/internal/processing/status/context.go @@ -24,7 +24,6 @@ import ( "strings" apimodel "code.superseriousbusiness.org/gotosocial/internal/api/model" - statusfilter "code.superseriousbusiness.org/gotosocial/internal/filter/status" "code.superseriousbusiness.org/gotosocial/internal/gtserror" "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" ) @@ -278,7 +277,7 @@ func (p *Processor) ContextGet( ) (*apimodel.ThreadContext, gtserror.WithCode) { // Retrieve filters as they affect // what should be shown to requester. - filters, err := p.state.DB.GetFiltersForAccountID( + filters, err := p.state.DB.GetFiltersByAccountID( ctx, // Populate filters. requester.ID, ) @@ -305,7 +304,7 @@ func (p *Processor) ContextGet( apiContext.Ancestors = p.c.GetVisibleAPIStatuses(ctx, requester, threadContext.ancestors, - statusfilter.FilterContextThread, + gtsmodel.FilterContextThread, filters, ) @@ -313,7 +312,7 @@ func (p *Processor) ContextGet( apiContext.Descendants = p.c.GetVisibleAPIStatuses(ctx, requester, threadContext.descendants, - statusfilter.FilterContextThread, + gtsmodel.FilterContextThread, filters, ) -- cgit v1.2.3