From 435fad0d68e18837f2f73e6d21cee330e4aab39f Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Tue, 5 Sep 2023 12:10:08 +0800
Subject: [PATCH] Move ui notification to service layer

---
 modules/notification/notification.go                     | 2 --
 routers/init.go                                          | 2 ++
 .../ui/ui.go => services/uinotification/notify.go        | 9 ++++++++-
 3 files changed, 10 insertions(+), 3 deletions(-)
 rename modules/notification/ui/ui.go => services/uinotification/notify.go (98%)

diff --git a/modules/notification/notification.go b/modules/notification/notification.go
index 50b2694d9c41..5c77e1233fee 100644
--- a/modules/notification/notification.go
+++ b/modules/notification/notification.go
@@ -16,7 +16,6 @@ import (
 	"code.gitea.io/gitea/modules/notification/base"
 	"code.gitea.io/gitea/modules/notification/indexer"
 	"code.gitea.io/gitea/modules/notification/mail"
-	"code.gitea.io/gitea/modules/notification/ui"
 	"code.gitea.io/gitea/modules/repository"
 	"code.gitea.io/gitea/modules/setting"
 )
@@ -31,7 +30,6 @@ func RegisterNotifier(notifier base.Notifier) {
 
 // NewContext registers notification handlers
 func NewContext() {
-	RegisterNotifier(ui.NewNotifier())
 	if setting.Service.EnableNotifyMail {
 		RegisterNotifier(mail.NewNotifier())
 	}
diff --git a/routers/init.go b/routers/init.go
index 020fff31c0e3..9f9a6111dc50 100644
--- a/routers/init.go
+++ b/routers/init.go
@@ -50,6 +50,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"
 )
 
@@ -121,6 +122,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 b/services/uinotification/notify.go
similarity index 98%
rename from modules/notification/ui/ui.go
rename to services/uinotification/notify.go
index 2ca1a7700f2c..4cf74b6f1aad 100644
--- a/modules/notification/ui/ui.go
+++ b/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