Skip to content

Commit 6e7fc2d

Browse files
zjjhotzjjhot
committed
Merge remote-tracking branch 'giteaofficial/main'
* giteaofficial/main: Fix `make generate-swagger` in go 1.22 (go-gitea#29780) Fix incorrect menu/link on webhook edit page (go-gitea#29709) Add test for webhook (go-gitea#29755) Fix possible NPE in ToPullReviewList (go-gitea#29759) fix missed RenderLabel change in card template (go-gitea#29772) Fix incorrect locale Tr for gpg command (go-gitea#29754) Improve a11y document and dropdown item (go-gitea#29753) Improve QueryEscape helper function (go-gitea#29768) Use relative links for commits, mentions, and issues in markdown (go-gitea#29427) Move fork router functions to a standalone file (go-gitea#29756) Configure pinned JS dependencies via updates.config.js (go-gitea#29696) Refactor to use optional.Option for issue index search option (go-gitea#29739) Fix user router possbile panic (go-gitea#29751) Refactor label.IsArchived() (go-gitea#29750)
2 parents 4fec29d + bbef5fc commit 6e7fc2d

File tree

42 files changed

+662
-545
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+662
-545
lines changed

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ GOFUMPT_PACKAGE ?= mvdan.cc/[email protected]
3131
GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/cmd/[email protected]
3232
GXZ_PACKAGE ?= github.com/ulikunitz/xz/cmd/[email protected]
3333
MISSPELL_PACKAGE ?= github.com/golangci/misspell/cmd/[email protected]
34-
SWAGGER_PACKAGE ?= github.com/go-swagger/go-swagger/cmd/swagger@v0.30.5
34+
SWAGGER_PACKAGE ?= github.com/go-swagger/go-swagger/cmd/swagger@db51e79a0e37c572d8b59ae0c58bf2bbbbe53285
3535
XGO_PACKAGE ?= src.techknowlogick.com/xgo@latest
3636
GO_LICENSES_PACKAGE ?= github.com/google/[email protected]
3737
GOVULNCHECK_PACKAGE ?= golang.org/x/vuln/cmd/[email protected]

‎docs/content/contributing/guidelines-frontend.zh-cn.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ HTML 页面由[Go HTML Template](https://pkg.go.dev/html/template)渲染。
5353
### 可访问性 / ARIA
5454

5555
在历史上，Gitea大量使用了可访问性不友好的框架 Fomantic UI。
56-
Gitea使用一些补丁使Fomantic UI更具可访问性（参见`aria.js`和`aria.md`），
56+
Gitea 使用一些补丁使 Fomantic UI 更具可访问性（参见 `aria.md`），
5757
但仍然存在许多问题需要大量的工作和时间来修复。
5858

5959
### 框架使用

‎models/issues/label.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -116,12 +116,17 @@ func (l *Label) CalOpenIssues() {
116116
func (l *Label) SetArchived(isArchived bool) {
117117
if !isArchived {
118118
l.ArchivedUnix = timeutil.TimeStamp(0)
119-
} else if isArchived && l.ArchivedUnix.IsZero() {
119+
} else if isArchived && !l.IsArchived() {
120120
// Only change the date when it is newly archived.
121121
l.ArchivedUnix = timeutil.TimeStampNow()
122122
}
123123
}
124124

125+
// IsArchived returns true if label is an archived
126+
func (l *Label) IsArchived() bool {
127+
return !l.ArchivedUnix.IsZero()
128+
}
129+
125130
// CalOpenOrgIssues calculates the open issues of a label for a specific repo
126131
func (l *Label) CalOpenOrgIssues(ctx context.Context, repoID, labelID int64) {
127132
counts, _ := CountIssuesByRepo(ctx, &IssuesOptions{
@@ -166,11 +171,6 @@ func (l *Label) BelongsToOrg() bool {
166171
return l.OrgID > 0
167172
}
168173

169-
// IsArchived returns true if label is an archived
170-
func (l *Label) IsArchived() bool {
171-
return l.ArchivedUnix > 0
172-
}
173-
174174
// BelongsToRepo returns true if label is a repository label
175175
func (l *Label) BelongsToRepo() bool {
176176
return l.RepoID > 0

‎modules/indexer/internal/bleve/query.go

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
package bleve
55

66
import (
7+
"code.gitea.io/gitea/modules/optional"
8+
79
"github.com/blevesearch/bleve/v2"
810
"github.com/blevesearch/bleve/v2/search/query"
911
)
@@ -39,18 +41,18 @@ func BoolFieldQuery(value bool, field string) *query.BoolFieldQuery {
3941
return q
4042
}
4143

42-
func NumericRangeInclusiveQuery(min, max *int64, field string) *query.NumericRangeQuery {
44+
func NumericRangeInclusiveQuery(min, max optional.Option[int64], field string) *query.NumericRangeQuery {
4345
var minF, maxF *float64
4446
var minI, maxI *bool
45-
if min != nil {
47+
if min.Has() {
4648
minF = new(float64)
47-
*minF = float64(*min)
49+
*minF = float64(min.Value())
4850
minI = new(bool)
4951
*minI = true
5052
}
51-
if max != nil {
53+
if max.Has() {
5254
maxF = new(float64)
53-
*maxF = float64(*max)
55+
*maxF = float64(max.Value())
5456
maxI = new(bool)
5557
*maxI = true
5658
}

‎modules/indexer/issues/bleve/bleve.go

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -224,38 +224,41 @@ func (b *Indexer) Search(ctx context.Context, options *internal.SearchOptions) (
224224
queries = append(queries, bleve.NewDisjunctionQuery(milestoneQueries...))
225225
}
226226

227-
if options.ProjectID != nil {
228-
queries = append(queries, inner_bleve.NumericEqualityQuery(*options.ProjectID, "project_id"))
227+
if options.ProjectID.Has() {
228+
queries = append(queries, inner_bleve.NumericEqualityQuery(options.ProjectID.Value(), "project_id"))
229229
}
230-
if options.ProjectBoardID != nil {
231-
queries = append(queries, inner_bleve.NumericEqualityQuery(*options.ProjectBoardID, "project_board_id"))
230+
if options.ProjectBoardID.Has() {
231+
queries = append(queries, inner_bleve.NumericEqualityQuery(options.ProjectBoardID.Value(), "project_board_id"))
232232
}
233233

234-
if options.PosterID != nil {
235-
queries = append(queries, inner_bleve.NumericEqualityQuery(*options.PosterID, "poster_id"))
234+
if options.PosterID.Has() {
235+
queries = append(queries, inner_bleve.NumericEqualityQuery(options.PosterID.Value(), "poster_id"))
236236
}
237237

238-
if options.AssigneeID != nil {
239-
queries = append(queries, inner_bleve.NumericEqualityQuery(*options.AssigneeID, "assignee_id"))
238+
if options.AssigneeID.Has() {
239+
queries = append(queries, inner_bleve.NumericEqualityQuery(options.AssigneeID.Value(), "assignee_id"))
240240
}
241241

242-
if options.MentionID != nil {
243-
queries = append(queries, inner_bleve.NumericEqualityQuery(*options.MentionID, "mention_ids"))
242+
if options.MentionID.Has() {
243+
queries = append(queries, inner_bleve.NumericEqualityQuery(options.MentionID.Value(), "mention_ids"))
244244
}
245245

246-
if options.ReviewedID != nil {
247-
queries = append(queries, inner_bleve.NumericEqualityQuery(*options.ReviewedID, "reviewed_ids"))
246+
if options.ReviewedID.Has() {
247+
queries = append(queries, inner_bleve.NumericEqualityQuery(options.ReviewedID.Value(), "reviewed_ids"))
248248
}
249-
if options.ReviewRequestedID != nil {
250-
queries = append(queries, inner_bleve.NumericEqualityQuery(*options.ReviewRequestedID, "review_requested_ids"))
249+
if options.ReviewRequestedID.Has() {
250+
queries = append(queries, inner_bleve.NumericEqualityQuery(options.ReviewRequestedID.Value(), "review_requested_ids"))
251251
}
252252

253-
if options.SubscriberID != nil {
254-
queries = append(queries, inner_bleve.NumericEqualityQuery(*options.SubscriberID, "subscriber_ids"))
253+
if options.SubscriberID.Has() {
254+
queries = append(queries, inner_bleve.NumericEqualityQuery(options.SubscriberID.Value(), "subscriber_ids"))
255255
}
256256

257-
if options.UpdatedAfterUnix != nil || options.UpdatedBeforeUnix != nil {
258-
queries = append(queries, inner_bleve.NumericRangeInclusiveQuery(options.UpdatedAfterUnix, options.UpdatedBeforeUnix, "updated_unix"))
257+
if options.UpdatedAfterUnix.Has() || options.UpdatedBeforeUnix.Has() {
258+
queries = append(queries, inner_bleve.NumericRangeInclusiveQuery(
259+
options.UpdatedAfterUnix,
260+
options.UpdatedBeforeUnix,
261+
"updated_unix"))
259262
}
260263

261264
var indexerQuery query.Query = bleve.NewConjunctionQuery(queries...)

‎modules/indexer/issues/db/options.go

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,6 @@ import (
1515
)
1616

1717
func ToDBOptions(ctx context.Context, options *internal.SearchOptions) (*issue_model.IssuesOptions, error) {
18-
// See the comment of issues_model.SearchOptions for the reason why we need to convert
19-
convertID := func(id *int64) int64 {
20-
if id == nil {
21-
return 0
22-
}
23-
if *id == 0 {
24-
return db.NoConditionID
25-
}
26-
return *id
27-
}
28-
convertInt64 := func(i *int64) int64 {
29-
if i == nil {
30-
return 0
31-
}
32-
return *i
33-
}
3418
var sortType string
3519
switch options.SortBy {
3620
case internal.SortByCreatedAsc:
@@ -53,6 +37,18 @@ func ToDBOptions(ctx context.Context, options *internal.SearchOptions) (*issue_m
5337
sortType = "newest"
5438
}
5539

40+
// See the comment of issues_model.SearchOptions for the reason why we need to convert
41+
convertID := func(id optional.Option[int64]) int64 {
42+
if !id.Has() {
43+
return 0
44+
}
45+
value := id.Value()
46+
if value == 0 {
47+
return db.NoConditionID
48+
}
49+
return value
50+
}
51+
5652
opts := &issue_model.IssuesOptions{
5753
Paginator: options.Paginator,
5854
RepoIDs: options.RepoIDs,
@@ -72,8 +68,8 @@ func ToDBOptions(ctx context.Context, options *internal.SearchOptions) (*issue_m
7268
IncludeMilestones: nil,
7369
SortType: sortType,
7470
IssueIDs: nil,
75-
UpdatedAfterUnix: convertInt64(options.UpdatedAfterUnix),
76-
UpdatedBeforeUnix: convertInt64(options.UpdatedBeforeUnix),
71+
UpdatedAfterUnix: options.UpdatedAfterUnix.Value(),
72+
UpdatedBeforeUnix: options.UpdatedBeforeUnix.Value(),
7773
PriorityRepoID: 0,
7874
IsArchived: optional.None[bool](),
7975
Org: nil,

‎modules/indexer/issues/dboptions.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ package issues
66
import (
77
"code.gitea.io/gitea/models/db"
88
issues_model "code.gitea.io/gitea/models/issues"
9+
"code.gitea.io/gitea/modules/optional"
910
)
1011

1112
func ToSearchOptions(keyword string, opts *issues_model.IssuesOptions) *SearchOptions {
@@ -39,13 +40,12 @@ func ToSearchOptions(keyword string, opts *issues_model.IssuesOptions) *SearchOp
3940
}
4041

4142
// See the comment of issues_model.SearchOptions for the reason why we need to convert
42-
convertID := func(id int64) *int64 {
43+
convertID := func(id int64) optional.Option[int64] {
4344
if id > 0 {
44-
return &id
45+
return optional.Some(id)
4546
}
4647
if id == db.NoConditionID {
47-
var zero int64
48-
return &zero
48+
return optional.None[int64]()
4949
}
5050
return nil
5151
}
@@ -60,10 +60,10 @@ func ToSearchOptions(keyword string, opts *issues_model.IssuesOptions) *SearchOp
6060
searchOpt.SubscriberID = convertID(opts.SubscriberID)
6161

6262
if opts.UpdatedAfterUnix > 0 {
63-
searchOpt.UpdatedAfterUnix = &opts.UpdatedAfterUnix
63+
searchOpt.UpdatedAfterUnix = optional.Some(opts.UpdatedAfterUnix)
6464
}
6565
if opts.UpdatedBeforeUnix > 0 {
66-
searchOpt.UpdatedBeforeUnix = &opts.UpdatedBeforeUnix
66+
searchOpt.UpdatedBeforeUnix = optional.Some(opts.UpdatedBeforeUnix)
6767
}
6868

6969
searchOpt.Paginator = opts.Paginator

‎modules/indexer/issues/elasticsearch/elasticsearch.go

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -195,43 +195,43 @@ func (b *Indexer) Search(ctx context.Context, options *internal.SearchOptions) (
195195
query.Must(elastic.NewTermsQuery("milestone_id", toAnySlice(options.MilestoneIDs)...))
196196
}
197197

198-
if options.ProjectID != nil {
199-
query.Must(elastic.NewTermQuery("project_id", *options.ProjectID))
198+
if options.ProjectID.Has() {
199+
query.Must(elastic.NewTermQuery("project_id", options.ProjectID.Value()))
200200
}
201-
if options.ProjectBoardID != nil {
202-
query.Must(elastic.NewTermQuery("project_board_id", *options.ProjectBoardID))
201+
if options.ProjectBoardID.Has() {
202+
query.Must(elastic.NewTermQuery("project_board_id", options.ProjectBoardID.Value()))
203203
}
204204

205-
if options.PosterID != nil {
206-
query.Must(elastic.NewTermQuery("poster_id", *options.PosterID))
205+
if options.PosterID.Has() {
206+
query.Must(elastic.NewTermQuery("poster_id", options.PosterID.Value()))
207207
}
208208

209-
if options.AssigneeID != nil {
210-
query.Must(elastic.NewTermQuery("assignee_id", *options.AssigneeID))
209+
if options.AssigneeID.Has() {
210+
query.Must(elastic.NewTermQuery("assignee_id", options.AssigneeID.Value()))
211211
}
212212

213-
if options.MentionID != nil {
214-
query.Must(elastic.NewTermQuery("mention_ids", *options.MentionID))
213+
if options.MentionID.Has() {
214+
query.Must(elastic.NewTermQuery("mention_ids", options.MentionID.Value()))
215215
}
216216

217-
if options.ReviewedID != nil {
218-
query.Must(elastic.NewTermQuery("reviewed_ids", *options.ReviewedID))
217+
if options.ReviewedID.Has() {
218+
query.Must(elastic.NewTermQuery("reviewed_ids", options.ReviewedID.Value()))
219219
}
220-
if options.ReviewRequestedID != nil {
221-
query.Must(elastic.NewTermQuery("review_requested_ids", *options.ReviewRequestedID))
220+
if options.ReviewRequestedID.Has() {
221+
query.Must(elastic.NewTermQuery("review_requested_ids", options.ReviewRequestedID.Value()))
222222
}
223223

224-
if options.SubscriberID != nil {
225-
query.Must(elastic.NewTermQuery("subscriber_ids", *options.SubscriberID))
224+
if options.SubscriberID.Has() {
225+
query.Must(elastic.NewTermQuery("subscriber_ids", options.SubscriberID.Value()))
226226
}
227227

228-
if options.UpdatedAfterUnix != nil || options.UpdatedBeforeUnix != nil {
228+
if options.UpdatedAfterUnix.Has() || options.UpdatedBeforeUnix.Has() {
229229
q := elastic.NewRangeQuery("updated_unix")
230-
if options.UpdatedAfterUnix != nil {
231-
q.Gte(*options.UpdatedAfterUnix)
230+
if options.UpdatedAfterUnix.Has() {
231+
q.Gte(options.UpdatedAfterUnix.Value())
232232
}
233-
if options.UpdatedBeforeUnix != nil {
234-
q.Lte(*options.UpdatedBeforeUnix)
233+
if options.UpdatedBeforeUnix.Has() {
234+
q.Lte(options.UpdatedBeforeUnix.Value())
235235
}
236236
query.Must(q)
237237
}

0 commit comments

Comments
 (0)