mirrors/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2025-12-30 13:36:15 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

tidy up federation call

Browse source
This commit is contained in:
tsmethurst 2021-10-15 11:29:35 +02:00
commit 118d51a2cd
1 changed files with 1 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
internal/processing/fromfederator.go
View file

@ -161,22 +161,13 @@ func (p *processor) processCreateFollowRequestFromFederator(ctx context.Context,
return p.notifyFollowRequest(ctx, followRequest)
}
if followRequest.Account == nil {
a, err := p.db.GetAccountByID(ctx, followRequest.AccountID)
if err != nil {
return err
}
followRequest.Account = a
}
originAccount := followRequest.Account
// if the target account isn't locked, we should already accept the follow and notify about the new follower instead
follow, err := p.db.AcceptFollowRequest(ctx, followRequest.AccountID, followRequest.TargetAccountID)
if err != nil {
return err
}
if err := p.federateAcceptFollowRequest(ctx, follow, originAccount, targetAccount); err != nil {
if err := p.federateAcceptFollowRequest(ctx, follow); err != nil {
return err
}