Merge branch 'main' into api-repo-actions

modules/context/utils.go

@@ -4,29 +4,18 @@
 package context
 
 import (
-	"net/url"
 	"strings"
 	"time"
 )
 
 // GetQueryBeforeSince return parsed time (unix format) from URL query's before and since
 func GetQueryBeforeSince(ctx *Base) (before, since int64, err error) {
-	qCreatedBefore, err := prepareQueryArg(ctx, "before")
+	before, err = parseFormTime(ctx, "before")
 	if err != nil {
 		return 0, 0, err
 	}
 
-	qCreatedSince, err := prepareQueryArg(ctx, "since")
-	if err != nil {
-		return 0, 0, err
-	}
-
-	before, err = parseTime(qCreatedBefore)
-	if err != nil {
-		return 0, 0, err
-	}
-
-	since, err = parseTime(qCreatedSince)
+	since, err = parseFormTime(ctx, "since")
 	if err != nil {
 		return 0, 0, err
 	}
@@ -34,7 +23,8 @@ func GetQueryBeforeSince(ctx *Base) (before, since int64, err error) {
 }
 
 // parseTime parse time and return unix timestamp
-func parseTime(value string) (int64, error) {
+func parseFormTime(ctx *Base, name string) (int64, error) {
+	value := strings.TrimSpace(ctx.FormString(name))
 	if len(value) != 0 {
 		t, err := time.Parse(time.RFC3339, value)
 		if err != nil {
@@ -46,10 +36,3 @@ func parseTime(value string) (int64, error) {
 	}
 	return 0, nil
 }
-
-// prepareQueryArg unescape and trim a query arg
-func prepareQueryArg(ctx *Base, name string) (value string, err error) {
-	value, err = url.PathUnescape(ctx.FormString(name))
-	value = strings.TrimSpace(value)
-	return value, err
-}

modules/contexttest/context_tests.go

@@ -1,7 +1,8 @@
 // Copyright 2017 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package test
+// Package contexttest provides utilities for testing Web/API contexts with models.
+package contexttest
 
 import (
 	gocontext "context"
@@ -22,7 +23,7 @@ import (
 	"code.gitea.io/gitea/modules/translation"
 	"code.gitea.io/gitea/modules/web/middleware"
 
-	chi "github.com/go-chi/chi/v5"
+	"github.com/go-chi/chi/v5"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -40,7 +41,6 @@ func mockRequest(t *testing.T, reqPath string) *http.Request {
 }
 
 // MockContext mock context for unit tests
-// TODO: move this function to other packages, because it depends on "models" package
 func MockContext(t *testing.T, reqPath string) (*context.Context, *httptest.ResponseRecorder) {
 	resp := httptest.NewRecorder()
 	req := mockRequest(t, reqPath)
@@ -50,7 +50,6 @@ func MockContext(t *testing.T, reqPath string) (*context.Context, *httptest.Resp
 	base.Locale = &translation.MockLocale{}
 
 	ctx := context.NewWebContext(base, &MockRender{}, nil)
-	ctx.Flash = &middleware.Flash{Values: url.Values{}}
 
 	chiCtx := chi.NewRouteContext()
 	ctx.Base.AppendContextValue(chi.RouteCtxKey, chiCtx)
@@ -58,7 +57,6 @@ func MockContext(t *testing.T, reqPath string) (*context.Context, *httptest.Resp
 }
 
 // MockAPIContext mock context for unit tests
-// TODO: move this function to other packages, because it depends on "models" package
 func MockAPIContext(t *testing.T, reqPath string) (*context.APIContext, *httptest.ResponseRecorder) {
 	resp := httptest.NewRecorder()
 	req := mockRequest(t, reqPath)
@@ -123,7 +121,7 @@ func LoadRepoCommit(t *testing.T, ctx gocontext.Context) {
 	}
 }
 
-// LoadUser load a user into a test context.
+// LoadUser load a user into a test context
 func LoadUser(t *testing.T, ctx gocontext.Context, userID int64) {
 	doer := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: userID})
 	switch ctx := ctx.(type) {

modules/indexer/code/search.go

@@ -11,7 +11,6 @@ import (
 	"code.gitea.io/gitea/modules/highlight"
 	"code.gitea.io/gitea/modules/indexer/code/internal"
 	"code.gitea.io/gitea/modules/timeutil"
-	"code.gitea.io/gitea/modules/util"
 )
 
 // Result a search result to display
@@ -77,8 +76,8 @@ func searchResult(result *internal.SearchResult, startIndex, endIndex int) (*Res
 		if index < result.EndIndex &&
 			result.StartIndex < index+len(line) &&
 			result.StartIndex < result.EndIndex {
-			openActiveIndex := util.Max(result.StartIndex-index, 0)
-			closeActiveIndex := util.Min(result.EndIndex-index, len(line))
+			openActiveIndex := max(result.StartIndex-index, 0)
+			closeActiveIndex := min(result.EndIndex-index, len(line))
 			err = writeStrings(&formattedLinesBuffer,
 				line[:openActiveIndex],
 				line[openActiveIndex:closeActiveIndex],

modules/notification/action/action.go

@@ -1,452 +0,0 @@
-// Copyright 2019 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
-
-package action
-
-import (
-	"context"
-	"fmt"
-	"path"
-	"strings"
-
-	activities_model "code.gitea.io/gitea/models/activities"
-	issues_model "code.gitea.io/gitea/models/issues"
-	repo_model "code.gitea.io/gitea/models/repo"
-	user_model "code.gitea.io/gitea/models/user"
-	"code.gitea.io/gitea/modules/git"
-	"code.gitea.io/gitea/modules/json"
-	"code.gitea.io/gitea/modules/log"
-	"code.gitea.io/gitea/modules/notification/base"
-	"code.gitea.io/gitea/modules/repository"
-	"code.gitea.io/gitea/modules/util"
-)
-
-type actionNotifier struct {
-	base.NullNotifier
-}
-
-var _ base.Notifier = &actionNotifier{}
-
-// NewNotifier create a new actionNotifier notifier
-func NewNotifier() base.Notifier {
-	return &actionNotifier{}
-}
-
-func (a *actionNotifier) NotifyNewIssue(ctx context.Context, issue *issues_model.Issue, mentions []*user_model.User) {
-	if err := issue.LoadPoster(ctx); err != nil {
-		log.Error("issue.LoadPoster: %v", err)
-		return
-	}
-	if err := issue.LoadRepo(ctx); err != nil {
-		log.Error("issue.LoadRepo: %v", err)
-		return
-	}
-	repo := issue.Repo
-
-	if err := activities_model.NotifyWatchers(ctx, &activities_model.Action{
-		ActUserID: issue.Poster.ID,
-		ActUser:   issue.Poster,
-		OpType:    activities_model.ActionCreateIssue,
-		Content:   fmt.Sprintf("%d|%s", issue.Index, issue.Title),
-		RepoID:    repo.ID,
-		Repo:      repo,
-		IsPrivate: repo.IsPrivate,
-	}); err != nil {
-		log.Error("NotifyWatchers: %v", err)
-	}
-}
-
-// NotifyIssueChangeStatus notifies close or reopen issue to notifiers
-func (a *actionNotifier) NotifyIssueChangeStatus(ctx context.Context, doer *user_model.User, commitID string, issue *issues_model.Issue, actionComment *issues_model.Comment, closeOrReopen bool) {
-	// Compose comment action, could be plain comment, close or reopen issue/pull request.
-	// This object will be used to notify watchers in the end of function.
-	act := &activities_model.Action{
-		ActUserID: doer.ID,
-		ActUser:   doer,
-		Content:   fmt.Sprintf("%d|%s", issue.Index, ""),
-		RepoID:    issue.Repo.ID,
-		Repo:      issue.Repo,
-		Comment:   actionComment,
-		CommentID: actionComment.ID,
-		IsPrivate: issue.Repo.IsPrivate,
-	}
-	// Check comment type.
-	if closeOrReopen {
-		act.OpType = activities_model.ActionCloseIssue
-		if issue.IsPull {
-			act.OpType = activities_model.ActionClosePullRequest
-		}
-	} else {
-		act.OpType = activities_model.ActionReopenIssue
-		if issue.IsPull {
-			act.OpType = activities_model.ActionReopenPullRequest
-		}
-	}
-
-	// Notify watchers for whatever action comes in, ignore if no action type.
-	if err := activities_model.NotifyWatchers(ctx, act); err != nil {
-		log.Error("NotifyWatchers: %v", err)
-	}
-}
-
-// NotifyCreateIssueComment notifies comment on an issue to notifiers
-func (a *actionNotifier) NotifyCreateIssueComment(ctx context.Context, doer *user_model.User, repo *repo_model.Repository,
-	issue *issues_model.Issue, comment *issues_model.Comment, mentions []*user_model.User,
-) {
-	act := &activities_model.Action{
-		ActUserID: doer.ID,
-		ActUser:   doer,
-		RepoID:    issue.Repo.ID,
-		Repo:      issue.Repo,
-		Comment:   comment,
-		CommentID: comment.ID,
-		IsPrivate: issue.Repo.IsPrivate,
-	}
-
-	truncatedContent, truncatedRight := util.SplitStringAtByteN(comment.Content, 200)
-	if truncatedRight != "" {
-		// in case the content is in a Latin family language, we remove the last broken word.
-		lastSpaceIdx := strings.LastIndex(truncatedContent, " ")
-		if lastSpaceIdx != -1 && (len(truncatedContent)-lastSpaceIdx < 15) {
-			truncatedContent = truncatedContent[:lastSpaceIdx] + "…"
-		}
-	}
-	act.Content = fmt.Sprintf("%d|%s", issue.Index, truncatedContent)
-
-	if issue.IsPull {
-		act.OpType = activities_model.ActionCommentPull
-	} else {
-		act.OpType = activities_model.ActionCommentIssue
-	}
-
-	// Notify watchers for whatever action comes in, ignore if no action type.
-	if err := activities_model.NotifyWatchers(ctx, act); err != nil {
-		log.Error("NotifyWatchers: %v", err)
-	}
-}
-
-func (a *actionNotifier) NotifyNewPullRequest(ctx context.Context, pull *issues_model.PullRequest, mentions []*user_model.User) {
-	if err := pull.LoadIssue(ctx); err != nil {
-		log.Error("pull.LoadIssue: %v", err)
-		return
-	}
-	if err := pull.Issue.LoadRepo(ctx); err != nil {
-		log.Error("pull.Issue.LoadRepo: %v", err)
-		return
-	}
-	if err := pull.Issue.LoadPoster(ctx); err != nil {
-		log.Error("pull.Issue.LoadPoster: %v", err)
-		return
-	}
-
-	if err := activities_model.NotifyWatchers(ctx, &activities_model.Action{
-		ActUserID: pull.Issue.Poster.ID,
-		ActUser:   pull.Issue.Poster,
-		OpType:    activities_model.ActionCreatePullRequest,
-		Content:   fmt.Sprintf("%d|%s", pull.Issue.Index, pull.Issue.Title),
-		RepoID:    pull.Issue.Repo.ID,
-		Repo:      pull.Issue.Repo,
-		IsPrivate: pull.Issue.Repo.IsPrivate,
-	}); err != nil {
-		log.Error("NotifyWatchers: %v", err)
-	}
-}
-
-func (a *actionNotifier) NotifyRenameRepository(ctx context.Context, doer *user_model.User, repo *repo_model.Repository, oldRepoName string) {
-	if err := activities_model.NotifyWatchers(ctx, &activities_model.Action{
-		ActUserID: doer.ID,
-		ActUser:   doer,
-		OpType:    activities_model.ActionRenameRepo,
-		RepoID:    repo.ID,
-		Repo:      repo,
-		IsPrivate: repo.IsPrivate,
-		Content:   oldRepoName,
-	}); err != nil {
-		log.Error("NotifyWatchers: %v", err)
-	}
-}
-
-func (a *actionNotifier) NotifyTransferRepository(ctx context.Context, doer *user_model.User, repo *repo_model.Repository, oldOwnerName string) {
-	if err := activities_model.NotifyWatchers(ctx, &activities_model.Action{
-		ActUserID: doer.ID,
-		ActUser:   doer,
-		OpType:    activities_model.ActionTransferRepo,
-		RepoID:    repo.ID,
-		Repo:      repo,
-		IsPrivate: repo.IsPrivate,
-		Content:   path.Join(oldOwnerName, repo.Name),
-	}); err != nil {
-		log.Error("NotifyWatchers: %v", err)
-	}
-}
-
-func (a *actionNotifier) NotifyCreateRepository(ctx context.Context, doer, u *user_model.User, repo *repo_model.Repository) {
-	if err := activities_model.NotifyWatchers(ctx, &activities_model.Action{
-		ActUserID: doer.ID,
-		ActUser:   doer,
-		OpType:    activities_model.ActionCreateRepo,
-		RepoID:    repo.ID,
-		Repo:      repo,
-		IsPrivate: repo.IsPrivate,
-	}); err != nil {
-		log.Error("notify watchers '%d/%d': %v", doer.ID, repo.ID, err)
-	}
-}
-
-func (a *actionNotifier) NotifyForkRepository(ctx context.Context, doer *user_model.User, oldRepo, repo *repo_model.Repository) {
-	if err := activities_model.NotifyWatchers(ctx, &activities_model.Action{
-		ActUserID: doer.ID,
-		ActUser:   doer,
-		OpType:    activities_model.ActionCreateRepo,
-		RepoID:    repo.ID,
-		Repo:      repo,
-		IsPrivate: repo.IsPrivate,
-	}); err != nil {
-		log.Error("notify watchers '%d/%d': %v", doer.ID, repo.ID, err)
-	}
-}
-
-func (a *actionNotifier) NotifyPullRequestReview(ctx context.Context, pr *issues_model.PullRequest, review *issues_model.Review, comment *issues_model.Comment, mentions []*user_model.User) {
-	if err := review.LoadReviewer(ctx); err != nil {
-		log.Error("LoadReviewer '%d/%d': %v", review.ID, review.ReviewerID, err)
-		return
-	}
-	if err := review.LoadCodeComments(ctx); err != nil {
-		log.Error("LoadCodeComments '%d/%d': %v", review.Reviewer.ID, review.ID, err)
-		return
-	}
-
-	actions := make([]*activities_model.Action, 0, 10)
-	for _, lines := range review.CodeComments {
-		for _, comments := range lines {
-			for _, comm := range comments {
-				actions = append(actions, &activities_model.Action{
-					ActUserID: review.Reviewer.ID,
-					ActUser:   review.Reviewer,
-					Content:   fmt.Sprintf("%d|%s", review.Issue.Index, strings.Split(comm.Content, "\n")[0]),
-					OpType:    activities_model.ActionCommentPull,
-					RepoID:    review.Issue.RepoID,
-					Repo:      review.Issue.Repo,
-					IsPrivate: review.Issue.Repo.IsPrivate,
-					Comment:   comm,
-					CommentID: comm.ID,
-				})
-			}
-		}
-	}
-
-	if review.Type != issues_model.ReviewTypeComment || strings.TrimSpace(comment.Content) != "" {
-		action := &activities_model.Action{
-			ActUserID: review.Reviewer.ID,
-			ActUser:   review.Reviewer,
-			Content:   fmt.Sprintf("%d|%s", review.Issue.Index, strings.Split(comment.Content, "\n")[0]),
-			RepoID:    review.Issue.RepoID,
-			Repo:      review.Issue.Repo,
-			IsPrivate: review.Issue.Repo.IsPrivate,
-			Comment:   comment,
-			CommentID: comment.ID,
-		}
-
-		switch review.Type {
-		case issues_model.ReviewTypeApprove:
-			action.OpType = activities_model.ActionApprovePullRequest
-		case issues_model.ReviewTypeReject:
-			action.OpType = activities_model.ActionRejectPullRequest
-		default:
-			action.OpType = activities_model.ActionCommentPull
-		}
-
-		actions = append(actions, action)
-	}
-
-	if err := activities_model.NotifyWatchersActions(actions); err != nil {
-		log.Error("notify watchers '%d/%d': %v", review.Reviewer.ID, review.Issue.RepoID, err)
-	}
-}
-
-func (*actionNotifier) NotifyMergePullRequest(ctx context.Context, doer *user_model.User, pr *issues_model.PullRequest) {
-	if err := activities_model.NotifyWatchers(ctx, &activities_model.Action{
-		ActUserID: doer.ID,
-		ActUser:   doer,
-		OpType:    activities_model.ActionMergePullRequest,
-		Content:   fmt.Sprintf("%d|%s", pr.Issue.Index, pr.Issue.Title),
-		RepoID:    pr.Issue.Repo.ID,
-		Repo:      pr.Issue.Repo,
-		IsPrivate: pr.Issue.Repo.IsPrivate,
-	}); err != nil {
-		log.Error("NotifyWatchers [%d]: %v", pr.ID, err)
-	}
-}
-
-func (*actionNotifier) NotifyAutoMergePullRequest(ctx context.Context, doer *user_model.User, pr *issues_model.PullRequest) {
-	if err := activities_model.NotifyWatchers(ctx, &activities_model.Action{
-		ActUserID: doer.ID,
-		ActUser:   doer,
-		OpType:    activities_model.ActionAutoMergePullRequest,
-		Content:   fmt.Sprintf("%d|%s", pr.Issue.Index, pr.Issue.Title),
-		RepoID:    pr.Issue.Repo.ID,
-		Repo:      pr.Issue.Repo,
-		IsPrivate: pr.Issue.Repo.IsPrivate,
-	}); err != nil {
-		log.Error("NotifyWatchers [%d]: %v", pr.ID, err)
-	}
-}
-
-func (*actionNotifier) NotifyPullRevieweDismiss(ctx context.Context, doer *user_model.User, review *issues_model.Review, comment *issues_model.Comment) {
-	reviewerName := review.Reviewer.Name
-	if len(review.OriginalAuthor) > 0 {
-		reviewerName = review.OriginalAuthor
-	}
-	if err := activities_model.NotifyWatchers(ctx, &activities_model.Action{
-		ActUserID: doer.ID,
-		ActUser:   doer,
-		OpType:    activities_model.ActionPullReviewDismissed,
-		Content:   fmt.Sprintf("%d|%s|%s", review.Issue.Index, reviewerName, comment.Content),
-		RepoID:    review.Issue.Repo.ID,
-		Repo:      review.Issue.Repo,
-		IsPrivate: review.Issue.Repo.IsPrivate,
-		CommentID: comment.ID,
-		Comment:   comment,
-	}); err != nil {
-		log.Error("NotifyWatchers [%d]: %v", review.Issue.ID, err)
-	}
-}
-
-func (a *actionNotifier) NotifyPushCommits(ctx context.Context, pusher *user_model.User, repo *repo_model.Repository, opts *repository.PushUpdateOptions, commits *repository.PushCommits) {
-	data, err := json.Marshal(commits)
-	if err != nil {
-		log.Error("Marshal: %v", err)
-		return
-	}
-
-	opType := activities_model.ActionCommitRepo
-
-	// Check it's tag push or branch.
-	if opts.RefFullName.IsTag() {
-		opType = activities_model.ActionPushTag
-		if opts.IsDelRef() {
-			opType = activities_model.ActionDeleteTag
-		}
-	} else if opts.IsDelRef() {
-		opType = activities_model.ActionDeleteBranch
-	}
-
-	if err = activities_model.NotifyWatchers(ctx, &activities_model.Action{
-		ActUserID: pusher.ID,
-		ActUser:   pusher,
-		OpType:    opType,
-		Content:   string(data),
-		RepoID:    repo.ID,
-		Repo:      repo,
-		RefName:   opts.RefFullName.String(),
-		IsPrivate: repo.IsPrivate,
-	}); err != nil {
-		log.Error("NotifyWatchers: %v", err)
-	}
-}
-
-func (a *actionNotifier) NotifyCreateRef(ctx context.Context, doer *user_model.User, repo *repo_model.Repository, refFullName git.RefName, refID string) {
-	opType := activities_model.ActionCommitRepo
-	if refFullName.IsTag() {
-		// has sent same action in `NotifyPushCommits`, so skip it.
-		return
-	}
-	if err := activities_model.NotifyWatchers(ctx, &activities_model.Action{
-		ActUserID: doer.ID,
-		ActUser:   doer,
-		OpType:    opType,
-		RepoID:    repo.ID,
-		Repo:      repo,
-		IsPrivate: repo.IsPrivate,
-		RefName:   refFullName.String(),
-	}); err != nil {
-		log.Error("NotifyWatchers: %v", err)
-	}
-}
-
-func (a *actionNotifier) NotifyDeleteRef(ctx context.Context, doer *user_model.User, repo *repo_model.Repository, refFullName git.RefName) {
-	opType := activities_model.ActionDeleteBranch
-	if refFullName.IsTag() {
-		// has sent same action in `NotifyPushCommits`, so skip it.
-		return
-	}
-	if err := activities_model.NotifyWatchers(ctx, &activities_model.Action{
-		ActUserID: doer.ID,
-		ActUser:   doer,
-		OpType:    opType,
-		RepoID:    repo.ID,
-		Repo:      repo,
-		IsPrivate: repo.IsPrivate,
-		RefName:   refFullName.String(),
-	}); err != nil {
-		log.Error("NotifyWatchers: %v", err)
-	}
-}
-
-func (a *actionNotifier) NotifySyncPushCommits(ctx context.Context, pusher *user_model.User, repo *repo_model.Repository, opts *repository.PushUpdateOptions, commits *repository.PushCommits) {
-	data, err := json.Marshal(commits)
-	if err != nil {
-		log.Error("json.Marshal: %v", err)
-		return
-	}
-
-	if err := activities_model.NotifyWatchers(ctx, &activities_model.Action{
-		ActUserID: repo.OwnerID,
-		ActUser:   repo.MustOwner(ctx),
-		OpType:    activities_model.ActionMirrorSyncPush,
-		RepoID:    repo.ID,
-		Repo:      repo,
-		IsPrivate: repo.IsPrivate,
-		RefName:   opts.RefFullName.String(),
-		Content:   string(data),
-	}); err != nil {
-		log.Error("NotifyWatchers: %v", err)
-	}
-}
-
-func (a *actionNotifier) NotifySyncCreateRef(ctx context.Context, doer *user_model.User, repo *repo_model.Repository, refFullName git.RefName, refID string) {
-	if err := activities_model.NotifyWatchers(ctx, &activities_model.Action{
-		ActUserID: repo.OwnerID,
-		ActUser:   repo.MustOwner(ctx),
-		OpType:    activities_model.ActionMirrorSyncCreate,
-		RepoID:    repo.ID,
-		Repo:      repo,
-		IsPrivate: repo.IsPrivate,
-		RefName:   refFullName.String(),
-	}); err != nil {
-		log.Error("NotifyWatchers: %v", err)
-	}
-}
-
-func (a *actionNotifier) NotifySyncDeleteRef(ctx context.Context, doer *user_model.User, repo *repo_model.Repository, refFullName git.RefName) {
-	if err := activities_model.NotifyWatchers(ctx, &activities_model.Action{
-		ActUserID: repo.OwnerID,
-		ActUser:   repo.MustOwner(ctx),
-		OpType:    activities_model.ActionMirrorSyncDelete,
-		RepoID:    repo.ID,
-		Repo:      repo,
-		IsPrivate: repo.IsPrivate,
-		RefName:   refFullName.String(),
-	}); err != nil {
-		log.Error("NotifyWatchers: %v", err)
-	}
-}
-
-func (a *actionNotifier) NotifyNewRelease(ctx context.Context, rel *repo_model.Release) {
-	if err := rel.LoadAttributes(ctx); err != nil {
-		log.Error("LoadAttributes: %v", err)
-		return
-	}
-	if err := activities_model.NotifyWatchers(ctx, &activities_model.Action{
-		ActUserID: rel.PublisherID,
-		ActUser:   rel.Publisher,
-		OpType:    activities_model.ActionPublishRelease,
-		RepoID:    rel.RepoID,
-		Repo:      rel.Repo,
-		IsPrivate: rel.Repo.IsPrivate,
-		Content:   rel.Title,
-		RefName:   rel.TagName, // FIXME: use a full ref name?
-	}); err != nil {
-		log.Error("NotifyWatchers: %v", err)
-	}
-}

modules/notification/action/action_test.go

@@ -1,53 +0,0 @@
-// Copyright 2019 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
-
-package action
-
-import (
-	"path/filepath"
-	"strings"
-	"testing"
-
-	activities_model "code.gitea.io/gitea/models/activities"
-	"code.gitea.io/gitea/models/db"
-	repo_model "code.gitea.io/gitea/models/repo"
-	"code.gitea.io/gitea/models/unittest"
-	user_model "code.gitea.io/gitea/models/user"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestMain(m *testing.M) {
-	unittest.MainTest(m, &unittest.TestOptions{
-		GiteaRootPath: filepath.Join("..", "..", ".."),
-	})
-}
-
-func TestRenameRepoAction(t *testing.T) {
-	assert.NoError(t, unittest.PrepareTestDatabase())
-
-	user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
-	repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{OwnerID: user.ID})
-	repo.Owner = user
-
-	oldRepoName := repo.Name
-	const newRepoName = "newRepoName"
-	repo.Name = newRepoName
-	repo.LowerName = strings.ToLower(newRepoName)
-
-	actionBean := &activities_model.Action{
-		OpType:    activities_model.ActionRenameRepo,
-		ActUserID: user.ID,
-		ActUser:   user,
-		RepoID:    repo.ID,
-		Repo:      repo,
-		IsPrivate: repo.IsPrivate,
-		Content:   oldRepoName,
-	}
-	unittest.AssertNotExistsBean(t, actionBean)
-
-	NewNotifier().NotifyRenameRepository(db.DefaultContext, user, repo, oldRepoName)
-
-	unittest.AssertExistsAndLoadBean(t, actionBean)
-	unittest.CheckConsistencyFor(t, &activities_model.Action{})
-}

modules/notification/base/notifier.go

@@ -1,67 +0,0 @@
-// Copyright 2018 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
-
-package base
-
-import (
-	"context"
-
-	issues_model "code.gitea.io/gitea/models/issues"
-	packages_model "code.gitea.io/gitea/models/packages"
-	repo_model "code.gitea.io/gitea/models/repo"
-	user_model "code.gitea.io/gitea/models/user"
-	"code.gitea.io/gitea/modules/git"
-	"code.gitea.io/gitea/modules/repository"
-)
-
-// Notifier defines an interface to notify receiver
-type Notifier interface {
-	Run()
-	NotifyAdoptRepository(ctx context.Context, doer, u *user_model.User, repo *repo_model.Repository)
-	NotifyCreateRepository(ctx context.Context, doer, u *user_model.User, repo *repo_model.Repository)
-	NotifyMigrateRepository(ctx context.Context, doer, u *user_model.User, repo *repo_model.Repository)
-	NotifyDeleteRepository(ctx context.Context, doer *user_model.User, repo *repo_model.Repository)
-	NotifyForkRepository(ctx context.Context, doer *user_model.User, oldRepo, repo *repo_model.Repository)
-	NotifyRenameRepository(ctx context.Context, doer *user_model.User, repo *repo_model.Repository, oldRepoName string)
-	NotifyTransferRepository(ctx context.Context, doer *user_model.User, repo *repo_model.Repository, oldOwnerName string)
-	NotifyNewIssue(ctx context.Context, issue *issues_model.Issue, mentions []*user_model.User)
-	NotifyIssueChangeStatus(ctx context.Context, doer *user_model.User, commitID string, issue *issues_model.Issue, actionComment *issues_model.Comment, closeOrReopen bool)
-	NotifyDeleteIssue(ctx context.Context, doer *user_model.User, issue *issues_model.Issue)
-	NotifyIssueChangeMilestone(ctx context.Context, doer *user_model.User, issue *issues_model.Issue, oldMilestoneID int64)
-	NotifyIssueChangeAssignee(ctx context.Context, doer *user_model.User, issue *issues_model.Issue, assignee *user_model.User, removed bool, comment *issues_model.Comment)
-	NotifyPullRequestReviewRequest(ctx context.Context, doer *user_model.User, issue *issues_model.Issue, reviewer *user_model.User, isRequest bool, comment *issues_model.Comment)
-	NotifyIssueChangeContent(ctx context.Context, doer *user_model.User, issue *issues_model.Issue, oldContent string)
-	NotifyIssueClearLabels(ctx context.Context, doer *user_model.User, issue *issues_model.Issue)
-	NotifyIssueChangeTitle(ctx context.Context, doer *user_model.User, issue *issues_model.Issue, oldTitle string)
-	NotifyIssueChangeRef(ctx context.Context, doer *user_model.User, issue *issues_model.Issue, oldRef string)
-	NotifyIssueChangeLabels(ctx context.Context, doer *user_model.User, issue *issues_model.Issue,
-		addedLabels, removedLabels []*issues_model.Label)
-	NotifyNewPullRequest(ctx context.Context, pr *issues_model.PullRequest, mentions []*user_model.User)
-	NotifyMergePullRequest(ctx context.Context, doer *user_model.User, pr *issues_model.PullRequest)
-	NotifyAutoMergePullRequest(ctx context.Context, doer *user_model.User, pr *issues_model.PullRequest)
-	NotifyPullRequestSynchronized(ctx context.Context, doer *user_model.User, pr *issues_model.PullRequest)
-	NotifyPullRequestReview(ctx context.Context, pr *issues_model.PullRequest, review *issues_model.Review, comment *issues_model.Comment, mentions []*user_model.User)
-	NotifyPullRequestCodeComment(ctx context.Context, pr *issues_model.PullRequest, comment *issues_model.Comment, mentions []*user_model.User)
-	NotifyPullRequestChangeTargetBranch(ctx context.Context, doer *user_model.User, pr *issues_model.PullRequest, oldBranch string)
-	NotifyPullRequestPushCommits(ctx context.Context, doer *user_model.User, pr *issues_model.PullRequest, comment *issues_model.Comment)
-	NotifyPullReviewDismiss(ctx context.Context, doer *user_model.User, review *issues_model.Review, comment *issues_model.Comment)
-	NotifyCreateIssueComment(ctx context.Context, doer *user_model.User, repo *repo_model.Repository,
-		issue *issues_model.Issue, comment *issues_model.Comment, mentions []*user_model.User)
-	NotifyUpdateComment(ctx context.Context, doer *user_model.User, c *issues_model.Comment, oldContent string)
-	NotifyDeleteComment(ctx context.Context, doer *user_model.User, c *issues_model.Comment)
-	NotifyNewWikiPage(ctx context.Context, doer *user_model.User, repo *repo_model.Repository, page, comment string)
-	NotifyEditWikiPage(ctx context.Context, doer *user_model.User, repo *repo_model.Repository, page, comment string)
-	NotifyDeleteWikiPage(ctx context.Context, doer *user_model.User, repo *repo_model.Repository, page string)
-	NotifyNewRelease(ctx context.Context, rel *repo_model.Release)
-	NotifyUpdateRelease(ctx context.Context, doer *user_model.User, rel *repo_model.Release)
-	NotifyDeleteRelease(ctx context.Context, doer *user_model.User, rel *repo_model.Release)
-	NotifyPushCommits(ctx context.Context, pusher *user_model.User, repo *repo_model.Repository, opts *repository.PushUpdateOptions, commits *repository.PushCommits)
-	NotifyCreateRef(ctx context.Context, doer *user_model.User, repo *repo_model.Repository, refFullName git.RefName, refID string)
-	NotifyDeleteRef(ctx context.Context, doer *user_model.User, repo *repo_model.Repository, refFullName git.RefName)
-	NotifySyncPushCommits(ctx context.Context, pusher *user_model.User, repo *repo_model.Repository, opts *repository.PushUpdateOptions, commits *repository.PushCommits)
-	NotifySyncCreateRef(ctx context.Context, doer *user_model.User, repo *repo_model.Repository, refFullName git.RefName, refID string)
-	NotifySyncDeleteRef(ctx context.Context, doer *user_model.User, repo *repo_model.Repository, refFullName git.RefName)
-	NotifyRepoPendingTransfer(ctx context.Context, doer, newOwner *user_model.User, repo *repo_model.Repository)
-	NotifyPackageCreate(ctx context.Context, doer *user_model.User, pd *packages_model.PackageDescriptor)
-	NotifyPackageDelete(ctx context.Context, doer *user_model.User, pd *packages_model.PackageDescriptor)
-}

modules/notification/base/null.go

@@ -1,206 +0,0 @@
-// Copyright 2019 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
-
-package base
-
-import (
-	"context"
-
-	issues_model "code.gitea.io/gitea/models/issues"
-	packages_model "code.gitea.io/gitea/models/packages"
-	repo_model "code.gitea.io/gitea/models/repo"
-	user_model "code.gitea.io/gitea/models/user"
-	"code.gitea.io/gitea/modules/git"
-	"code.gitea.io/gitea/modules/repository"
-)
-
-// NullNotifier implements a blank notifier
-type NullNotifier struct{}
-
-var _ Notifier = &NullNotifier{}
-
-// Run places a place holder function
-func (*NullNotifier) Run() {
-}
-
-// NotifyCreateIssueComment places a place holder function
-func (*NullNotifier) NotifyCreateIssueComment(ctx context.Context, doer *user_model.User, repo *repo_model.Repository,
-	issue *issues_model.Issue, comment *issues_model.Comment, mentions []*user_model.User) {
-}
-
-// NotifyNewIssue places a place holder function
-func (*NullNotifier) NotifyNewIssue(ctx context.Context, issue *issues_model.Issue, mentions []*user_model.User) {
-}
-
-// NotifyIssueChangeStatus places a place holder function
-func (*NullNotifier) NotifyIssueChangeStatus(ctx context.Context, doer *user_model.User, commitID string, issue *issues_model.Issue, actionComment *issues_model.Comment, isClosed bool) {
-}
-
-// NotifyDeleteIssue notify when some issue deleted
-func (*NullNotifier) NotifyDeleteIssue(ctx context.Context, doer *user_model.User, issue *issues_model.Issue) {
-}
-
-// NotifyNewPullRequest places a place holder function
-func (*NullNotifier) NotifyNewPullRequest(ctx context.Context, pr *issues_model.PullRequest, mentions []*user_model.User) {
-}
-
-// NotifyPullRequestReview places a place holder function
-func (*NullNotifier) NotifyPullRequestReview(ctx context.Context, pr *issues_model.PullRequest, r *issues_model.Review, comment *issues_model.Comment, mentions []*user_model.User) {
-}
-
-// NotifyPullRequestCodeComment places a place holder function
-func (*NullNotifier) NotifyPullRequestCodeComment(ctx context.Context, pr *issues_model.PullRequest, comment *issues_model.Comment, mentions []*user_model.User) {
-}
-
-// NotifyMergePullRequest places a place holder function
-func (*NullNotifier) NotifyMergePullRequest(ctx context.Context, doer *user_model.User, pr *issues_model.PullRequest) {
-}
-
-// NotifyAutoMergePullRequest places a place holder function
-func (*NullNotifier) NotifyAutoMergePullRequest(ctx context.Context, doer *user_model.User, pr *issues_model.PullRequest) {
-}
-
-// NotifyPullRequestSynchronized places a place holder function
-func (*NullNotifier) NotifyPullRequestSynchronized(ctx context.Context, doer *user_model.User, pr *issues_model.PullRequest) {
-}
-
-// NotifyPullRequestChangeTargetBranch places a place holder function
-func (*NullNotifier) NotifyPullRequestChangeTargetBranch(ctx context.Context, doer *user_model.User, pr *issues_model.PullRequest, oldBranch string) {
-}
-
-// NotifyPullRequestPushCommits notifies when push commits to pull request's head branch
-func (*NullNotifier) NotifyPullRequestPushCommits(ctx context.Context, doer *user_model.User, pr *issues_model.PullRequest, comment *issues_model.Comment) {
-}
-
-// NotifyPullReviewDismiss notifies when a review was dismissed by repo admin
-func (*NullNotifier) NotifyPullReviewDismiss(ctx context.Context, doer *user_model.User, review *issues_model.Review, comment *issues_model.Comment) {
-}
-
-// NotifyUpdateComment places a place holder function
-func (*NullNotifier) NotifyUpdateComment(ctx context.Context, doer *user_model.User, c *issues_model.Comment, oldContent string) {
-}
-
-// NotifyDeleteComment places a place holder function
-func (*NullNotifier) NotifyDeleteComment(ctx context.Context, doer *user_model.User, c *issues_model.Comment) {
-}
-
-// NotifyNewWikiPage places a place holder function
-func (*NullNotifier) NotifyNewWikiPage(ctx context.Context, doer *user_model.User, repo *repo_model.Repository, page, comment string) {
-}
-
-// NotifyEditWikiPage places a place holder function
-func (*NullNotifier) NotifyEditWikiPage(ctx context.Context, doer *user_model.User, repo *repo_model.Repository, page, comment string) {
-}
-
-// NotifyDeleteWikiPage places a place holder function
-func (*NullNotifier) NotifyDeleteWikiPage(ctx context.Context, doer *user_model.User, repo *repo_model.Repository, page string) {
-}
-
-// NotifyNewRelease places a place holder function
-func (*NullNotifier) NotifyNewRelease(ctx context.Context, rel *repo_model.Release) {
-}
-
-// NotifyUpdateRelease places a place holder function
-func (*NullNotifier) NotifyUpdateRelease(ctx context.Context, doer *user_model.User, rel *repo_model.Release) {
-}
-
-// NotifyDeleteRelease places a place holder function
-func (*NullNotifier) NotifyDeleteRelease(ctx context.Context, doer *user_model.User, rel *repo_model.Release) {
-}
-
-// NotifyIssueChangeMilestone places a place holder function
-func (*NullNotifier) NotifyIssueChangeMilestone(ctx context.Context, doer *user_model.User, issue *issues_model.Issue, oldMilestoneID int64) {
-}
-
-// NotifyIssueChangeContent places a place holder function
-func (*NullNotifier) NotifyIssueChangeContent(ctx context.Context, doer *user_model.User, issue *issues_model.Issue, oldContent string) {
-}
-
-// NotifyIssueChangeAssignee places a place holder function
-func (*NullNotifier) NotifyIssueChangeAssignee(ctx context.Context, doer *user_model.User, issue *issues_model.Issue, assignee *user_model.User, removed bool, comment *issues_model.Comment) {
-}
-
-// NotifyPullRequestReviewRequest places a place holder function
-func (*NullNotifier) NotifyPullRequestReviewRequest(ctx context.Context, doer *user_model.User, issue *issues_model.Issue, reviewer *user_model.User, isRequest bool, comment *issues_model.Comment) {
-}
-
-// NotifyIssueClearLabels places a place holder function
-func (*NullNotifier) NotifyIssueClearLabels(ctx context.Context, doer *user_model.User, issue *issues_model.Issue) {
-}
-
-// NotifyIssueChangeTitle places a place holder function
-func (*NullNotifier) NotifyIssueChangeTitle(ctx context.Context, doer *user_model.User, issue *issues_model.Issue, oldTitle string) {
-}
-
-// NotifyIssueChangeRef places a place holder function
-func (*NullNotifier) NotifyIssueChangeRef(ctx context.Context, doer *user_model.User, issue *issues_model.Issue, oldTitle string) {
-}
-
-// NotifyIssueChangeLabels places a place holder function
-func (*NullNotifier) NotifyIssueChangeLabels(ctx context.Context, doer *user_model.User, issue *issues_model.Issue,
-	addedLabels, removedLabels []*issues_model.Label) {
-}
-
-// NotifyCreateRepository places a place holder function
-func (*NullNotifier) NotifyCreateRepository(ctx context.Context, doer, u *user_model.User, repo *repo_model.Repository) {
-}
-
-// NotifyAdoptRepository places a place holder function
-func (*NullNotifier) NotifyAdoptRepository(ctx context.Context, doer, u *user_model.User, repo *repo_model.Repository) {
-}
-
-// NotifyDeleteRepository places a place holder function
-func (*NullNotifier) NotifyDeleteRepository(ctx context.Context, doer *user_model.User, repo *repo_model.Repository) {
-}
-
-// NotifyForkRepository places a place holder function
-func (*NullNotifier) NotifyForkRepository(ctx context.Context, doer *user_model.User, oldRepo, repo *repo_model.Repository) {
-}
-
-// NotifyMigrateRepository places a place holder function
-func (*NullNotifier) NotifyMigrateRepository(ctx context.Context, doer, u *user_model.User, repo *repo_model.Repository) {
-}
-
-// NotifyPushCommits notifies commits pushed to notifiers
-func (*NullNotifier) NotifyPushCommits(ctx context.Context, pusher *user_model.User, repo *repo_model.Repository, opts *repository.PushUpdateOptions, commits *repository.PushCommits) {
-}
-
-// NotifyCreateRef notifies branch or tag creation to notifiers
-func (*NullNotifier) NotifyCreateRef(ctx context.Context, doer *user_model.User, repo *repo_model.Repository, refFullName git.RefName, refID string) {
-}
-
-// NotifyDeleteRef notifies branch or tag deletion to notifiers
-func (*NullNotifier) NotifyDeleteRef(ctx context.Context, doer *user_model.User, repo *repo_model.Repository, refFullName git.RefName) {
-}
-
-// NotifyRenameRepository places a place holder function
-func (*NullNotifier) NotifyRenameRepository(ctx context.Context, doer *user_model.User, repo *repo_model.Repository, oldRepoName string) {
-}
-
-// NotifyTransferRepository places a place holder function
-func (*NullNotifier) NotifyTransferRepository(ctx context.Context, doer *user_model.User, repo *repo_model.Repository, oldOwnerName string) {
-}
-
-// NotifySyncPushCommits places a place holder function
-func (*NullNotifier) NotifySyncPushCommits(ctx context.Context, pusher *user_model.User, repo *repo_model.Repository, opts *repository.PushUpdateOptions, commits *repository.PushCommits) {
-}
-
-// NotifySyncCreateRef places a place holder function
-func (*NullNotifier) NotifySyncCreateRef(ctx context.Context, doer *user_model.User, repo *repo_model.Repository, refFullName git.RefName, refID string) {
-}
-
-// NotifySyncDeleteRef places a place holder function
-func (*NullNotifier) NotifySyncDeleteRef(ctx context.Context, doer *user_model.User, repo *repo_model.Repository, refFullName git.RefName) {
-}
-
-// NotifyRepoPendingTransfer places a place holder function
-func (*NullNotifier) NotifyRepoPendingTransfer(ctx context.Context, doer, newOwner *user_model.User, repo *repo_model.Repository) {
-}
-
-// NotifyPackageCreate places a place holder function
-func (*NullNotifier) NotifyPackageCreate(ctx context.Context, doer *user_model.User, pd *packages_model.PackageDescriptor) {
-}
-
-// NotifyPackageDelete places a place holder function
-func (*NullNotifier) NotifyPackageDelete(ctx context.Context, doer *user_model.User, pd *packages_model.PackageDescriptor) {
-}

modules/notification/indexer/indexer.go

@@ -1,123 +0,0 @@
-// Copyright 2019 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
-
-package indexer
-
-import (
-	"context"
-
-	issues_model "code.gitea.io/gitea/models/issues"
-	repo_model "code.gitea.io/gitea/models/repo"
-	user_model "code.gitea.io/gitea/models/user"
-	code_indexer "code.gitea.io/gitea/modules/indexer/code"
-	issue_indexer "code.gitea.io/gitea/modules/indexer/issues"
-	stats_indexer "code.gitea.io/gitea/modules/indexer/stats"
-	"code.gitea.io/gitea/modules/log"
-	"code.gitea.io/gitea/modules/notification/base"
-	"code.gitea.io/gitea/modules/repository"
-	"code.gitea.io/gitea/modules/setting"
-)
-
-type indexerNotifier struct {
-	base.NullNotifier
-}
-
-var _ base.Notifier = &indexerNotifier{}
-
-// NewNotifier create a new indexerNotifier notifier
-func NewNotifier() base.Notifier {
-	return &indexerNotifier{}
-}
-
-func (r *indexerNotifier) NotifyAdoptRepository(ctx context.Context, doer, u *user_model.User, repo *repo_model.Repository) {
-	r.NotifyMigrateRepository(ctx, doer, u, repo)
-}
-
-func (r *indexerNotifier) NotifyCreateIssueComment(ctx context.Context, doer *user_model.User, repo *repo_model.Repository,
-	issue *issues_model.Issue, comment *issues_model.Comment, mentions []*user_model.User,
-) {
-	issue_indexer.UpdateIssueIndexer(issue.ID)
-}
-
-func (r *indexerNotifier) NotifyNewIssue(ctx context.Context, issue *issues_model.Issue, mentions []*user_model.User) {
-	issue_indexer.UpdateIssueIndexer(issue.ID)
-}
-
-func (r *indexerNotifier) NotifyNewPullRequest(ctx context.Context, pr *issues_model.PullRequest, mentions []*user_model.User) {
-	if err := pr.LoadIssue(ctx); err != nil {
-		log.Error("LoadIssue: %v", err)
-		return
-	}
-	issue_indexer.UpdateIssueIndexer(pr.Issue.ID)
-}
-
-func (r *indexerNotifier) NotifyUpdateComment(ctx context.Context, doer *user_model.User, c *issues_model.Comment, oldContent string) {
-	if err := c.LoadIssue(ctx); err != nil {
-		log.Error("LoadIssue: %v", err)
-		return
-	}
-	issue_indexer.UpdateIssueIndexer(c.Issue.ID)
-}
-
-func (r *indexerNotifier) NotifyDeleteComment(ctx context.Context, doer *user_model.User, comment *issues_model.Comment) {
-	if err := comment.LoadIssue(ctx); err != nil {
-		log.Error("LoadIssue: %v", err)
-		return
-	}
-	issue_indexer.UpdateIssueIndexer(comment.Issue.ID)
-}
-
-func (r *indexerNotifier) NotifyDeleteRepository(ctx context.Context, doer *user_model.User, repo *repo_model.Repository) {
-	issue_indexer.DeleteRepoIssueIndexer(ctx, repo.ID)
-	if setting.Indexer.RepoIndexerEnabled {
-		code_indexer.UpdateRepoIndexer(repo)
-	}
-}
-
-func (r *indexerNotifier) NotifyMigrateRepository(ctx context.Context, doer, u *user_model.User, repo *repo_model.Repository) {
-	issue_indexer.UpdateRepoIndexer(ctx, repo.ID)
-	if setting.Indexer.RepoIndexerEnabled && !repo.IsEmpty {
-		code_indexer.UpdateRepoIndexer(repo)
-	}
-	if err := stats_indexer.UpdateRepoIndexer(repo); err != nil {
-		log.Error("stats_indexer.UpdateRepoIndexer(%d) failed: %v", repo.ID, err)
-	}
-}
-
-func (r *indexerNotifier) NotifyPushCommits(ctx context.Context, pusher *user_model.User, repo *repo_model.Repository, opts *repository.PushUpdateOptions, commits *repository.PushCommits) {
-	if !opts.RefFullName.IsBranch() {
-		return
-	}
-
-	if setting.Indexer.RepoIndexerEnabled && opts.RefFullName.BranchName() == repo.DefaultBranch {
-		code_indexer.UpdateRepoIndexer(repo)
-	}
-	if err := stats_indexer.UpdateRepoIndexer(repo); err != nil {
-		log.Error("stats_indexer.UpdateRepoIndexer(%d) failed: %v", repo.ID, err)
-	}
-}
-
-func (r *indexerNotifier) NotifySyncPushCommits(ctx context.Context, pusher *user_model.User, repo *repo_model.Repository, opts *repository.PushUpdateOptions, commits *repository.PushCommits) {
-	if !opts.RefFullName.IsBranch() {
-		return
-	}
-
-	if setting.Indexer.RepoIndexerEnabled && opts.RefFullName.BranchName() == repo.DefaultBranch {
-		code_indexer.UpdateRepoIndexer(repo)
-	}
-	if err := stats_indexer.UpdateRepoIndexer(repo); err != nil {
-		log.Error("stats_indexer.UpdateRepoIndexer(%d) failed: %v", repo.ID, err)
-	}
-}
-
-func (r *indexerNotifier) NotifyIssueChangeContent(ctx context.Context, doer *user_model.User, issue *issues_model.Issue, oldContent string) {
-	issue_indexer.UpdateIssueIndexer(issue.ID)
-}
-
-func (r *indexerNotifier) NotifyIssueChangeTitle(ctx context.Context, doer *user_model.User, issue *issues_model.Issue, oldTitle string) {
-	issue_indexer.UpdateIssueIndexer(issue.ID)
-}
-
-func (r *indexerNotifier) NotifyIssueChangeRef(ctx context.Context, doer *user_model.User, issue *issues_model.Issue, oldRef string) {
-	issue_indexer.UpdateIssueIndexer(issue.ID)
-}

modules/notification/mail/mail.go

@@ -1,202 +0,0 @@
-// Copyright 2019 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
-
-package mail
-
-import (
-	"context"
-	"fmt"
-
-	activities_model "code.gitea.io/gitea/models/activities"
-	issues_model "code.gitea.io/gitea/models/issues"
-	repo_model "code.gitea.io/gitea/models/repo"
-	user_model "code.gitea.io/gitea/models/user"
-	"code.gitea.io/gitea/modules/log"
-	"code.gitea.io/gitea/modules/notification/base"
-	"code.gitea.io/gitea/services/mailer"
-)
-
-type mailNotifier struct {
-	base.NullNotifier
-}
-
-var _ base.Notifier = &mailNotifier{}
-
-// NewNotifier create a new mailNotifier notifier
-func NewNotifier() base.Notifier {
-	return &mailNotifier{}
-}
-
-func (m *mailNotifier) NotifyCreateIssueComment(ctx context.Context, doer *user_model.User, repo *repo_model.Repository,
-	issue *issues_model.Issue, comment *issues_model.Comment, mentions []*user_model.User,
-) {
-	var act activities_model.ActionType
-	if comment.Type == issues_model.CommentTypeClose {
-		act = activities_model.ActionCloseIssue
-	} else if comment.Type == issues_model.CommentTypeReopen {
-		act = activities_model.ActionReopenIssue
-	} else if comment.Type == issues_model.CommentTypeComment {
-		act = activities_model.ActionCommentIssue
-	} else if comment.Type == issues_model.CommentTypeCode {
-		act = activities_model.ActionCommentIssue
-	} else if comment.Type == issues_model.CommentTypePullRequestPush {
-		act = 0
-	}
-
-	if err := mailer.MailParticipantsComment(ctx, comment, act, issue, mentions); err != nil {
-		log.Error("MailParticipantsComment: %v", err)
-	}
-}
-
-func (m *mailNotifier) NotifyNewIssue(ctx context.Context, issue *issues_model.Issue, mentions []*user_model.User) {
-	if err := mailer.MailParticipants(ctx, issue, issue.Poster, activities_model.ActionCreateIssue, mentions); err != nil {
-		log.Error("MailParticipants: %v", err)
-	}
-}
-
-func (m *mailNotifier) NotifyIssueChangeStatus(ctx context.Context, doer *user_model.User, commitID string, issue *issues_model.Issue, actionComment *issues_model.Comment, isClosed bool) {
-	var actionType activities_model.ActionType
-	if issue.IsPull {
-		if isClosed {
-			actionType = activities_model.ActionClosePullRequest
-		} else {
-			actionType = activities_model.ActionReopenPullRequest
-		}
-	} else {
-		if isClosed {
-			actionType = activities_model.ActionCloseIssue
-		} else {
-			actionType = activities_model.ActionReopenIssue
-		}
-	}
-
-	if err := mailer.MailParticipants(ctx, issue, doer, actionType, nil); err != nil {
-		log.Error("MailParticipants: %v", err)
-	}
-}
-
-func (m *mailNotifier) NotifyIssueChangeTitle(ctx context.Context, doer *user_model.User, issue *issues_model.Issue, oldTitle string) {
-	if err := issue.LoadPullRequest(ctx); err != nil {
-		log.Error("issue.LoadPullRequest: %v", err)
-		return
-	}
-	if issue.IsPull && issues_model.HasWorkInProgressPrefix(oldTitle) && !issue.PullRequest.IsWorkInProgress() {
-		if err := mailer.MailParticipants(ctx, issue, doer, activities_model.ActionPullRequestReadyForReview, nil); err != nil {
-			log.Error("MailParticipants: %v", err)
-		}
-	}
-}
-
-func (m *mailNotifier) NotifyNewPullRequest(ctx context.Context, pr *issues_model.PullRequest, mentions []*user_model.User) {
-	if err := mailer.MailParticipants(ctx, pr.Issue, pr.Issue.Poster, activities_model.ActionCreatePullRequest, mentions); err != nil {
-		log.Error("MailParticipants: %v", err)
-	}
-}
-
-func (m *mailNotifier) NotifyPullRequestReview(ctx context.Context, pr *issues_model.PullRequest, r *issues_model.Review, comment *issues_model.Comment, mentions []*user_model.User) {
-	var act activities_model.ActionType
-	if comment.Type == issues_model.CommentTypeClose {
-		act = activities_model.ActionCloseIssue
-	} else if comment.Type == issues_model.CommentTypeReopen {
-		act = activities_model.ActionReopenIssue
-	} else if comment.Type == issues_model.CommentTypeComment {
-		act = activities_model.ActionCommentPull
-	}
-	if err := mailer.MailParticipantsComment(ctx, comment, act, pr.Issue, mentions); err != nil {
-		log.Error("MailParticipantsComment: %v", err)
-	}
-}
-
-func (m *mailNotifier) NotifyPullRequestCodeComment(ctx context.Context, pr *issues_model.PullRequest, comment *issues_model.Comment, mentions []*user_model.User) {
-	if err := mailer.MailMentionsComment(ctx, pr, comment, mentions); err != nil {
-		log.Error("MailMentionsComment: %v", err)
-	}
-}
-
-func (m *mailNotifier) NotifyIssueChangeAssignee(ctx context.Context, doer *user_model.User, issue *issues_model.Issue, assignee *user_model.User, removed bool, comment *issues_model.Comment) {
-	// mail only sent to added assignees and not self-assignee
-	if !removed && doer.ID != assignee.ID && assignee.EmailNotifications() != user_model.EmailNotificationsDisabled {
-		ct := fmt.Sprintf("Assigned #%d.", issue.Index)
-		if err := mailer.SendIssueAssignedMail(ctx, issue, doer, ct, comment, []*user_model.User{assignee}); err != nil {
-			log.Error("Error in SendIssueAssignedMail for issue[%d] to assignee[%d]: %v", issue.ID, assignee.ID, err)
-		}
-	}
-}
-
-func (m *mailNotifier) NotifyPullRequestReviewRequest(ctx context.Context, doer *user_model.User, issue *issues_model.Issue, reviewer *user_model.User, isRequest bool, comment *issues_model.Comment) {
-	if isRequest && doer.ID != reviewer.ID && reviewer.EmailNotifications() != user_model.EmailNotificationsDisabled {
-		ct := fmt.Sprintf("Requested to review %s.", issue.HTMLURL())
-		if err := mailer.SendIssueAssignedMail(ctx, issue, doer, ct, comment, []*user_model.User{reviewer}); err != nil {
-			log.Error("Error in SendIssueAssignedMail for issue[%d] to reviewer[%d]: %v", issue.ID, reviewer.ID, err)
-		}
-	}
-}
-
-func (m *mailNotifier) NotifyMergePullRequest(ctx context.Context, doer *user_model.User, pr *issues_model.PullRequest) {
-	if err := pr.LoadIssue(ctx); err != nil {
-		log.Error("LoadIssue: %v", err)
-		return
-	}
-	if err := mailer.MailParticipants(ctx, pr.Issue, doer, activities_model.ActionMergePullRequest, nil); err != nil {
-		log.Error("MailParticipants: %v", err)
-	}
-}
-
-func (m *mailNotifier) NotifyAutoMergePullRequest(ctx context.Context, doer *user_model.User, pr *issues_model.PullRequest) {
-	if err := pr.LoadIssue(ctx); err != nil {
-		log.Error("pr.LoadIssue: %v", err)
-		return
-	}
-	if err := mailer.MailParticipants(ctx, pr.Issue, doer, activities_model.ActionAutoMergePullRequest, nil); err != nil {
-		log.Error("MailParticipants: %v", err)
-	}
-}
-
-func (m *mailNotifier) NotifyPullRequestPushCommits(ctx context.Context, doer *user_model.User, pr *issues_model.PullRequest, comment *issues_model.Comment) {
-	var err error
-	if err = comment.LoadIssue(ctx); err != nil {
-		log.Error("comment.LoadIssue: %v", err)
-		return
-	}
-	if err = comment.Issue.LoadRepo(ctx); err != nil {
-		log.Error("comment.Issue.LoadRepo: %v", err)
-		return
-	}
-	if err = comment.Issue.LoadPullRequest(ctx); err != nil {
-		log.Error("comment.Issue.LoadPullRequest: %v", err)
-		return
-	}
-	if err = comment.Issue.PullRequest.LoadBaseRepo(ctx); err != nil {
-		log.Error("comment.Issue.PullRequest.LoadBaseRepo: %v", err)
-		return
-	}
-	if err := comment.LoadPushCommits(ctx); err != nil {
-		log.Error("comment.LoadPushCommits: %v", err)
-	}
-	m.NotifyCreateIssueComment(ctx, doer, comment.Issue.Repo, comment.Issue, comment, nil)
-}
-
-func (m *mailNotifier) NotifyPullReviewDismiss(ctx context.Context, doer *user_model.User, review *issues_model.Review, comment *issues_model.Comment) {
-	if err := mailer.MailParticipantsComment(ctx, comment, activities_model.ActionPullReviewDismissed, review.Issue, nil); err != nil {
-		log.Error("MailParticipantsComment: %v", err)
-	}
-}
-
-func (m *mailNotifier) NotifyNewRelease(ctx context.Context, rel *repo_model.Release) {
-	if err := rel.LoadAttributes(ctx); err != nil {
-		log.Error("LoadAttributes: %v", err)
-		return
-	}
-
-	if rel.IsDraft || rel.IsPrerelease {
-		return
-	}
-
-	mailer.MailNewRelease(ctx, rel)
-}
-
-func (m *mailNotifier) NotifyRepoPendingTransfer(ctx context.Context, doer, newOwner *user_model.User, repo *repo_model.Repository) {
-	if err := mailer.SendRepoTransferNotifyMail(ctx, doer, newOwner, repo); err != nil {
-		log.Error("SendRepoTransferNotifyMail: %v", err)
-	}
-}

modules/notification/notification.go

@@ -1,378 +0,0 @@
-// Copyright 2018 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
-
-package notification
-
-import (
-	"context"
-
-	issues_model "code.gitea.io/gitea/models/issues"
-	packages_model "code.gitea.io/gitea/models/packages"
-	repo_model "code.gitea.io/gitea/models/repo"
-	user_model "code.gitea.io/gitea/models/user"
-	"code.gitea.io/gitea/modules/git"
-	"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/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"
-)
-
-var notifiers []base.Notifier
-
-// RegisterNotifier providers method to receive notify messages
-func RegisterNotifier(notifier base.Notifier) {
-	go notifier.Run()
-	notifiers = append(notifiers, notifier)
-}
-
-// NewContext registers notification handlers
-func NewContext() {
-	RegisterNotifier(ui.NewNotifier())
-	if setting.Service.EnableNotifyMail {
-		RegisterNotifier(mail.NewNotifier())
-	}
-	RegisterNotifier(indexer.NewNotifier())
-	RegisterNotifier(action.NewNotifier())
-}
-
-// NotifyNewWikiPage notifies creating new wiki pages to notifiers
-func NotifyNewWikiPage(ctx context.Context, doer *user_model.User, repo *repo_model.Repository, page, comment string) {
-	for _, notifier := range notifiers {
-		notifier.NotifyNewWikiPage(ctx, doer, repo, page, comment)
-	}
-}
-
-// NotifyEditWikiPage notifies editing or renaming wiki pages to notifiers
-func NotifyEditWikiPage(ctx context.Context, doer *user_model.User, repo *repo_model.Repository, page, comment string) {
-	for _, notifier := range notifiers {
-		notifier.NotifyEditWikiPage(ctx, doer, repo, page, comment)
-	}
-}
-
-// NotifyDeleteWikiPage notifies deleting wiki pages to notifiers
-func NotifyDeleteWikiPage(ctx context.Context, doer *user_model.User, repo *repo_model.Repository, page string) {
-	for _, notifier := range notifiers {
-		notifier.NotifyDeleteWikiPage(ctx, doer, repo, page)
-	}
-}
-
-// NotifyCreateIssueComment notifies issue comment related message to notifiers
-func NotifyCreateIssueComment(ctx context.Context, doer *user_model.User, repo *repo_model.Repository,
-	issue *issues_model.Issue, comment *issues_model.Comment, mentions []*user_model.User,
-) {
-	for _, notifier := range notifiers {
-		notifier.NotifyCreateIssueComment(ctx, doer, repo, issue, comment, mentions)
-	}
-}
-
-// NotifyNewIssue notifies new issue to notifiers
-func NotifyNewIssue(ctx context.Context, issue *issues_model.Issue, mentions []*user_model.User) {
-	for _, notifier := range notifiers {
-		notifier.NotifyNewIssue(ctx, issue, mentions)
-	}
-}
-
-// NotifyIssueChangeStatus notifies close or reopen issue to notifiers
-func NotifyIssueChangeStatus(ctx context.Context, doer *user_model.User, commitID string, issue *issues_model.Issue, actionComment *issues_model.Comment, closeOrReopen bool) {
-	for _, notifier := range notifiers {
-		notifier.NotifyIssueChangeStatus(ctx, doer, commitID, issue, actionComment, closeOrReopen)
-	}
-}
-
-// NotifyDeleteIssue notify when some issue deleted
-func NotifyDeleteIssue(ctx context.Context, doer *user_model.User, issue *issues_model.Issue) {
-	for _, notifier := range notifiers {
-		notifier.NotifyDeleteIssue(ctx, doer, issue)
-	}
-}
-
-// NotifyMergePullRequest notifies merge pull request to notifiers
-func NotifyMergePullRequest(ctx context.Context, doer *user_model.User, pr *issues_model.PullRequest) {
-	for _, notifier := range notifiers {
-		notifier.NotifyMergePullRequest(ctx, doer, pr)
-	}
-}
-
-// NotifyAutoMergePullRequest notifies merge pull request to notifiers
-func NotifyAutoMergePullRequest(ctx context.Context, doer *user_model.User, pr *issues_model.PullRequest) {
-	for _, notifier := range notifiers {
-		notifier.NotifyAutoMergePullRequest(ctx, doer, pr)
-	}
-}
-
-// NotifyNewPullRequest notifies new pull request to notifiers
-func NotifyNewPullRequest(ctx context.Context, pr *issues_model.PullRequest, mentions []*user_model.User) {
-	if err := pr.LoadIssue(ctx); err != nil {
-		log.Error("%v", err)
-		return
-	}
-	if err := pr.Issue.LoadPoster(ctx); err != nil {
-		return
-	}
-	for _, notifier := range notifiers {
-		notifier.NotifyNewPullRequest(ctx, pr, mentions)
-	}
-}
-
-// NotifyPullRequestSynchronized notifies Synchronized pull request
-func NotifyPullRequestSynchronized(ctx context.Context, doer *user_model.User, pr *issues_model.PullRequest) {
-	for _, notifier := range notifiers {
-		notifier.NotifyPullRequestSynchronized(ctx, doer, pr)
-	}
-}
-
-// NotifyPullRequestReview notifies new pull request review
-func NotifyPullRequestReview(ctx context.Context, pr *issues_model.PullRequest, review *issues_model.Review, comment *issues_model.Comment, mentions []*user_model.User) {
-	if err := review.LoadReviewer(ctx); err != nil {
-		log.Error("%v", err)
-		return
-	}
-	for _, notifier := range notifiers {
-		notifier.NotifyPullRequestReview(ctx, pr, review, comment, mentions)
-	}
-}
-
-// NotifyPullRequestCodeComment notifies new pull request code comment
-func NotifyPullRequestCodeComment(ctx context.Context, pr *issues_model.PullRequest, comment *issues_model.Comment, mentions []*user_model.User) {
-	if err := comment.LoadPoster(ctx); err != nil {
-		log.Error("LoadPoster: %v", err)
-		return
-	}
-	for _, notifier := range notifiers {
-		notifier.NotifyPullRequestCodeComment(ctx, pr, comment, mentions)
-	}
-}
-
-// NotifyPullRequestChangeTargetBranch notifies when a pull request's target branch was changed
-func NotifyPullRequestChangeTargetBranch(ctx context.Context, doer *user_model.User, pr *issues_model.PullRequest, oldBranch string) {
-	for _, notifier := range notifiers {
-		notifier.NotifyPullRequestChangeTargetBranch(ctx, doer, pr, oldBranch)
-	}
-}
-
-// NotifyPullRequestPushCommits notifies when push commits to pull request's head branch
-func NotifyPullRequestPushCommits(ctx context.Context, doer *user_model.User, pr *issues_model.PullRequest, comment *issues_model.Comment) {
-	for _, notifier := range notifiers {
-		notifier.NotifyPullRequestPushCommits(ctx, doer, pr, comment)
-	}
-}
-
-// NotifyPullReviewDismiss notifies when a review was dismissed by repo admin
-func NotifyPullReviewDismiss(ctx context.Context, doer *user_model.User, review *issues_model.Review, comment *issues_model.Comment) {
-	for _, notifier := range notifiers {
-		notifier.NotifyPullReviewDismiss(ctx, doer, review, comment)
-	}
-}
-
-// NotifyUpdateComment notifies update comment to notifiers
-func NotifyUpdateComment(ctx context.Context, doer *user_model.User, c *issues_model.Comment, oldContent string) {
-	for _, notifier := range notifiers {
-		notifier.NotifyUpdateComment(ctx, doer, c, oldContent)
-	}
-}
-
-// NotifyDeleteComment notifies delete comment to notifiers
-func NotifyDeleteComment(ctx context.Context, doer *user_model.User, c *issues_model.Comment) {
-	for _, notifier := range notifiers {
-		notifier.NotifyDeleteComment(ctx, doer, c)
-	}
-}
-
-// NotifyNewRelease notifies new release to notifiers
-func NotifyNewRelease(ctx context.Context, rel *repo_model.Release) {
-	if err := rel.LoadAttributes(ctx); err != nil {
-		log.Error("LoadPublisher: %v", err)
-		return
-	}
-	for _, notifier := range notifiers {
-		notifier.NotifyNewRelease(ctx, rel)
-	}
-}
-
-// NotifyUpdateRelease notifies update release to notifiers
-func NotifyUpdateRelease(ctx context.Context, doer *user_model.User, rel *repo_model.Release) {
-	for _, notifier := range notifiers {
-		notifier.NotifyUpdateRelease(ctx, doer, rel)
-	}
-}
-
-// NotifyDeleteRelease notifies delete release to notifiers
-func NotifyDeleteRelease(ctx context.Context, doer *user_model.User, rel *repo_model.Release) {
-	for _, notifier := range notifiers {
-		notifier.NotifyDeleteRelease(ctx, doer, rel)
-	}
-}
-
-// NotifyIssueChangeMilestone notifies change milestone to notifiers
-func NotifyIssueChangeMilestone(ctx context.Context, doer *user_model.User, issue *issues_model.Issue, oldMilestoneID int64) {
-	for _, notifier := range notifiers {
-		notifier.NotifyIssueChangeMilestone(ctx, doer, issue, oldMilestoneID)
-	}
-}
-
-// NotifyIssueChangeContent notifies change content to notifiers
-func NotifyIssueChangeContent(ctx context.Context, doer *user_model.User, issue *issues_model.Issue, oldContent string) {
-	for _, notifier := range notifiers {
-		notifier.NotifyIssueChangeContent(ctx, doer, issue, oldContent)
-	}
-}
-
-// NotifyIssueChangeAssignee notifies change content to notifiers
-func NotifyIssueChangeAssignee(ctx context.Context, doer *user_model.User, issue *issues_model.Issue, assignee *user_model.User, removed bool, comment *issues_model.Comment) {
-	for _, notifier := range notifiers {
-		notifier.NotifyIssueChangeAssignee(ctx, doer, issue, assignee, removed, comment)
-	}
-}
-
-// NotifyPullRequestReviewRequest notifies Request Review change
-func NotifyPullRequestReviewRequest(ctx context.Context, doer *user_model.User, issue *issues_model.Issue, reviewer *user_model.User, isRequest bool, comment *issues_model.Comment) {
-	for _, notifier := range notifiers {
-		notifier.NotifyPullRequestReviewRequest(ctx, doer, issue, reviewer, isRequest, comment)
-	}
-}
-
-// NotifyIssueClearLabels notifies clear labels to notifiers
-func NotifyIssueClearLabels(ctx context.Context, doer *user_model.User, issue *issues_model.Issue) {
-	for _, notifier := range notifiers {
-		notifier.NotifyIssueClearLabels(ctx, doer, issue)
-	}
-}
-
-// NotifyIssueChangeTitle notifies change title to notifiers
-func NotifyIssueChangeTitle(ctx context.Context, doer *user_model.User, issue *issues_model.Issue, oldTitle string) {
-	for _, notifier := range notifiers {
-		notifier.NotifyIssueChangeTitle(ctx, doer, issue, oldTitle)
-	}
-}
-
-// NotifyIssueChangeRef notifies change reference to notifiers
-func NotifyIssueChangeRef(ctx context.Context, doer *user_model.User, issue *issues_model.Issue, oldRef string) {
-	for _, notifier := range notifiers {
-		notifier.NotifyIssueChangeRef(ctx, doer, issue, oldRef)
-	}
-}
-
-// NotifyIssueChangeLabels notifies change labels to notifiers
-func NotifyIssueChangeLabels(ctx context.Context, doer *user_model.User, issue *issues_model.Issue,
-	addedLabels, removedLabels []*issues_model.Label,
-) {
-	for _, notifier := range notifiers {
-		notifier.NotifyIssueChangeLabels(ctx, doer, issue, addedLabels, removedLabels)
-	}
-}
-
-// NotifyCreateRepository notifies create repository to notifiers
-func NotifyCreateRepository(ctx context.Context, doer, u *user_model.User, repo *repo_model.Repository) {
-	for _, notifier := range notifiers {
-		notifier.NotifyCreateRepository(ctx, doer, u, repo)
-	}
-}
-
-// NotifyAdoptRepository notifies the adoption of a repository to notifiers
-func NotifyAdoptRepository(ctx context.Context, doer, u *user_model.User, repo *repo_model.Repository) {
-	for _, notifier := range notifiers {
-		notifier.NotifyAdoptRepository(ctx, doer, u, repo)
-	}
-}
-
-// NotifyMigrateRepository notifies create repository to notifiers
-func NotifyMigrateRepository(ctx context.Context, doer, u *user_model.User, repo *repo_model.Repository) {
-	for _, notifier := range notifiers {
-		notifier.NotifyMigrateRepository(ctx, doer, u, repo)
-	}
-}
-
-// NotifyTransferRepository notifies create repository to notifiers
-func NotifyTransferRepository(ctx context.Context, doer *user_model.User, repo *repo_model.Repository, newOwnerName string) {
-	for _, notifier := range notifiers {
-		notifier.NotifyTransferRepository(ctx, doer, repo, newOwnerName)
-	}
-}
-
-// NotifyDeleteRepository notifies delete repository to notifiers
-func NotifyDeleteRepository(ctx context.Context, doer *user_model.User, repo *repo_model.Repository) {
-	for _, notifier := range notifiers {
-		notifier.NotifyDeleteRepository(ctx, doer, repo)
-	}
-}
-
-// NotifyForkRepository notifies fork repository to notifiers
-func NotifyForkRepository(ctx context.Context, doer *user_model.User, oldRepo, repo *repo_model.Repository) {
-	for _, notifier := range notifiers {
-		notifier.NotifyForkRepository(ctx, doer, oldRepo, repo)
-	}
-}
-
-// NotifyRenameRepository notifies repository renamed
-func NotifyRenameRepository(ctx context.Context, doer *user_model.User, repo *repo_model.Repository, oldName string) {
-	for _, notifier := range notifiers {
-		notifier.NotifyRenameRepository(ctx, doer, repo, oldName)
-	}
-}
-
-// NotifyPushCommits notifies commits pushed to notifiers
-func NotifyPushCommits(ctx context.Context, pusher *user_model.User, repo *repo_model.Repository, opts *repository.PushUpdateOptions, commits *repository.PushCommits) {
-	for _, notifier := range notifiers {
-		notifier.NotifyPushCommits(ctx, pusher, repo, opts, commits)
-	}
-}
-
-// NotifyCreateRef notifies branch or tag creation to notifiers
-func NotifyCreateRef(ctx context.Context, pusher *user_model.User, repo *repo_model.Repository, refFullName git.RefName, refID string) {
-	for _, notifier := range notifiers {
-		notifier.NotifyCreateRef(ctx, pusher, repo, refFullName, refID)
-	}
-}
-
-// NotifyDeleteRef notifies branch or tag deletion to notifiers
-func NotifyDeleteRef(ctx context.Context, pusher *user_model.User, repo *repo_model.Repository, refFullName git.RefName) {
-	for _, notifier := range notifiers {
-		notifier.NotifyDeleteRef(ctx, pusher, repo, refFullName)
-	}
-}
-
-// NotifySyncPushCommits notifies commits pushed to notifiers
-func NotifySyncPushCommits(ctx context.Context, pusher *user_model.User, repo *repo_model.Repository, opts *repository.PushUpdateOptions, commits *repository.PushCommits) {
-	for _, notifier := range notifiers {
-		notifier.NotifySyncPushCommits(ctx, pusher, repo, opts, commits)
-	}
-}
-
-// NotifySyncCreateRef notifies branch or tag creation to notifiers
-func NotifySyncCreateRef(ctx context.Context, pusher *user_model.User, repo *repo_model.Repository, refFullName git.RefName, refID string) {
-	for _, notifier := range notifiers {
-		notifier.NotifySyncCreateRef(ctx, pusher, repo, refFullName, refID)
-	}
-}
-
-// NotifySyncDeleteRef notifies branch or tag deletion to notifiers
-func NotifySyncDeleteRef(ctx context.Context, pusher *user_model.User, repo *repo_model.Repository, refFullName git.RefName) {
-	for _, notifier := range notifiers {
-		notifier.NotifySyncDeleteRef(ctx, pusher, repo, refFullName)
-	}
-}
-
-// NotifyRepoPendingTransfer notifies creation of pending transfer to notifiers
-func NotifyRepoPendingTransfer(ctx context.Context, doer, newOwner *user_model.User, repo *repo_model.Repository) {
-	for _, notifier := range notifiers {
-		notifier.NotifyRepoPendingTransfer(ctx, doer, newOwner, repo)
-	}
-}
-
-// NotifyPackageCreate notifies creation of a package to notifiers
-func NotifyPackageCreate(ctx context.Context, doer *user_model.User, pd *packages_model.PackageDescriptor) {
-	for _, notifier := range notifiers {
-		notifier.NotifyPackageCreate(ctx, doer, pd)
-	}
-}
-
-// NotifyPackageDelete notifies deletion of a package to notifiers
-func NotifyPackageDelete(ctx context.Context, doer *user_model.User, pd *packages_model.PackageDescriptor) {
-	for _, notifier := range notifiers {
-		notifier.NotifyPackageDelete(ctx, doer, pd)
-	}
-}

modules/notification/ui/ui.go

@@ -1,255 +0,0 @@
-// Copyright 2018 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
-
-package ui
-
-import (
-	"context"
-
-	activities_model "code.gitea.io/gitea/models/activities"
-	"code.gitea.io/gitea/models/db"
-	issues_model "code.gitea.io/gitea/models/issues"
-	repo_model "code.gitea.io/gitea/models/repo"
-	user_model "code.gitea.io/gitea/models/user"
-	"code.gitea.io/gitea/modules/container"
-	"code.gitea.io/gitea/modules/graceful"
-	"code.gitea.io/gitea/modules/log"
-	"code.gitea.io/gitea/modules/notification/base"
-	"code.gitea.io/gitea/modules/queue"
-)
-
-type (
-	notificationService struct {
-		base.NullNotifier
-		issueQueue *queue.WorkerPoolQueue[issueNotificationOpts]
-	}
-
-	issueNotificationOpts struct {
-		IssueID              int64
-		CommentID            int64
-		NotificationAuthorID int64
-		ReceiverID           int64 // 0 -- ALL Watcher
-	}
-)
-
-var _ base.Notifier = &notificationService{}
-
-// NewNotifier create a new notificationService notifier
-func NewNotifier() base.Notifier {
-	ns := &notificationService{}
-	ns.issueQueue = queue.CreateSimpleQueue(graceful.GetManager().ShutdownContext(), "notification-service", handler)
-	if ns.issueQueue == nil {
-		log.Fatal("Unable to create notification-service queue")
-	}
-	return ns
-}
-
-func handler(items ...issueNotificationOpts) []issueNotificationOpts {
-	for _, opts := range items {
-		if err := activities_model.CreateOrUpdateIssueNotifications(opts.IssueID, opts.CommentID, opts.NotificationAuthorID, opts.ReceiverID); err != nil {
-			log.Error("Was unable to create issue notification: %v", err)
-		}
-	}
-	return nil
-}
-
-func (ns *notificationService) Run() {
-	go graceful.GetManager().RunWithCancel(ns.issueQueue) // TODO: using "go" here doesn't seem right, just leave it as old code
-}
-
-func (ns *notificationService) NotifyCreateIssueComment(ctx context.Context, doer *user_model.User, repo *repo_model.Repository,
-	issue *issues_model.Issue, comment *issues_model.Comment, mentions []*user_model.User,
-) {
-	opts := issueNotificationOpts{
-		IssueID:              issue.ID,
-		NotificationAuthorID: doer.ID,
-	}
-	if comment != nil {
-		opts.CommentID = comment.ID
-	}
-	_ = ns.issueQueue.Push(opts)
-	for _, mention := range mentions {
-		opts := issueNotificationOpts{
-			IssueID:              issue.ID,
-			NotificationAuthorID: doer.ID,
-			ReceiverID:           mention.ID,
-		}
-		if comment != nil {
-			opts.CommentID = comment.ID
-		}
-		_ = ns.issueQueue.Push(opts)
-	}
-}
-
-func (ns *notificationService) NotifyNewIssue(ctx context.Context, issue *issues_model.Issue, mentions []*user_model.User) {
-	_ = ns.issueQueue.Push(issueNotificationOpts{
-		IssueID:              issue.ID,
-		NotificationAuthorID: issue.Poster.ID,
-	})
-	for _, mention := range mentions {
-		_ = ns.issueQueue.Push(issueNotificationOpts{
-			IssueID:              issue.ID,
-			NotificationAuthorID: issue.Poster.ID,
-			ReceiverID:           mention.ID,
-		})
-	}
-}
-
-func (ns *notificationService) NotifyIssueChangeStatus(ctx context.Context, doer *user_model.User, commitID string, issue *issues_model.Issue, actionComment *issues_model.Comment, isClosed bool) {
-	_ = ns.issueQueue.Push(issueNotificationOpts{
-		IssueID:              issue.ID,
-		NotificationAuthorID: doer.ID,
-		CommentID:            actionComment.ID,
-	})
-}
-
-func (ns *notificationService) NotifyIssueChangeTitle(ctx context.Context, doer *user_model.User, issue *issues_model.Issue, oldTitle string) {
-	if err := issue.LoadPullRequest(ctx); err != nil {
-		log.Error("issue.LoadPullRequest: %v", err)
-		return
-	}
-	if issue.IsPull && issues_model.HasWorkInProgressPrefix(oldTitle) && !issue.PullRequest.IsWorkInProgress() {
-		_ = ns.issueQueue.Push(issueNotificationOpts{
-			IssueID:              issue.ID,
-			NotificationAuthorID: doer.ID,
-		})
-	}
-}
-
-func (ns *notificationService) NotifyMergePullRequest(ctx context.Context, doer *user_model.User, pr *issues_model.PullRequest) {
-	_ = ns.issueQueue.Push(issueNotificationOpts{
-		IssueID:              pr.Issue.ID,
-		NotificationAuthorID: doer.ID,
-	})
-}
-
-func (ns *notificationService) NotifyAutoMergePullRequest(ctx context.Context, doer *user_model.User, pr *issues_model.PullRequest) {
-	ns.NotifyMergePullRequest(ctx, doer, pr)
-}
-
-func (ns *notificationService) NotifyNewPullRequest(ctx context.Context, pr *issues_model.PullRequest, mentions []*user_model.User) {
-	if err := pr.LoadIssue(ctx); err != nil {
-		log.Error("Unable to load issue: %d for pr: %d: Error: %v", pr.IssueID, pr.ID, err)
-		return
-	}
-	toNotify := make(container.Set[int64], 32)
-	repoWatchers, err := repo_model.GetRepoWatchersIDs(ctx, pr.Issue.RepoID)
-	if err != nil {
-		log.Error("GetRepoWatchersIDs: %v", err)
-		return
-	}
-	for _, id := range repoWatchers {
-		toNotify.Add(id)
-	}
-	issueParticipants, err := issues_model.GetParticipantsIDsByIssueID(ctx, pr.IssueID)
-	if err != nil {
-		log.Error("GetParticipantsIDsByIssueID: %v", err)
-		return
-	}
-	for _, id := range issueParticipants {
-		toNotify.Add(id)
-	}
-	delete(toNotify, pr.Issue.PosterID)
-	for _, mention := range mentions {
-		toNotify.Add(mention.ID)
-	}
-	for receiverID := range toNotify {
-		_ = ns.issueQueue.Push(issueNotificationOpts{
-			IssueID:              pr.Issue.ID,
-			NotificationAuthorID: pr.Issue.PosterID,
-			ReceiverID:           receiverID,
-		})
-	}
-}
-
-func (ns *notificationService) NotifyPullRequestReview(ctx context.Context, pr *issues_model.PullRequest, r *issues_model.Review, c *issues_model.Comment, mentions []*user_model.User) {
-	opts := issueNotificationOpts{
-		IssueID:              pr.Issue.ID,
-		NotificationAuthorID: r.Reviewer.ID,
-	}
-	if c != nil {
-		opts.CommentID = c.ID
-	}
-	_ = ns.issueQueue.Push(opts)
-	for _, mention := range mentions {
-		opts := issueNotificationOpts{
-			IssueID:              pr.Issue.ID,
-			NotificationAuthorID: r.Reviewer.ID,
-			ReceiverID:           mention.ID,
-		}
-		if c != nil {
-			opts.CommentID = c.ID
-		}
-		_ = ns.issueQueue.Push(opts)
-	}
-}
-
-func (ns *notificationService) NotifyPullRequestCodeComment(ctx context.Context, pr *issues_model.PullRequest, c *issues_model.Comment, mentions []*user_model.User) {
-	for _, mention := range mentions {
-		_ = ns.issueQueue.Push(issueNotificationOpts{
-			IssueID:              pr.Issue.ID,
-			NotificationAuthorID: c.Poster.ID,
-			CommentID:            c.ID,
-			ReceiverID:           mention.ID,
-		})
-	}
-}
-
-func (ns *notificationService) NotifyPullRequestPushCommits(ctx context.Context, doer *user_model.User, pr *issues_model.PullRequest, comment *issues_model.Comment) {
-	opts := issueNotificationOpts{
-		IssueID:              pr.IssueID,
-		NotificationAuthorID: doer.ID,
-		CommentID:            comment.ID,
-	}
-	_ = ns.issueQueue.Push(opts)
-}
-
-func (ns *notificationService) NotifyPullReviewDismiss(ctx context.Context, doer *user_model.User, review *issues_model.Review, comment *issues_model.Comment) {
-	opts := issueNotificationOpts{
-		IssueID:              review.IssueID,
-		NotificationAuthorID: doer.ID,
-		CommentID:            comment.ID,
-	}
-	_ = ns.issueQueue.Push(opts)
-}
-
-func (ns *notificationService) NotifyIssueChangeAssignee(ctx context.Context, doer *user_model.User, issue *issues_model.Issue, assignee *user_model.User, removed bool, comment *issues_model.Comment) {
-	if !removed && doer.ID != assignee.ID {
-		opts := issueNotificationOpts{
-			IssueID:              issue.ID,
-			NotificationAuthorID: doer.ID,
-			ReceiverID:           assignee.ID,
-		}
-
-		if comment != nil {
-			opts.CommentID = comment.ID
-		}
-
-		_ = ns.issueQueue.Push(opts)
-	}
-}
-
-func (ns *notificationService) NotifyPullRequestReviewRequest(ctx context.Context, doer *user_model.User, issue *issues_model.Issue, reviewer *user_model.User, isRequest bool, comment *issues_model.Comment) {
-	if isRequest {
-		opts := issueNotificationOpts{
-			IssueID:              issue.ID,
-			NotificationAuthorID: doer.ID,
-			ReceiverID:           reviewer.ID,
-		}
-
-		if comment != nil {
-			opts.CommentID = comment.ID
-		}
-
-		_ = ns.issueQueue.Push(opts)
-	}
-}
-
-func (ns *notificationService) NotifyRepoPendingTransfer(ctx context.Context, doer, newOwner *user_model.User, repo *repo_model.Repository) {
-	err := db.WithTx(ctx, func(ctx context.Context) error {
-		return activities_model.CreateRepoTransferNotification(ctx, doer, newOwner, repo)
-	})
-	if err != nil {
-		log.Error("CreateRepoTransferNotification: %v", err)
-	}
-}

modules/ssh/ssh.go

@@ -191,6 +191,12 @@ func publicKeyHandler(ctx ssh.Context, key ssh.PublicKey) bool {
 			return false
 		}
 
+		if cert.CertType != gossh.UserCert {
+			log.Warn("Certificate Rejected: Not a user certificate")
+			log.Warn("Failed authentication attempt from %s", ctx.RemoteAddr())
+			return false
+		}
+
 		// look for the exact principal
 	principalLoop:
 		for _, principal := range cert.ValidPrincipals {

modules/templates/util_render.go

@@ -108,10 +108,9 @@ func RenderCommitBody(ctx context.Context, msg, urlPrefix string, metas map[stri
 // Match text that is between back ticks.
 var codeMatcher = regexp.MustCompile("`([^`]+)`")
 
-// RenderCodeBlock renders "`…`" as highlighted "<code>" block.
-// Intended for issue and PR titles, these containers should have styles for "<code>" elements
+// RenderCodeBlock renders "`…`" as highlighted "<code>" block, intended for issue and PR titles
 func RenderCodeBlock(htmlEscapedTextToRender template.HTML) template.HTML {
-	htmlWithCodeTags := codeMatcher.ReplaceAllString(string(htmlEscapedTextToRender), "<code>$1</code>") // replace with HTML <code> tags
+	htmlWithCodeTags := codeMatcher.ReplaceAllString(string(htmlEscapedTextToRender), `<code class="inline-code-block">$1</code>`) // replace with HTML <code> tags
 	return template.HTML(htmlWithCodeTags)
 }
 

modules/templates/util_string.go

@@ -33,6 +33,11 @@ func (su *StringUtils) Join(a []string, sep string) string {
 	return strings.Join(a, sep)
 }
 
+func (su *StringUtils) Cut(s, sep string) []any {
+	before, after, found := strings.Cut(s, sep)
+	return []any{before, after, found}
+}
+
 func (su *StringUtils) EllipsisString(s string, max int) string {
 	return base.EllipsisString(s, max)
 }

modules/util/util.go

@@ -60,22 +60,6 @@ func OptionalBoolParse(s string) OptionalBool {
 	return OptionalBoolOf(b)
 }
 
-// Max max of two ints
-func Max(a, b int) int {
-	if a < b {
-		return b
-	}
-	return a
-}
-
-// Min min of two ints
-func Min(a, b int) int {
-	if a > b {
-		return b
-	}
-	return a
-}
-
 // IsEmptyString checks if the provided string is empty
 func IsEmptyString(s string) bool {
 	return len(strings.TrimSpace(s)) == 0