mirror of
https://github.com/superseriousbusiness/gotosocial
synced 2025-06-05 21:59:39 +02:00
[feature] List replies policy, refactor async workers (#2087)
* Add/update some DB functions. * move async workers into subprocessor * rename FromFederator -> FromFediAPI * update home timeline check to include check for current status first before moving to parent status * change streamMap to pointer to mollify linter * update followtoas func signature * fix merge * remove errant debug log * don't use separate errs.Combine() check to wrap errs * wrap parts of workers functionality in sub-structs * populate report using new db funcs * embed federator (tiny bit tidier) * flesh out error msg, add continue(!) * fix other error messages to be more specific * better, nicer * give parseURI util function a bit more util * missing headers * use pointers for subprocessors
This commit is contained in:
@@ -774,10 +774,14 @@ func (c *converter) StatusToASDelete(ctx context.Context, s *gtsmodel.Status) (v
|
||||
return delete, nil
|
||||
}
|
||||
|
||||
func (c *converter) FollowToAS(ctx context.Context, f *gtsmodel.Follow, originAccount *gtsmodel.Account, targetAccount *gtsmodel.Account) (vocab.ActivityStreamsFollow, error) {
|
||||
// parse out the various URIs we need for this
|
||||
// origin account (who's doing the follow)
|
||||
originAccountURI, err := url.Parse(originAccount.URI)
|
||||
func (c *converter) FollowToAS(ctx context.Context, f *gtsmodel.Follow) (vocab.ActivityStreamsFollow, error) {
|
||||
if err := c.db.PopulateFollow(ctx, f); err != nil {
|
||||
return nil, gtserror.Newf("error populating follow: %w", err)
|
||||
}
|
||||
|
||||
// Parse out the various URIs we need for this
|
||||
// origin account (who's doing the follow).
|
||||
originAccountURI, err := url.Parse(f.Account.URI)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("followtoasfollow: error parsing origin account uri: %s", err)
|
||||
}
|
||||
@@ -785,7 +789,7 @@ func (c *converter) FollowToAS(ctx context.Context, f *gtsmodel.Follow, originAc
|
||||
originActor.AppendIRI(originAccountURI)
|
||||
|
||||
// target account (who's being followed)
|
||||
targetAccountURI, err := url.Parse(targetAccount.URI)
|
||||
targetAccountURI, err := url.Parse(f.TargetAccount.URI)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("followtoasfollow: error parsing target account uri: %s", err)
|
||||
}
|
||||
|
Reference in New Issue
Block a user