Improve getAPObjectByType to return ObjectOrLink

Changes

1 changed files (+107/-108)

• activitypub/marshalling.go
  • @@ -4,226 +4,225 @@ import (
    "fmt" ) - func getAPObjectByType(typ ActivityVocabularyType) (interface{}, error) { - var ret interface{} + func getAPObjectByType(typ ActivityVocabularyType) (ObjectOrLink, error) { + var ret ObjectOrLink var err error switch typ { case ObjectType: - ret = Object{} - o := ret.(Object) + ret = &Object{} + o := ret.(*Object) o.Type = typ case LinkType: - ret = Link{} - o := ret.(Link) + ret = &Link{} + o := ret.(*Link) o.Type = typ case ActivityType: - ret = Activity{} - o := ret.(Activity) + ret = &Activity{} + o := ret.(*Activity) o.Type = typ case IntransitiveActivityType: - ret = IntransitiveActivity{} - o := ret.(IntransitiveActivity) + ret = &IntransitiveActivity{} + o := ret.(*IntransitiveActivity) o.Type = typ case ActorType: - ret = Actor{} - o := ret.(Actor) + ret = &Actor{} + o := ret.(*Actor) o.Type = typ case CollectionType: - ret = Collection{} - o := ret.(Collection) + ret = &Collection{} + o := ret.(*Collection) o.Type = typ case OrderedCollectionType: - ret = Link{} - o := ret.(Link) + ret = &Link{} + o := ret.(*Link) o.Type = typ case ArticleType: - ret = Object{} - o := ret.(Object) + ret = &Object{} + o := ret.(*Object) o.Type = typ case AudioType: - ret = Object{} - o := ret.(Object) + ret = &Object{} + o := ret.(*Object) o.Type = typ case DocumentType: - ret = Object{} - o := ret.(Object) + ret = &Object{} + o := ret.(*Object) o.Type = typ case EventType: o := Object{} o.Type = typ case ImageType: - ret = Object{} - o := ret.(Object) + ret = &Object{} + o := ret.(*Object) o.Type = typ case NoteType: - ret = Object{} - o := ret.(Object) + ret = &Object{} + o := ret.(*Object) o.Type = typ - ret = o case PageType: - ret = Object{} - o := ret.(Object) + ret = &Object{} + o := ret.(*Object) o.Type = typ case PlaceType: - ret = Object{} - o := ret.(Object) + ret = &Object{} + o := ret.(*Object) o.Type = typ case ProfileType: - ret = Object{} - o := ret.(Object) + ret = &Object{} + o := ret.(*Object) o.Type = typ case RelationshipType: - ret = Object{} - o := ret.(Object) + ret = &Object{} + o := ret.(*Object) o.Type = typ case TombstoneType: - ret = Object{} - o := ret.(Object) + ret = &Object{} + o := ret.(*Object) o.Type = typ case VideoType: - ret = Object{} - o := ret.(Object) + ret = &Object{} + o := ret.(*Object) o.Type = typ case MentionType: - ret = Mention{} - o := ret.(Mention) + ret = &Mention{} + o := ret.(*Mention) o.Type = typ case ApplicationType: - ret = Application{} - o := ret.(Application) + ret = &Application{} + o := ret.(*Application) o.Type = typ case GroupType: - ret = Group{} - o := ret.(Group) + ret = &Group{} + o := ret.(*Group) o.Type = typ case OrganizationType: - ret = Organization{} - o := ret.(Organization) + ret = &Organization{} + o := ret.(*Organization) o.Type = typ case PersonType: - ret = Person{} - o := ret.(Person) + ret = &Person{} + o := ret.(*Person) o.Type = typ case ServiceType: - ret = Service{} - o := ret.(Service) + ret = &Service{} + o := ret.(*Service) o.Type = typ case AcceptType: - ret = Accept{} - o := ret.(Accept) + ret = &Accept{} + o := ret.(*Accept) o.Type = typ case AddType: - ret = Add{} - o := ret.(Add) + ret = &Add{} + o := ret.(*Add) o.Type = typ case AnnounceType: - ret = Announce{} - o := ret.(Announce) + ret = &Announce{} + o := ret.(*Announce) o.Type = typ case ArriveType: - ret = Arrive{} - o := ret.(Arrive) + ret = &Arrive{} + o := ret.(*Arrive) o.Type = typ case BlockType: - ret = Block{} - o := ret.(Block) + ret = &Block{} + o := ret.(*Block) o.Type = typ case CreateType: - ret = Create{} - o := ret.(Create) + ret = &Create{} + o := ret.(*Create) o.Type = typ case DeleteType: - ret = Delete{} - o := ret.(Delete) + ret = &Delete{} + o := ret.(*Delete) o.Type = typ case DislikeType: - ret = Dislike{} - o := ret.(Dislike) + ret = &Dislike{} + o := ret.(*Dislike) o.Type = typ case FlagType: - ret = Flag{} - o := ret.(Flag) + ret = &Flag{} + o := ret.(*Flag) o.Type = typ case FollowType: - ret = Follow{} - o := ret.(Follow) + ret = &Follow{} + o := ret.(*Follow) o.Type = typ case IgnoreType: - ret = Ignore{} - o := ret.(Ignore) + ret = &Ignore{} + o := ret.(*Ignore) o.Type = typ case InviteType: - ret = Invite{} - o := ret.(Invite) + ret = &Invite{} + o := ret.(*Invite) o.Type = typ case JoinType: - ret = Join{} - o := ret.(Join) + ret = &Join{} + o := ret.(*Join) o.Type = typ case LeaveType: - ret = Leave{} - o := ret.(Leave) + ret = &Leave{} + o := ret.(*Leave) o.Type = typ case LikeType: - ret = Like{} - o := ret.(Like) + ret = &Like{} + o := ret.(*Like) o.Type = typ case ListenType: - ret = Listen{} - o := ret.(Listen) + ret = &Listen{} + o := ret.(*Listen) o.Type = typ case MoveType: - ret = Move{} - o := ret.(Move) + ret = &Move{} + o := ret.(*Move) o.Type = typ case OfferType: - ret = Offer{} - o := ret.(Offer) + ret = &Offer{} + o := ret.(*Offer) o.Type = typ case QuestionType: - ret = Question{} - o := ret.(Question) + ret = &Question{} + o := ret.(*Question) o.Type = typ case RejectType: - ret = Reject{} - o := ret.(Reject) + ret = &Reject{} + o := ret.(*Reject) o.Type = typ case ReadType: - ret = Read{} - o := ret.(Read) + ret = &Read{} + o := ret.(*Read) o.Type = typ case RemoveType: - ret = Remove{} - o := ret.(Remove) + ret = &Remove{} + o := ret.(*Remove) o.Type = typ case TentativeRejectType: - ret = TentativeReject{} - o := ret.(TentativeReject) + ret = &TentativeReject{} + o := ret.(*TentativeReject) o.Type = typ case TentativeAcceptType: - ret = TentativeAccept{} - o := ret.(TentativeAccept) + ret = &TentativeAccept{} + o := ret.(*TentativeAccept) o.Type = typ case TravelType: - ret = Travel{} - o := ret.(Travel) + ret = &Travel{} + o := ret.(*Travel) o.Type = typ case UndoType: - ret = Undo{} - o := ret.(Undo) + ret = &Undo{} + o := ret.(*Undo) o.Type = typ case UpdateType: - ret = Update{} - o := ret.(Update) + ret = &Update{} + o := ret.(*Update) o.Type = typ case ViewType: - ret = View{} - o := ret.(View) + ret = &View{} + o := ret.(*View) o.Type = typ default: ret = nil - err = fmt.Errorf("%q unrecognized ActivityPub type", typ) + err = fmt.Errorf("unrecognized ActivityPub type %q", typ) } return ret, err }