diff options
Diffstat (limited to 'internal/processing/search.go')
| -rw-r--r-- | internal/processing/search.go | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/internal/processing/search.go b/internal/processing/search.go index c8dc58320..ef5da9ee7 100644 --- a/internal/processing/search.go +++ b/internal/processing/search.go @@ -226,17 +226,8 @@ func (p *Processor) SearchGet(ctx context.Context, authed *oauth.Auth, search *a } func (p *Processor) searchStatusByURI(ctx context.Context, authed *oauth.Auth, uri *url.URL) (*gtsmodel.Status, error) { - status, statusable, err := p.federator.GetStatus(gtscontext.SetFastFail(ctx), authed.Account.Username, uri, true, true) - if err != nil { - return nil, err - } - - if !*status.Local && statusable != nil { - // Attempt to dereference the status thread while we are here - p.federator.DereferenceThread(gtscontext.SetFastFail(ctx), authed.Account.Username, uri, status, statusable) - } - - return status, nil + status, _, err := p.federator.GetStatusByURI(gtscontext.SetFastFail(ctx), authed.Account.Username, uri) + return status, err } func (p *Processor) searchAccountByURI(ctx context.Context, authed *oauth.Auth, uri *url.URL, resolve bool) (*gtsmodel.Account, error) { @@ -267,11 +258,12 @@ func (p *Processor) searchAccountByURI(ctx context.Context, authed *oauth.Auth, return account, nil } - return p.federator.GetAccountByURI( + account, _, err := p.federator.GetAccountByURI( gtscontext.SetFastFail(ctx), authed.Account.Username, uri, ) + return account, err } func (p *Processor) searchAccountByUsernameDomain(ctx context.Context, authed *oauth.Auth, username string, domain string, resolve bool) (*gtsmodel.Account, error) { @@ -294,9 +286,10 @@ func (p *Processor) searchAccountByUsernameDomain(ctx context.Context, authed *o return account, nil } - return p.federator.GetAccountByUsernameDomain( + account, _, err := p.federator.GetAccountByUsernameDomain( gtscontext.SetFastFail(ctx), authed.Account.Username, username, domain, ) + return account, err } |