Merge branch 'cursor/bluegit-templates-65da' into 'master'
Sjablonen uit .bluegit en klikbare takenlijsten See merge request Timfa/bluegit!40
@@ -0,0 +1,246 @@
1
// Package desctpl leest beschrijvingssjablonen uit de standaardbranch
2
// en vult de variabelen van een merge request in.
3
package desctpl
4
5
import (
6
"context"
7
"regexp"
8
"sort"
9
"strings"
10
11
"gitlab.com/Timfa/bluegit/internal/gitrepo"
12
)
13
14
// Template is één Markdown-bestand zonder het achtervoegsel .md.
15
type Template struct {
16
Name string
17
Body string
18
}
19
20
// Commit is een bericht op de bronbranch, oudste eerst.
21
type Commit struct {
22
Subject string
23
Body string
24
Author string
25
Email string
26
Merge bool
27
}
28
29
// Vars zijn de waarden voor %{...} bij het aanmaken van een merge request.
30
type Vars struct {
31
Source string
32
Target string
33
Commits []Commit
34
}
35
36
const hugeBody = 10000
37
38
var (
39
closesBranch = regexp.MustCompile(`^(\d+)-`)
40
coAuthor = regexp.MustCompile(`(?m)^Co-authored-by: .+$`)
41
)
42
43
// List leest .bluegit/<kind>_templates en valt terug op .gitlab/.
44
// Een gelijke naam uit .bluegit wint. kind is issue of mr.
45
// Ontbreken beide mappen, dan is de lijst leeg. Dat is geen fout en er wordt niets aangemaakt.
46
func List(ctx context.Context, gitBin, dir, rev, kind string) ([]Template, error) {
47
sub, err := subdir(kind)
48
if err != nil {
49
return nil, err
50
}
51
found := map[string]Template{}
52
var order []string
53
for _, root := range []string{".bluegit", ".gitlab"} {
54
entries, err := gitrepo.Tree(ctx, gitBin, dir, rev, root+"/"+sub)
55
if err != nil {
56
continue
57
}
58
for _, e := range entries {
59
if e.Type != "blob" || !strings.HasSuffix(e.Name, ".md") {
60
continue
61
}
62
name := strings.TrimSuffix(e.Name, ".md")
63
if !validName(name) {
64
continue
65
}
66
if _, ok := found[name]; ok {
67
continue
68
}
69
text, binary, err := gitrepo.Blob(ctx, gitBin, dir, rev, root+"/"+sub+"/"+e.Name, 100000)
70
if err != nil || binary {
71
continue
72
}
73
if len(text) > 20000 {
74
text = text[:20000]
75
}
76
found[name] = Template{Name: name, Body: text}
77
order = append(order, name)
78
}
79
}
80
list := make([]Template, 0, len(order))
81
for _, name := range order {
82
list = append(list, found[name])
83
}
84
sort.SliceStable(list, func(i, j int) bool {
85
di := strings.EqualFold(list[i].Name, "Default")
86
dj := strings.EqualFold(list[j].Name, "Default")
87
if di != dj {
88
return di
89
}
90
return strings.ToLower(list[i].Name) < strings.ToLower(list[j].Name)
91
})
92
return list, nil
93
}
94
95
// Find zoekt een sjabloon op naam. Een hoofdletterverschil telt alleen als er één kandidaat is.
96
func Find(list []Template, name string) (Template, bool) {
97
name = strings.TrimSpace(name)
98
if name == "" {
99
return Template{}, false
100
}
101
for _, t := range list {
102
if t.Name == name {
103
return t, true
104
}
105
}
106
var hit Template
107
n := 0
108
for _, t := range list {
109
if strings.EqualFold(t.Name, name) {
110
hit = t
111
n++
112
}
113
}
114
if n == 1 {
115
return hit, true
116
}
117
return Template{}, false
118
}
119
120
// Default is Default.md, ongeacht hoofdletters. Een exacte naam wint.
121
func Default(list []Template) (Template, bool) {
122
var loose Template
123
looseOK := false
124
for _, t := range list {
125
if t.Name == "Default" {
126
return t, true
127
}
128
if !looseOK && strings.EqualFold(t.Name, "Default") {
129
loose = t
130
looseOK = true
131
}
132
}
133
return loose, looseOK
134
}
135
136
// Expand vervangt de variabelen. Een merge-commit en een heel lang bericht
137
// tellen niet mee voor de commitlijsten. Er worden hooguit 100 commits gebruikt.
138
func Expand(body string, v Vars) string {
139
commits := v.Commits
140
if len(commits) > 100 {
141
commits = commits[:100]
142
}
143
repl := map[string]string{
144
"%{source_branch}": v.Source,
145
"%{target_branch}": v.Target,
146
"%{first_commit}": firstCommit(commits),
147
"%{all_commits}": allCommits(commits),
148
"%{co_authored_by}": coAuthored(commits),
149
"%{first_multiline_commit}": firstMultiline(commits),
150
"%{closes_issue}": closesIssue(v.Source),
151
}
152
for token, value := range repl {
153
body = strings.ReplaceAll(body, token, value)
154
}
155
return body
156
}
157
158
func closesIssue(branch string) string {
159
m := closesBranch.FindStringSubmatch(branch)
160
if m == nil {
161
return ""
162
}
163
return "Closes #" + m[1]
164
}
165
166
func usable(c Commit) bool {
167
return !c.Merge && len(c.Subject) <= hugeBody && len(c.Body) <= hugeBody
168
}
169
170
func message(c Commit) string {
171
if c.Body == "" {
172
return c.Subject
173
}
174
return c.Subject + "\n\n" + c.Body
175
}
176
177
func firstCommit(commits []Commit) string {
178
for _, c := range commits {
179
if usable(c) {
180
return message(c)
181
}
182
}
183
return ""
184
}
185
186
func firstMultiline(commits []Commit) string {
187
for _, c := range commits {
188
if usable(c) && c.Body != "" {
189
return message(c)
190
}
191
}
192
return ""
193
}
194
195
func allCommits(commits []Commit) string {
196
var parts []string
197
for _, c := range commits {
198
if !usable(c) {
199
continue
200
}
201
parts = append(parts, message(c))
202
}
203
return strings.Join(parts, "\n\n")
204
}
205
206
func coAuthored(commits []Commit) string {
207
seen := map[string]bool{}
208
var lines []string
209
for _, c := range commits {
210
if len(c.Body) > hugeBody {
211
continue
212
}
213
for _, line := range coAuthor.FindAllString(c.Body, -1) {
214
if seen[line] {
215
continue
216
}
217
seen[line] = true
218
lines = append(lines, line)
219
}
220
}
221
return strings.Join(lines, "\n")
222
}
223
224
func subdir(kind string) (string, error) {
225
switch kind {
226
case "issue":
227
return "issue_templates", nil
228
case "mr":
229
return "merge_request_templates", nil
230
default:
231
return "", errKind
232
}
233
}
234
235
type kindError struct{}
236
237
func (kindError) Error() string { return "onbekend sjabloon" }
238
239
var errKind kindError
240
241
func validName(name string) bool {
242
if name == "" || name == "." || name == ".." {
243
return false
244
}
245
return !strings.ContainsAny(name, "/\\")
246
}
@@ -0,0 +1,246 @@1
// Package desctpl leest beschrijvingssjablonen uit de standaardbranch2
// en vult de variabelen van een merge request in.3
package desctpl4
5
import (6
"context"7
"regexp"8
"sort"9
"strings"10
11
"gitlab.com/Timfa/bluegit/internal/gitrepo"12
)13
14
// Template is één Markdown-bestand zonder het achtervoegsel .md.15
type Template struct {16
Name string17
Body string18
}19
20
// Commit is een bericht op de bronbranch, oudste eerst.21
type Commit struct {22
Subject string23
Body string24
Author string25
Email string26
Merge bool27
}28
29
// Vars zijn de waarden voor %{...} bij het aanmaken van een merge request.30
type Vars struct {31
Source string32
Target string33
Commits []Commit34
}35
36
const hugeBody = 1000037
38
var (39
closesBranch = regexp.MustCompile(`^(\d+)-`)40
coAuthor = regexp.MustCompile(`(?m)^Co-authored-by: .+$`)41
)42
43
// List leest .bluegit/<kind>_templates en valt terug op .gitlab/.44
// Een gelijke naam uit .bluegit wint. kind is issue of mr.45
// Ontbreken beide mappen, dan is de lijst leeg. Dat is geen fout en er wordt niets aangemaakt.46
func List(ctx context.Context, gitBin, dir, rev, kind string) ([]Template, error) {47
sub, err := subdir(kind)48
if err != nil {49
return nil, err50
}51
found := map[string]Template{}52
var order []string53
for _, root := range []string{".bluegit", ".gitlab"} {54
entries, err := gitrepo.Tree(ctx, gitBin, dir, rev, root+"/"+sub)55
if err != nil {56
continue57
}58
for _, e := range entries {59
if e.Type != "blob" || !strings.HasSuffix(e.Name, ".md") {60
continue61
}62
name := strings.TrimSuffix(e.Name, ".md")63
if !validName(name) {64
continue65
}66
if _, ok := found[name]; ok {67
continue68
}69
text, binary, err := gitrepo.Blob(ctx, gitBin, dir, rev, root+"/"+sub+"/"+e.Name, 100000)70
if err != nil || binary {71
continue72
}73
if len(text) > 20000 {74
text = text[:20000]75
}76
found[name] = Template{Name: name, Body: text}77
order = append(order, name)78
}79
}80
list := make([]Template, 0, len(order))81
for _, name := range order {82
list = append(list, found[name])83
}84
sort.SliceStable(list, func(i, j int) bool {85
di := strings.EqualFold(list[i].Name, "Default")86
dj := strings.EqualFold(list[j].Name, "Default")87
if di != dj {88
return di89
}90
return strings.ToLower(list[i].Name) < strings.ToLower(list[j].Name)91
})92
return list, nil93
}94
95
// Find zoekt een sjabloon op naam. Een hoofdletterverschil telt alleen als er één kandidaat is.96
func Find(list []Template, name string) (Template, bool) {97
name = strings.TrimSpace(name)98
if name == "" {99
return Template{}, false100
}101
for _, t := range list {102
if t.Name == name {103
return t, true104
}105
}106
var hit Template107
n := 0108
for _, t := range list {109
if strings.EqualFold(t.Name, name) {110
hit = t111
n++112
}113
}114
if n == 1 {115
return hit, true116
}117
return Template{}, false118
}119
120
// Default is Default.md, ongeacht hoofdletters. Een exacte naam wint.121
func Default(list []Template) (Template, bool) {122
var loose Template123
looseOK := false124
for _, t := range list {125
if t.Name == "Default" {126
return t, true127
}128
if !looseOK && strings.EqualFold(t.Name, "Default") {129
loose = t130
looseOK = true131
}132
}133
return loose, looseOK134
}135
136
// Expand vervangt de variabelen. Een merge-commit en een heel lang bericht137
// tellen niet mee voor de commitlijsten. Er worden hooguit 100 commits gebruikt.138
func Expand(body string, v Vars) string {139
commits := v.Commits140
if len(commits) > 100 {141
commits = commits[:100]142
}143
repl := map[string]string{144
"%{source_branch}": v.Source,145
"%{target_branch}": v.Target,146
"%{first_commit}": firstCommit(commits),147
"%{all_commits}": allCommits(commits),148
"%{co_authored_by}": coAuthored(commits),149
"%{first_multiline_commit}": firstMultiline(commits),150
"%{closes_issue}": closesIssue(v.Source),151
}152
for token, value := range repl {153
body = strings.ReplaceAll(body, token, value)154
}155
return body156
}157
158
func closesIssue(branch string) string {159
m := closesBranch.FindStringSubmatch(branch)160
if m == nil {161
return ""162
}163
return "Closes #" + m[1]164
}165
166
func usable(c Commit) bool {167
return !c.Merge && len(c.Subject) <= hugeBody && len(c.Body) <= hugeBody168
}169
170
func message(c Commit) string {171
if c.Body == "" {172
return c.Subject173
}174
return c.Subject + "\n\n" + c.Body175
}176
177
func firstCommit(commits []Commit) string {178
for _, c := range commits {179
if usable(c) {180
return message(c)181
}182
}183
return ""184
}185
186
func firstMultiline(commits []Commit) string {187
for _, c := range commits {188
if usable(c) && c.Body != "" {189
return message(c)190
}191
}192
return ""193
}194
195
func allCommits(commits []Commit) string {196
var parts []string197
for _, c := range commits {198
if !usable(c) {199
continue200
}201
parts = append(parts, message(c))202
}203
return strings.Join(parts, "\n\n")204
}205
206
func coAuthored(commits []Commit) string {207
seen := map[string]bool{}208
var lines []string209
for _, c := range commits {210
if len(c.Body) > hugeBody {211
continue212
}213
for _, line := range coAuthor.FindAllString(c.Body, -1) {214
if seen[line] {215
continue216
}217
seen[line] = true218
lines = append(lines, line)219
}220
}221
return strings.Join(lines, "\n")222
}223
224
func subdir(kind string) (string, error) {225
switch kind {226
case "issue":227
return "issue_templates", nil228
case "mr":229
return "merge_request_templates", nil230
default:231
return "", errKind232
}233
}234
235
type kindError struct{}236
237
func (kindError) Error() string { return "onbekend sjabloon" }238
239
var errKind kindError240
241
func validName(name string) bool {242
if name == "" || name == "." || name == ".." {243
return false244
}245
return !strings.ContainsAny(name, "/\\")246
}@@ -0,0 +1,134 @@
1
package desctpl
2
3
import (
4
"context"
5
"os"
6
"os/exec"
7
"path/filepath"
8
"strings"
9
"testing"
10
)
11
12
func TestExpand(t *testing.T) {
13
body := "%{source_branch} -> %{target_branch}\n%{closes_issue}\n%{first_commit}\n%{all_commits}\n%{first_multiline_commit}\n%{co_authored_by}"
14
got := Expand(body, Vars{
15
Source: "12-fix", Target: "master",
16
Commits: []Commit{
17
{Subject: "Merge branch", Merge: true, Body: "Co-authored-by: Sam <sam@example>"},
18
{Subject: "Fix login", Body: "Details\n\nCo-authored-by: Tim <tim@example>"},
19
{Subject: "klein"},
20
{Subject: "enorm", Body: strings.Repeat("x", hugeBody+1)},
21
},
22
})
23
for _, want := range []string{"12-fix -> master", "Closes #12", "Fix login\n\nDetails", "klein", "Co-authored-by: Sam <sam@example>", "Co-authored-by: Tim <tim@example>"} {
24
if !strings.Contains(got, want) {
25
t.Errorf("mist %q in\n%s", want, got)
26
}
27
}
28
if strings.Contains(got, "Merge branch") || strings.Contains(got, "enorm") {
29
t.Fatalf("merge of enorm hoort er niet in:\n%s", got)
30
}
31
if Expand("%{closes_issue}", Vars{Source: "feature"}) != "" {
32
t.Fatal("branch zonder nummer")
33
}
34
}
35
36
func TestListFallback(t *testing.T) {
37
dir := t.TempDir()
38
git := func(args ...string) {
39
t.Helper()
40
cmd := exec.Command("git", args...)
41
cmd.Dir = dir
42
out, err := cmd.CombinedOutput()
43
if err != nil {
44
t.Fatalf("git %s: %v\n%s", strings.Join(args, " "), err, out)
45
}
46
}
47
git("init", "-b", "master")
48
git("config", "user.email", "t@example")
49
git("config", "user.name", "t")
50
write(t, filepath.Join(dir, ".gitlab", "issue_templates", "Bug.md"), "gitlab bug\n")
51
write(t, filepath.Join(dir, ".gitlab", "issue_templates", "Legacy.md"), "oud\n")
52
write(t, filepath.Join(dir, ".gitlab", "issue_templates", "default.md"), "gitlab default\n")
53
write(t, filepath.Join(dir, ".bluegit", "issue_templates", "Bug.md"), "bluegit bug\n")
54
write(t, filepath.Join(dir, ".bluegit", "issue_templates", "Default.md"), "bluegit default\n")
55
git("add", ".")
56
git("commit", "-m", "sjablonen")
57
list, err := List(context.Background(), "git", dir, "master", "issue")
58
if err != nil {
59
t.Fatal(err)
60
}
61
if len(list) != 4 {
62
t.Fatalf("lijst %v", names(list))
63
}
64
if list[0].Name != "Default" || !strings.Contains(list[0].Body, "bluegit default") {
65
t.Fatalf("default %#v", list[0])
66
}
67
other, ok := Find(list, "default")
68
if !ok || !strings.Contains(other.Body, "gitlab default") {
69
t.Fatalf("default.md %#v", other)
70
}
71
bug, ok := Find(list, "Bug")
72
if !ok || !strings.Contains(bug.Body, "bluegit bug") || strings.Contains(bug.Body, "gitlab") {
73
t.Fatalf("bug %#v", bug)
74
}
75
legacy, ok := Find(list, "Legacy")
76
if !ok || !strings.Contains(legacy.Body, "oud") {
77
t.Fatal(legacy)
78
}
79
def, ok := Default(list)
80
if !ok || def.Name != "Default" {
81
t.Fatal(def)
82
}
83
}
84
85
func TestListAbsent(t *testing.T) {
86
dir := t.TempDir()
87
git := func(args ...string) {
88
t.Helper()
89
cmd := exec.Command("git", args...)
90
cmd.Dir = dir
91
out, err := cmd.CombinedOutput()
92
if err != nil {
93
t.Fatalf("git %s: %v\n%s", strings.Join(args, " "), err, out)
94
}
95
}
96
git("init", "-b", "master")
97
git("config", "user.email", "t@example")
98
git("config", "user.name", "t")
99
write(t, filepath.Join(dir, "README.md"), "alleen dit\n")
100
git("add", ".")
101
git("commit", "-m", "zonder sjablonen")
102
for _, kind := range []string{"issue", "mr"} {
103
list, err := List(context.Background(), "git", dir, "master", kind)
104
if err != nil {
105
t.Fatalf("%s: %v", kind, err)
106
}
107
if len(list) != 0 {
108
t.Fatalf("%s lijst %v", kind, names(list))
109
}
110
}
111
for _, root := range []string{".bluegit", ".gitlab"} {
112
if _, err := os.Stat(filepath.Join(dir, root)); !os.IsNotExist(err) {
113
t.Fatalf("%s werd aangemaakt: %v", root, err)
114
}
115
}
116
}
117
118
func names(list []Template) []string {
119
var out []string
120
for _, t := range list {
121
out = append(out, t.Name)
122
}
123
return out
124
}
125
126
func write(t *testing.T, path, body string) {
127
t.Helper()
128
if err := os.MkdirAll(filepath.Dir(path), 0o755); err != nil {
129
t.Fatal(err)
130
}
131
if err := os.WriteFile(path, []byte(body), 0o644); err != nil {
132
t.Fatal(err)
133
}
134
}
@@ -0,0 +1,134 @@1
package desctpl2
3
import (4
"context"5
"os"6
"os/exec"7
"path/filepath"8
"strings"9
"testing"10
)11
12
func TestExpand(t *testing.T) {13
body := "%{source_branch} -> %{target_branch}\n%{closes_issue}\n%{first_commit}\n%{all_commits}\n%{first_multiline_commit}\n%{co_authored_by}"14
got := Expand(body, Vars{15
Source: "12-fix", Target: "master",16
Commits: []Commit{17
{Subject: "Merge branch", Merge: true, Body: "Co-authored-by: Sam <sam@example>"},18
{Subject: "Fix login", Body: "Details\n\nCo-authored-by: Tim <tim@example>"},19
{Subject: "klein"},20
{Subject: "enorm", Body: strings.Repeat("x", hugeBody+1)},21
},22
})23
for _, want := range []string{"12-fix -> master", "Closes #12", "Fix login\n\nDetails", "klein", "Co-authored-by: Sam <sam@example>", "Co-authored-by: Tim <tim@example>"} {24
if !strings.Contains(got, want) {25
t.Errorf("mist %q in\n%s", want, got)26
}27
}28
if strings.Contains(got, "Merge branch") || strings.Contains(got, "enorm") {29
t.Fatalf("merge of enorm hoort er niet in:\n%s", got)30
}31
if Expand("%{closes_issue}", Vars{Source: "feature"}) != "" {32
t.Fatal("branch zonder nummer")33
}34
}35
36
func TestListFallback(t *testing.T) {37
dir := t.TempDir()38
git := func(args ...string) {39
t.Helper()40
cmd := exec.Command("git", args...)41
cmd.Dir = dir42
out, err := cmd.CombinedOutput()43
if err != nil {44
t.Fatalf("git %s: %v\n%s", strings.Join(args, " "), err, out)45
}46
}47
git("init", "-b", "master")48
git("config", "user.email", "t@example")49
git("config", "user.name", "t")50
write(t, filepath.Join(dir, ".gitlab", "issue_templates", "Bug.md"), "gitlab bug\n")51
write(t, filepath.Join(dir, ".gitlab", "issue_templates", "Legacy.md"), "oud\n")52
write(t, filepath.Join(dir, ".gitlab", "issue_templates", "default.md"), "gitlab default\n")53
write(t, filepath.Join(dir, ".bluegit", "issue_templates", "Bug.md"), "bluegit bug\n")54
write(t, filepath.Join(dir, ".bluegit", "issue_templates", "Default.md"), "bluegit default\n")55
git("add", ".")56
git("commit", "-m", "sjablonen")57
list, err := List(context.Background(), "git", dir, "master", "issue")58
if err != nil {59
t.Fatal(err)60
}61
if len(list) != 4 {62
t.Fatalf("lijst %v", names(list))63
}64
if list[0].Name != "Default" || !strings.Contains(list[0].Body, "bluegit default") {65
t.Fatalf("default %#v", list[0])66
}67
other, ok := Find(list, "default")68
if !ok || !strings.Contains(other.Body, "gitlab default") {69
t.Fatalf("default.md %#v", other)70
}71
bug, ok := Find(list, "Bug")72
if !ok || !strings.Contains(bug.Body, "bluegit bug") || strings.Contains(bug.Body, "gitlab") {73
t.Fatalf("bug %#v", bug)74
}75
legacy, ok := Find(list, "Legacy")76
if !ok || !strings.Contains(legacy.Body, "oud") {77
t.Fatal(legacy)78
}79
def, ok := Default(list)80
if !ok || def.Name != "Default" {81
t.Fatal(def)82
}83
}84
85
func TestListAbsent(t *testing.T) {86
dir := t.TempDir()87
git := func(args ...string) {88
t.Helper()89
cmd := exec.Command("git", args...)90
cmd.Dir = dir91
out, err := cmd.CombinedOutput()92
if err != nil {93
t.Fatalf("git %s: %v\n%s", strings.Join(args, " "), err, out)94
}95
}96
git("init", "-b", "master")97
git("config", "user.email", "t@example")98
git("config", "user.name", "t")99
write(t, filepath.Join(dir, "README.md"), "alleen dit\n")100
git("add", ".")101
git("commit", "-m", "zonder sjablonen")102
for _, kind := range []string{"issue", "mr"} {103
list, err := List(context.Background(), "git", dir, "master", kind)104
if err != nil {105
t.Fatalf("%s: %v", kind, err)106
}107
if len(list) != 0 {108
t.Fatalf("%s lijst %v", kind, names(list))109
}110
}111
for _, root := range []string{".bluegit", ".gitlab"} {112
if _, err := os.Stat(filepath.Join(dir, root)); !os.IsNotExist(err) {113
t.Fatalf("%s werd aangemaakt: %v", root, err)114
}115
}116
}117
118
func names(list []Template) []string {119
var out []string120
for _, t := range list {121
out = append(out, t.Name)122
}123
return out124
}125
126
func write(t *testing.T, path, body string) {127
t.Helper()128
if err := os.MkdirAll(filepath.Dir(path), 0o755); err != nil {129
t.Fatal(err)130
}131
if err := os.WriteFile(path, []byte(body), 0o644); err != nil {132
t.Fatal(err)133
}134
}@@ -160,6 +160,57 @@ func parseLog(out string) []Commit {
160
160
return commits
161
161
}
162
162
163
// Message is een commitbericht. Merge is waar bij twee of meer ouders.
164
type Message struct {
165
Subject string
166
Body string
167
Author string
168
Email string
169
Merge bool
170
}
171
172
// Messages leest hooguit limit berichten, oudste eerst.
173
func Messages(ctx context.Context, gitBin, dir, rev string, limit int) ([]Message, error) {
174
if rev == "" {
175
rev = "HEAD"
176
}
177
if limit < 1 {
178
limit = 1
179
}
180
if limit > 100 {
181
limit = 100
182
}
183
out, err := run(ctx, gitBin, nil, "-C", dir, "log", "--reverse", "--format=%an%x1f%ae%x1f%P%x1f%s%x1f%b%x1e", "--date=short", fmt.Sprintf("-n%d", limit), rev)
184
if err != nil {
185
if strings.Contains(err.Error(), "does not have any commits") || strings.Contains(err.Error(), "bad default revision") || strings.Contains(err.Error(), "ambiguous argument") {
186
return nil, nil
187
}
188
return nil, err
189
}
190
return parseMessages(out), nil
191
}
192
193
func parseMessages(out string) []Message {
194
var msgs []Message
195
for _, rec := range strings.Split(out, "\x1e") {
196
rec = strings.TrimSpace(rec)
197
if rec == "" {
198
continue
199
}
200
parts := strings.Split(rec, "\x1f")
201
if len(parts) < 4 {
202
continue
203
}
204
m := Message{Author: parts[0], Email: parts[1], Subject: parts[3]}
205
m.Merge = len(strings.Fields(parts[2])) > 1
206
if len(parts) > 4 {
207
m.Body = strings.TrimSpace(parts[4])
208
}
209
msgs = append(msgs, m)
210
}
211
return msgs
212
}
213
163
214
// Show leest één commit.
164
215
func Show(ctx context.Context, gitBin, dir, sha string) (Commit, error) {
165
216
list, err := Log(ctx, gitBin, dir, sha, 1)
@@ -160,6 +160,57 @@ func parseLog(out string) []Commit {160
return commits160
return commits161
}161
}162
162
163
// Message is een commitbericht. Merge is waar bij twee of meer ouders.164
type Message struct {165
Subject string166
Body string167
Author string168
Email string169
Merge bool170
}171
172
// Messages leest hooguit limit berichten, oudste eerst.173
func Messages(ctx context.Context, gitBin, dir, rev string, limit int) ([]Message, error) {174
if rev == "" {175
rev = "HEAD"176
}177
if limit < 1 {178
limit = 1179
}180
if limit > 100 {181
limit = 100182
}183
out, err := run(ctx, gitBin, nil, "-C", dir, "log", "--reverse", "--format=%an%x1f%ae%x1f%P%x1f%s%x1f%b%x1e", "--date=short", fmt.Sprintf("-n%d", limit), rev)184
if err != nil {185
if strings.Contains(err.Error(), "does not have any commits") || strings.Contains(err.Error(), "bad default revision") || strings.Contains(err.Error(), "ambiguous argument") {186
return nil, nil187
}188
return nil, err189
}190
return parseMessages(out), nil191
}192
193
func parseMessages(out string) []Message {194
var msgs []Message195
for _, rec := range strings.Split(out, "\x1e") {196
rec = strings.TrimSpace(rec)197
if rec == "" {198
continue199
}200
parts := strings.Split(rec, "\x1f")201
if len(parts) < 4 {202
continue203
}204
m := Message{Author: parts[0], Email: parts[1], Subject: parts[3]}205
m.Merge = len(strings.Fields(parts[2])) > 1206
if len(parts) > 4 {207
m.Body = strings.TrimSpace(parts[4])208
}209
msgs = append(msgs, m)210
}211
return msgs212
}213
163
// Show leest één commit.214
// Show leest één commit.164
func Show(ctx context.Context, gitBin, dir, sha string) (Commit, error) {215
func Show(ctx context.Context, gitBin, dir, sha string) (Commit, error) {165
list, err := Log(ctx, gitBin, dir, sha, 1)216
list, err := Log(ctx, gitBin, dir, sha, 1)@@ -0,0 +1,52 @@
1
package i18n
2
3
func init() {
4
addCatalog(en, templateEN)
5
addCatalog(nl, templateNL)
6
addCatalog(de, templateDE)
7
addCatalog(fr, templateFR)
8
}
9
10
var templateEN = map[string]string{
11
"tpl.choose": "Template",
12
"tpl.none": "No template",
13
"tpl.apply": "Apply template",
14
"tpl.tasks": "%d of %d tasks completed",
15
"tpl.toggle": "Toggle task",
16
"err.task": "that task was not found",
17
"info.sec.templates": "Templates and task lists",
18
"info.tpl.lead": "Description templates live on the default branch. Put Markdown files in .bluegit/merge_request_templates and .bluegit/issue_templates. Default.md fills an empty description. The create form has a template menu, and choosing one replaces the description. The same names under .gitlab/ are a fallback, and a .bluegit file wins when both exist. When neither directory is present the form stays empty, with no template menu and no message. A merge request template may use %{source_branch}, %{target_branch}, %{first_commit}, %{all_commits}, %{co_authored_by}, %{first_multiline_commit} and %{closes_issue}. Those are filled in when the merge request is created. %{closes_issue} becomes Closes #12 when the source branch starts with a number and a hyphen, such as 12-fix. Up to 100 commits are used. Merge commits and very long messages are left out. Quick actions on an issue or an issue comment run on save when you may triage: /label ~name, /unlabel ~name, /assign @user, /unassign @user, /milestone %name, /due YYYY-MM-DD and /confidential. A line you may not run stays in the text. Anyone who may create an issue may use /confidential while creating it. Labels and milestones must already exist. Lines that start with - [ ] or - [x], or the same with a star, render as checkboxes in merge requests, issues and comments. With permission to edit that text you can click a checkbox and the source Markdown is updated. A list that contains tasks shows how many are done, for example 1 of 2 tasks completed. Preview and the repository README show the boxes without writing.",
19
}
20
21
var templateNL = map[string]string{
22
"tpl.choose": "Sjabloon",
23
"tpl.none": "Geen sjabloon",
24
"tpl.apply": "Sjabloon toepassen",
25
"tpl.tasks": "%d van %d taken voltooid",
26
"tpl.toggle": "Taak omschakelen",
27
"err.task": "die taak bestaat niet",
28
"info.sec.templates": "Sjablonen en takenlijsten",
29
"info.tpl.lead": "Beschrijvingssjablonen staan op de standaardbranch. Zet Markdownbestanden in .bluegit/merge_request_templates en .bluegit/issue_templates. Default.md vult een lege beschrijving. Het aanmaakformulier heeft een sjabloonmenu en een keuze vervangt de beschrijving. Dezelfde namen onder .gitlab/ zijn een terugval, en een .bluegit-bestand wint als beide bestaan. Als beide mappen ontbreken blijft het formulier leeg, zonder sjabloonmenu en zonder melding. Een merge-request-sjabloon mag %{source_branch}, %{target_branch}, %{first_commit}, %{all_commits}, %{co_authored_by}, %{first_multiline_commit} en %{closes_issue} gebruiken. Die worden ingevuld bij het aanmaken. %{closes_issue} wordt Closes #12 als de bronbranch met een nummer en een streepje begint, zoals 12-fix. Er worden hooguit 100 commits gebruikt. Merge-commits en heel lange berichten blijven weg. Quick actions op een issue of een issue-reactie draaien bij het opslaan als je mag triageen: /label ~naam, /unlabel ~naam, /assign @gebruiker, /unassign @gebruiker, /milestone %naam, /due YYYY-MM-DD en /confidential. Een regel die je niet mag uitvoeren blijft in de tekst staan. Wie een issue mag aanmaken, mag /confidential gebruiken tijdens het aanmaken. Labels en mijlpalen moeten al bestaan. Regels die beginnen met - [ ] of - [x], of hetzelfde met een ster, worden aanvinkvakjes in merge requests, issues en reacties. Met schrijfrecht op die tekst klik je een vakje aan en de bron-Markdown wordt bijgewerkt. Een lijst met taken toont hoeveel er af zijn, bijvoorbeeld 1 van 2 taken voltooid. Het voorbeeld en de README van de repository tonen de vakjes zonder te schrijven.",
30
}
31
32
var templateDE = map[string]string{
33
"tpl.choose": "Vorlage",
34
"tpl.none": "Keine Vorlage",
35
"tpl.apply": "Vorlage anwenden",
36
"tpl.tasks": "%d von %d Aufgaben erledigt",
37
"tpl.toggle": "Aufgabe umschalten",
38
"err.task": "diese Aufgabe gibt es nicht",
39
"info.sec.templates": "Vorlagen und Aufgabenlisten",
40
"info.tpl.lead": "Beschreibungsvorlagen liegen auf dem Standardbranch. Lege Markdown-Dateien in .bluegit/merge_request_templates und .bluegit/issue_templates ab. Default.md füllt eine leere Beschreibung. Das Formular hat ein Vorlagenmenü und eine Wahl ersetzt die Beschreibung. Dieselben Namen unter .gitlab/ sind ein Ersatz, und eine .bluegit-Datei gewinnt, wenn beide existieren. Fehlen beide Verzeichnisse, bleibt das Formular leer, ohne Vorlagenmenü und ohne Hinweis. Eine Merge-Request-Vorlage darf %{source_branch}, %{target_branch}, %{first_commit}, %{all_commits}, %{co_authored_by}, %{first_multiline_commit} und %{closes_issue} nutzen. Sie werden beim Anlegen gefüllt. %{closes_issue} wird zu Closes #12, wenn der Quellbranch mit einer Zahl und einem Bindestrich beginnt, zum Beispiel 12-fix. Es werden höchstens 100 Commits verwendet. Merge-Commits und sehr lange Nachrichten entfallen. Quick Actions an einem Issue oder einem Issue-Kommentar laufen beim Speichern, wenn du triagieren darfst: /label ~Name, /unlabel ~Name, /assign @Benutzer, /unassign @Benutzer, /milestone %Name, /due YYYY-MM-DD und /confidential. Eine Zeile, die du nicht ausführen darfst, bleibt im Text. Wer ein Issue anlegen darf, darf /confidential beim Anlegen nutzen. Labels und Meilensteine müssen schon existieren. Zeilen mit - [ ] oder - [x], auch mit einem Stern, werden zu Kontrollkästchen in Merge Requests, Issues und Kommentaren. Mit Schreibrecht an diesem Text klickst du ein Kästchen an und das Quell-Markdown wird aktualisiert. Eine Liste mit Aufgaben zeigt, wie viele erledigt sind, zum Beispiel 1 von 2 Aufgaben erledigt. Vorschau und README zeigen die Kästchen, ohne zu schreiben.",
41
}
42
43
var templateFR = map[string]string{
44
"tpl.choose": "Modèle",
45
"tpl.none": "Aucun modèle",
46
"tpl.apply": "Appliquer le modèle",
47
"tpl.tasks": "%d tâches sur %d terminées",
48
"tpl.toggle": "Basculer la tâche",
49
"err.task": "cette tâche est introuvable",
50
"info.sec.templates": "Modèles et listes de tâches",
51
"info.tpl.lead": "Les modèles de description sont sur la branche par défaut. Place des fichiers Markdown dans .bluegit/merge_request_templates et .bluegit/issue_templates. Default.md remplit une description vide. Le formulaire de création a un menu de modèles et un choix remplace la description. Les mêmes noms sous .gitlab/ servent de repli, et un fichier .bluegit gagne quand les deux existent. Si les deux dossiers manquent, le formulaire reste vide, sans menu de modèles et sans message. Un modèle de merge request peut utiliser %{source_branch}, %{target_branch}, %{first_commit}, %{all_commits}, %{co_authored_by}, %{first_multiline_commit} et %{closes_issue}. Ils sont remplis à la création. %{closes_issue} devient Closes #12 quand la branche source commence par un nombre et un tiret, comme 12-fix. Au plus 100 commits sont utilisés. Les commits de merge et les messages très longs sont écartés. Les quick actions sur un ticket ou un commentaire de ticket s'exécutent à l'enregistrement si tu peux trier : /label ~nom, /unlabel ~nom, /assign @utilisateur, /unassign @utilisateur, /milestone %nom, /due YYYY-MM-DD et /confidential. Une ligne que tu ne peux pas exécuter reste dans le texte. Qui peut créer un ticket peut utiliser /confidential pendant la création. Les étiquettes et les jalons doivent déjà exister. Les lignes qui commencent par - [ ] ou - [x], ou la même chose avec une étoile, deviennent des cases dans les merge requests, les tickets et les commentaires. Avec le droit d'écrire ce texte, un clic met à jour le Markdown source. Une liste qui contient des tâches montre combien sont finies, par exemple 1 tâche sur 2 terminées. L'aperçu et le README du dépôt montrent les cases sans écrire.",
52
}
@@ -0,0 +1,52 @@1
package i18n2
3
func init() {4
addCatalog(en, templateEN)5
addCatalog(nl, templateNL)6
addCatalog(de, templateDE)7
addCatalog(fr, templateFR)8
}9
10
var templateEN = map[string]string{11
"tpl.choose": "Template",12
"tpl.none": "No template",13
"tpl.apply": "Apply template",14
"tpl.tasks": "%d of %d tasks completed",15
"tpl.toggle": "Toggle task",16
"err.task": "that task was not found",17
"info.sec.templates": "Templates and task lists",18
"info.tpl.lead": "Description templates live on the default branch. Put Markdown files in .bluegit/merge_request_templates and .bluegit/issue_templates. Default.md fills an empty description. The create form has a template menu, and choosing one replaces the description. The same names under .gitlab/ are a fallback, and a .bluegit file wins when both exist. When neither directory is present the form stays empty, with no template menu and no message. A merge request template may use %{source_branch}, %{target_branch}, %{first_commit}, %{all_commits}, %{co_authored_by}, %{first_multiline_commit} and %{closes_issue}. Those are filled in when the merge request is created. %{closes_issue} becomes Closes #12 when the source branch starts with a number and a hyphen, such as 12-fix. Up to 100 commits are used. Merge commits and very long messages are left out. Quick actions on an issue or an issue comment run on save when you may triage: /label ~name, /unlabel ~name, /assign @user, /unassign @user, /milestone %name, /due YYYY-MM-DD and /confidential. A line you may not run stays in the text. Anyone who may create an issue may use /confidential while creating it. Labels and milestones must already exist. Lines that start with - [ ] or - [x], or the same with a star, render as checkboxes in merge requests, issues and comments. With permission to edit that text you can click a checkbox and the source Markdown is updated. A list that contains tasks shows how many are done, for example 1 of 2 tasks completed. Preview and the repository README show the boxes without writing.",19
}20
21
var templateNL = map[string]string{22
"tpl.choose": "Sjabloon",23
"tpl.none": "Geen sjabloon",24
"tpl.apply": "Sjabloon toepassen",25
"tpl.tasks": "%d van %d taken voltooid",26
"tpl.toggle": "Taak omschakelen",27
"err.task": "die taak bestaat niet",28
"info.sec.templates": "Sjablonen en takenlijsten",29
"info.tpl.lead": "Beschrijvingssjablonen staan op de standaardbranch. Zet Markdownbestanden in .bluegit/merge_request_templates en .bluegit/issue_templates. Default.md vult een lege beschrijving. Het aanmaakformulier heeft een sjabloonmenu en een keuze vervangt de beschrijving. Dezelfde namen onder .gitlab/ zijn een terugval, en een .bluegit-bestand wint als beide bestaan. Als beide mappen ontbreken blijft het formulier leeg, zonder sjabloonmenu en zonder melding. Een merge-request-sjabloon mag %{source_branch}, %{target_branch}, %{first_commit}, %{all_commits}, %{co_authored_by}, %{first_multiline_commit} en %{closes_issue} gebruiken. Die worden ingevuld bij het aanmaken. %{closes_issue} wordt Closes #12 als de bronbranch met een nummer en een streepje begint, zoals 12-fix. Er worden hooguit 100 commits gebruikt. Merge-commits en heel lange berichten blijven weg. Quick actions op een issue of een issue-reactie draaien bij het opslaan als je mag triageen: /label ~naam, /unlabel ~naam, /assign @gebruiker, /unassign @gebruiker, /milestone %naam, /due YYYY-MM-DD en /confidential. Een regel die je niet mag uitvoeren blijft in de tekst staan. Wie een issue mag aanmaken, mag /confidential gebruiken tijdens het aanmaken. Labels en mijlpalen moeten al bestaan. Regels die beginnen met - [ ] of - [x], of hetzelfde met een ster, worden aanvinkvakjes in merge requests, issues en reacties. Met schrijfrecht op die tekst klik je een vakje aan en de bron-Markdown wordt bijgewerkt. Een lijst met taken toont hoeveel er af zijn, bijvoorbeeld 1 van 2 taken voltooid. Het voorbeeld en de README van de repository tonen de vakjes zonder te schrijven.",30
}31
32
var templateDE = map[string]string{33
"tpl.choose": "Vorlage",34
"tpl.none": "Keine Vorlage",35
"tpl.apply": "Vorlage anwenden",36
"tpl.tasks": "%d von %d Aufgaben erledigt",37
"tpl.toggle": "Aufgabe umschalten",38
"err.task": "diese Aufgabe gibt es nicht",39
"info.sec.templates": "Vorlagen und Aufgabenlisten",40
"info.tpl.lead": "Beschreibungsvorlagen liegen auf dem Standardbranch. Lege Markdown-Dateien in .bluegit/merge_request_templates und .bluegit/issue_templates ab. Default.md füllt eine leere Beschreibung. Das Formular hat ein Vorlagenmenü und eine Wahl ersetzt die Beschreibung. Dieselben Namen unter .gitlab/ sind ein Ersatz, und eine .bluegit-Datei gewinnt, wenn beide existieren. Fehlen beide Verzeichnisse, bleibt das Formular leer, ohne Vorlagenmenü und ohne Hinweis. Eine Merge-Request-Vorlage darf %{source_branch}, %{target_branch}, %{first_commit}, %{all_commits}, %{co_authored_by}, %{first_multiline_commit} und %{closes_issue} nutzen. Sie werden beim Anlegen gefüllt. %{closes_issue} wird zu Closes #12, wenn der Quellbranch mit einer Zahl und einem Bindestrich beginnt, zum Beispiel 12-fix. Es werden höchstens 100 Commits verwendet. Merge-Commits und sehr lange Nachrichten entfallen. Quick Actions an einem Issue oder einem Issue-Kommentar laufen beim Speichern, wenn du triagieren darfst: /label ~Name, /unlabel ~Name, /assign @Benutzer, /unassign @Benutzer, /milestone %Name, /due YYYY-MM-DD und /confidential. Eine Zeile, die du nicht ausführen darfst, bleibt im Text. Wer ein Issue anlegen darf, darf /confidential beim Anlegen nutzen. Labels und Meilensteine müssen schon existieren. Zeilen mit - [ ] oder - [x], auch mit einem Stern, werden zu Kontrollkästchen in Merge Requests, Issues und Kommentaren. Mit Schreibrecht an diesem Text klickst du ein Kästchen an und das Quell-Markdown wird aktualisiert. Eine Liste mit Aufgaben zeigt, wie viele erledigt sind, zum Beispiel 1 von 2 Aufgaben erledigt. Vorschau und README zeigen die Kästchen, ohne zu schreiben.",41
}42
43
var templateFR = map[string]string{44
"tpl.choose": "Modèle",45
"tpl.none": "Aucun modèle",46
"tpl.apply": "Appliquer le modèle",47
"tpl.tasks": "%d tâches sur %d terminées",48
"tpl.toggle": "Basculer la tâche",49
"err.task": "cette tâche est introuvable",50
"info.sec.templates": "Modèles et listes de tâches",51
"info.tpl.lead": "Les modèles de description sont sur la branche par défaut. Place des fichiers Markdown dans .bluegit/merge_request_templates et .bluegit/issue_templates. Default.md remplit une description vide. Le formulaire de création a un menu de modèles et un choix remplace la description. Les mêmes noms sous .gitlab/ servent de repli, et un fichier .bluegit gagne quand les deux existent. Si les deux dossiers manquent, le formulaire reste vide, sans menu de modèles et sans message. Un modèle de merge request peut utiliser %{source_branch}, %{target_branch}, %{first_commit}, %{all_commits}, %{co_authored_by}, %{first_multiline_commit} et %{closes_issue}. Ils sont remplis à la création. %{closes_issue} devient Closes #12 quand la branche source commence par un nombre et un tiret, comme 12-fix. Au plus 100 commits sont utilisés. Les commits de merge et les messages très longs sont écartés. Les quick actions sur un ticket ou un commentaire de ticket s'exécutent à l'enregistrement si tu peux trier : /label ~nom, /unlabel ~nom, /assign @utilisateur, /unassign @utilisateur, /milestone %nom, /due YYYY-MM-DD et /confidential. Une ligne que tu ne peux pas exécuter reste dans le texte. Qui peut créer un ticket peut utiliser /confidential pendant la création. Les étiquettes et les jalons doivent déjà exister. Les lignes qui commencent par - [ ] ou - [x], ou la même chose avec une étoile, deviennent des cases dans les merge requests, les tickets et les commentaires. Avec le droit d'écrire ce texte, un clic met à jour le Markdown source. Une liste qui contient des tâches montre combien sont finies, par exemple 1 tâche sur 2 terminées. L'aperçu et le README du dépôt montrent les cases sans écrire.",52
}@@ -3,16 +3,36 @@
3
3
package markdown
4
4
5
5
import (
6
"fmt"
6
7
"html"
7
8
"net/url"
8
9
"strconv"
9
10
"strings"
10
11
)
11
12
13
// Tasks maakt takenlijsten klikbaar. Een leeg Post-adres of CanToggle onwaar
14
// laat een vast vinkje zien. Count is een tekst met twee %d: af, totaal.
15
// Het volgnummer is de volgorde in het document, dezelfde als SetTask.
16
type Tasks struct {
17
Post string
18
CSRF string
19
Kind string
20
ID string
21
CanToggle bool
22
Count string
23
Toggle string
24
}
25
12
26
// Render maakt HTML. Relatieve links krijgen linkBase ervoor, plus rev.
13
27
// repoPath is /owner/repo. Dan worden #12 en !5 links naar dat issue of die merge request.
14
28
func Render(src, linkBase, rev, repoPath string) string {
29
return RenderTasks(src, linkBase, rev, repoPath, Tasks{})
30
}
31
32
// RenderTasks is Render plus aanvinkbare taken.
33
func RenderTasks(src, linkBase, rev, repoPath string, tasks Tasks) string {
15
34
lines := strings.Split(strings.ReplaceAll(src, "\r\n", "\n"), "\n")
35
hits := indexTasks(lines)
16
36
var b strings.Builder
17
37
for i := 0; i < len(lines); {
18
38
line := lines[i]
@@ -55,15 +75,44 @@ func Render(src, linkBase, rev, repoPath string) string {
55
75
}
56
76
}
57
77
if isList(trim) {
58
b.WriteString("<ul>\n")
78
type row struct {
79
text string
80
task bool
81
checked bool
82
index int
83
}
84
var rows []row
85
done, total := 0, 0
59
86
for i < len(lines) && isList(strings.TrimSpace(lines[i])) {
60
87
item := strings.TrimSpace(lines[i])
61
88
item = strings.TrimPrefix(item, "- ")
62
89
item = strings.TrimPrefix(item, "* ")
90
if hit, ok := hits[i]; ok && len(item) >= 3 {
91
item = strings.TrimSpace(item[3:])
92
rows = append(rows, row{text: item, task: true, checked: hit.checked, index: hit.index})
93
total++
94
if hit.checked {
95
done++
96
}
97
} else {
98
rows = append(rows, row{text: item})
99
}
100
i++
101
}
102
if total > 0 {
103
b.WriteString(`<p class="taskcount">`)
104
b.WriteString(html.EscapeString(fmt.Sprintf(taskCountFmt(tasks.Count), done, total)))
105
b.WriteString("</p>\n<ul class=\"tasks\">\n")
106
} else {
107
b.WriteString("<ul>\n")
108
}
109
for _, row := range rows {
63
110
b.WriteString("<li>")
64
b.WriteString(inline(item, linkBase, rev, repoPath))
111
if row.task {
112
b.WriteString(taskBox(row.checked, row.index, tasks))
113
}
114
b.WriteString(inline(row.text, linkBase, rev, repoPath))
65
115
b.WriteString("</li>\n")
66
i++
67
116
}
68
117
b.WriteString("</ul>\n")
69
118
continue
@@ -84,6 +133,175 @@ func isList(trim string) bool {
84
133
return strings.HasPrefix(trim, "- ") || strings.HasPrefix(trim, "* ")
85
134
}
86
135
136
type taskHit struct {
137
index int
138
checked bool
139
}
140
141
// SetTask zet het vinkje met dit volgnummer. ok is onwaar als dat nummer er niet is.
142
func SetTask(src string, index int, checked bool) (string, bool) {
143
if index < 0 {
144
return src, false
145
}
146
lines := strings.Split(strings.ReplaceAll(src, "\r\n", "\n"), "\n")
147
hits := indexTasks(lines)
148
for i, hit := range hits {
149
if hit.index != index {
150
continue
151
}
152
lines[i] = rewriteTask(lines[i], checked)
153
return strings.Join(lines, "\n"), true
154
}
155
return src, false
156
}
157
158
// indexTasks loopt dezelfde blokken als Render, zodat een hek of een tabel geen taak is.
159
func indexTasks(lines []string) map[int]taskHit {
160
out := map[int]taskHit{}
161
n := 0
162
for i := 0; i < len(lines); {
163
trim := strings.TrimSpace(lines[i])
164
if trim == "" {
165
i++
166
continue
167
}
168
if strings.HasPrefix(trim, "```") {
169
i++
170
for i < len(lines) && !strings.HasPrefix(strings.TrimSpace(lines[i]), "```") {
171
i++
172
}
173
if i < len(lines) {
174
i++
175
}
176
continue
177
}
178
if isTableStart(lines, i) {
179
i += 2
180
for i < len(lines) && strings.Contains(lines[i], "|") && strings.TrimSpace(lines[i]) != "" {
181
i++
182
}
183
continue
184
}
185
if strings.HasPrefix(trim, "#") {
186
h := 0
187
for h < len(trim) && trim[h] == '#' && h < 6 {
188
h++
189
}
190
if h > 0 && (h == len(trim) || trim[h] == ' ') {
191
i++
192
continue
193
}
194
}
195
if isList(trim) {
196
for i < len(lines) && isList(strings.TrimSpace(lines[i])) {
197
if checked, ok := taskMarker(lines[i]); ok {
198
out[i] = taskHit{index: n, checked: checked}
199
n++
200
}
201
i++
202
}
203
continue
204
}
205
for i < len(lines) && strings.TrimSpace(lines[i]) != "" && !strings.HasPrefix(strings.TrimSpace(lines[i]), "```") && !strings.HasPrefix(strings.TrimSpace(lines[i]), "#") && !isList(strings.TrimSpace(lines[i])) && !isTableStart(lines, i) {
206
i++
207
}
208
}
209
return out
210
}
211
212
func taskMarker(line string) (checked bool, ok bool) {
213
trim := strings.TrimSpace(line)
214
switch {
215
case strings.HasPrefix(trim, "- "):
216
trim = trim[2:]
217
case strings.HasPrefix(trim, "* "):
218
trim = trim[2:]
219
default:
220
return false, false
221
}
222
if strings.HasPrefix(trim, "[ ]") && markerEnd(trim) {
223
return false, true
224
}
225
if (strings.HasPrefix(trim, "[x]") || strings.HasPrefix(trim, "[X]")) && markerEnd(trim) {
226
return true, true
227
}
228
return false, false
229
}
230
231
func markerEnd(trim string) bool {
232
return len(trim) == 3 || (len(trim) > 3 && trim[3] == ' ')
233
}
234
235
func rewriteTask(line string, checked bool) string {
236
repl := "[ ]"
237
if checked {
238
repl = "[x]"
239
}
240
for _, marker := range []string{"[ ]", "[x]", "[X]"} {
241
if i := strings.Index(line, marker); i >= 0 {
242
return line[:i] + repl + line[i+3:]
243
}
244
}
245
return line
246
}
247
248
func taskCountFmt(s string) string {
249
if strings.Count(s, "%d") >= 2 {
250
return s
251
}
252
return "%d of %d tasks completed"
253
}
254
255
func taskBox(checked bool, index int, tasks Tasks) string {
256
if tasks.CanToggle && tasks.Post != "" {
257
val := "1"
258
pressed := "false"
259
class := "taskbox"
260
mark := ""
261
if checked {
262
val = "0"
263
pressed = "true"
264
class = "taskbox on"
265
mark = "✓"
266
}
267
label := tasks.Toggle
268
if label == "" {
269
label = "Toggle task"
270
}
271
var b strings.Builder
272
b.WriteString(`<form class="taskform" method="post" action="`)
273
b.WriteString(html.EscapeString(tasks.Post))
274
b.WriteString(`">`)
275
writeHidden(&b, "csrf", tasks.CSRF)
276
writeHidden(&b, "kind", tasks.Kind)
277
writeHidden(&b, "id", tasks.ID)
278
writeHidden(&b, "index", strconv.Itoa(index))
279
writeHidden(&b, "checked", val)
280
b.WriteString(`<button type="submit" class="`)
281
b.WriteString(class)
282
b.WriteString(`" aria-pressed="`)
283
b.WriteString(pressed)
284
b.WriteString(`" aria-label="`)
285
b.WriteString(html.EscapeString(label))
286
b.WriteString(`">`)
287
b.WriteString(mark)
288
b.WriteString(`</button></form>`)
289
return b.String()
290
}
291
if checked {
292
return `<input class="tasktick" type="checkbox" disabled checked> `
293
}
294
return `<input class="tasktick" type="checkbox" disabled> `
295
}
296
297
func writeHidden(b *strings.Builder, name, value string) {
298
b.WriteString(`<input type="hidden" name="`)
299
b.WriteString(html.EscapeString(name))
300
b.WriteString(`" value="`)
301
b.WriteString(html.EscapeString(value))
302
b.WriteString(`">`)
303
}
304
87
305
func isTableStart(lines []string, i int) bool {
88
306
if i+1 >= len(lines) || !strings.Contains(lines[i], "|") {
89
307
return false
@@ -3,16 +3,36 @@3
package markdown3
package markdown4
4
5
import (5
import (6
"fmt"6
"html"7
"html"7
"net/url"8
"net/url"8
"strconv"9
"strconv"9
"strings"10
"strings"10
)11
)11
12
13
// Tasks maakt takenlijsten klikbaar. Een leeg Post-adres of CanToggle onwaar14
// laat een vast vinkje zien. Count is een tekst met twee %d: af, totaal.15
// Het volgnummer is de volgorde in het document, dezelfde als SetTask.16
type Tasks struct {17
Post string18
CSRF string19
Kind string20
ID string21
CanToggle bool22
Count string23
Toggle string24
}25
12
// Render maakt HTML. Relatieve links krijgen linkBase ervoor, plus rev.26
// Render maakt HTML. Relatieve links krijgen linkBase ervoor, plus rev.13
// repoPath is /owner/repo. Dan worden #12 en !5 links naar dat issue of die merge request.27
// repoPath is /owner/repo. Dan worden #12 en !5 links naar dat issue of die merge request.14
func Render(src, linkBase, rev, repoPath string) string {28
func Render(src, linkBase, rev, repoPath string) string {29
return RenderTasks(src, linkBase, rev, repoPath, Tasks{})30
}31
32
// RenderTasks is Render plus aanvinkbare taken.33
func RenderTasks(src, linkBase, rev, repoPath string, tasks Tasks) string {15
lines := strings.Split(strings.ReplaceAll(src, "\r\n", "\n"), "\n")34
lines := strings.Split(strings.ReplaceAll(src, "\r\n", "\n"), "\n")35
hits := indexTasks(lines)16
var b strings.Builder36
var b strings.Builder17
for i := 0; i < len(lines); {37
for i := 0; i < len(lines); {18
line := lines[i]38
line := lines[i]@@ -55,15 +75,44 @@ func Render(src, linkBase, rev, repoPath string) string {55
}75
}56
}76
}57
if isList(trim) {77
if isList(trim) {58
b.WriteString("<ul>\n")78
type row struct {79
text string80
task bool81
checked bool82
index int83
}84
var rows []row85
done, total := 0, 059
for i < len(lines) && isList(strings.TrimSpace(lines[i])) {86
for i < len(lines) && isList(strings.TrimSpace(lines[i])) {60
item := strings.TrimSpace(lines[i])87
item := strings.TrimSpace(lines[i])61
item = strings.TrimPrefix(item, "- ")88
item = strings.TrimPrefix(item, "- ")62
item = strings.TrimPrefix(item, "* ")89
item = strings.TrimPrefix(item, "* ")90
if hit, ok := hits[i]; ok && len(item) >= 3 {91
item = strings.TrimSpace(item[3:])92
rows = append(rows, row{text: item, task: true, checked: hit.checked, index: hit.index})93
total++94
if hit.checked {95
done++96
}97
} else {98
rows = append(rows, row{text: item})99
}100
i++101
}102
if total > 0 {103
b.WriteString(`<p class="taskcount">`)104
b.WriteString(html.EscapeString(fmt.Sprintf(taskCountFmt(tasks.Count), done, total)))105
b.WriteString("</p>\n<ul class=\"tasks\">\n")106
} else {107
b.WriteString("<ul>\n")108
}109
for _, row := range rows {63
b.WriteString("<li>")110
b.WriteString("<li>")64
b.WriteString(inline(item, linkBase, rev, repoPath))111
if row.task {112
b.WriteString(taskBox(row.checked, row.index, tasks))113
}114
b.WriteString(inline(row.text, linkBase, rev, repoPath))65
b.WriteString("</li>\n")115
b.WriteString("</li>\n")66
i++67
}116
}68
b.WriteString("</ul>\n")117
b.WriteString("</ul>\n")69
continue118
continue@@ -84,6 +133,175 @@ func isList(trim string) bool {84
return strings.HasPrefix(trim, "- ") || strings.HasPrefix(trim, "* ")133
return strings.HasPrefix(trim, "- ") || strings.HasPrefix(trim, "* ")85
}134
}86
135
136
type taskHit struct {137
index int138
checked bool139
}140
141
// SetTask zet het vinkje met dit volgnummer. ok is onwaar als dat nummer er niet is.142
func SetTask(src string, index int, checked bool) (string, bool) {143
if index < 0 {144
return src, false145
}146
lines := strings.Split(strings.ReplaceAll(src, "\r\n", "\n"), "\n")147
hits := indexTasks(lines)148
for i, hit := range hits {149
if hit.index != index {150
continue151
}152
lines[i] = rewriteTask(lines[i], checked)153
return strings.Join(lines, "\n"), true154
}155
return src, false156
}157
158
// indexTasks loopt dezelfde blokken als Render, zodat een hek of een tabel geen taak is.159
func indexTasks(lines []string) map[int]taskHit {160
out := map[int]taskHit{}161
n := 0162
for i := 0; i < len(lines); {163
trim := strings.TrimSpace(lines[i])164
if trim == "" {165
i++166
continue167
}168
if strings.HasPrefix(trim, "```") {169
i++170
for i < len(lines) && !strings.HasPrefix(strings.TrimSpace(lines[i]), "```") {171
i++172
}173
if i < len(lines) {174
i++175
}176
continue177
}178
if isTableStart(lines, i) {179
i += 2180
for i < len(lines) && strings.Contains(lines[i], "|") && strings.TrimSpace(lines[i]) != "" {181
i++182
}183
continue184
}185
if strings.HasPrefix(trim, "#") {186
h := 0187
for h < len(trim) && trim[h] == '#' && h < 6 {188
h++189
}190
if h > 0 && (h == len(trim) || trim[h] == ' ') {191
i++192
continue193
}194
}195
if isList(trim) {196
for i < len(lines) && isList(strings.TrimSpace(lines[i])) {197
if checked, ok := taskMarker(lines[i]); ok {198
out[i] = taskHit{index: n, checked: checked}199
n++200
}201
i++202
}203
continue204
}205
for i < len(lines) && strings.TrimSpace(lines[i]) != "" && !strings.HasPrefix(strings.TrimSpace(lines[i]), "```") && !strings.HasPrefix(strings.TrimSpace(lines[i]), "#") && !isList(strings.TrimSpace(lines[i])) && !isTableStart(lines, i) {206
i++207
}208
}209
return out210
}211
212
func taskMarker(line string) (checked bool, ok bool) {213
trim := strings.TrimSpace(line)214
switch {215
case strings.HasPrefix(trim, "- "):216
trim = trim[2:]217
case strings.HasPrefix(trim, "* "):218
trim = trim[2:]219
default:220
return false, false221
}222
if strings.HasPrefix(trim, "[ ]") && markerEnd(trim) {223
return false, true224
}225
if (strings.HasPrefix(trim, "[x]") || strings.HasPrefix(trim, "[X]")) && markerEnd(trim) {226
return true, true227
}228
return false, false229
}230
231
func markerEnd(trim string) bool {232
return len(trim) == 3 || (len(trim) > 3 && trim[3] == ' ')233
}234
235
func rewriteTask(line string, checked bool) string {236
repl := "[ ]"237
if checked {238
repl = "[x]"239
}240
for _, marker := range []string{"[ ]", "[x]", "[X]"} {241
if i := strings.Index(line, marker); i >= 0 {242
return line[:i] + repl + line[i+3:]243
}244
}245
return line246
}247
248
func taskCountFmt(s string) string {249
if strings.Count(s, "%d") >= 2 {250
return s251
}252
return "%d of %d tasks completed"253
}254
255
func taskBox(checked bool, index int, tasks Tasks) string {256
if tasks.CanToggle && tasks.Post != "" {257
val := "1"258
pressed := "false"259
class := "taskbox"260
mark := ""261
if checked {262
val = "0"263
pressed = "true"264
class = "taskbox on"265
mark = "✓"266
}267
label := tasks.Toggle268
if label == "" {269
label = "Toggle task"270
}271
var b strings.Builder272
b.WriteString(`<form class="taskform" method="post" action="`)273
b.WriteString(html.EscapeString(tasks.Post))274
b.WriteString(`">`)275
writeHidden(&b, "csrf", tasks.CSRF)276
writeHidden(&b, "kind", tasks.Kind)277
writeHidden(&b, "id", tasks.ID)278
writeHidden(&b, "index", strconv.Itoa(index))279
writeHidden(&b, "checked", val)280
b.WriteString(`<button type="submit" class="`)281
b.WriteString(class)282
b.WriteString(`" aria-pressed="`)283
b.WriteString(pressed)284
b.WriteString(`" aria-label="`)285
b.WriteString(html.EscapeString(label))286
b.WriteString(`">`)287
b.WriteString(mark)288
b.WriteString(`</button></form>`)289
return b.String()290
}291
if checked {292
return `<input class="tasktick" type="checkbox" disabled checked> `293
}294
return `<input class="tasktick" type="checkbox" disabled> `295
}296
297
func writeHidden(b *strings.Builder, name, value string) {298
b.WriteString(`<input type="hidden" name="`)299
b.WriteString(html.EscapeString(name))300
b.WriteString(`" value="`)301
b.WriteString(html.EscapeString(value))302
b.WriteString(`">`)303
}304
87
func isTableStart(lines []string, i int) bool {305
func isTableStart(lines []string, i int) bool {88
if i+1 >= len(lines) || !strings.Contains(lines[i], "|") {306
if i+1 >= len(lines) || !strings.Contains(lines[i], "|") {89
return false307
return false@@ -38,3 +38,40 @@ func TestIssueRefs(t *testing.T) {
38
38
t.Fatalf("verwijzing in code of woord: %s", got)
39
39
}
40
40
}
41
42
func TestTasks(t *testing.T) {
43
src := "- [ ] een\n- [x] punt\n\n```\n- [ ] nee\n```\n\n* [X] twee\n"
44
got := RenderTasks(src, "", "", "", Tasks{Count: "%d van %d taken voltooid"})
45
for _, want := range []string{
46
"1 van 2 taken voltooid",
47
"1 van 1 taken voltooid",
48
`<input class="tasktick" type="checkbox" disabled>`,
49
`<input class="tasktick" type="checkbox" disabled checked>`,
50
"<code>- [ ] nee",
51
"een",
52
"twee",
53
"punt",
54
} {
55
if !strings.Contains(got, want) {
56
t.Errorf("mist %q in\n%s", want, got)
57
}
58
}
59
if strings.Count(got, "tasktick") != 3 {
60
t.Fatalf("vinkjes\n%s", got)
61
}
62
next, ok := SetTask(src, 0, true)
63
if !ok || !strings.Contains(next, "- [x] een") || strings.Contains(next, "- [ ] nee") == false {
64
t.Fatalf("zet %q", next)
65
}
66
next, ok = SetTask(next, 2, false)
67
if !ok || !strings.Contains(next, "* [ ] twee") {
68
t.Fatalf("uit %q", next)
69
}
70
if _, ok := SetTask(src, 5, true); ok {
71
t.Fatal("nummer 5 bestaat niet")
72
}
73
live := RenderTasks("- [ ] klik", "", "", "", Tasks{Post: "/r/-/tasks", CSRF: "c", Kind: "issue", ID: "3", CanToggle: true, Toggle: "Taak"})
74
if !strings.Contains(live, `action="/r/-/tasks"`) || !strings.Contains(live, `name="index" value="0"`) || !strings.Contains(live, `name="checked" value="1"`) {
75
t.Fatalf("formulier\n%s", live)
76
}
77
}
@@ -38,3 +38,40 @@ func TestIssueRefs(t *testing.T) {38
t.Fatalf("verwijzing in code of woord: %s", got)38
t.Fatalf("verwijzing in code of woord: %s", got)39
}39
}40
}40
}41
42
func TestTasks(t *testing.T) {43
src := "- [ ] een\n- [x] punt\n\n```\n- [ ] nee\n```\n\n* [X] twee\n"44
got := RenderTasks(src, "", "", "", Tasks{Count: "%d van %d taken voltooid"})45
for _, want := range []string{46
"1 van 2 taken voltooid",47
"1 van 1 taken voltooid",48
`<input class="tasktick" type="checkbox" disabled>`,49
`<input class="tasktick" type="checkbox" disabled checked>`,50
"<code>- [ ] nee",51
"een",52
"twee",53
"punt",54
} {55
if !strings.Contains(got, want) {56
t.Errorf("mist %q in\n%s", want, got)57
}58
}59
if strings.Count(got, "tasktick") != 3 {60
t.Fatalf("vinkjes\n%s", got)61
}62
next, ok := SetTask(src, 0, true)63
if !ok || !strings.Contains(next, "- [x] een") || strings.Contains(next, "- [ ] nee") == false {64
t.Fatalf("zet %q", next)65
}66
next, ok = SetTask(next, 2, false)67
if !ok || !strings.Contains(next, "* [ ] twee") {68
t.Fatalf("uit %q", next)69
}70
if _, ok := SetTask(src, 5, true); ok {71
t.Fatal("nummer 5 bestaat niet")72
}73
live := RenderTasks("- [ ] klik", "", "", "", Tasks{Post: "/r/-/tasks", CSRF: "c", Kind: "issue", ID: "3", CanToggle: true, Toggle: "Taak"})74
if !strings.Contains(live, `action="/r/-/tasks"`) || !strings.Contains(live, `name="index" value="0"`) || !strings.Contains(live, `name="checked" value="1"`) {75
t.Fatalf("formulier\n%s", live)76
}77
}@@ -0,0 +1,145 @@
1
// Package quick herkent quick actions op een eigen regel.
2
// Een regel in een codeblok blijft gewone tekst.
3
package quick
4
5
import "strings"
6
7
// Command is één opdracht. Names zijn labels, gebruikers of een mijlpaal, zonder ~ @ of %.
8
type Command struct {
9
Kind string
10
Names []string
11
Due string
12
}
13
14
// Piece is één regel. Cmd is nil als de regel tekst blijft.
15
type Piece struct {
16
Text string
17
Cmd *Command
18
}
19
20
// Scan splitst de tekst in regels. Opdrachten in een hek ``` blijven tekst.
21
func Scan(body string) []Piece {
22
body = strings.ReplaceAll(body, "\r\n", "\n")
23
lines := strings.Split(body, "\n")
24
out := make([]Piece, 0, len(lines))
25
fence := false
26
for _, line := range lines {
27
trim := strings.TrimSpace(line)
28
if strings.HasPrefix(trim, "```") {
29
fence = !fence
30
out = append(out, Piece{Text: line})
31
continue
32
}
33
if fence {
34
out = append(out, Piece{Text: line})
35
continue
36
}
37
if cmd, ok := parse(trim); ok {
38
c := cmd
39
out = append(out, Piece{Text: line, Cmd: &c})
40
continue
41
}
42
out = append(out, Piece{Text: line})
43
}
44
return out
45
}
46
47
func parse(trim string) (Command, bool) {
48
switch {
49
case trim == "/confidential":
50
return Command{Kind: "confidential"}, true
51
case strings.HasPrefix(trim, "/due "):
52
due := strings.TrimSpace(strings.TrimPrefix(trim, "/due "))
53
if len(due) != 10 || due[4] != '-' || due[7] != '-' || !digits(due[0:4]) || !digits(due[5:7]) || !digits(due[8:10]) {
54
return Command{}, false
55
}
56
return Command{Kind: "due", Due: due}, true
57
case strings.HasPrefix(trim, "/label "):
58
names := sigils(strings.TrimSpace(strings.TrimPrefix(trim, "/label ")), '~')
59
if len(names) == 0 {
60
return Command{}, false
61
}
62
return Command{Kind: "label", Names: names}, true
63
case strings.HasPrefix(trim, "/unlabel "):
64
names := sigils(strings.TrimSpace(strings.TrimPrefix(trim, "/unlabel ")), '~')
65
if len(names) == 0 {
66
return Command{}, false
67
}
68
return Command{Kind: "unlabel", Names: names}, true
69
case strings.HasPrefix(trim, "/assign "):
70
names := sigils(strings.TrimSpace(strings.TrimPrefix(trim, "/assign ")), '@')
71
if len(names) == 0 {
72
return Command{}, false
73
}
74
return Command{Kind: "assign", Names: names}, true
75
case strings.HasPrefix(trim, "/unassign "):
76
names := sigils(strings.TrimSpace(strings.TrimPrefix(trim, "/unassign ")), '@')
77
if len(names) == 0 {
78
return Command{}, false
79
}
80
return Command{Kind: "unassign", Names: names}, true
81
case strings.HasPrefix(trim, "/milestone "):
82
names := sigils(strings.TrimSpace(strings.TrimPrefix(trim, "/milestone ")), '%')
83
if len(names) != 1 {
84
return Command{}, false
85
}
86
return Command{Kind: "milestone", Names: names}, true
87
default:
88
return Command{}, false
89
}
90
}
91
92
func digits(s string) bool {
93
if s == "" {
94
return false
95
}
96
for _, r := range s {
97
if r < '0' || r > '9' {
98
return false
99
}
100
}
101
return true
102
}
103
104
func sigils(s string, mark byte) []string {
105
var out []string
106
i := 0
107
for i < len(s) {
108
if s[i] == ' ' || s[i] == '\t' {
109
i++
110
continue
111
}
112
if s[i] != mark {
113
return nil
114
}
115
i++
116
if i >= len(s) {
117
return nil
118
}
119
if s[i] == '"' || s[i] == '\'' {
120
q := s[i]
121
i++
122
j := strings.IndexByte(s[i:], q)
123
if j < 0 {
124
return nil
125
}
126
name := strings.TrimSpace(s[i : i+j])
127
if name == "" {
128
return nil
129
}
130
out = append(out, name)
131
i += j + 1
132
continue
133
}
134
j := i
135
for j < len(s) && s[j] != ' ' && s[j] != '\t' {
136
j++
137
}
138
if j == i {
139
return nil
140
}
141
out = append(out, s[i:j])
142
i = j
143
}
144
return out
145
}
@@ -0,0 +1,145 @@1
// Package quick herkent quick actions op een eigen regel.2
// Een regel in een codeblok blijft gewone tekst.3
package quick4
5
import "strings"6
7
// Command is één opdracht. Names zijn labels, gebruikers of een mijlpaal, zonder ~ @ of %.8
type Command struct {9
Kind string10
Names []string11
Due string12
}13
14
// Piece is één regel. Cmd is nil als de regel tekst blijft.15
type Piece struct {16
Text string17
Cmd *Command18
}19
20
// Scan splitst de tekst in regels. Opdrachten in een hek ``` blijven tekst.21
func Scan(body string) []Piece {22
body = strings.ReplaceAll(body, "\r\n", "\n")23
lines := strings.Split(body, "\n")24
out := make([]Piece, 0, len(lines))25
fence := false26
for _, line := range lines {27
trim := strings.TrimSpace(line)28
if strings.HasPrefix(trim, "```") {29
fence = !fence30
out = append(out, Piece{Text: line})31
continue32
}33
if fence {34
out = append(out, Piece{Text: line})35
continue36
}37
if cmd, ok := parse(trim); ok {38
c := cmd39
out = append(out, Piece{Text: line, Cmd: &c})40
continue41
}42
out = append(out, Piece{Text: line})43
}44
return out45
}46
47
func parse(trim string) (Command, bool) {48
switch {49
case trim == "/confidential":50
return Command{Kind: "confidential"}, true51
case strings.HasPrefix(trim, "/due "):52
due := strings.TrimSpace(strings.TrimPrefix(trim, "/due "))53
if len(due) != 10 || due[4] != '-' || due[7] != '-' || !digits(due[0:4]) || !digits(due[5:7]) || !digits(due[8:10]) {54
return Command{}, false55
}56
return Command{Kind: "due", Due: due}, true57
case strings.HasPrefix(trim, "/label "):58
names := sigils(strings.TrimSpace(strings.TrimPrefix(trim, "/label ")), '~')59
if len(names) == 0 {60
return Command{}, false61
}62
return Command{Kind: "label", Names: names}, true63
case strings.HasPrefix(trim, "/unlabel "):64
names := sigils(strings.TrimSpace(strings.TrimPrefix(trim, "/unlabel ")), '~')65
if len(names) == 0 {66
return Command{}, false67
}68
return Command{Kind: "unlabel", Names: names}, true69
case strings.HasPrefix(trim, "/assign "):70
names := sigils(strings.TrimSpace(strings.TrimPrefix(trim, "/assign ")), '@')71
if len(names) == 0 {72
return Command{}, false73
}74
return Command{Kind: "assign", Names: names}, true75
case strings.HasPrefix(trim, "/unassign "):76
names := sigils(strings.TrimSpace(strings.TrimPrefix(trim, "/unassign ")), '@')77
if len(names) == 0 {78
return Command{}, false79
}80
return Command{Kind: "unassign", Names: names}, true81
case strings.HasPrefix(trim, "/milestone "):82
names := sigils(strings.TrimSpace(strings.TrimPrefix(trim, "/milestone ")), '%')83
if len(names) != 1 {84
return Command{}, false85
}86
return Command{Kind: "milestone", Names: names}, true87
default:88
return Command{}, false89
}90
}91
92
func digits(s string) bool {93
if s == "" {94
return false95
}96
for _, r := range s {97
if r < '0' || r > '9' {98
return false99
}100
}101
return true102
}103
104
func sigils(s string, mark byte) []string {105
var out []string106
i := 0107
for i < len(s) {108
if s[i] == ' ' || s[i] == '\t' {109
i++110
continue111
}112
if s[i] != mark {113
return nil114
}115
i++116
if i >= len(s) {117
return nil118
}119
if s[i] == '"' || s[i] == '\'' {120
q := s[i]121
i++122
j := strings.IndexByte(s[i:], q)123
if j < 0 {124
return nil125
}126
name := strings.TrimSpace(s[i : i+j])127
if name == "" {128
return nil129
}130
out = append(out, name)131
i += j + 1132
continue133
}134
j := i135
for j < len(s) && s[j] != ' ' && s[j] != '\t' {136
j++137
}138
if j == i {139
return nil140
}141
out = append(out, s[i:j])142
i = j143
}144
return out145
}@@ -0,0 +1,33 @@
1
package quick
2
3
import (
4
"strings"
5
"testing"
6
)
7
8
func TestScan(t *testing.T) {
9
body := "/label ~bug ~\"needs work\"\nTekst\n/due 2026-11-01\n```\n/label ~geheim\n```\n/confidential\n/label zonder\n"
10
pieces := Scan(body)
11
var kinds []string
12
var kept []string
13
for _, p := range pieces {
14
if p.Cmd == nil {
15
kept = append(kept, p.Text)
16
continue
17
}
18
kinds = append(kinds, p.Cmd.Kind)
19
if p.Cmd.Kind == "label" && (len(p.Cmd.Names) != 2 || p.Cmd.Names[0] != "bug" || p.Cmd.Names[1] != "needs work") {
20
t.Fatalf("label %#v", p.Cmd)
21
}
22
if p.Cmd.Kind == "due" && p.Cmd.Due != "2026-11-01" {
23
t.Fatalf("due %#v", p.Cmd)
24
}
25
}
26
if strings.Join(kinds, ",") != "label,due,confidential" {
27
t.Fatalf("opdrachten %v", kinds)
28
}
29
plain := strings.Join(kept, "\n")
30
if !strings.Contains(plain, "Tekst") || !strings.Contains(plain, "/label ~geheim") || !strings.Contains(plain, "/label zonder") {
31
t.Fatalf("tekst\n%s", plain)
32
}
33
}
@@ -0,0 +1,33 @@1
package quick2
3
import (4
"strings"5
"testing"6
)7
8
func TestScan(t *testing.T) {9
body := "/label ~bug ~\"needs work\"\nTekst\n/due 2026-11-01\n```\n/label ~geheim\n```\n/confidential\n/label zonder\n"10
pieces := Scan(body)11
var kinds []string12
var kept []string13
for _, p := range pieces {14
if p.Cmd == nil {15
kept = append(kept, p.Text)16
continue17
}18
kinds = append(kinds, p.Cmd.Kind)19
if p.Cmd.Kind == "label" && (len(p.Cmd.Names) != 2 || p.Cmd.Names[0] != "bug" || p.Cmd.Names[1] != "needs work") {20
t.Fatalf("label %#v", p.Cmd)21
}22
if p.Cmd.Kind == "due" && p.Cmd.Due != "2026-11-01" {23
t.Fatalf("due %#v", p.Cmd)24
}25
}26
if strings.Join(kinds, ",") != "label,due,confidential" {27
t.Fatalf("opdrachten %v", kinds)28
}29
plain := strings.Join(kept, "\n")30
if !strings.Contains(plain, "Tekst") || !strings.Contains(plain, "/label ~geheim") || !strings.Contains(plain, "/label zonder") {31
t.Fatalf("tekst\n%s", plain)32
}33
}@@ -42,6 +42,8 @@ type IssueBoard struct {
42
42
CanDelete bool
43
43
Relate int64
44
44
Related []IssueRow
45
Tpls []string
46
Tpl string
45
47
}
46
48
47
49
// IssueChoice is een label of persoon in een formulier.
@@ -127,6 +129,7 @@ func (s *Server) newIssue(w http.ResponseWriter, r *http.Request) {
127
129
v.Wide = true
128
130
b := s.issueBoard(r, repo, role, u)
129
131
s.prefillIssue(r, repo, u, role, b)
132
s.fillTpl(r, repo, "issue", &b.FormBody, &b.Tpl, &b.Tpls)
130
133
v.Issues = b
131
134
s.render(w, "issuenew", v)
132
135
}
@@ -146,6 +149,7 @@ func (s *Server) createIssue(w http.ResponseWriter, r *http.Request) {
146
149
Description: r.FormValue("description"),
147
150
Confidential: r.FormValue("confidential") == "1",
148
151
}
152
base := quickBase{Confidential: in.Confidential}
149
153
if triagePosted(r) {
150
154
if !role.CanTriageIssue() {
151
155
http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
@@ -157,6 +161,27 @@ func (s *Server) createIssue(w http.ResponseWriter, r *http.Request) {
157
161
s.redirect(w, r, back, "", s.trErr(r, err))
158
162
return
159
163
}
164
base.Labels = r.Form["label"]
165
base.Assignees = r.Form["assignee"]
166
base.Milestone = r.FormValue("milestone")
167
base.Due = in.DueOn
168
}
169
q, err := s.foldQuick(r.Context(), repo, in.Description, role.CanTriageIssue(), true, base)
170
if err != nil {
171
s.redirect(w, r, back, "", s.trErr(r, err))
172
return
173
}
174
in.Description = q.Body
175
if q.Labels {
176
in.LabelIDs = q.LabelIDs
177
}
178
if q.Assignees {
179
in.AssigneeIDs = q.AssigneeIDs
180
}
181
if q.Meta {
182
in.MilestoneID = q.MilestoneID
183
in.DueOn = q.Due
184
in.Confidential = q.Confidential
160
185
}
161
186
iss, err := s.Store.CreateIssue(r.Context(), repo.ID, u.ID, in)
162
187
if err != nil {
@@ -187,6 +212,8 @@ func (s *Server) showIssue(w http.ResponseWriter, r *http.Request) {
187
212
v.Wide = true
188
213
b := s.issueBoard(r, repo, role, u)
189
214
row := s.issueRow(r, repo, iss)
215
canText := u.ID != 0 && (u.ID == iss.AuthorID || role.CanTriageIssue())
216
row.HTML = template.HTML(markdown.RenderTasks(iss.Description, "", "", "/"+repo.FullPath(), s.taskOpt(r, v.CSRF, repo, "issue", strconv.FormatInt(iss.Number, 10), canText)))
190
217
b.One = &row
191
218
b.Confidential = iss.Confidential
192
219
b.Milestone = iss.Milestone
@@ -203,7 +230,7 @@ func (s *Server) showIssue(w http.ResponseWriter, r *http.Request) {
203
230
b.Notes = append(b.Notes, IssueNoteRow{
204
231
Author: n.Author,
205
232
When: i18n.FormatDate(s.langOf(r), n.CreatedAt),
206
HTML: template.HTML(markdown.Render(n.Body, "", "", "/"+repo.FullPath())),
233
HTML: template.HTML(markdown.RenderTasks(n.Body, "", "", "/"+repo.FullPath(), s.taskOpt(r, v.CSRF, repo, "issue-note", strconv.FormatInt(n.ID, 10), u.ID != 0 && u.ID == n.AuthorID))),
207
234
})
208
235
}
209
236
related, _ := s.Store.RelatedIssues(r.Context(), repo.ID, iss.ID)
@@ -236,11 +263,29 @@ func (s *Server) postIssue(w http.ResponseWriter, r *http.Request) {
236
263
http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
237
264
return
238
265
}
239
if _, err := s.Store.AddIssueNote(r.Context(), repo.ID, iss.ID, u.ID, r.FormValue("body")); err != nil {
266
q, err := s.foldQuick(r.Context(), repo, r.FormValue("body"), role.CanTriageIssue(), false, quickFromIssue(iss))
267
if err != nil {
268
s.redirect(w, r, back, "", s.trErr(r, err))
269
return
270
}
271
if err := s.persistQuick(r.Context(), repo, iss.ID, q); err != nil {
272
s.redirect(w, r, back, "", s.trErr(r, err))
273
return
274
}
275
if strings.TrimSpace(q.Body) == "" {
276
if !q.touched() {
277
s.redirect(w, r, back, "", s.tr(r, "err.issueNote"))
278
return
279
}
280
s.issueHook(repo, iss.Number, u.Username, "updated", "")
281
s.redirect(w, r, back, s.tr(r, "flash.issueUpdated"), "")
282
return
283
}
284
if _, err := s.Store.AddIssueNote(r.Context(), repo.ID, iss.ID, u.ID, q.Body); err != nil {
240
285
s.redirect(w, r, back, "", s.trErr(r, err))
241
286
return
242
287
}
243
s.issueHook(repo, iss.Number, u.Username, "commented", strings.TrimSpace(r.FormValue("body")))
288
s.issueHook(repo, iss.Number, u.Username, "commented", strings.TrimSpace(q.Body))
244
289
s.redirect(w, r, back, s.tr(r, "flash.note"), "")
245
290
case "close", "reopen":
246
291
if u.ID != iss.AuthorID && !role.CanTriageIssue() {
@@ -267,7 +312,16 @@ func (s *Server) postIssue(w http.ResponseWriter, r *http.Request) {
267
312
http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
268
313
return
269
314
}
270
if err := s.Store.UpdateIssueText(r.Context(), iss.ID, r.FormValue("title"), r.FormValue("description")); err != nil {
315
q, err := s.foldQuick(r.Context(), repo, r.FormValue("description"), role.CanTriageIssue(), false, quickFromIssue(iss))
316
if err != nil {
317
s.redirect(w, r, back, "", s.trErr(r, err))
318
return
319
}
320
if err := s.Store.UpdateIssueText(r.Context(), iss.ID, r.FormValue("title"), q.Body); err != nil {
321
s.redirect(w, r, back, "", s.trErr(r, err))
322
return
323
}
324
if err := s.persistQuick(r.Context(), repo, iss.ID, q); err != nil {
271
325
s.redirect(w, r, back, "", s.trErr(r, err))
272
326
return
273
327
}
@@ -42,6 +42,8 @@ type IssueBoard struct {42
CanDelete bool42
CanDelete bool43
Relate int6443
Relate int6444
Related []IssueRow44
Related []IssueRow45
Tpls []string46
Tpl string45
}47
}46
48
47
// IssueChoice is een label of persoon in een formulier.49
// IssueChoice is een label of persoon in een formulier.@@ -127,6 +129,7 @@ func (s *Server) newIssue(w http.ResponseWriter, r *http.Request) {127
v.Wide = true129
v.Wide = true128
b := s.issueBoard(r, repo, role, u)130
b := s.issueBoard(r, repo, role, u)129
s.prefillIssue(r, repo, u, role, b)131
s.prefillIssue(r, repo, u, role, b)132
s.fillTpl(r, repo, "issue", &b.FormBody, &b.Tpl, &b.Tpls)130
v.Issues = b133
v.Issues = b131
s.render(w, "issuenew", v)134
s.render(w, "issuenew", v)132
}135
}@@ -146,6 +149,7 @@ func (s *Server) createIssue(w http.ResponseWriter, r *http.Request) {146
Description: r.FormValue("description"),149
Description: r.FormValue("description"),147
Confidential: r.FormValue("confidential") == "1",150
Confidential: r.FormValue("confidential") == "1",148
}151
}152
base := quickBase{Confidential: in.Confidential}149
if triagePosted(r) {153
if triagePosted(r) {150
if !role.CanTriageIssue() {154
if !role.CanTriageIssue() {151
http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)155
http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)@@ -157,6 +161,27 @@ func (s *Server) createIssue(w http.ResponseWriter, r *http.Request) {157
s.redirect(w, r, back, "", s.trErr(r, err))161
s.redirect(w, r, back, "", s.trErr(r, err))158
return162
return159
}163
}164
base.Labels = r.Form["label"]165
base.Assignees = r.Form["assignee"]166
base.Milestone = r.FormValue("milestone")167
base.Due = in.DueOn168
}169
q, err := s.foldQuick(r.Context(), repo, in.Description, role.CanTriageIssue(), true, base)170
if err != nil {171
s.redirect(w, r, back, "", s.trErr(r, err))172
return173
}174
in.Description = q.Body175
if q.Labels {176
in.LabelIDs = q.LabelIDs177
}178
if q.Assignees {179
in.AssigneeIDs = q.AssigneeIDs180
}181
if q.Meta {182
in.MilestoneID = q.MilestoneID183
in.DueOn = q.Due184
in.Confidential = q.Confidential160
}185
}161
iss, err := s.Store.CreateIssue(r.Context(), repo.ID, u.ID, in)186
iss, err := s.Store.CreateIssue(r.Context(), repo.ID, u.ID, in)162
if err != nil {187
if err != nil {@@ -187,6 +212,8 @@ func (s *Server) showIssue(w http.ResponseWriter, r *http.Request) {187
v.Wide = true212
v.Wide = true188
b := s.issueBoard(r, repo, role, u)213
b := s.issueBoard(r, repo, role, u)189
row := s.issueRow(r, repo, iss)214
row := s.issueRow(r, repo, iss)215
canText := u.ID != 0 && (u.ID == iss.AuthorID || role.CanTriageIssue())216
row.HTML = template.HTML(markdown.RenderTasks(iss.Description, "", "", "/"+repo.FullPath(), s.taskOpt(r, v.CSRF, repo, "issue", strconv.FormatInt(iss.Number, 10), canText)))190
b.One = &row217
b.One = &row191
b.Confidential = iss.Confidential218
b.Confidential = iss.Confidential192
b.Milestone = iss.Milestone219
b.Milestone = iss.Milestone@@ -203,7 +230,7 @@ func (s *Server) showIssue(w http.ResponseWriter, r *http.Request) {203
b.Notes = append(b.Notes, IssueNoteRow{230
b.Notes = append(b.Notes, IssueNoteRow{204
Author: n.Author,231
Author: n.Author,205
When: i18n.FormatDate(s.langOf(r), n.CreatedAt),232
When: i18n.FormatDate(s.langOf(r), n.CreatedAt),206
HTML: template.HTML(markdown.Render(n.Body, "", "", "/"+repo.FullPath())),233
HTML: template.HTML(markdown.RenderTasks(n.Body, "", "", "/"+repo.FullPath(), s.taskOpt(r, v.CSRF, repo, "issue-note", strconv.FormatInt(n.ID, 10), u.ID != 0 && u.ID == n.AuthorID))),207
})234
})208
}235
}209
related, _ := s.Store.RelatedIssues(r.Context(), repo.ID, iss.ID)236
related, _ := s.Store.RelatedIssues(r.Context(), repo.ID, iss.ID)@@ -236,11 +263,29 @@ func (s *Server) postIssue(w http.ResponseWriter, r *http.Request) {236
http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)263
http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)237
return264
return238
}265
}239
if _, err := s.Store.AddIssueNote(r.Context(), repo.ID, iss.ID, u.ID, r.FormValue("body")); err != nil {266
q, err := s.foldQuick(r.Context(), repo, r.FormValue("body"), role.CanTriageIssue(), false, quickFromIssue(iss))267
if err != nil {268
s.redirect(w, r, back, "", s.trErr(r, err))269
return270
}271
if err := s.persistQuick(r.Context(), repo, iss.ID, q); err != nil {272
s.redirect(w, r, back, "", s.trErr(r, err))273
return274
}275
if strings.TrimSpace(q.Body) == "" {276
if !q.touched() {277
s.redirect(w, r, back, "", s.tr(r, "err.issueNote"))278
return279
}280
s.issueHook(repo, iss.Number, u.Username, "updated", "")281
s.redirect(w, r, back, s.tr(r, "flash.issueUpdated"), "")282
return283
}284
if _, err := s.Store.AddIssueNote(r.Context(), repo.ID, iss.ID, u.ID, q.Body); err != nil {240
s.redirect(w, r, back, "", s.trErr(r, err))285
s.redirect(w, r, back, "", s.trErr(r, err))241
return286
return242
}287
}243
s.issueHook(repo, iss.Number, u.Username, "commented", strings.TrimSpace(r.FormValue("body")))288
s.issueHook(repo, iss.Number, u.Username, "commented", strings.TrimSpace(q.Body))244
s.redirect(w, r, back, s.tr(r, "flash.note"), "")289
s.redirect(w, r, back, s.tr(r, "flash.note"), "")245
case "close", "reopen":290
case "close", "reopen":246
if u.ID != iss.AuthorID && !role.CanTriageIssue() {291
if u.ID != iss.AuthorID && !role.CanTriageIssue() {@@ -267,7 +312,16 @@ func (s *Server) postIssue(w http.ResponseWriter, r *http.Request) {267
http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)312
http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)268
return313
return269
}314
}270
if err := s.Store.UpdateIssueText(r.Context(), iss.ID, r.FormValue("title"), r.FormValue("description")); err != nil {315
q, err := s.foldQuick(r.Context(), repo, r.FormValue("description"), role.CanTriageIssue(), false, quickFromIssue(iss))316
if err != nil {317
s.redirect(w, r, back, "", s.trErr(r, err))318
return319
}320
if err := s.Store.UpdateIssueText(r.Context(), iss.ID, r.FormValue("title"), q.Body); err != nil {321
s.redirect(w, r, back, "", s.trErr(r, err))322
return323
}324
if err := s.persistQuick(r.Context(), repo, iss.ID, q); err != nil {271
s.redirect(w, r, back, "", s.trErr(r, err))325
s.redirect(w, r, back, "", s.trErr(r, err))272
return326
return273
}327
}@@ -78,6 +78,33 @@ func (s *Server) issuesAPI(w http.ResponseWriter, r *http.Request) {
78
78
return
79
79
}
80
80
}
81
base := quickBase{Confidential: in.Confidential, Due: in.DueOn}
82
if req.Labels != nil {
83
base.Labels = *req.Labels
84
}
85
if req.Assignees != nil {
86
base.Assignees = *req.Assignees
87
}
88
if req.Milestone != nil {
89
base.Milestone = *req.Milestone
90
}
91
q, err := s.foldQuick(r.Context(), repo, in.Description, role.CanTriageIssue(), true, base)
92
if err != nil {
93
http.Error(w, s.trErr(r, err), http.StatusBadRequest)
94
return
95
}
96
in.Description = q.Body
97
if q.Labels {
98
in.LabelIDs = q.LabelIDs
99
}
100
if q.Assignees {
101
in.AssigneeIDs = q.AssigneeIDs
102
}
103
if q.Meta {
104
in.MilestoneID = q.MilestoneID
105
in.DueOn = q.Due
106
in.Confidential = q.Confidential
107
}
81
108
iss, err := s.Store.CreateIssue(r.Context(), repo.ID, u.ID, in)
82
109
if err != nil {
83
110
http.Error(w, s.trErr(r, err), http.StatusBadRequest)
@@ -133,27 +160,54 @@ func (s *Server) issueAPI(w http.ResponseWriter, r *http.Request) {
133
160
if !s.readJSON(w, r, &req) {
134
161
return
135
162
}
163
if (req.Labels != nil || req.Assignees != nil || req.Milestone != nil || req.DueDate != nil || req.Confidential != nil) && !role.CanTriageIssue() {
164
http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
165
return
166
}
136
167
action := ""
168
var folded quickResult
169
base := quickFromIssue(iss)
170
if req.Labels != nil {
171
base.Labels = *req.Labels
172
}
173
if req.Assignees != nil {
174
base.Assignees = *req.Assignees
175
}
176
if req.Milestone != nil {
177
base.Milestone = *req.Milestone
178
}
179
if req.DueDate != nil {
180
base.Due = *req.DueDate
181
}
182
if req.Confidential != nil {
183
base.Confidential = *req.Confidential
184
}
137
185
if req.Title != nil || req.Description != nil {
138
186
title, desc := iss.Title, iss.Description
139
187
if req.Title != nil {
140
188
title = *req.Title
141
189
}
142
190
if req.Description != nil {
143
desc = *req.Description
191
var err error
192
folded, err = s.foldQuick(r.Context(), repo, *req.Description, role.CanTriageIssue(), false, base)
193
if err != nil {
194
http.Error(w, s.trErr(r, err), http.StatusBadRequest)
195
return
196
}
197
desc = folded.Body
144
198
}
145
199
if err := s.Store.UpdateIssueText(r.Context(), iss.ID, title, desc); err != nil {
146
200
http.Error(w, s.trErr(r, err), http.StatusBadRequest)
147
201
return
148
202
}
203
if err := s.persistQuick(r.Context(), repo, iss.ID, folded); err != nil {
204
http.Error(w, s.trErr(r, err), http.StatusBadRequest)
205
return
206
}
149
207
action = "updated"
150
208
}
151
209
if req.Labels != nil || req.Assignees != nil || req.Milestone != nil || req.DueDate != nil || req.Confidential != nil {
152
if !role.CanTriageIssue() {
153
http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
154
return
155
}
156
if req.Labels != nil {
210
if req.Labels != nil && !folded.Labels {
157
211
ids, err := s.resolveLabels(r.Context(), repo.ID, *req.Labels)
158
212
if err != nil {
159
213
http.Error(w, s.trErr(r, err), http.StatusBadRequest)
@@ -164,7 +218,7 @@ func (s *Server) issueAPI(w http.ResponseWriter, r *http.Request) {
164
218
return
165
219
}
166
220
}
167
if req.Assignees != nil {
221
if req.Assignees != nil && !folded.Assignees {
168
222
ids, err := s.resolveAssignees(r.Context(), repo, *req.Assignees)
169
223
if err != nil {
170
224
http.Error(w, s.trErr(r, err), http.StatusBadRequest)
@@ -175,7 +229,7 @@ func (s *Server) issueAPI(w http.ResponseWriter, r *http.Request) {
175
229
return
176
230
}
177
231
}
178
if req.Milestone != nil || req.DueDate != nil || req.Confidential != nil {
232
if !folded.Meta && (req.Milestone != nil || req.DueDate != nil || req.Confidential != nil) {
179
233
mile, due, conf := iss.MilestoneID, iss.DueOn, iss.Confidential
180
234
if req.Milestone != nil {
181
235
id, err := s.resolveMilestone(r.Context(), repo.ID, *req.Milestone)
@@ -256,7 +310,31 @@ func (s *Server) issueNoteAPI(w http.ResponseWriter, r *http.Request) {
256
310
if !s.readJSON(w, r, &req) {
257
311
return
258
312
}
259
note, err := s.Store.AddIssueNote(r.Context(), repo.ID, iss.ID, u.ID, req.Body)
313
q, err := s.foldQuick(r.Context(), repo, req.Body, role.CanTriageIssue(), false, quickFromIssue(iss))
314
if err != nil {
315
http.Error(w, s.trErr(r, err), http.StatusBadRequest)
316
return
317
}
318
if err := s.persistQuick(r.Context(), repo, iss.ID, q); err != nil {
319
http.Error(w, s.trErr(r, err), http.StatusBadRequest)
320
return
321
}
322
if strings.TrimSpace(q.Body) == "" {
323
if !q.touched() {
324
http.Error(w, s.tr(r, "err.issueNote"), http.StatusBadRequest)
325
return
326
}
327
s.issueHook(repo, iss.Number, u.Username, "updated", "")
328
fresh, err := s.Store.IssueByNumber(r.Context(), repo.ID, n)
329
if err != nil {
330
s.fail(w, r, err)
331
return
332
}
333
notes, _ := s.Store.ListIssueNotes(r.Context(), fresh.ID)
334
writeJSON(w, http.StatusOK, s.issueJSON(repo, fresh, notes))
335
return
336
}
337
note, err := s.Store.AddIssueNote(r.Context(), repo.ID, iss.ID, u.ID, q.Body)
260
338
if err != nil {
261
339
http.Error(w, s.trErr(r, err), http.StatusBadRequest)
262
340
return
@@ -78,6 +78,33 @@ func (s *Server) issuesAPI(w http.ResponseWriter, r *http.Request) {78
return78
return79
}79
}80
}80
}81
base := quickBase{Confidential: in.Confidential, Due: in.DueOn}82
if req.Labels != nil {83
base.Labels = *req.Labels84
}85
if req.Assignees != nil {86
base.Assignees = *req.Assignees87
}88
if req.Milestone != nil {89
base.Milestone = *req.Milestone90
}91
q, err := s.foldQuick(r.Context(), repo, in.Description, role.CanTriageIssue(), true, base)92
if err != nil {93
http.Error(w, s.trErr(r, err), http.StatusBadRequest)94
return95
}96
in.Description = q.Body97
if q.Labels {98
in.LabelIDs = q.LabelIDs99
}100
if q.Assignees {101
in.AssigneeIDs = q.AssigneeIDs102
}103
if q.Meta {104
in.MilestoneID = q.MilestoneID105
in.DueOn = q.Due106
in.Confidential = q.Confidential107
}81
iss, err := s.Store.CreateIssue(r.Context(), repo.ID, u.ID, in)108
iss, err := s.Store.CreateIssue(r.Context(), repo.ID, u.ID, in)82
if err != nil {109
if err != nil {83
http.Error(w, s.trErr(r, err), http.StatusBadRequest)110
http.Error(w, s.trErr(r, err), http.StatusBadRequest)@@ -133,27 +160,54 @@ func (s *Server) issueAPI(w http.ResponseWriter, r *http.Request) {133
if !s.readJSON(w, r, &req) {160
if !s.readJSON(w, r, &req) {134
return161
return135
}162
}163
if (req.Labels != nil || req.Assignees != nil || req.Milestone != nil || req.DueDate != nil || req.Confidential != nil) && !role.CanTriageIssue() {164
http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)165
return166
}136
action := ""167
action := ""168
var folded quickResult169
base := quickFromIssue(iss)170
if req.Labels != nil {171
base.Labels = *req.Labels172
}173
if req.Assignees != nil {174
base.Assignees = *req.Assignees175
}176
if req.Milestone != nil {177
base.Milestone = *req.Milestone178
}179
if req.DueDate != nil {180
base.Due = *req.DueDate181
}182
if req.Confidential != nil {183
base.Confidential = *req.Confidential184
}137
if req.Title != nil || req.Description != nil {185
if req.Title != nil || req.Description != nil {138
title, desc := iss.Title, iss.Description186
title, desc := iss.Title, iss.Description139
if req.Title != nil {187
if req.Title != nil {140
title = *req.Title188
title = *req.Title141
}189
}142
if req.Description != nil {190
if req.Description != nil {143
desc = *req.Description191
var err error192
folded, err = s.foldQuick(r.Context(), repo, *req.Description, role.CanTriageIssue(), false, base)193
if err != nil {194
http.Error(w, s.trErr(r, err), http.StatusBadRequest)195
return196
}197
desc = folded.Body144
}198
}145
if err := s.Store.UpdateIssueText(r.Context(), iss.ID, title, desc); err != nil {199
if err := s.Store.UpdateIssueText(r.Context(), iss.ID, title, desc); err != nil {146
http.Error(w, s.trErr(r, err), http.StatusBadRequest)200
http.Error(w, s.trErr(r, err), http.StatusBadRequest)147
return201
return148
}202
}203
if err := s.persistQuick(r.Context(), repo, iss.ID, folded); err != nil {204
http.Error(w, s.trErr(r, err), http.StatusBadRequest)205
return206
}149
action = "updated"207
action = "updated"150
}208
}151
if req.Labels != nil || req.Assignees != nil || req.Milestone != nil || req.DueDate != nil || req.Confidential != nil {209
if req.Labels != nil || req.Assignees != nil || req.Milestone != nil || req.DueDate != nil || req.Confidential != nil {152
if !role.CanTriageIssue() {210
if req.Labels != nil && !folded.Labels {153
http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)154
return155
}156
if req.Labels != nil {157
ids, err := s.resolveLabels(r.Context(), repo.ID, *req.Labels)211
ids, err := s.resolveLabels(r.Context(), repo.ID, *req.Labels)158
if err != nil {212
if err != nil {159
http.Error(w, s.trErr(r, err), http.StatusBadRequest)213
http.Error(w, s.trErr(r, err), http.StatusBadRequest)@@ -164,7 +218,7 @@ func (s *Server) issueAPI(w http.ResponseWriter, r *http.Request) {164
return218
return165
}219
}166
}220
}167
if req.Assignees != nil {221
if req.Assignees != nil && !folded.Assignees {168
ids, err := s.resolveAssignees(r.Context(), repo, *req.Assignees)222
ids, err := s.resolveAssignees(r.Context(), repo, *req.Assignees)169
if err != nil {223
if err != nil {170
http.Error(w, s.trErr(r, err), http.StatusBadRequest)224
http.Error(w, s.trErr(r, err), http.StatusBadRequest)@@ -175,7 +229,7 @@ func (s *Server) issueAPI(w http.ResponseWriter, r *http.Request) {175
return229
return176
}230
}177
}231
}178
if req.Milestone != nil || req.DueDate != nil || req.Confidential != nil {232
if !folded.Meta && (req.Milestone != nil || req.DueDate != nil || req.Confidential != nil) {179
mile, due, conf := iss.MilestoneID, iss.DueOn, iss.Confidential233
mile, due, conf := iss.MilestoneID, iss.DueOn, iss.Confidential180
if req.Milestone != nil {234
if req.Milestone != nil {181
id, err := s.resolveMilestone(r.Context(), repo.ID, *req.Milestone)235
id, err := s.resolveMilestone(r.Context(), repo.ID, *req.Milestone)@@ -256,7 +310,31 @@ func (s *Server) issueNoteAPI(w http.ResponseWriter, r *http.Request) {256
if !s.readJSON(w, r, &req) {310
if !s.readJSON(w, r, &req) {257
return311
return258
}312
}259
note, err := s.Store.AddIssueNote(r.Context(), repo.ID, iss.ID, u.ID, req.Body)313
q, err := s.foldQuick(r.Context(), repo, req.Body, role.CanTriageIssue(), false, quickFromIssue(iss))314
if err != nil {315
http.Error(w, s.trErr(r, err), http.StatusBadRequest)316
return317
}318
if err := s.persistQuick(r.Context(), repo, iss.ID, q); err != nil {319
http.Error(w, s.trErr(r, err), http.StatusBadRequest)320
return321
}322
if strings.TrimSpace(q.Body) == "" {323
if !q.touched() {324
http.Error(w, s.tr(r, "err.issueNote"), http.StatusBadRequest)325
return326
}327
s.issueHook(repo, iss.Number, u.Username, "updated", "")328
fresh, err := s.Store.IssueByNumber(r.Context(), repo.ID, n)329
if err != nil {330
s.fail(w, r, err)331
return332
}333
notes, _ := s.Store.ListIssueNotes(r.Context(), fresh.ID)334
writeJSON(w, http.StatusOK, s.issueJSON(repo, fresh, notes))335
return336
}337
note, err := s.Store.AddIssueNote(r.Context(), repo.ID, iss.ID, u.ID, q.Body)260
if err != nil {338
if err != nil {261
http.Error(w, s.trErr(r, err), http.StatusBadRequest)339
http.Error(w, s.trErr(r, err), http.StatusBadRequest)262
return340
return@@ -58,6 +58,7 @@ func (s *Server) newMR(w http.ResponseWriter, r *http.Request) {
58
58
s.fillCompare(r, &v, repo, target, source)
59
59
v.CompareFrom = source
60
60
v.CompareTo = target
61
s.fillTpl(r, repo, "mr", &v.FormBody, &v.TplPick, &v.DescTpls)
61
62
s.render(w, "newmr", v)
62
63
}
63
64
@@ -75,7 +76,7 @@ func (s *Server) previewMarkdown(w http.ResponseWriter, r *http.Request) {
75
76
body = body[:20000]
76
77
}
77
78
w.Header().Set("Content-Type", "text/html; charset=utf-8")
78
_, _ = w.Write([]byte(markdown.Render(body, "", "", "/"+repo.FullPath())))
79
_, _ = w.Write([]byte(markdown.RenderTasks(body, "", "", "/"+repo.FullPath(), markdown.Tasks{Count: s.tr(r, "tpl.tasks")})))
79
80
}
80
81
81
82
func (s *Server) updateMR(w http.ResponseWriter, r *http.Request) {
@@ -96,9 +97,10 @@ func (s *Server) updateMR(w http.ResponseWriter, r *http.Request) {
96
97
}
97
98
98
99
func (s *Server) finishMR(r *http.Request, v *View, repo store.Repo, mr store.MergeRequest, u store.User) {
99
v.DescHTML = template.HTML(markdown.Render(mr.Description, "", "", "/"+repo.FullPath()))
100
canText := mr.Status == "open" && u.ID != 0 && (u.ID == mr.AuthorID || v.CanWrite)
101
v.DescHTML = template.HTML(markdown.RenderTasks(mr.Description, "", "", "/"+repo.FullPath(), s.taskOpt(r, v.CSRF, repo, "mr", strconv.FormatInt(mr.Number, 10), canText)))
100
102
v.Labels = splitLabels(mr.Labels)
101
v.CanEditMR = mr.Status == "open" && u.ID != 0 && (u.ID == mr.AuthorID || v.CanWrite)
103
v.CanEditMR = canText
102
104
switch r.URL.Query().Get("tab") {
103
105
case "commits", "pipelines", "changes":
104
106
v.Tab = r.URL.Query().Get("tab")
@@ -107,7 +109,10 @@ func (s *Server) finishMR(r *http.Request, v *View, repo store.Repo, mr store.Me
107
109
}
108
110
s.fillCompare(r, v, repo, mr.TargetBranch, mr.SourceBranch)
109
111
raw, _ := s.Store.ListNotes(r.Context(), mr.ID)
110
rows := buildNoteRows(raw, s.langOf(r), "/"+repo.FullPath())
112
rows := buildNoteRows(raw, s.langOf(r), noteRender{
113
RepoPath: "/" + repo.FullPath(), Post: repoURL(repo) + "/-/tasks", CSRF: v.CSRF,
114
Count: s.tr(r, "tpl.tasks"), Toggle: s.tr(r, "tpl.toggle"), ViewerID: u.ID,
115
})
111
116
v.Notes = stampNotes(v.CommitDiff, rows)
112
117
s.fillTimeline(r, v, repo, mr, rows)
113
118
}
@@ -58,6 +58,7 @@ func (s *Server) newMR(w http.ResponseWriter, r *http.Request) {58
s.fillCompare(r, &v, repo, target, source)58
s.fillCompare(r, &v, repo, target, source)59
v.CompareFrom = source59
v.CompareFrom = source60
v.CompareTo = target60
v.CompareTo = target61
s.fillTpl(r, repo, "mr", &v.FormBody, &v.TplPick, &v.DescTpls)61
s.render(w, "newmr", v)62
s.render(w, "newmr", v)62
}63
}63
64
@@ -75,7 +76,7 @@ func (s *Server) previewMarkdown(w http.ResponseWriter, r *http.Request) {75
body = body[:20000]76
body = body[:20000]76
}77
}77
w.Header().Set("Content-Type", "text/html; charset=utf-8")78
w.Header().Set("Content-Type", "text/html; charset=utf-8")78
_, _ = w.Write([]byte(markdown.Render(body, "", "", "/"+repo.FullPath())))79
_, _ = w.Write([]byte(markdown.RenderTasks(body, "", "", "/"+repo.FullPath(), markdown.Tasks{Count: s.tr(r, "tpl.tasks")})))79
}80
}80
81
81
func (s *Server) updateMR(w http.ResponseWriter, r *http.Request) {82
func (s *Server) updateMR(w http.ResponseWriter, r *http.Request) {@@ -96,9 +97,10 @@ func (s *Server) updateMR(w http.ResponseWriter, r *http.Request) {96
}97
}97
98
98
func (s *Server) finishMR(r *http.Request, v *View, repo store.Repo, mr store.MergeRequest, u store.User) {99
func (s *Server) finishMR(r *http.Request, v *View, repo store.Repo, mr store.MergeRequest, u store.User) {99
v.DescHTML = template.HTML(markdown.Render(mr.Description, "", "", "/"+repo.FullPath()))100
canText := mr.Status == "open" && u.ID != 0 && (u.ID == mr.AuthorID || v.CanWrite)101
v.DescHTML = template.HTML(markdown.RenderTasks(mr.Description, "", "", "/"+repo.FullPath(), s.taskOpt(r, v.CSRF, repo, "mr", strconv.FormatInt(mr.Number, 10), canText)))100
v.Labels = splitLabels(mr.Labels)102
v.Labels = splitLabels(mr.Labels)101
v.CanEditMR = mr.Status == "open" && u.ID != 0 && (u.ID == mr.AuthorID || v.CanWrite)103
v.CanEditMR = canText102
switch r.URL.Query().Get("tab") {104
switch r.URL.Query().Get("tab") {103
case "commits", "pipelines", "changes":105
case "commits", "pipelines", "changes":104
v.Tab = r.URL.Query().Get("tab")106
v.Tab = r.URL.Query().Get("tab")@@ -107,7 +109,10 @@ func (s *Server) finishMR(r *http.Request, v *View, repo store.Repo, mr store.Me107
}109
}108
s.fillCompare(r, v, repo, mr.TargetBranch, mr.SourceBranch)110
s.fillCompare(r, v, repo, mr.TargetBranch, mr.SourceBranch)109
raw, _ := s.Store.ListNotes(r.Context(), mr.ID)111
raw, _ := s.Store.ListNotes(r.Context(), mr.ID)110
rows := buildNoteRows(raw, s.langOf(r), "/"+repo.FullPath())112
rows := buildNoteRows(raw, s.langOf(r), noteRender{113
RepoPath: "/" + repo.FullPath(), Post: repoURL(repo) + "/-/tasks", CSRF: v.CSRF,114
Count: s.tr(r, "tpl.tasks"), Toggle: s.tr(r, "tpl.toggle"), ViewerID: u.ID,115
})111
v.Notes = stampNotes(v.CommitDiff, rows)116
v.Notes = stampNotes(v.CommitDiff, rows)112
s.fillTimeline(r, v, repo, mr, rows)117
s.fillTimeline(r, v, repo, mr, rows)113
}118
}@@ -40,7 +40,7 @@ func (s *Server) fillOverview(r *http.Request, v *View, repo store.Repo) {
40
40
if err == nil && !binary {
41
41
v.ReadmeName = readme
42
42
base := "/" + repo.FullPath() + "/-/blob/"
43
v.Readme = template.HTML(markdown.Render(text, base, v.Rev, "/"+repo.FullPath()))
43
v.Readme = template.HTML(markdown.RenderTasks(text, base, v.Rev, "/"+repo.FullPath(), markdown.Tasks{Count: s.tr(r, "tpl.tasks")}))
44
44
}
45
45
}
46
46
commits, branches, tags, _ := gitrepo.Stats(r.Context(), s.Git, dir, v.Rev)
@@ -40,7 +40,7 @@ func (s *Server) fillOverview(r *http.Request, v *View, repo store.Repo) {40
if err == nil && !binary {40
if err == nil && !binary {41
v.ReadmeName = readme41
v.ReadmeName = readme42
base := "/" + repo.FullPath() + "/-/blob/"42
base := "/" + repo.FullPath() + "/-/blob/"43
v.Readme = template.HTML(markdown.Render(text, base, v.Rev, "/"+repo.FullPath()))43
v.Readme = template.HTML(markdown.RenderTasks(text, base, v.Rev, "/"+repo.FullPath(), markdown.Tasks{Count: s.tr(r, "tpl.tasks")}))44
}44
}45
}45
}46
commits, branches, tags, _ := gitrepo.Stats(r.Context(), s.Git, dir, v.Rev)46
commits, branches, tags, _ := gitrepo.Stats(r.Context(), s.Git, dir, v.Rev)@@ -0,0 +1,184 @@
1
package server
2
3
import (
4
"context"
5
"strings"
6
7
"gitlab.com/Timfa/bluegit/internal/quick"
8
"gitlab.com/Timfa/bluegit/internal/store"
9
)
10
11
type quickBase struct {
12
Labels []string
13
Assignees []string
14
Milestone string
15
Due string
16
Confidential bool
17
}
18
19
type quickResult struct {
20
Body string
21
LabelIDs []int64
22
AssigneeIDs []int64
23
MilestoneID int64
24
Due string
25
Confidential bool
26
Labels bool
27
Assignees bool
28
Meta bool
29
}
30
31
func (q quickResult) touched() bool {
32
return q.Labels || q.Assignees || q.Meta
33
}
34
35
// foldQuick haalt quick actions uit de tekst als de gebruiker ze mag uitvoeren.
36
// Een regel zonder recht blijft staan. Een onbekend label of een onbekende
37
// gebruiker is een fout en er wordt nog niets opgeslagen.
38
func (s *Server) foldQuick(ctx context.Context, repo store.Repo, body string, canTriage, creating bool, base quickBase) (quickResult, error) {
39
labels := append([]string{}, base.Labels...)
40
assignees := append([]string{}, base.Assignees...)
41
mile := base.Milestone
42
due := base.Due
43
conf := base.Confidential
44
var kept []string
45
var touchL, touchA, touchM bool
46
for _, p := range quick.Scan(body) {
47
if p.Cmd == nil || !allowQuick(p.Cmd.Kind, canTriage, creating) {
48
kept = append(kept, p.Text)
49
continue
50
}
51
switch p.Cmd.Kind {
52
case "label":
53
touchL = true
54
for _, name := range p.Cmd.Names {
55
if !hasName(labels, name) {
56
labels = append(labels, name)
57
}
58
}
59
case "unlabel":
60
touchL = true
61
labels = dropNames(labels, p.Cmd.Names)
62
case "assign":
63
touchA = true
64
for _, name := range p.Cmd.Names {
65
if !hasFold(assignees, name) {
66
assignees = append(assignees, name)
67
}
68
}
69
case "unassign":
70
touchA = true
71
assignees = dropFold(assignees, p.Cmd.Names)
72
case "milestone":
73
touchM = true
74
mile = p.Cmd.Names[0]
75
case "due":
76
touchM = true
77
due = p.Cmd.Due
78
case "confidential":
79
touchM = true
80
conf = true
81
}
82
}
83
res := quickResult{Body: strings.Join(kept, "\n"), Due: due, Confidential: conf, Labels: touchL, Assignees: touchA, Meta: touchM}
84
if touchL {
85
ids, err := s.resolveLabels(ctx, repo.ID, labels)
86
if err != nil {
87
return quickResult{}, err
88
}
89
res.LabelIDs = ids
90
}
91
if touchA {
92
ids, err := s.resolveAssignees(ctx, repo, assignees)
93
if err != nil {
94
return quickResult{}, err
95
}
96
res.AssigneeIDs = ids
97
}
98
if touchM {
99
id, err := s.resolveMilestone(ctx, repo.ID, mile)
100
if err != nil {
101
return quickResult{}, err
102
}
103
if err := store.ValidDue(due); err != nil {
104
return quickResult{}, err
105
}
106
res.MilestoneID = id
107
}
108
return res, nil
109
}
110
111
func (s *Server) persistQuick(ctx context.Context, repo store.Repo, issueID int64, res quickResult) error {
112
if res.Labels {
113
if err := s.Store.SetIssueLabels(ctx, repo.ID, issueID, res.LabelIDs); err != nil {
114
return err
115
}
116
}
117
if res.Assignees {
118
if err := s.Store.SetIssueAssignees(ctx, repo.ID, issueID, res.AssigneeIDs); err != nil {
119
return err
120
}
121
}
122
if res.Meta {
123
if err := s.Store.SetIssueMeta(ctx, repo.ID, issueID, res.MilestoneID, res.Confidential, res.Due); err != nil {
124
return err
125
}
126
}
127
return nil
128
}
129
130
func allowQuick(kind string, canTriage, creating bool) bool {
131
if canTriage {
132
return true
133
}
134
return creating && kind == "confidential"
135
}
136
137
func hasName(list []string, name string) bool {
138
for _, item := range list {
139
if item == name {
140
return true
141
}
142
}
143
return false
144
}
145
146
func hasFold(list []string, name string) bool {
147
for _, item := range list {
148
if strings.EqualFold(item, name) {
149
return true
150
}
151
}
152
return false
153
}
154
155
func dropNames(list, gone []string) []string {
156
dead := map[string]bool{}
157
for _, name := range gone {
158
dead[name] = true
159
}
160
var out []string
161
for _, name := range list {
162
if !dead[name] {
163
out = append(out, name)
164
}
165
}
166
return out
167
}
168
169
func dropFold(list, gone []string) []string {
170
var out []string
171
for _, name := range list {
172
if !hasFold(gone, name) {
173
out = append(out, name)
174
}
175
}
176
return out
177
}
178
179
func quickFromIssue(iss store.Issue) quickBase {
180
return quickBase{
181
Labels: labelNames(iss.Labels), Assignees: append([]string{}, iss.Assignees...),
182
Milestone: iss.Milestone, Due: iss.DueOn, Confidential: iss.Confidential,
183
}
184
}
@@ -0,0 +1,184 @@1
package server2
3
import (4
"context"5
"strings"6
7
"gitlab.com/Timfa/bluegit/internal/quick"8
"gitlab.com/Timfa/bluegit/internal/store"9
)10
11
type quickBase struct {12
Labels []string13
Assignees []string14
Milestone string15
Due string16
Confidential bool17
}18
19
type quickResult struct {20
Body string21
LabelIDs []int6422
AssigneeIDs []int6423
MilestoneID int6424
Due string25
Confidential bool26
Labels bool27
Assignees bool28
Meta bool29
}30
31
func (q quickResult) touched() bool {32
return q.Labels || q.Assignees || q.Meta33
}34
35
// foldQuick haalt quick actions uit de tekst als de gebruiker ze mag uitvoeren.36
// Een regel zonder recht blijft staan. Een onbekend label of een onbekende37
// gebruiker is een fout en er wordt nog niets opgeslagen.38
func (s *Server) foldQuick(ctx context.Context, repo store.Repo, body string, canTriage, creating bool, base quickBase) (quickResult, error) {39
labels := append([]string{}, base.Labels...)40
assignees := append([]string{}, base.Assignees...)41
mile := base.Milestone42
due := base.Due43
conf := base.Confidential44
var kept []string45
var touchL, touchA, touchM bool46
for _, p := range quick.Scan(body) {47
if p.Cmd == nil || !allowQuick(p.Cmd.Kind, canTriage, creating) {48
kept = append(kept, p.Text)49
continue50
}51
switch p.Cmd.Kind {52
case "label":53
touchL = true54
for _, name := range p.Cmd.Names {55
if !hasName(labels, name) {56
labels = append(labels, name)57
}58
}59
case "unlabel":60
touchL = true61
labels = dropNames(labels, p.Cmd.Names)62
case "assign":63
touchA = true64
for _, name := range p.Cmd.Names {65
if !hasFold(assignees, name) {66
assignees = append(assignees, name)67
}68
}69
case "unassign":70
touchA = true71
assignees = dropFold(assignees, p.Cmd.Names)72
case "milestone":73
touchM = true74
mile = p.Cmd.Names[0]75
case "due":76
touchM = true77
due = p.Cmd.Due78
case "confidential":79
touchM = true80
conf = true81
}82
}83
res := quickResult{Body: strings.Join(kept, "\n"), Due: due, Confidential: conf, Labels: touchL, Assignees: touchA, Meta: touchM}84
if touchL {85
ids, err := s.resolveLabels(ctx, repo.ID, labels)86
if err != nil {87
return quickResult{}, err88
}89
res.LabelIDs = ids90
}91
if touchA {92
ids, err := s.resolveAssignees(ctx, repo, assignees)93
if err != nil {94
return quickResult{}, err95
}96
res.AssigneeIDs = ids97
}98
if touchM {99
id, err := s.resolveMilestone(ctx, repo.ID, mile)100
if err != nil {101
return quickResult{}, err102
}103
if err := store.ValidDue(due); err != nil {104
return quickResult{}, err105
}106
res.MilestoneID = id107
}108
return res, nil109
}110
111
func (s *Server) persistQuick(ctx context.Context, repo store.Repo, issueID int64, res quickResult) error {112
if res.Labels {113
if err := s.Store.SetIssueLabels(ctx, repo.ID, issueID, res.LabelIDs); err != nil {114
return err115
}116
}117
if res.Assignees {118
if err := s.Store.SetIssueAssignees(ctx, repo.ID, issueID, res.AssigneeIDs); err != nil {119
return err120
}121
}122
if res.Meta {123
if err := s.Store.SetIssueMeta(ctx, repo.ID, issueID, res.MilestoneID, res.Confidential, res.Due); err != nil {124
return err125
}126
}127
return nil128
}129
130
func allowQuick(kind string, canTriage, creating bool) bool {131
if canTriage {132
return true133
}134
return creating && kind == "confidential"135
}136
137
func hasName(list []string, name string) bool {138
for _, item := range list {139
if item == name {140
return true141
}142
}143
return false144
}145
146
func hasFold(list []string, name string) bool {147
for _, item := range list {148
if strings.EqualFold(item, name) {149
return true150
}151
}152
return false153
}154
155
func dropNames(list, gone []string) []string {156
dead := map[string]bool{}157
for _, name := range gone {158
dead[name] = true159
}160
var out []string161
for _, name := range list {162
if !dead[name] {163
out = append(out, name)164
}165
}166
return out167
}168
169
func dropFold(list, gone []string) []string {170
var out []string171
for _, name := range list {172
if !hasFold(gone, name) {173
out = append(out, name)174
}175
}176
return out177
}178
179
func quickFromIssue(iss store.Issue) quickBase {180
return quickBase{181
Labels: labelNames(iss.Labels), Assignees: append([]string{}, iss.Assignees...),182
Milestone: iss.Milestone, Due: iss.DueOn, Confidential: iss.Confidential,183
}184
}@@ -6,6 +6,7 @@ import (
6
6
"strings"
7
7
8
8
"gitlab.com/Timfa/bluegit/internal/access"
9
"gitlab.com/Timfa/bluegit/internal/desctpl"
9
10
"gitlab.com/Timfa/bluegit/internal/gitrepo"
10
11
"gitlab.com/Timfa/bluegit/internal/i18n"
11
12
"gitlab.com/Timfa/bluegit/internal/store"
@@ -180,7 +181,10 @@ func (s *Server) createMR(w http.ResponseWriter, r *http.Request) {
180
181
if !ok || !s.csrfOK(w, r) {
181
182
return
182
183
}
183
mr, err := s.opCreateMR(r.Context(), u, repo, r.FormValue("title"), r.FormValue("description"), r.FormValue("source"), r.FormValue("target"), r.FormValue("draft") == "1")
184
source := safeRev(r.FormValue("source"), "")
185
target := safeRev(r.FormValue("target"), repo.DefaultBranch)
186
desc := desctpl.Expand(r.FormValue("description"), s.mrVars(r, repo, source, target))
187
mr, err := s.opCreateMR(r.Context(), u, repo, r.FormValue("title"), desc, source, target, r.FormValue("draft") == "1")
184
188
if !s.uiOK(w, r, repoURL(repo)+"/-/merge-requests", err) {
185
189
return
186
190
}
@@ -6,6 +6,7 @@ import (6
"strings"6
"strings"7
7
8
"gitlab.com/Timfa/bluegit/internal/access"8
"gitlab.com/Timfa/bluegit/internal/access"9
"gitlab.com/Timfa/bluegit/internal/desctpl"9
"gitlab.com/Timfa/bluegit/internal/gitrepo"10
"gitlab.com/Timfa/bluegit/internal/gitrepo"10
"gitlab.com/Timfa/bluegit/internal/i18n"11
"gitlab.com/Timfa/bluegit/internal/i18n"11
"gitlab.com/Timfa/bluegit/internal/store"12
"gitlab.com/Timfa/bluegit/internal/store"@@ -180,7 +181,10 @@ func (s *Server) createMR(w http.ResponseWriter, r *http.Request) {180
if !ok || !s.csrfOK(w, r) {181
if !ok || !s.csrfOK(w, r) {181
return182
return182
}183
}183
mr, err := s.opCreateMR(r.Context(), u, repo, r.FormValue("title"), r.FormValue("description"), r.FormValue("source"), r.FormValue("target"), r.FormValue("draft") == "1")184
source := safeRev(r.FormValue("source"), "")185
target := safeRev(r.FormValue("target"), repo.DefaultBranch)186
desc := desctpl.Expand(r.FormValue("description"), s.mrVars(r, repo, source, target))187
mr, err := s.opCreateMR(r.Context(), u, repo, r.FormValue("title"), desc, source, target, r.FormValue("draft") == "1")184
if !s.uiOK(w, r, repoURL(repo)+"/-/merge-requests", err) {188
if !s.uiOK(w, r, repoURL(repo)+"/-/merge-requests", err) {185
return189
return186
}190
}@@ -163,6 +163,7 @@ func (s *Server) Handler() http.Handler {
163
163
mux.HandleFunc("POST /{owner}/{repo}/-/branches/rename", s.renameBranch)
164
164
mux.HandleFunc("GET /{owner}/{repo}/-/compare", s.compare)
165
165
mux.HandleFunc("POST /{owner}/{repo}/-/markdown", s.previewMarkdown)
166
mux.HandleFunc("POST /{owner}/{repo}/-/tasks", s.toggleTask)
166
167
mux.HandleFunc("GET /{owner}/{repo}/-/merge-requests", s.mergeRequests)
167
168
mux.HandleFunc("GET /{owner}/{repo}/-/merge-requests/new", s.newMR)
168
169
mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests", s.createMR)
@@ -604,6 +605,9 @@ type View struct {
604
605
CanEditMR bool
605
606
Issues *IssueBoard
606
607
IssueDoc string
608
DescTpls []string
609
TplPick string
610
FormBody string
607
611
}
608
612
609
613
// LangChoice is één taal in de instellingen.
@@ -163,6 +163,7 @@ func (s *Server) Handler() http.Handler {163
mux.HandleFunc("POST /{owner}/{repo}/-/branches/rename", s.renameBranch)163
mux.HandleFunc("POST /{owner}/{repo}/-/branches/rename", s.renameBranch)164
mux.HandleFunc("GET /{owner}/{repo}/-/compare", s.compare)164
mux.HandleFunc("GET /{owner}/{repo}/-/compare", s.compare)165
mux.HandleFunc("POST /{owner}/{repo}/-/markdown", s.previewMarkdown)165
mux.HandleFunc("POST /{owner}/{repo}/-/markdown", s.previewMarkdown)166
mux.HandleFunc("POST /{owner}/{repo}/-/tasks", s.toggleTask)166
mux.HandleFunc("GET /{owner}/{repo}/-/merge-requests", s.mergeRequests)167
mux.HandleFunc("GET /{owner}/{repo}/-/merge-requests", s.mergeRequests)167
mux.HandleFunc("GET /{owner}/{repo}/-/merge-requests/new", s.newMR)168
mux.HandleFunc("GET /{owner}/{repo}/-/merge-requests/new", s.newMR)168
mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests", s.createMR)169
mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests", s.createMR)@@ -604,6 +605,9 @@ type View struct {604
CanEditMR bool605
CanEditMR bool605
Issues *IssueBoard606
Issues *IssueBoard606
IssueDoc string607
IssueDoc string608
DescTpls []string609
TplPick string610
FormBody string607
}611
}608
612
609
// LangChoice is één taal in de instellingen.613
// LangChoice is één taal in de instellingen.@@ -893,3 +893,14 @@ form.wh .grid-2 label { margin-top: 0; }
893
893
.lab { display: inline-block; color: #fff; border-radius: 999px; padding: 0.05rem 0.45rem; font-size: 0.78rem; margin: 0 0.2rem; }
894
894
.issue-meta { display: flex; flex-wrap: wrap; gap: 0.35rem; align-items: center; margin: 0.4rem 0; }
895
895
.checks label { display: block; margin: 0.2rem 0; }
896
.taskcount { margin: 0.7rem 0 0.2rem; font-size: 0.9rem; }
897
ul.tasks { list-style: none; padding-left: 0.1rem; }
898
ul.tasks > li { display: flex; align-items: flex-start; gap: 0.35rem; margin: 0.25rem 0; }
899
.taskform { display: inline-flex; margin: 0; }
900
button.taskbox {
901
min-height: 1.1rem; width: 1.1rem; height: 1.1rem; padding: 0;
902
background: var(--card); color: var(--ink); border: 1px solid var(--ink); border-radius: 3px;
903
font-size: 0.75rem;
904
}
905
button.taskbox.on { background: var(--blue); color: #fff; border-color: var(--blue); }
906
input.tasktick { margin: 0.15rem 0.35rem 0 0; }
@@ -893,3 +893,14 @@ form.wh .grid-2 label { margin-top: 0; }893
.lab { display: inline-block; color: #fff; border-radius: 999px; padding: 0.05rem 0.45rem; font-size: 0.78rem; margin: 0 0.2rem; }893
.lab { display: inline-block; color: #fff; border-radius: 999px; padding: 0.05rem 0.45rem; font-size: 0.78rem; margin: 0 0.2rem; }894
.issue-meta { display: flex; flex-wrap: wrap; gap: 0.35rem; align-items: center; margin: 0.4rem 0; }894
.issue-meta { display: flex; flex-wrap: wrap; gap: 0.35rem; align-items: center; margin: 0.4rem 0; }895
.checks label { display: block; margin: 0.2rem 0; }895
.checks label { display: block; margin: 0.2rem 0; }896
.taskcount { margin: 0.7rem 0 0.2rem; font-size: 0.9rem; }897
ul.tasks { list-style: none; padding-left: 0.1rem; }898
ul.tasks > li { display: flex; align-items: flex-start; gap: 0.35rem; margin: 0.25rem 0; }899
.taskform { display: inline-flex; margin: 0; }900
button.taskbox {901
min-height: 1.1rem; width: 1.1rem; height: 1.1rem; padding: 0;902
background: var(--card); color: var(--ink); border: 1px solid var(--ink); border-radius: 3px;903
font-size: 0.75rem;904
}905
button.taskbox.on { background: var(--blue); color: #fff; border-color: var(--blue); }906
input.tasktick { margin: 0.15rem 0.35rem 0 0; }@@ -13,7 +13,16 @@ import (
13
13
"gitlab.com/Timfa/bluegit/internal/store"
14
14
)
15
15
16
func buildNoteRows(notes []store.Note, lang i18n.Lang, repoPath string) []NoteRow {
16
type noteRender struct {
17
RepoPath string
18
Post string
19
CSRF string
20
Count string
21
Toggle string
22
ViewerID int64
23
}
24
25
func buildNoteRows(notes []store.Note, lang i18n.Lang, opt noteRender) []NoteRow {
17
26
rows := make([]NoteRow, len(notes))
18
27
index := map[int64]int{}
19
28
for i, n := range notes {
@@ -21,7 +30,10 @@ func buildNoteRows(notes []store.Note, lang i18n.Lang, repoPath string) []NoteRo
21
30
ID: n.ID, Author: n.Author, Body: n.Body, Path: n.FilePath,
22
31
Start: n.LineStart, End: n.LineEnd, HasSuggestion: n.Suggestion != "",
23
32
When: i18n.FormatDate(lang, n.CreatedAt), At: n.CreatedAt, ParentID: n.ParentID,
24
HTML: template.HTML(markdown.Render(n.Body, "", "", repoPath)),
33
HTML: template.HTML(markdown.RenderTasks(n.Body, "", "", opt.RepoPath, markdown.Tasks{
34
Post: opt.Post, CSRF: opt.CSRF, Kind: "mr-note", ID: strconv.FormatInt(n.ID, 10),
35
CanToggle: opt.ViewerID != 0 && opt.ViewerID == n.AuthorID, Count: opt.Count, Toggle: opt.Toggle,
36
})),
25
37
}
26
38
index[n.ID] = i
27
39
}
@@ -40,8 +52,8 @@ func buildNoteRows(notes []store.Note, lang i18n.Lang, repoPath string) []NoteRo
40
52
return rows
41
53
}
42
54
43
func arrangeNotes(notes []store.Note, files []gitrepo.DiffFile, lang i18n.Lang, repoPath string) ([]NoteRow, []DiffFileView) {
44
rows := buildNoteRows(notes, lang, repoPath)
55
func arrangeNotes(notes []store.Note, files []gitrepo.DiffFile, lang i18n.Lang, opt noteRender) ([]NoteRow, []DiffFileView) {
56
rows := buildNoteRows(notes, lang, opt)
45
57
placed := map[int64]bool{}
46
58
var views []DiffFileView
47
59
for _, f := range files {
@@ -13,7 +13,16 @@ import (13
"gitlab.com/Timfa/bluegit/internal/store"13
"gitlab.com/Timfa/bluegit/internal/store"14
)14
)15
15
16
func buildNoteRows(notes []store.Note, lang i18n.Lang, repoPath string) []NoteRow {16
type noteRender struct {17
RepoPath string18
Post string19
CSRF string20
Count string21
Toggle string22
ViewerID int6423
}24
25
func buildNoteRows(notes []store.Note, lang i18n.Lang, opt noteRender) []NoteRow {17
rows := make([]NoteRow, len(notes))26
rows := make([]NoteRow, len(notes))18
index := map[int64]int{}27
index := map[int64]int{}19
for i, n := range notes {28
for i, n := range notes {@@ -21,7 +30,10 @@ func buildNoteRows(notes []store.Note, lang i18n.Lang, repoPath string) []NoteRo21
ID: n.ID, Author: n.Author, Body: n.Body, Path: n.FilePath,30
ID: n.ID, Author: n.Author, Body: n.Body, Path: n.FilePath,22
Start: n.LineStart, End: n.LineEnd, HasSuggestion: n.Suggestion != "",31
Start: n.LineStart, End: n.LineEnd, HasSuggestion: n.Suggestion != "",23
When: i18n.FormatDate(lang, n.CreatedAt), At: n.CreatedAt, ParentID: n.ParentID,32
When: i18n.FormatDate(lang, n.CreatedAt), At: n.CreatedAt, ParentID: n.ParentID,24
HTML: template.HTML(markdown.Render(n.Body, "", "", repoPath)),33
HTML: template.HTML(markdown.RenderTasks(n.Body, "", "", opt.RepoPath, markdown.Tasks{34
Post: opt.Post, CSRF: opt.CSRF, Kind: "mr-note", ID: strconv.FormatInt(n.ID, 10),35
CanToggle: opt.ViewerID != 0 && opt.ViewerID == n.AuthorID, Count: opt.Count, Toggle: opt.Toggle,36
})),25
}37
}26
index[n.ID] = i38
index[n.ID] = i27
}39
}@@ -40,8 +52,8 @@ func buildNoteRows(notes []store.Note, lang i18n.Lang, repoPath string) []NoteRo40
return rows52
return rows41
}53
}42
54
43
func arrangeNotes(notes []store.Note, files []gitrepo.DiffFile, lang i18n.Lang, repoPath string) ([]NoteRow, []DiffFileView) {55
func arrangeNotes(notes []store.Note, files []gitrepo.DiffFile, lang i18n.Lang, opt noteRender) ([]NoteRow, []DiffFileView) {44
rows := buildNoteRows(notes, lang, repoPath)56
rows := buildNoteRows(notes, lang, opt)45
placed := map[int64]bool{}57
placed := map[int64]bool{}46
var views []DiffFileView58
var views []DiffFileView47
for _, f := range files {59
for _, f := range files {@@ -0,0 +1,233 @@
1
package server
2
3
import (
4
"net/http"
5
"strconv"
6
"strings"
7
8
"gitlab.com/Timfa/bluegit/internal/access"
9
"gitlab.com/Timfa/bluegit/internal/desctpl"
10
"gitlab.com/Timfa/bluegit/internal/gitrepo"
11
"gitlab.com/Timfa/bluegit/internal/i18n"
12
"gitlab.com/Timfa/bluegit/internal/markdown"
13
"gitlab.com/Timfa/bluegit/internal/store"
14
)
15
16
func (s *Server) taskOpt(r *http.Request, csrf string, repo store.Repo, kind, id string, can bool) markdown.Tasks {
17
return markdown.Tasks{
18
Post: repoURL(repo) + "/-/tasks", CSRF: csrf, Kind: kind, ID: id,
19
CanToggle: can && csrf != "", Count: s.tr(r, "tpl.tasks"), Toggle: s.tr(r, "tpl.toggle"),
20
}
21
}
22
23
func (s *Server) descriptionTemplates(r *http.Request, repo store.Repo, kind string) []desctpl.Template {
24
if s.StoragePath() == "" {
25
return nil
26
}
27
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
28
list, err := desctpl.List(r.Context(), s.Git, dir, repo.DefaultBranch, kind)
29
if err != nil {
30
return nil
31
}
32
return list
33
}
34
35
func templateNames(list []desctpl.Template) []string {
36
if len(list) == 0 {
37
return nil
38
}
39
out := make([]string, len(list))
40
for i, t := range list {
41
out[i] = t.Name
42
}
43
return out
44
}
45
46
// fillTpl zet een sjabloon in een lege beschrijving, of het gekozen sjabloon
47
// als het formulier ?template= meestuurt. Een lege keuze maakt de tekst leeg.
48
func (s *Server) fillTpl(r *http.Request, repo store.Repo, kind string, body, picked *string, names *[]string) {
49
list := s.descriptionTemplates(r, repo, kind)
50
*names = templateNames(list)
51
if r.URL.Query().Has("template") {
52
name := r.URL.Query().Get("template")
53
if name == "" {
54
*body = ""
55
*picked = ""
56
return
57
}
58
if t, ok := desctpl.Find(list, name); ok {
59
*body = t.Body
60
*picked = t.Name
61
}
62
return
63
}
64
if strings.TrimSpace(*body) == "" {
65
if t, ok := desctpl.Default(list); ok {
66
*body = t.Body
67
*picked = t.Name
68
}
69
}
70
}
71
72
func (s *Server) mrVars(r *http.Request, repo store.Repo, source, target string) desctpl.Vars {
73
v := desctpl.Vars{Source: source, Target: target}
74
if s.StoragePath() == "" || source == "" || target == "" {
75
return v
76
}
77
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
78
msgs, err := gitrepo.Messages(r.Context(), s.Git, dir, target+".."+source, 100)
79
if err != nil {
80
return v
81
}
82
for _, m := range msgs {
83
v.Commits = append(v.Commits, desctpl.Commit{
84
Subject: m.Subject, Body: m.Body, Author: m.Author, Email: m.Email, Merge: m.Merge,
85
})
86
}
87
return v
88
}
89
90
func applyToggle(body string, index int, checked bool) (string, error) {
91
next, ok := markdown.SetTask(body, index, checked)
92
if !ok {
93
return "", i18n.E("err.task")
94
}
95
return next, nil
96
}
97
98
func (s *Server) toggleTask(w http.ResponseWriter, r *http.Request) {
99
u, repo, role, ok := s.guard(w, r, access.RoleReadonly)
100
if !ok || !s.csrfOK(w, r) {
101
return
102
}
103
if u.ID == 0 {
104
http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
105
return
106
}
107
index, err := strconv.Atoi(r.FormValue("index"))
108
if err != nil || index < 0 {
109
http.Error(w, s.tr(r, "err.task"), http.StatusBadRequest)
110
return
111
}
112
id, err := strconv.ParseInt(r.FormValue("id"), 10, 64)
113
if err != nil || id < 1 {
114
http.Error(w, s.tr(r, "err.task"), http.StatusBadRequest)
115
return
116
}
117
checked := r.FormValue("checked") == "1"
118
switch r.FormValue("kind") {
119
case "issue":
120
s.toggleIssue(w, r, u, repo, role, id, index, checked)
121
case "issue-note":
122
s.toggleIssueNote(w, r, u, repo, role, id, index, checked)
123
case "mr":
124
s.toggleMR(w, r, u, repo, role, id, index, checked)
125
case "mr-note":
126
s.toggleMRNote(w, r, u, repo, id, index, checked)
127
default:
128
http.Error(w, s.tr(r, "err.task"), http.StatusBadRequest)
129
}
130
}
131
132
func (s *Server) toggleIssue(w http.ResponseWriter, r *http.Request, u store.User, repo store.Repo, role access.Role, number int64, index int, checked bool) {
133
iss, err := s.Store.IssueByNumber(r.Context(), repo.ID, number)
134
if err != nil || !issueVisible(iss, u, role) {
135
http.NotFound(w, r)
136
return
137
}
138
back := issuePath(repo, iss.Number)
139
if u.ID != iss.AuthorID && !role.CanTriageIssue() {
140
http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
141
return
142
}
143
next, err := applyToggle(iss.Description, index, checked)
144
if err != nil {
145
s.redirect(w, r, back, "", s.trErr(r, err))
146
return
147
}
148
if err := s.Store.UpdateIssueText(r.Context(), iss.ID, iss.Title, next); err != nil {
149
s.redirect(w, r, back, "", s.trErr(r, err))
150
return
151
}
152
s.issueHook(repo, iss.Number, u.Username, "updated", "")
153
s.redirect(w, r, back, "", "")
154
}
155
156
func (s *Server) toggleIssueNote(w http.ResponseWriter, r *http.Request, u store.User, repo store.Repo, role access.Role, id int64, index int, checked bool) {
157
note, err := s.Store.IssueNoteByID(r.Context(), repo.ID, id)
158
if err != nil {
159
http.NotFound(w, r)
160
return
161
}
162
iss, err := s.Store.IssueByID(r.Context(), repo.ID, note.IssueID)
163
if err != nil || !issueVisible(iss, u, role) {
164
http.NotFound(w, r)
165
return
166
}
167
back := issuePath(repo, iss.Number)
168
if u.ID != note.AuthorID {
169
http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
170
return
171
}
172
next, err := applyToggle(note.Body, index, checked)
173
if err != nil {
174
s.redirect(w, r, back, "", s.trErr(r, err))
175
return
176
}
177
if err := s.Store.UpdateIssueNoteBody(r.Context(), repo.ID, note.ID, next); err != nil {
178
s.redirect(w, r, back, "", s.trErr(r, err))
179
return
180
}
181
s.redirect(w, r, back, "", "")
182
}
183
184
func (s *Server) toggleMR(w http.ResponseWriter, r *http.Request, u store.User, repo store.Repo, role access.Role, number int64, index int, checked bool) {
185
mr, err := s.Store.MergeRequestByNumber(r.Context(), repo.ID, number)
186
if err != nil {
187
http.NotFound(w, r)
188
return
189
}
190
back := repoURL(repo) + "/-/merge-requests/" + strconv.FormatInt(mr.Number, 10)
191
if mr.Status != "open" || (u.ID != mr.AuthorID && !role.CanWriteCode()) {
192
http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
193
return
194
}
195
next, err := applyToggle(mr.Description, index, checked)
196
if err != nil {
197
s.redirect(w, r, back, "", s.trErr(r, err))
198
return
199
}
200
if err := s.Store.UpdateMergeRequest(r.Context(), mr.ID, mr.Title, next, mr.Labels); err != nil {
201
s.redirect(w, r, back, "", s.trErr(r, err))
202
return
203
}
204
s.redirect(w, r, back, "", "")
205
}
206
207
func (s *Server) toggleMRNote(w http.ResponseWriter, r *http.Request, u store.User, repo store.Repo, id int64, index int, checked bool) {
208
note, err := s.Store.NoteByID(r.Context(), repo.ID, id)
209
if err != nil {
210
http.NotFound(w, r)
211
return
212
}
213
mr, err := s.Store.MergeRequest(r.Context(), repo.ID, note.MRID)
214
if err != nil {
215
http.NotFound(w, r)
216
return
217
}
218
back := repoURL(repo) + "/-/merge-requests/" + strconv.FormatInt(mr.Number, 10)
219
if u.ID != note.AuthorID {
220
http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
221
return
222
}
223
next, err := applyToggle(note.Body, index, checked)
224
if err != nil {
225
s.redirect(w, r, back, "", s.trErr(r, err))
226
return
227
}
228
if err := s.Store.UpdateNoteBody(r.Context(), repo.ID, note.ID, next); err != nil {
229
s.redirect(w, r, back, "", s.trErr(r, err))
230
return
231
}
232
s.redirect(w, r, back, "", "")
233
}
@@ -0,0 +1,233 @@1
package server2
3
import (4
"net/http"5
"strconv"6
"strings"7
8
"gitlab.com/Timfa/bluegit/internal/access"9
"gitlab.com/Timfa/bluegit/internal/desctpl"10
"gitlab.com/Timfa/bluegit/internal/gitrepo"11
"gitlab.com/Timfa/bluegit/internal/i18n"12
"gitlab.com/Timfa/bluegit/internal/markdown"13
"gitlab.com/Timfa/bluegit/internal/store"14
)15
16
func (s *Server) taskOpt(r *http.Request, csrf string, repo store.Repo, kind, id string, can bool) markdown.Tasks {17
return markdown.Tasks{18
Post: repoURL(repo) + "/-/tasks", CSRF: csrf, Kind: kind, ID: id,19
CanToggle: can && csrf != "", Count: s.tr(r, "tpl.tasks"), Toggle: s.tr(r, "tpl.toggle"),20
}21
}22
23
func (s *Server) descriptionTemplates(r *http.Request, repo store.Repo, kind string) []desctpl.Template {24
if s.StoragePath() == "" {25
return nil26
}27
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)28
list, err := desctpl.List(r.Context(), s.Git, dir, repo.DefaultBranch, kind)29
if err != nil {30
return nil31
}32
return list33
}34
35
func templateNames(list []desctpl.Template) []string {36
if len(list) == 0 {37
return nil38
}39
out := make([]string, len(list))40
for i, t := range list {41
out[i] = t.Name42
}43
return out44
}45
46
// fillTpl zet een sjabloon in een lege beschrijving, of het gekozen sjabloon47
// als het formulier ?template= meestuurt. Een lege keuze maakt de tekst leeg.48
func (s *Server) fillTpl(r *http.Request, repo store.Repo, kind string, body, picked *string, names *[]string) {49
list := s.descriptionTemplates(r, repo, kind)50
*names = templateNames(list)51
if r.URL.Query().Has("template") {52
name := r.URL.Query().Get("template")53
if name == "" {54
*body = ""55
*picked = ""56
return57
}58
if t, ok := desctpl.Find(list, name); ok {59
*body = t.Body60
*picked = t.Name61
}62
return63
}64
if strings.TrimSpace(*body) == "" {65
if t, ok := desctpl.Default(list); ok {66
*body = t.Body67
*picked = t.Name68
}69
}70
}71
72
func (s *Server) mrVars(r *http.Request, repo store.Repo, source, target string) desctpl.Vars {73
v := desctpl.Vars{Source: source, Target: target}74
if s.StoragePath() == "" || source == "" || target == "" {75
return v76
}77
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)78
msgs, err := gitrepo.Messages(r.Context(), s.Git, dir, target+".."+source, 100)79
if err != nil {80
return v81
}82
for _, m := range msgs {83
v.Commits = append(v.Commits, desctpl.Commit{84
Subject: m.Subject, Body: m.Body, Author: m.Author, Email: m.Email, Merge: m.Merge,85
})86
}87
return v88
}89
90
func applyToggle(body string, index int, checked bool) (string, error) {91
next, ok := markdown.SetTask(body, index, checked)92
if !ok {93
return "", i18n.E("err.task")94
}95
return next, nil96
}97
98
func (s *Server) toggleTask(w http.ResponseWriter, r *http.Request) {99
u, repo, role, ok := s.guard(w, r, access.RoleReadonly)100
if !ok || !s.csrfOK(w, r) {101
return102
}103
if u.ID == 0 {104
http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)105
return106
}107
index, err := strconv.Atoi(r.FormValue("index"))108
if err != nil || index < 0 {109
http.Error(w, s.tr(r, "err.task"), http.StatusBadRequest)110
return111
}112
id, err := strconv.ParseInt(r.FormValue("id"), 10, 64)113
if err != nil || id < 1 {114
http.Error(w, s.tr(r, "err.task"), http.StatusBadRequest)115
return116
}117
checked := r.FormValue("checked") == "1"118
switch r.FormValue("kind") {119
case "issue":120
s.toggleIssue(w, r, u, repo, role, id, index, checked)121
case "issue-note":122
s.toggleIssueNote(w, r, u, repo, role, id, index, checked)123
case "mr":124
s.toggleMR(w, r, u, repo, role, id, index, checked)125
case "mr-note":126
s.toggleMRNote(w, r, u, repo, id, index, checked)127
default:128
http.Error(w, s.tr(r, "err.task"), http.StatusBadRequest)129
}130
}131
132
func (s *Server) toggleIssue(w http.ResponseWriter, r *http.Request, u store.User, repo store.Repo, role access.Role, number int64, index int, checked bool) {133
iss, err := s.Store.IssueByNumber(r.Context(), repo.ID, number)134
if err != nil || !issueVisible(iss, u, role) {135
http.NotFound(w, r)136
return137
}138
back := issuePath(repo, iss.Number)139
if u.ID != iss.AuthorID && !role.CanTriageIssue() {140
http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)141
return142
}143
next, err := applyToggle(iss.Description, index, checked)144
if err != nil {145
s.redirect(w, r, back, "", s.trErr(r, err))146
return147
}148
if err := s.Store.UpdateIssueText(r.Context(), iss.ID, iss.Title, next); err != nil {149
s.redirect(w, r, back, "", s.trErr(r, err))150
return151
}152
s.issueHook(repo, iss.Number, u.Username, "updated", "")153
s.redirect(w, r, back, "", "")154
}155
156
func (s *Server) toggleIssueNote(w http.ResponseWriter, r *http.Request, u store.User, repo store.Repo, role access.Role, id int64, index int, checked bool) {157
note, err := s.Store.IssueNoteByID(r.Context(), repo.ID, id)158
if err != nil {159
http.NotFound(w, r)160
return161
}162
iss, err := s.Store.IssueByID(r.Context(), repo.ID, note.IssueID)163
if err != nil || !issueVisible(iss, u, role) {164
http.NotFound(w, r)165
return166
}167
back := issuePath(repo, iss.Number)168
if u.ID != note.AuthorID {169
http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)170
return171
}172
next, err := applyToggle(note.Body, index, checked)173
if err != nil {174
s.redirect(w, r, back, "", s.trErr(r, err))175
return176
}177
if err := s.Store.UpdateIssueNoteBody(r.Context(), repo.ID, note.ID, next); err != nil {178
s.redirect(w, r, back, "", s.trErr(r, err))179
return180
}181
s.redirect(w, r, back, "", "")182
}183
184
func (s *Server) toggleMR(w http.ResponseWriter, r *http.Request, u store.User, repo store.Repo, role access.Role, number int64, index int, checked bool) {185
mr, err := s.Store.MergeRequestByNumber(r.Context(), repo.ID, number)186
if err != nil {187
http.NotFound(w, r)188
return189
}190
back := repoURL(repo) + "/-/merge-requests/" + strconv.FormatInt(mr.Number, 10)191
if mr.Status != "open" || (u.ID != mr.AuthorID && !role.CanWriteCode()) {192
http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)193
return194
}195
next, err := applyToggle(mr.Description, index, checked)196
if err != nil {197
s.redirect(w, r, back, "", s.trErr(r, err))198
return199
}200
if err := s.Store.UpdateMergeRequest(r.Context(), mr.ID, mr.Title, next, mr.Labels); err != nil {201
s.redirect(w, r, back, "", s.trErr(r, err))202
return203
}204
s.redirect(w, r, back, "", "")205
}206
207
func (s *Server) toggleMRNote(w http.ResponseWriter, r *http.Request, u store.User, repo store.Repo, id int64, index int, checked bool) {208
note, err := s.Store.NoteByID(r.Context(), repo.ID, id)209
if err != nil {210
http.NotFound(w, r)211
return212
}213
mr, err := s.Store.MergeRequest(r.Context(), repo.ID, note.MRID)214
if err != nil {215
http.NotFound(w, r)216
return217
}218
back := repoURL(repo) + "/-/merge-requests/" + strconv.FormatInt(mr.Number, 10)219
if u.ID != note.AuthorID {220
http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)221
return222
}223
next, err := applyToggle(note.Body, index, checked)224
if err != nil {225
s.redirect(w, r, back, "", s.trErr(r, err))226
return227
}228
if err := s.Store.UpdateNoteBody(r.Context(), repo.ID, note.ID, next); err != nil {229
s.redirect(w, r, back, "", s.trErr(r, err))230
return231
}232
s.redirect(w, r, back, "", "")233
}@@ -65,6 +65,8 @@
65
65
<h2 id="issues">{{t "info.sec.issues"}}</h2>
66
66
<p>{{t "info.issue.lead"}}</p>
67
67
<pre class="spec-example">{{.IssueDoc}}</pre>
68
<h2 id="templates">{{t "info.sec.templates"}}</h2>
69
<p>{{t "info.tpl.lead"}}</p>
68
70
<script type="application/json" id="bluegit-ci-spec">{{.SpecJSON}}</script>
69
71
<script type="application/json" id="bluegit-api">{{.APIJSON}}</script>
70
72
</article>
@@ -65,6 +65,8 @@65
<h2 id="issues">{{t "info.sec.issues"}}</h2>65
<h2 id="issues">{{t "info.sec.issues"}}</h2>66
<p>{{t "info.issue.lead"}}</p>66
<p>{{t "info.issue.lead"}}</p>67
<pre class="spec-example">{{.IssueDoc}}</pre>67
<pre class="spec-example">{{.IssueDoc}}</pre>68
<h2 id="templates">{{t "info.sec.templates"}}</h2>69
<p>{{t "info.tpl.lead"}}</p>68
<script type="application/json" id="bluegit-ci-spec">{{.SpecJSON}}</script>70
<script type="application/json" id="bluegit-ci-spec">{{.SpecJSON}}</script>69
<script type="application/json" id="bluegit-api">{{.APIJSON}}</script>71
<script type="application/json" id="bluegit-api">{{.APIJSON}}</script>70
</article>72
</article>@@ -54,6 +54,18 @@
54
54
{{define "issuenew"}}
55
55
{{template "layout-start" .}}
56
56
<header class="pagehead"><h1>{{t "issue.new"}}</h1></header>
57
{{if .Issues.Tpls}}
58
<form class="row" method="get" action="/{{.Repo.FullPath}}/-/issues/new">
59
{{if .Issues.Relate}}<input type="hidden" name="relate" value="{{.Issues.Relate}}">{{end}}
60
<label>{{t "tpl.choose"}}
61
<select name="template">
62
<option value="">{{t "tpl.none"}}</option>
63
{{range .Issues.Tpls}}<option value="{{.}}"{{if eq . $.Issues.Tpl}} selected{{end}}>{{.}}</option>{{end}}
64
</select>
65
</label>
66
<button type="submit">{{t "tpl.apply"}}</button>
67
</form>
68
{{end}}
57
69
<form class="panel" method="post" action="/{{.Repo.FullPath}}/-/issues">
58
70
<input type="hidden" name="csrf" value="{{.CSRF}}">
59
71
<label>{{t "issue.title"}} <input name="title" value="{{.Issues.FormTitle}}" required></label>
@@ -54,6 +54,18 @@54
{{define "issuenew"}}54
{{define "issuenew"}}55
{{template "layout-start" .}}55
{{template "layout-start" .}}56
<header class="pagehead"><h1>{{t "issue.new"}}</h1></header>56
<header class="pagehead"><h1>{{t "issue.new"}}</h1></header>57
{{if .Issues.Tpls}}58
<form class="row" method="get" action="/{{.Repo.FullPath}}/-/issues/new">59
{{if .Issues.Relate}}<input type="hidden" name="relate" value="{{.Issues.Relate}}">{{end}}60
<label>{{t "tpl.choose"}}61
<select name="template">62
<option value="">{{t "tpl.none"}}</option>63
{{range .Issues.Tpls}}<option value="{{.}}"{{if eq . $.Issues.Tpl}} selected{{end}}>{{.}}</option>{{end}}64
</select>65
</label>66
<button type="submit">{{t "tpl.apply"}}</button>67
</form>68
{{end}}57
<form class="panel" method="post" action="/{{.Repo.FullPath}}/-/issues">69
<form class="panel" method="post" action="/{{.Repo.FullPath}}/-/issues">58
<input type="hidden" name="csrf" value="{{.CSRF}}">70
<input type="hidden" name="csrf" value="{{.CSRF}}">59
<label>{{t "issue.title"}} <input name="title" value="{{.Issues.FormTitle}}" required></label>71
<label>{{t "issue.title"}} <input name="title" value="{{.Issues.FormTitle}}" required></label>@@ -36,6 +36,19 @@
36
36
</form>
37
37
{{template "comparediff" .}}
38
38
{{if and .CompareFrom .CompareTo (ne .CompareFrom .CompareTo)}}
39
{{if .DescTpls}}
40
<form class="row" method="get" action="/{{.Repo.FullPath}}/-/merge-requests/new">
41
<input type="hidden" name="source" value="{{.CompareFrom}}">
42
<input type="hidden" name="target" value="{{.CompareTo}}">
43
<label>{{t "tpl.choose"}}
44
<select name="template">
45
<option value="">{{t "tpl.none"}}</option>
46
{{range .DescTpls}}<option value="{{.}}"{{if eq . $.TplPick}} selected{{end}}>{{.}}</option>{{end}}
47
</select>
48
</label>
49
<button type="submit">{{t "tpl.apply"}}</button>
50
</form>
51
{{end}}
39
52
<form class="panel" method="post" action="/{{.Repo.FullPath}}/-/merge-requests">
40
53
<input type="hidden" name="csrf" value="{{.CSRF}}">
41
54
<input type="hidden" name="source" value="{{.CompareFrom}}">
@@ -48,7 +61,7 @@
48
61
<button type="button" data-md-tab="preview" aria-selected="false">{{t "mr.preview"}}</button>
49
62
</div>
50
63
<div data-md-write>
51
<textarea name="description"></textarea>
64
<textarea name="description">{{.FormBody}}</textarea>
52
65
</div>
53
66
<div class="mdbody" data-md-preview hidden></div>
54
67
</div>
@@ -36,6 +36,19 @@36
</form>36
</form>37
{{template "comparediff" .}}37
{{template "comparediff" .}}38
{{if and .CompareFrom .CompareTo (ne .CompareFrom .CompareTo)}}38
{{if and .CompareFrom .CompareTo (ne .CompareFrom .CompareTo)}}39
{{if .DescTpls}}40
<form class="row" method="get" action="/{{.Repo.FullPath}}/-/merge-requests/new">41
<input type="hidden" name="source" value="{{.CompareFrom}}">42
<input type="hidden" name="target" value="{{.CompareTo}}">43
<label>{{t "tpl.choose"}}44
<select name="template">45
<option value="">{{t "tpl.none"}}</option>46
{{range .DescTpls}}<option value="{{.}}"{{if eq . $.TplPick}} selected{{end}}>{{.}}</option>{{end}}47
</select>48
</label>49
<button type="submit">{{t "tpl.apply"}}</button>50
</form>51
{{end}}39
<form class="panel" method="post" action="/{{.Repo.FullPath}}/-/merge-requests">52
<form class="panel" method="post" action="/{{.Repo.FullPath}}/-/merge-requests">40
<input type="hidden" name="csrf" value="{{.CSRF}}">53
<input type="hidden" name="csrf" value="{{.CSRF}}">41
<input type="hidden" name="source" value="{{.CompareFrom}}">54
<input type="hidden" name="source" value="{{.CompareFrom}}">@@ -48,7 +61,7 @@48
<button type="button" data-md-tab="preview" aria-selected="false">{{t "mr.preview"}}</button>61
<button type="button" data-md-tab="preview" aria-selected="false">{{t "mr.preview"}}</button>49
</div>62
</div>50
<div data-md-write>63
<div data-md-write>51
<textarea name="description"></textarea>64
<textarea name="description">{{.FormBody}}</textarea>52
</div>65
</div>53
<div class="mdbody" data-md-preview hidden></div>66
<div class="mdbody" data-md-preview hidden></div>54
</div>67
</div>@@ -0,0 +1,311 @@
1
package server
2
3
import (
4
"context"
5
"encoding/json"
6
"net/http"
7
"net/http/cookiejar"
8
"net/http/httptest"
9
"net/url"
10
"path/filepath"
11
"strings"
12
"testing"
13
14
"gitlab.com/Timfa/bluegit/internal/access"
15
"gitlab.com/Timfa/bluegit/internal/auth"
16
"gitlab.com/Timfa/bluegit/internal/config"
17
"gitlab.com/Timfa/bluegit/internal/store"
18
)
19
20
func TestMissingTemplateDirs(t *testing.T) {
21
storage := t.TempDir()
22
st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())
23
if err != nil {
24
t.Fatal(err)
25
}
26
t.Cleanup(func() { _ = st.Close() })
27
cfg := config.Config{
28
BaseURL: "http://git.example", Listen: "127.0.0.1:0", StoragePath: storage,
29
Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test", BaseURL: "https://auth.timfalken.com"},
30
Git: config.Git{Binary: "git", DefaultBranch: "master"},
31
}
32
srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true"}
33
ts := httptest.NewServer(srv.Handler())
34
t.Cleanup(ts.Close)
35
36
jar, _ := cookiejar.New(nil)
37
tim := &http.Client{Jar: jar}
38
page := read(t, mustGet(t, tim, ts.URL+"/login"))
39
page = read(t, mustPost(t, tim, ts.URL+"/new/repo", url.Values{
40
"csrf": {csrfOf(t, page)}, "name": {"kaal"}, "visibility": {"public"},
41
}))
42
page = read(t, mustPost(t, tim, ts.URL+"/settings/tokens", url.Values{"csrf": {csrfOf(t, page)}, "name": {"tim"}}))
43
token := between(page, `<p class="code">`, "</p>")
44
45
empty := read(t, mustGet(t, tim, ts.URL+"/tim/kaal/-/issues/new"))
46
assertBareForm(t, empty, "issue")
47
48
work := t.TempDir()
49
git(t, work, "init", "-b", "master")
50
git(t, work, "config", "user.email", "tim@example")
51
git(t, work, "config", "user.name", "tim")
52
writeFile(t, filepath.Join(work, "README.md"), "start\n")
53
git(t, work, "add", ".")
54
git(t, work, "commit", "-m", "start")
55
remote := strings.Replace(ts.URL, "http://", "http://tim:"+token+"@", 1) + "/tim/kaal.git"
56
git(t, work, "remote", "add", "origin", remote)
57
git(t, work, "push", "-u", "origin", "master")
58
git(t, work, "checkout", "-b", "feature")
59
writeFile(t, filepath.Join(work, "extra.txt"), "meer\n")
60
git(t, work, "add", "extra.txt")
61
git(t, work, "commit", "-m", "meer")
62
git(t, work, "push", "-u", "origin", "feature")
63
64
issue := read(t, mustGet(t, tim, ts.URL+"/tim/kaal/-/issues/new"))
65
assertBareForm(t, issue, "issue")
66
mr := read(t, mustGet(t, tim, ts.URL+"/tim/kaal/-/merge-requests/new?source=feature&target=master"))
67
assertBareForm(t, mr, "mr")
68
69
bare := filepath.Join(storage, "repos", "tim", "kaal.git")
70
out, err := gitOut(bare, "ls-tree", "-r", "--name-only", "master")
71
if err != nil {
72
t.Fatal(err)
73
}
74
if strings.Contains(out, ".bluegit") || strings.Contains(out, ".gitlab") {
75
t.Fatalf("mappen aangemaakt:\n%s", out)
76
}
77
}
78
79
func assertBareForm(t *testing.T, page, kind string) {
80
t.Helper()
81
if strings.Contains(page, `name="template"`) || strings.Contains(page, "Apply template") {
82
t.Fatalf("%s toont een sjabloonmenu:\n%s", kind, page)
83
}
84
if strings.Contains(page, `class="flash"`) || strings.Contains(page, "fatal:") || strings.Contains(page, "Not a valid object") {
85
t.Fatalf("%s toont een melding:\n%s", kind, page)
86
}
87
if !strings.Contains(page, `<textarea name="description"></textarea>`) {
88
t.Fatalf("%s beschrijving is niet leeg:\n%s", kind, page)
89
}
90
}
91
92
func TestTemplatesAndTasks(t *testing.T) {
93
storage := t.TempDir()
94
st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())
95
if err != nil {
96
t.Fatal(err)
97
}
98
t.Cleanup(func() { _ = st.Close() })
99
cfg := config.Config{
100
BaseURL: "http://git.example", Listen: "127.0.0.1:0", StoragePath: storage,
101
Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test", BaseURL: "https://auth.timfalken.com"},
102
Git: config.Git{Binary: "git", DefaultBranch: "master"},
103
}
104
srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true"}
105
ts := httptest.NewServer(srv.Handler())
106
t.Cleanup(ts.Close)
107
108
jar, _ := cookiejar.New(nil)
109
tim := &http.Client{Jar: jar}
110
page := read(t, mustGet(t, tim, ts.URL+"/login"))
111
page = read(t, mustPost(t, tim, ts.URL+"/new/repo", url.Values{
112
"csrf": {csrfOf(t, page)}, "name": {"sjablonen"}, "visibility": {"public"},
113
}))
114
page = read(t, mustPost(t, tim, ts.URL+"/settings/tokens", url.Values{"csrf": {csrfOf(t, page)}, "name": {"tim"}}))
115
token := between(page, `<p class="code">`, "</p>")
116
ctx := context.Background()
117
repo, err := st.RepoByPath(ctx, "tim", "sjablonen")
118
if err != nil {
119
t.Fatal(err)
120
}
121
rep, err := st.UpsertUser(ctx, 4, "rep", "", false)
122
if err != nil {
123
t.Fatal(err)
124
}
125
ro, err := st.UpsertUser(ctx, 3, "ro", "", false)
126
if err != nil {
127
t.Fatal(err)
128
}
129
if err := st.SetMember(ctx, "repo", repo.ID, "rep", access.RoleReporter); err != nil {
130
t.Fatal(err)
131
}
132
if err := st.SetMember(ctx, "repo", repo.ID, "ro", access.RoleReadonly); err != nil {
133
t.Fatal(err)
134
}
135
repToken, err := st.CreateToken(ctx, rep.ID, "rep")
136
if err != nil {
137
t.Fatal(err)
138
}
139
roToken, err := st.CreateToken(ctx, ro.ID, "ro")
140
if err != nil {
141
t.Fatal(err)
142
}
143
144
work := t.TempDir()
145
git(t, work, "init", "-b", "master")
146
git(t, work, "config", "user.email", "tim@example")
147
git(t, work, "config", "user.name", "tim")
148
writeFile(t, filepath.Join(work, ".bluegit", "issue_templates", "Default.md"), "Standaard issue-tekst\n")
149
writeFile(t, filepath.Join(work, ".bluegit", "issue_templates", "Bug.md"), "Bluegit bugtekst\n")
150
writeFile(t, filepath.Join(work, ".gitlab", "issue_templates", "Bug.md"), "Gitlab bugtekst\n")
151
writeFile(t, filepath.Join(work, ".gitlab", "issue_templates", "Legacy.md"), "Oude gitlab-tekst\n")
152
writeFile(t, filepath.Join(work, ".bluegit", "merge_request_templates", "Default.md"), "- [ ] controle\nBron %{source_branch}\nDoel %{target_branch}\n%{closes_issue}\n\n%{first_commit}\n")
153
writeFile(t, filepath.Join(work, ".gitlab", "merge_request_templates", "Default.md"), "GITLAB MR\n")
154
writeFile(t, filepath.Join(work, "README.md"), "start\n")
155
git(t, work, "add", ".")
156
git(t, work, "commit", "-m", "sjablonen")
157
remote := strings.Replace(ts.URL, "http://", "http://tim:"+token+"@", 1) + "/tim/sjablonen.git"
158
git(t, work, "remote", "add", "origin", remote)
159
git(t, work, "push", "-u", "origin", "master")
160
git(t, work, "checkout", "-b", "12-fix")
161
writeFile(t, filepath.Join(work, "fix.txt"), "ok\n")
162
git(t, work, "add", "fix.txt")
163
git(t, work, "commit", "-m", "Fix login", "-m", "Details here")
164
git(t, work, "push", "-u", "origin", "12-fix")
165
166
page = read(t, mustGet(t, tim, ts.URL+"/tim/sjablonen/-/issues/new"))
167
for _, want := range []string{"Standaard issue-tekst", `value="Bug"`, `value="Legacy"`, `value="Default" selected`} {
168
if !strings.Contains(page, want) {
169
t.Fatalf("nieuw issue mist %q\n%s", want, page)
170
}
171
}
172
if strings.Contains(page, "Gitlab bugtekst") {
173
t.Fatal("gitlab-bug hoort niet de standaard te zijn")
174
}
175
bug := read(t, mustGet(t, tim, ts.URL+"/tim/sjablonen/-/issues/new?template=Bug"))
176
if !strings.Contains(bug, "Bluegit bugtekst") || strings.Contains(bug, "Gitlab bugtekst") {
177
t.Fatalf("bug-sjabloon:\n%s", bug)
178
}
179
legacy := read(t, mustGet(t, tim, ts.URL+"/tim/sjablonen/-/issues/new?template=Legacy"))
180
if !strings.Contains(legacy, "Oude gitlab-tekst") {
181
t.Fatalf("terugval:\n%s", legacy)
182
}
183
184
res := postJSON(t, http.MethodPost, ts.URL+"/api/v1/repos/tim/sjablonen/labels", token, map[string]any{"name": "bug", "color": "#428fdc"})
185
if res.StatusCode != http.StatusCreated {
186
t.Fatalf("label %d %s", res.StatusCode, read(t, res))
187
}
188
res.Body.Close()
189
190
res = postJSON(t, http.MethodPost, ts.URL+"/api/v1/repos/tim/sjablonen/issues", repToken, map[string]any{
191
"title": "Gelabeld", "description": "/label ~bug\n\n- [ ] een\n- [x] twee\n",
192
})
193
body := read(t, res)
194
if res.StatusCode != http.StatusCreated || strings.Contains(body, "/label") || !strings.Contains(body, "- [ ] een") {
195
t.Fatalf("reporter %d %s", res.StatusCode, body)
196
}
197
var created map[string]any
198
if err := json.Unmarshal([]byte(body), &created); err != nil {
199
t.Fatal(err)
200
}
201
labels, _ := created["labels"].([]any)
202
if len(labels) != 1 || labels[0] != "bug" {
203
t.Fatalf("labels %#v", created["labels"])
204
}
205
206
res = postJSON(t, http.MethodPost, ts.URL+"/api/v1/repos/tim/sjablonen/issues", roToken, map[string]any{
207
"title": "Blijft", "description": "/label ~bug\n/confidential\n\nTekst\n",
208
})
209
body = read(t, res)
210
if res.StatusCode != http.StatusCreated || !strings.Contains(body, "/label ~bug") || strings.Contains(body, "/confidential") {
211
t.Fatalf("readonly %d %s", res.StatusCode, body)
212
}
213
if err := json.Unmarshal([]byte(body), &created); err != nil {
214
t.Fatal(err)
215
}
216
if created["confidential"] != true {
217
t.Fatalf("confidential %#v", created["confidential"])
218
}
219
if labs, _ := created["labels"].([]any); len(labs) != 0 {
220
t.Fatalf("readonly labels %#v", created["labels"])
221
}
222
223
res = postJSON(t, http.MethodPost, ts.URL+"/api/v1/repos/tim/sjablonen/issues", repToken, map[string]any{
224
"title": "Hek", "description": "```\n/label ~bug\n```\nBlijft\n",
225
})
226
body = read(t, res)
227
if res.StatusCode != http.StatusCreated || !strings.Contains(body, "/label ~bug") {
228
t.Fatalf("hek %d %s", res.StatusCode, body)
229
}
230
if err := json.Unmarshal([]byte(body), &created); err != nil {
231
t.Fatal(err)
232
}
233
if labs, _ := created["labels"].([]any); len(labs) != 0 {
234
t.Fatalf("hek labels %#v", created["labels"])
235
}
236
237
page = read(t, mustGet(t, tim, ts.URL+"/tim/sjablonen/-/issues/1"))
238
if !strings.Contains(page, "1 of 2 tasks completed") || !strings.Contains(page, `name="kind" value="issue"`) {
239
t.Fatalf("taken:\n%s", page)
240
}
241
page = read(t, mustPost(t, tim, ts.URL+"/tim/sjablonen/-/tasks", url.Values{
242
"csrf": {csrfOf(t, page)}, "kind": {"issue"}, "id": {"1"}, "index": {"0"}, "checked": {"1"},
243
}))
244
if !strings.Contains(page, "2 of 2 tasks completed") || !strings.Contains(page, "- [x] een") {
245
t.Fatalf("na klik:\n%s", page)
246
}
247
page = read(t, mustPost(t, tim, ts.URL+"/tim/sjablonen/-/issues/1", url.Values{
248
"csrf": {csrfOf(t, page)}, "action": {"note"}, "body": {"- [ ] reactie"},
249
}))
250
if !strings.Contains(page, `name="kind" value="issue-note"`) {
251
t.Fatalf("reactie:\n%s", page)
252
}
253
noteID := between(page[strings.Index(page, `name="kind" value="issue-note"`):], `name="id" value="`, `"`)
254
page = read(t, mustPost(t, tim, ts.URL+"/tim/sjablonen/-/tasks", url.Values{
255
"csrf": {csrfOf(t, page)}, "kind": {"issue-note"}, "id": {noteID}, "index": {"0"}, "checked": {"1"},
256
}))
257
if !strings.Contains(page, "reactie") {
258
t.Fatalf("reactie na klik:\n%s", page)
259
}
260
res = postJSON(t, http.MethodGet, ts.URL+"/api/v1/repos/tim/sjablonen/issues/1", token, nil)
261
body = read(t, res)
262
if !strings.Contains(body, "- [x] reactie") {
263
t.Fatalf("bron van de reactie:\n%s", body)
264
}
265
266
res = postJSON(t, http.MethodPost, ts.URL+"/api/v1/repos/tim/sjablonen/issues/1/notes", repToken, map[string]any{"body": "/assign @tim\n\nZie dit"})
267
body = read(t, res)
268
if res.StatusCode != http.StatusCreated || strings.Contains(body, "/assign") || !strings.Contains(body, "Zie dit") {
269
t.Fatalf("toewijzen %d %s", res.StatusCode, body)
270
}
271
res = postJSON(t, http.MethodGet, ts.URL+"/api/v1/repos/tim/sjablonen/issues/1", repToken, nil)
272
body = read(t, res)
273
if !strings.Contains(body, `"assignees":["tim"]`) {
274
t.Fatalf("assignee:\n%s", body)
275
}
276
277
mrPage := read(t, mustGet(t, tim, ts.URL+"/tim/sjablonen/-/merge-requests/new?source=12-fix&target=master"))
278
for _, want := range []string{"%{source_branch}", "- [ ] controle", `value="Default" selected`} {
279
if !strings.Contains(mrPage, want) {
280
t.Fatalf("mr-formulier mist %q\n%s", want, mrPage)
281
}
282
}
283
if strings.Contains(mrPage, "GITLAB MR") {
284
t.Fatal("gitlab-default wint niet")
285
}
286
made := read(t, mustPost(t, tim, ts.URL+"/tim/sjablonen/-/merge-requests", url.Values{
287
"csrf": {csrfOf(t, mrPage)}, "source": {"12-fix"}, "target": {"master"}, "title": {"Fix"},
288
"description": {"- [ ] controle\nBron %{source_branch}\nDoel %{target_branch}\n%{closes_issue}\n\n%{first_commit}\n"},
289
}))
290
for _, want := range []string{"Bron 12-fix", "Doel master", "Closes #12", "Fix login", "Details here", "0 of 1 tasks completed"} {
291
if !strings.Contains(made, want) {
292
t.Fatalf("mr mist %q\n%s", want, made)
293
}
294
}
295
if strings.Contains(made, "%{source_branch}") || strings.Contains(made, "GITLAB MR") {
296
t.Fatalf("variabelen bleven staan:\n%s", made)
297
}
298
made = read(t, mustPost(t, tim, ts.URL+"/tim/sjablonen/-/tasks", url.Values{
299
"csrf": {csrfOf(t, made)}, "kind": {"mr"}, "id": {"1"}, "index": {"0"}, "checked": {"1"},
300
}))
301
if !strings.Contains(made, "1 of 1 tasks completed") || !strings.Contains(made, "- [x] controle") {
302
t.Fatalf("mr-taak:\n%s", made)
303
}
304
305
info := read(t, mustGet(t, tim, ts.URL+"/-/info"))
306
for _, want := range []string{`id="templates"`, "Default.md", ".gitlab/", "tasks completed", "/label"} {
307
if !strings.Contains(info, want) {
308
t.Fatalf("info mist %q", want)
309
}
310
}
311
}
@@ -0,0 +1,311 @@1
package server2
3
import (4
"context"5
"encoding/json"6
"net/http"7
"net/http/cookiejar"8
"net/http/httptest"9
"net/url"10
"path/filepath"11
"strings"12
"testing"13
14
"gitlab.com/Timfa/bluegit/internal/access"15
"gitlab.com/Timfa/bluegit/internal/auth"16
"gitlab.com/Timfa/bluegit/internal/config"17
"gitlab.com/Timfa/bluegit/internal/store"18
)19
20
func TestMissingTemplateDirs(t *testing.T) {21
storage := t.TempDir()22
st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())23
if err != nil {24
t.Fatal(err)25
}26
t.Cleanup(func() { _ = st.Close() })27
cfg := config.Config{28
BaseURL: "http://git.example", Listen: "127.0.0.1:0", StoragePath: storage,29
Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test", BaseURL: "https://auth.timfalken.com"},30
Git: config.Git{Binary: "git", DefaultBranch: "master"},31
}32
srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true"}33
ts := httptest.NewServer(srv.Handler())34
t.Cleanup(ts.Close)35
36
jar, _ := cookiejar.New(nil)37
tim := &http.Client{Jar: jar}38
page := read(t, mustGet(t, tim, ts.URL+"/login"))39
page = read(t, mustPost(t, tim, ts.URL+"/new/repo", url.Values{40
"csrf": {csrfOf(t, page)}, "name": {"kaal"}, "visibility": {"public"},41
}))42
page = read(t, mustPost(t, tim, ts.URL+"/settings/tokens", url.Values{"csrf": {csrfOf(t, page)}, "name": {"tim"}}))43
token := between(page, `<p class="code">`, "</p>")44
45
empty := read(t, mustGet(t, tim, ts.URL+"/tim/kaal/-/issues/new"))46
assertBareForm(t, empty, "issue")47
48
work := t.TempDir()49
git(t, work, "init", "-b", "master")50
git(t, work, "config", "user.email", "tim@example")51
git(t, work, "config", "user.name", "tim")52
writeFile(t, filepath.Join(work, "README.md"), "start\n")53
git(t, work, "add", ".")54
git(t, work, "commit", "-m", "start")55
remote := strings.Replace(ts.URL, "http://", "http://tim:"+token+"@", 1) + "/tim/kaal.git"56
git(t, work, "remote", "add", "origin", remote)57
git(t, work, "push", "-u", "origin", "master")58
git(t, work, "checkout", "-b", "feature")59
writeFile(t, filepath.Join(work, "extra.txt"), "meer\n")60
git(t, work, "add", "extra.txt")61
git(t, work, "commit", "-m", "meer")62
git(t, work, "push", "-u", "origin", "feature")63
64
issue := read(t, mustGet(t, tim, ts.URL+"/tim/kaal/-/issues/new"))65
assertBareForm(t, issue, "issue")66
mr := read(t, mustGet(t, tim, ts.URL+"/tim/kaal/-/merge-requests/new?source=feature&target=master"))67
assertBareForm(t, mr, "mr")68
69
bare := filepath.Join(storage, "repos", "tim", "kaal.git")70
out, err := gitOut(bare, "ls-tree", "-r", "--name-only", "master")71
if err != nil {72
t.Fatal(err)73
}74
if strings.Contains(out, ".bluegit") || strings.Contains(out, ".gitlab") {75
t.Fatalf("mappen aangemaakt:\n%s", out)76
}77
}78
79
func assertBareForm(t *testing.T, page, kind string) {80
t.Helper()81
if strings.Contains(page, `name="template"`) || strings.Contains(page, "Apply template") {82
t.Fatalf("%s toont een sjabloonmenu:\n%s", kind, page)83
}84
if strings.Contains(page, `class="flash"`) || strings.Contains(page, "fatal:") || strings.Contains(page, "Not a valid object") {85
t.Fatalf("%s toont een melding:\n%s", kind, page)86
}87
if !strings.Contains(page, `<textarea name="description"></textarea>`) {88
t.Fatalf("%s beschrijving is niet leeg:\n%s", kind, page)89
}90
}91
92
func TestTemplatesAndTasks(t *testing.T) {93
storage := t.TempDir()94
st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())95
if err != nil {96
t.Fatal(err)97
}98
t.Cleanup(func() { _ = st.Close() })99
cfg := config.Config{100
BaseURL: "http://git.example", Listen: "127.0.0.1:0", StoragePath: storage,101
Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test", BaseURL: "https://auth.timfalken.com"},102
Git: config.Git{Binary: "git", DefaultBranch: "master"},103
}104
srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true"}105
ts := httptest.NewServer(srv.Handler())106
t.Cleanup(ts.Close)107
108
jar, _ := cookiejar.New(nil)109
tim := &http.Client{Jar: jar}110
page := read(t, mustGet(t, tim, ts.URL+"/login"))111
page = read(t, mustPost(t, tim, ts.URL+"/new/repo", url.Values{112
"csrf": {csrfOf(t, page)}, "name": {"sjablonen"}, "visibility": {"public"},113
}))114
page = read(t, mustPost(t, tim, ts.URL+"/settings/tokens", url.Values{"csrf": {csrfOf(t, page)}, "name": {"tim"}}))115
token := between(page, `<p class="code">`, "</p>")116
ctx := context.Background()117
repo, err := st.RepoByPath(ctx, "tim", "sjablonen")118
if err != nil {119
t.Fatal(err)120
}121
rep, err := st.UpsertUser(ctx, 4, "rep", "", false)122
if err != nil {123
t.Fatal(err)124
}125
ro, err := st.UpsertUser(ctx, 3, "ro", "", false)126
if err != nil {127
t.Fatal(err)128
}129
if err := st.SetMember(ctx, "repo", repo.ID, "rep", access.RoleReporter); err != nil {130
t.Fatal(err)131
}132
if err := st.SetMember(ctx, "repo", repo.ID, "ro", access.RoleReadonly); err != nil {133
t.Fatal(err)134
}135
repToken, err := st.CreateToken(ctx, rep.ID, "rep")136
if err != nil {137
t.Fatal(err)138
}139
roToken, err := st.CreateToken(ctx, ro.ID, "ro")140
if err != nil {141
t.Fatal(err)142
}143
144
work := t.TempDir()145
git(t, work, "init", "-b", "master")146
git(t, work, "config", "user.email", "tim@example")147
git(t, work, "config", "user.name", "tim")148
writeFile(t, filepath.Join(work, ".bluegit", "issue_templates", "Default.md"), "Standaard issue-tekst\n")149
writeFile(t, filepath.Join(work, ".bluegit", "issue_templates", "Bug.md"), "Bluegit bugtekst\n")150
writeFile(t, filepath.Join(work, ".gitlab", "issue_templates", "Bug.md"), "Gitlab bugtekst\n")151
writeFile(t, filepath.Join(work, ".gitlab", "issue_templates", "Legacy.md"), "Oude gitlab-tekst\n")152
writeFile(t, filepath.Join(work, ".bluegit", "merge_request_templates", "Default.md"), "- [ ] controle\nBron %{source_branch}\nDoel %{target_branch}\n%{closes_issue}\n\n%{first_commit}\n")153
writeFile(t, filepath.Join(work, ".gitlab", "merge_request_templates", "Default.md"), "GITLAB MR\n")154
writeFile(t, filepath.Join(work, "README.md"), "start\n")155
git(t, work, "add", ".")156
git(t, work, "commit", "-m", "sjablonen")157
remote := strings.Replace(ts.URL, "http://", "http://tim:"+token+"@", 1) + "/tim/sjablonen.git"158
git(t, work, "remote", "add", "origin", remote)159
git(t, work, "push", "-u", "origin", "master")160
git(t, work, "checkout", "-b", "12-fix")161
writeFile(t, filepath.Join(work, "fix.txt"), "ok\n")162
git(t, work, "add", "fix.txt")163
git(t, work, "commit", "-m", "Fix login", "-m", "Details here")164
git(t, work, "push", "-u", "origin", "12-fix")165
166
page = read(t, mustGet(t, tim, ts.URL+"/tim/sjablonen/-/issues/new"))167
for _, want := range []string{"Standaard issue-tekst", `value="Bug"`, `value="Legacy"`, `value="Default" selected`} {168
if !strings.Contains(page, want) {169
t.Fatalf("nieuw issue mist %q\n%s", want, page)170
}171
}172
if strings.Contains(page, "Gitlab bugtekst") {173
t.Fatal("gitlab-bug hoort niet de standaard te zijn")174
}175
bug := read(t, mustGet(t, tim, ts.URL+"/tim/sjablonen/-/issues/new?template=Bug"))176
if !strings.Contains(bug, "Bluegit bugtekst") || strings.Contains(bug, "Gitlab bugtekst") {177
t.Fatalf("bug-sjabloon:\n%s", bug)178
}179
legacy := read(t, mustGet(t, tim, ts.URL+"/tim/sjablonen/-/issues/new?template=Legacy"))180
if !strings.Contains(legacy, "Oude gitlab-tekst") {181
t.Fatalf("terugval:\n%s", legacy)182
}183
184
res := postJSON(t, http.MethodPost, ts.URL+"/api/v1/repos/tim/sjablonen/labels", token, map[string]any{"name": "bug", "color": "#428fdc"})185
if res.StatusCode != http.StatusCreated {186
t.Fatalf("label %d %s", res.StatusCode, read(t, res))187
}188
res.Body.Close()189
190
res = postJSON(t, http.MethodPost, ts.URL+"/api/v1/repos/tim/sjablonen/issues", repToken, map[string]any{191
"title": "Gelabeld", "description": "/label ~bug\n\n- [ ] een\n- [x] twee\n",192
})193
body := read(t, res)194
if res.StatusCode != http.StatusCreated || strings.Contains(body, "/label") || !strings.Contains(body, "- [ ] een") {195
t.Fatalf("reporter %d %s", res.StatusCode, body)196
}197
var created map[string]any198
if err := json.Unmarshal([]byte(body), &created); err != nil {199
t.Fatal(err)200
}201
labels, _ := created["labels"].([]any)202
if len(labels) != 1 || labels[0] != "bug" {203
t.Fatalf("labels %#v", created["labels"])204
}205
206
res = postJSON(t, http.MethodPost, ts.URL+"/api/v1/repos/tim/sjablonen/issues", roToken, map[string]any{207
"title": "Blijft", "description": "/label ~bug\n/confidential\n\nTekst\n",208
})209
body = read(t, res)210
if res.StatusCode != http.StatusCreated || !strings.Contains(body, "/label ~bug") || strings.Contains(body, "/confidential") {211
t.Fatalf("readonly %d %s", res.StatusCode, body)212
}213
if err := json.Unmarshal([]byte(body), &created); err != nil {214
t.Fatal(err)215
}216
if created["confidential"] != true {217
t.Fatalf("confidential %#v", created["confidential"])218
}219
if labs, _ := created["labels"].([]any); len(labs) != 0 {220
t.Fatalf("readonly labels %#v", created["labels"])221
}222
223
res = postJSON(t, http.MethodPost, ts.URL+"/api/v1/repos/tim/sjablonen/issues", repToken, map[string]any{224
"title": "Hek", "description": "```\n/label ~bug\n```\nBlijft\n",225
})226
body = read(t, res)227
if res.StatusCode != http.StatusCreated || !strings.Contains(body, "/label ~bug") {228
t.Fatalf("hek %d %s", res.StatusCode, body)229
}230
if err := json.Unmarshal([]byte(body), &created); err != nil {231
t.Fatal(err)232
}233
if labs, _ := created["labels"].([]any); len(labs) != 0 {234
t.Fatalf("hek labels %#v", created["labels"])235
}236
237
page = read(t, mustGet(t, tim, ts.URL+"/tim/sjablonen/-/issues/1"))238
if !strings.Contains(page, "1 of 2 tasks completed") || !strings.Contains(page, `name="kind" value="issue"`) {239
t.Fatalf("taken:\n%s", page)240
}241
page = read(t, mustPost(t, tim, ts.URL+"/tim/sjablonen/-/tasks", url.Values{242
"csrf": {csrfOf(t, page)}, "kind": {"issue"}, "id": {"1"}, "index": {"0"}, "checked": {"1"},243
}))244
if !strings.Contains(page, "2 of 2 tasks completed") || !strings.Contains(page, "- [x] een") {245
t.Fatalf("na klik:\n%s", page)246
}247
page = read(t, mustPost(t, tim, ts.URL+"/tim/sjablonen/-/issues/1", url.Values{248
"csrf": {csrfOf(t, page)}, "action": {"note"}, "body": {"- [ ] reactie"},249
}))250
if !strings.Contains(page, `name="kind" value="issue-note"`) {251
t.Fatalf("reactie:\n%s", page)252
}253
noteID := between(page[strings.Index(page, `name="kind" value="issue-note"`):], `name="id" value="`, `"`)254
page = read(t, mustPost(t, tim, ts.URL+"/tim/sjablonen/-/tasks", url.Values{255
"csrf": {csrfOf(t, page)}, "kind": {"issue-note"}, "id": {noteID}, "index": {"0"}, "checked": {"1"},256
}))257
if !strings.Contains(page, "reactie") {258
t.Fatalf("reactie na klik:\n%s", page)259
}260
res = postJSON(t, http.MethodGet, ts.URL+"/api/v1/repos/tim/sjablonen/issues/1", token, nil)261
body = read(t, res)262
if !strings.Contains(body, "- [x] reactie") {263
t.Fatalf("bron van de reactie:\n%s", body)264
}265
266
res = postJSON(t, http.MethodPost, ts.URL+"/api/v1/repos/tim/sjablonen/issues/1/notes", repToken, map[string]any{"body": "/assign @tim\n\nZie dit"})267
body = read(t, res)268
if res.StatusCode != http.StatusCreated || strings.Contains(body, "/assign") || !strings.Contains(body, "Zie dit") {269
t.Fatalf("toewijzen %d %s", res.StatusCode, body)270
}271
res = postJSON(t, http.MethodGet, ts.URL+"/api/v1/repos/tim/sjablonen/issues/1", repToken, nil)272
body = read(t, res)273
if !strings.Contains(body, `"assignees":["tim"]`) {274
t.Fatalf("assignee:\n%s", body)275
}276
277
mrPage := read(t, mustGet(t, tim, ts.URL+"/tim/sjablonen/-/merge-requests/new?source=12-fix&target=master"))278
for _, want := range []string{"%{source_branch}", "- [ ] controle", `value="Default" selected`} {279
if !strings.Contains(mrPage, want) {280
t.Fatalf("mr-formulier mist %q\n%s", want, mrPage)281
}282
}283
if strings.Contains(mrPage, "GITLAB MR") {284
t.Fatal("gitlab-default wint niet")285
}286
made := read(t, mustPost(t, tim, ts.URL+"/tim/sjablonen/-/merge-requests", url.Values{287
"csrf": {csrfOf(t, mrPage)}, "source": {"12-fix"}, "target": {"master"}, "title": {"Fix"},288
"description": {"- [ ] controle\nBron %{source_branch}\nDoel %{target_branch}\n%{closes_issue}\n\n%{first_commit}\n"},289
}))290
for _, want := range []string{"Bron 12-fix", "Doel master", "Closes #12", "Fix login", "Details here", "0 of 1 tasks completed"} {291
if !strings.Contains(made, want) {292
t.Fatalf("mr mist %q\n%s", want, made)293
}294
}295
if strings.Contains(made, "%{source_branch}") || strings.Contains(made, "GITLAB MR") {296
t.Fatalf("variabelen bleven staan:\n%s", made)297
}298
made = read(t, mustPost(t, tim, ts.URL+"/tim/sjablonen/-/tasks", url.Values{299
"csrf": {csrfOf(t, made)}, "kind": {"mr"}, "id": {"1"}, "index": {"0"}, "checked": {"1"},300
}))301
if !strings.Contains(made, "1 of 1 tasks completed") || !strings.Contains(made, "- [x] controle") {302
t.Fatalf("mr-taak:\n%s", made)303
}304
305
info := read(t, mustGet(t, tim, ts.URL+"/-/info"))306
for _, want := range []string{`id="templates"`, "Default.md", ".gitlab/", "tasks completed", "/label"} {307
if !strings.Contains(info, want) {308
t.Fatalf("info mist %q", want)309
}310
}311
}@@ -550,6 +550,42 @@ func (s *Store) issueByID(ctx context.Context, repoID, id int64) (Issue, error)
550
550
return scanIssue(row)
551
551
}
552
552
553
// IssueByID leest een issue op de interne id.
554
func (s *Store) IssueByID(ctx context.Context, repoID, id int64) (Issue, error) {
555
return s.issueByID(ctx, repoID, id)
556
}
557
558
// IssueNoteByID leest een reactie in deze repository.
559
func (s *Store) IssueNoteByID(ctx context.Context, repoID, id int64) (IssueNote, error) {
560
n, err := s.issueNote(ctx, id)
561
if err != nil {
562
return IssueNote{}, err
563
}
564
if n.RepoID != repoID {
565
return IssueNote{}, errNotFound
566
}
567
return n, nil
568
}
569
570
// UpdateIssueNoteBody vervangt de tekst van een issue-reactie.
571
func (s *Store) UpdateIssueNoteBody(ctx context.Context, repoID, id int64, body string) error {
572
if strings.TrimSpace(body) == "" {
573
return i18n.E("err.issueNote")
574
}
575
if err := limitIssueText(body); err != nil {
576
return err
577
}
578
res, err := s.db.ExecContext(ctx, `UPDATE issue_notes SET body = ? WHERE id = ? AND repo_id = ?`, body, id, repoID)
579
if err != nil {
580
return err
581
}
582
n, _ := res.RowsAffected()
583
if n == 0 {
584
return errNotFound
585
}
586
return nil
587
}
588
553
589
func (s *Store) issueNote(ctx context.Context, id int64) (IssueNote, error) {
554
590
row := s.db.QueryRowContext(ctx, `SELECT n.id, n.repo_id, n.issue_id, n.author_id, u.username, n.body, n.created_at
555
591
FROM issue_notes n JOIN users u ON u.id = n.author_id WHERE n.id = ?`, id)
@@ -550,6 +550,42 @@ func (s *Store) issueByID(ctx context.Context, repoID, id int64) (Issue, error)550
return scanIssue(row)550
return scanIssue(row)551
}551
}552
552
553
// IssueByID leest een issue op de interne id.554
func (s *Store) IssueByID(ctx context.Context, repoID, id int64) (Issue, error) {555
return s.issueByID(ctx, repoID, id)556
}557
558
// IssueNoteByID leest een reactie in deze repository.559
func (s *Store) IssueNoteByID(ctx context.Context, repoID, id int64) (IssueNote, error) {560
n, err := s.issueNote(ctx, id)561
if err != nil {562
return IssueNote{}, err563
}564
if n.RepoID != repoID {565
return IssueNote{}, errNotFound566
}567
return n, nil568
}569
570
// UpdateIssueNoteBody vervangt de tekst van een issue-reactie.571
func (s *Store) UpdateIssueNoteBody(ctx context.Context, repoID, id int64, body string) error {572
if strings.TrimSpace(body) == "" {573
return i18n.E("err.issueNote")574
}575
if err := limitIssueText(body); err != nil {576
return err577
}578
res, err := s.db.ExecContext(ctx, `UPDATE issue_notes SET body = ? WHERE id = ? AND repo_id = ?`, body, id, repoID)579
if err != nil {580
return err581
}582
n, _ := res.RowsAffected()583
if n == 0 {584
return errNotFound585
}586
return nil587
}588
553
func (s *Store) issueNote(ctx context.Context, id int64) (IssueNote, error) {589
func (s *Store) issueNote(ctx context.Context, id int64) (IssueNote, error) {554
row := s.db.QueryRowContext(ctx, `SELECT n.id, n.repo_id, n.issue_id, n.author_id, u.username, n.body, n.created_at590
row := s.db.QueryRowContext(ctx, `SELECT n.id, n.repo_id, n.issue_id, n.author_id, u.username, n.body, n.created_at555
FROM issue_notes n JOIN users u ON u.id = n.author_id WHERE n.id = ?`, id)591
FROM issue_notes n JOIN users u ON u.id = n.author_id WHERE n.id = ?`, id)@@ -2,11 +2,13 @@ package store
2
2
3
3
import (
4
4
"context"
5
"database/sql"
6
"errors"
5
7
"strconv"
6
7
"gitlab.com/Timfa/bluegit/internal/i18n"
8
8
"strings"
9
9
"time"
10
11
"gitlab.com/Timfa/bluegit/internal/i18n"
10
12
)
11
13
12
14
// Note is een reactie op een merge request.
@@ -107,3 +109,39 @@ func (s *Store) ListNotes(ctx context.Context, mrID int64) ([]Note, error) {
107
109
}
108
110
return out, rows.Err()
109
111
}
112
113
// NoteByID leest één reactie in deze repository.
114
func (s *Store) NoteByID(ctx context.Context, repoID, id int64) (Note, error) {
115
var n Note
116
var created string
117
err := s.db.QueryRowContext(ctx, `SELECT n.id, n.repo_id, n.mr_id, n.author_id, u.username, n.body, n.created_at, n.file_path, n.line_start, n.line_end, n.suggestion, n.base_text, n.parent_id
118
FROM notes n JOIN users u ON u.id = n.author_id WHERE n.id = ? AND n.repo_id = ?`, id, repoID).
119
Scan(&n.ID, &n.RepoID, &n.MRID, &n.AuthorID, &n.Author, &n.Body, &created, &n.FilePath, &n.LineStart, &n.LineEnd, &n.Suggestion, &n.BaseText, &n.ParentID)
120
if errors.Is(err, sql.ErrNoRows) {
121
return Note{}, errNotFound
122
}
123
if err != nil {
124
return Note{}, err
125
}
126
n.CreatedAt = parseTime(created)
127
return n, nil
128
}
129
130
// UpdateNoteBody vervangt de tekst van een reactie.
131
func (s *Store) UpdateNoteBody(ctx context.Context, repoID, id int64, body string) error {
132
if strings.TrimSpace(body) == "" {
133
return i18n.E("err.noteEmpty")
134
}
135
if len([]rune(body)) > 20000 {
136
return i18n.E("err.issueBody")
137
}
138
res, err := s.db.ExecContext(ctx, `UPDATE notes SET body = ? WHERE id = ? AND repo_id = ?`, body, id, repoID)
139
if err != nil {
140
return err
141
}
142
n, _ := res.RowsAffected()
143
if n == 0 {
144
return errNotFound
145
}
146
return nil
147
}
@@ -2,11 +2,13 @@ package store2
2
3
import (3
import (4
"context"4
"context"5
"database/sql"6
"errors"5
"strconv"7
"strconv"6
7
"gitlab.com/Timfa/bluegit/internal/i18n"8
"strings"8
"strings"9
"time"9
"time"10
11
"gitlab.com/Timfa/bluegit/internal/i18n"10
)12
)11
13
12
// Note is een reactie op een merge request.14
// Note is een reactie op een merge request.@@ -107,3 +109,39 @@ func (s *Store) ListNotes(ctx context.Context, mrID int64) ([]Note, error) {107
}109
}108
return out, rows.Err()110
return out, rows.Err()109
}111
}112
113
// NoteByID leest één reactie in deze repository.114
func (s *Store) NoteByID(ctx context.Context, repoID, id int64) (Note, error) {115
var n Note116
var created string117
err := s.db.QueryRowContext(ctx, `SELECT n.id, n.repo_id, n.mr_id, n.author_id, u.username, n.body, n.created_at, n.file_path, n.line_start, n.line_end, n.suggestion, n.base_text, n.parent_id118
FROM notes n JOIN users u ON u.id = n.author_id WHERE n.id = ? AND n.repo_id = ?`, id, repoID).119
Scan(&n.ID, &n.RepoID, &n.MRID, &n.AuthorID, &n.Author, &n.Body, &created, &n.FilePath, &n.LineStart, &n.LineEnd, &n.Suggestion, &n.BaseText, &n.ParentID)120
if errors.Is(err, sql.ErrNoRows) {121
return Note{}, errNotFound122
}123
if err != nil {124
return Note{}, err125
}126
n.CreatedAt = parseTime(created)127
return n, nil128
}129
130
// UpdateNoteBody vervangt de tekst van een reactie.131
func (s *Store) UpdateNoteBody(ctx context.Context, repoID, id int64, body string) error {132
if strings.TrimSpace(body) == "" {133
return i18n.E("err.noteEmpty")134
}135
if len([]rune(body)) > 20000 {136
return i18n.E("err.issueBody")137
}138
res, err := s.db.ExecContext(ctx, `UPDATE notes SET body = ? WHERE id = ? AND repo_id = ?`, body, id, repoID)139
if err != nil {140
return err141
}142
n, _ := res.RowsAffected()143
if n == 0 {144
return errNotFound145
}146
return nil147
}