Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move ui notification to service layer #26907

Merged
merged 5 commits into from
Sep 5, 2023
Merged

Move ui notification to service layer #26907

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
435fad0
Move ui notification to service layer
lunny Sep 5, 2023
16a0cdd
Merge branch 'main' into lunny/move_uinotification_notify_service
lunny Sep 5, 2023
a4586b4
Merge branch 'main' into lunny/move_uinotification_notify_service
lunny Sep 5, 2023
5a5f00c
Merge branch 'main' into lunny/move_uinotification_notify_service
lunny Sep 5, 2023
83997ff
Merge branch 'main' into lunny/move_uinotification_notify_service
GiteaBot Sep 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions modules/notification/notification.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand All @@ -28,7 +27,6 @@ func RegisterNotifier(notifier base.Notifier) {

// NewContext registers notification handlers
func NewContext() {
RegisterNotifier(ui.NewNotifier())
RegisterNotifier(action.NewNotifier())
}

Expand Down
2 changes: 2 additions & 0 deletions routers/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down Expand Up @@ -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()
Expand Down
9 changes: 8 additions & 1 deletion modules/notification/ui/ui.go → services/uinotification/notify.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright 2018 The Gitea Authors. All rights reserved.
// SPDX-License-Identifier: MIT

package ui
package uinotification

import (
"context"
Expand All @@ -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"
)
Expand All @@ -32,6 +33,12 @@ type (
}
)

func Init() error {
notification.RegisterNotifier(NewNotifier())

return nil
}

var _ base.Notifier = &notificationService{}

// NewNotifier create a new notificationService notifier
Expand Down