mirror of
				https://github.com/superseriousbusiness/gotosocial.git
				synced 2025-10-31 12:12:25 -05:00 
			
		
		
		
	[bugfix] Ensure side effects handled for local unlocked follows (#2998)
This commit is contained in:
		
					parent
					
						
							
								978b4176f1
							
						
					
				
			
			
				commit
				
					
						20877c1474
					
				
			
		
					 2 changed files with 50 additions and 22 deletions
				
			
		|  | @ -305,6 +305,30 @@ func (p *clientAPI) CreateFollowReq(ctx context.Context, cMsg *messages.FromClie | |||
| 		return gtserror.Newf("%T not parseable as *gtsmodel.FollowRequest", cMsg.GTSModel) | ||||
| 	} | ||||
| 
 | ||||
| 	// If target is a local, unlocked account, | ||||
| 	// we can skip side effects for the follow | ||||
| 	// request and accept the follow immediately. | ||||
| 	if cMsg.Target.IsLocal() && !*cMsg.Target.Locked { | ||||
| 		// Accept the FR first to get the Follow. | ||||
| 		follow, err := p.state.DB.AcceptFollowRequest( | ||||
| 			ctx, | ||||
| 			cMsg.Origin.ID, | ||||
| 			cMsg.Target.ID, | ||||
| 		) | ||||
| 		if err != nil { | ||||
| 			return gtserror.Newf("db error accepting follow req: %w", err) | ||||
| 		} | ||||
| 
 | ||||
| 		// Use AcceptFollow to do side effects. | ||||
| 		return p.AcceptFollow(ctx, &messages.FromClientAPI{ | ||||
| 			APObjectType:   ap.ActivityFollow, | ||||
| 			APActivityType: ap.ActivityAccept, | ||||
| 			GTSModel:       follow, | ||||
| 			Origin:         cMsg.Origin, | ||||
| 			Target:         cMsg.Target, | ||||
| 		}) | ||||
| 	} | ||||
| 
 | ||||
| 	// Update stats for the target account. | ||||
| 	if err := p.utils.incrementFollowRequestsCount(ctx, cMsg.Target); err != nil { | ||||
| 		log.Errorf(ctx, "error updating account stats: %v", err) | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue