Gabe KangasandGitHub
a82efb0e9a
* fix(ap): add safe constructors, getters, and validators to ActivityPub actors to address #4701 * chore: replace nil check with the new Validate() method * chore(test): added test to verify the values extracted from actors * fix: return the specific error type + test for it * fix(ap): add recovery for each AP inbox worker for a worst case scenario * fix(ap): add additional safe accessor methods to other AP entities other than actors * chore(tests): add tests for the new safe accessors * fix(ap): handle empty public keys in AP actors
59 lines
1.8 KiB
Go
59 lines
1.8 KiB
Go
package resolvers
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
|
|
"github.com/go-fed/activity/streams/vocab"
|
|
"github.com/owncast/owncast/activitypub/apmodels"
|
|
"github.com/pkg/errors"
|
|
log "github.com/sirupsen/logrus"
|
|
)
|
|
|
|
func getPersonFromFollow(activity vocab.ActivityStreamsFollow) (apmodels.ActivityPubActor, error) {
|
|
return GetResolvedActorFromActorProperty(activity.GetActivityStreamsActor())
|
|
}
|
|
|
|
// MakeFollowRequest will convert an inbound Follow request to our internal actor model.
|
|
func MakeFollowRequest(c context.Context, activity vocab.ActivityStreamsFollow) (*apmodels.ActivityPubActor, error) {
|
|
person, err := getPersonFromFollow(activity)
|
|
if err != nil {
|
|
return nil, errors.Wrap(err, "unable to resolve person from follow request")
|
|
}
|
|
|
|
hostname := person.ActorIriHostname()
|
|
username := person.Username
|
|
fullUsername := fmt.Sprintf("%s@%s", username, hostname)
|
|
|
|
followRequest := apmodels.ActivityPubActor{
|
|
ActorIri: person.ActorIri,
|
|
FollowRequestIri: activity.GetJSONLDId().Get(),
|
|
Inbox: person.Inbox,
|
|
Name: person.Name,
|
|
Username: fullUsername,
|
|
Image: person.Image,
|
|
RequestObject: activity,
|
|
}
|
|
|
|
return &followRequest, nil
|
|
}
|
|
|
|
// MakeUnFollowRequest will convert an inbound Unfollow request to our internal actor model.
|
|
func MakeUnFollowRequest(c context.Context, activity vocab.ActivityStreamsUndo) *apmodels.ActivityPubActor {
|
|
person, err := GetResolvedActorFromActorProperty(activity.GetActivityStreamsActor())
|
|
if err != nil {
|
|
log.Errorln("unable to resolve person from actor iri", person.ActorIri, err)
|
|
return nil
|
|
}
|
|
|
|
unfollowRequest := apmodels.ActivityPubActor{
|
|
ActorIri: person.ActorIri,
|
|
FollowRequestIri: activity.GetJSONLDId().Get(),
|
|
Inbox: person.Inbox,
|
|
Name: person.Name,
|
|
Image: person.Image,
|
|
}
|
|
|
|
return &unfollowRequest
|
|
}
|