qugalet/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2024-11-26 05:36:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[bugfix] Fix error on searching for account w/accountDomain by host (#1465)

Browse source
This commit is contained in:
tobi 2023-02-09 10:34:44 +01:00 committed by GitHub
parent 95715f9251
commit e5e257c259
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
internal/federation/dereferencing/account.go
View file

@ -162,6 +162,24 @@ func (d *deref) enrichAccount(ctx context.Context, requestUser string, uri *url.
} }
if err == nil { if err == nil {
if account.Domain != accDomain {
// We have the correct accountDomain now; if it was different from
// the account domain we were provided, do another db lookup to check
// if we already had the account in the db under the account domain we
// just discovered, otherwise we risk thinking this is a new account
// and trying to put it into the database again (which will cause issues).
alreadyAccount, err := d.db.GetAccountByUsernameDomain(ctx, account.Username, accDomain)
if err != nil && !errors.Is(err, db.ErrNoEntries) {
return nil, fmt.Errorf("enrichAccount: db err looking for account again after webfinger: %w", err)
}
if err == nil {
// We already had the account in the database;
// continue by enriching that one instead.
account = alreadyAccount
}
}
// Update account with latest info. // Update account with latest info.
account.URI = accURI.String() account.URI = accURI.String()
account.Domain = accDomain account.Domain = accDomain