Check err in Follow() to avoid crash and don't check FederatedUserNew error

Changes

2 changed files (+2/-7)

• modules/activitypub/follow.go
  • @@ -28,7 +28,7 @@ func Follow(ctx context.Context, follow ap.Follow) {
    objectIRI := follow.Object.GetID() objectUser, err := personIRIToUser(ctx, objectIRI) // Must be a local user - if strings.Contains(objectUser.Name, "@") || err != nil { + if err != nil || strings.Contains(objectUser.Name, "@") { log.Warn("Couldn't find object user for follow", err) return }
  • @@ -44,7 +44,6 @@ func Follow(ctx context.Context, follow ap.Follow) {
    } // Process a Undo follow activity - // I haven't tried this yet so hopefully it works func Unfollow(ctx context.Context, unfollow ap.Undo) { follow := unfollow.Object.(*ap.Follow) // Actor is the user performing the undo follow
• modules/activitypub/iri.go
  • @@ -47,11 +47,7 @@ func personIRIToUser(ctx context.Context, personIRI ap.IRI) (*user_model.User, e
    return user, err } - err = FederatedUserNew(personIRI) - if err != nil { - return nil, err - } - + FederatedUserNew(personIRI) return user_model.GetUserByName(ctx, name) }