[chore] Update activity dependency (#2031)

2 files changed, 92 insertions, 339 deletions

diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_subject/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_subject/gen_pkg.go
index 9708e08a1..1a5522d56 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_subject/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_subject/gen_pkg.go
@@ -45,10 +45,6 @@ type privateManager interface {
 	// the "ActivityStreamsBlock" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeBlockActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsBlock, error)
-	// DeserializeBranchForgeFed returns the deserialization method for the
-	// "ForgeFedBranch" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeBranchForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedBranch, error)
 	// DeserializeCollectionActivityStreams returns the deserialization method
 	// for the "ActivityStreamsCollection" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -57,10 +53,6 @@ type privateManager interface {
 	// method for the "ActivityStreamsCollectionPage" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeCollectionPageActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsCollectionPage, error)
-	// DeserializeCommitForgeFed returns the deserialization method for the
-	// "ForgeFedCommit" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeCommitForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedCommit, error)
 	// DeserializeCreateActivityStreams returns the deserialization method for
 	// the "ActivityStreamsCreate" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -96,6 +88,9 @@ type privateManager interface {
 	// the "ActivityStreamsGroup" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeGroupActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsGroup, error)
+	// DeserializeHashtagToot returns the deserialization method for the
+	// "TootHashtag" non-functional property in the vocabulary "Toot"
+	DeserializeHashtagToot() func(map[string]interface{}, map[string]string) (vocab.TootHashtag, error)
 	// DeserializeIdentityProofToot returns the deserialization method for the
 	// "TootIdentityProof" non-functional property in the vocabulary "Toot"
 	DeserializeIdentityProofToot() func(map[string]interface{}, map[string]string) (vocab.TootIdentityProof, error)
@@ -189,9 +184,6 @@ type privateManager interface {
 	// the "SchemaPropertyValue" non-functional property in the vocabulary
 	// "Schema"
 	DeserializePropertyValueSchema() func(map[string]interface{}, map[string]string) (vocab.SchemaPropertyValue, error)
-	// DeserializePushForgeFed returns the deserialization method for the
-	// "ForgeFedPush" non-functional property in the vocabulary "ForgeFed"
-	DeserializePushForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedPush, error)
 	// DeserializeQuestionActivityStreams returns the deserialization method
 	// for the "ActivityStreamsQuestion" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -212,10 +204,6 @@ type privateManager interface {
 	// the "ActivityStreamsRemove" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeRemoveActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsRemove, error)
-	// DeserializeRepositoryForgeFed returns the deserialization method for
-	// the "ForgeFedRepository" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeRepositoryForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedRepository, error)
 	// DeserializeServiceActivityStreams returns the deserialization method
 	// for the "ActivityStreamsService" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -228,14 +216,6 @@ type privateManager interface {
 	// method for the "ActivityStreamsTentativeReject" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeTentativeRejectActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTentativeReject, error)
-	// DeserializeTicketDependencyForgeFed returns the deserialization method
-	// for the "ForgeFedTicketDependency" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTicketDependencyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketDependency, error)
-	// DeserializeTicketForgeFed returns the deserialization method for the
-	// "ForgeFedTicket" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeTicketForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicket, error)
 	// DeserializeTombstoneActivityStreams returns the deserialization method
 	// for the "ActivityStreamsTombstone" non-functional property in the
 	// vocabulary "ActivityStreams"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_subject/gen_property_activitystreams_subject.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_subject/gen_property_activitystreams_subject.go
index 9904c54d0..300d95ed5 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_subject/gen_property_activitystreams_subject.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_subject/gen_property_activitystreams_subject.go
@@ -25,10 +25,8 @@ type ActivityStreamsSubjectProperty struct {
 	activitystreamsArticleMember               vocab.ActivityStreamsArticle
 	activitystreamsAudioMember                 vocab.ActivityStreamsAudio
 	activitystreamsBlockMember                 vocab.ActivityStreamsBlock
-	forgefedBranchMember                       vocab.ForgeFedBranch
 	activitystreamsCollectionMember            vocab.ActivityStreamsCollection
 	activitystreamsCollectionPageMember        vocab.ActivityStreamsCollectionPage
-	forgefedCommitMember                       vocab.ForgeFedCommit
 	activitystreamsCreateMember                vocab.ActivityStreamsCreate
 	activitystreamsDeleteMember                vocab.ActivityStreamsDelete
 	activitystreamsDislikeMember               vocab.ActivityStreamsDislike
@@ -38,6 +36,7 @@ type ActivityStreamsSubjectProperty struct {
 	activitystreamsFlagMember                  vocab.ActivityStreamsFlag
 	activitystreamsFollowMember                vocab.ActivityStreamsFollow
 	activitystreamsGroupMember                 vocab.ActivityStreamsGroup
+	tootHashtagMember                          vocab.TootHashtag
 	tootIdentityProofMember                    vocab.TootIdentityProof
 	activitystreamsIgnoreMember                vocab.ActivityStreamsIgnore
 	activitystreamsImageMember                 vocab.ActivityStreamsImage
@@ -59,18 +58,14 @@ type ActivityStreamsSubjectProperty struct {
 	activitystreamsPlaceMember                 vocab.ActivityStreamsPlace
 	activitystreamsProfileMember               vocab.ActivityStreamsProfile
 	schemaPropertyValueMember                  vocab.SchemaPropertyValue
-	forgefedPushMember                         vocab.ForgeFedPush
 	activitystreamsQuestionMember              vocab.ActivityStreamsQuestion
 	activitystreamsReadMember                  vocab.ActivityStreamsRead
 	activitystreamsRejectMember                vocab.ActivityStreamsReject
 	activitystreamsRelationshipMember          vocab.ActivityStreamsRelationship
 	activitystreamsRemoveMember                vocab.ActivityStreamsRemove
-	forgefedRepositoryMember                   vocab.ForgeFedRepository
 	activitystreamsServiceMember               vocab.ActivityStreamsService
 	activitystreamsTentativeAcceptMember       vocab.ActivityStreamsTentativeAccept
 	activitystreamsTentativeRejectMember       vocab.ActivityStreamsTentativeReject
-	forgefedTicketMember                       vocab.ForgeFedTicket
-	forgefedTicketDependencyMember             vocab.ForgeFedTicketDependency
 	activitystreamsTombstoneMember             vocab.ActivityStreamsTombstone
 	activitystreamsTravelMember                vocab.ActivityStreamsTravel
 	activitystreamsUndoMember                  vocab.ActivityStreamsUndo
@@ -176,12 +171,6 @@ func DeserializeSubjectProperty(m map[string]interface{}, aliasMap map[string]st
 					alias:                      alias,
 				}
 				return this, nil
-			} else if v, err := mgr.DeserializeBranchForgeFed()(m, aliasMap); err == nil {
-				this := &ActivityStreamsSubjectProperty{
-					alias:                alias,
-					forgefedBranchMember: v,
-				}
-				return this, nil
 			} else if v, err := mgr.DeserializeCollectionActivityStreams()(m, aliasMap); err == nil {
 				this := &ActivityStreamsSubjectProperty{
 					activitystreamsCollectionMember: v,
@@ -194,12 +183,6 @@ func DeserializeSubjectProperty(m map[string]interface{}, aliasMap map[string]st
 					alias:                               alias,
 				}
 				return this, nil
-			} else if v, err := mgr.DeserializeCommitForgeFed()(m, aliasMap); err == nil {
-				this := &ActivityStreamsSubjectProperty{
-					alias:                alias,
-					forgefedCommitMember: v,
-				}
-				return this, nil
 			} else if v, err := mgr.DeserializeCreateActivityStreams()(m, aliasMap); err == nil {
 				this := &ActivityStreamsSubjectProperty{
 					activitystreamsCreateMember: v,
@@ -254,6 +237,12 @@ func DeserializeSubjectProperty(m map[string]interface{}, aliasMap map[string]st
 					alias:                      alias,
 				}
 				return this, nil
+			} else if v, err := mgr.DeserializeHashtagToot()(m, aliasMap); err == nil {
+				this := &ActivityStreamsSubjectProperty{
+					alias:             alias,
+					tootHashtagMember: v,
+				}
+				return this, nil
 			} else if v, err := mgr.DeserializeIdentityProofToot()(m, aliasMap); err == nil {
 				this := &ActivityStreamsSubjectProperty{
 					alias:                   alias,
@@ -380,12 +369,6 @@ func DeserializeSubjectProperty(m map[string]interface{}, aliasMap map[string]st
 					schemaPropertyValueMember: v,
 				}
 				return this, nil
-			} else if v, err := mgr.DeserializePushForgeFed()(m, aliasMap); err == nil {
-				this := &ActivityStreamsSubjectProperty{
-					alias:              alias,
-					forgefedPushMember: v,
-				}
-				return this, nil
 			} else if v, err := mgr.DeserializeQuestionActivityStreams()(m, aliasMap); err == nil {
 				this := &ActivityStreamsSubjectProperty{
 					activitystreamsQuestionMember: v,
@@ -416,12 +399,6 @@ func DeserializeSubjectProperty(m map[string]interface{}, aliasMap map[string]st
 					alias:                       alias,
 				}
 				return this, nil
-			} else if v, err := mgr.DeserializeRepositoryForgeFed()(m, aliasMap); err == nil {
-				this := &ActivityStreamsSubjectProperty{
-					alias:                    alias,
-					forgefedRepositoryMember: v,
-				}
-				return this, nil
 			} else if v, err := mgr.DeserializeServiceActivityStreams()(m, aliasMap); err == nil {
 				this := &ActivityStreamsSubjectProperty{
 					activitystreamsServiceMember: v,
@@ -440,18 +417,6 @@ func DeserializeSubjectProperty(m map[string]interface{}, aliasMap map[string]st
 					alias:                                alias,
 				}
 				return this, nil
-			} else if v, err := mgr.DeserializeTicketForgeFed()(m, aliasMap); err == nil {
-				this := &ActivityStreamsSubjectProperty{
-					alias:                alias,
-					forgefedTicketMember: v,
-				}
-				return this, nil
-			} else if v, err := mgr.DeserializeTicketDependencyForgeFed()(m, aliasMap); err == nil {
-				this := &ActivityStreamsSubjectProperty{
-					alias:                          alias,
-					forgefedTicketDependencyMember: v,
-				}
-				return this, nil
 			} else if v, err := mgr.DeserializeTombstoneActivityStreams()(m, aliasMap); err == nil {
 				this := &ActivityStreamsSubjectProperty{
 					activitystreamsTombstoneMember: v,
@@ -518,10 +483,8 @@ func (this *ActivityStreamsSubjectProperty) Clear() {
 	this.activitystreamsArticleMember = nil
 	this.activitystreamsAudioMember = nil
 	this.activitystreamsBlockMember = nil
-	this.forgefedBranchMember = nil
 	this.activitystreamsCollectionMember = nil
 	this.activitystreamsCollectionPageMember = nil
-	this.forgefedCommitMember = nil
 	this.activitystreamsCreateMember = nil
 	this.activitystreamsDeleteMember = nil
 	this.activitystreamsDislikeMember = nil
@@ -531,6 +494,7 @@ func (this *ActivityStreamsSubjectProperty) Clear() {
 	this.activitystreamsFlagMember = nil
 	this.activitystreamsFollowMember = nil
 	this.activitystreamsGroupMember = nil
+	this.tootHashtagMember = nil
 	this.tootIdentityProofMember = nil
 	this.activitystreamsIgnoreMember = nil
 	this.activitystreamsImageMember = nil
@@ -552,18 +516,14 @@ func (this *ActivityStreamsSubjectProperty) Clear() {
 	this.activitystreamsPlaceMember = nil
 	this.activitystreamsProfileMember = nil
 	this.schemaPropertyValueMember = nil
-	this.forgefedPushMember = nil
 	this.activitystreamsQuestionMember = nil
 	this.activitystreamsReadMember = nil
 	this.activitystreamsRejectMember = nil
 	this.activitystreamsRelationshipMember = nil
 	this.activitystreamsRemoveMember = nil
-	this.forgefedRepositoryMember = nil
 	this.activitystreamsServiceMember = nil
 	this.activitystreamsTentativeAcceptMember = nil
 	this.activitystreamsTentativeRejectMember = nil
-	this.forgefedTicketMember = nil
-	this.forgefedTicketDependencyMember = nil
 	this.activitystreamsTombstoneMember = nil
 	this.activitystreamsTravelMember = nil
 	this.activitystreamsUndoMember = nil
@@ -952,44 +912,6 @@ func (this ActivityStreamsSubjectProperty) GetActivityStreamsView() vocab.Activi
 	return this.activitystreamsViewMember
 }
 
-// GetForgeFedBranch returns the value of this property. When IsForgeFedBranch
-// returns false, GetForgeFedBranch will return an arbitrary value.
-func (this ActivityStreamsSubjectProperty) GetForgeFedBranch() vocab.ForgeFedBranch {
-	return this.forgefedBranchMember
-}
-
-// GetForgeFedCommit returns the value of this property. When IsForgeFedCommit
-// returns false, GetForgeFedCommit will return an arbitrary value.
-func (this ActivityStreamsSubjectProperty) GetForgeFedCommit() vocab.ForgeFedCommit {
-	return this.forgefedCommitMember
-}
-
-// GetForgeFedPush returns the value of this property. When IsForgeFedPush returns
-// false, GetForgeFedPush will return an arbitrary value.
-func (this ActivityStreamsSubjectProperty) GetForgeFedPush() vocab.ForgeFedPush {
-	return this.forgefedPushMember
-}
-
-// GetForgeFedRepository returns the value of this property. When
-// IsForgeFedRepository returns false, GetForgeFedRepository will return an
-// arbitrary value.
-func (this ActivityStreamsSubjectProperty) GetForgeFedRepository() vocab.ForgeFedRepository {
-	return this.forgefedRepositoryMember
-}
-
-// GetForgeFedTicket returns the value of this property. When IsForgeFedTicket
-// returns false, GetForgeFedTicket will return an arbitrary value.
-func (this ActivityStreamsSubjectProperty) GetForgeFedTicket() vocab.ForgeFedTicket {
-	return this.forgefedTicketMember
-}
-
-// GetForgeFedTicketDependency returns the value of this property. When
-// IsForgeFedTicketDependency returns false, GetForgeFedTicketDependency will
-// return an arbitrary value.
-func (this ActivityStreamsSubjectProperty) GetForgeFedTicketDependency() vocab.ForgeFedTicketDependency {
-	return this.forgefedTicketDependencyMember
-}
-
 // GetIRI returns the IRI of this property. When IsIRI returns false, GetIRI will
 // return an arbitrary value.
 func (this ActivityStreamsSubjectProperty) GetIRI() *url.URL {
@@ -1009,6 +931,12 @@ func (this ActivityStreamsSubjectProperty) GetTootEmoji() vocab.TootEmoji {
 	return this.tootEmojiMember
 }
 
+// GetTootHashtag returns the value of this property. When IsTootHashtag returns
+// false, GetTootHashtag will return an arbitrary value.
+func (this ActivityStreamsSubjectProperty) GetTootHashtag() vocab.TootHashtag {
+	return this.tootHashtagMember
+}
+
 // GetTootIdentityProof returns the value of this property. When
 // IsTootIdentityProof returns false, GetTootIdentityProof will return an
 // arbitrary value.
@@ -1052,18 +980,12 @@ func (this ActivityStreamsSubjectProperty) GetType() vocab.Type {
 	if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock()
 	}
-	if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch()
-	}
 	if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection()
 	}
 	if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage()
 	}
-	if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit()
-	}
 	if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate()
 	}
@@ -1091,6 +1013,9 @@ func (this ActivityStreamsSubjectProperty) GetType() vocab.Type {
 	if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup()
 	}
+	if this.IsTootHashtag() {
+		return this.GetTootHashtag()
+	}
 	if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof()
 	}
@@ -1154,9 +1079,6 @@ func (this ActivityStreamsSubjectProperty) GetType() vocab.Type {
 	if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue()
 	}
-	if this.IsForgeFedPush() {
-		return this.GetForgeFedPush()
-	}
 	if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion()
 	}
@@ -1172,9 +1094,6 @@ func (this ActivityStreamsSubjectProperty) GetType() vocab.Type {
 	if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove()
 	}
-	if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository()
-	}
 	if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService()
 	}
@@ -1184,12 +1103,6 @@ func (this ActivityStreamsSubjectProperty) GetType() vocab.Type {
 	if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject()
 	}
-	if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket()
-	}
-	if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency()
-	}
 	if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone()
 	}
@@ -1225,10 +1138,8 @@ func (this ActivityStreamsSubjectProperty) HasAny() bool {
 		this.IsActivityStreamsArticle() ||
 		this.IsActivityStreamsAudio() ||
 		this.IsActivityStreamsBlock() ||
-		this.IsForgeFedBranch() ||
 		this.IsActivityStreamsCollection() ||
 		this.IsActivityStreamsCollectionPage() ||
-		this.IsForgeFedCommit() ||
 		this.IsActivityStreamsCreate() ||
 		this.IsActivityStreamsDelete() ||
 		this.IsActivityStreamsDislike() ||
@@ -1238,6 +1149,7 @@ func (this ActivityStreamsSubjectProperty) HasAny() bool {
 		this.IsActivityStreamsFlag() ||
 		this.IsActivityStreamsFollow() ||
 		this.IsActivityStreamsGroup() ||
+		this.IsTootHashtag() ||
 		this.IsTootIdentityProof() ||
 		this.IsActivityStreamsIgnore() ||
 		this.IsActivityStreamsImage() ||
@@ -1259,18 +1171,14 @@ func (this ActivityStreamsSubjectProperty) HasAny() bool {
 		this.IsActivityStreamsPlace() ||
 		this.IsActivityStreamsProfile() ||
 		this.IsSchemaPropertyValue() ||
-		this.IsForgeFedPush() ||
 		this.IsActivityStreamsQuestion() ||
 		this.IsActivityStreamsRead() ||
 		this.IsActivityStreamsReject() ||
 		this.IsActivityStreamsRelationship() ||
 		this.IsActivityStreamsRemove() ||
-		this.IsForgeFedRepository() ||
 		this.IsActivityStreamsService() ||
 		this.IsActivityStreamsTentativeAccept() ||
 		this.IsActivityStreamsTentativeReject() ||
-		this.IsForgeFedTicket() ||
-		this.IsForgeFedTicketDependency() ||
 		this.IsActivityStreamsTombstone() ||
 		this.IsActivityStreamsTravel() ||
 		this.IsActivityStreamsUndo() ||
@@ -1663,48 +1571,6 @@ func (this ActivityStreamsSubjectProperty) IsActivityStreamsView() bool {
 	return this.activitystreamsViewMember != nil
 }
 
-// IsForgeFedBranch returns true if this property has a type of "Branch". When
-// true, use the GetForgeFedBranch and SetForgeFedBranch methods to access and
-// set this property.
-func (this ActivityStreamsSubjectProperty) IsForgeFedBranch() bool {
-	return this.forgefedBranchMember != nil
-}
-
-// IsForgeFedCommit returns true if this property has a type of "Commit". When
-// true, use the GetForgeFedCommit and SetForgeFedCommit methods to access and
-// set this property.
-func (this ActivityStreamsSubjectProperty) IsForgeFedCommit() bool {
-	return this.forgefedCommitMember != nil
-}
-
-// IsForgeFedPush returns true if this property has a type of "Push". When true,
-// use the GetForgeFedPush and SetForgeFedPush methods to access and set this
-// property.
-func (this ActivityStreamsSubjectProperty) IsForgeFedPush() bool {
-	return this.forgefedPushMember != nil
-}
-
-// IsForgeFedRepository returns true if this property has a type of "Repository".
-// When true, use the GetForgeFedRepository and SetForgeFedRepository methods
-// to access and set this property.
-func (this ActivityStreamsSubjectProperty) IsForgeFedRepository() bool {
-	return this.forgefedRepositoryMember != nil
-}
-
-// IsForgeFedTicket returns true if this property has a type of "Ticket". When
-// true, use the GetForgeFedTicket and SetForgeFedTicket methods to access and
-// set this property.
-func (this ActivityStreamsSubjectProperty) IsForgeFedTicket() bool {
-	return this.forgefedTicketMember != nil
-}
-
-// IsForgeFedTicketDependency returns true if this property has a type of
-// "TicketDependency". When true, use the GetForgeFedTicketDependency and
-// SetForgeFedTicketDependency methods to access and set this property.
-func (this ActivityStreamsSubjectProperty) IsForgeFedTicketDependency() bool {
-	return this.forgefedTicketDependencyMember != nil
-}
-
 // IsIRI returns true if this property is an IRI. When true, use GetIRI and SetIRI
 // to access and set this property
 func (this ActivityStreamsSubjectProperty) IsIRI() bool {
@@ -1724,6 +1590,13 @@ func (this ActivityStreamsSubjectProperty) IsTootEmoji() bool {
 	return this.tootEmojiMember != nil
 }
 
+// IsTootHashtag returns true if this property has a type of "Hashtag". When true,
+// use the GetTootHashtag and SetTootHashtag methods to access and set this
+// property.
+func (this ActivityStreamsSubjectProperty) IsTootHashtag() bool {
+	return this.tootHashtagMember != nil
+}
+
 // IsTootIdentityProof returns true if this property has a type of
 // "IdentityProof". When true, use the GetTootIdentityProof and
 // SetTootIdentityProof methods to access and set this property.
@@ -1759,14 +1632,10 @@ func (this ActivityStreamsSubjectProperty) JSONLDContext() map[string]string {
 		child = this.GetActivityStreamsAudio().JSONLDContext()
 	} else if this.IsActivityStreamsBlock() {
 		child = this.GetActivityStreamsBlock().JSONLDContext()
-	} else if this.IsForgeFedBranch() {
-		child = this.GetForgeFedBranch().JSONLDContext()
 	} else if this.IsActivityStreamsCollection() {
 		child = this.GetActivityStreamsCollection().JSONLDContext()
 	} else if this.IsActivityStreamsCollectionPage() {
 		child = this.GetActivityStreamsCollectionPage().JSONLDContext()
-	} else if this.IsForgeFedCommit() {
-		child = this.GetForgeFedCommit().JSONLDContext()
 	} else if this.IsActivityStreamsCreate() {
 		child = this.GetActivityStreamsCreate().JSONLDContext()
 	} else if this.IsActivityStreamsDelete() {
@@ -1785,6 +1654,8 @@ func (this ActivityStreamsSubjectProperty) JSONLDContext() map[string]string {
 		child = this.GetActivityStreamsFollow().JSONLDContext()
 	} else if this.IsActivityStreamsGroup() {
 		child = this.GetActivityStreamsGroup().JSONLDContext()
+	} else if this.IsTootHashtag() {
+		child = this.GetTootHashtag().JSONLDContext()
 	} else if this.IsTootIdentityProof() {
 		child = this.GetTootIdentityProof().JSONLDContext()
 	} else if this.IsActivityStreamsIgnore() {
@@ -1827,8 +1698,6 @@ func (this ActivityStreamsSubjectProperty) JSONLDContext() map[string]string {
 		child = this.GetActivityStreamsProfile().JSONLDContext()
 	} else if this.IsSchemaPropertyValue() {
 		child = this.GetSchemaPropertyValue().JSONLDContext()
-	} else if this.IsForgeFedPush() {
-		child = this.GetForgeFedPush().JSONLDContext()
 	} else if this.IsActivityStreamsQuestion() {
 		child = this.GetActivityStreamsQuestion().JSONLDContext()
 	} else if this.IsActivityStreamsRead() {
@@ -1839,18 +1708,12 @@ func (this ActivityStreamsSubjectProperty) JSONLDContext() map[string]string {
 		child = this.GetActivityStreamsRelationship().JSONLDContext()
 	} else if this.IsActivityStreamsRemove() {
 		child = this.GetActivityStreamsRemove().JSONLDContext()
-	} else if this.IsForgeFedRepository() {
-		child = this.GetForgeFedRepository().JSONLDContext()
 	} else if this.IsActivityStreamsService() {
 		child = this.GetActivityStreamsService().JSONLDContext()
 	} else if this.IsActivityStreamsTentativeAccept() {
 		child = this.GetActivityStreamsTentativeAccept().JSONLDContext()
 	} else if this.IsActivityStreamsTentativeReject() {
 		child = this.GetActivityStreamsTentativeReject().JSONLDContext()
-	} else if this.IsForgeFedTicket() {
-		child = this.GetForgeFedTicket().JSONLDContext()
-	} else if this.IsForgeFedTicketDependency() {
-		child = this.GetForgeFedTicketDependency().JSONLDContext()
 	} else if this.IsActivityStreamsTombstone() {
 		child = this.GetActivityStreamsTombstone().JSONLDContext()
 	} else if this.IsActivityStreamsTravel() {
@@ -1912,161 +1775,146 @@ func (this ActivityStreamsSubjectProperty) KindIndex() int {
 	if this.IsActivityStreamsBlock() {
 		return 10
 	}
-	if this.IsForgeFedBranch() {
+	if this.IsActivityStreamsCollection() {
 		return 11
 	}
-	if this.IsActivityStreamsCollection() {
+	if this.IsActivityStreamsCollectionPage() {
 		return 12
 	}
-	if this.IsActivityStreamsCollectionPage() {
+	if this.IsActivityStreamsCreate() {
 		return 13
 	}
-	if this.IsForgeFedCommit() {
+	if this.IsActivityStreamsDelete() {
 		return 14
 	}
-	if this.IsActivityStreamsCreate() {
+	if this.IsActivityStreamsDislike() {
 		return 15
 	}
-	if this.IsActivityStreamsDelete() {
+	if this.IsActivityStreamsDocument() {
 		return 16
 	}
-	if this.IsActivityStreamsDislike() {
+	if this.IsTootEmoji() {
 		return 17
 	}
-	if this.IsActivityStreamsDocument() {
+	if this.IsActivityStreamsEvent() {
 		return 18
 	}
-	if this.IsTootEmoji() {
+	if this.IsActivityStreamsFlag() {
 		return 19
 	}
-	if this.IsActivityStreamsEvent() {
+	if this.IsActivityStreamsFollow() {
 		return 20
 	}
-	if this.IsActivityStreamsFlag() {
+	if this.IsActivityStreamsGroup() {
 		return 21
 	}
-	if this.IsActivityStreamsFollow() {
+	if this.IsTootHashtag() {
 		return 22
 	}
-	if this.IsActivityStreamsGroup() {
-		return 23
-	}
 	if this.IsTootIdentityProof() {
-		return 24
+		return 23
 	}
 	if this.IsActivityStreamsIgnore() {
-		return 25
+		return 24
 	}
 	if this.IsActivityStreamsImage() {
-		return 26
+		return 25
 	}
 	if this.IsActivityStreamsIntransitiveActivity() {
-		return 27
+		return 26
 	}
 	if this.IsActivityStreamsInvite() {
-		return 28
+		return 27
 	}
 	if this.IsActivityStreamsJoin() {
-		return 29
+		return 28
 	}
 	if this.IsActivityStreamsLeave() {
-		return 30
+		return 29
 	}
 	if this.IsActivityStreamsLike() {
-		return 31
+		return 30
 	}
 	if this.IsActivityStreamsListen() {
-		return 32
+		return 31
 	}
 	if this.IsActivityStreamsMention() {
-		return 33
+		return 32
 	}
 	if this.IsActivityStreamsMove() {
-		return 34
+		return 33
 	}
 	if this.IsActivityStreamsNote() {
-		return 35
+		return 34
 	}
 	if this.IsActivityStreamsOffer() {
-		return 36
+		return 35
 	}
 	if this.IsActivityStreamsOrderedCollection() {
-		return 37
+		return 36
 	}
 	if this.IsActivityStreamsOrderedCollectionPage() {
-		return 38
+		return 37
 	}
 	if this.IsActivityStreamsOrganization() {
-		return 39
+		return 38
 	}
 	if this.IsActivityStreamsPage() {
-		return 40
+		return 39
 	}
 	if this.IsActivityStreamsPerson() {
-		return 41
+		return 40
 	}
 	if this.IsActivityStreamsPlace() {
-		return 42
+		return 41
 	}
 	if this.IsActivityStreamsProfile() {
-		return 43
+		return 42
 	}
 	if this.IsSchemaPropertyValue() {
-		return 44
-	}
-	if this.IsForgeFedPush() {
-		return 45
+		return 43
 	}
 	if this.IsActivityStreamsQuestion() {
-		return 46
+		return 44
 	}
 	if this.IsActivityStreamsRead() {
-		return 47
+		return 45
 	}
 	if this.IsActivityStreamsReject() {
-		return 48
+		return 46
 	}
 	if this.IsActivityStreamsRelationship() {
-		return 49
+		return 47
 	}
 	if this.IsActivityStreamsRemove() {
-		return 50
-	}
-	if this.IsForgeFedRepository() {
-		return 51
+		return 48
 	}
 	if this.IsActivityStreamsService() {
-		return 52
+		return 49
 	}
 	if this.IsActivityStreamsTentativeAccept() {
-		return 53
+		return 50
 	}
 	if this.IsActivityStreamsTentativeReject() {
-		return 54
-	}
-	if this.IsForgeFedTicket() {
-		return 55
-	}
-	if this.IsForgeFedTicketDependency() {
-		return 56
+		return 51
 	}
 	if this.IsActivityStreamsTombstone() {
-		return 57
+		return 52
 	}
 	if this.IsActivityStreamsTravel() {
-		return 58
+		return 53
 	}
 	if this.IsActivityStreamsUndo() {
-		return 59
+		return 54
 	}
 	if this.IsActivityStreamsUpdate() {
-		return 60
+		return 55
 	}
 	if this.IsActivityStreamsVideo() {
-		return 61
+		return 56
 	}
 	if this.IsActivityStreamsView() {
-		return 62
+		return 57
 	}
 	if this.IsIRI() {
 		return -2
@@ -2107,14 +1955,10 @@ func (this ActivityStreamsSubjectProperty) LessThan(o vocab.ActivityStreamsSubje
 		return this.GetActivityStreamsAudio().LessThan(o.GetActivityStreamsAudio())
 	} else if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock().LessThan(o.GetActivityStreamsBlock())
-	} else if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch().LessThan(o.GetForgeFedBranch())
 	} else if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection().LessThan(o.GetActivityStreamsCollection())
 	} else if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage().LessThan(o.GetActivityStreamsCollectionPage())
-	} else if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit().LessThan(o.GetForgeFedCommit())
 	} else if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate().LessThan(o.GetActivityStreamsCreate())
 	} else if this.IsActivityStreamsDelete() {
@@ -2133,6 +1977,8 @@ func (this ActivityStreamsSubjectProperty) LessThan(o vocab.ActivityStreamsSubje
 		return this.GetActivityStreamsFollow().LessThan(o.GetActivityStreamsFollow())
 	} else if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup().LessThan(o.GetActivityStreamsGroup())
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().LessThan(o.GetTootHashtag())
 	} else if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof().LessThan(o.GetTootIdentityProof())
 	} else if this.IsActivityStreamsIgnore() {
@@ -2175,8 +2021,6 @@ func (this ActivityStreamsSubjectProperty) LessThan(o vocab.ActivityStreamsSubje
 		return this.GetActivityStreamsProfile().LessThan(o.GetActivityStreamsProfile())
 	} else if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue().LessThan(o.GetSchemaPropertyValue())
-	} else if this.IsForgeFedPush() {
-		return this.GetForgeFedPush().LessThan(o.GetForgeFedPush())
 	} else if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion().LessThan(o.GetActivityStreamsQuestion())
 	} else if this.IsActivityStreamsRead() {
@@ -2187,18 +2031,12 @@ func (this ActivityStreamsSubjectProperty) LessThan(o vocab.ActivityStreamsSubje
 		return this.GetActivityStreamsRelationship().LessThan(o.GetActivityStreamsRelationship())
 	} else if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove().LessThan(o.GetActivityStreamsRemove())
-	} else if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository().LessThan(o.GetForgeFedRepository())
 	} else if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService().LessThan(o.GetActivityStreamsService())
 	} else if this.IsActivityStreamsTentativeAccept() {
 		return this.GetActivityStreamsTentativeAccept().LessThan(o.GetActivityStreamsTentativeAccept())
 	} else if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject().LessThan(o.GetActivityStreamsTentativeReject())
-	} else if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket().LessThan(o.GetForgeFedTicket())
-	} else if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency().LessThan(o.GetForgeFedTicketDependency())
 	} else if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone().LessThan(o.GetActivityStreamsTombstone())
 	} else if this.IsActivityStreamsTravel() {
@@ -2253,14 +2091,10 @@ func (this ActivityStreamsSubjectProperty) Serialize() (interface{}, error) {
 		return this.GetActivityStreamsAudio().Serialize()
 	} else if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock().Serialize()
-	} else if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch().Serialize()
 	} else if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection().Serialize()
 	} else if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage().Serialize()
-	} else if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit().Serialize()
 	} else if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate().Serialize()
 	} else if this.IsActivityStreamsDelete() {
@@ -2279,6 +2113,8 @@ func (this ActivityStreamsSubjectProperty) Serialize() (interface{}, error) {
 		return this.GetActivityStreamsFollow().Serialize()
 	} else if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup().Serialize()
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().Serialize()
 	} else if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof().Serialize()
 	} else if this.IsActivityStreamsIgnore() {
@@ -2321,8 +2157,6 @@ func (this ActivityStreamsSubjectProperty) Serialize() (interface{}, error) {
 		return this.GetActivityStreamsProfile().Serialize()
 	} else if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue().Serialize()
-	} else if this.IsForgeFedPush() {
-		return this.GetForgeFedPush().Serialize()
 	} else if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion().Serialize()
 	} else if this.IsActivityStreamsRead() {
@@ -2333,18 +2167,12 @@ func (this ActivityStreamsSubjectProperty) Serialize() (interface{}, error) {
 		return this.GetActivityStreamsRelationship().Serialize()
 	} else if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove().Serialize()
-	} else if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository().Serialize()
 	} else if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService().Serialize()
 	} else if this.IsActivityStreamsTentativeAccept() {
 		return this.GetActivityStreamsTentativeAccept().Serialize()
 	} else if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject().Serialize()
-	} else if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket().Serialize()
-	} else if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency().Serialize()
 	} else if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone().Serialize()
 	} else if this.IsActivityStreamsTravel() {
@@ -2741,48 +2569,6 @@ func (this *ActivityStreamsSubjectProperty) SetActivityStreamsView(v vocab.Activ
 	this.activitystreamsViewMember = v
 }
 
-// SetForgeFedBranch sets the value of this property. Calling IsForgeFedBranch
-// afterwards returns true.
-func (this *ActivityStreamsSubjectProperty) SetForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.Clear()
-	this.forgefedBranchMember = v
-}
-
-// SetForgeFedCommit sets the value of this property. Calling IsForgeFedCommit
-// afterwards returns true.
-func (this *ActivityStreamsSubjectProperty) SetForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.Clear()
-	this.forgefedCommitMember = v
-}
-
-// SetForgeFedPush sets the value of this property. Calling IsForgeFedPush
-// afterwards returns true.
-func (this *ActivityStreamsSubjectProperty) SetForgeFedPush(v vocab.ForgeFedPush) {
-	this.Clear()
-	this.forgefedPushMember = v
-}
-
-// SetForgeFedRepository sets the value of this property. Calling
-// IsForgeFedRepository afterwards returns true.
-func (this *ActivityStreamsSubjectProperty) SetForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.Clear()
-	this.forgefedRepositoryMember = v
-}
-
-// SetForgeFedTicket sets the value of this property. Calling IsForgeFedTicket
-// afterwards returns true.
-func (this *ActivityStreamsSubjectProperty) SetForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.Clear()
-	this.forgefedTicketMember = v
-}
-
-// SetForgeFedTicketDependency sets the value of this property. Calling
-// IsForgeFedTicketDependency afterwards returns true.
-func (this *ActivityStreamsSubjectProperty) SetForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.Clear()
-	this.forgefedTicketDependencyMember = v
-}
-
 // SetIRI sets the value of this property. Calling IsIRI afterwards returns true.
 func (this *ActivityStreamsSubjectProperty) SetIRI(v *url.URL) {
 	this.Clear()
@@ -2803,6 +2589,13 @@ func (this *ActivityStreamsSubjectProperty) SetTootEmoji(v vocab.TootEmoji) {
 	this.tootEmojiMember = v
 }
 
+// SetTootHashtag sets the value of this property. Calling IsTootHashtag
+// afterwards returns true.
+func (this *ActivityStreamsSubjectProperty) SetTootHashtag(v vocab.TootHashtag) {
+	this.Clear()
+	this.tootHashtagMember = v
+}
+
 // SetTootIdentityProof sets the value of this property. Calling
 // IsTootIdentityProof afterwards returns true.
 func (this *ActivityStreamsSubjectProperty) SetTootIdentityProof(v vocab.TootIdentityProof) {
@@ -2857,10 +2650,6 @@ func (this *ActivityStreamsSubjectProperty) SetType(t vocab.Type) error {
 		this.SetActivityStreamsBlock(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedBranch); ok {
-		this.SetForgeFedBranch(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsCollection); ok {
 		this.SetActivityStreamsCollection(v)
 		return nil
@@ -2869,10 +2658,6 @@ func (this *ActivityStreamsSubjectProperty) SetType(t vocab.Type) error {
 		this.SetActivityStreamsCollectionPage(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedCommit); ok {
-		this.SetForgeFedCommit(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsCreate); ok {
 		this.SetActivityStreamsCreate(v)
 		return nil
@@ -2909,6 +2694,10 @@ func (this *ActivityStreamsSubjectProperty) SetType(t vocab.Type) error {
 		this.SetActivityStreamsGroup(v)
 		return nil
 	}
+	if v, ok := t.(vocab.TootHashtag); ok {
+		this.SetTootHashtag(v)
+		return nil
+	}
 	if v, ok := t.(vocab.TootIdentityProof); ok {
 		this.SetTootIdentityProof(v)
 		return nil
@@ -2993,10 +2782,6 @@ func (this *ActivityStreamsSubjectProperty) SetType(t vocab.Type) error {
 		this.SetSchemaPropertyValue(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedPush); ok {
-		this.SetForgeFedPush(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsQuestion); ok {
 		this.SetActivityStreamsQuestion(v)
 		return nil
@@ -3017,10 +2802,6 @@ func (this *ActivityStreamsSubjectProperty) SetType(t vocab.Type) error {
 		this.SetActivityStreamsRemove(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedRepository); ok {
-		this.SetForgeFedRepository(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsService); ok {
 		this.SetActivityStreamsService(v)
 		return nil
@@ -3033,14 +2814,6 @@ func (this *ActivityStreamsSubjectProperty) SetType(t vocab.Type) error {
 		this.SetActivityStreamsTentativeReject(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedTicket); ok {
-		this.SetForgeFedTicket(v)
-		return nil
-	}
-	if v, ok := t.(vocab.ForgeFedTicketDependency); ok {
-		this.SetForgeFedTicketDependency(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsTombstone); ok {
 		this.SetActivityStreamsTombstone(v)
 		return nil