Take control over your live stream video by running it yourself. Streaming + chat out of the box.
HTML activitypubbroadcastingchatdecentralizedfederationfediversegolanghacktoberfesthlslivelivestreamowncastrtmpself-hostedstreaming-videovideo
Replace our go-fed activity fork with the superseriousbusiness fork (#4993)
Gabe Kangasec7bf4232dee
diff --git a/.github/workflows/activitypub-tests.yaml b/.github/workflows/activitypub-tests.yamlindex dc92285a36..a2c9b36072 100644--- a/.github/workflows/activitypub-tests.yaml+++ b/.github/workflows/activitypub-tests.yaml@@ -5,24 +5,28 @@ on:branches:- developpaths:- - "activitypub/**"- - "core/chat/**"+ - "services/activitypub/**"+ - "services/chat/**"- "config/**"- "main.go"+ - "go.mod"+ - "go.sum"- "webserver/**"- "auth/**"- - "persistence/userrepository/**"+ - "persistence/**"- "test/automated/activitypub/**"- ".github/workflows/activitypub-tests.yaml"pull_request:paths:- - "activitypub/**"- - "core/chat/**"+ - "services/activitypub/**"+ - "services/chat/**"- "config/**"- "main.go"+ - "go.mod"+ - "go.sum"- "webserver/**"- "auth/**"- - "persistence/userrepository/**"+ - "persistence/**"- "test/automated/activitypub/**"- ".github/workflows/activitypub-tests.yaml"diff --git a/go.mod b/go.modindex 4a46ed186c..6d3412aaea 100644--- a/go.mod+++ b/go.mod@@ -3,6 +3,7 @@ module github.com/owncast/owncastgo 1.26.2require (+ code.superseriousbusiness.org/activity v1.19.0github.com/CAFxX/httpcompression v0.0.9github.com/SherClockHolmes/webpush-go v1.4.0github.com/TwiN/go-away v1.8.1@@ -12,7 +13,6 @@ require (github.com/aws/aws-sdk-go-v2/service/s3 v1.103.3github.com/extism/go-sdk v1.7.1github.com/go-chi/chi/v5 v5.2.4- github.com/go-fed/activity v1.0.1-0.20220119073622-b14b50eecad0github.com/go-fed/httpsig v1.1.0github.com/gobwas/glob v0.2.3github.com/gorilla/websocket v1.5.3@@ -96,5 +96,3 @@ require (google.golang.org/protobuf v1.36.11 // indirectgopkg.in/yaml.v3 v3.0.1 // indirect)--replace github.com/go-fed/activity => github.com/owncast/activity v1.0.1-0.20260122170223-675f6eb53e71diff --git a/go.sum b/go.sumindex 5068235550..80b2dc1d3f 100644--- a/go.sum+++ b/go.sum@@ -1,3 +1,5 @@+code.superseriousbusiness.org/activity v1.19.0 h1:3WeE2+x5ZN4PQ3hF0YfxbnfJcD2uG8XAGIw3dc66CM0=+code.superseriousbusiness.org/activity v1.19.0/go.mod h1:BTMWJIAuwDH1w+ieRP5N+T5LipbXjw35U6KZy0V/xdg=github.com/CAFxX/httpcompression v0.0.9 h1:0ue2X8dOLEpxTm8tt+OdHcgA+gbDge0OqFQWGKSqgrg=github.com/CAFxX/httpcompression v0.0.9/go.mod h1:XX8oPZA+4IDcfZ0A71Hz0mZsv/YJOgYygkFhizVPilM=github.com/RaveNoX/go-jsoncommentstrip v1.0.0/go.mod h1:78ihd09MekBnJnxpICcwzCMzGrKSKYe4AqU6PDYYpjk=@@ -43,7 +45,6 @@ github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rgithub.com/bmatcuk/doublestar v1.1.1/go.mod h1:UD6OnuiIn0yFxxA2le/rnRU1G4RaI4UvFv1sNto9p6w=github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=-github.com/dave/jennifer v1.3.0/go.mod h1:fIb+770HOpJ2fmN9EPPKOqm1vMGhB+TwXKMZhrIygKg=github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=@@ -59,18 +60,16 @@ github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM=github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE=github.com/go-chi/chi/v5 v5.2.4 h1:WtFKPHwlywe8Srng8j2BhOD9312j9cGUxG1SP4V2cR4=github.com/go-chi/chi/v5 v5.2.4/go.mod h1:X7Gx4mteadT3eDOMTsXzmI4/rwUpOwBHLpAfupzFJP0=-github.com/go-fed/httpsig v0.1.1-0.20190914113940-c2de3672e5b5/go.mod h1:T56HUNYZUQ1AGUzhAYPugZfp36sKApVnGBgKlIY+aIE=github.com/go-fed/httpsig v1.1.0 h1:9M+hb0jkEICD8/cAiNqEB66R87tTINszBRTjwjQzWcI=github.com/go-fed/httpsig v1.1.0/go.mod h1:RCMrTZvN1bJYtofsG4rd5NaO5obxQ5xBkdiS7xsT7bM=github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=-github.com/go-test/deep v1.0.1 h1:UQhStjbkDClarlmv0am7OXXO4/GaPdCGiUiMTvi28sg=-github.com/go-test/deep v1.0.1/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=+github.com/go-test/deep v1.0.8 h1:TDsG77qcSprGbC6vTN8OuXp5g+J+b5Pcguhf7Zt61VM=+github.com/go-test/deep v1.0.8/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE=github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk=github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=-github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=github.com/google/brotli/go/cbrotli v0.0.0-20230829110029-ed738e842d2f h1:jopqB+UTSdJGEJT8tEqYyE29zN91fi2827oLET8tl7k=github.com/google/brotli/go/cbrotli v0.0.0-20230829110029-ed738e842d2f/go.mod h1:nOPhAkwVliJdNTkj3gXpljmWhjc4wCaVqbMJcPKWP4s=github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=@@ -93,8 +92,6 @@ github.com/hashicorp/go-retryablehttp v0.7.8 h1:ylXZWnqa7Lhqpk0L1P1LzDtGcCR0rPVUgithub.com/hashicorp/go-retryablehttp v0.7.8/go.mod h1:rjiScheydd+CxvumBsIrFKlx3iS0jrZ7LvzFGFmuKbw=github.com/ianlancetaylor/demangle v0.0.0-20240805132620-81f5be970eca h1:T54Ema1DU8ngI+aef9ZhAhNGQhcRTrWxVeG07F+c/Rw=github.com/ianlancetaylor/demangle v0.0.0-20240805132620-81f5be970eca/go.mod h1:gx7rwoVhcfuVKG5uya9Hs3Sxj7EIvldVofAWIUtGouw=-github.com/jellydator/ttlcache/v3 v3.4.0 h1:YS4P125qQS0tNhtL6aeYkheEaB/m8HCqdMMP4mnWdTY=-github.com/jellydator/ttlcache/v3 v3.4.0/go.mod h1:Hw9EgjymziQD3yGsQdf1FqFdpp7YjFMd4Srg5EJlgD4=github.com/jellydator/ttlcache/v3 v3.4.1 h1:bOdXmXiycyK6E6Qjyuj5vl+/vU3SCOoDs8a86NbHjAQ=github.com/jellydator/ttlcache/v3 v3.4.1/go.mod h1:j7LO12PNghFg5+0v9budMAT4rDK4JY969jb9vOdOBBk=github.com/jonboulle/clockwork v0.5.0 h1:Hyh9A8u51kptdkR+cqRpT1EebBwTn1oK9YfGYbdFz6I=@@ -123,8 +120,6 @@ github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stggithub.com/mattn/go-isatty v0.0.21 h1:xYae+lCNBP7QuW4PUnNG61ffM4hVIfm+zUzDuSzYLGs=github.com/mattn/go-isatty v0.0.21/go.mod h1:ZXfXG4SQHsB/w3ZeOYbR0PrPwLy+n6xiMrJlRFqopa4=github.com/mattn/go-sqlite3 v1.14.7/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=-github.com/mattn/go-sqlite3 v1.14.45 h1:6KA/spDguL3KV8rnybG7ezSaE4SeMR3KC9VbUoAQaIk=-github.com/mattn/go-sqlite3 v1.14.45/go.mod h1:pjEuOr8IwzLJP2MfGeTb0A35jauH+C2kbHKBr7yXKVQ=github.com/mattn/go-sqlite3 v1.14.47 h1:jOBI62gS7nKeZv+as1oGEy0+1qISgXwH/QBlR6KbfIo=github.com/mattn/go-sqlite3 v1.14.47/go.mod h1:6JTjA44L93a0QCyJef5YvlPoKXntQPjzWv5gtm9sB6w=github.com/mfridman/interpolate v0.0.2 h1:pnuTK7MQIxxFz1Gr+rjSIx9u7qVjf5VOoM/u6BbAxPY=@@ -143,16 +138,12 @@ github.com/ncruces/go-strftime v1.0.0 h1:HMFp8mLCTPp341M/ZnA4qaf7ZlsbTc+miZjCLOFgithub.com/ncruces/go-strftime v1.0.0/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls=github.com/oapi-codegen/nullable v1.1.0 h1:eAh8JVc5430VtYVnq00Hrbpag9PFRGWLjxR1/3KntMs=github.com/oapi-codegen/nullable v1.1.0/go.mod h1:KUZ3vUzkmEKY90ksAmit2+5juDIhIZhfDl+0PwOQlFY=-github.com/oapi-codegen/runtime v1.4.1 h1:9nwLoI+KrWxzbBcp0jO/R8uXqbik/HUyCvPeU68Y/qo=-github.com/oapi-codegen/runtime v1.4.1/go.mod h1:GwV7hC2hviaMzj+ITfHVRESK5J2W/GefVwIND/bMGvU=github.com/oapi-codegen/runtime v1.4.2 h1:GMxFVYLzoYLua+/KvzgSphkyK1lLTReQI9Vf4hvATKE=github.com/oapi-codegen/runtime v1.4.2/go.mod h1:GwV7hC2hviaMzj+ITfHVRESK5J2W/GefVwIND/bMGvU=github.com/oschwald/geoip2-golang v1.13.0 h1:Q44/Ldc703pasJeP5V9+aFSZFmBN7DKHbNsSFzQATJI=github.com/oschwald/geoip2-golang v1.13.0/go.mod h1:P9zG+54KPEFOliZ29i7SeYZ/GM6tfEL+rgSn03hYuUo=github.com/oschwald/maxminddb-golang v1.13.0 h1:R8xBorY71s84yO06NgTmQvqvTvlS/bnYZrrWX1MElnU=github.com/oschwald/maxminddb-golang v1.13.0/go.mod h1:BU0z8BfFVhi1LQaonTwwGQlsHUEu9pWNdMfmq4ztm0o=-github.com/owncast/activity v1.0.1-0.20260122170223-675f6eb53e71 h1:dJ6DdVqcZjz0P7UIKPCARucmyIGNXiL7BxNfg1Ul8Gs=-github.com/owncast/activity v1.0.1-0.20260122170223-675f6eb53e71/go.mod h1:v4QoPaAzjWZ8zN2VFVGL5ep9C02mst0hQYHUpQwso4Q=github.com/pierrec/lz4/v4 v4.1.18/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=github.com/pierrec/lz4/v4 v4.1.26 h1:GrpZw1gZttORinvzBdXPUXATeqlJjqUG/D87TKMnhjY=github.com/pierrec/lz4/v4 v4.1.26/go.mod h1:EoQMVJgeeEOMsCqCzqFm2O0cJvljX2nGZjcRIPL34O4=@@ -229,7 +220,6 @@ go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI=go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU=-golang.org/x/crypto v0.0.0-20180527072434-ab813273cd59/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=@@ -267,7 +257,6 @@ golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=golang.org/x/sync v0.21.0 h1:HLII4xRRTtCRkxYp4HNFF0Js/Og6q2i++KXbg0gHCwM=golang.org/x/sync v0.21.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=-golang.org/x/sys v0.0.0-20180525142821-c11f84a56e43/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=diff --git a/renovate.json b/renovate.jsonindex 100556941a..949f17bdd3 100644--- a/renovate.json+++ b/renovate.json@@ -52,7 +52,6 @@"@videojs/themes","@joeattardi/emoji-button","preact",- "github.com/go-fed/activity","go"],"enabled": falsediff --git a/services/activitypub/apmodels/activity.go b/services/activitypub/apmodels/activity.goindex 71547b8c8b..0a7760c434 100644--- a/services/activitypub/apmodels/activity.go+++ b/services/activitypub/apmodels/activity.go@@ -4,8 +4,8 @@ import ("net/url""time"- "github.com/go-fed/activity/streams"- "github.com/go-fed/activity/streams/vocab"+ "code.superseriousbusiness.org/activity/streams"+ "code.superseriousbusiness.org/activity/streams/vocab")// PrivacyAudience represents the audience for an activity.diff --git a/services/activitypub/apmodels/actor.go b/services/activitypub/apmodels/actor.goindex 9788b7ba38..1e5b17c775 100644--- a/services/activitypub/apmodels/actor.go+++ b/services/activitypub/apmodels/actor.go@@ -6,8 +6,8 @@ import ("net/url""time"- "github.com/go-fed/activity/streams"- "github.com/go-fed/activity/streams/vocab"+ "code.superseriousbusiness.org/activity/streams"+ "code.superseriousbusiness.org/activity/streams/vocab"log "github.com/sirupsen/logrus""github.com/owncast/owncast/models"@@ -155,11 +155,16 @@ func getNameFromEntity(entity ExternalEntity) string {// getSharedInboxFromEntity extracts the optional shared inbox URL from an entity.func getSharedInboxFromEntity(entity ExternalEntity) *url.URL {endpointsProp := entity.GetActivityStreamsEndpoints()- if endpointsProp == nil || !endpointsProp.IsActivityStreamsEndpoints() {+ if endpointsProp == nil || endpointsProp.Empty() {return nil}- endpoints := endpointsProp.Get()+ iter := endpointsProp.At(0)+ if !iter.IsActivityStreamsEndpoints() {+ return nil+ }++ endpoints := iter.Get()if endpoints == nil {return nil}diff --git a/services/activitypub/apmodels/actor_test.go b/services/activitypub/apmodels/actor_test.goindex 75c780d483..8580923049 100644--- a/services/activitypub/apmodels/actor_test.go+++ b/services/activitypub/apmodels/actor_test.go@@ -1,6 +1,7 @@package apmodelsimport (+ "context""encoding/json""errors""io/ioutil"@@ -8,8 +9,8 @@ import ("os""testing"- "github.com/go-fed/activity/streams"- "github.com/go-fed/activity/streams/vocab"+ "code.superseriousbusiness.org/activity/streams"+ "code.superseriousbusiness.org/activity/streams/vocab""github.com/owncast/owncast/persistence/configrepository""github.com/owncast/owncast/services/activitypub/crypto"@@ -683,3 +684,86 @@ func TestSafeAccessorsWithOptionalNilFields(t *testing.T) {t.Error("Actor with ActorIri and Inbox should be valid even with nil optional fields")}}++// Tests for shared inbox extraction (getSharedInboxFromEntity via+// NewActivityPubActorFromEntity). Entities are resolved from raw actor JSON+// the same way inbound remote actors are, so these cover the wire-parse path.++// makeRemoteActorJSON returns a minimal Mastodon-style Person document.+// endpointsFragment is inserted verbatim after the publicKey (e.g.+// `,"endpoints": {"sharedInbox": "..."}`) or left empty to omit the property.+func makeRemoteActorJSON(endpointsFragment string) string {+ return `{+ "@context": ["https://www.w3.org/ns/activitystreams", "https://w3id.org/security/v1"],+ "type": "Person",+ "id": "https://remote.example/users/alice",+ "inbox": "https://remote.example/users/alice/inbox",+ "preferredUsername": "alice",+ "publicKey": {+ "id": "https://remote.example/users/alice#main-key",+ "owner": "https://remote.example/users/alice",+ "publicKeyPem": "-----BEGIN PUBLIC KEY-----\nfake\n-----END PUBLIC KEY-----\n"+ }` + endpointsFragment + `+ }`+}++func TestNewActivityPubActorFromEntitySharedInbox(t *testing.T) {+ tests := []struct {+ name string+ actorJSON string+ wantSharedInbox string+ }{+ {+ name: "endpoints with sharedInbox",+ actorJSON: makeRemoteActorJSON(`,"endpoints": {"sharedInbox": "https://remote.example/inbox"}`),+ wantSharedInbox: "https://remote.example/inbox",+ },+ {+ name: "no endpoints property",+ actorJSON: makeRemoteActorJSON(""),+ wantSharedInbox: "",+ },+ {+ name: "endpoints present but empty",+ actorJSON: makeRemoteActorJSON(`,"endpoints": {}`),+ wantSharedInbox: "",+ },+ {+ name: "endpoints is an IRI string",+ actorJSON: makeRemoteActorJSON(`,"endpoints": "https://remote.example/endpoints"`),+ wantSharedInbox: "",+ },+ }++ for _, tc := range tests {+ t.Run(tc.name, func(t *testing.T) {+ var jsonMap map[string]interface{}+ if err := json.Unmarshal([]byte(tc.actorJSON), &jsonMap); err != nil {+ t.Fatalf("failed to unmarshal actor JSON: %v", err)+ }++ entityType, err := streams.ToType(context.Background(), jsonMap)+ if err != nil {+ t.Fatalf("streams.ToType failed to resolve actor JSON: %v", err)+ }++ entity, ok := entityType.(ExternalEntity)+ if !ok {+ t.Fatalf("resolved type %T does not satisfy ExternalEntity", entityType)+ }++ actor, err := NewActivityPubActorFromEntity(entity)+ if err != nil {+ t.Fatalf("NewActivityPubActorFromEntity returned error: %v", err)+ }++ got := ""+ if actor.SharedInbox != nil {+ got = actor.SharedInbox.String()+ }+ if got != tc.wantSharedInbox {+ t.Errorf("SharedInbox = %q, want %q", got, tc.wantSharedInbox)+ }+ })+ }+}diff --git a/services/activitypub/apmodels/hashtag.go b/services/activitypub/apmodels/hashtag.goindex b779df5ae1..5c66f98cfe 100644--- a/services/activitypub/apmodels/hashtag.go+++ b/services/activitypub/apmodels/hashtag.go@@ -3,8 +3,8 @@ package apmodelsimport ("net/url"- "github.com/go-fed/activity/streams"- "github.com/go-fed/activity/streams/vocab"+ "code.superseriousbusiness.org/activity/streams"+ "code.superseriousbusiness.org/activity/streams/vocab")// MakeHashtag will create and return a mastodon toot hashtag object with the provided name.diff --git a/services/activitypub/apmodels/message.go b/services/activitypub/apmodels/message.goindex 0b08981cdc..cc60223888 100644--- a/services/activitypub/apmodels/message.go+++ b/services/activitypub/apmodels/message.go@@ -3,8 +3,8 @@ package apmodelsimport ("net/url"- "github.com/go-fed/activity/streams"- "github.com/go-fed/activity/streams/vocab"+ "code.superseriousbusiness.org/activity/streams"+ "code.superseriousbusiness.org/activity/streams/vocab")// CreateCreateActivity will create a new Create Activity model with the provided ID and IRI.diff --git a/services/activitypub/apmodels/utils.go b/services/activitypub/apmodels/utils.goindex 58d57823f4..d762eeb09c 100644--- a/services/activitypub/apmodels/utils.go+++ b/services/activitypub/apmodels/utils.go@@ -7,8 +7,8 @@ import ("path""path/filepath"- "github.com/go-fed/activity/streams"- "github.com/go-fed/activity/streams/vocab"+ "code.superseriousbusiness.org/activity/streams"+ "code.superseriousbusiness.org/activity/streams/vocab"log "github.com/sirupsen/logrus""github.com/owncast/owncast/utils"diff --git a/services/activitypub/apmodels/utils_test.go b/services/activitypub/apmodels/utils_test.goindex 42c8d55688..747e2cee83 100644--- a/services/activitypub/apmodels/utils_test.go+++ b/services/activitypub/apmodels/utils_test.go@@ -5,7 +5,7 @@ import ("net/url""testing"- "github.com/go-fed/activity/streams"+ "code.superseriousbusiness.org/activity/streams")func TestGetIRIFromActorPropertyWithNil(t *testing.T) {diff --git a/services/activitypub/controllers/followers.go b/services/activitypub/controllers/followers.goindex bc9e6d5e1e..846b1abaed 100644--- a/services/activitypub/controllers/followers.go+++ b/services/activitypub/controllers/followers.go@@ -7,8 +7,8 @@ import ("strconv""strings"- "github.com/go-fed/activity/streams"- "github.com/go-fed/activity/streams/vocab"+ "code.superseriousbusiness.org/activity/streams"+ "code.superseriousbusiness.org/activity/streams/vocab""github.com/pkg/errors"log "github.com/sirupsen/logrus"diff --git a/services/activitypub/controllers/outbox.go b/services/activitypub/controllers/outbox.goindex 3bcc930aa0..837746503c 100644--- a/services/activitypub/controllers/outbox.go+++ b/services/activitypub/controllers/outbox.go@@ -6,8 +6,8 @@ import ("strconv""strings"- "github.com/go-fed/activity/streams"- "github.com/go-fed/activity/streams/vocab"+ "code.superseriousbusiness.org/activity/streams"+ "code.superseriousbusiness.org/activity/streams/vocab""github.com/pkg/errors"log "github.com/sirupsen/logrus"diff --git a/services/activitypub/inbox/accept.go b/services/activitypub/inbox/accept.goindex ee0437c59c..6e5bd0a072 100644--- a/services/activitypub/inbox/accept.go+++ b/services/activitypub/inbox/accept.go@@ -6,7 +6,7 @@ import ("net/url""time"- "github.com/go-fed/activity/streams/vocab"+ "code.superseriousbusiness.org/activity/streams/vocab"log "github.com/sirupsen/logrus""github.com/owncast/owncast/config"diff --git a/services/activitypub/inbox/announce.go b/services/activitypub/inbox/announce.goindex 0303b38397..020f11e1ca 100644--- a/services/activitypub/inbox/announce.go+++ b/services/activitypub/inbox/announce.go@@ -4,7 +4,7 @@ import ("context""time"- "github.com/go-fed/activity/streams/vocab"+ "code.superseriousbusiness.org/activity/streams/vocab""github.com/pkg/errors""github.com/owncast/owncast/services/activitypub/apmodels"diff --git a/services/activitypub/inbox/chat.go b/services/activitypub/inbox/chat.goindex 4295d1e00c..ecc41dcb30 100644--- a/services/activitypub/inbox/chat.go+++ b/services/activitypub/inbox/chat.go@@ -3,7 +3,7 @@ package inboximport ("fmt"- "github.com/go-fed/activity/streams/vocab"+ "code.superseriousbusiness.org/activity/streams/vocab""github.com/microcosm-cc/bluemonday""github.com/owncast/owncast/services/chat/events"diff --git a/services/activitypub/inbox/create.go b/services/activitypub/inbox/create.goindex 824579ca99..97f7580a64 100644--- a/services/activitypub/inbox/create.go+++ b/services/activitypub/inbox/create.go@@ -3,7 +3,7 @@ package inboximport ("context"- "github.com/go-fed/activity/streams/vocab"+ "code.superseriousbusiness.org/activity/streams/vocab""github.com/pkg/errors""github.com/owncast/owncast/services/activitypub/apmodels"diff --git a/services/activitypub/inbox/follow.go b/services/activitypub/inbox/follow.goindex 33445711be..8f0a368c7e 100644--- a/services/activitypub/inbox/follow.go+++ b/services/activitypub/inbox/follow.go@@ -5,7 +5,7 @@ import ("fmt""time"- "github.com/go-fed/activity/streams/vocab"+ "code.superseriousbusiness.org/activity/streams/vocab""github.com/pkg/errors"log "github.com/sirupsen/logrus"diff --git a/services/activitypub/inbox/leave.go b/services/activitypub/inbox/leave.goindex 30c361745f..9255e37419 100644--- a/services/activitypub/inbox/leave.go+++ b/services/activitypub/inbox/leave.go@@ -4,7 +4,7 @@ import ("context""fmt"- "github.com/go-fed/activity/streams/vocab"+ "code.superseriousbusiness.org/activity/streams/vocab"log "github.com/sirupsen/logrus""github.com/owncast/owncast/persistence/federatedserversrepository"diff --git a/services/activitypub/inbox/leave_test.go b/services/activitypub/inbox/leave_test.goindex 5070f78db7..1682ef96fa 100644--- a/services/activitypub/inbox/leave_test.go+++ b/services/activitypub/inbox/leave_test.go@@ -5,8 +5,8 @@ import ("net/url""testing"- "github.com/go-fed/activity/streams"- "github.com/go-fed/activity/streams/vocab"+ "code.superseriousbusiness.org/activity/streams"+ "code.superseriousbusiness.org/activity/streams/vocab""github.com/owncast/owncast/config""github.com/owncast/owncast/services/activitypub/apmodels")diff --git a/services/activitypub/inbox/like.go b/services/activitypub/inbox/like.goindex 89154e974f..0a18ed50d6 100644--- a/services/activitypub/inbox/like.go+++ b/services/activitypub/inbox/like.go@@ -4,7 +4,7 @@ import ("context""time"- "github.com/go-fed/activity/streams/vocab"+ "code.superseriousbusiness.org/activity/streams/vocab""github.com/pkg/errors""github.com/owncast/owncast/services/activitypub/apmodels"diff --git a/services/activitypub/inbox/nil_safety_test.go b/services/activitypub/inbox/nil_safety_test.goindex 3c2814abc8..cbbe5b298d 100644--- a/services/activitypub/inbox/nil_safety_test.go+++ b/services/activitypub/inbox/nil_safety_test.go@@ -5,7 +5,7 @@ import ("net/url""testing"- "github.com/go-fed/activity/streams"+ "code.superseriousbusiness.org/activity/streams")// testInbox carries no deps. Every assertion in this file exercises andiff --git a/services/activitypub/inbox/offer.go b/services/activitypub/inbox/offer.goindex 625bf3fc32..9d75c5a5c2 100644--- a/services/activitypub/inbox/offer.go+++ b/services/activitypub/inbox/offer.go@@ -5,7 +5,7 @@ import ("fmt""net/url"- "github.com/go-fed/activity/streams/vocab"+ "code.superseriousbusiness.org/activity/streams/vocab"log "github.com/sirupsen/logrus""github.com/owncast/owncast/config"diff --git a/services/activitypub/inbox/offer_test.go b/services/activitypub/inbox/offer_test.goindex 7b640ae9df..de3fc581ca 100644--- a/services/activitypub/inbox/offer_test.go+++ b/services/activitypub/inbox/offer_test.go@@ -5,8 +5,8 @@ import ("net/url""testing"- "github.com/go-fed/activity/streams"- "github.com/go-fed/activity/streams/vocab"+ "code.superseriousbusiness.org/activity/streams"+ "code.superseriousbusiness.org/activity/streams/vocab""github.com/owncast/owncast/config""github.com/owncast/owncast/services/activitypub/apmodels")diff --git a/services/activitypub/inbox/reject.go b/services/activitypub/inbox/reject.goindex 487d694dcb..aa52206a23 100644--- a/services/activitypub/inbox/reject.go+++ b/services/activitypub/inbox/reject.go@@ -6,7 +6,7 @@ import ("net/url""time"- "github.com/go-fed/activity/streams/vocab"+ "code.superseriousbusiness.org/activity/streams/vocab""github.com/owncast/owncast/persistence/federatedserversrepository"log "github.com/sirupsen/logrus")diff --git a/services/activitypub/inbox/undo.go b/services/activitypub/inbox/undo.goindex e44d219e8c..763b0b6cac 100644--- a/services/activitypub/inbox/undo.go+++ b/services/activitypub/inbox/undo.go@@ -5,7 +5,7 @@ import (log "github.com/sirupsen/logrus"- "github.com/go-fed/activity/streams/vocab"+ "code.superseriousbusiness.org/activity/streams/vocab")func (s *Service) handleUndoInboxRequest(c context.Context, activity vocab.ActivityStreamsUndo) error {diff --git a/services/activitypub/inbox/update.go b/services/activitypub/inbox/update.goindex 4bad0f2a23..0644c665ca 100644--- a/services/activitypub/inbox/update.go+++ b/services/activitypub/inbox/update.go@@ -3,7 +3,7 @@ package inboximport ("context"- "github.com/go-fed/activity/streams/vocab"+ "code.superseriousbusiness.org/activity/streams/vocab"log "github.com/sirupsen/logrus""github.com/owncast/owncast/services/activitypub/apmodels"diff --git a/services/activitypub/inbox/worker_test.go b/services/activitypub/inbox/worker_test.goindex 547aa34b18..2ab9c1f20d 100644--- a/services/activitypub/inbox/worker_test.go+++ b/services/activitypub/inbox/worker_test.go@@ -5,8 +5,8 @@ import ("os""testing"- "github.com/go-fed/activity/streams"- "github.com/go-fed/activity/streams/vocab"+ "code.superseriousbusiness.org/activity/streams"+ "code.superseriousbusiness.org/activity/streams/vocab""github.com/owncast/owncast/persistence/configrepository""github.com/owncast/owncast/services/activitypub/apmodels"diff --git a/services/activitypub/jobs/followervalidation_test.go b/services/activitypub/jobs/followervalidation_test.goindex 974e07b147..bfdc3bf639 100644--- a/services/activitypub/jobs/followervalidation_test.go+++ b/services/activitypub/jobs/followervalidation_test.go@@ -6,7 +6,7 @@ import ("testing""time"- "github.com/go-fed/activity/streams"+ "code.superseriousbusiness.org/activity/streams""github.com/owncast/owncast/services/activitypub/apmodels""github.com/owncast/owncast/services/activitypub/persistence/followersrepository"diff --git a/services/activitypub/outbox/follow.go b/services/activitypub/outbox/follow.goindex 125006b280..87b1f66cdb 100644--- a/services/activitypub/outbox/follow.go+++ b/services/activitypub/outbox/follow.go@@ -5,7 +5,7 @@ import ("net/url""strings"- "github.com/go-fed/activity/streams"+ "code.superseriousbusiness.org/activity/streams"log "github.com/sirupsen/logrus""github.com/teris-io/shortid"diff --git a/services/activitypub/outbox/nil_safety_test.go b/services/activitypub/outbox/nil_safety_test.goindex 685f41aea6..378e22b752 100644--- a/services/activitypub/outbox/nil_safety_test.go+++ b/services/activitypub/outbox/nil_safety_test.go@@ -3,8 +3,8 @@ package outboximport ("testing"- "github.com/go-fed/activity/streams"- "github.com/go-fed/activity/streams/vocab"+ "code.superseriousbusiness.org/activity/streams"+ "code.superseriousbusiness.org/activity/streams/vocab")// testOutbox carries no deps. Every assertion in this file exercisesdiff --git a/services/activitypub/outbox/outbox.go b/services/activitypub/outbox/outbox.goindex c3f9106276..9c658c8752 100644--- a/services/activitypub/outbox/outbox.go+++ b/services/activitypub/outbox/outbox.go@@ -14,8 +14,8 @@ import ("sync""time"- "github.com/go-fed/activity/streams"- "github.com/go-fed/activity/streams/vocab"+ "code.superseriousbusiness.org/activity/streams"+ "code.superseriousbusiness.org/activity/streams/vocab""github.com/pkg/errors"log "github.com/sirupsen/logrus""github.com/teris-io/shortid"diff --git a/services/activitypub/outbox/outbox_test.go b/services/activitypub/outbox/outbox_test.goindex 5c47f7fd2c..13507e4f55 100644--- a/services/activitypub/outbox/outbox_test.go+++ b/services/activitypub/outbox/outbox_test.go@@ -4,8 +4,8 @@ import ("net/url""testing"- "github.com/go-fed/activity/streams"- "github.com/go-fed/activity/streams/vocab"+ "code.superseriousbusiness.org/activity/streams"+ "code.superseriousbusiness.org/activity/streams/vocab""github.com/owncast/owncast/config""github.com/owncast/owncast/services/activitypub/apmodels"diff --git a/services/activitypub/outbox/ping.go b/services/activitypub/outbox/ping.goindex 76f0853129..59e1a1eabc 100644--- a/services/activitypub/outbox/ping.go+++ b/services/activitypub/outbox/ping.go@@ -3,8 +3,8 @@ package outboximport ("net/url"- "github.com/go-fed/activity/streams"- "github.com/go-fed/activity/streams/vocab"+ "code.superseriousbusiness.org/activity/streams"+ "code.superseriousbusiness.org/activity/streams/vocab""github.com/pkg/errors"log "github.com/sirupsen/logrus""github.com/teris-io/shortid"diff --git a/services/activitypub/persistence/followers_fixture.go b/services/activitypub/persistence/followers_fixture.goindex 3d797d8132..a3dbd94f8c 100644--- a/services/activitypub/persistence/followers_fixture.go+++ b/services/activitypub/persistence/followers_fixture.go@@ -9,7 +9,7 @@ import ("net/url""os"- "github.com/go-fed/activity/streams"+ "code.superseriousbusiness.org/activity/streams"log "github.com/sirupsen/logrus""github.com/owncast/owncast/services/activitypub/apmodels"diff --git a/services/activitypub/persistence/followers_test.go b/services/activitypub/persistence/followers_test.goindex a4966978a0..16b2a36ec6 100644--- a/services/activitypub/persistence/followers_test.go+++ b/services/activitypub/persistence/followers_test.go@@ -6,7 +6,7 @@ import ("strings""testing"- "github.com/go-fed/activity/streams"+ "code.superseriousbusiness.org/activity/streams""github.com/owncast/owncast/models""github.com/owncast/owncast/services/activitypub/apmodels"diff --git a/services/activitypub/persistence/followersrepository/followersrepository.go b/services/activitypub/persistence/followersrepository/followersrepository.goindex b27a910d50..b8409dd355 100644--- a/services/activitypub/persistence/followersrepository/followersrepository.go+++ b/services/activitypub/persistence/followersrepository/followersrepository.go@@ -7,8 +7,8 @@ import ("net/url""time"- "github.com/go-fed/activity/streams"- "github.com/go-fed/activity/streams/vocab"+ "code.superseriousbusiness.org/activity/streams"+ "code.superseriousbusiness.org/activity/streams/vocab""github.com/pkg/errors"log "github.com/sirupsen/logrus"diff --git a/services/activitypub/persistence/persistence.go b/services/activitypub/persistence/persistence.goindex 254250588d..8d8c7dac2c 100644--- a/services/activitypub/persistence/persistence.go+++ b/services/activitypub/persistence/persistence.go@@ -11,8 +11,8 @@ import ("fmt""time"- "github.com/go-fed/activity/streams"- "github.com/go-fed/activity/streams/vocab"+ "code.superseriousbusiness.org/activity/streams"+ "code.superseriousbusiness.org/activity/streams/vocab""github.com/pkg/errors"log "github.com/sirupsen/logrus"diff --git a/services/activitypub/requests/acceptFollow.go b/services/activitypub/requests/acceptFollow.goindex 9d130f0203..18c1c7b635 100644--- a/services/activitypub/requests/acceptFollow.go+++ b/services/activitypub/requests/acceptFollow.go@@ -4,8 +4,8 @@ import ("encoding/json""net/url"- "github.com/go-fed/activity/streams"- "github.com/go-fed/activity/streams/vocab"+ "code.superseriousbusiness.org/activity/streams"+ "code.superseriousbusiness.org/activity/streams/vocab""github.com/pkg/errors""github.com/owncast/owncast/persistence/configrepository"diff --git a/services/activitypub/requests/http.go b/services/activitypub/requests/http.goindex 81b33889bc..ac85e447d7 100644--- a/services/activitypub/requests/http.go+++ b/services/activitypub/requests/http.go@@ -7,8 +7,8 @@ import ("net/http""net/url"- "github.com/go-fed/activity/streams"- "github.com/go-fed/activity/streams/vocab"+ "code.superseriousbusiness.org/activity/streams"+ "code.superseriousbusiness.org/activity/streams/vocab""github.com/owncast/owncast/config""github.com/owncast/owncast/services/activitypub/crypto"diff --git a/services/activitypub/requests/rejectFollow.go b/services/activitypub/requests/rejectFollow.goindex f0b606bb48..8d15c7ace1 100644--- a/services/activitypub/requests/rejectFollow.go+++ b/services/activitypub/requests/rejectFollow.go@@ -4,8 +4,8 @@ import ("encoding/json""net/url"- "github.com/go-fed/activity/streams"- "github.com/go-fed/activity/streams/vocab"+ "code.superseriousbusiness.org/activity/streams"+ "code.superseriousbusiness.org/activity/streams/vocab""github.com/pkg/errors""github.com/owncast/owncast/services/activitypub/apmodels"diff --git a/services/activitypub/resolvers/follow.go b/services/activitypub/resolvers/follow.goindex f3dc919ca2..1828079d5e 100644--- a/services/activitypub/resolvers/follow.go+++ b/services/activitypub/resolvers/follow.go@@ -4,7 +4,7 @@ import ("context""fmt"- "github.com/go-fed/activity/streams/vocab"+ "code.superseriousbusiness.org/activity/streams/vocab""github.com/pkg/errors"log "github.com/sirupsen/logrus"diff --git a/services/activitypub/resolvers/nil_safety_test.go b/services/activitypub/resolvers/nil_safety_test.goindex 0ac656620b..1cc948c62c 100644--- a/services/activitypub/resolvers/nil_safety_test.go+++ b/services/activitypub/resolvers/nil_safety_test.go@@ -4,7 +4,7 @@ import ("net/url""testing"- "github.com/go-fed/activity/streams"+ "code.superseriousbusiness.org/activity/streams")func mustParseURL(s string) *url.URL {diff --git a/services/activitypub/resolvers/resolve.go b/services/activitypub/resolvers/resolve.goindex 37372cee09..106e1be88d 100644--- a/services/activitypub/resolvers/resolve.go+++ b/services/activitypub/resolvers/resolve.go@@ -7,8 +7,8 @@ import ("net/http""net/url"- "github.com/go-fed/activity/streams"- "github.com/go-fed/activity/streams/vocab"+ "code.superseriousbusiness.org/activity/streams"+ "code.superseriousbusiness.org/activity/streams/vocab""github.com/pkg/errors"log "github.com/sirupsen/logrus"