Skip to content

Commit 0fb6f40

Browse files
zjjhotzjjhot
committed
Merge remote-tracking branch 'giteaofficial/main'
* giteaofficial/main: Do not render truncated links in markdown (go-gitea#32980) Use `CloseIssue` and `ReopenIssue` instead of `ChangeStatus` (go-gitea#32467)
2 parents 7da99b0 + 594edad commit 0fb6f40

File tree

16 files changed

+207
-112
lines changed

16 files changed

+207
-112
lines changed

‎models/issues/dependency_test.go‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,25 @@ func TestCreateIssueDependency(t *testing.T) {
4949
assert.False(t, left)
5050

5151
// Close #2 and check again
52-
_, err = issues_model.ChangeIssueStatus(db.DefaultContext, issue2, user1, true)
52+
_, err = issues_model.CloseIssue(db.DefaultContext, issue2, user1)
5353
assert.NoError(t, err)
5454

55+
issue2Closed, err := issues_model.GetIssueByID(db.DefaultContext, 2)
56+
assert.NoError(t, err)
57+
assert.True(t, issue2Closed.IsClosed)
58+
5559
left, err = issues_model.IssueNoDependenciesLeft(db.DefaultContext, issue1)
5660
assert.NoError(t, err)
5761
assert.True(t, left)
5862

5963
// Test removing the dependency
6064
err = issues_model.RemoveIssueDependency(db.DefaultContext, user1, issue1, issue2, issues_model.DependencyTypeBlockedBy)
6165
assert.NoError(t, err)
66+
67+
_, err = issues_model.ReopenIssue(db.DefaultContext, issue2, user1)
68+
assert.NoError(t, err)
69+
70+
issue2Reopened, err := issues_model.GetIssueByID(db.DefaultContext, 2)
71+
assert.NoError(t, err)
72+
assert.False(t, issue2Reopened.IsClosed)
6273
}

‎models/issues/issue_update.go‎

Lines changed: 41 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,16 +119,54 @@ func doChangeIssueStatus(ctx context.Context, issue *Issue, doer *user_model.Use
119119
})
120120
}
121121

122-
// ChangeIssueStatus changes issue status to open or closed.
123-
func ChangeIssueStatus(ctx context.Context, issue *Issue, doer *user_model.User, isClosed bool) (*Comment, error) {
122+
// CloseIssue changes issue status to closed.
123+
func CloseIssue(ctx context.Context, issue *Issue, doer *user_model.User) (*Comment, error) {
124124
if err := issue.LoadRepo(ctx); err != nil {
125125
return nil, err
126126
}
127127
if err := issue.LoadPoster(ctx); err != nil {
128128
return nil, err
129129
}
130130

131-
return changeIssueStatus(ctx, issue, doer, isClosed, false)
131+
ctx, committer, err := db.TxContext(ctx)
132+
if err != nil {
133+
return nil, err
134+
}
135+
defer committer.Close()
136+
137+
comment, err := changeIssueStatus(ctx, issue, doer, true, false)
138+
if err != nil {
139+
return nil, err
140+
}
141+
if err := committer.Commit(); err != nil {
142+
return nil, err
143+
}
144+
return comment, nil
145+
}
146+
147+
// ReopenIssue changes issue status to open.
148+
func ReopenIssue(ctx context.Context, issue *Issue, doer *user_model.User) (*Comment, error) {
149+
if err := issue.LoadRepo(ctx); err != nil {
150+
return nil, err
151+
}
152+
if err := issue.LoadPoster(ctx); err != nil {
153+
return nil, err
154+
}
155+
156+
ctx, committer, err := db.TxContext(ctx)
157+
if err != nil {
158+
return nil, err
159+
}
160+
defer committer.Close()
161+
162+
comment, err := changeIssueStatus(ctx, issue, doer, false, false)
163+
if err != nil {
164+
return nil, err
165+
}
166+
if err := committer.Commit(); err != nil {
167+
return nil, err
168+
}
169+
return comment, nil
132170
}
133171

134172
// ChangeIssueTitle changes the title of this issue, as the given user.

‎models/issues/issue_xref_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ func TestXRef_ResolveCrossReferences(t *testing.T) {
9898
i1 := testCreateIssue(t, 1, 2, "title1", "content1", false)
9999
i2 := testCreateIssue(t, 1, 2, "title2", "content2", false)
100100
i3 := testCreateIssue(t, 1, 2, "title3", "content3", false)
101-
_, err := issues_model.ChangeIssueStatus(db.DefaultContext, i3, d, true)
101+
_, err := issues_model.CloseIssue(db.DefaultContext, i3, d)
102102
assert.NoError(t, err)
103103

104104
pr := testCreatePR(t, 1, 2, "titlepr", fmt.Sprintf("closes #%d", i1.Index))

‎modules/markup/html_link.go‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99
"strings"
1010

1111
"code.gitea.io/gitea/modules/markup/common"
12+
"code.gitea.io/gitea/modules/util"
1213

1314
"golang.org/x/net/html"
1415
"golang.org/x/net/html/atom"
@@ -171,6 +172,10 @@ func linkProcessor(ctx *RenderContext, node *html.Node) {
171172
}
172173

173174
uri := node.Data[m[0]:m[1]]
175+
remaining := node.Data[m[1]:]
176+
if util.IsLikelySplitLeftPart(remaining) {
177+
return
178+
}
174179
replaceContent(node, m[0], m[1], createLink(ctx, uri, uri, "" /*link*/))
175180
node = node.NextSibling.NextSibling
176181
}

‎modules/markup/html_test.go‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,16 @@ func TestRender_links(t *testing.T) {
206206
test(
207207
"ftps://gitea.com",
208208
`<p>ftps://gitea.com</p>`)
209+
210+
t.Run("LinkSplit", func(t *testing.T) {
211+
input, _ := util.SplitStringAtByteN("http://10.1.2.3", 12)
212+
assert.Equal(t, "http://10…", input)
213+
test(input, "<p>http://10…</p>")
214+
215+
input, _ = util.SplitStringAtByteN("http://10.1.2.3", 13)
216+
assert.Equal(t, "http://10.…", input)
217+
test(input, "<p>http://10.…</p>")
218+
})
209219
}
210220

211221
func TestRender_email(t *testing.T) {

‎modules/util/string.go‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33

44
package util
55

6-
import "unsafe"
6+
import (
7+
"strings"
8+
"unsafe"
9+
)
710

811
func isSnakeCaseUpper(c byte) bool {
912
return 'A' <= c && c <= 'Z'
@@ -95,3 +98,15 @@ func UnsafeBytesToString(b []byte) string {
9598
func UnsafeStringToBytes(s string) []byte {
9699
return unsafe.Slice(unsafe.StringData(s), len(s))
97100
}
101+
102+
// SplitTrimSpace splits the string at given separator and trims leading and trailing space
103+
func SplitTrimSpace(input, sep string) []string {
104+
input = strings.TrimSpace(input)
105+
var stringList []string
106+
for _, s := range strings.Split(input, sep) {
107+
if s = strings.TrimSpace(s); s != "" {
108+
stringList = append(stringList, s)
109+
}
110+
}
111+
return stringList
112+
}

‎modules/util/string_test.go‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,8 @@ func TestToSnakeCase(t *testing.T) {
4545
assert.Equal(t, expected, ToSnakeCase(input))
4646
}
4747
}
48+
49+
func TestSplitTrimSpace(t *testing.T) {
50+
assert.Equal(t, []string{"a", "b", "c"}, SplitTrimSpace("a\nb\nc", "\n"))
51+
assert.Equal(t, []string{"a", "b"}, SplitTrimSpace("\r\na\n\r\nb\n\n", "\n"))
52+
}

‎modules/util/truncate.go‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ const (
1414
asciiEllipsis = "..."
1515
)
1616

17+
func IsLikelySplitLeftPart(s string) bool {
18+
return strings.HasSuffix(s, utf8Ellipsis) || strings.HasSuffix(s, asciiEllipsis)
19+
}
20+
1721
// SplitStringAtByteN splits a string at byte n accounting for rune boundaries. (Combining characters are not accounted for.)
1822
func SplitStringAtByteN(input string, n int) (left, right string) {
1923
if len(input) <= n {
@@ -38,19 +42,3 @@ func SplitStringAtByteN(input string, n int) (left, right string) {
3842

3943
return input[:end] + utf8Ellipsis, utf8Ellipsis + input[end:]
4044
}
41-
42-
// SplitTrimSpace splits the string at given separator and trims leading and trailing space
43-
func SplitTrimSpace(input, sep string) []string {
44-
// Trim initial leading & trailing space
45-
input = strings.TrimSpace(input)
46-
// replace CRLF with LF
47-
input = strings.ReplaceAll(input, "\r\n", "\n")
48-
49-
var stringList []string
50-
for _, s := range strings.Split(input, sep) {
51-
// trim leading and trailing space
52-
stringList = append(stringList, strings.TrimSpace(s))
53-
}
54-
55-
return stringList
56-
}

‎routers/api/v1/repo/issue.go‎

Lines changed: 27 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -733,7 +733,7 @@ func CreateIssue(ctx *context.APIContext) {
733733
}
734734

735735
if form.Closed {
736-
if err := issue_service.ChangeStatus(ctx, issue, ctx.Doer, "", true); err != nil {
736+
if err := issue_service.CloseIssue(ctx, issue, ctx.Doer, ""); err != nil {
737737
if issues_model.IsErrDependenciesLeft(err) {
738738
ctx.Error(http.StatusPreconditionFailed, "DependenciesLeft", "cannot close this issue because it still has open dependencies")
739739
return
@@ -912,27 +912,11 @@ func EditIssue(ctx *context.APIContext) {
912912
}
913913
}
914914

915-
var isClosed bool
916-
switch state := api.StateType(*form.State); state {
917-
case api.StateOpen:
918-
isClosed = false
919-
case api.StateClosed:
920-
isClosed = true
921-
default:
922-
ctx.Error(http.StatusPreconditionFailed, "UnknownIssueStateError", fmt.Sprintf("unknown state: %s", state))
915+
state := api.StateType(*form.State)
916+
closeOrReopenIssue(ctx, issue, state)
917+
if ctx.Written() {
923918
return
924919
}
925-
926-
if issue.IsClosed != isClosed {
927-
if err := issue_service.ChangeStatus(ctx, issue, ctx.Doer, "", isClosed); err != nil {
928-
if issues_model.IsErrDependenciesLeft(err) {
929-
ctx.Error(http.StatusPreconditionFailed, "DependenciesLeft", "cannot close this issue because it still has open dependencies")
930-
return
931-
}
932-
ctx.Error(http.StatusInternalServerError, "ChangeStatus", err)
933-
return
934-
}
935-
}
936920
}
937921

938922
// Refetch from database to assign some automatic values
@@ -1055,3 +1039,26 @@ func UpdateIssueDeadline(ctx *context.APIContext) {
10551039

10561040
ctx.JSON(http.StatusCreated, api.IssueDeadline{Deadline: deadlineUnix.AsTimePtr()})
10571041
}
1042+
1043+
func closeOrReopenIssue(ctx *context.APIContext, issue *issues_model.Issue, state api.StateType) {
1044+
if state != api.StateOpen && state != api.StateClosed {
1045+
ctx.Error(http.StatusPreconditionFailed, "UnknownIssueStateError", fmt.Sprintf("unknown state: %s", state))
1046+
return
1047+
}
1048+
1049+
if state == api.StateClosed && !issue.IsClosed {
1050+
if err := issue_service.CloseIssue(ctx, issue, ctx.Doer, ""); err != nil {
1051+
if issues_model.IsErrDependenciesLeft(err) {
1052+
ctx.Error(http.StatusPreconditionFailed, "DependenciesLeft", "cannot close this issue or pull request because it still has open dependencies")
1053+
return
1054+
}
1055+
ctx.Error(http.StatusInternalServerError, "CloseIssue", err)
1056+
return
1057+
}
1058+
} else if state == api.StateOpen && issue.IsClosed {
1059+
if err := issue_service.ReopenIssue(ctx, issue, ctx.Doer, ""); err != nil {
1060+
ctx.Error(http.StatusInternalServerError, "ReopenIssue", err)
1061+
return
1062+
}
1063+
}
1064+
}

‎routers/api/v1/repo/pull.go‎

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -728,27 +728,11 @@ func EditPullRequest(ctx *context.APIContext) {
728728
return
729729
}
730730

731-
var isClosed bool
732-
switch state := api.StateType(*form.State); state {
733-
case api.StateOpen:
734-
isClosed = false
735-
case api.StateClosed:
736-
isClosed = true
737-
default:
738-
ctx.Error(http.StatusPreconditionFailed, "UnknownPRStateError", fmt.Sprintf("unknown state: %s", state))
731+
state := api.StateType(*form.State)
732+
closeOrReopenIssue(ctx, issue, state)
733+
if ctx.Written() {
739734
return
740735
}
741-
742-
if issue.IsClosed != isClosed {
743-
if err := issue_service.ChangeStatus(ctx, issue, ctx.Doer, "", isClosed); err != nil {
744-
if issues_model.IsErrDependenciesLeft(err) {
745-
ctx.Error(http.StatusPreconditionFailed, "DependenciesLeft", "cannot close this pull request because it still has open dependencies")
746-
return
747-
}
748-
ctx.Error(http.StatusInternalServerError, "ChangeStatus", err)
749-
return
750-
}
751-
}
752736
}
753737

754738
// change pull target branch

0 commit comments

Comments
 (0)