diff options
Diffstat (limited to 'internal/federation')
| -rw-r--r-- | internal/federation/dereferencing/account.go | 38 | ||||
| -rw-r--r-- | internal/federation/dereferencing/status.go | 108 | ||||
| -rw-r--r-- | internal/federation/federatingdb/create.go | 30 |
3 files changed, 151 insertions, 25 deletions
diff --git a/internal/federation/dereferencing/account.go b/internal/federation/dereferencing/account.go index f94dbaffa..670c8e2c8 100644 --- a/internal/federation/dereferencing/account.go +++ b/internal/federation/dereferencing/account.go @@ -163,6 +163,37 @@ func (d *Dereferencer) getAccountByURI(ctx context.Context, requestUser string, // or a remote model whose last_fetched date is beyond a certain interval, the account will be dereferenced. In the case of dereferencing, some low-priority // account information may be enqueued for asynchronous fetching, e.g. featured account statuses (pins). An ActivityPub object indicates the account was dereferenced. func (d *Dereferencer) GetAccountByUsernameDomain(ctx context.Context, requestUser string, username string, domain string) (*gtsmodel.Account, ap.Accountable, error) { + account, apubAcc, err := d.getAccountByUsernameDomain( + ctx, + requestUser, + username, + domain, + ) + if err != nil { + return nil, nil, err + } + + if apubAcc != nil { + // This account was updated, enqueue re-dereference featured posts. + d.state.Workers.Federator.MustEnqueueCtx(ctx, func(ctx context.Context) { + if err := d.dereferenceAccountFeatured(ctx, requestUser, account); err != nil { + log.Errorf(ctx, "error fetching account featured collection: %v", err) + } + }) + } + + return account, apubAcc, nil +} + +// getAccountByUsernameDomain is a package internal form +// of .GetAccountByUsernameDomain() that doesn't bother +// dereferencing featured posts. +func (d *Dereferencer) getAccountByUsernameDomain( + ctx context.Context, + requestUser string, + username string, + domain string, +) (*gtsmodel.Account, ap.Accountable, error) { if domain == config.GetHost() || domain == config.GetAccountDomain() { // We do local lookups using an empty domain, // else it will fail the db search below. @@ -196,13 +227,6 @@ func (d *Dereferencer) GetAccountByUsernameDomain(ctx context.Context, requestUs return nil, nil, err } - // This account was updated, enqueue dereference featured posts. - d.state.Workers.Federator.MustEnqueueCtx(ctx, func(ctx context.Context) { - if err := d.dereferenceAccountFeatured(ctx, requestUser, account); err != nil { - log.Errorf(ctx, "error fetching account featured collection: %v", err) - } - }) - return account, apubAcc, nil } diff --git a/internal/federation/dereferencing/status.go b/internal/federation/dereferencing/status.go index 89b3088c8..adc73e843 100644 --- a/internal/federation/dereferencing/status.go +++ b/internal/federation/dereferencing/status.go @@ -36,6 +36,7 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/log" "github.com/superseriousbusiness/gotosocial/internal/media" "github.com/superseriousbusiness/gotosocial/internal/transport" + "github.com/superseriousbusiness/gotosocial/internal/util" ) // statusUpToDate returns whether the given status model is both updateable @@ -342,35 +343,110 @@ func (d *Dereferencer) enrichStatus( return latestStatus, apubStatus, nil } -func (d *Dereferencer) fetchStatusMentions(ctx context.Context, requestUser string, existing, status *gtsmodel.Status) error { - // Allocate new slice to take the yet-to-be created mention IDs. - status.MentionIDs = make([]string, len(status.Mentions)) - - for i := range status.Mentions { - mention := status.Mentions[i] - - // Look for existing mention with target account URI first. - existing, ok := existing.GetMentionByTargetURI(mention.TargetAccountURI) - if ok && existing.ID != "" { - status.Mentions[i] = existing - status.MentionIDs[i] = existing.ID - continue +// populateMentionTarget tries to populate the given +// mention with the correct TargetAccount and (if not +// yet set) TargetAccountURI, returning the populated +// mention. +// +// Will check on the existing status if the mention +// is already there and populated; if so, existing +// mention will be returned along with `true`. +// +// Otherwise, this function will try to parse first +// the Href of the mention, and then the namestring, +// to see who it targets, and go fetch that account. +func (d *Dereferencer) populateMentionTarget( + ctx context.Context, + mention *gtsmodel.Mention, + requestUser string, + existing, status *gtsmodel.Status, +) ( + *gtsmodel.Mention, + bool, // True if mention already exists in the DB. + error, +) { + // Mentions can be created using Name or Href. + // Prefer Href (TargetAccountURI), fall back to Name. + if mention.TargetAccountURI != "" { + // Look for existing mention with this URI. + // If we already have it we can return early. + existingMention, ok := existing.GetMentionByTargetURI(mention.TargetAccountURI) + if ok && existingMention.ID != "" { + return existingMention, true, nil } // Ensure that mention account URI is parseable. accountURI, err := url.Parse(mention.TargetAccountURI) if err != nil { - log.Errorf(ctx, "invalid account uri %q: %v", mention.TargetAccountURI, err) - continue + err = gtserror.Newf("invalid account uri %q: %w", mention.TargetAccountURI, err) + return nil, false, err } // Ensure we have the account of the mention target dereferenced. mention.TargetAccount, _, err = d.getAccountByURI(ctx, requestUser, accountURI) if err != nil { - log.Errorf(ctx, "failed to dereference account %s: %v", accountURI, err) + err = gtserror.Newf("failed to dereference account %s: %w", accountURI, err) + return nil, false, err + } + } else { + // Href wasn't set. Find the target account using namestring. + username, domain, err := util.ExtractNamestringParts(mention.NameString) + if err != nil { + err = gtserror.Newf("failed to parse namestring %s: %w", mention.NameString, err) + return nil, false, err + } + + mention.TargetAccount, _, err = d.getAccountByUsernameDomain(ctx, requestUser, username, domain) + if err != nil { + err = gtserror.Newf("failed to dereference account %s: %w", mention.NameString, err) + return nil, false, err + } + + // Look for existing mention with this URI. + mention.TargetAccountURI = mention.TargetAccount.URI + existingMention, ok := existing.GetMentionByTargetURI(mention.TargetAccountURI) + if ok && existingMention.ID != "" { + return existingMention, true, nil + } + } + + // At this point, mention.TargetAccountURI + // and mention.TargetAccount must be set. + return mention, false, nil +} + +func (d *Dereferencer) fetchStatusMentions(ctx context.Context, requestUser string, existing, status *gtsmodel.Status) error { + // Allocate new slice to take the yet-to-be created mention IDs. + status.MentionIDs = make([]string, len(status.Mentions)) + + for i := range status.Mentions { + var ( + mention = status.Mentions[i] + alreadyExists bool + err error + ) + + mention, alreadyExists, err = d.populateMentionTarget( + ctx, + mention, + requestUser, + existing, + status, + ) + if err != nil { + log.Errorf(ctx, "failed to derive mention: %v", err) + continue + } + + if alreadyExists { + // This mention was already attached + // to the status, use it and continue. + status.Mentions[i] = mention + status.MentionIDs[i] = mention.ID continue } + // This mention didn't exist yet. // Generate new ID according to status creation. // TODO: update this to use "edited_at" when we add // support for edited status revision history. diff --git a/internal/federation/federatingdb/create.go b/internal/federation/federatingdb/create.go index 6cb230589..14e846b15 100644 --- a/internal/federation/federatingdb/create.go +++ b/internal/federation/federatingdb/create.go @@ -21,17 +21,20 @@ import ( "context" "errors" "fmt" + "strings" "codeberg.org/gruf/go-logger/v2/level" "github.com/superseriousbusiness/activity/pub" "github.com/superseriousbusiness/activity/streams/vocab" "github.com/superseriousbusiness/gotosocial/internal/ap" + "github.com/superseriousbusiness/gotosocial/internal/config" "github.com/superseriousbusiness/gotosocial/internal/db" "github.com/superseriousbusiness/gotosocial/internal/gtserror" "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" "github.com/superseriousbusiness/gotosocial/internal/id" "github.com/superseriousbusiness/gotosocial/internal/log" "github.com/superseriousbusiness/gotosocial/internal/messages" + "github.com/superseriousbusiness/gotosocial/internal/util" ) // Create adds a new entry to the database which must be able to be @@ -288,11 +291,34 @@ func (f *federatingDB) createStatusable( } func (f *federatingDB) shouldAcceptStatusable(ctx context.Context, receiver *gtsmodel.Account, requester *gtsmodel.Account, status *gtsmodel.Status) (bool, error) { + host := config.GetHost() + accountDomain := config.GetAccountDomain() + // Check whether status mentions the receiver, // this is the quickest check so perform it first. + // Prefer checking using mention Href, fall back to Name. for _, mention := range status.Mentions { - if mention.TargetAccountURI == receiver.URI { - return true, nil + targetURI := mention.TargetAccountURI + nameString := mention.NameString + + if targetURI != "" { + if targetURI == receiver.URI || targetURI == receiver.URL { + // Target URI or URL match; + // receiver is mentioned. + return true, nil + } + } else if nameString != "" { + username, domain, err := util.ExtractNamestringParts(nameString) + if err != nil { + return false, gtserror.Newf("error checking if mentioned: %w", err) + } + + if (domain == host || domain == accountDomain) && + strings.EqualFold(username, receiver.Username) { + // Username + domain match; + // receiver is mentioned. + return true, nil + } } } |