From 79b6d6c0af1748c232a55f55c932337b7c53a5e2 Mon Sep 17 00:00:00 2001 From: Gabe Kangas Date: Wed, 14 Jun 2023 17:31:52 -0700 Subject: [PATCH] feat: move notifications under services --- core/core.go | 2 +- core/streamState.go | 2 +- {notifications => services/notifications}/browser/browser.go | 0 {notifications => services/notifications}/channels.go | 0 {notifications => services/notifications}/discord/discord.go | 0 {notifications => services/notifications}/notifications.go | 4 ++-- {notifications => services/notifications}/persistence.go | 0 webserver/handlers/notifications.go | 4 ++-- 8 files changed, 6 insertions(+), 6 deletions(-) rename {notifications => services/notifications}/browser/browser.go (100%) rename {notifications => services/notifications}/channels.go (100%) rename {notifications => services/notifications}/discord/discord.go (100%) rename {notifications => services/notifications}/notifications.go (97%) rename {notifications => services/notifications}/persistence.go (100%) diff --git a/core/core.go b/core/core.go index d0fb969e0..13273364d 100644 --- a/core/core.go +++ b/core/core.go @@ -15,7 +15,7 @@ import ( "github.com/owncast/owncast/core/transcoder" "github.com/owncast/owncast/core/webhooks" "github.com/owncast/owncast/models" - "github.com/owncast/owncast/notifications" + "github.com/owncast/owncast/services/notifications" "github.com/owncast/owncast/utils" "github.com/owncast/owncast/yp" ) diff --git a/core/streamState.go b/core/streamState.go index 52b8b844e..0d36f85c9 100644 --- a/core/streamState.go +++ b/core/streamState.go @@ -15,7 +15,7 @@ import ( "github.com/owncast/owncast/core/transcoder" "github.com/owncast/owncast/core/webhooks" "github.com/owncast/owncast/models" - "github.com/owncast/owncast/notifications" + "github.com/owncast/owncast/services/notifications" "github.com/owncast/owncast/utils" ) diff --git a/notifications/browser/browser.go b/services/notifications/browser/browser.go similarity index 100% rename from notifications/browser/browser.go rename to services/notifications/browser/browser.go diff --git a/notifications/channels.go b/services/notifications/channels.go similarity index 100% rename from notifications/channels.go rename to services/notifications/channels.go diff --git a/notifications/discord/discord.go b/services/notifications/discord/discord.go similarity index 100% rename from notifications/discord/discord.go rename to services/notifications/discord/discord.go diff --git a/notifications/notifications.go b/services/notifications/notifications.go similarity index 97% rename from notifications/notifications.go rename to services/notifications/notifications.go index 545488efa..b473f6490 100644 --- a/notifications/notifications.go +++ b/services/notifications/notifications.go @@ -6,8 +6,8 @@ import ( "github.com/owncast/owncast/config" "github.com/owncast/owncast/core/data" "github.com/owncast/owncast/models" - "github.com/owncast/owncast/notifications/browser" - "github.com/owncast/owncast/notifications/discord" + "github.com/owncast/owncast/services/notifications/browser" + "github.com/owncast/owncast/services/notifications/discord" "github.com/pkg/errors" log "github.com/sirupsen/logrus" ) diff --git a/notifications/persistence.go b/services/notifications/persistence.go similarity index 100% rename from notifications/persistence.go rename to services/notifications/persistence.go diff --git a/webserver/handlers/notifications.go b/webserver/handlers/notifications.go index 35ed47e75..192de02ca 100644 --- a/webserver/handlers/notifications.go +++ b/webserver/handlers/notifications.go @@ -4,8 +4,8 @@ import ( "encoding/json" "net/http" - "github.com/owncast/owncast/core/user" - "github.com/owncast/owncast/notifications" + "github.com/owncast/owncast/models" + "github.com/owncast/owncast/services/notifications" "github.com/owncast/owncast/webserver/responses" "github.com/owncast/owncast/utils"