aboutsummaryrefslogtreecommitdiffstats
path: root/models
diff options
context:
space:
mode:
authorsilverwind <me@silverwind.io>2023-07-09 13:58:06 +0200
committerGitHub <noreply@github.com>2023-07-09 11:58:06 +0000
commit887a683af97b570a0fb117068c980f3086133ae4 (patch)
treec9d5d41c40a9d2fbeb40a8be27a60d5c13132b69 /models
parent115f40e43368fefc776232a2df289b2fcadbb11d (diff)
downloadgitea-887a683af97b570a0fb117068c980f3086133ae4.tar.gz
gitea-887a683af97b570a0fb117068c980f3086133ae4.zip
Update tool dependencies, lock govulncheck and actionlint (#25655)
- Update all tool dependencies - Lock `govulncheck` and `actionlint` to their latest tags --------- Co-authored-by: 6543 <m.huber@kithara.com> Co-authored-by: 6543 <6543@obermui.de> Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Diffstat (limited to 'models')
-rw-r--r--models/activities/notification.go10
-rw-r--r--models/asymkey/gpg_key_common.go2
-rw-r--r--models/issues/comment.go10
-rw-r--r--models/issues/comment_list.go22
-rw-r--r--models/issues/issue.go15
-rw-r--r--models/issues/issue_label.go4
-rw-r--r--models/issues/issue_update.go34
-rw-r--r--models/issues/review.go18
-rw-r--r--models/issues/tracked_time.go2
-rw-r--r--models/migrations/v1_14/v166.go6
-rw-r--r--models/repo.go4
11 files changed, 61 insertions, 66 deletions
diff --git a/models/activities/notification.go b/models/activities/notification.go
index 75276a0443..e0af2ee8bb 100644
--- a/models/activities/notification.go
+++ b/models/activities/notification.go
@@ -343,7 +343,7 @@ func getIssueNotification(ctx context.Context, userID, issueID int64) (*Notifica
// NotificationsForUser returns notifications for a given user and status
func NotificationsForUser(ctx context.Context, user *user_model.User, statuses []NotificationStatus, page, perPage int) (notifications NotificationList, err error) {
if len(statuses) == 0 {
- return
+ return nil, nil
}
sess := db.GetEngine(ctx).
@@ -372,16 +372,16 @@ func CountUnread(ctx context.Context, userID int64) int64 {
// LoadAttributes load Repo Issue User and Comment if not loaded
func (n *Notification) LoadAttributes(ctx context.Context) (err error) {
if err = n.loadRepo(ctx); err != nil {
- return
+ return err
}
if err = n.loadIssue(ctx); err != nil {
- return
+ return err
}
if err = n.loadUser(ctx); err != nil {
- return
+ return err
}
if err = n.loadComment(ctx); err != nil {
- return
+ return err
}
return err
}
diff --git a/models/asymkey/gpg_key_common.go b/models/asymkey/gpg_key_common.go
index 5ceeee9aac..b02be2851a 100644
--- a/models/asymkey/gpg_key_common.go
+++ b/models/asymkey/gpg_key_common.go
@@ -111,7 +111,7 @@ func populateHash(hashFunc crypto.Hash, msg []byte) (hash.Hash, error) {
func readArmoredSign(r io.Reader) (body io.Reader, err error) {
block, err := armor.Decode(r)
if err != nil {
- return
+ return nil, err
}
if block.Type != openpgp.SignatureType {
return nil, fmt.Errorf("expected '" + openpgp.SignatureType + "', got: " + block.Type)
diff --git a/models/issues/comment.go b/models/issues/comment.go
index 303c23916b..be020b2e1f 100644
--- a/models/issues/comment.go
+++ b/models/issues/comment.go
@@ -749,7 +749,7 @@ func (c *Comment) LoadPushCommits(ctx context.Context) (err error) {
err = json.Unmarshal([]byte(c.Content), &data)
if err != nil {
- return
+ return err
}
c.IsForcePush = data.IsForcePush
@@ -925,7 +925,7 @@ func createIssueDependencyComment(ctx context.Context, doer *user_model.User, is
cType = CommentTypeRemoveDependency
}
if err = issue.LoadRepo(ctx); err != nil {
- return
+ return err
}
// Make two comments, one in each issue
@@ -937,7 +937,7 @@ func createIssueDependencyComment(ctx context.Context, doer *user_model.User, is
DependentIssueID: dependentIssue.ID,
}
if _, err = CreateComment(ctx, opts); err != nil {
- return
+ return err
}
opts = &CreateCommentOptions{
@@ -1170,11 +1170,11 @@ func CreateAutoMergeComment(ctx context.Context, typ CommentType, pr *PullReques
return nil, fmt.Errorf("comment type %d cannot be used to create an auto merge comment", typ)
}
if err = pr.LoadIssue(ctx); err != nil {
- return
+ return nil, err
}
if err = pr.LoadBaseRepo(ctx); err != nil {
- return
+ return nil, err
}
comment, err = CreateComment(ctx, &CreateCommentOptions{
diff --git a/models/issues/comment_list.go b/models/issues/comment_list.go
index 477337443d..e9c8406c3a 100644
--- a/models/issues/comment_list.go
+++ b/models/issues/comment_list.go
@@ -468,42 +468,38 @@ func (comments CommentList) loadReviews(ctx context.Context) error {
// loadAttributes loads all attributes
func (comments CommentList) loadAttributes(ctx context.Context) (err error) {
if err = comments.LoadPosters(ctx); err != nil {
- return
+ return err
}
if err = comments.loadLabels(ctx); err != nil {
- return
+ return err
}
if err = comments.loadMilestones(ctx); err != nil {
- return
+ return err
}
if err = comments.loadOldMilestones(ctx); err != nil {
- return
+ return err
}
if err = comments.loadAssignees(ctx); err != nil {
- return
+ return err
}
if err = comments.LoadAttachments(ctx); err != nil {
- return
+ return err
}
if err = comments.loadReviews(ctx); err != nil {
- return
+ return err
}
if err = comments.LoadIssues(ctx); err != nil {
- return
- }
-
- if err = comments.loadDependentIssues(ctx); err != nil {
- return
+ return err
}
- return nil
+ return comments.loadDependentIssues(ctx)
}
// LoadAttributes loads attributes of the comments, except for attachments and
diff --git a/models/issues/issue.go b/models/issues/issue.go
index 364d53ba31..d0c5ad2bf8 100644
--- a/models/issues/issue.go
+++ b/models/issues/issue.go
@@ -222,8 +222,7 @@ func (issue *Issue) LoadPoster(ctx context.Context) (err error) {
if !user_model.IsErrUserNotExist(err) {
return fmt.Errorf("getUserByID.(poster) [%d]: %w", issue.PosterID, err)
}
- err = nil
- return
+ return nil
}
}
return err
@@ -316,27 +315,27 @@ func (issue *Issue) LoadMilestone(ctx context.Context) (err error) {
// LoadAttributes loads the attribute of this issue.
func (issue *Issue) LoadAttributes(ctx context.Context) (err error) {
if err = issue.LoadRepo(ctx); err != nil {
- return
+ return err
}
if err = issue.LoadPoster(ctx); err != nil {
- return
+ return err
}
if err = issue.LoadLabels(ctx); err != nil {
- return
+ return err
}
if err = issue.LoadMilestone(ctx); err != nil {
- return
+ return err
}
if err = issue.LoadProject(ctx); err != nil {
- return
+ return err
}
if err = issue.LoadAssignees(ctx); err != nil {
- return
+ return err
}
if err = issue.LoadPullRequest(ctx); err != nil && !IsErrPullRequestNotExist(err) {
diff --git a/models/issues/issue_label.go b/models/issues/issue_label.go
index f4060b1402..119a13adf2 100644
--- a/models/issues/issue_label.go
+++ b/models/issues/issue_label.go
@@ -39,7 +39,7 @@ func newIssueLabel(ctx context.Context, issue *Issue, label *Label, doer *user_m
}
if err = issue.LoadRepo(ctx); err != nil {
- return
+ return err
}
opts := &CreateCommentOptions{
@@ -168,7 +168,7 @@ func deleteIssueLabel(ctx context.Context, issue *Issue, label *Label, doer *use
}
if err = issue.LoadRepo(ctx); err != nil {
- return
+ return err
}
opts := &CreateCommentOptions{
diff --git a/models/issues/issue_update.go b/models/issues/issue_update.go
index 9453ddc085..9607b21a67 100644
--- a/models/issues/issue_update.go
+++ b/models/issues/issue_update.go
@@ -538,10 +538,10 @@ func FindAndUpdateIssueMentions(ctx context.Context, issue *Issue, doer *user_mo
// don't have access to reading it. Teams are expanded into their users, but organizations are ignored.
func ResolveIssueMentionsByVisibility(ctx context.Context, issue *Issue, doer *user_model.User, mentions []string) (users []*user_model.User, err error) {
if len(mentions) == 0 {
- return
+ return nil, nil
}
if err = issue.LoadRepo(ctx); err != nil {
- return
+ return nil, err
}
resolved := make(map[string]bool, 10)
@@ -635,7 +635,7 @@ func ResolveIssueMentionsByVisibility(ctx context.Context, issue *Issue, doer *u
}
}
if len(mentionUsers) == 0 {
- return
+ return users, err
}
if users == nil {
@@ -702,66 +702,66 @@ func DeleteIssuesByRepoID(ctx context.Context, repoID int64) (attachmentPaths []
// Delete content histories
if _, err = sess.In("issue_id", deleteCond).
Delete(&ContentHistory{}); err != nil {
- return
+ return nil, err
}
// Delete comments and attachments
if _, err = sess.In("issue_id", deleteCond).
Delete(&Comment{}); err != nil {
- return
+ return nil, err
}
// Dependencies for issues in this repository
if _, err = sess.In("issue_id", deleteCond).
Delete(&IssueDependency{}); err != nil {
- return
+ return nil, err
}
// Delete dependencies for issues in other repositories
if _, err = sess.In("dependency_id", deleteCond).
Delete(&IssueDependency{}); err != nil {
- return
+ return nil, err
}
if _, err = sess.In("issue_id", deleteCond).
Delete(&IssueUser{}); err != nil {
- return
+ return nil, err
}
if _, err = sess.In("issue_id", deleteCond).
Delete(&Reaction{}); err != nil {
- return
+ return nil, err
}
if _, err = sess.In("issue_id", deleteCond).
Delete(&IssueWatch{}); err != nil {
- return
+ return nil, err
}
if _, err = sess.In("issue_id", deleteCond).
Delete(&Stopwatch{}); err != nil {
- return
+ return nil, err
}
if _, err = sess.In("issue_id", deleteCond).
Delete(&TrackedTime{}); err != nil {
- return
+ return nil, err
}
if _, err = sess.In("issue_id", deleteCond).
Delete(&project_model.ProjectIssue{}); err != nil {
- return
+ return nil, err
}
if _, err = sess.In("dependent_issue_id", deleteCond).
Delete(&Comment{}); err != nil {
- return
+ return nil, err
}
var attachments []*repo_model.Attachment
if err = sess.In("issue_id", deleteCond).
Find(&attachments); err != nil {
- return
+ return nil, err
}
for j := range attachments {
@@ -770,11 +770,11 @@ func DeleteIssuesByRepoID(ctx context.Context, repoID int64) (attachmentPaths []
if _, err = sess.In("issue_id", deleteCond).
Delete(&repo_model.Attachment{}); err != nil {
- return
+ return nil, err
}
if _, err = db.DeleteByBean(ctx, &Issue{RepoID: repoID}); err != nil {
- return
+ return nil, err
}
return attachmentPaths, err
diff --git a/models/issues/review.go b/models/issues/review.go
index dbacfa3a87..3ec2c00fe9 100644
--- a/models/issues/review.go
+++ b/models/issues/review.go
@@ -136,10 +136,10 @@ func init() {
// LoadCodeComments loads CodeComments
func (r *Review) LoadCodeComments(ctx context.Context) (err error) {
if r.CodeComments != nil {
- return
+ return err
}
if err = r.loadIssue(ctx); err != nil {
- return
+ return err
}
r.CodeComments, err = fetchCodeCommentsByReview(ctx, r.Issue, nil, r, false)
return err
@@ -147,7 +147,7 @@ func (r *Review) LoadCodeComments(ctx context.Context) (err error) {
func (r *Review) loadIssue(ctx context.Context) (err error) {
if r.Issue != nil {
- return
+ return err
}
r.Issue, err = GetIssueByID(ctx, r.IssueID)
return err
@@ -156,7 +156,7 @@ func (r *Review) loadIssue(ctx context.Context) (err error) {
// LoadReviewer loads reviewer
func (r *Review) LoadReviewer(ctx context.Context) (err error) {
if r.ReviewerID == 0 || r.Reviewer != nil {
- return
+ return err
}
r.Reviewer, err = user_model.GetPossibleUserByID(ctx, r.ReviewerID)
return err
@@ -186,7 +186,7 @@ func LoadReviewers(ctx context.Context, reviews []*Review) (err error) {
// LoadReviewerTeam loads reviewer team
func (r *Review) LoadReviewerTeam(ctx context.Context) (err error) {
if r.ReviewerTeamID == 0 || r.ReviewerTeam != nil {
- return
+ return nil
}
r.ReviewerTeam, err = organization.GetTeamByID(ctx, r.ReviewerTeamID)
@@ -196,16 +196,16 @@ func (r *Review) LoadReviewerTeam(ctx context.Context) (err error) {
// LoadAttributes loads all attributes except CodeComments
func (r *Review) LoadAttributes(ctx context.Context) (err error) {
if err = r.loadIssue(ctx); err != nil {
- return
+ return err
}
if err = r.LoadCodeComments(ctx); err != nil {
- return
+ return err
}
if err = r.LoadReviewer(ctx); err != nil {
- return
+ return err
}
if err = r.LoadReviewerTeam(ctx); err != nil {
- return
+ return err
}
return err
}
diff --git a/models/issues/tracked_time.go b/models/issues/tracked_time.go
index 1d7592926b..d117b74bc0 100644
--- a/models/issues/tracked_time.go
+++ b/models/issues/tracked_time.go
@@ -302,7 +302,7 @@ func DeleteTime(t *TrackedTime) error {
func deleteTimes(ctx context.Context, opts FindTrackedTimesOptions) (removedTime int64, err error) {
removedTime, err = GetTrackedSeconds(ctx, opts)
if err != nil || removedTime == 0 {
- return
+ return removedTime, err
}
_, err = opts.toSession(db.GetEngine(ctx)).Table("tracked_time").Cols("deleted").Update(&TrackedTime{Deleted: true})
diff --git a/models/migrations/v1_14/v166.go b/models/migrations/v1_14/v166.go
index de7626076a..78f33e8f9b 100644
--- a/models/migrations/v1_14/v166.go
+++ b/models/migrations/v1_14/v166.go
@@ -78,14 +78,14 @@ func RecalculateUserEmptyPWD(x *xorm.Engine) (err error) {
for start := 0; ; start += batchSize {
users := make([]*User, 0, batchSize)
if err = sess.Limit(batchSize, start).Where(builder.Neq{"passwd": ""}, 0).Find(&users); err != nil {
- return
+ return err
}
if len(users) == 0 {
break
}
if err = sess.Begin(); err != nil {
- return
+ return err
}
for _, user := range users {
@@ -100,7 +100,7 @@ func RecalculateUserEmptyPWD(x *xorm.Engine) (err error) {
}
if err = sess.Commit(); err != nil {
- return
+ return err
}
}
diff --git a/models/repo.go b/models/repo.go
index 9044fc8aed..7579d2ad73 100644
--- a/models/repo.go
+++ b/models/repo.go
@@ -628,14 +628,14 @@ func DoctorUserStarNum() (err error) {
for start := 0; ; start += batchSize {
users := make([]user_model.User, 0, batchSize)
if err = db.GetEngine(db.DefaultContext).Limit(batchSize, start).Where("type = ?", 0).Cols("id").Find(&users); err != nil {
- return
+ return err
}
if len(users) == 0 {
break
}
if err = updateUserStarNumbers(users); err != nil {
- return
+ return err
}
}