rafaelcaricio/gotosocial
1
0
Fork 0
forked from mirrors/gotosocial
Code Issues Pull requests Projects Releases Packages Wiki Activity

[bugfix] Account self finger fix (#658)

Browse source 
* check only 1 of status/account when search by uri

* don't try to resolve local uris when searching
This commit is contained in:
tobi 2022-06-20 14:11:36 +02:00 committed by GitHub
parent ec81d28a77
commit 8c7945fb78
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
internal/processing/search.go
View file

@ -85,14 +85,17 @@ func (p *processor) SearchGet(ctx context.Context, authed *oauth.Auth, search *a
*/ */
if !foundOne { if !foundOne {
if uri, err := url.Parse(query); err == nil && (uri.Scheme == "https" || uri.Scheme == "http") { if uri, err := url.Parse(query); err == nil && (uri.Scheme == "https" || uri.Scheme == "http") {
// 1. check if it's a status // don't attempt to resolve (ie., dereference) local accounts/statuses
if foundStatus, err := p.searchStatusByURI(ctx, authed, uri, search.Resolve); err == nil && foundStatus != nil { resolve := search.Resolve
foundStatuses = append(foundStatuses, foundStatus) if uri.Host == config.GetHost() || uri.Host == config.GetAccountDomain() {
l.Debug("got a status by searching by URI") resolve = false
} }
// 2. check if it's an account // check if it's a status or an account
if foundAccount, err := p.searchAccountByURI(ctx, authed, uri, search.Resolve); err == nil && foundAccount != nil { if foundStatus, err := p.searchStatusByURI(ctx, authed, uri, resolve); err == nil && foundStatus != nil {
foundStatuses = append(foundStatuses, foundStatus)
l.Debug("got a status by searching by URI")
} else if foundAccount, err := p.searchAccountByURI(ctx, authed, uri, resolve); err == nil && foundAccount != nil {
foundAccounts = append(foundAccounts, foundAccount) foundAccounts = append(foundAccounts, foundAccount)
l.Debug("got an account by searching by URI") l.Debug("got an account by searching by URI")
} }