diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2023-09-05 19:15:42 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-05 11:15:42 +0000 |
| commit | 6c73c0da530649d0d629359e13d0373b72568f41 (patch) | |
| tree | d18ecd31d7091c239deae721d851a2c2b419e03f | |
| parent | dc2dd76d98e3fcdfde922812f793a1db1f1ca555 (diff) | |
| download | gitea-6c73c0da530649d0d629359e13d0373b72568f41.tar.gz gitea-6c73c0da530649d0d629359e13d0373b72568f41.zip | |
Move ui notification to service layer (#26907)
Extract from #22266
| -rw-r--r-- | modules/notification/notification.go | 2 | ||||
| -rw-r--r-- | routers/init.go | 2 | ||||
| -rw-r--r-- | services/uinotification/notify.go (renamed from modules/notification/ui/ui.go) | 9 |
3 files changed, 10 insertions, 3 deletions
diff --git a/modules/notification/notification.go b/modules/notification/notification.go index 093113dcbe..c265388a18 100644 --- 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 index ad7da70718..f311b4f95d 100644 --- 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 b/services/uinotification/notify.go index 2ca1a7700f..4cf74b6f1a 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 = ¬ificationService{} // NewNotifier create a new notificationService notifier |