Take control over your live stream video by running it yourself. Streaming + chat out of the box.
HTML activitypubbroadcastingchatdecentralizedfederationfediversegolanghacktoberfesthlslivelivestreamowncastrtmpself-hostedstreaming-videovideo
fix(webhooks): include serverURL in fediverse follow event (#4899)
John Costacefc21369b99
diff --git a/services/webhooks/fediverseEngagement.go b/services/webhooks/fediverseEngagement.goindex f6ea7aa732..a2cf5e65d1 100644--- a/services/webhooks/fediverseEngagement.go+++ b/services/webhooks/fediverseEngagement.go@@ -24,8 +24,15 @@ func (s *Service) SendFediverseEngagementFollowEvent(iri string) {func (s *Service) sendFediverseEngagementEventFollow(event events.FediverseEngagementFollowEvent) {webhookEvent := WebhookEvent{- Type: models.FediverseEngagementFollow,- EventData: event,+ Type: models.FediverseEngagementFollow,+ EventData: &WebhookFediverseEngagementFollowEventData{+ ID: event.ID,+ Timestamp: event.Timestamp,+ Name: event.Name,+ Username: event.Username,+ Image: event.Image,+ ServerURL: s.serverURL(),+ },}s.SendEventToWebhooks(webhookEvent)diff --git a/services/webhooks/fediverseEngagement_test.go b/services/webhooks/fediverseEngagement_test.goindex 5c72b3206c..976ae133ed 100644--- a/services/webhooks/fediverseEngagement_test.go+++ b/services/webhooks/fediverseEngagement_test.go@@ -22,6 +22,7 @@ func TestSendFediverseEngagementEventFollow(t *testing.T) {"id": "id","image": "","name": "be",+ "serverURL": "http://localhost:8080","timestamp": "1970-01-01T00:01:12.000000006Z","username": "[email protected]"}`)diff --git a/services/webhooks/webhooks.go b/services/webhooks/webhooks.goindex 87a1832efb..d8c4098f28 100644--- a/services/webhooks/webhooks.go+++ b/services/webhooks/webhooks.go@@ -74,6 +74,20 @@ type WebhookVisibilityToggleEventData struct {MessageIDs []string `json:"ids"`}+// WebhookFediverseEngagementFollowEventData represents Fediverse follow engagement+// event data sent as a webhook payload. Unlike stream-state events it does not+// embed BaseWebhookData; the live stream status is unrelated to a follow action.+// ServerURL is included so receivers can identify which Owncast instance sent+// the webhook.+type WebhookFediverseEngagementFollowEventData struct {+ ID string `json:"id"`+ Timestamp time.Time `json:"timestamp"`+ Name string `json:"name"`+ Username string `json:"username"`+ Image string `json:"image"`+ ServerURL string `json:"serverURL,omitempty"`+}+// SendEventToWebhooks fans an event out to every configured webhook// destination subscribed to that event type.func (s *Service) SendEventToWebhooks(payload WebhookEvent) {