From f4fcffc8b56ef73c184ae17892b69181961c15c7 Mon Sep 17 00:00:00 2001 From: kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> Date: Fri, 15 Dec 2023 14:24:39 +0000 Subject: [bugfix] use a much shorter refresh limit for statuses with polls (#2453) * specifically use a much shorter refresh limit for statuses with polls * allow specifying whether status must be upToDate in calls to Get(Visible)?TargetStatusBy_(), limit force refresh to 5 minute cooldown * remove the PollID check from statusUpToDate() * remove unnecessary force flag checks * remove unused field * check refresh status error * use argument name 'refresh' instead of 'upToDate' to better fit with the codebase * add statuses_poll_id_idx * remove the definitely-not copy-pasted comment i accidentally typed out in full * only synchronously refresh if the refresh flag is provided, otherwise do async * fix wrong force value being provided for async --------- Co-authored-by: tobi --- internal/processing/status/get.go | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'internal/processing/status/get.go') diff --git a/internal/processing/status/get.go b/internal/processing/status/get.go index c182bd148..f8c037404 100644 --- a/internal/processing/status/get.go +++ b/internal/processing/status/get.go @@ -28,7 +28,11 @@ import ( // Get gets the given status, taking account of privacy settings and blocks etc. func (p *Processor) Get(ctx context.Context, requestingAccount *gtsmodel.Account, targetStatusID string) (*apimodel.Status, gtserror.WithCode) { - targetStatus, errWithCode := p.c.GetVisibleTargetStatus(ctx, requestingAccount, targetStatusID) + targetStatus, errWithCode := p.c.GetVisibleTargetStatus(ctx, + requestingAccount, + targetStatusID, + false, // refresh + ) if errWithCode != nil { return nil, errWithCode } @@ -38,7 +42,11 @@ func (p *Processor) Get(ctx context.Context, requestingAccount *gtsmodel.Account // WebGet gets the given status for web use, taking account of privacy settings. func (p *Processor) WebGet(ctx context.Context, targetStatusID string) (*apimodel.Status, gtserror.WithCode) { - targetStatus, errWithCode := p.c.GetVisibleTargetStatus(ctx, nil, targetStatusID) + targetStatus, errWithCode := p.c.GetVisibleTargetStatus(ctx, + nil, // requester + targetStatusID, + false, // refresh + ) if errWithCode != nil { return nil, errWithCode } @@ -57,7 +65,11 @@ func (p *Processor) contextGet( targetStatusID string, convert func(context.Context, *gtsmodel.Status, *gtsmodel.Account) (*apimodel.Status, error), ) (*apimodel.Context, gtserror.WithCode) { - targetStatus, errWithCode := p.c.GetVisibleTargetStatus(ctx, requestingAccount, targetStatusID) + targetStatus, errWithCode := p.c.GetVisibleTargetStatus(ctx, + requestingAccount, + targetStatusID, + false, // refresh + ) if errWithCode != nil { return nil, errWithCode } -- cgit v1.2.3