Move ui notification to service layer (#26907)

Extract from #22266
go-gitea · Sep 5, 2023 · 6c73c0d · 6c73c0d
1 parent dc2dd76
commit 6c73c0d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/modules/notification/notification.go b/modules/notification/notification.go
@@ -14,7 +14,6 @@ import (
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/notification/action"
 	"code.gitea.io/gitea/modules/notification/base"
-	"code.gitea.io/gitea/modules/notification/ui"
 	"code.gitea.io/gitea/modules/repository"
 )
 
@@ -28,7 +27,6 @@ func RegisterNotifier(notifier base.Notifier) {
 
 // NewContext registers notification handlers
 func NewContext() {
-	RegisterNotifier(ui.NewNotifier())
 	RegisterNotifier(action.NewNotifier())
 }
 

diff --git a/routers/init.go b/routers/init.go
@@ -48,6 +48,7 @@ import (
 	repo_service "code.gitea.io/gitea/services/repository"
 	"code.gitea.io/gitea/services/repository/archiver"
 	"code.gitea.io/gitea/services/task"
+	"code.gitea.io/gitea/services/uinotification"
 	"code.gitea.io/gitea/services/webhook"
 )
 
@@ -119,6 +120,7 @@ func InitWebInstalled(ctx context.Context) {
 	mailer.NewContext(ctx)
 	mustInit(cache.NewContext)
 	notification.NewContext()
+	mustInit(uinotification.Init)
 	mustInit(archiver.Init)
 
 	highlight.NewContext()

diff --git a/modules/notification/ui/ui.go → services/uinotification/notify.go b/modules/notification/ui/ui.go → services/uinotification/notify.go
@@ -1,7 +1,7 @@
 // Copyright 2018 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package ui
+package uinotification
 
 import (
 	"context"
@@ -14,6 +14,7 @@ import (
 	"code.gitea.io/gitea/modules/container"
 	"code.gitea.io/gitea/modules/graceful"
 	"code.gitea.io/gitea/modules/log"
+	"code.gitea.io/gitea/modules/notification"
 	"code.gitea.io/gitea/modules/notification/base"
 	"code.gitea.io/gitea/modules/queue"
 )
@@ -32,6 +33,12 @@ type (
 	}
 )
 
+func Init() error {
+	notification.RegisterNotifier(NewNotifier())
+
+	return nil
+}
+
 var _ base.Notifier = &notificationService{}
 
 // NewNotifier create a new notificationService notifier