BlueGit

timfa bluegit

feat: voeg een issue-tracker per repository toe

Elke repository krijgt een Issues-tab met nummering, labels,
toewijzing, mijlpalen, vervaldatum en een vertrouwelijke vlag.
Readonly mag aanmaken en Reporter mag triëren. Een verwijzing
in een merge request of op de standaardbranch sluit het issue.
De API en issue-webhooks sturen de details mee.

Co-authored-by: tim <tim@timfalken.com>

timfa project_87923614_bot_3aff574f6f98414b945a8799374f9092 · pushed by timfa

Authored 2026-10-22 · 3 weeks ago

Hash
f3222d5fbff906c2852d57484af3feb302f4a9e0
Parent
6ef4ea8e
29 files changed +3172 −32
internal/access/access.go +19 −4
@@ -1,6 +1,6 @@
1 1 // Package access bevat de rolregels van BlueGit.
2 2 // Een repository hoort bij een gebruiker of een groep. Leden hebben
3 // Readonly, Developer of Maintainer. De effectieve rol is de hoogste
3 // Readonly, Reporter, Developer of Maintainer. De effectieve rol is de hoogste
4 4 // van groepslidmaatschap, rechtstreeks repolidmaatschap en eigenaarschap.
5 5 // Installatiebeheer is hier geen rol: dat geeft geen toegang tot
6 6 // repositories, groepen of geheimen van anderen.
@@ -20,15 +20,18 @@ type Role string
20 20 const (
21 21 RoleNone Role = ""
22 22 RoleReadonly Role = "readonly"
23 RoleReporter Role = "reporter"
23 24 RoleDeveloper Role = "developer"
24 25 RoleMaintainer Role = "maintainer"
25 26 )
26 27
27 // ParseRole herkent de drie rollen. Leeg is geen rol.
28 // ParseRole herkent de rollen. Leeg is geen rol.
28 29 func ParseRole(s string) (Role, error) {
29 30 switch Role(strings.ToLower(strings.TrimSpace(s))) {
30 31 case RoleReadonly:
31 32 return RoleReadonly, nil
33 case RoleReporter:
34 return RoleReporter, nil
32 35 case RoleDeveloper:
33 36 return RoleDeveloper, nil
34 37 case RoleMaintainer:
@@ -45,6 +48,8 @@ func (r Role) Label() string {
45 48 switch r {
46 49 case RoleReadonly:
47 50 return "Readonly"
51 case RoleReporter:
52 return "Reporter"
48 53 case RoleDeveloper:
49 54 return "Developer"
50 55 case RoleMaintainer:
@@ -59,10 +64,12 @@ func (r Role) Rank() int {
59 64 switch r {
60 65 case RoleReadonly:
61 66 return 1
62 case RoleDeveloper:
67 case RoleReporter:
63 68 return 2
64 case RoleMaintainer:
69 case RoleDeveloper:
65 70 return 3
71 case RoleMaintainer:
72 return 4
66 73 default:
67 74 return 0
68 75 }
@@ -84,6 +91,14 @@ func (r Role) AtLeast(other Role) bool {
84 91 // CanRead geldt voor elke echte rol.
85 92 func (r Role) CanRead() bool { return r.AtLeast(RoleReadonly) }
86 93
94 // CanCreateIssue geldt voor Readonly en hoger, zoals een GitLab-Guest.
95 // Anoniem (geen rol) mag geen issue aanmaken.
96 func (r Role) CanCreateIssue() bool { return r.AtLeast(RoleReadonly) }
97
98 // CanTriageIssue geldt voor Reporter en hoger: labels, toewijzing,
99 // milestone, vervaldatum, andermans issue sluiten en vertrouwelijke issues zien.
100 func (r Role) CanTriageIssue() bool { return r.AtLeast(RoleReporter) }
101
87 102 // CanWriteCode geldt voor ontwikkelaar en beheerder.
88 103 // Protected branches en secrets vallen hier buiten.
89 104 func (r Role) CanWriteCode() bool { return r.AtLeast(RoleDeveloper) }
@@ -1,6 +1,6 @@
1// Package access bevat de rolregels van BlueGit.
1// Package access bevat de rolregels van BlueGit.
2// Een repository hoort bij een gebruiker of een groep. Leden hebben
2// Een repository hoort bij een gebruiker of een groep. Leden hebben
3// Readonly, Developer of Maintainer. De effectieve rol is de hoogste
3// Readonly, Reporter, Developer of Maintainer. De effectieve rol is de hoogste
4// van groepslidmaatschap, rechtstreeks repolidmaatschap en eigenaarschap.
4// van groepslidmaatschap, rechtstreeks repolidmaatschap en eigenaarschap.
5// Installatiebeheer is hier geen rol: dat geeft geen toegang tot
5// Installatiebeheer is hier geen rol: dat geeft geen toegang tot
6// repositories, groepen of geheimen van anderen.
6// repositories, groepen of geheimen van anderen.
@@ -20,15 +20,18 @@ type Role string
20const (
20const (
21 RoleNone Role = ""
21 RoleNone Role = ""
22 RoleReadonly Role = "readonly"
22 RoleReadonly Role = "readonly"
23 RoleReporter Role = "reporter"
23 RoleDeveloper Role = "developer"
24 RoleDeveloper Role = "developer"
24 RoleMaintainer Role = "maintainer"
25 RoleMaintainer Role = "maintainer"
25)
26)
26
27
27// ParseRole herkent de drie rollen. Leeg is geen rol.
28// ParseRole herkent de rollen. Leeg is geen rol.
28func ParseRole(s string) (Role, error) {
29func ParseRole(s string) (Role, error) {
29 switch Role(strings.ToLower(strings.TrimSpace(s))) {
30 switch Role(strings.ToLower(strings.TrimSpace(s))) {
30 case RoleReadonly:
31 case RoleReadonly:
31 return RoleReadonly, nil
32 return RoleReadonly, nil
33 case RoleReporter:
34 return RoleReporter, nil
32 case RoleDeveloper:
35 case RoleDeveloper:
33 return RoleDeveloper, nil
36 return RoleDeveloper, nil
34 case RoleMaintainer:
37 case RoleMaintainer:
@@ -45,6 +48,8 @@ func (r Role) Label() string {
45 switch r {
48 switch r {
46 case RoleReadonly:
49 case RoleReadonly:
47 return "Readonly"
50 return "Readonly"
51 case RoleReporter:
52 return "Reporter"
48 case RoleDeveloper:
53 case RoleDeveloper:
49 return "Developer"
54 return "Developer"
50 case RoleMaintainer:
55 case RoleMaintainer:
@@ -59,10 +64,12 @@ func (r Role) Rank() int {
59 switch r {
64 switch r {
60 case RoleReadonly:
65 case RoleReadonly:
61 return 1
66 return 1
62 case RoleDeveloper:
67 case RoleReporter:
63 return 2
68 return 2
64 case RoleMaintainer:
69 case RoleDeveloper:
65 return 3
70 return 3
71 case RoleMaintainer:
72 return 4
66 default:
73 default:
67 return 0
74 return 0
68 }
75 }
@@ -84,6 +91,14 @@ func (r Role) AtLeast(other Role) bool {
84// CanRead geldt voor elke echte rol.
91// CanRead geldt voor elke echte rol.
85func (r Role) CanRead() bool { return r.AtLeast(RoleReadonly) }
92func (r Role) CanRead() bool { return r.AtLeast(RoleReadonly) }
86
93
94// CanCreateIssue geldt voor Readonly en hoger, zoals een GitLab-Guest.
95// Anoniem (geen rol) mag geen issue aanmaken.
96func (r Role) CanCreateIssue() bool { return r.AtLeast(RoleReadonly) }
97
98// CanTriageIssue geldt voor Reporter en hoger: labels, toewijzing,
99// milestone, vervaldatum, andermans issue sluiten en vertrouwelijke issues zien.
100func (r Role) CanTriageIssue() bool { return r.AtLeast(RoleReporter) }
101
87// CanWriteCode geldt voor ontwikkelaar en beheerder.
102// CanWriteCode geldt voor ontwikkelaar en beheerder.
88// Protected branches en secrets vallen hier buiten.
103// Protected branches en secrets vallen hier buiten.
89func (r Role) CanWriteCode() bool { return r.AtLeast(RoleDeveloper) }
104func (r Role) CanWriteCode() bool { return r.AtLeast(RoleDeveloper) }
internal/access/access_test.go +15 −2
@@ -12,8 +12,9 @@ func TestParseAndRank(t *testing.T) {
12 12 rank int
13 13 }{
14 14 {"readonly", RoleReadonly, 1},
15 {"Developer", RoleDeveloper, 2},
16 {" maintainer ", RoleMaintainer, 3},
15 {"reporter", RoleReporter, 2},
16 {"Developer", RoleDeveloper, 3},
17 {" maintainer ", RoleMaintainer, 4},
17 18 }
18 19 for _, tc := range cases {
19 20 got, err := ParseRole(tc.in)
@@ -59,6 +60,18 @@ func TestCapabilities(t *testing.T) {
59 60 if RoleReadonly.CanWriteCode() || RoleReadonly.CanPushBranch(false) || RoleReadonly.CanManageSecrets() {
60 61 t.Fatal("alleen-lezen mag niet schrijven")
61 62 }
63 if !RoleReadonly.CanCreateIssue() || RoleReadonly.CanTriageIssue() {
64 t.Fatal("alleen-lezen mag een issue aanmaken, niet triëren")
65 }
66 if !RoleReporter.CanCreateIssue() || !RoleReporter.CanTriageIssue() || RoleReporter.CanWriteCode() || RoleReporter.CanPushBranch(false) {
67 t.Fatal("reporter mag issues triëren en geen code schrijven")
68 }
69 if !RoleDeveloper.CanTriageIssue() {
70 t.Fatal("ontwikkelaar erft issue-triage")
71 }
72 if RoleNone.CanCreateIssue() {
73 t.Fatal("zonder rol geen issue")
74 }
62 75 if !RoleDeveloper.CanPushBranch(false) {
63 76 t.Fatal("ontwikkelaar mag naar een gewone branch")
64 77 }
@@ -12,8 +12,9 @@ func TestParseAndRank(t *testing.T) {
12 rank int
12 rank int
13 }{
13 }{
14 {"readonly", RoleReadonly, 1},
14 {"readonly", RoleReadonly, 1},
15 {"Developer", RoleDeveloper, 2},
15 {"reporter", RoleReporter, 2},
16 {" maintainer ", RoleMaintainer, 3},
16 {"Developer", RoleDeveloper, 3},
17 {" maintainer ", RoleMaintainer, 4},
17 }
18 }
18 for _, tc := range cases {
19 for _, tc := range cases {
19 got, err := ParseRole(tc.in)
20 got, err := ParseRole(tc.in)
@@ -59,6 +60,18 @@ func TestCapabilities(t *testing.T) {
59 if RoleReadonly.CanWriteCode() || RoleReadonly.CanPushBranch(false) || RoleReadonly.CanManageSecrets() {
60 if RoleReadonly.CanWriteCode() || RoleReadonly.CanPushBranch(false) || RoleReadonly.CanManageSecrets() {
60 t.Fatal("alleen-lezen mag niet schrijven")
61 t.Fatal("alleen-lezen mag niet schrijven")
61 }
62 }
63 if !RoleReadonly.CanCreateIssue() || RoleReadonly.CanTriageIssue() {
64 t.Fatal("alleen-lezen mag een issue aanmaken, niet triëren")
65 }
66 if !RoleReporter.CanCreateIssue() || !RoleReporter.CanTriageIssue() || RoleReporter.CanWriteCode() || RoleReporter.CanPushBranch(false) {
67 t.Fatal("reporter mag issues triëren en geen code schrijven")
68 }
69 if !RoleDeveloper.CanTriageIssue() {
70 t.Fatal("ontwikkelaar erft issue-triage")
71 }
72 if RoleNone.CanCreateIssue() {
73 t.Fatal("zonder rol geen issue")
74 }
62 if !RoleDeveloper.CanPushBranch(false) {
75 if !RoleDeveloper.CanPushBranch(false) {
63 t.Fatal("ontwikkelaar mag naar een gewone branch")
76 t.Fatal("ontwikkelaar mag naar een gewone branch")
64 }
77 }
internal/i18n/catalog_issues.go added +264 −0
@@ -0,0 +1,264 @@
1 package i18n
2
3 func init() {
4 addCatalog(en, issueEN)
5 addCatalog(nl, issueNL)
6 addCatalog(de, issueDE)
7 addCatalog(fr, issueFR)
8 }
9
10 var issueEN = map[string]string{
11 "tab.issues": "Issues",
12 "role.reporter": "Reporter",
13 "set.ev.issue": "Issues",
14 "issue.new": "New issue",
15 "issue.search": "Search issues",
16 "issue.open": "Open",
17 "issue.closed": "Closed",
18 "issue.all": "All",
19 "issue.anyLabel": "Any label",
20 "issue.anyAssignee": "Any assignee",
21 "issue.filter": "Filter",
22 "issue.none": "Nothing here yet.",
23 "issue.confidential": "Confidential",
24 "issue.title": "Title",
25 "issue.description": "Description",
26 "issue.labels": "Labels",
27 "issue.assignees": "Assignees",
28 "issue.milestone": "Milestone",
29 "issue.due": "Due date",
30 "issue.noMilestone": "No milestone",
31 "issue.create": "Create issue",
32 "issue.save": "Save",
33 "issue.close": "Close issue",
34 "issue.reopen": "Reopen issue",
35 "issue.delete": "Delete issue",
36 "issue.comment": "Comment",
37 "issue.comments": "Comments",
38 "issue.related": "Related issues",
39 "issue.relatedNew": "New related issue",
40 "issue.relate": "Mark this issue as related to #%d",
41 "issue.fromComment": "New issue from comment",
42 "issue.by": "opened by %s",
43 "issue.edit": "Edit",
44 "issue.meta": "Labels and assignees",
45 "issue.addLabel": "Add label",
46 "issue.addMilestone": "Add milestone",
47 "info.sec.issues": "Issues",
48 "info.issue.lead": "Each repository has an Issues tab. Readonly may create issues, like a GitLab Guest: create, comment, edit and close their own issue, and set confidential when creating it. Reporter may label and assign, set a milestone and a due date, and close, reopen or edit any issue. A Developer has the same issue rights as a Reporter and can still push code. A Maintainer creates the label and milestone lists and can delete an issue. Anonymous visitors of a public repository can read issues, except confidential ones. Those stay hidden unless you wrote the issue or you are a Reporter or higher. Issues are numbered per repository, #1 then #2. In Markdown, #12 becomes a link to that issue and !5 becomes a link to that merge request, except inside code. Closes #12, Fixes #12, Resolves #12 or Implements #12 in a merge request description or in its commits closes the issue when the merge request is merged. The same words in a commit on the default branch close the issue on push. You can start a new issue from a merge request comment, or as a related issue from another issue. The API uses a personal token: GET and POST /api/v1/repos/{owner}/{repo}/issues, GET and PUT /api/v1/repos/{owner}/{repo}/issues/{number}, POST .../notes, and GET and POST .../labels and .../milestones. The issue webhook has object_kind issue and action opened, updated, closed, reopened or commented. The body includes title, description, status, confidential, author, assignees, labels, milestone and due date. A commented action also includes the comment text.",
49 "hook.issueOpened": "issue #%s opened: %s",
50 "hook.issueUpdated": "issue #%s updated: %s",
51 "hook.issueClosed": "issue #%s closed: %s",
52 "hook.issueReopened": "issue #%s reopened: %s",
53 "hook.issueComment": "comment on issue #%s",
54 "err.issueTitle": "an issue needs a title",
55 "err.issueBody": "the description is too long",
56 "err.issueDue": "a due date uses YYYY-MM-DD",
57 "err.labelName": "a label uses letters, digits, spaces, hyphens or underscores",
58 "err.labelColor": "a color uses # and six hex digits",
59 "err.labelMissing": "unknown label %s",
60 "err.milestone": "unknown milestone",
61 "err.milestoneName": "a milestone needs a title",
62 "err.assignee": "unknown assignee %s",
63 "err.issueState": "an issue is open or closed",
64 "err.issueNote": "a comment needs text",
65 "flash.issueCreated": "Issue created.",
66 "flash.issueUpdated": "Issue updated.",
67 "flash.issueClosed": "Issue closed.",
68 "flash.issueReopened": "Issue reopened.",
69 "flash.issueDeleted": "Issue deleted.",
70 "flash.label": "Label saved.",
71 "flash.milestone": "Milestone saved.",
72 }
73
74 var issueNL = map[string]string{
75 "tab.issues": "Issues",
76 "role.reporter": "Reporter",
77 "set.ev.issue": "Issues",
78 "issue.new": "Nieuw issue",
79 "issue.search": "Zoek issues",
80 "issue.open": "Open",
81 "issue.closed": "Gesloten",
82 "issue.all": "Alles",
83 "issue.anyLabel": "Elk label",
84 "issue.anyAssignee": "Elke toegewezene",
85 "issue.filter": "Filter",
86 "issue.none": "Hier staat nog niets.",
87 "issue.confidential": "Vertrouwelijk",
88 "issue.title": "Titel",
89 "issue.description": "Beschrijving",
90 "issue.labels": "Labels",
91 "issue.assignees": "Toegewezenen",
92 "issue.milestone": "Mijlpaal",
93 "issue.due": "Vervaldatum",
94 "issue.noMilestone": "Geen mijlpaal",
95 "issue.create": "Issue aanmaken",
96 "issue.save": "Opslaan",
97 "issue.close": "Issue sluiten",
98 "issue.reopen": "Issue heropenen",
99 "issue.delete": "Issue verwijderen",
100 "issue.comment": "Reactie",
101 "issue.comments": "Reacties",
102 "issue.related": "Gerelateerde issues",
103 "issue.relatedNew": "Nieuw gerelateerd issue",
104 "issue.relate": "Markeer dit issue als gerelateerd aan #%d",
105 "issue.fromComment": "Nieuw issue uit reactie",
106 "issue.by": "geopend door %s",
107 "issue.edit": "Bewerken",
108 "issue.meta": "Labels en toewijzing",
109 "issue.addLabel": "Label toevoegen",
110 "issue.addMilestone": "Mijlpaal toevoegen",
111 "info.sec.issues": "Issues",
112 "info.issue.lead": "Elke repository heeft een Issues-tab. Readonly mag issues aanmaken, zoals een GitLab-Guest: aanmaken, reageren, het eigen issue bewerken en sluiten, en bij het aanmaken vertrouwelijk zetten. Reporter mag labelen en toewijzen, een mijlpaal en vervaldatum zetten, en elk issue sluiten, heropenen of bewerken. Een Developer heeft dezelfde issuerechten als een Reporter en kan nog steeds code pushen. Een Maintainer maakt de lijsten met labels en mijlpalen en mag een issue verwijderen. Anonieme bezoekers van een publieke repository kunnen issues lezen, behalve vertrouwelijke. Die blijven verborgen, tenzij je het issue schreef of Reporter of hoger bent. Issues worden per repository genummerd, #1 en dan #2. In Markdown wordt #12 een link naar dat issue en !5 een link naar die merge request, behalve in code. Closes #12, Fixes #12, Resolves #12 of Implements #12 in een beschrijving van een merge request of in de commits sluit het issue bij het mergen. Dezelfde woorden in een commit op de standaardbranch sluiten het issue bij een push. Je kunt een nieuw issue starten vanuit een merge-request-reactie, of als gerelateerd issue vanuit een ander issue. De API gebruikt een persoonlijk token: GET en POST /api/v1/repos/{owner}/{repo}/issues, GET en PUT /api/v1/repos/{owner}/{repo}/issues/{number}, POST .../notes, en GET en POST .../labels en .../milestones. De issue-webhook heeft object_kind issue en action opened, updated, closed, reopened of commented. De body bevat titel, beschrijving, status, confidential, auteur, assignees, labels, milestone en due date. Bij commented hoort ook de tekst van de reactie.",
113 "hook.issueOpened": "issue #%s geopend: %s",
114 "hook.issueUpdated": "issue #%s bijgewerkt: %s",
115 "hook.issueClosed": "issue #%s gesloten: %s",
116 "hook.issueReopened": "issue #%s heropend: %s",
117 "hook.issueComment": "reactie op issue #%s",
118 "err.issueTitle": "een issue heeft een titel nodig",
119 "err.issueBody": "de beschrijving is te lang",
120 "err.issueDue": "een vervaldatum gebruikt YYYY-MM-DD",
121 "err.labelName": "een label gebruikt letters, cijfers, spaties, streepjes of underscores",
122 "err.labelColor": "een kleur gebruikt # en zes hexadecimale tekens",
123 "err.labelMissing": "onbekend label %s",
124 "err.milestone": "onbekende mijlpaal",
125 "err.milestoneName": "een mijlpaal heeft een titel nodig",
126 "err.assignee": "onbekende toegewezene %s",
127 "err.issueState": "een issue is open of gesloten",
128 "err.issueNote": "een reactie heeft tekst nodig",
129 "flash.issueCreated": "Issue aangemaakt.",
130 "flash.issueUpdated": "Issue bijgewerkt.",
131 "flash.issueClosed": "Issue gesloten.",
132 "flash.issueReopened": "Issue heropend.",
133 "flash.issueDeleted": "Issue verwijderd.",
134 "flash.label": "Label opgeslagen.",
135 "flash.milestone": "Mijlpaal opgeslagen.",
136 }
137
138 var issueDE = map[string]string{
139 "tab.issues": "Issues",
140 "role.reporter": "Reporter",
141 "set.ev.issue": "Issues",
142 "issue.new": "Neues Issue",
143 "issue.search": "Issues suchen",
144 "issue.open": "Offen",
145 "issue.closed": "Geschlossen",
146 "issue.all": "Alle",
147 "issue.anyLabel": "Jedes Label",
148 "issue.anyAssignee": "Jede zugewiesene Person",
149 "issue.filter": "Filtern",
150 "issue.none": "Hier ist noch nichts.",
151 "issue.confidential": "Vertraulich",
152 "issue.title": "Titel",
153 "issue.description": "Beschreibung",
154 "issue.labels": "Labels",
155 "issue.assignees": "Zugewiesene",
156 "issue.milestone": "Meilenstein",
157 "issue.due": "Fälligkeitsdatum",
158 "issue.noMilestone": "Kein Meilenstein",
159 "issue.create": "Issue anlegen",
160 "issue.save": "Speichern",
161 "issue.close": "Issue schließen",
162 "issue.reopen": "Issue wieder öffnen",
163 "issue.delete": "Issue löschen",
164 "issue.comment": "Kommentar",
165 "issue.comments": "Kommentare",
166 "issue.related": "Verwandte Issues",
167 "issue.relatedNew": "Neues verwandtes Issue",
168 "issue.relate": "Dieses Issue als verwandt mit #%d markieren",
169 "issue.fromComment": "Neues Issue aus Kommentar",
170 "issue.by": "geöffnet von %s",
171 "issue.edit": "Bearbeiten",
172 "issue.meta": "Labels und Zuweisung",
173 "issue.addLabel": "Label hinzufügen",
174 "issue.addMilestone": "Meilenstein hinzufügen",
175 "info.sec.issues": "Issues",
176 "info.issue.lead": "Jedes Repository hat einen Issues-Tab. Readonly darf Issues anlegen, wie ein GitLab-Guest: anlegen, kommentieren, das eigene Issue bearbeiten und schließen und es beim Anlegen als vertraulich markieren. Reporter darf labeln und zuweisen, einen Meilenstein und ein Fälligkeitsdatum setzen und jedes Issue schließen, wieder öffnen oder bearbeiten. Ein Developer hat dieselben Issue-Rechte wie ein Reporter und kann weiterhin Code pushen. Ein Maintainer legt die Listen für Labels und Meilensteine an und darf ein Issue löschen. Anonyme Besucher eines öffentlichen Repositorys können Issues lesen, außer vertrauliche. Die bleiben verborgen, außer du hast das Issue geschrieben oder bist Reporter oder höher. Issues werden pro Repository nummeriert, #1 dann #2. In Markdown wird #12 ein Link zu diesem Issue und !5 ein Link zu diesem Merge Request, außer in Code. Closes #12, Fixes #12, Resolves #12 oder Implements #12 in der Beschreibung eines Merge Requests oder in seinen Commits schließt das Issue beim Merge. Dieselben Wörter in einem Commit auf dem Standardbranch schließen das Issue beim Push. Ein neues Issue kann aus einem Merge-Request-Kommentar starten oder als verwandtes Issue aus einem anderen Issue. Die API benutzt ein persönliches Token: GET und POST /api/v1/repos/{owner}/{repo}/issues, GET und PUT /api/v1/repos/{owner}/{repo}/issues/{number}, POST .../notes und GET und POST .../labels und .../milestones. Der Issue-Webhook hat object_kind issue und action opened, updated, closed, reopened oder commented. Der Body enthält Titel, Beschreibung, Status, confidential, Autor, Assignees, Labels, Milestone und due date. Bei commented steht auch der Kommentartext dabei.",
177 "hook.issueOpened": "Issue #%s geöffnet: %s",
178 "hook.issueUpdated": "Issue #%s aktualisiert: %s",
179 "hook.issueClosed": "Issue #%s geschlossen: %s",
180 "hook.issueReopened": "Issue #%s wieder geöffnet: %s",
181 "hook.issueComment": "Kommentar zu Issue #%s",
182 "err.issueTitle": "ein Issue braucht einen Titel",
183 "err.issueBody": "die Beschreibung ist zu lang",
184 "err.issueDue": "ein Fälligkeitsdatum nutzt YYYY-MM-DD",
185 "err.labelName": "ein Label nutzt Buchstaben, Ziffern, Leerzeichen, Bindestriche oder Unterstriche",
186 "err.labelColor": "eine Farbe nutzt # und sechs Hex-Zeichen",
187 "err.labelMissing": "unbekanntes Label %s",
188 "err.milestone": "unbekannter Meilenstein",
189 "err.milestoneName": "ein Meilenstein braucht einen Titel",
190 "err.assignee": "unbekannte zugewiesene Person %s",
191 "err.issueState": "ein Issue ist offen oder geschlossen",
192 "err.issueNote": "ein Kommentar braucht Text",
193 "flash.issueCreated": "Issue angelegt.",
194 "flash.issueUpdated": "Issue aktualisiert.",
195 "flash.issueClosed": "Issue geschlossen.",
196 "flash.issueReopened": "Issue wieder geöffnet.",
197 "flash.issueDeleted": "Issue gelöscht.",
198 "flash.label": "Label gespeichert.",
199 "flash.milestone": "Meilenstein gespeichert.",
200 }
201
202 var issueFR = map[string]string{
203 "tab.issues": "Tickets",
204 "role.reporter": "Rapporteur",
205 "set.ev.issue": "Tickets",
206 "issue.new": "Nouveau ticket",
207 "issue.search": "Chercher des tickets",
208 "issue.open": "Ouvert",
209 "issue.closed": "Fermé",
210 "issue.all": "Tous",
211 "issue.anyLabel": "Toute étiquette",
212 "issue.anyAssignee": "Tout assigné",
213 "issue.filter": "Filtrer",
214 "issue.none": "Rien ici pour le moment.",
215 "issue.confidential": "Confidentiel",
216 "issue.title": "Titre",
217 "issue.description": "Description",
218 "issue.labels": "Étiquettes",
219 "issue.assignees": "Assignés",
220 "issue.milestone": "Jalon",
221 "issue.due": "Date d'échéance",
222 "issue.noMilestone": "Aucun jalon",
223 "issue.create": "Créer le ticket",
224 "issue.save": "Enregistrer",
225 "issue.close": "Fermer le ticket",
226 "issue.reopen": "Rouvrir le ticket",
227 "issue.delete": "Supprimer le ticket",
228 "issue.comment": "Commentaire",
229 "issue.comments": "Commentaires",
230 "issue.related": "Tickets liés",
231 "issue.relatedNew": "Nouveau ticket lié",
232 "issue.relate": "Marquer ce ticket comme lié à #%d",
233 "issue.fromComment": "Nouveau ticket depuis le commentaire",
234 "issue.by": "ouvert par %s",
235 "issue.edit": "Modifier",
236 "issue.meta": "Étiquettes et assignation",
237 "issue.addLabel": "Ajouter une étiquette",
238 "issue.addMilestone": "Ajouter un jalon",
239 "info.sec.issues": "Tickets",
240 "info.issue.lead": "Chaque dépôt a un onglet Tickets. Readonly peut créer des tickets, comme un Guest GitLab : créer, commenter, modifier et fermer son propre ticket, et le marquer confidentiel à la création. Reporter peut étiqueter et assigner, poser un jalon et une date d échéance, et fermer, rouvrir ou modifier tout ticket. Un Developer a les mêmes droits sur les tickets qu un Reporter et peut toujours pousser du code. Un Maintainer crée les listes d étiquettes et de jalons et peut supprimer un ticket. Les visiteurs anonymes d un dépôt public peuvent lire les tickets, sauf les confidentiels. Ceux-là restent cachés, sauf si vous avez écrit le ticket ou si vous êtes Reporter ou plus. Les tickets sont numérotés par dépôt, #1 puis #2. En Markdown, #12 devient un lien vers ce ticket et !5 un lien vers cette merge request, sauf dans le code. Closes #12, Fixes #12, Resolves #12 ou Implements #12 dans la description d une merge request ou dans ses commits ferme le ticket à la fusion. Les mêmes mots dans un commit sur la branche par défaut ferment le ticket au push. Vous pouvez ouvrir un ticket depuis un commentaire de merge request, ou comme ticket lié depuis un autre ticket. L API utilise un jeton personnel : GET et POST /api/v1/repos/{owner}/{repo}/issues, GET et PUT /api/v1/repos/{owner}/{repo}/issues/{number}, POST .../notes, et GET et POST .../labels et .../milestones. Le webhook issue a object_kind issue et action opened, updated, closed, reopened ou commented. Le corps contient titre, description, statut, confidential, auteur, assignees, labels, milestone et due date. Une action commented contient aussi le texte.",
241 "hook.issueOpened": "ticket #%s ouvert : %s",
242 "hook.issueUpdated": "ticket #%s mis à jour : %s",
243 "hook.issueClosed": "ticket #%s fermé : %s",
244 "hook.issueReopened": "ticket #%s rouvert : %s",
245 "hook.issueComment": "commentaire sur le ticket #%s",
246 "err.issueTitle": "un ticket a besoin d un titre",
247 "err.issueBody": "la description est trop longue",
248 "err.issueDue": "une date d échéance utilise YYYY-MM-DD",
249 "err.labelName": "une étiquette utilise des lettres, des chiffres, des espaces, des tirets ou des underscores",
250 "err.labelColor": "une couleur utilise # et six chiffres hexadécimaux",
251 "err.labelMissing": "étiquette inconnue %s",
252 "err.milestone": "jalon inconnu",
253 "err.milestoneName": "un jalon a besoin d un titre",
254 "err.assignee": "assigné inconnu %s",
255 "err.issueState": "un ticket est ouvert ou fermé",
256 "err.issueNote": "un commentaire a besoin de texte",
257 "flash.issueCreated": "Ticket créé.",
258 "flash.issueUpdated": "Ticket mis à jour.",
259 "flash.issueClosed": "Ticket fermé.",
260 "flash.issueReopened": "Ticket rouvert.",
261 "flash.issueDeleted": "Ticket supprimé.",
262 "flash.label": "Étiquette enregistrée.",
263 "flash.milestone": "Jalon enregistré.",
264 }
@@ -0,0 +1,264 @@
1package i18n
2
3func init() {
4 addCatalog(en, issueEN)
5 addCatalog(nl, issueNL)
6 addCatalog(de, issueDE)
7 addCatalog(fr, issueFR)
8}
9
10var issueEN = map[string]string{
11 "tab.issues": "Issues",
12 "role.reporter": "Reporter",
13 "set.ev.issue": "Issues",
14 "issue.new": "New issue",
15 "issue.search": "Search issues",
16 "issue.open": "Open",
17 "issue.closed": "Closed",
18 "issue.all": "All",
19 "issue.anyLabel": "Any label",
20 "issue.anyAssignee": "Any assignee",
21 "issue.filter": "Filter",
22 "issue.none": "Nothing here yet.",
23 "issue.confidential": "Confidential",
24 "issue.title": "Title",
25 "issue.description": "Description",
26 "issue.labels": "Labels",
27 "issue.assignees": "Assignees",
28 "issue.milestone": "Milestone",
29 "issue.due": "Due date",
30 "issue.noMilestone": "No milestone",
31 "issue.create": "Create issue",
32 "issue.save": "Save",
33 "issue.close": "Close issue",
34 "issue.reopen": "Reopen issue",
35 "issue.delete": "Delete issue",
36 "issue.comment": "Comment",
37 "issue.comments": "Comments",
38 "issue.related": "Related issues",
39 "issue.relatedNew": "New related issue",
40 "issue.relate": "Mark this issue as related to #%d",
41 "issue.fromComment": "New issue from comment",
42 "issue.by": "opened by %s",
43 "issue.edit": "Edit",
44 "issue.meta": "Labels and assignees",
45 "issue.addLabel": "Add label",
46 "issue.addMilestone": "Add milestone",
47 "info.sec.issues": "Issues",
48 "info.issue.lead": "Each repository has an Issues tab. Readonly may create issues, like a GitLab Guest: create, comment, edit and close their own issue, and set confidential when creating it. Reporter may label and assign, set a milestone and a due date, and close, reopen or edit any issue. A Developer has the same issue rights as a Reporter and can still push code. A Maintainer creates the label and milestone lists and can delete an issue. Anonymous visitors of a public repository can read issues, except confidential ones. Those stay hidden unless you wrote the issue or you are a Reporter or higher. Issues are numbered per repository, #1 then #2. In Markdown, #12 becomes a link to that issue and !5 becomes a link to that merge request, except inside code. Closes #12, Fixes #12, Resolves #12 or Implements #12 in a merge request description or in its commits closes the issue when the merge request is merged. The same words in a commit on the default branch close the issue on push. You can start a new issue from a merge request comment, or as a related issue from another issue. The API uses a personal token: GET and POST /api/v1/repos/{owner}/{repo}/issues, GET and PUT /api/v1/repos/{owner}/{repo}/issues/{number}, POST .../notes, and GET and POST .../labels and .../milestones. The issue webhook has object_kind issue and action opened, updated, closed, reopened or commented. The body includes title, description, status, confidential, author, assignees, labels, milestone and due date. A commented action also includes the comment text.",
49 "hook.issueOpened": "issue #%s opened: %s",
50 "hook.issueUpdated": "issue #%s updated: %s",
51 "hook.issueClosed": "issue #%s closed: %s",
52 "hook.issueReopened": "issue #%s reopened: %s",
53 "hook.issueComment": "comment on issue #%s",
54 "err.issueTitle": "an issue needs a title",
55 "err.issueBody": "the description is too long",
56 "err.issueDue": "a due date uses YYYY-MM-DD",
57 "err.labelName": "a label uses letters, digits, spaces, hyphens or underscores",
58 "err.labelColor": "a color uses # and six hex digits",
59 "err.labelMissing": "unknown label %s",
60 "err.milestone": "unknown milestone",
61 "err.milestoneName": "a milestone needs a title",
62 "err.assignee": "unknown assignee %s",
63 "err.issueState": "an issue is open or closed",
64 "err.issueNote": "a comment needs text",
65 "flash.issueCreated": "Issue created.",
66 "flash.issueUpdated": "Issue updated.",
67 "flash.issueClosed": "Issue closed.",
68 "flash.issueReopened": "Issue reopened.",
69 "flash.issueDeleted": "Issue deleted.",
70 "flash.label": "Label saved.",
71 "flash.milestone": "Milestone saved.",
72}
73
74var issueNL = map[string]string{
75 "tab.issues": "Issues",
76 "role.reporter": "Reporter",
77 "set.ev.issue": "Issues",
78 "issue.new": "Nieuw issue",
79 "issue.search": "Zoek issues",
80 "issue.open": "Open",
81 "issue.closed": "Gesloten",
82 "issue.all": "Alles",
83 "issue.anyLabel": "Elk label",
84 "issue.anyAssignee": "Elke toegewezene",
85 "issue.filter": "Filter",
86 "issue.none": "Hier staat nog niets.",
87 "issue.confidential": "Vertrouwelijk",
88 "issue.title": "Titel",
89 "issue.description": "Beschrijving",
90 "issue.labels": "Labels",
91 "issue.assignees": "Toegewezenen",
92 "issue.milestone": "Mijlpaal",
93 "issue.due": "Vervaldatum",
94 "issue.noMilestone": "Geen mijlpaal",
95 "issue.create": "Issue aanmaken",
96 "issue.save": "Opslaan",
97 "issue.close": "Issue sluiten",
98 "issue.reopen": "Issue heropenen",
99 "issue.delete": "Issue verwijderen",
100 "issue.comment": "Reactie",
101 "issue.comments": "Reacties",
102 "issue.related": "Gerelateerde issues",
103 "issue.relatedNew": "Nieuw gerelateerd issue",
104 "issue.relate": "Markeer dit issue als gerelateerd aan #%d",
105 "issue.fromComment": "Nieuw issue uit reactie",
106 "issue.by": "geopend door %s",
107 "issue.edit": "Bewerken",
108 "issue.meta": "Labels en toewijzing",
109 "issue.addLabel": "Label toevoegen",
110 "issue.addMilestone": "Mijlpaal toevoegen",
111 "info.sec.issues": "Issues",
112 "info.issue.lead": "Elke repository heeft een Issues-tab. Readonly mag issues aanmaken, zoals een GitLab-Guest: aanmaken, reageren, het eigen issue bewerken en sluiten, en bij het aanmaken vertrouwelijk zetten. Reporter mag labelen en toewijzen, een mijlpaal en vervaldatum zetten, en elk issue sluiten, heropenen of bewerken. Een Developer heeft dezelfde issuerechten als een Reporter en kan nog steeds code pushen. Een Maintainer maakt de lijsten met labels en mijlpalen en mag een issue verwijderen. Anonieme bezoekers van een publieke repository kunnen issues lezen, behalve vertrouwelijke. Die blijven verborgen, tenzij je het issue schreef of Reporter of hoger bent. Issues worden per repository genummerd, #1 en dan #2. In Markdown wordt #12 een link naar dat issue en !5 een link naar die merge request, behalve in code. Closes #12, Fixes #12, Resolves #12 of Implements #12 in een beschrijving van een merge request of in de commits sluit het issue bij het mergen. Dezelfde woorden in een commit op de standaardbranch sluiten het issue bij een push. Je kunt een nieuw issue starten vanuit een merge-request-reactie, of als gerelateerd issue vanuit een ander issue. De API gebruikt een persoonlijk token: GET en POST /api/v1/repos/{owner}/{repo}/issues, GET en PUT /api/v1/repos/{owner}/{repo}/issues/{number}, POST .../notes, en GET en POST .../labels en .../milestones. De issue-webhook heeft object_kind issue en action opened, updated, closed, reopened of commented. De body bevat titel, beschrijving, status, confidential, auteur, assignees, labels, milestone en due date. Bij commented hoort ook de tekst van de reactie.",
113 "hook.issueOpened": "issue #%s geopend: %s",
114 "hook.issueUpdated": "issue #%s bijgewerkt: %s",
115 "hook.issueClosed": "issue #%s gesloten: %s",
116 "hook.issueReopened": "issue #%s heropend: %s",
117 "hook.issueComment": "reactie op issue #%s",
118 "err.issueTitle": "een issue heeft een titel nodig",
119 "err.issueBody": "de beschrijving is te lang",
120 "err.issueDue": "een vervaldatum gebruikt YYYY-MM-DD",
121 "err.labelName": "een label gebruikt letters, cijfers, spaties, streepjes of underscores",
122 "err.labelColor": "een kleur gebruikt # en zes hexadecimale tekens",
123 "err.labelMissing": "onbekend label %s",
124 "err.milestone": "onbekende mijlpaal",
125 "err.milestoneName": "een mijlpaal heeft een titel nodig",
126 "err.assignee": "onbekende toegewezene %s",
127 "err.issueState": "een issue is open of gesloten",
128 "err.issueNote": "een reactie heeft tekst nodig",
129 "flash.issueCreated": "Issue aangemaakt.",
130 "flash.issueUpdated": "Issue bijgewerkt.",
131 "flash.issueClosed": "Issue gesloten.",
132 "flash.issueReopened": "Issue heropend.",
133 "flash.issueDeleted": "Issue verwijderd.",
134 "flash.label": "Label opgeslagen.",
135 "flash.milestone": "Mijlpaal opgeslagen.",
136}
137
138var issueDE = map[string]string{
139 "tab.issues": "Issues",
140 "role.reporter": "Reporter",
141 "set.ev.issue": "Issues",
142 "issue.new": "Neues Issue",
143 "issue.search": "Issues suchen",
144 "issue.open": "Offen",
145 "issue.closed": "Geschlossen",
146 "issue.all": "Alle",
147 "issue.anyLabel": "Jedes Label",
148 "issue.anyAssignee": "Jede zugewiesene Person",
149 "issue.filter": "Filtern",
150 "issue.none": "Hier ist noch nichts.",
151 "issue.confidential": "Vertraulich",
152 "issue.title": "Titel",
153 "issue.description": "Beschreibung",
154 "issue.labels": "Labels",
155 "issue.assignees": "Zugewiesene",
156 "issue.milestone": "Meilenstein",
157 "issue.due": "Fälligkeitsdatum",
158 "issue.noMilestone": "Kein Meilenstein",
159 "issue.create": "Issue anlegen",
160 "issue.save": "Speichern",
161 "issue.close": "Issue schließen",
162 "issue.reopen": "Issue wieder öffnen",
163 "issue.delete": "Issue löschen",
164 "issue.comment": "Kommentar",
165 "issue.comments": "Kommentare",
166 "issue.related": "Verwandte Issues",
167 "issue.relatedNew": "Neues verwandtes Issue",
168 "issue.relate": "Dieses Issue als verwandt mit #%d markieren",
169 "issue.fromComment": "Neues Issue aus Kommentar",
170 "issue.by": "geöffnet von %s",
171 "issue.edit": "Bearbeiten",
172 "issue.meta": "Labels und Zuweisung",
173 "issue.addLabel": "Label hinzufügen",
174 "issue.addMilestone": "Meilenstein hinzufügen",
175 "info.sec.issues": "Issues",
176 "info.issue.lead": "Jedes Repository hat einen Issues-Tab. Readonly darf Issues anlegen, wie ein GitLab-Guest: anlegen, kommentieren, das eigene Issue bearbeiten und schließen und es beim Anlegen als vertraulich markieren. Reporter darf labeln und zuweisen, einen Meilenstein und ein Fälligkeitsdatum setzen und jedes Issue schließen, wieder öffnen oder bearbeiten. Ein Developer hat dieselben Issue-Rechte wie ein Reporter und kann weiterhin Code pushen. Ein Maintainer legt die Listen für Labels und Meilensteine an und darf ein Issue löschen. Anonyme Besucher eines öffentlichen Repositorys können Issues lesen, außer vertrauliche. Die bleiben verborgen, außer du hast das Issue geschrieben oder bist Reporter oder höher. Issues werden pro Repository nummeriert, #1 dann #2. In Markdown wird #12 ein Link zu diesem Issue und !5 ein Link zu diesem Merge Request, außer in Code. Closes #12, Fixes #12, Resolves #12 oder Implements #12 in der Beschreibung eines Merge Requests oder in seinen Commits schließt das Issue beim Merge. Dieselben Wörter in einem Commit auf dem Standardbranch schließen das Issue beim Push. Ein neues Issue kann aus einem Merge-Request-Kommentar starten oder als verwandtes Issue aus einem anderen Issue. Die API benutzt ein persönliches Token: GET und POST /api/v1/repos/{owner}/{repo}/issues, GET und PUT /api/v1/repos/{owner}/{repo}/issues/{number}, POST .../notes und GET und POST .../labels und .../milestones. Der Issue-Webhook hat object_kind issue und action opened, updated, closed, reopened oder commented. Der Body enthält Titel, Beschreibung, Status, confidential, Autor, Assignees, Labels, Milestone und due date. Bei commented steht auch der Kommentartext dabei.",
177 "hook.issueOpened": "Issue #%s geöffnet: %s",
178 "hook.issueUpdated": "Issue #%s aktualisiert: %s",
179 "hook.issueClosed": "Issue #%s geschlossen: %s",
180 "hook.issueReopened": "Issue #%s wieder geöffnet: %s",
181 "hook.issueComment": "Kommentar zu Issue #%s",
182 "err.issueTitle": "ein Issue braucht einen Titel",
183 "err.issueBody": "die Beschreibung ist zu lang",
184 "err.issueDue": "ein Fälligkeitsdatum nutzt YYYY-MM-DD",
185 "err.labelName": "ein Label nutzt Buchstaben, Ziffern, Leerzeichen, Bindestriche oder Unterstriche",
186 "err.labelColor": "eine Farbe nutzt # und sechs Hex-Zeichen",
187 "err.labelMissing": "unbekanntes Label %s",
188 "err.milestone": "unbekannter Meilenstein",
189 "err.milestoneName": "ein Meilenstein braucht einen Titel",
190 "err.assignee": "unbekannte zugewiesene Person %s",
191 "err.issueState": "ein Issue ist offen oder geschlossen",
192 "err.issueNote": "ein Kommentar braucht Text",
193 "flash.issueCreated": "Issue angelegt.",
194 "flash.issueUpdated": "Issue aktualisiert.",
195 "flash.issueClosed": "Issue geschlossen.",
196 "flash.issueReopened": "Issue wieder geöffnet.",
197 "flash.issueDeleted": "Issue gelöscht.",
198 "flash.label": "Label gespeichert.",
199 "flash.milestone": "Meilenstein gespeichert.",
200}
201
202var issueFR = map[string]string{
203 "tab.issues": "Tickets",
204 "role.reporter": "Rapporteur",
205 "set.ev.issue": "Tickets",
206 "issue.new": "Nouveau ticket",
207 "issue.search": "Chercher des tickets",
208 "issue.open": "Ouvert",
209 "issue.closed": "Fermé",
210 "issue.all": "Tous",
211 "issue.anyLabel": "Toute étiquette",
212 "issue.anyAssignee": "Tout assigné",
213 "issue.filter": "Filtrer",
214 "issue.none": "Rien ici pour le moment.",
215 "issue.confidential": "Confidentiel",
216 "issue.title": "Titre",
217 "issue.description": "Description",
218 "issue.labels": "Étiquettes",
219 "issue.assignees": "Assignés",
220 "issue.milestone": "Jalon",
221 "issue.due": "Date d'échéance",
222 "issue.noMilestone": "Aucun jalon",
223 "issue.create": "Créer le ticket",
224 "issue.save": "Enregistrer",
225 "issue.close": "Fermer le ticket",
226 "issue.reopen": "Rouvrir le ticket",
227 "issue.delete": "Supprimer le ticket",
228 "issue.comment": "Commentaire",
229 "issue.comments": "Commentaires",
230 "issue.related": "Tickets liés",
231 "issue.relatedNew": "Nouveau ticket lié",
232 "issue.relate": "Marquer ce ticket comme lié à #%d",
233 "issue.fromComment": "Nouveau ticket depuis le commentaire",
234 "issue.by": "ouvert par %s",
235 "issue.edit": "Modifier",
236 "issue.meta": "Étiquettes et assignation",
237 "issue.addLabel": "Ajouter une étiquette",
238 "issue.addMilestone": "Ajouter un jalon",
239 "info.sec.issues": "Tickets",
240 "info.issue.lead": "Chaque dépôt a un onglet Tickets. Readonly peut créer des tickets, comme un Guest GitLab : créer, commenter, modifier et fermer son propre ticket, et le marquer confidentiel à la création. Reporter peut étiqueter et assigner, poser un jalon et une date d échéance, et fermer, rouvrir ou modifier tout ticket. Un Developer a les mêmes droits sur les tickets qu un Reporter et peut toujours pousser du code. Un Maintainer crée les listes d étiquettes et de jalons et peut supprimer un ticket. Les visiteurs anonymes d un dépôt public peuvent lire les tickets, sauf les confidentiels. Ceux-là restent cachés, sauf si vous avez écrit le ticket ou si vous êtes Reporter ou plus. Les tickets sont numérotés par dépôt, #1 puis #2. En Markdown, #12 devient un lien vers ce ticket et !5 un lien vers cette merge request, sauf dans le code. Closes #12, Fixes #12, Resolves #12 ou Implements #12 dans la description d une merge request ou dans ses commits ferme le ticket à la fusion. Les mêmes mots dans un commit sur la branche par défaut ferment le ticket au push. Vous pouvez ouvrir un ticket depuis un commentaire de merge request, ou comme ticket lié depuis un autre ticket. L API utilise un jeton personnel : GET et POST /api/v1/repos/{owner}/{repo}/issues, GET et PUT /api/v1/repos/{owner}/{repo}/issues/{number}, POST .../notes, et GET et POST .../labels et .../milestones. Le webhook issue a object_kind issue et action opened, updated, closed, reopened ou commented. Le corps contient titre, description, statut, confidential, auteur, assignees, labels, milestone et due date. Une action commented contient aussi le texte.",
241 "hook.issueOpened": "ticket #%s ouvert : %s",
242 "hook.issueUpdated": "ticket #%s mis à jour : %s",
243 "hook.issueClosed": "ticket #%s fermé : %s",
244 "hook.issueReopened": "ticket #%s rouvert : %s",
245 "hook.issueComment": "commentaire sur le ticket #%s",
246 "err.issueTitle": "un ticket a besoin d un titre",
247 "err.issueBody": "la description est trop longue",
248 "err.issueDue": "une date d échéance utilise YYYY-MM-DD",
249 "err.labelName": "une étiquette utilise des lettres, des chiffres, des espaces, des tirets ou des underscores",
250 "err.labelColor": "une couleur utilise # et six chiffres hexadécimaux",
251 "err.labelMissing": "étiquette inconnue %s",
252 "err.milestone": "jalon inconnu",
253 "err.milestoneName": "un jalon a besoin d un titre",
254 "err.assignee": "assigné inconnu %s",
255 "err.issueState": "un ticket est ouvert ou fermé",
256 "err.issueNote": "un commentaire a besoin de texte",
257 "flash.issueCreated": "Ticket créé.",
258 "flash.issueUpdated": "Ticket mis à jour.",
259 "flash.issueClosed": "Ticket fermé.",
260 "flash.issueReopened": "Ticket rouvert.",
261 "flash.issueDeleted": "Ticket supprimé.",
262 "flash.label": "Étiquette enregistrée.",
263 "flash.milestone": "Jalon enregistré.",
264}
internal/markdown/markdown.go +54 −12
@@ -10,7 +10,8 @@ import (
10 10 )
11 11
12 12 // Render maakt HTML. Relatieve links krijgen linkBase ervoor, plus rev.
13 func Render(src, linkBase, rev string) string {
13 // 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 {
14 15 lines := strings.Split(strings.ReplaceAll(src, "\r\n", "\n"), "\n")
15 16 var b strings.Builder
16 17 for i := 0; i < len(lines); {
@@ -36,7 +37,7 @@ func Render(src, linkBase, rev string) string {
36 37 continue
37 38 }
38 39 if isTableStart(lines, i) {
39 b.WriteString(table(lines, &i, linkBase, rev))
40 b.WriteString(table(lines, &i, linkBase, rev, repoPath))
40 41 continue
41 42 }
42 43 if strings.HasPrefix(trim, "#") {
@@ -47,7 +48,7 @@ func Render(src, linkBase, rev string) string {
47 48 if n > 0 && (n == len(trim) || trim[n] == ' ') {
48 49 h := strconv.Itoa(n)
49 50 b.WriteString("<h" + h + ">")
50 b.WriteString(inline(strings.TrimSpace(trim[n:]), linkBase, rev))
51 b.WriteString(inline(strings.TrimSpace(trim[n:]), linkBase, rev, repoPath))
51 52 b.WriteString("</h" + h + ">\n")
52 53 i++
53 54 continue
@@ -60,7 +61,7 @@ func Render(src, linkBase, rev string) string {
60 61 item = strings.TrimPrefix(item, "- ")
61 62 item = strings.TrimPrefix(item, "* ")
62 63 b.WriteString("<li>")
63 b.WriteString(inline(item, linkBase, rev))
64 b.WriteString(inline(item, linkBase, rev, repoPath))
64 65 b.WriteString("</li>\n")
65 66 i++
66 67 }
@@ -73,7 +74,7 @@ func Render(src, linkBase, rev string) string {
73 74 i++
74 75 }
75 76 b.WriteString("<p>")
76 b.WriteString(inline(strings.Join(para, " "), linkBase, rev))
77 b.WriteString(inline(strings.Join(para, " "), linkBase, rev, repoPath))
77 78 b.WriteString("</p>\n")
78 79 }
79 80 return b.String()
@@ -125,7 +126,7 @@ func splitRow(line string) []string {
125 126 return parts
126 127 }
127 128
128 func table(lines []string, i *int, linkBase, rev string) string {
129 func table(lines []string, i *int, linkBase, rev, repoPath string) string {
129 130 head := splitRow(lines[*i])
130 131 *i += 2
131 132 var rows [][]string
@@ -137,7 +138,7 @@ func table(lines []string, i *int, linkBase, rev string) string {
137 138 b.WriteString("<table class=\"md\">\n<thead><tr>")
138 139 for _, c := range head {
139 140 b.WriteString("<th>")
140 b.WriteString(inline(c, linkBase, rev))
141 b.WriteString(inline(c, linkBase, rev, repoPath))
141 142 b.WriteString("</th>")
142 143 }
143 144 b.WriteString("</tr></thead>\n<tbody>\n")
@@ -145,7 +146,7 @@ func table(lines []string, i *int, linkBase, rev string) string {
145 146 b.WriteString("<tr>")
146 147 for _, c := range row {
147 148 b.WriteString("<td>")
148 b.WriteString(inline(c, linkBase, rev))
149 b.WriteString(inline(c, linkBase, rev, repoPath))
149 150 b.WriteString("</td>")
150 151 }
151 152 b.WriteString("</tr>\n")
@@ -154,7 +155,7 @@ func table(lines []string, i *int, linkBase, rev string) string {
154 155 return b.String()
155 156 }
156 157
157 func inline(s, linkBase, rev string) string {
158 func inline(s, linkBase, rev, repoPath string) string {
158 159 var b strings.Builder
159 160 for i := 0; i < len(s); {
160 161 if s[i] == '`' {
@@ -169,7 +170,7 @@ func inline(s, linkBase, rev string) string {
169 170 if strings.HasPrefix(s[i:], "**") {
170 171 if j := strings.Index(s[i+2:], "**"); j >= 0 {
171 172 b.WriteString("<strong>")
172 b.WriteString(inline(s[i+2:i+2+j], linkBase, rev))
173 b.WriteString(inline(s[i+2:i+2+j], linkBase, rev, repoPath))
173 174 b.WriteString("</strong>")
174 175 i += j + 4
175 176 continue
@@ -178,7 +179,7 @@ func inline(s, linkBase, rev string) string {
178 179 if s[i] == '*' {
179 180 if j := strings.IndexByte(s[i+1:], '*'); j > 0 {
180 181 b.WriteString("<em>")
181 b.WriteString(inline(s[i+1:i+1+j], linkBase, rev))
182 b.WriteString(inline(s[i+1:i+1+j], linkBase, rev, repoPath))
182 183 b.WriteString("</em>")
183 184 i += j + 2
184 185 continue
@@ -192,19 +193,60 @@ func inline(s, linkBase, rev string) string {
192 193 b.WriteString(`<a href="`)
193 194 b.WriteString(html.EscapeString(resolveLink(href, linkBase, rev)))
194 195 b.WriteString(`">`)
195 b.WriteString(inline(text, linkBase, rev))
196 b.WriteString(inline(text, linkBase, rev, repoPath))
196 197 b.WriteString("</a>")
197 198 i += mid + end + 1
198 199 continue
199 200 }
200 201 }
201 202 }
203 if href, label, n, ok := refLink(s, i, repoPath); ok {
204 b.WriteString(`<a href="`)
205 b.WriteString(html.EscapeString(href))
206 b.WriteString(`">`)
207 b.WriteString(html.EscapeString(label))
208 b.WriteString("</a>")
209 i += n
210 continue
211 }
202 212 b.WriteString(html.EscapeString(s[i : i+1]))
203 213 i++
204 214 }
205 215 return b.String()
206 216 }
207 217
218 func refLink(s string, i int, repoPath string) (href, label string, n int, ok bool) {
219 if repoPath == "" || i >= len(s) {
220 return "", "", 0, false
221 }
222 if s[i] != '#' && s[i] != '!' {
223 return "", "", 0, false
224 }
225 if i > 0 && isIdent(s[i-1]) {
226 return "", "", 0, false
227 }
228 j := i + 1
229 if j >= len(s) || s[j] < '0' || s[j] > '9' {
230 return "", "", 0, false
231 }
232 for j < len(s) && s[j] >= '0' && s[j] <= '9' {
233 j++
234 }
235 if j < len(s) && isIdent(s[j]) {
236 return "", "", 0, false
237 }
238 kind := "issues"
239 if s[i] == '!' {
240 kind = "merge-requests"
241 }
242 base := strings.Trim(repoPath, "/")
243 return "/" + base + "/-/" + kind + "/" + s[i+1:j], s[i:j], j - i, true
244 }
245
246 func isIdent(c byte) bool {
247 return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9') || c == '_'
248 }
249
208 250 func resolveLink(href, linkBase, rev string) string {
209 251 href = strings.TrimSpace(href)
210 252 lower := strings.ToLower(href)
@@ -10,7 +10,8 @@ import (
10)
10)
11
11
12// Render maakt HTML. Relatieve links krijgen linkBase ervoor, plus rev.
12// Render maakt HTML. Relatieve links krijgen linkBase ervoor, plus rev.
13func Render(src, linkBase, rev string) string {
13// repoPath is /owner/repo. Dan worden #12 en !5 links naar dat issue of die merge request.
14func Render(src, linkBase, rev, repoPath string) string {
14 lines := strings.Split(strings.ReplaceAll(src, "\r\n", "\n"), "\n")
15 lines := strings.Split(strings.ReplaceAll(src, "\r\n", "\n"), "\n")
15 var b strings.Builder
16 var b strings.Builder
16 for i := 0; i < len(lines); {
17 for i := 0; i < len(lines); {
@@ -36,7 +37,7 @@ func Render(src, linkBase, rev string) string {
36 continue
37 continue
37 }
38 }
38 if isTableStart(lines, i) {
39 if isTableStart(lines, i) {
39 b.WriteString(table(lines, &i, linkBase, rev))
40 b.WriteString(table(lines, &i, linkBase, rev, repoPath))
40 continue
41 continue
41 }
42 }
42 if strings.HasPrefix(trim, "#") {
43 if strings.HasPrefix(trim, "#") {
@@ -47,7 +48,7 @@ func Render(src, linkBase, rev string) string {
47 if n > 0 && (n == len(trim) || trim[n] == ' ') {
48 if n > 0 && (n == len(trim) || trim[n] == ' ') {
48 h := strconv.Itoa(n)
49 h := strconv.Itoa(n)
49 b.WriteString("<h" + h + ">")
50 b.WriteString("<h" + h + ">")
50 b.WriteString(inline(strings.TrimSpace(trim[n:]), linkBase, rev))
51 b.WriteString(inline(strings.TrimSpace(trim[n:]), linkBase, rev, repoPath))
51 b.WriteString("</h" + h + ">\n")
52 b.WriteString("</h" + h + ">\n")
52 i++
53 i++
53 continue
54 continue
@@ -60,7 +61,7 @@ func Render(src, linkBase, rev string) string {
60 item = strings.TrimPrefix(item, "- ")
61 item = strings.TrimPrefix(item, "- ")
61 item = strings.TrimPrefix(item, "* ")
62 item = strings.TrimPrefix(item, "* ")
62 b.WriteString("<li>")
63 b.WriteString("<li>")
63 b.WriteString(inline(item, linkBase, rev))
64 b.WriteString(inline(item, linkBase, rev, repoPath))
64 b.WriteString("</li>\n")
65 b.WriteString("</li>\n")
65 i++
66 i++
66 }
67 }
@@ -73,7 +74,7 @@ func Render(src, linkBase, rev string) string {
73 i++
74 i++
74 }
75 }
75 b.WriteString("<p>")
76 b.WriteString("<p>")
76 b.WriteString(inline(strings.Join(para, " "), linkBase, rev))
77 b.WriteString(inline(strings.Join(para, " "), linkBase, rev, repoPath))
77 b.WriteString("</p>\n")
78 b.WriteString("</p>\n")
78 }
79 }
79 return b.String()
80 return b.String()
@@ -125,7 +126,7 @@ func splitRow(line string) []string {
125 return parts
126 return parts
126}
127}
127
128
128func table(lines []string, i *int, linkBase, rev string) string {
129func table(lines []string, i *int, linkBase, rev, repoPath string) string {
129 head := splitRow(lines[*i])
130 head := splitRow(lines[*i])
130 *i += 2
131 *i += 2
131 var rows [][]string
132 var rows [][]string
@@ -137,7 +138,7 @@ func table(lines []string, i *int, linkBase, rev string) string {
137 b.WriteString("<table class=\"md\">\n<thead><tr>")
138 b.WriteString("<table class=\"md\">\n<thead><tr>")
138 for _, c := range head {
139 for _, c := range head {
139 b.WriteString("<th>")
140 b.WriteString("<th>")
140 b.WriteString(inline(c, linkBase, rev))
141 b.WriteString(inline(c, linkBase, rev, repoPath))
141 b.WriteString("</th>")
142 b.WriteString("</th>")
142 }
143 }
143 b.WriteString("</tr></thead>\n<tbody>\n")
144 b.WriteString("</tr></thead>\n<tbody>\n")
@@ -145,7 +146,7 @@ func table(lines []string, i *int, linkBase, rev string) string {
145 b.WriteString("<tr>")
146 b.WriteString("<tr>")
146 for _, c := range row {
147 for _, c := range row {
147 b.WriteString("<td>")
148 b.WriteString("<td>")
148 b.WriteString(inline(c, linkBase, rev))
149 b.WriteString(inline(c, linkBase, rev, repoPath))
149 b.WriteString("</td>")
150 b.WriteString("</td>")
150 }
151 }
151 b.WriteString("</tr>\n")
152 b.WriteString("</tr>\n")
@@ -154,7 +155,7 @@ func table(lines []string, i *int, linkBase, rev string) string {
154 return b.String()
155 return b.String()
155}
156}
156
157
157func inline(s, linkBase, rev string) string {
158func inline(s, linkBase, rev, repoPath string) string {
158 var b strings.Builder
159 var b strings.Builder
159 for i := 0; i < len(s); {
160 for i := 0; i < len(s); {
160 if s[i] == '`' {
161 if s[i] == '`' {
@@ -169,7 +170,7 @@ func inline(s, linkBase, rev string) string {
169 if strings.HasPrefix(s[i:], "**") {
170 if strings.HasPrefix(s[i:], "**") {
170 if j := strings.Index(s[i+2:], "**"); j >= 0 {
171 if j := strings.Index(s[i+2:], "**"); j >= 0 {
171 b.WriteString("<strong>")
172 b.WriteString("<strong>")
172 b.WriteString(inline(s[i+2:i+2+j], linkBase, rev))
173 b.WriteString(inline(s[i+2:i+2+j], linkBase, rev, repoPath))
173 b.WriteString("</strong>")
174 b.WriteString("</strong>")
174 i += j + 4
175 i += j + 4
175 continue
176 continue
@@ -178,7 +179,7 @@ func inline(s, linkBase, rev string) string {
178 if s[i] == '*' {
179 if s[i] == '*' {
179 if j := strings.IndexByte(s[i+1:], '*'); j > 0 {
180 if j := strings.IndexByte(s[i+1:], '*'); j > 0 {
180 b.WriteString("<em>")
181 b.WriteString("<em>")
181 b.WriteString(inline(s[i+1:i+1+j], linkBase, rev))
182 b.WriteString(inline(s[i+1:i+1+j], linkBase, rev, repoPath))
182 b.WriteString("</em>")
183 b.WriteString("</em>")
183 i += j + 2
184 i += j + 2
184 continue
185 continue
@@ -192,19 +193,60 @@ func inline(s, linkBase, rev string) string {
192 b.WriteString(`<a href="`)
193 b.WriteString(`<a href="`)
193 b.WriteString(html.EscapeString(resolveLink(href, linkBase, rev)))
194 b.WriteString(html.EscapeString(resolveLink(href, linkBase, rev)))
194 b.WriteString(`">`)
195 b.WriteString(`">`)
195 b.WriteString(inline(text, linkBase, rev))
196 b.WriteString(inline(text, linkBase, rev, repoPath))
196 b.WriteString("</a>")
197 b.WriteString("</a>")
197 i += mid + end + 1
198 i += mid + end + 1
198 continue
199 continue
199 }
200 }
200 }
201 }
201 }
202 }
203 if href, label, n, ok := refLink(s, i, repoPath); ok {
204 b.WriteString(`<a href="`)
205 b.WriteString(html.EscapeString(href))
206 b.WriteString(`">`)
207 b.WriteString(html.EscapeString(label))
208 b.WriteString("</a>")
209 i += n
210 continue
211 }
202 b.WriteString(html.EscapeString(s[i : i+1]))
212 b.WriteString(html.EscapeString(s[i : i+1]))
203 i++
213 i++
204 }
214 }
205 return b.String()
215 return b.String()
206}
216}
207
217
218func refLink(s string, i int, repoPath string) (href, label string, n int, ok bool) {
219 if repoPath == "" || i >= len(s) {
220 return "", "", 0, false
221 }
222 if s[i] != '#' && s[i] != '!' {
223 return "", "", 0, false
224 }
225 if i > 0 && isIdent(s[i-1]) {
226 return "", "", 0, false
227 }
228 j := i + 1
229 if j >= len(s) || s[j] < '0' || s[j] > '9' {
230 return "", "", 0, false
231 }
232 for j < len(s) && s[j] >= '0' && s[j] <= '9' {
233 j++
234 }
235 if j < len(s) && isIdent(s[j]) {
236 return "", "", 0, false
237 }
238 kind := "issues"
239 if s[i] == '!' {
240 kind = "merge-requests"
241 }
242 base := strings.Trim(repoPath, "/")
243 return "/" + base + "/-/" + kind + "/" + s[i+1:j], s[i:j], j - i, true
244}
245
246func isIdent(c byte) bool {
247 return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9') || c == '_'
248}
249
208func resolveLink(href, linkBase, rev string) string {
250func resolveLink(href, linkBase, rev string) string {
209 href = strings.TrimSpace(href)
251 href = strings.TrimSpace(href)
210 lower := strings.ToLower(href)
252 lower := strings.ToLower(href)
internal/markdown/markdown_test.go +17 −1
@@ -7,7 +7,7 @@ import (
7 7
8 8 func TestTableAndEscape(t *testing.T) {
9 9 src := "# Demo\n\nEen <script>regel</script> met **vet**.\n\n| Sleutel | Actie |\n| --- | --- |\n| A | Links |\n| D | Rechts |\n\nZie [regels](docs/regels.md).\n"
10 got := Render(src, "/tim/demo/-/blob/", "master")
10 got := Render(src, "/tim/demo/-/blob/", "master", "")
11 11 for _, want := range []string{
12 12 "<h1>Demo</h1>",
13 13 "<strong>vet</strong>",
@@ -22,3 +22,19 @@ func TestTableAndEscape(t *testing.T) {
22 22 }
23 23 }
24 24 }
25
26 func TestIssueRefs(t *testing.T) {
27 got := Render("Zie #12 en !5.\n\n`#9` en a#3 en x!7.", "", "", "/tim/app")
28 for _, want := range []string{
29 `<a href="/tim/app/-/issues/12">#12</a>`,
30 `<a href="/tim/app/-/merge-requests/5">!5</a>`,
31 "<code>#9</code>",
32 } {
33 if !strings.Contains(got, want) {
34 t.Errorf("mist %s in\n%s", want, got)
35 }
36 }
37 if strings.Contains(got, "/issues/3") || strings.Contains(got, "/issues/9") || strings.Contains(got, "merge-requests/7") {
38 t.Fatalf("verwijzing in code of woord: %s", got)
39 }
40 }
@@ -7,7 +7,7 @@ import (
7
7
8func TestTableAndEscape(t *testing.T) {
8func TestTableAndEscape(t *testing.T) {
9 src := "# Demo\n\nEen <script>regel</script> met **vet**.\n\n| Sleutel | Actie |\n| --- | --- |\n| A | Links |\n| D | Rechts |\n\nZie [regels](docs/regels.md).\n"
9 src := "# Demo\n\nEen <script>regel</script> met **vet**.\n\n| Sleutel | Actie |\n| --- | --- |\n| A | Links |\n| D | Rechts |\n\nZie [regels](docs/regels.md).\n"
10 got := Render(src, "/tim/demo/-/blob/", "master")
10 got := Render(src, "/tim/demo/-/blob/", "master", "")
11 for _, want := range []string{
11 for _, want := range []string{
12 "<h1>Demo</h1>",
12 "<h1>Demo</h1>",
13 "<strong>vet</strong>",
13 "<strong>vet</strong>",
@@ -22,3 +22,19 @@ func TestTableAndEscape(t *testing.T) {
22 }
22 }
23 }
23 }
24}
24}
25
26func TestIssueRefs(t *testing.T) {
27 got := Render("Zie #12 en !5.\n\n`#9` en a#3 en x!7.", "", "", "/tim/app")
28 for _, want := range []string{
29 `<a href="/tim/app/-/issues/12">#12</a>`,
30 `<a href="/tim/app/-/merge-requests/5">!5</a>`,
31 "<code>#9</code>",
32 } {
33 if !strings.Contains(got, want) {
34 t.Errorf("mist %s in\n%s", want, got)
35 }
36 }
37 if strings.Contains(got, "/issues/3") || strings.Contains(got, "/issues/9") || strings.Contains(got, "merge-requests/7") {
38 t.Fatalf("verwijzing in code of woord: %s", got)
39 }
40}
internal/server/events.go +3 −0
@@ -69,6 +69,9 @@ func (s *Server) AfterPush(repo store.Repo, user store.User, before, after map[s
69 69 s.recordMRPushes(repo, user, branch, before[ref], sha)
70 70 s.rerunMergeRequestsOnTarget(context.Background(), repo, branch, actor)
71 71 s.pushHook(repo, actor, ref, before[ref], sha)
72 if branch == repo.DefaultBranch {
73 s.closeIssuesOnPush(repo, user, before[ref], sha)
74 }
72 75 }
73 76 }
74 77
@@ -69,6 +69,9 @@ func (s *Server) AfterPush(repo store.Repo, user store.User, before, after map[s
69 s.recordMRPushes(repo, user, branch, before[ref], sha)
69 s.recordMRPushes(repo, user, branch, before[ref], sha)
70 s.rerunMergeRequestsOnTarget(context.Background(), repo, branch, actor)
70 s.rerunMergeRequestsOnTarget(context.Background(), repo, branch, actor)
71 s.pushHook(repo, actor, ref, before[ref], sha)
71 s.pushHook(repo, actor, ref, before[ref], sha)
72 if branch == repo.DefaultBranch {
73 s.closeIssuesOnPush(repo, user, before[ref], sha)
74 }
72 }
75 }
73}
76}
74
77
internal/server/info.go +1 −0
@@ -23,6 +23,7 @@ func (s *Server) infoPage(w http.ResponseWriter, r *http.Request) {
23 23 v.SpecJSON = template.JS(raw)
24 24 v.APIJSON = template.JS(apiIndex())
25 25 v.HookDoc = webhook.Example()
26 v.IssueDoc = webhook.IssueExample()
26 27 s.attachUpdate(&v, s.langOf(r))
27 28 s.render(w, "info", v)
28 29 }
@@ -23,6 +23,7 @@ func (s *Server) infoPage(w http.ResponseWriter, r *http.Request) {
23 v.SpecJSON = template.JS(raw)
23 v.SpecJSON = template.JS(raw)
24 v.APIJSON = template.JS(apiIndex())
24 v.APIJSON = template.JS(apiIndex())
25 v.HookDoc = webhook.Example()
25 v.HookDoc = webhook.Example()
26 v.IssueDoc = webhook.IssueExample()
26 s.attachUpdate(&v, s.langOf(r))
27 s.attachUpdate(&v, s.langOf(r))
27 s.render(w, "info", v)
28 s.render(w, "info", v)
28}
29}
internal/server/issues.go added +698 −0
@@ -0,0 +1,698 @@
1 package server
2
3 import (
4 "context"
5 "html/template"
6 "net/http"
7 "regexp"
8 "sort"
9 "strconv"
10 "strings"
11
12 "gitlab.com/Timfa/bluegit/internal/access"
13 "gitlab.com/Timfa/bluegit/internal/gitrepo"
14 "gitlab.com/Timfa/bluegit/internal/i18n"
15 "gitlab.com/Timfa/bluegit/internal/markdown"
16 "gitlab.com/Timfa/bluegit/internal/store"
17 "gitlab.com/Timfa/bluegit/internal/webhook"
18 )
19
20 // IssueBoard is de gegevensset voor de issuepagina's.
21 type IssueBoard struct {
22 List []IssueRow
23 One *IssueRow
24 Notes []IssueNoteRow
25 Labels []IssueChoice
26 Milestones []store.Milestone
27 People []IssueChoice
28 State string
29 Query string
30 Label string
31 Assignee string
32 Milestone string
33 Due string
34 FormTitle string
35 FormBody string
36 Confidential bool
37 CanCreate bool
38 CanTriage bool
39 CanEdit bool
40 CanClose bool
41 CanReopen bool
42 CanDelete bool
43 Relate int64
44 Related []IssueRow
45 }
46
47 // IssueChoice is een label of persoon in een formulier.
48 type IssueChoice struct {
49 Name string
50 Color string
51 On bool
52 }
53
54 // IssueRow is één issue in een lijst of op de detailpagina.
55 type IssueRow struct {
56 Number int64
57 Title string
58 Status string
59 Author string
60 Confidential bool
61 Milestone string
62 Due string
63 When string
64 Assignees string
65 Labels []store.Label
66 HTML template.HTML
67 }
68
69 // IssueNoteRow is een gerenderde reactie.
70 type IssueNoteRow struct {
71 Author string
72 When string
73 HTML template.HTML
74 }
75
76 var (
77 closeIssueRe = regexp.MustCompile(`(?i)(?:^|[\s:])((?:close[sd]?|fix(?:e[sd])?|resolve[sd]?|implement(?:s|ed)?))\s+#(\d+)\b`)
78 fenceRe = regexp.MustCompile("(?s)```.*?```")
79 inlineCodeRe = regexp.MustCompile("`[^`\n]*`")
80 )
81
82 func (s *Server) issuesPage(w http.ResponseWriter, r *http.Request) {
83 u, repo, role, ok := s.guard(w, r, access.RoleReadonly)
84 if !ok {
85 return
86 }
87 v := s.repoView(w, r, repo, role, "tab.issues")
88 v.Title = s.tr(r, "tab.issues")
89 v.Page = "issues"
90 v.Wide = true
91 b := s.issueBoard(r, repo, role, u)
92 state := r.URL.Query().Get("state")
93 if state != "closed" && state != "all" {
94 state = "open"
95 }
96 b.State = state
97 b.Query = strings.TrimSpace(r.URL.Query().Get("q"))
98 b.Label = strings.TrimSpace(r.URL.Query().Get("label"))
99 b.Assignee = strings.TrimSpace(r.URL.Query().Get("assignee"))
100 list, err := s.Store.ListIssues(r.Context(), repo.ID, store.IssueFilter{
101 State: b.State, Query: b.Query, Label: b.Label, Assignee: b.Assignee,
102 ViewerID: u.ID, Triage: role.CanTriageIssue(),
103 })
104 if err != nil {
105 s.fail(w, r, err)
106 return
107 }
108 for _, iss := range list {
109 b.List = append(b.List, s.issueRow(r, repo, iss))
110 }
111 v.Issues = b
112 s.render(w, "issues", v)
113 }
114
115 func (s *Server) newIssue(w http.ResponseWriter, r *http.Request) {
116 u, repo, role, ok := s.guard(w, r, access.RoleReadonly)
117 if !ok {
118 return
119 }
120 if u.ID == 0 || !role.CanCreateIssue() {
121 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
122 return
123 }
124 v := s.repoView(w, r, repo, role, "issue.new")
125 v.Title = s.tr(r, "issue.new")
126 v.Page = "issuenew"
127 v.Wide = true
128 b := s.issueBoard(r, repo, role, u)
129 s.prefillIssue(r, repo, u, role, b)
130 v.Issues = b
131 s.render(w, "issuenew", v)
132 }
133
134 func (s *Server) createIssue(w http.ResponseWriter, r *http.Request) {
135 u, repo, role, ok := s.guard(w, r, access.RoleReadonly)
136 if !ok || !s.csrfOK(w, r) {
137 return
138 }
139 back := repoURL(repo) + "/-/issues/new"
140 if u.ID == 0 || !role.CanCreateIssue() {
141 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
142 return
143 }
144 in := store.NewIssue{
145 Title: r.FormValue("title"),
146 Description: r.FormValue("description"),
147 Confidential: r.FormValue("confidential") == "1",
148 }
149 if triagePosted(r) {
150 if !role.CanTriageIssue() {
151 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
152 return
153 }
154 var err error
155 in.LabelIDs, in.AssigneeIDs, in.MilestoneID, in.DueOn, err = s.triageInput(r, repo)
156 if err != nil {
157 s.redirect(w, r, back, "", s.trErr(r, err))
158 return
159 }
160 }
161 iss, err := s.Store.CreateIssue(r.Context(), repo.ID, u.ID, in)
162 if err != nil {
163 s.redirect(w, r, back, "", s.trErr(r, err))
164 return
165 }
166 if rel, _ := strconv.ParseInt(r.FormValue("relate"), 10, 64); rel > 0 {
167 if other, err := s.Store.IssueByNumber(r.Context(), repo.ID, rel); err == nil && issueVisible(other, u, role) {
168 _ = s.Store.LinkIssues(r.Context(), repo.ID, iss.ID, other.ID)
169 }
170 }
171 s.issueHook(repo, iss.Number, u.Username, "opened", "")
172 s.redirect(w, r, issuePath(repo, iss.Number), s.tr(r, "flash.issueCreated"), "")
173 }
174
175 func (s *Server) showIssue(w http.ResponseWriter, r *http.Request) {
176 u, repo, role, ok := s.guard(w, r, access.RoleReadonly)
177 if !ok {
178 return
179 }
180 iss, ok := s.loadVisibleIssue(w, r, repo, u, role)
181 if !ok {
182 return
183 }
184 v := s.repoView(w, r, repo, role, "#"+strconv.FormatInt(iss.Number, 10))
185 v.Title = "#" + strconv.FormatInt(iss.Number, 10) + " " + iss.Title
186 v.Page = "issue"
187 v.Wide = true
188 b := s.issueBoard(r, repo, role, u)
189 row := s.issueRow(r, repo, iss)
190 b.One = &row
191 b.Confidential = iss.Confidential
192 b.Milestone = iss.Milestone
193 b.Due = iss.DueOn
194 b.FormTitle = iss.Title
195 b.FormBody = iss.Description
196 b.CanEdit = u.ID != 0 && (u.ID == iss.AuthorID || role.CanTriageIssue())
197 b.CanClose = iss.Status == "open" && b.CanEdit
198 b.CanReopen = iss.Status == "closed" && b.CanEdit
199 b.Labels = markChoices(b.Labels, labelNames(iss.Labels))
200 b.People = markChoices(b.People, iss.Assignees)
201 notes, _ := s.Store.ListIssueNotes(r.Context(), iss.ID)
202 for _, n := range notes {
203 b.Notes = append(b.Notes, IssueNoteRow{
204 Author: n.Author,
205 When: i18n.FormatDate(s.langOf(r), n.CreatedAt),
206 HTML: template.HTML(markdown.Render(n.Body, "", "", "/"+repo.FullPath())),
207 })
208 }
209 related, _ := s.Store.RelatedIssues(r.Context(), repo.ID, iss.ID)
210 for _, other := range related {
211 if issueVisible(other, u, role) {
212 b.Related = append(b.Related, s.issueRow(r, repo, other))
213 }
214 }
215 v.Issues = b
216 s.render(w, "issue", v)
217 }
218
219 func (s *Server) postIssue(w http.ResponseWriter, r *http.Request) {
220 u, repo, role, ok := s.guard(w, r, access.RoleReadonly)
221 if !ok || !s.csrfOK(w, r) {
222 return
223 }
224 iss, ok := s.loadVisibleIssue(w, r, repo, u, role)
225 if !ok {
226 return
227 }
228 back := issuePath(repo, iss.Number)
229 if u.ID == 0 {
230 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
231 return
232 }
233 switch r.FormValue("action") {
234 case "note":
235 if !role.CanCreateIssue() {
236 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
237 return
238 }
239 if _, err := s.Store.AddIssueNote(r.Context(), repo.ID, iss.ID, u.ID, r.FormValue("body")); err != nil {
240 s.redirect(w, r, back, "", s.trErr(r, err))
241 return
242 }
243 s.issueHook(repo, iss.Number, u.Username, "commented", strings.TrimSpace(r.FormValue("body")))
244 s.redirect(w, r, back, s.tr(r, "flash.note"), "")
245 case "close", "reopen":
246 if u.ID != iss.AuthorID && !role.CanTriageIssue() {
247 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
248 return
249 }
250 status := "closed"
251 flash := "flash.issueClosed"
252 action := "closed"
253 if r.FormValue("action") == "reopen" {
254 status, flash, action = "open", "flash.issueReopened", "reopened"
255 }
256 changed, err := s.Store.SetIssueState(r.Context(), iss.ID, status)
257 if err != nil {
258 s.redirect(w, r, back, "", s.trErr(r, err))
259 return
260 }
261 if changed {
262 s.issueHook(repo, iss.Number, u.Username, action, "")
263 }
264 s.redirect(w, r, back, s.tr(r, flash), "")
265 case "update":
266 if u.ID != iss.AuthorID && !role.CanTriageIssue() {
267 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
268 return
269 }
270 if err := s.Store.UpdateIssueText(r.Context(), iss.ID, r.FormValue("title"), r.FormValue("description")); err != nil {
271 s.redirect(w, r, back, "", s.trErr(r, err))
272 return
273 }
274 s.issueHook(repo, iss.Number, u.Username, "updated", "")
275 s.redirect(w, r, back, s.tr(r, "flash.issueUpdated"), "")
276 case "meta":
277 if !role.CanTriageIssue() {
278 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
279 return
280 }
281 labels, assignees, milestoneID, due, err := s.triageInput(r, repo)
282 if err != nil {
283 s.redirect(w, r, back, "", s.trErr(r, err))
284 return
285 }
286 if err := s.Store.SetIssueLabels(r.Context(), repo.ID, iss.ID, labels); err != nil {
287 s.redirect(w, r, back, "", s.trErr(r, err))
288 return
289 }
290 if err := s.Store.SetIssueAssignees(r.Context(), repo.ID, iss.ID, assignees); err != nil {
291 s.redirect(w, r, back, "", s.trErr(r, err))
292 return
293 }
294 if err := s.Store.SetIssueMeta(r.Context(), repo.ID, iss.ID, milestoneID, r.FormValue("confidential") == "1", due); err != nil {
295 s.redirect(w, r, back, "", s.trErr(r, err))
296 return
297 }
298 s.issueHook(repo, iss.Number, u.Username, "updated", "")
299 s.redirect(w, r, back, s.tr(r, "flash.issueUpdated"), "")
300 case "delete":
301 if !role.CanManageSettings() {
302 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
303 return
304 }
305 if err := s.Store.DeleteIssue(r.Context(), repo.ID, iss.ID); err != nil {
306 s.redirect(w, r, back, "", s.trErr(r, err))
307 return
308 }
309 s.redirect(w, r, repoURL(repo)+"/-/issues", s.tr(r, "flash.issueDeleted"), "")
310 default:
311 http.Error(w, s.tr(r, "err.badForm"), http.StatusBadRequest)
312 }
313 }
314
315 func (s *Server) createIssueLabel(w http.ResponseWriter, r *http.Request) {
316 u, repo, role, ok := s.guard(w, r, access.RoleReadonly)
317 if !ok || !s.csrfOK(w, r) {
318 return
319 }
320 if u.ID == 0 || !role.CanManageSettings() {
321 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
322 return
323 }
324 back := repoURL(repo) + "/-/issues"
325 if _, err := s.Store.UpsertLabel(r.Context(), repo.ID, r.FormValue("name"), r.FormValue("color")); err != nil {
326 s.redirect(w, r, back, "", s.trErr(r, err))
327 return
328 }
329 s.redirect(w, r, back, s.tr(r, "flash.label"), "")
330 }
331
332 func (s *Server) createIssueMilestone(w http.ResponseWriter, r *http.Request) {
333 u, repo, role, ok := s.guard(w, r, access.RoleReadonly)
334 if !ok || !s.csrfOK(w, r) {
335 return
336 }
337 if u.ID == 0 || !role.CanManageSettings() {
338 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
339 return
340 }
341 back := repoURL(repo) + "/-/issues"
342 if _, err := s.Store.UpsertMilestone(r.Context(), repo.ID, r.FormValue("title"), r.FormValue("due_on")); err != nil {
343 s.redirect(w, r, back, "", s.trErr(r, err))
344 return
345 }
346 s.redirect(w, r, back, s.tr(r, "flash.milestone"), "")
347 }
348
349 func (s *Server) loadVisibleIssue(w http.ResponseWriter, r *http.Request, repo store.Repo, u store.User, role access.Role) (store.Issue, bool) {
350 n, err := strconv.ParseInt(r.PathValue("number"), 10, 64)
351 if err != nil || n < 1 {
352 http.NotFound(w, r)
353 return store.Issue{}, false
354 }
355 iss, err := s.Store.IssueByNumber(r.Context(), repo.ID, n)
356 if err != nil || !issueVisible(iss, u, role) {
357 http.NotFound(w, r)
358 return store.Issue{}, false
359 }
360 return iss, true
361 }
362
363 func (s *Server) issueBoard(r *http.Request, repo store.Repo, role access.Role, u store.User) *IssueBoard {
364 labels, _ := s.Store.ListLabels(r.Context(), repo.ID)
365 miles, _ := s.Store.ListMilestones(r.Context(), repo.ID)
366 b := &IssueBoard{
367 Labels: []IssueChoice{},
368 Milestones: miles,
369 People: []IssueChoice{},
370 CanCreate: u.ID != 0 && role.CanCreateIssue(),
371 CanTriage: role.CanTriageIssue(),
372 CanDelete: role.CanManageSettings(),
373 }
374 if b.Milestones == nil {
375 b.Milestones = []store.Milestone{}
376 }
377 for _, l := range labels {
378 b.Labels = append(b.Labels, IssueChoice{Name: l.Name, Color: l.Color})
379 }
380 for _, p := range s.issueCandidates(r.Context(), repo) {
381 b.People = append(b.People, IssueChoice{Name: p.Username})
382 }
383 return b
384 }
385
386 func (s *Server) issueRow(r *http.Request, repo store.Repo, iss store.Issue) IssueRow {
387 return IssueRow{
388 Number: iss.Number, Title: iss.Title, Status: iss.Status, Author: iss.Author,
389 Confidential: iss.Confidential, Milestone: iss.Milestone, Due: iss.DueOn,
390 When: i18n.FormatDate(s.langOf(r), iss.CreatedAt), Assignees: strings.Join(iss.Assignees, ", "),
391 Labels: iss.Labels, HTML: template.HTML(markdown.Render(iss.Description, "", "", "/"+repo.FullPath())),
392 }
393 }
394
395 func (s *Server) prefillIssue(r *http.Request, repo store.Repo, u store.User, role access.Role, b *IssueBoard) {
396 if rel, err := strconv.ParseInt(r.URL.Query().Get("relate"), 10, 64); err == nil && rel > 0 {
397 if iss, err := s.Store.IssueByNumber(r.Context(), repo.ID, rel); err == nil && issueVisible(iss, u, role) {
398 b.Relate = rel
399 }
400 }
401 if r.URL.Query().Get("from") != "mr" {
402 return
403 }
404 n, err := strconv.ParseInt(r.URL.Query().Get("mr"), 10, 64)
405 if err != nil || n < 1 {
406 return
407 }
408 mr, err := s.Store.MergeRequestByNumber(r.Context(), repo.ID, n)
409 if err != nil {
410 return
411 }
412 ref := "!" + strconv.FormatInt(n, 10)
413 b.FormBody = ref
414 noteID, _ := strconv.ParseInt(r.URL.Query().Get("note"), 10, 64)
415 if noteID == 0 {
416 return
417 }
418 notes, err := s.Store.ListNotes(r.Context(), mr.ID)
419 if err != nil {
420 return
421 }
422 for _, note := range notes {
423 if note.ID == noteID {
424 b.FormBody = strings.TrimSpace(note.Body) + "\n\n" + ref
425 return
426 }
427 }
428 }
429
430 func (s *Server) issueCandidates(ctx context.Context, repo store.Repo) []store.Member {
431 seen := map[string]store.Member{}
432 add := func(list []store.Member) {
433 for _, m := range list {
434 if m.Pending || m.UserID == 0 || m.Username == "" {
435 continue
436 }
437 seen[m.Username] = m
438 }
439 }
440 if repo.OwnerKind == "user" {
441 if u, err := s.Store.UserByID(ctx, repo.OwnerID); err == nil {
442 seen[u.Username] = store.Member{UserID: u.ID, Username: u.Username, Role: access.RoleMaintainer}
443 }
444 }
445 if members, err := s.Store.ListMembers(ctx, "repo", repo.ID); err == nil {
446 add(members)
447 }
448 if repo.OwnerKind == "group" {
449 if members, err := s.Store.ListMembers(ctx, "group", repo.OwnerID); err == nil {
450 add(members)
451 }
452 }
453 out := make([]store.Member, 0, len(seen))
454 for _, m := range seen {
455 out = append(out, m)
456 }
457 sort.Slice(out, func(i, j int) bool { return out[i].Username < out[j].Username })
458 return out
459 }
460
461 func (s *Server) triageInput(r *http.Request, repo store.Repo) (labels, assignees []int64, milestoneID int64, due string, err error) {
462 labels, err = s.resolveLabels(r.Context(), repo.ID, r.Form["label"])
463 if err != nil {
464 return nil, nil, 0, "", err
465 }
466 assignees, err = s.resolveAssignees(r.Context(), repo, r.Form["assignee"])
467 if err != nil {
468 return nil, nil, 0, "", err
469 }
470 milestoneID, err = s.resolveMilestone(r.Context(), repo.ID, r.FormValue("milestone"))
471 if err != nil {
472 return nil, nil, 0, "", err
473 }
474 due = strings.TrimSpace(r.FormValue("due_on"))
475 if err := store.ValidDue(due); err != nil {
476 return nil, nil, 0, "", err
477 }
478 return labels, assignees, milestoneID, due, nil
479 }
480
481 func (s *Server) resolveLabels(ctx context.Context, repoID int64, names []string) ([]int64, error) {
482 ids := []int64{}
483 seen := map[int64]bool{}
484 for _, name := range names {
485 name = strings.TrimSpace(name)
486 if name == "" {
487 continue
488 }
489 if err := store.ValidLabelName(name); err != nil {
490 return nil, err
491 }
492 lab, err := s.Store.LabelByName(ctx, repoID, name)
493 if err != nil {
494 return nil, i18n.E("err.labelMissing", name)
495 }
496 if seen[lab.ID] {
497 continue
498 }
499 seen[lab.ID] = true
500 ids = append(ids, lab.ID)
501 }
502 return ids, nil
503 }
504
505 func (s *Server) resolveAssignees(ctx context.Context, repo store.Repo, names []string) ([]int64, error) {
506 cand := map[string]int64{}
507 for _, m := range s.issueCandidates(ctx, repo) {
508 cand[m.Username] = m.UserID
509 }
510 ids := []int64{}
511 seen := map[int64]bool{}
512 for _, name := range names {
513 name = strings.ToLower(strings.TrimSpace(strings.TrimPrefix(name, "@")))
514 if name == "" {
515 continue
516 }
517 id, ok := cand[name]
518 if !ok {
519 return nil, i18n.E("err.assignee", name)
520 }
521 if seen[id] {
522 continue
523 }
524 seen[id] = true
525 ids = append(ids, id)
526 }
527 return ids, nil
528 }
529
530 func (s *Server) resolveMilestone(ctx context.Context, repoID int64, title string) (int64, error) {
531 title = strings.TrimSpace(title)
532 if title == "" {
533 return 0, nil
534 }
535 m, err := s.Store.MilestoneByTitle(ctx, repoID, title)
536 if err != nil {
537 return 0, i18n.E("err.milestone")
538 }
539 return m.ID, nil
540 }
541
542 func (s *Server) issueHook(repo store.Repo, number int64, actor, action, comment string) {
543 if s.Store == nil {
544 return
545 }
546 iss, err := s.Store.IssueByNumber(context.Background(), repo.ID, number)
547 if err != nil {
548 return
549 }
550 num := strconv.FormatInt(iss.Number, 10)
551 page := strings.TrimRight(s.Cfg.BaseURL, "/") + issuePath(repo, iss.Number)
552 key := "hook.issueOpened"
553 switch action {
554 case "updated":
555 key = "hook.issueUpdated"
556 case "closed":
557 key = "hook.issueClosed"
558 case "reopened":
559 key = "hook.issueReopened"
560 case "commented":
561 key = "hook.issueComment"
562 }
563 summary := i18n.T(i18n.EN, key, num)
564 if action != "commented" {
565 summary = i18n.T(i18n.EN, key, num, iss.Title)
566 }
567 s.Dispatch(repo.ID, webhook.Event{
568 Type: webhook.EventIssue, Project: repo.FullPath(), Actor: actor,
569 Summary: summary, URL: page, Comment: comment,
570 Issue: &webhook.IssueInfo{
571 ID: iss.Number, Title: iss.Title, Description: iss.Description,
572 Status: iss.Status, Confidential: iss.Confidential, Author: iss.Author,
573 Assignees: iss.Assignees, Labels: labelNames(iss.Labels),
574 Milestone: iss.Milestone, DueDate: iss.DueOn, Action: action, URL: page,
575 },
576 })
577 }
578
579 func (s *Server) closeIssueNumbers(ctx context.Context, repo store.Repo, actor store.User, numbers []int64) {
580 if s.Store == nil {
581 return
582 }
583 for _, n := range numbers {
584 iss, err := s.Store.IssueByNumber(ctx, repo.ID, n)
585 if err != nil || iss.Status == "closed" {
586 continue
587 }
588 changed, err := s.Store.SetIssueState(ctx, iss.ID, "closed")
589 if err != nil || !changed {
590 continue
591 }
592 s.issueHook(repo, n, actor.Username, "closed", "")
593 }
594 }
595
596 func (s *Server) mergeCloseTexts(r *http.Request, repo store.Repo, mr store.MergeRequest) []string {
597 texts := []string{mr.Description}
598 if s.StoragePath() == "" {
599 return texts
600 }
601 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
602 commits, err := gitrepo.RangeLog(r.Context(), s.Git, dir, mr.TargetBranch, mr.SourceBranch)
603 if err != nil {
604 return texts
605 }
606 for i, c := range commits {
607 if i >= 50 {
608 break
609 }
610 texts = append(texts, commitText(c))
611 }
612 return texts
613 }
614
615 func (s *Server) closeIssuesOnPush(repo store.Repo, user store.User, before, after string) {
616 if s.Store == nil || s.StoragePath() == "" {
617 return
618 }
619 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
620 commits, err := gitrepo.RangeLog(context.Background(), s.Git, dir, before, after)
621 if err != nil {
622 return
623 }
624 var texts []string
625 for i, c := range commits {
626 if i >= 50 {
627 break
628 }
629 texts = append(texts, commitText(c))
630 }
631 s.closeIssueNumbers(context.Background(), repo, user, closingNumbers(texts...))
632 }
633
634 func closingNumbers(texts ...string) []int64 {
635 seen := map[int64]bool{}
636 var out []int64
637 for _, text := range texts {
638 text = fenceRe.ReplaceAllString(text, " ")
639 text = inlineCodeRe.ReplaceAllString(text, " ")
640 for _, m := range closeIssueRe.FindAllStringSubmatch(text, -1) {
641 n, err := strconv.ParseInt(m[2], 10, 64)
642 if err != nil || n < 1 || seen[n] {
643 continue
644 }
645 seen[n] = true
646 out = append(out, n)
647 }
648 }
649 return out
650 }
651
652 func issueVisible(iss store.Issue, u store.User, role access.Role) bool {
653 if !iss.Confidential {
654 return true
655 }
656 if role.CanTriageIssue() {
657 return true
658 }
659 return u.ID != 0 && u.ID == iss.AuthorID
660 }
661
662 func triagePosted(r *http.Request) bool {
663 if r.Form == nil {
664 return false
665 }
666 _, label := r.Form["label"]
667 _, assignee := r.Form["assignee"]
668 _, milestone := r.Form["milestone"]
669 _, due := r.Form["due_on"]
670 return label || assignee || milestone || due
671 }
672
673 func markChoices(list []IssueChoice, selected []string) []IssueChoice {
674 on := map[string]bool{}
675 for _, name := range selected {
676 on[name] = true
677 }
678 for i := range list {
679 list[i].On = on[list[i].Name]
680 }
681 return list
682 }
683
684 func labelNames(labels []store.Label) []string {
685 out := []string{}
686 for _, l := range labels {
687 out = append(out, l.Name)
688 }
689 return out
690 }
691
692 func issuePath(repo store.Repo, n int64) string {
693 return repoURL(repo) + "/-/issues/" + strconv.FormatInt(n, 10)
694 }
695
696 func (s *Server) fail(w http.ResponseWriter, r *http.Request, err error) {
697 http.Error(w, s.trErr(r, err), http.StatusInternalServerError)
698 }
@@ -0,0 +1,698 @@
1package server
2
3import (
4 "context"
5 "html/template"
6 "net/http"
7 "regexp"
8 "sort"
9 "strconv"
10 "strings"
11
12 "gitlab.com/Timfa/bluegit/internal/access"
13 "gitlab.com/Timfa/bluegit/internal/gitrepo"
14 "gitlab.com/Timfa/bluegit/internal/i18n"
15 "gitlab.com/Timfa/bluegit/internal/markdown"
16 "gitlab.com/Timfa/bluegit/internal/store"
17 "gitlab.com/Timfa/bluegit/internal/webhook"
18)
19
20// IssueBoard is de gegevensset voor de issuepagina's.
21type IssueBoard struct {
22 List []IssueRow
23 One *IssueRow
24 Notes []IssueNoteRow
25 Labels []IssueChoice
26 Milestones []store.Milestone
27 People []IssueChoice
28 State string
29 Query string
30 Label string
31 Assignee string
32 Milestone string
33 Due string
34 FormTitle string
35 FormBody string
36 Confidential bool
37 CanCreate bool
38 CanTriage bool
39 CanEdit bool
40 CanClose bool
41 CanReopen bool
42 CanDelete bool
43 Relate int64
44 Related []IssueRow
45}
46
47// IssueChoice is een label of persoon in een formulier.
48type IssueChoice struct {
49 Name string
50 Color string
51 On bool
52}
53
54// IssueRow is één issue in een lijst of op de detailpagina.
55type IssueRow struct {
56 Number int64
57 Title string
58 Status string
59 Author string
60 Confidential bool
61 Milestone string
62 Due string
63 When string
64 Assignees string
65 Labels []store.Label
66 HTML template.HTML
67}
68
69// IssueNoteRow is een gerenderde reactie.
70type IssueNoteRow struct {
71 Author string
72 When string
73 HTML template.HTML
74}
75
76var (
77 closeIssueRe = regexp.MustCompile(`(?i)(?:^|[\s:])((?:close[sd]?|fix(?:e[sd])?|resolve[sd]?|implement(?:s|ed)?))\s+#(\d+)\b`)
78 fenceRe = regexp.MustCompile("(?s)```.*?```")
79 inlineCodeRe = regexp.MustCompile("`[^`\n]*`")
80)
81
82func (s *Server) issuesPage(w http.ResponseWriter, r *http.Request) {
83 u, repo, role, ok := s.guard(w, r, access.RoleReadonly)
84 if !ok {
85 return
86 }
87 v := s.repoView(w, r, repo, role, "tab.issues")
88 v.Title = s.tr(r, "tab.issues")
89 v.Page = "issues"
90 v.Wide = true
91 b := s.issueBoard(r, repo, role, u)
92 state := r.URL.Query().Get("state")
93 if state != "closed" && state != "all" {
94 state = "open"
95 }
96 b.State = state
97 b.Query = strings.TrimSpace(r.URL.Query().Get("q"))
98 b.Label = strings.TrimSpace(r.URL.Query().Get("label"))
99 b.Assignee = strings.TrimSpace(r.URL.Query().Get("assignee"))
100 list, err := s.Store.ListIssues(r.Context(), repo.ID, store.IssueFilter{
101 State: b.State, Query: b.Query, Label: b.Label, Assignee: b.Assignee,
102 ViewerID: u.ID, Triage: role.CanTriageIssue(),
103 })
104 if err != nil {
105 s.fail(w, r, err)
106 return
107 }
108 for _, iss := range list {
109 b.List = append(b.List, s.issueRow(r, repo, iss))
110 }
111 v.Issues = b
112 s.render(w, "issues", v)
113}
114
115func (s *Server) newIssue(w http.ResponseWriter, r *http.Request) {
116 u, repo, role, ok := s.guard(w, r, access.RoleReadonly)
117 if !ok {
118 return
119 }
120 if u.ID == 0 || !role.CanCreateIssue() {
121 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
122 return
123 }
124 v := s.repoView(w, r, repo, role, "issue.new")
125 v.Title = s.tr(r, "issue.new")
126 v.Page = "issuenew"
127 v.Wide = true
128 b := s.issueBoard(r, repo, role, u)
129 s.prefillIssue(r, repo, u, role, b)
130 v.Issues = b
131 s.render(w, "issuenew", v)
132}
133
134func (s *Server) createIssue(w http.ResponseWriter, r *http.Request) {
135 u, repo, role, ok := s.guard(w, r, access.RoleReadonly)
136 if !ok || !s.csrfOK(w, r) {
137 return
138 }
139 back := repoURL(repo) + "/-/issues/new"
140 if u.ID == 0 || !role.CanCreateIssue() {
141 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
142 return
143 }
144 in := store.NewIssue{
145 Title: r.FormValue("title"),
146 Description: r.FormValue("description"),
147 Confidential: r.FormValue("confidential") == "1",
148 }
149 if triagePosted(r) {
150 if !role.CanTriageIssue() {
151 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
152 return
153 }
154 var err error
155 in.LabelIDs, in.AssigneeIDs, in.MilestoneID, in.DueOn, err = s.triageInput(r, repo)
156 if err != nil {
157 s.redirect(w, r, back, "", s.trErr(r, err))
158 return
159 }
160 }
161 iss, err := s.Store.CreateIssue(r.Context(), repo.ID, u.ID, in)
162 if err != nil {
163 s.redirect(w, r, back, "", s.trErr(r, err))
164 return
165 }
166 if rel, _ := strconv.ParseInt(r.FormValue("relate"), 10, 64); rel > 0 {
167 if other, err := s.Store.IssueByNumber(r.Context(), repo.ID, rel); err == nil && issueVisible(other, u, role) {
168 _ = s.Store.LinkIssues(r.Context(), repo.ID, iss.ID, other.ID)
169 }
170 }
171 s.issueHook(repo, iss.Number, u.Username, "opened", "")
172 s.redirect(w, r, issuePath(repo, iss.Number), s.tr(r, "flash.issueCreated"), "")
173}
174
175func (s *Server) showIssue(w http.ResponseWriter, r *http.Request) {
176 u, repo, role, ok := s.guard(w, r, access.RoleReadonly)
177 if !ok {
178 return
179 }
180 iss, ok := s.loadVisibleIssue(w, r, repo, u, role)
181 if !ok {
182 return
183 }
184 v := s.repoView(w, r, repo, role, "#"+strconv.FormatInt(iss.Number, 10))
185 v.Title = "#" + strconv.FormatInt(iss.Number, 10) + " " + iss.Title
186 v.Page = "issue"
187 v.Wide = true
188 b := s.issueBoard(r, repo, role, u)
189 row := s.issueRow(r, repo, iss)
190 b.One = &row
191 b.Confidential = iss.Confidential
192 b.Milestone = iss.Milestone
193 b.Due = iss.DueOn
194 b.FormTitle = iss.Title
195 b.FormBody = iss.Description
196 b.CanEdit = u.ID != 0 && (u.ID == iss.AuthorID || role.CanTriageIssue())
197 b.CanClose = iss.Status == "open" && b.CanEdit
198 b.CanReopen = iss.Status == "closed" && b.CanEdit
199 b.Labels = markChoices(b.Labels, labelNames(iss.Labels))
200 b.People = markChoices(b.People, iss.Assignees)
201 notes, _ := s.Store.ListIssueNotes(r.Context(), iss.ID)
202 for _, n := range notes {
203 b.Notes = append(b.Notes, IssueNoteRow{
204 Author: n.Author,
205 When: i18n.FormatDate(s.langOf(r), n.CreatedAt),
206 HTML: template.HTML(markdown.Render(n.Body, "", "", "/"+repo.FullPath())),
207 })
208 }
209 related, _ := s.Store.RelatedIssues(r.Context(), repo.ID, iss.ID)
210 for _, other := range related {
211 if issueVisible(other, u, role) {
212 b.Related = append(b.Related, s.issueRow(r, repo, other))
213 }
214 }
215 v.Issues = b
216 s.render(w, "issue", v)
217}
218
219func (s *Server) postIssue(w http.ResponseWriter, r *http.Request) {
220 u, repo, role, ok := s.guard(w, r, access.RoleReadonly)
221 if !ok || !s.csrfOK(w, r) {
222 return
223 }
224 iss, ok := s.loadVisibleIssue(w, r, repo, u, role)
225 if !ok {
226 return
227 }
228 back := issuePath(repo, iss.Number)
229 if u.ID == 0 {
230 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
231 return
232 }
233 switch r.FormValue("action") {
234 case "note":
235 if !role.CanCreateIssue() {
236 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
237 return
238 }
239 if _, err := s.Store.AddIssueNote(r.Context(), repo.ID, iss.ID, u.ID, r.FormValue("body")); err != nil {
240 s.redirect(w, r, back, "", s.trErr(r, err))
241 return
242 }
243 s.issueHook(repo, iss.Number, u.Username, "commented", strings.TrimSpace(r.FormValue("body")))
244 s.redirect(w, r, back, s.tr(r, "flash.note"), "")
245 case "close", "reopen":
246 if u.ID != iss.AuthorID && !role.CanTriageIssue() {
247 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
248 return
249 }
250 status := "closed"
251 flash := "flash.issueClosed"
252 action := "closed"
253 if r.FormValue("action") == "reopen" {
254 status, flash, action = "open", "flash.issueReopened", "reopened"
255 }
256 changed, err := s.Store.SetIssueState(r.Context(), iss.ID, status)
257 if err != nil {
258 s.redirect(w, r, back, "", s.trErr(r, err))
259 return
260 }
261 if changed {
262 s.issueHook(repo, iss.Number, u.Username, action, "")
263 }
264 s.redirect(w, r, back, s.tr(r, flash), "")
265 case "update":
266 if u.ID != iss.AuthorID && !role.CanTriageIssue() {
267 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
268 return
269 }
270 if err := s.Store.UpdateIssueText(r.Context(), iss.ID, r.FormValue("title"), r.FormValue("description")); err != nil {
271 s.redirect(w, r, back, "", s.trErr(r, err))
272 return
273 }
274 s.issueHook(repo, iss.Number, u.Username, "updated", "")
275 s.redirect(w, r, back, s.tr(r, "flash.issueUpdated"), "")
276 case "meta":
277 if !role.CanTriageIssue() {
278 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
279 return
280 }
281 labels, assignees, milestoneID, due, err := s.triageInput(r, repo)
282 if err != nil {
283 s.redirect(w, r, back, "", s.trErr(r, err))
284 return
285 }
286 if err := s.Store.SetIssueLabels(r.Context(), repo.ID, iss.ID, labels); err != nil {
287 s.redirect(w, r, back, "", s.trErr(r, err))
288 return
289 }
290 if err := s.Store.SetIssueAssignees(r.Context(), repo.ID, iss.ID, assignees); err != nil {
291 s.redirect(w, r, back, "", s.trErr(r, err))
292 return
293 }
294 if err := s.Store.SetIssueMeta(r.Context(), repo.ID, iss.ID, milestoneID, r.FormValue("confidential") == "1", due); err != nil {
295 s.redirect(w, r, back, "", s.trErr(r, err))
296 return
297 }
298 s.issueHook(repo, iss.Number, u.Username, "updated", "")
299 s.redirect(w, r, back, s.tr(r, "flash.issueUpdated"), "")
300 case "delete":
301 if !role.CanManageSettings() {
302 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
303 return
304 }
305 if err := s.Store.DeleteIssue(r.Context(), repo.ID, iss.ID); err != nil {
306 s.redirect(w, r, back, "", s.trErr(r, err))
307 return
308 }
309 s.redirect(w, r, repoURL(repo)+"/-/issues", s.tr(r, "flash.issueDeleted"), "")
310 default:
311 http.Error(w, s.tr(r, "err.badForm"), http.StatusBadRequest)
312 }
313}
314
315func (s *Server) createIssueLabel(w http.ResponseWriter, r *http.Request) {
316 u, repo, role, ok := s.guard(w, r, access.RoleReadonly)
317 if !ok || !s.csrfOK(w, r) {
318 return
319 }
320 if u.ID == 0 || !role.CanManageSettings() {
321 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
322 return
323 }
324 back := repoURL(repo) + "/-/issues"
325 if _, err := s.Store.UpsertLabel(r.Context(), repo.ID, r.FormValue("name"), r.FormValue("color")); err != nil {
326 s.redirect(w, r, back, "", s.trErr(r, err))
327 return
328 }
329 s.redirect(w, r, back, s.tr(r, "flash.label"), "")
330}
331
332func (s *Server) createIssueMilestone(w http.ResponseWriter, r *http.Request) {
333 u, repo, role, ok := s.guard(w, r, access.RoleReadonly)
334 if !ok || !s.csrfOK(w, r) {
335 return
336 }
337 if u.ID == 0 || !role.CanManageSettings() {
338 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
339 return
340 }
341 back := repoURL(repo) + "/-/issues"
342 if _, err := s.Store.UpsertMilestone(r.Context(), repo.ID, r.FormValue("title"), r.FormValue("due_on")); err != nil {
343 s.redirect(w, r, back, "", s.trErr(r, err))
344 return
345 }
346 s.redirect(w, r, back, s.tr(r, "flash.milestone"), "")
347}
348
349func (s *Server) loadVisibleIssue(w http.ResponseWriter, r *http.Request, repo store.Repo, u store.User, role access.Role) (store.Issue, bool) {
350 n, err := strconv.ParseInt(r.PathValue("number"), 10, 64)
351 if err != nil || n < 1 {
352 http.NotFound(w, r)
353 return store.Issue{}, false
354 }
355 iss, err := s.Store.IssueByNumber(r.Context(), repo.ID, n)
356 if err != nil || !issueVisible(iss, u, role) {
357 http.NotFound(w, r)
358 return store.Issue{}, false
359 }
360 return iss, true
361}
362
363func (s *Server) issueBoard(r *http.Request, repo store.Repo, role access.Role, u store.User) *IssueBoard {
364 labels, _ := s.Store.ListLabels(r.Context(), repo.ID)
365 miles, _ := s.Store.ListMilestones(r.Context(), repo.ID)
366 b := &IssueBoard{
367 Labels: []IssueChoice{},
368 Milestones: miles,
369 People: []IssueChoice{},
370 CanCreate: u.ID != 0 && role.CanCreateIssue(),
371 CanTriage: role.CanTriageIssue(),
372 CanDelete: role.CanManageSettings(),
373 }
374 if b.Milestones == nil {
375 b.Milestones = []store.Milestone{}
376 }
377 for _, l := range labels {
378 b.Labels = append(b.Labels, IssueChoice{Name: l.Name, Color: l.Color})
379 }
380 for _, p := range s.issueCandidates(r.Context(), repo) {
381 b.People = append(b.People, IssueChoice{Name: p.Username})
382 }
383 return b
384}
385
386func (s *Server) issueRow(r *http.Request, repo store.Repo, iss store.Issue) IssueRow {
387 return IssueRow{
388 Number: iss.Number, Title: iss.Title, Status: iss.Status, Author: iss.Author,
389 Confidential: iss.Confidential, Milestone: iss.Milestone, Due: iss.DueOn,
390 When: i18n.FormatDate(s.langOf(r), iss.CreatedAt), Assignees: strings.Join(iss.Assignees, ", "),
391 Labels: iss.Labels, HTML: template.HTML(markdown.Render(iss.Description, "", "", "/"+repo.FullPath())),
392 }
393}
394
395func (s *Server) prefillIssue(r *http.Request, repo store.Repo, u store.User, role access.Role, b *IssueBoard) {
396 if rel, err := strconv.ParseInt(r.URL.Query().Get("relate"), 10, 64); err == nil && rel > 0 {
397 if iss, err := s.Store.IssueByNumber(r.Context(), repo.ID, rel); err == nil && issueVisible(iss, u, role) {
398 b.Relate = rel
399 }
400 }
401 if r.URL.Query().Get("from") != "mr" {
402 return
403 }
404 n, err := strconv.ParseInt(r.URL.Query().Get("mr"), 10, 64)
405 if err != nil || n < 1 {
406 return
407 }
408 mr, err := s.Store.MergeRequestByNumber(r.Context(), repo.ID, n)
409 if err != nil {
410 return
411 }
412 ref := "!" + strconv.FormatInt(n, 10)
413 b.FormBody = ref
414 noteID, _ := strconv.ParseInt(r.URL.Query().Get("note"), 10, 64)
415 if noteID == 0 {
416 return
417 }
418 notes, err := s.Store.ListNotes(r.Context(), mr.ID)
419 if err != nil {
420 return
421 }
422 for _, note := range notes {
423 if note.ID == noteID {
424 b.FormBody = strings.TrimSpace(note.Body) + "\n\n" + ref
425 return
426 }
427 }
428}
429
430func (s *Server) issueCandidates(ctx context.Context, repo store.Repo) []store.Member {
431 seen := map[string]store.Member{}
432 add := func(list []store.Member) {
433 for _, m := range list {
434 if m.Pending || m.UserID == 0 || m.Username == "" {
435 continue
436 }
437 seen[m.Username] = m
438 }
439 }
440 if repo.OwnerKind == "user" {
441 if u, err := s.Store.UserByID(ctx, repo.OwnerID); err == nil {
442 seen[u.Username] = store.Member{UserID: u.ID, Username: u.Username, Role: access.RoleMaintainer}
443 }
444 }
445 if members, err := s.Store.ListMembers(ctx, "repo", repo.ID); err == nil {
446 add(members)
447 }
448 if repo.OwnerKind == "group" {
449 if members, err := s.Store.ListMembers(ctx, "group", repo.OwnerID); err == nil {
450 add(members)
451 }
452 }
453 out := make([]store.Member, 0, len(seen))
454 for _, m := range seen {
455 out = append(out, m)
456 }
457 sort.Slice(out, func(i, j int) bool { return out[i].Username < out[j].Username })
458 return out
459}
460
461func (s *Server) triageInput(r *http.Request, repo store.Repo) (labels, assignees []int64, milestoneID int64, due string, err error) {
462 labels, err = s.resolveLabels(r.Context(), repo.ID, r.Form["label"])
463 if err != nil {
464 return nil, nil, 0, "", err
465 }
466 assignees, err = s.resolveAssignees(r.Context(), repo, r.Form["assignee"])
467 if err != nil {
468 return nil, nil, 0, "", err
469 }
470 milestoneID, err = s.resolveMilestone(r.Context(), repo.ID, r.FormValue("milestone"))
471 if err != nil {
472 return nil, nil, 0, "", err
473 }
474 due = strings.TrimSpace(r.FormValue("due_on"))
475 if err := store.ValidDue(due); err != nil {
476 return nil, nil, 0, "", err
477 }
478 return labels, assignees, milestoneID, due, nil
479}
480
481func (s *Server) resolveLabels(ctx context.Context, repoID int64, names []string) ([]int64, error) {
482 ids := []int64{}
483 seen := map[int64]bool{}
484 for _, name := range names {
485 name = strings.TrimSpace(name)
486 if name == "" {
487 continue
488 }
489 if err := store.ValidLabelName(name); err != nil {
490 return nil, err
491 }
492 lab, err := s.Store.LabelByName(ctx, repoID, name)
493 if err != nil {
494 return nil, i18n.E("err.labelMissing", name)
495 }
496 if seen[lab.ID] {
497 continue
498 }
499 seen[lab.ID] = true
500 ids = append(ids, lab.ID)
501 }
502 return ids, nil
503}
504
505func (s *Server) resolveAssignees(ctx context.Context, repo store.Repo, names []string) ([]int64, error) {
506 cand := map[string]int64{}
507 for _, m := range s.issueCandidates(ctx, repo) {
508 cand[m.Username] = m.UserID
509 }
510 ids := []int64{}
511 seen := map[int64]bool{}
512 for _, name := range names {
513 name = strings.ToLower(strings.TrimSpace(strings.TrimPrefix(name, "@")))
514 if name == "" {
515 continue
516 }
517 id, ok := cand[name]
518 if !ok {
519 return nil, i18n.E("err.assignee", name)
520 }
521 if seen[id] {
522 continue
523 }
524 seen[id] = true
525 ids = append(ids, id)
526 }
527 return ids, nil
528}
529
530func (s *Server) resolveMilestone(ctx context.Context, repoID int64, title string) (int64, error) {
531 title = strings.TrimSpace(title)
532 if title == "" {
533 return 0, nil
534 }
535 m, err := s.Store.MilestoneByTitle(ctx, repoID, title)
536 if err != nil {
537 return 0, i18n.E("err.milestone")
538 }
539 return m.ID, nil
540}
541
542func (s *Server) issueHook(repo store.Repo, number int64, actor, action, comment string) {
543 if s.Store == nil {
544 return
545 }
546 iss, err := s.Store.IssueByNumber(context.Background(), repo.ID, number)
547 if err != nil {
548 return
549 }
550 num := strconv.FormatInt(iss.Number, 10)
551 page := strings.TrimRight(s.Cfg.BaseURL, "/") + issuePath(repo, iss.Number)
552 key := "hook.issueOpened"
553 switch action {
554 case "updated":
555 key = "hook.issueUpdated"
556 case "closed":
557 key = "hook.issueClosed"
558 case "reopened":
559 key = "hook.issueReopened"
560 case "commented":
561 key = "hook.issueComment"
562 }
563 summary := i18n.T(i18n.EN, key, num)
564 if action != "commented" {
565 summary = i18n.T(i18n.EN, key, num, iss.Title)
566 }
567 s.Dispatch(repo.ID, webhook.Event{
568 Type: webhook.EventIssue, Project: repo.FullPath(), Actor: actor,
569 Summary: summary, URL: page, Comment: comment,
570 Issue: &webhook.IssueInfo{
571 ID: iss.Number, Title: iss.Title, Description: iss.Description,
572 Status: iss.Status, Confidential: iss.Confidential, Author: iss.Author,
573 Assignees: iss.Assignees, Labels: labelNames(iss.Labels),
574 Milestone: iss.Milestone, DueDate: iss.DueOn, Action: action, URL: page,
575 },
576 })
577}
578
579func (s *Server) closeIssueNumbers(ctx context.Context, repo store.Repo, actor store.User, numbers []int64) {
580 if s.Store == nil {
581 return
582 }
583 for _, n := range numbers {
584 iss, err := s.Store.IssueByNumber(ctx, repo.ID, n)
585 if err != nil || iss.Status == "closed" {
586 continue
587 }
588 changed, err := s.Store.SetIssueState(ctx, iss.ID, "closed")
589 if err != nil || !changed {
590 continue
591 }
592 s.issueHook(repo, n, actor.Username, "closed", "")
593 }
594}
595
596func (s *Server) mergeCloseTexts(r *http.Request, repo store.Repo, mr store.MergeRequest) []string {
597 texts := []string{mr.Description}
598 if s.StoragePath() == "" {
599 return texts
600 }
601 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
602 commits, err := gitrepo.RangeLog(r.Context(), s.Git, dir, mr.TargetBranch, mr.SourceBranch)
603 if err != nil {
604 return texts
605 }
606 for i, c := range commits {
607 if i >= 50 {
608 break
609 }
610 texts = append(texts, commitText(c))
611 }
612 return texts
613}
614
615func (s *Server) closeIssuesOnPush(repo store.Repo, user store.User, before, after string) {
616 if s.Store == nil || s.StoragePath() == "" {
617 return
618 }
619 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
620 commits, err := gitrepo.RangeLog(context.Background(), s.Git, dir, before, after)
621 if err != nil {
622 return
623 }
624 var texts []string
625 for i, c := range commits {
626 if i >= 50 {
627 break
628 }
629 texts = append(texts, commitText(c))
630 }
631 s.closeIssueNumbers(context.Background(), repo, user, closingNumbers(texts...))
632}
633
634func closingNumbers(texts ...string) []int64 {
635 seen := map[int64]bool{}
636 var out []int64
637 for _, text := range texts {
638 text = fenceRe.ReplaceAllString(text, " ")
639 text = inlineCodeRe.ReplaceAllString(text, " ")
640 for _, m := range closeIssueRe.FindAllStringSubmatch(text, -1) {
641 n, err := strconv.ParseInt(m[2], 10, 64)
642 if err != nil || n < 1 || seen[n] {
643 continue
644 }
645 seen[n] = true
646 out = append(out, n)
647 }
648 }
649 return out
650}
651
652func issueVisible(iss store.Issue, u store.User, role access.Role) bool {
653 if !iss.Confidential {
654 return true
655 }
656 if role.CanTriageIssue() {
657 return true
658 }
659 return u.ID != 0 && u.ID == iss.AuthorID
660}
661
662func triagePosted(r *http.Request) bool {
663 if r.Form == nil {
664 return false
665 }
666 _, label := r.Form["label"]
667 _, assignee := r.Form["assignee"]
668 _, milestone := r.Form["milestone"]
669 _, due := r.Form["due_on"]
670 return label || assignee || milestone || due
671}
672
673func markChoices(list []IssueChoice, selected []string) []IssueChoice {
674 on := map[string]bool{}
675 for _, name := range selected {
676 on[name] = true
677 }
678 for i := range list {
679 list[i].On = on[list[i].Name]
680 }
681 return list
682}
683
684func labelNames(labels []store.Label) []string {
685 out := []string{}
686 for _, l := range labels {
687 out = append(out, l.Name)
688 }
689 return out
690}
691
692func issuePath(repo store.Repo, n int64) string {
693 return repoURL(repo) + "/-/issues/" + strconv.FormatInt(n, 10)
694}
695
696func (s *Server) fail(w http.ResponseWriter, r *http.Request, err error) {
697 http.Error(w, s.trErr(r, err), http.StatusInternalServerError)
698}
internal/server/issues_api.go added +455 −0
@@ -0,0 +1,455 @@
1 package server
2
3 import (
4 "encoding/json"
5 "io"
6 "net/http"
7 "strconv"
8 "strings"
9 "time"
10
11 "gitlab.com/Timfa/bluegit/internal/access"
12 "gitlab.com/Timfa/bluegit/internal/store"
13 )
14
15 type issueWrite struct {
16 Title *string `json:"title"`
17 Description *string `json:"description"`
18 State *string `json:"state"`
19 Confidential *bool `json:"confidential"`
20 Labels *[]string `json:"labels"`
21 Assignees *[]string `json:"assignees"`
22 Milestone *string `json:"milestone"`
23 DueDate *string `json:"due_date"`
24 }
25
26 func (s *Server) issuesAPI(w http.ResponseWriter, r *http.Request) {
27 write := r.Method == http.MethodPost
28 u, repo, role, ok := s.issueAuth(w, r, write)
29 if !ok {
30 return
31 }
32 if r.Method == http.MethodGet {
33 state := r.URL.Query().Get("state")
34 if state != "closed" && state != "all" {
35 state = "open"
36 }
37 list, err := s.Store.ListIssues(r.Context(), repo.ID, store.IssueFilter{
38 State: state, Query: r.URL.Query().Get("q"), Label: r.URL.Query().Get("label"),
39 Assignee: r.URL.Query().Get("assignee"), ViewerID: u.ID, Triage: role.CanTriageIssue(),
40 })
41 if err != nil {
42 s.fail(w, r, err)
43 return
44 }
45 out := make([]any, 0, len(list))
46 for _, iss := range list {
47 out = append(out, s.issueJSON(repo, iss, nil))
48 }
49 writeJSON(w, http.StatusOK, map[string]any{"issues": out})
50 return
51 }
52 if !role.CanCreateIssue() {
53 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
54 return
55 }
56 var req issueWrite
57 if !s.readJSON(w, r, &req) {
58 return
59 }
60 if req.Title == nil || strings.TrimSpace(*req.Title) == "" {
61 http.Error(w, s.tr(r, "err.issueTitle"), http.StatusBadRequest)
62 return
63 }
64 in := store.NewIssue{Title: *req.Title}
65 if req.Description != nil {
66 in.Description = *req.Description
67 }
68 if req.Confidential != nil {
69 in.Confidential = *req.Confidential
70 }
71 if req.Labels != nil || req.Assignees != nil || req.Milestone != nil || req.DueDate != nil {
72 if !role.CanTriageIssue() {
73 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
74 return
75 }
76 if err := s.applyIssueWrite(r, repo, &in, req); err != nil {
77 http.Error(w, s.trErr(r, err), http.StatusBadRequest)
78 return
79 }
80 }
81 iss, err := s.Store.CreateIssue(r.Context(), repo.ID, u.ID, in)
82 if err != nil {
83 http.Error(w, s.trErr(r, err), http.StatusBadRequest)
84 return
85 }
86 s.issueHook(repo, iss.Number, u.Username, "opened", "")
87 notes, _ := s.Store.ListIssueNotes(r.Context(), iss.ID)
88 writeJSON(w, http.StatusCreated, s.issueJSON(repo, iss, notes))
89 }
90
91 func (s *Server) issueAPI(w http.ResponseWriter, r *http.Request) {
92 write := r.Method != http.MethodGet
93 u, repo, role, ok := s.issueAuth(w, r, write)
94 if !ok {
95 return
96 }
97 n, err := strconv.ParseInt(r.PathValue("number"), 10, 64)
98 if err != nil || n < 1 {
99 http.NotFound(w, r)
100 return
101 }
102 iss, err := s.Store.IssueByNumber(r.Context(), repo.ID, n)
103 if err != nil || !issueVisible(iss, u, role) {
104 http.NotFound(w, r)
105 return
106 }
107 if r.Method == http.MethodGet {
108 notes, err := s.Store.ListIssueNotes(r.Context(), iss.ID)
109 if err != nil {
110 s.fail(w, r, err)
111 return
112 }
113 writeJSON(w, http.StatusOK, s.issueJSON(repo, iss, notes))
114 return
115 }
116 if r.Method == http.MethodDelete {
117 if !role.CanManageSettings() {
118 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
119 return
120 }
121 if err := s.Store.DeleteIssue(r.Context(), repo.ID, iss.ID); err != nil {
122 http.Error(w, s.trErr(r, err), http.StatusBadRequest)
123 return
124 }
125 w.WriteHeader(http.StatusNoContent)
126 return
127 }
128 if u.ID != iss.AuthorID && !role.CanTriageIssue() {
129 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
130 return
131 }
132 var req issueWrite
133 if !s.readJSON(w, r, &req) {
134 return
135 }
136 action := ""
137 if req.Title != nil || req.Description != nil {
138 title, desc := iss.Title, iss.Description
139 if req.Title != nil {
140 title = *req.Title
141 }
142 if req.Description != nil {
143 desc = *req.Description
144 }
145 if err := s.Store.UpdateIssueText(r.Context(), iss.ID, title, desc); err != nil {
146 http.Error(w, s.trErr(r, err), http.StatusBadRequest)
147 return
148 }
149 action = "updated"
150 }
151 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 {
157 ids, err := s.resolveLabels(r.Context(), repo.ID, *req.Labels)
158 if err != nil {
159 http.Error(w, s.trErr(r, err), http.StatusBadRequest)
160 return
161 }
162 if err := s.Store.SetIssueLabels(r.Context(), repo.ID, iss.ID, ids); err != nil {
163 http.Error(w, s.trErr(r, err), http.StatusBadRequest)
164 return
165 }
166 }
167 if req.Assignees != nil {
168 ids, err := s.resolveAssignees(r.Context(), repo, *req.Assignees)
169 if err != nil {
170 http.Error(w, s.trErr(r, err), http.StatusBadRequest)
171 return
172 }
173 if err := s.Store.SetIssueAssignees(r.Context(), repo.ID, iss.ID, ids); err != nil {
174 http.Error(w, s.trErr(r, err), http.StatusBadRequest)
175 return
176 }
177 }
178 if req.Milestone != nil || req.DueDate != nil || req.Confidential != nil {
179 mile, due, conf := iss.MilestoneID, iss.DueOn, iss.Confidential
180 if req.Milestone != nil {
181 id, err := s.resolveMilestone(r.Context(), repo.ID, *req.Milestone)
182 if err != nil {
183 http.Error(w, s.trErr(r, err), http.StatusBadRequest)
184 return
185 }
186 mile = id
187 }
188 if req.DueDate != nil {
189 due = *req.DueDate
190 }
191 if req.Confidential != nil {
192 conf = *req.Confidential
193 }
194 if err := s.Store.SetIssueMeta(r.Context(), repo.ID, iss.ID, mile, conf, due); err != nil {
195 http.Error(w, s.trErr(r, err), http.StatusBadRequest)
196 return
197 }
198 }
199 if action == "" {
200 action = "updated"
201 }
202 }
203 if req.State != nil {
204 if *req.State != "open" && *req.State != "closed" {
205 http.Error(w, s.tr(r, "err.issueState"), http.StatusBadRequest)
206 return
207 }
208 changed, err := s.Store.SetIssueState(r.Context(), iss.ID, *req.State)
209 if err != nil {
210 http.Error(w, s.trErr(r, err), http.StatusBadRequest)
211 return
212 }
213 if changed {
214 if *req.State == "closed" {
215 action = "closed"
216 } else {
217 action = "reopened"
218 }
219 }
220 }
221 fresh, err := s.Store.IssueByNumber(r.Context(), repo.ID, n)
222 if err != nil {
223 s.fail(w, r, err)
224 return
225 }
226 if action != "" {
227 comment := ""
228 s.issueHook(repo, fresh.Number, u.Username, action, comment)
229 }
230 notes, _ := s.Store.ListIssueNotes(r.Context(), fresh.ID)
231 writeJSON(w, http.StatusOK, s.issueJSON(repo, fresh, notes))
232 }
233
234 func (s *Server) issueNoteAPI(w http.ResponseWriter, r *http.Request) {
235 u, repo, role, ok := s.issueAuth(w, r, true)
236 if !ok {
237 return
238 }
239 if !role.CanCreateIssue() {
240 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
241 return
242 }
243 n, err := strconv.ParseInt(r.PathValue("number"), 10, 64)
244 if err != nil || n < 1 {
245 http.NotFound(w, r)
246 return
247 }
248 iss, err := s.Store.IssueByNumber(r.Context(), repo.ID, n)
249 if err != nil || !issueVisible(iss, u, role) {
250 http.NotFound(w, r)
251 return
252 }
253 var req struct {
254 Body string `json:"body"`
255 }
256 if !s.readJSON(w, r, &req) {
257 return
258 }
259 note, err := s.Store.AddIssueNote(r.Context(), repo.ID, iss.ID, u.ID, req.Body)
260 if err != nil {
261 http.Error(w, s.trErr(r, err), http.StatusBadRequest)
262 return
263 }
264 s.issueHook(repo, iss.Number, u.Username, "commented", note.Body)
265 writeJSON(w, http.StatusCreated, map[string]any{
266 "id": note.ID, "author": note.Author, "body": note.Body,
267 "created_at": note.CreatedAt.UTC().Format(time.RFC3339),
268 })
269 }
270
271 func (s *Server) labelsAPI(w http.ResponseWriter, r *http.Request) {
272 u, repo, role, ok := s.issueAuth(w, r, r.Method == http.MethodPost)
273 if !ok {
274 return
275 }
276 if r.Method == http.MethodGet {
277 list, err := s.Store.ListLabels(r.Context(), repo.ID)
278 if err != nil {
279 s.fail(w, r, err)
280 return
281 }
282 out := make([]any, 0, len(list))
283 for _, l := range list {
284 out = append(out, map[string]any{"id": l.ID, "name": l.Name, "color": l.Color})
285 }
286 writeJSON(w, http.StatusOK, map[string]any{"labels": out})
287 return
288 }
289 if u.ID == 0 || !role.CanManageSettings() {
290 http.Error(w, s.tr(r, "err.onlyAdmin"), http.StatusForbidden)
291 return
292 }
293 var req struct {
294 Name string `json:"name"`
295 Color string `json:"color"`
296 }
297 if !s.readJSON(w, r, &req) {
298 return
299 }
300 lab, err := s.Store.UpsertLabel(r.Context(), repo.ID, req.Name, req.Color)
301 if err != nil {
302 http.Error(w, s.trErr(r, err), http.StatusBadRequest)
303 return
304 }
305 writeJSON(w, http.StatusCreated, map[string]any{"id": lab.ID, "name": lab.Name, "color": lab.Color})
306 }
307
308 func (s *Server) milestonesAPI(w http.ResponseWriter, r *http.Request) {
309 u, repo, role, ok := s.issueAuth(w, r, r.Method == http.MethodPost)
310 if !ok {
311 return
312 }
313 if r.Method == http.MethodGet {
314 list, err := s.Store.ListMilestones(r.Context(), repo.ID)
315 if err != nil {
316 s.fail(w, r, err)
317 return
318 }
319 out := make([]any, 0, len(list))
320 for _, m := range list {
321 out = append(out, map[string]any{"id": m.ID, "title": m.Title, "due_on": m.DueOn, "state": m.State})
322 }
323 writeJSON(w, http.StatusOK, map[string]any{"milestones": out})
324 return
325 }
326 if u.ID == 0 || !role.CanManageSettings() {
327 http.Error(w, s.tr(r, "err.onlyAdmin"), http.StatusForbidden)
328 return
329 }
330 var req struct {
331 Title string `json:"title"`
332 DueOn string `json:"due_on"`
333 }
334 if !s.readJSON(w, r, &req) {
335 return
336 }
337 m, err := s.Store.UpsertMilestone(r.Context(), repo.ID, req.Title, req.DueOn)
338 if err != nil {
339 http.Error(w, s.trErr(r, err), http.StatusBadRequest)
340 return
341 }
342 writeJSON(w, http.StatusCreated, map[string]any{"id": m.ID, "title": m.Title, "due_on": m.DueOn, "state": m.State})
343 }
344
345 func (s *Server) applyIssueWrite(r *http.Request, repo store.Repo, in *store.NewIssue, req issueWrite) error {
346 if req.Labels != nil {
347 ids, err := s.resolveLabels(r.Context(), repo.ID, *req.Labels)
348 if err != nil {
349 return err
350 }
351 in.LabelIDs = ids
352 }
353 if req.Assignees != nil {
354 ids, err := s.resolveAssignees(r.Context(), repo, *req.Assignees)
355 if err != nil {
356 return err
357 }
358 in.AssigneeIDs = ids
359 }
360 if req.Milestone != nil {
361 id, err := s.resolveMilestone(r.Context(), repo.ID, *req.Milestone)
362 if err != nil {
363 return err
364 }
365 in.MilestoneID = id
366 }
367 if req.DueDate != nil {
368 in.DueOn = *req.DueDate
369 }
370 return nil
371 }
372
373 func (s *Server) issueAuth(w http.ResponseWriter, r *http.Request, write bool) (store.User, store.Repo, access.Role, bool) {
374 if s.Store == nil {
375 http.Error(w, s.noStorageText(r), http.StatusServiceUnavailable)
376 return store.User{}, store.Repo{}, "", false
377 }
378 repo, err := s.Store.RepoByPath(r.Context(), r.PathValue("owner"), r.PathValue("repo"))
379 if err != nil {
380 http.NotFound(w, r)
381 return store.User{}, store.Repo{}, "", false
382 }
383 token := bearer(r)
384 if token == "" {
385 http.Error(w, s.tr(r, "err.tokenAbsent"), http.StatusUnauthorized)
386 return store.User{}, store.Repo{}, "", false
387 }
388 if strings.HasPrefix(token, "bgj_") || !strings.HasPrefix(token, "bg_") {
389 http.Error(w, s.tr(r, "err.tokenBad"), http.StatusUnauthorized)
390 return store.User{}, store.Repo{}, "", false
391 }
392 u, err := s.Store.UserByToken(r.Context(), token)
393 if err != nil {
394 http.Error(w, s.tr(r, "err.tokenBad"), http.StatusUnauthorized)
395 return store.User{}, store.Repo{}, "", false
396 }
397 role, err := s.Store.EffectiveRole(r.Context(), u.ID, repo.ID)
398 if err != nil {
399 http.Error(w, s.tr(r, "err.rights"), http.StatusInternalServerError)
400 return store.User{}, store.Repo{}, "", false
401 }
402 if !write && !role.CanRead() && repo.Visibility != "public" {
403 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
404 return store.User{}, store.Repo{}, "", false
405 }
406 return u, repo, role, true
407 }
408
409 func (s *Server) readJSON(w http.ResponseWriter, r *http.Request, dst any) bool {
410 if err := json.NewDecoder(io.LimitReader(r.Body, 1<<20)).Decode(dst); err != nil {
411 http.Error(w, s.tr(r, "err.json"), http.StatusBadRequest)
412 return false
413 }
414 return true
415 }
416
417 func (s *Server) issueJSON(repo store.Repo, iss store.Issue, notes []store.IssueNote) map[string]any {
418 obj := map[string]any{
419 "id": iss.Number, "title": iss.Title, "description": iss.Description,
420 "status": iss.Status, "confidential": iss.Confidential, "author": iss.Author,
421 "assignees": nonNil(iss.Assignees), "labels": labelNames(iss.Labels),
422 "milestone": iss.Milestone, "due_date": iss.DueOn,
423 "created_at": iss.CreatedAt.UTC().Format(time.RFC3339),
424 "updated_at": iss.UpdatedAt.UTC().Format(time.RFC3339),
425 "web_url": strings.TrimRight(s.Cfg.BaseURL, "/") + issuePath(repo, iss.Number),
426 }
427 if !iss.ClosedAt.IsZero() {
428 obj["closed_at"] = iss.ClosedAt.UTC().Format(time.RFC3339)
429 }
430 if notes != nil {
431 arr := make([]any, 0, len(notes))
432 for _, n := range notes {
433 arr = append(arr, map[string]any{
434 "id": n.ID, "author": n.Author, "body": n.Body,
435 "created_at": n.CreatedAt.UTC().Format(time.RFC3339),
436 })
437 }
438 obj["notes"] = arr
439 }
440 return obj
441 }
442
443 func writeJSON(w http.ResponseWriter, status int, v any) {
444 w.Header().Set("Content-Type", "application/json; charset=utf-8")
445 w.Header().Set("Cache-Control", "no-store")
446 w.WriteHeader(status)
447 _ = json.NewEncoder(w).Encode(v)
448 }
449
450 func nonNil(s []string) []string {
451 if s == nil {
452 return []string{}
453 }
454 return s
455 }
@@ -0,0 +1,455 @@
1package server
2
3import (
4 "encoding/json"
5 "io"
6 "net/http"
7 "strconv"
8 "strings"
9 "time"
10
11 "gitlab.com/Timfa/bluegit/internal/access"
12 "gitlab.com/Timfa/bluegit/internal/store"
13)
14
15type issueWrite struct {
16 Title *string `json:"title"`
17 Description *string `json:"description"`
18 State *string `json:"state"`
19 Confidential *bool `json:"confidential"`
20 Labels *[]string `json:"labels"`
21 Assignees *[]string `json:"assignees"`
22 Milestone *string `json:"milestone"`
23 DueDate *string `json:"due_date"`
24}
25
26func (s *Server) issuesAPI(w http.ResponseWriter, r *http.Request) {
27 write := r.Method == http.MethodPost
28 u, repo, role, ok := s.issueAuth(w, r, write)
29 if !ok {
30 return
31 }
32 if r.Method == http.MethodGet {
33 state := r.URL.Query().Get("state")
34 if state != "closed" && state != "all" {
35 state = "open"
36 }
37 list, err := s.Store.ListIssues(r.Context(), repo.ID, store.IssueFilter{
38 State: state, Query: r.URL.Query().Get("q"), Label: r.URL.Query().Get("label"),
39 Assignee: r.URL.Query().Get("assignee"), ViewerID: u.ID, Triage: role.CanTriageIssue(),
40 })
41 if err != nil {
42 s.fail(w, r, err)
43 return
44 }
45 out := make([]any, 0, len(list))
46 for _, iss := range list {
47 out = append(out, s.issueJSON(repo, iss, nil))
48 }
49 writeJSON(w, http.StatusOK, map[string]any{"issues": out})
50 return
51 }
52 if !role.CanCreateIssue() {
53 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
54 return
55 }
56 var req issueWrite
57 if !s.readJSON(w, r, &req) {
58 return
59 }
60 if req.Title == nil || strings.TrimSpace(*req.Title) == "" {
61 http.Error(w, s.tr(r, "err.issueTitle"), http.StatusBadRequest)
62 return
63 }
64 in := store.NewIssue{Title: *req.Title}
65 if req.Description != nil {
66 in.Description = *req.Description
67 }
68 if req.Confidential != nil {
69 in.Confidential = *req.Confidential
70 }
71 if req.Labels != nil || req.Assignees != nil || req.Milestone != nil || req.DueDate != nil {
72 if !role.CanTriageIssue() {
73 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
74 return
75 }
76 if err := s.applyIssueWrite(r, repo, &in, req); err != nil {
77 http.Error(w, s.trErr(r, err), http.StatusBadRequest)
78 return
79 }
80 }
81 iss, err := s.Store.CreateIssue(r.Context(), repo.ID, u.ID, in)
82 if err != nil {
83 http.Error(w, s.trErr(r, err), http.StatusBadRequest)
84 return
85 }
86 s.issueHook(repo, iss.Number, u.Username, "opened", "")
87 notes, _ := s.Store.ListIssueNotes(r.Context(), iss.ID)
88 writeJSON(w, http.StatusCreated, s.issueJSON(repo, iss, notes))
89}
90
91func (s *Server) issueAPI(w http.ResponseWriter, r *http.Request) {
92 write := r.Method != http.MethodGet
93 u, repo, role, ok := s.issueAuth(w, r, write)
94 if !ok {
95 return
96 }
97 n, err := strconv.ParseInt(r.PathValue("number"), 10, 64)
98 if err != nil || n < 1 {
99 http.NotFound(w, r)
100 return
101 }
102 iss, err := s.Store.IssueByNumber(r.Context(), repo.ID, n)
103 if err != nil || !issueVisible(iss, u, role) {
104 http.NotFound(w, r)
105 return
106 }
107 if r.Method == http.MethodGet {
108 notes, err := s.Store.ListIssueNotes(r.Context(), iss.ID)
109 if err != nil {
110 s.fail(w, r, err)
111 return
112 }
113 writeJSON(w, http.StatusOK, s.issueJSON(repo, iss, notes))
114 return
115 }
116 if r.Method == http.MethodDelete {
117 if !role.CanManageSettings() {
118 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
119 return
120 }
121 if err := s.Store.DeleteIssue(r.Context(), repo.ID, iss.ID); err != nil {
122 http.Error(w, s.trErr(r, err), http.StatusBadRequest)
123 return
124 }
125 w.WriteHeader(http.StatusNoContent)
126 return
127 }
128 if u.ID != iss.AuthorID && !role.CanTriageIssue() {
129 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
130 return
131 }
132 var req issueWrite
133 if !s.readJSON(w, r, &req) {
134 return
135 }
136 action := ""
137 if req.Title != nil || req.Description != nil {
138 title, desc := iss.Title, iss.Description
139 if req.Title != nil {
140 title = *req.Title
141 }
142 if req.Description != nil {
143 desc = *req.Description
144 }
145 if err := s.Store.UpdateIssueText(r.Context(), iss.ID, title, desc); err != nil {
146 http.Error(w, s.trErr(r, err), http.StatusBadRequest)
147 return
148 }
149 action = "updated"
150 }
151 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 {
157 ids, err := s.resolveLabels(r.Context(), repo.ID, *req.Labels)
158 if err != nil {
159 http.Error(w, s.trErr(r, err), http.StatusBadRequest)
160 return
161 }
162 if err := s.Store.SetIssueLabels(r.Context(), repo.ID, iss.ID, ids); err != nil {
163 http.Error(w, s.trErr(r, err), http.StatusBadRequest)
164 return
165 }
166 }
167 if req.Assignees != nil {
168 ids, err := s.resolveAssignees(r.Context(), repo, *req.Assignees)
169 if err != nil {
170 http.Error(w, s.trErr(r, err), http.StatusBadRequest)
171 return
172 }
173 if err := s.Store.SetIssueAssignees(r.Context(), repo.ID, iss.ID, ids); err != nil {
174 http.Error(w, s.trErr(r, err), http.StatusBadRequest)
175 return
176 }
177 }
178 if req.Milestone != nil || req.DueDate != nil || req.Confidential != nil {
179 mile, due, conf := iss.MilestoneID, iss.DueOn, iss.Confidential
180 if req.Milestone != nil {
181 id, err := s.resolveMilestone(r.Context(), repo.ID, *req.Milestone)
182 if err != nil {
183 http.Error(w, s.trErr(r, err), http.StatusBadRequest)
184 return
185 }
186 mile = id
187 }
188 if req.DueDate != nil {
189 due = *req.DueDate
190 }
191 if req.Confidential != nil {
192 conf = *req.Confidential
193 }
194 if err := s.Store.SetIssueMeta(r.Context(), repo.ID, iss.ID, mile, conf, due); err != nil {
195 http.Error(w, s.trErr(r, err), http.StatusBadRequest)
196 return
197 }
198 }
199 if action == "" {
200 action = "updated"
201 }
202 }
203 if req.State != nil {
204 if *req.State != "open" && *req.State != "closed" {
205 http.Error(w, s.tr(r, "err.issueState"), http.StatusBadRequest)
206 return
207 }
208 changed, err := s.Store.SetIssueState(r.Context(), iss.ID, *req.State)
209 if err != nil {
210 http.Error(w, s.trErr(r, err), http.StatusBadRequest)
211 return
212 }
213 if changed {
214 if *req.State == "closed" {
215 action = "closed"
216 } else {
217 action = "reopened"
218 }
219 }
220 }
221 fresh, err := s.Store.IssueByNumber(r.Context(), repo.ID, n)
222 if err != nil {
223 s.fail(w, r, err)
224 return
225 }
226 if action != "" {
227 comment := ""
228 s.issueHook(repo, fresh.Number, u.Username, action, comment)
229 }
230 notes, _ := s.Store.ListIssueNotes(r.Context(), fresh.ID)
231 writeJSON(w, http.StatusOK, s.issueJSON(repo, fresh, notes))
232}
233
234func (s *Server) issueNoteAPI(w http.ResponseWriter, r *http.Request) {
235 u, repo, role, ok := s.issueAuth(w, r, true)
236 if !ok {
237 return
238 }
239 if !role.CanCreateIssue() {
240 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
241 return
242 }
243 n, err := strconv.ParseInt(r.PathValue("number"), 10, 64)
244 if err != nil || n < 1 {
245 http.NotFound(w, r)
246 return
247 }
248 iss, err := s.Store.IssueByNumber(r.Context(), repo.ID, n)
249 if err != nil || !issueVisible(iss, u, role) {
250 http.NotFound(w, r)
251 return
252 }
253 var req struct {
254 Body string `json:"body"`
255 }
256 if !s.readJSON(w, r, &req) {
257 return
258 }
259 note, err := s.Store.AddIssueNote(r.Context(), repo.ID, iss.ID, u.ID, req.Body)
260 if err != nil {
261 http.Error(w, s.trErr(r, err), http.StatusBadRequest)
262 return
263 }
264 s.issueHook(repo, iss.Number, u.Username, "commented", note.Body)
265 writeJSON(w, http.StatusCreated, map[string]any{
266 "id": note.ID, "author": note.Author, "body": note.Body,
267 "created_at": note.CreatedAt.UTC().Format(time.RFC3339),
268 })
269}
270
271func (s *Server) labelsAPI(w http.ResponseWriter, r *http.Request) {
272 u, repo, role, ok := s.issueAuth(w, r, r.Method == http.MethodPost)
273 if !ok {
274 return
275 }
276 if r.Method == http.MethodGet {
277 list, err := s.Store.ListLabels(r.Context(), repo.ID)
278 if err != nil {
279 s.fail(w, r, err)
280 return
281 }
282 out := make([]any, 0, len(list))
283 for _, l := range list {
284 out = append(out, map[string]any{"id": l.ID, "name": l.Name, "color": l.Color})
285 }
286 writeJSON(w, http.StatusOK, map[string]any{"labels": out})
287 return
288 }
289 if u.ID == 0 || !role.CanManageSettings() {
290 http.Error(w, s.tr(r, "err.onlyAdmin"), http.StatusForbidden)
291 return
292 }
293 var req struct {
294 Name string `json:"name"`
295 Color string `json:"color"`
296 }
297 if !s.readJSON(w, r, &req) {
298 return
299 }
300 lab, err := s.Store.UpsertLabel(r.Context(), repo.ID, req.Name, req.Color)
301 if err != nil {
302 http.Error(w, s.trErr(r, err), http.StatusBadRequest)
303 return
304 }
305 writeJSON(w, http.StatusCreated, map[string]any{"id": lab.ID, "name": lab.Name, "color": lab.Color})
306}
307
308func (s *Server) milestonesAPI(w http.ResponseWriter, r *http.Request) {
309 u, repo, role, ok := s.issueAuth(w, r, r.Method == http.MethodPost)
310 if !ok {
311 return
312 }
313 if r.Method == http.MethodGet {
314 list, err := s.Store.ListMilestones(r.Context(), repo.ID)
315 if err != nil {
316 s.fail(w, r, err)
317 return
318 }
319 out := make([]any, 0, len(list))
320 for _, m := range list {
321 out = append(out, map[string]any{"id": m.ID, "title": m.Title, "due_on": m.DueOn, "state": m.State})
322 }
323 writeJSON(w, http.StatusOK, map[string]any{"milestones": out})
324 return
325 }
326 if u.ID == 0 || !role.CanManageSettings() {
327 http.Error(w, s.tr(r, "err.onlyAdmin"), http.StatusForbidden)
328 return
329 }
330 var req struct {
331 Title string `json:"title"`
332 DueOn string `json:"due_on"`
333 }
334 if !s.readJSON(w, r, &req) {
335 return
336 }
337 m, err := s.Store.UpsertMilestone(r.Context(), repo.ID, req.Title, req.DueOn)
338 if err != nil {
339 http.Error(w, s.trErr(r, err), http.StatusBadRequest)
340 return
341 }
342 writeJSON(w, http.StatusCreated, map[string]any{"id": m.ID, "title": m.Title, "due_on": m.DueOn, "state": m.State})
343}
344
345func (s *Server) applyIssueWrite(r *http.Request, repo store.Repo, in *store.NewIssue, req issueWrite) error {
346 if req.Labels != nil {
347 ids, err := s.resolveLabels(r.Context(), repo.ID, *req.Labels)
348 if err != nil {
349 return err
350 }
351 in.LabelIDs = ids
352 }
353 if req.Assignees != nil {
354 ids, err := s.resolveAssignees(r.Context(), repo, *req.Assignees)
355 if err != nil {
356 return err
357 }
358 in.AssigneeIDs = ids
359 }
360 if req.Milestone != nil {
361 id, err := s.resolveMilestone(r.Context(), repo.ID, *req.Milestone)
362 if err != nil {
363 return err
364 }
365 in.MilestoneID = id
366 }
367 if req.DueDate != nil {
368 in.DueOn = *req.DueDate
369 }
370 return nil
371}
372
373func (s *Server) issueAuth(w http.ResponseWriter, r *http.Request, write bool) (store.User, store.Repo, access.Role, bool) {
374 if s.Store == nil {
375 http.Error(w, s.noStorageText(r), http.StatusServiceUnavailable)
376 return store.User{}, store.Repo{}, "", false
377 }
378 repo, err := s.Store.RepoByPath(r.Context(), r.PathValue("owner"), r.PathValue("repo"))
379 if err != nil {
380 http.NotFound(w, r)
381 return store.User{}, store.Repo{}, "", false
382 }
383 token := bearer(r)
384 if token == "" {
385 http.Error(w, s.tr(r, "err.tokenAbsent"), http.StatusUnauthorized)
386 return store.User{}, store.Repo{}, "", false
387 }
388 if strings.HasPrefix(token, "bgj_") || !strings.HasPrefix(token, "bg_") {
389 http.Error(w, s.tr(r, "err.tokenBad"), http.StatusUnauthorized)
390 return store.User{}, store.Repo{}, "", false
391 }
392 u, err := s.Store.UserByToken(r.Context(), token)
393 if err != nil {
394 http.Error(w, s.tr(r, "err.tokenBad"), http.StatusUnauthorized)
395 return store.User{}, store.Repo{}, "", false
396 }
397 role, err := s.Store.EffectiveRole(r.Context(), u.ID, repo.ID)
398 if err != nil {
399 http.Error(w, s.tr(r, "err.rights"), http.StatusInternalServerError)
400 return store.User{}, store.Repo{}, "", false
401 }
402 if !write && !role.CanRead() && repo.Visibility != "public" {
403 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
404 return store.User{}, store.Repo{}, "", false
405 }
406 return u, repo, role, true
407}
408
409func (s *Server) readJSON(w http.ResponseWriter, r *http.Request, dst any) bool {
410 if err := json.NewDecoder(io.LimitReader(r.Body, 1<<20)).Decode(dst); err != nil {
411 http.Error(w, s.tr(r, "err.json"), http.StatusBadRequest)
412 return false
413 }
414 return true
415}
416
417func (s *Server) issueJSON(repo store.Repo, iss store.Issue, notes []store.IssueNote) map[string]any {
418 obj := map[string]any{
419 "id": iss.Number, "title": iss.Title, "description": iss.Description,
420 "status": iss.Status, "confidential": iss.Confidential, "author": iss.Author,
421 "assignees": nonNil(iss.Assignees), "labels": labelNames(iss.Labels),
422 "milestone": iss.Milestone, "due_date": iss.DueOn,
423 "created_at": iss.CreatedAt.UTC().Format(time.RFC3339),
424 "updated_at": iss.UpdatedAt.UTC().Format(time.RFC3339),
425 "web_url": strings.TrimRight(s.Cfg.BaseURL, "/") + issuePath(repo, iss.Number),
426 }
427 if !iss.ClosedAt.IsZero() {
428 obj["closed_at"] = iss.ClosedAt.UTC().Format(time.RFC3339)
429 }
430 if notes != nil {
431 arr := make([]any, 0, len(notes))
432 for _, n := range notes {
433 arr = append(arr, map[string]any{
434 "id": n.ID, "author": n.Author, "body": n.Body,
435 "created_at": n.CreatedAt.UTC().Format(time.RFC3339),
436 })
437 }
438 obj["notes"] = arr
439 }
440 return obj
441}
442
443func writeJSON(w http.ResponseWriter, status int, v any) {
444 w.Header().Set("Content-Type", "application/json; charset=utf-8")
445 w.Header().Set("Cache-Control", "no-store")
446 w.WriteHeader(status)
447 _ = json.NewEncoder(w).Encode(v)
448}
449
450func nonNil(s []string) []string {
451 if s == nil {
452 return []string{}
453 }
454 return s
455}
internal/server/issues_test.go added +404 −0
@@ -0,0 +1,404 @@
1 package server
2
3 import (
4 "bytes"
5 "context"
6 "encoding/json"
7 "net/http"
8 "net/http/cookiejar"
9 "net/http/httptest"
10 "net/url"
11 "os/exec"
12 "path/filepath"
13 "strconv"
14 "strings"
15 "testing"
16 "time"
17
18 "gitlab.com/Timfa/bluegit/internal/access"
19 "gitlab.com/Timfa/bluegit/internal/auth"
20 "gitlab.com/Timfa/bluegit/internal/config"
21 "gitlab.com/Timfa/bluegit/internal/store"
22 )
23
24 func TestClosingPatterns(t *testing.T) {
25 got := closingNumbers("Closes #1", "please Fixes #2.", "```\nCloses #4\n```", "`Resolves #8`", "See #3", "Implements #2")
26 if len(got) != 2 || got[0] != 1 || got[1] != 2 {
27 t.Fatalf("nummers %v", got)
28 }
29 }
30
31 func TestIssues(t *testing.T) {
32 storage := t.TempDir()
33 st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())
34 if err != nil {
35 t.Fatal(err)
36 }
37 t.Cleanup(func() { _ = st.Close() })
38 cfg := config.Config{
39 BaseURL: "http://git.example", Listen: "127.0.0.1:0", StoragePath: storage,
40 Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test", BaseURL: "https://auth.timfalken.com"},
41 Git: config.Git{Binary: "git", DefaultBranch: "master"},
42 }
43 var bodies [][]byte
44 srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true"}
45 srv.hookSink = func(b []byte) { bodies = append(bodies, append([]byte(nil), b...)) }
46 ts := httptest.NewServer(srv.Handler())
47 t.Cleanup(ts.Close)
48
49 jar, _ := cookiejar.New(nil)
50 tim := &http.Client{Jar: jar}
51 page := read(t, mustGet(t, tim, ts.URL+"/login"))
52 page = read(t, mustPost(t, tim, ts.URL+"/new/repo", url.Values{
53 "csrf": {csrfOf(t, page)}, "name": {"bugs"}, "visibility": {"public"},
54 }))
55 ctx := context.Background()
56 repo, err := st.RepoByPath(ctx, "tim", "bugs")
57 if err != nil {
58 t.Fatal(err)
59 }
60 if _, err := st.CreateWebhook(ctx, store.Webhook{
61 ScopeKind: "repo", ScopeID: repo.ID, Name: "issues", Preset: "generic",
62 URLTemplate: "https://example.test/hook", Events: []string{"issue"},
63 }); err != nil {
64 t.Fatal(err)
65 }
66 page = read(t, mustPost(t, tim, ts.URL+"/settings/tokens", url.Values{"csrf": {csrfOf(t, page)}, "name": {"tim"}}))
67 timToken := between(page, `<p class="code">`, "</p>")
68
69 ro, err := st.UpsertUser(ctx, 3, "ro", "", false)
70 if err != nil {
71 t.Fatal(err)
72 }
73 rep, err := st.UpsertUser(ctx, 4, "rep", "", false)
74 if err != nil {
75 t.Fatal(err)
76 }
77 sam, err := st.UpsertUser(ctx, 5, "sam", "", false)
78 if err != nil {
79 t.Fatal(err)
80 }
81 dev, err := st.UpsertUser(ctx, 6, "dev", "", false)
82 if err != nil {
83 t.Fatal(err)
84 }
85 if err := st.SetMember(ctx, "repo", repo.ID, "ro", access.RoleReadonly); err != nil {
86 t.Fatal(err)
87 }
88 if err := st.SetMember(ctx, "repo", repo.ID, "rep", access.RoleReporter); err != nil {
89 t.Fatal(err)
90 }
91 if err := st.SetMember(ctx, "repo", repo.ID, "dev", access.RoleDeveloper); err != nil {
92 t.Fatal(err)
93 }
94 roToken, _ := st.CreateToken(ctx, ro.ID, "ro")
95 repToken, _ := st.CreateToken(ctx, rep.ID, "rep")
96 samToken, _ := st.CreateToken(ctx, sam.ID, "sam")
97 devToken, _ := st.CreateToken(ctx, dev.ID, "dev")
98
99 res := postJSON(t, http.MethodPost, ts.URL+"/api/v1/repos/tim/bugs/labels", timToken, map[string]any{"name": "bug", "color": "#428fdc"})
100 if res.StatusCode != http.StatusCreated {
101 t.Fatalf("label %d %s", res.StatusCode, read(t, res))
102 }
103 res.Body.Close()
104 res = postJSON(t, http.MethodPost, ts.URL+"/api/v1/repos/tim/bugs/milestones", timToken, map[string]any{"title": "v1", "due_on": "2026-11-01"})
105 if res.StatusCode != http.StatusCreated {
106 t.Fatalf("mijlpaal %d %s", res.StatusCode, read(t, res))
107 }
108 res.Body.Close()
109 res = postJSON(t, http.MethodPost, ts.URL+"/api/v1/repos/tim/bugs/labels", roToken, map[string]any{"name": "nope"})
110 if res.StatusCode != http.StatusForbidden {
111 t.Fatalf("readonly label %d", res.StatusCode)
112 }
113 res.Body.Close()
114
115 res = postJSON(t, http.MethodPost, ts.URL+"/api/v1/repos/tim/bugs/issues", roToken, map[string]any{"title": "Geheim", "labels": []string{"bug"}})
116 if res.StatusCode != http.StatusForbidden {
117 t.Fatalf("readonly labelen %d %s", res.StatusCode, read(t, res))
118 }
119 res.Body.Close()
120 noTok := postJSON(t, http.MethodPost, ts.URL+"/api/v1/repos/tim/bugs/issues", "", map[string]any{"title": "x"})
121 if noTok.StatusCode != http.StatusUnauthorized {
122 t.Fatalf("zonder token %d", noTok.StatusCode)
123 }
124 noTok.Body.Close()
125 jobTok := postJSON(t, http.MethodPost, ts.URL+"/api/v1/repos/tim/bugs/issues", "bgj_fake", map[string]any{"title": "x"})
126 if jobTok.StatusCode != http.StatusUnauthorized {
127 t.Fatalf("jobtoken %d", jobTok.StatusCode)
128 }
129 jobTok.Body.Close()
130
131 res = postJSON(t, http.MethodPost, ts.URL+"/api/v1/repos/tim/bugs/issues", roToken, map[string]any{
132 "title": "Geheim", "description": "niet delen", "confidential": true,
133 })
134 body := read(t, res)
135 if res.StatusCode != http.StatusCreated || !strings.Contains(body, `"id":1`) {
136 t.Fatalf("aanmaken %d %s", res.StatusCode, body)
137 }
138 opened := issuePayload(t, bodies, "opened")
139 if opened["comment"] != nil {
140 t.Fatalf("opened heeft comment %s", mustJSON(t, opened))
141 }
142 iss := opened["issue"].(map[string]any)
143 if iss["title"] != "Geheim" || iss["confidential"] != true || iss["author"] != "ro" {
144 t.Fatalf("payload %s", mustJSON(t, iss))
145 }
146
147 res = getBearer(t, ts.URL+"/api/v1/repos/tim/bugs/issues", samToken)
148 list := read(t, res)
149 if res.StatusCode != http.StatusOK || strings.Contains(list, "Geheim") {
150 t.Fatalf("vreemde lijst %d %s", res.StatusCode, list)
151 }
152 res = getBearer(t, ts.URL+"/api/v1/repos/tim/bugs/issues/1", samToken)
153 if res.StatusCode != http.StatusNotFound {
154 t.Fatalf("vreemde detail %d", res.StatusCode)
155 }
156 res.Body.Close()
157 anon := mustGet(t, http.DefaultClient, ts.URL+"/tim/bugs/-/issues/1")
158 if anon.StatusCode != http.StatusNotFound {
159 t.Fatalf("anoniem %d", anon.StatusCode)
160 }
161 anon.Body.Close()
162 res = getBearer(t, ts.URL+"/api/v1/repos/tim/bugs/issues/1", repToken)
163 if res.StatusCode != http.StatusOK || !strings.Contains(read(t, res), "Geheim") {
164 t.Fatal("reporter ziet het vertrouwelijke issue niet")
165 }
166
167 res = postJSON(t, http.MethodPut, ts.URL+"/api/v1/repos/tim/bugs/issues/1", repToken, map[string]any{
168 "labels": []string{"bug"}, "assignees": []string{"ro"}, "milestone": "v1", "due_date": "2026-12-01",
169 })
170 tagged := read(t, res)
171 if res.StatusCode != http.StatusOK || !strings.Contains(tagged, "bug") || !strings.Contains(tagged, "ro") || !strings.Contains(tagged, "v1") {
172 t.Fatalf("triage %d %s", res.StatusCode, tagged)
173 }
174 res = postJSON(t, http.MethodPut, ts.URL+"/api/v1/repos/tim/bugs/issues/1", devToken, map[string]any{"labels": []string{"bug"}})
175 if res.StatusCode != http.StatusOK {
176 t.Fatalf("developer %d %s", res.StatusCode, read(t, res))
177 }
178 res = postJSON(t, http.MethodPost, ts.URL+"/api/v1/repos/tim/bugs/issues/1/notes", roToken, map[string]any{"body": "zie !4"})
179 if res.StatusCode != http.StatusCreated {
180 t.Fatalf("reactie %d %s", res.StatusCode, read(t, res))
181 }
182 commented := issuePayload(t, bodies, "commented")
183 if commented["comment"] != "zie !4" {
184 t.Fatalf("comment %s", mustJSON(t, commented))
185 }
186
187 filtered := read(t, getBearer(t, ts.URL+"/api/v1/repos/tim/bugs/issues?state=open&label=bug&assignee=ro&q=geheim", repToken))
188 if !strings.Contains(filtered, `"id":1`) {
189 t.Fatalf("filter %s", filtered)
190 }
191
192 roJar, _ := cookiejar.New(nil)
193 roClient := &http.Client{Jar: roJar}
194 u, _ := url.Parse(ts.URL)
195 sess, err := st.CreateSession(ctx, ro.ID, "dev", time.Now().Add(time.Hour))
196 if err != nil {
197 t.Fatal(err)
198 }
199 roJar.SetCookies(u, []*http.Cookie{{Name: "bluegit_session", Value: sess.ID, Path: "/"}})
200 page = read(t, mustGet(t, roClient, ts.URL+"/tim/bugs/-/issues"))
201 if !strings.Contains(page, "Issues") || !strings.Contains(page, "#1") || !strings.Contains(page, "Geheim") || !strings.Contains(page, "bug") {
202 t.Fatalf("lijst\n%s", page)
203 }
204 page = read(t, mustGet(t, roClient, ts.URL+"/tim/bugs/-/issues/new?relate=1"))
205 if !strings.Contains(page, `name="relate"`) || !strings.Contains(page, "value=\"1\"") {
206 t.Fatalf("gerelateerd\n%s", page)
207 }
208 page = read(t, mustPost(t, roClient, ts.URL+"/tim/bugs/-/issues", url.Values{
209 "csrf": {csrfOf(t, page)}, "title": {"Tweede"}, "description": {"Zie #1 en !4"}, "relate": {"1"},
210 }))
211 if !strings.Contains(page, "#2") || !strings.Contains(page, `/tim/bugs/-/issues/1`) || !strings.Contains(page, `/tim/bugs/-/merge-requests/4`) {
212 t.Fatalf("tweede pagina\n%s", page)
213 }
214 if !strings.Contains(page, "#1 Tweede") && !strings.Contains(page, "#1") {
215 t.Fatal("koppeling ontbreekt")
216 }
217
218 mr, err := st.CreateMergeRequest(ctx, repo.ID, ro.ID, "Voorbeeld", "tekst", "topic", "master")
219 if err != nil {
220 t.Fatal(err)
221 }
222 note, err := st.AddNote(ctx, repo.ID, mr.ID, ro.ID, "dit hoort een issue")
223 if err != nil {
224 t.Fatal(err)
225 }
226 form := read(t, mustGet(t, roClient, ts.URL+"/tim/bugs/-/issues/new?from=mr&mr=1&note="+strconv.FormatInt(note.ID, 10)))
227 if !strings.Contains(form, "dit hoort een issue") || !strings.Contains(form, "!1") {
228 t.Fatalf("prefill\n%s", form)
229 }
230 prev := read(t, mustPost(t, roClient, ts.URL+"/tim/bugs/-/markdown", url.Values{
231 "csrf": {csrfOf(t, form)}, "body": {"zie #1 en !4"},
232 }))
233 if !strings.Contains(prev, `/tim/bugs/-/issues/1`) || !strings.Contains(prev, `/tim/bugs/-/merge-requests/4`) {
234 t.Fatalf("preview %s", prev)
235 }
236
237 res = postJSON(t, http.MethodPut, ts.URL+"/api/v1/repos/tim/bugs/issues/1", roToken, map[string]any{"state": "closed"})
238 if res.StatusCode != http.StatusOK || !strings.Contains(read(t, res), `"status":"closed"`) {
239 t.Fatal("sluiten faalde")
240 }
241 closed := issuePayload(t, bodies, "closed")
242 if closed["issue"].(map[string]any)["status"] != "closed" {
243 t.Fatalf("webhook sluiten %s", mustJSON(t, closed))
244 }
245 closedPage := read(t, mustGet(t, roClient, ts.URL+"/tim/bugs/-/issues?state=closed"))
246 if !strings.Contains(closedPage, "Geheim") || strings.Contains(closedPage, "Tweede") {
247 t.Fatalf("filter gesloten\n%s", closedPage)
248 }
249
250 info := read(t, mustGet(t, http.DefaultClient, ts.URL+"/-/info"))
251 for _, want := range []string{`id="issues"`, "Readonly may create issues", "Inloggen faalt", "/api/v1/repos/{owner}/{repo}/issues"} {
252 if !strings.Contains(info, want) {
253 t.Errorf("info mist %s", want)
254 }
255 }
256 }
257
258 func TestIssueClosesOnMerge(t *testing.T) {
259 if _, err := exec.LookPath("git"); err != nil {
260 t.Skip("git ontbreekt")
261 }
262 storage := t.TempDir()
263 st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())
264 if err != nil {
265 t.Fatal(err)
266 }
267 t.Cleanup(func() { _ = st.Close() })
268 cfg := config.Config{
269 BaseURL: "http://git.example", Listen: "127.0.0.1:0", StoragePath: storage,
270 Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test", BaseURL: "https://auth.timfalken.com"},
271 Git: config.Git{Binary: "git", DefaultBranch: "master"},
272 }
273 var bodies [][]byte
274 srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true"}
275 srv.hookSink = func(b []byte) { bodies = append(bodies, append([]byte(nil), b...)) }
276 ts := httptest.NewServer(srv.Handler())
277 t.Cleanup(ts.Close)
278 jar, _ := cookiejar.New(nil)
279 tim := &http.Client{Jar: jar}
280 page := read(t, mustGet(t, tim, ts.URL+"/login"))
281 page = read(t, mustPost(t, tim, ts.URL+"/new/repo", url.Values{
282 "csrf": {csrfOf(t, page)}, "name": {"bugs"}, "visibility": {"private"},
283 }))
284 page = read(t, mustPost(t, tim, ts.URL+"/settings/tokens", url.Values{"csrf": {csrfOf(t, page)}, "name": {"tim"}}))
285 token := between(page, `<p class="code">`, "</p>")
286 ctx := context.Background()
287 repo, err := st.RepoByPath(ctx, "tim", "bugs")
288 if err != nil {
289 t.Fatal(err)
290 }
291 if _, err := st.CreateWebhook(ctx, store.Webhook{
292 ScopeKind: "repo", ScopeID: repo.ID, Name: "issues", Preset: "generic",
293 URLTemplate: "https://example.test/hook", Events: []string{"issue"},
294 }); err != nil {
295 t.Fatal(err)
296 }
297 for _, title := range []string{"een", "twee", "drie"} {
298 res := postJSON(t, http.MethodPost, ts.URL+"/api/v1/repos/tim/bugs/issues", token, map[string]any{"title": title})
299 if res.StatusCode != http.StatusCreated {
300 t.Fatalf("issue %s %d %s", title, res.StatusCode, read(t, res))
301 }
302 res.Body.Close()
303 }
304 remote := strings.Replace(ts.URL, "http://", "http://tim:"+token+"@", 1) + "/tim/bugs.git"
305 work := t.TempDir()
306 git(t, work, "init", "-b", "master")
307 git(t, work, "config", "user.email", "tim@users.git.timfalken.com")
308 git(t, work, "config", "user.name", "tim")
309 writeFile(t, filepath.Join(work, "README.md"), "a\n")
310 git(t, work, "add", "README.md")
311 git(t, work, "commit", "-m", "start")
312 git(t, work, "remote", "add", "origin", remote)
313 git(t, work, "push", "-u", "origin", "master")
314 git(t, work, "checkout", "-b", "topic")
315 writeFile(t, filepath.Join(work, "extra.txt"), "c\n")
316 git(t, work, "add", "extra.txt")
317 git(t, work, "commit", "-m", "Fixes #1")
318 git(t, work, "push", "-u", "origin", "topic")
319
320 page = read(t, mustGet(t, tim, ts.URL+"/tim/bugs/-/merge-requests/new?source=topic&target=master"))
321 page = read(t, mustPost(t, tim, ts.URL+"/tim/bugs/-/merge-requests", url.Values{
322 "csrf": {csrfOf(t, page)}, "source": {"topic"}, "target": {"master"},
323 "title": {"Sluit issues"}, "description": {"Closes #2"},
324 }))
325 page = read(t, mustPost(t, tim, ts.URL+"/tim/bugs/-/merge-requests/1/notes", url.Values{
326 "csrf": {csrfOf(t, page)}, "body": {"dit wordt een issue"},
327 }))
328 if !strings.Contains(page, "/-/issues/new?from=mr") || !strings.Contains(page, "dit wordt een issue") {
329 t.Fatalf("mr-link ontbreekt\n%s", page[:min(800, len(page))])
330 }
331 page = read(t, mustPost(t, tim, ts.URL+"/tim/bugs/-/merge-requests/1/merge", url.Values{"csrf": {csrfOf(t, page)}}))
332 if !strings.Contains(page, "merged") && !strings.Contains(page, "samengevoegd") {
333 t.Fatalf("merge\n%s", page[:min(500, len(page))])
334 }
335 one := read(t, getBearer(t, ts.URL+"/api/v1/repos/tim/bugs/issues/1", token))
336 two := read(t, getBearer(t, ts.URL+"/api/v1/repos/tim/bugs/issues/2", token))
337 if !strings.Contains(one, `"status":"closed"`) || !strings.Contains(two, `"status":"closed"`) {
338 t.Fatalf("na merge\n1 %s\n2 %s", one, two)
339 }
340 foundClosed := 0
341 for _, raw := range bodies {
342 var doc map[string]any
343 if json.Unmarshal(raw, &doc) != nil || doc["object_kind"] != "issue" {
344 continue
345 }
346 iss, _ := doc["issue"].(map[string]any)
347 if iss != nil && iss["action"] == "closed" {
348 foundClosed++
349 }
350 }
351 if foundClosed < 2 {
352 t.Fatalf("webhooks gesloten %d", foundClosed)
353 }
354
355 git(t, work, "checkout", "master")
356 git(t, work, "pull", "--ff-only", "origin", "master")
357 writeFile(t, filepath.Join(work, "README.md"), "b\n")
358 git(t, work, "add", "README.md")
359 git(t, work, "commit", "-m", "Resolves #3")
360 git(t, work, "push", "origin", "master")
361 three := read(t, getBearer(t, ts.URL+"/api/v1/repos/tim/bugs/issues/3", token))
362 if !strings.Contains(three, `"status":"closed"`) {
363 t.Fatalf("push sluit niet %s", three)
364 }
365 }
366
367 func postJSON(t *testing.T, method, raw, token string, body any) *http.Response {
368 t.Helper()
369 var buf bytes.Buffer
370 if body != nil {
371 if err := json.NewEncoder(&buf).Encode(body); err != nil {
372 t.Fatal(err)
373 }
374 }
375 req, err := http.NewRequest(method, raw, &buf)
376 if err != nil {
377 t.Fatal(err)
378 }
379 if token != "" {
380 req.Header.Set("Authorization", "Bearer "+token)
381 }
382 req.Header.Set("Content-Type", "application/json")
383 res, err := http.DefaultClient.Do(req)
384 if err != nil {
385 t.Fatal(err)
386 }
387 return res
388 }
389
390 func issuePayload(t *testing.T, bodies [][]byte, action string) map[string]any {
391 t.Helper()
392 for i := len(bodies) - 1; i >= 0; i-- {
393 var doc map[string]any
394 if err := json.Unmarshal(bodies[i], &doc); err != nil {
395 continue
396 }
397 iss, _ := doc["issue"].(map[string]any)
398 if iss != nil && iss["action"] == action {
399 return doc
400 }
401 }
402 t.Fatalf("geen issue-actie %s", action)
403 return nil
404 }
@@ -0,0 +1,404 @@
1package server
2
3import (
4 "bytes"
5 "context"
6 "encoding/json"
7 "net/http"
8 "net/http/cookiejar"
9 "net/http/httptest"
10 "net/url"
11 "os/exec"
12 "path/filepath"
13 "strconv"
14 "strings"
15 "testing"
16 "time"
17
18 "gitlab.com/Timfa/bluegit/internal/access"
19 "gitlab.com/Timfa/bluegit/internal/auth"
20 "gitlab.com/Timfa/bluegit/internal/config"
21 "gitlab.com/Timfa/bluegit/internal/store"
22)
23
24func TestClosingPatterns(t *testing.T) {
25 got := closingNumbers("Closes #1", "please Fixes #2.", "```\nCloses #4\n```", "`Resolves #8`", "See #3", "Implements #2")
26 if len(got) != 2 || got[0] != 1 || got[1] != 2 {
27 t.Fatalf("nummers %v", got)
28 }
29}
30
31func TestIssues(t *testing.T) {
32 storage := t.TempDir()
33 st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())
34 if err != nil {
35 t.Fatal(err)
36 }
37 t.Cleanup(func() { _ = st.Close() })
38 cfg := config.Config{
39 BaseURL: "http://git.example", Listen: "127.0.0.1:0", StoragePath: storage,
40 Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test", BaseURL: "https://auth.timfalken.com"},
41 Git: config.Git{Binary: "git", DefaultBranch: "master"},
42 }
43 var bodies [][]byte
44 srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true"}
45 srv.hookSink = func(b []byte) { bodies = append(bodies, append([]byte(nil), b...)) }
46 ts := httptest.NewServer(srv.Handler())
47 t.Cleanup(ts.Close)
48
49 jar, _ := cookiejar.New(nil)
50 tim := &http.Client{Jar: jar}
51 page := read(t, mustGet(t, tim, ts.URL+"/login"))
52 page = read(t, mustPost(t, tim, ts.URL+"/new/repo", url.Values{
53 "csrf": {csrfOf(t, page)}, "name": {"bugs"}, "visibility": {"public"},
54 }))
55 ctx := context.Background()
56 repo, err := st.RepoByPath(ctx, "tim", "bugs")
57 if err != nil {
58 t.Fatal(err)
59 }
60 if _, err := st.CreateWebhook(ctx, store.Webhook{
61 ScopeKind: "repo", ScopeID: repo.ID, Name: "issues", Preset: "generic",
62 URLTemplate: "https://example.test/hook", Events: []string{"issue"},
63 }); err != nil {
64 t.Fatal(err)
65 }
66 page = read(t, mustPost(t, tim, ts.URL+"/settings/tokens", url.Values{"csrf": {csrfOf(t, page)}, "name": {"tim"}}))
67 timToken := between(page, `<p class="code">`, "</p>")
68
69 ro, err := st.UpsertUser(ctx, 3, "ro", "", false)
70 if err != nil {
71 t.Fatal(err)
72 }
73 rep, err := st.UpsertUser(ctx, 4, "rep", "", false)
74 if err != nil {
75 t.Fatal(err)
76 }
77 sam, err := st.UpsertUser(ctx, 5, "sam", "", false)
78 if err != nil {
79 t.Fatal(err)
80 }
81 dev, err := st.UpsertUser(ctx, 6, "dev", "", false)
82 if err != nil {
83 t.Fatal(err)
84 }
85 if err := st.SetMember(ctx, "repo", repo.ID, "ro", access.RoleReadonly); err != nil {
86 t.Fatal(err)
87 }
88 if err := st.SetMember(ctx, "repo", repo.ID, "rep", access.RoleReporter); err != nil {
89 t.Fatal(err)
90 }
91 if err := st.SetMember(ctx, "repo", repo.ID, "dev", access.RoleDeveloper); err != nil {
92 t.Fatal(err)
93 }
94 roToken, _ := st.CreateToken(ctx, ro.ID, "ro")
95 repToken, _ := st.CreateToken(ctx, rep.ID, "rep")
96 samToken, _ := st.CreateToken(ctx, sam.ID, "sam")
97 devToken, _ := st.CreateToken(ctx, dev.ID, "dev")
98
99 res := postJSON(t, http.MethodPost, ts.URL+"/api/v1/repos/tim/bugs/labels", timToken, map[string]any{"name": "bug", "color": "#428fdc"})
100 if res.StatusCode != http.StatusCreated {
101 t.Fatalf("label %d %s", res.StatusCode, read(t, res))
102 }
103 res.Body.Close()
104 res = postJSON(t, http.MethodPost, ts.URL+"/api/v1/repos/tim/bugs/milestones", timToken, map[string]any{"title": "v1", "due_on": "2026-11-01"})
105 if res.StatusCode != http.StatusCreated {
106 t.Fatalf("mijlpaal %d %s", res.StatusCode, read(t, res))
107 }
108 res.Body.Close()
109 res = postJSON(t, http.MethodPost, ts.URL+"/api/v1/repos/tim/bugs/labels", roToken, map[string]any{"name": "nope"})
110 if res.StatusCode != http.StatusForbidden {
111 t.Fatalf("readonly label %d", res.StatusCode)
112 }
113 res.Body.Close()
114
115 res = postJSON(t, http.MethodPost, ts.URL+"/api/v1/repos/tim/bugs/issues", roToken, map[string]any{"title": "Geheim", "labels": []string{"bug"}})
116 if res.StatusCode != http.StatusForbidden {
117 t.Fatalf("readonly labelen %d %s", res.StatusCode, read(t, res))
118 }
119 res.Body.Close()
120 noTok := postJSON(t, http.MethodPost, ts.URL+"/api/v1/repos/tim/bugs/issues", "", map[string]any{"title": "x"})
121 if noTok.StatusCode != http.StatusUnauthorized {
122 t.Fatalf("zonder token %d", noTok.StatusCode)
123 }
124 noTok.Body.Close()
125 jobTok := postJSON(t, http.MethodPost, ts.URL+"/api/v1/repos/tim/bugs/issues", "bgj_fake", map[string]any{"title": "x"})
126 if jobTok.StatusCode != http.StatusUnauthorized {
127 t.Fatalf("jobtoken %d", jobTok.StatusCode)
128 }
129 jobTok.Body.Close()
130
131 res = postJSON(t, http.MethodPost, ts.URL+"/api/v1/repos/tim/bugs/issues", roToken, map[string]any{
132 "title": "Geheim", "description": "niet delen", "confidential": true,
133 })
134 body := read(t, res)
135 if res.StatusCode != http.StatusCreated || !strings.Contains(body, `"id":1`) {
136 t.Fatalf("aanmaken %d %s", res.StatusCode, body)
137 }
138 opened := issuePayload(t, bodies, "opened")
139 if opened["comment"] != nil {
140 t.Fatalf("opened heeft comment %s", mustJSON(t, opened))
141 }
142 iss := opened["issue"].(map[string]any)
143 if iss["title"] != "Geheim" || iss["confidential"] != true || iss["author"] != "ro" {
144 t.Fatalf("payload %s", mustJSON(t, iss))
145 }
146
147 res = getBearer(t, ts.URL+"/api/v1/repos/tim/bugs/issues", samToken)
148 list := read(t, res)
149 if res.StatusCode != http.StatusOK || strings.Contains(list, "Geheim") {
150 t.Fatalf("vreemde lijst %d %s", res.StatusCode, list)
151 }
152 res = getBearer(t, ts.URL+"/api/v1/repos/tim/bugs/issues/1", samToken)
153 if res.StatusCode != http.StatusNotFound {
154 t.Fatalf("vreemde detail %d", res.StatusCode)
155 }
156 res.Body.Close()
157 anon := mustGet(t, http.DefaultClient, ts.URL+"/tim/bugs/-/issues/1")
158 if anon.StatusCode != http.StatusNotFound {
159 t.Fatalf("anoniem %d", anon.StatusCode)
160 }
161 anon.Body.Close()
162 res = getBearer(t, ts.URL+"/api/v1/repos/tim/bugs/issues/1", repToken)
163 if res.StatusCode != http.StatusOK || !strings.Contains(read(t, res), "Geheim") {
164 t.Fatal("reporter ziet het vertrouwelijke issue niet")
165 }
166
167 res = postJSON(t, http.MethodPut, ts.URL+"/api/v1/repos/tim/bugs/issues/1", repToken, map[string]any{
168 "labels": []string{"bug"}, "assignees": []string{"ro"}, "milestone": "v1", "due_date": "2026-12-01",
169 })
170 tagged := read(t, res)
171 if res.StatusCode != http.StatusOK || !strings.Contains(tagged, "bug") || !strings.Contains(tagged, "ro") || !strings.Contains(tagged, "v1") {
172 t.Fatalf("triage %d %s", res.StatusCode, tagged)
173 }
174 res = postJSON(t, http.MethodPut, ts.URL+"/api/v1/repos/tim/bugs/issues/1", devToken, map[string]any{"labels": []string{"bug"}})
175 if res.StatusCode != http.StatusOK {
176 t.Fatalf("developer %d %s", res.StatusCode, read(t, res))
177 }
178 res = postJSON(t, http.MethodPost, ts.URL+"/api/v1/repos/tim/bugs/issues/1/notes", roToken, map[string]any{"body": "zie !4"})
179 if res.StatusCode != http.StatusCreated {
180 t.Fatalf("reactie %d %s", res.StatusCode, read(t, res))
181 }
182 commented := issuePayload(t, bodies, "commented")
183 if commented["comment"] != "zie !4" {
184 t.Fatalf("comment %s", mustJSON(t, commented))
185 }
186
187 filtered := read(t, getBearer(t, ts.URL+"/api/v1/repos/tim/bugs/issues?state=open&label=bug&assignee=ro&q=geheim", repToken))
188 if !strings.Contains(filtered, `"id":1`) {
189 t.Fatalf("filter %s", filtered)
190 }
191
192 roJar, _ := cookiejar.New(nil)
193 roClient := &http.Client{Jar: roJar}
194 u, _ := url.Parse(ts.URL)
195 sess, err := st.CreateSession(ctx, ro.ID, "dev", time.Now().Add(time.Hour))
196 if err != nil {
197 t.Fatal(err)
198 }
199 roJar.SetCookies(u, []*http.Cookie{{Name: "bluegit_session", Value: sess.ID, Path: "/"}})
200 page = read(t, mustGet(t, roClient, ts.URL+"/tim/bugs/-/issues"))
201 if !strings.Contains(page, "Issues") || !strings.Contains(page, "#1") || !strings.Contains(page, "Geheim") || !strings.Contains(page, "bug") {
202 t.Fatalf("lijst\n%s", page)
203 }
204 page = read(t, mustGet(t, roClient, ts.URL+"/tim/bugs/-/issues/new?relate=1"))
205 if !strings.Contains(page, `name="relate"`) || !strings.Contains(page, "value=\"1\"") {
206 t.Fatalf("gerelateerd\n%s", page)
207 }
208 page = read(t, mustPost(t, roClient, ts.URL+"/tim/bugs/-/issues", url.Values{
209 "csrf": {csrfOf(t, page)}, "title": {"Tweede"}, "description": {"Zie #1 en !4"}, "relate": {"1"},
210 }))
211 if !strings.Contains(page, "#2") || !strings.Contains(page, `/tim/bugs/-/issues/1`) || !strings.Contains(page, `/tim/bugs/-/merge-requests/4`) {
212 t.Fatalf("tweede pagina\n%s", page)
213 }
214 if !strings.Contains(page, "#1 Tweede") && !strings.Contains(page, "#1") {
215 t.Fatal("koppeling ontbreekt")
216 }
217
218 mr, err := st.CreateMergeRequest(ctx, repo.ID, ro.ID, "Voorbeeld", "tekst", "topic", "master")
219 if err != nil {
220 t.Fatal(err)
221 }
222 note, err := st.AddNote(ctx, repo.ID, mr.ID, ro.ID, "dit hoort een issue")
223 if err != nil {
224 t.Fatal(err)
225 }
226 form := read(t, mustGet(t, roClient, ts.URL+"/tim/bugs/-/issues/new?from=mr&mr=1&note="+strconv.FormatInt(note.ID, 10)))
227 if !strings.Contains(form, "dit hoort een issue") || !strings.Contains(form, "!1") {
228 t.Fatalf("prefill\n%s", form)
229 }
230 prev := read(t, mustPost(t, roClient, ts.URL+"/tim/bugs/-/markdown", url.Values{
231 "csrf": {csrfOf(t, form)}, "body": {"zie #1 en !4"},
232 }))
233 if !strings.Contains(prev, `/tim/bugs/-/issues/1`) || !strings.Contains(prev, `/tim/bugs/-/merge-requests/4`) {
234 t.Fatalf("preview %s", prev)
235 }
236
237 res = postJSON(t, http.MethodPut, ts.URL+"/api/v1/repos/tim/bugs/issues/1", roToken, map[string]any{"state": "closed"})
238 if res.StatusCode != http.StatusOK || !strings.Contains(read(t, res), `"status":"closed"`) {
239 t.Fatal("sluiten faalde")
240 }
241 closed := issuePayload(t, bodies, "closed")
242 if closed["issue"].(map[string]any)["status"] != "closed" {
243 t.Fatalf("webhook sluiten %s", mustJSON(t, closed))
244 }
245 closedPage := read(t, mustGet(t, roClient, ts.URL+"/tim/bugs/-/issues?state=closed"))
246 if !strings.Contains(closedPage, "Geheim") || strings.Contains(closedPage, "Tweede") {
247 t.Fatalf("filter gesloten\n%s", closedPage)
248 }
249
250 info := read(t, mustGet(t, http.DefaultClient, ts.URL+"/-/info"))
251 for _, want := range []string{`id="issues"`, "Readonly may create issues", "Inloggen faalt", "/api/v1/repos/{owner}/{repo}/issues"} {
252 if !strings.Contains(info, want) {
253 t.Errorf("info mist %s", want)
254 }
255 }
256}
257
258func TestIssueClosesOnMerge(t *testing.T) {
259 if _, err := exec.LookPath("git"); err != nil {
260 t.Skip("git ontbreekt")
261 }
262 storage := t.TempDir()
263 st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())
264 if err != nil {
265 t.Fatal(err)
266 }
267 t.Cleanup(func() { _ = st.Close() })
268 cfg := config.Config{
269 BaseURL: "http://git.example", Listen: "127.0.0.1:0", StoragePath: storage,
270 Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test", BaseURL: "https://auth.timfalken.com"},
271 Git: config.Git{Binary: "git", DefaultBranch: "master"},
272 }
273 var bodies [][]byte
274 srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true"}
275 srv.hookSink = func(b []byte) { bodies = append(bodies, append([]byte(nil), b...)) }
276 ts := httptest.NewServer(srv.Handler())
277 t.Cleanup(ts.Close)
278 jar, _ := cookiejar.New(nil)
279 tim := &http.Client{Jar: jar}
280 page := read(t, mustGet(t, tim, ts.URL+"/login"))
281 page = read(t, mustPost(t, tim, ts.URL+"/new/repo", url.Values{
282 "csrf": {csrfOf(t, page)}, "name": {"bugs"}, "visibility": {"private"},
283 }))
284 page = read(t, mustPost(t, tim, ts.URL+"/settings/tokens", url.Values{"csrf": {csrfOf(t, page)}, "name": {"tim"}}))
285 token := between(page, `<p class="code">`, "</p>")
286 ctx := context.Background()
287 repo, err := st.RepoByPath(ctx, "tim", "bugs")
288 if err != nil {
289 t.Fatal(err)
290 }
291 if _, err := st.CreateWebhook(ctx, store.Webhook{
292 ScopeKind: "repo", ScopeID: repo.ID, Name: "issues", Preset: "generic",
293 URLTemplate: "https://example.test/hook", Events: []string{"issue"},
294 }); err != nil {
295 t.Fatal(err)
296 }
297 for _, title := range []string{"een", "twee", "drie"} {
298 res := postJSON(t, http.MethodPost, ts.URL+"/api/v1/repos/tim/bugs/issues", token, map[string]any{"title": title})
299 if res.StatusCode != http.StatusCreated {
300 t.Fatalf("issue %s %d %s", title, res.StatusCode, read(t, res))
301 }
302 res.Body.Close()
303 }
304 remote := strings.Replace(ts.URL, "http://", "http://tim:"+token+"@", 1) + "/tim/bugs.git"
305 work := t.TempDir()
306 git(t, work, "init", "-b", "master")
307 git(t, work, "config", "user.email", "tim@users.git.timfalken.com")
308 git(t, work, "config", "user.name", "tim")
309 writeFile(t, filepath.Join(work, "README.md"), "a\n")
310 git(t, work, "add", "README.md")
311 git(t, work, "commit", "-m", "start")
312 git(t, work, "remote", "add", "origin", remote)
313 git(t, work, "push", "-u", "origin", "master")
314 git(t, work, "checkout", "-b", "topic")
315 writeFile(t, filepath.Join(work, "extra.txt"), "c\n")
316 git(t, work, "add", "extra.txt")
317 git(t, work, "commit", "-m", "Fixes #1")
318 git(t, work, "push", "-u", "origin", "topic")
319
320 page = read(t, mustGet(t, tim, ts.URL+"/tim/bugs/-/merge-requests/new?source=topic&target=master"))
321 page = read(t, mustPost(t, tim, ts.URL+"/tim/bugs/-/merge-requests", url.Values{
322 "csrf": {csrfOf(t, page)}, "source": {"topic"}, "target": {"master"},
323 "title": {"Sluit issues"}, "description": {"Closes #2"},
324 }))
325 page = read(t, mustPost(t, tim, ts.URL+"/tim/bugs/-/merge-requests/1/notes", url.Values{
326 "csrf": {csrfOf(t, page)}, "body": {"dit wordt een issue"},
327 }))
328 if !strings.Contains(page, "/-/issues/new?from=mr") || !strings.Contains(page, "dit wordt een issue") {
329 t.Fatalf("mr-link ontbreekt\n%s", page[:min(800, len(page))])
330 }
331 page = read(t, mustPost(t, tim, ts.URL+"/tim/bugs/-/merge-requests/1/merge", url.Values{"csrf": {csrfOf(t, page)}}))
332 if !strings.Contains(page, "merged") && !strings.Contains(page, "samengevoegd") {
333 t.Fatalf("merge\n%s", page[:min(500, len(page))])
334 }
335 one := read(t, getBearer(t, ts.URL+"/api/v1/repos/tim/bugs/issues/1", token))
336 two := read(t, getBearer(t, ts.URL+"/api/v1/repos/tim/bugs/issues/2", token))
337 if !strings.Contains(one, `"status":"closed"`) || !strings.Contains(two, `"status":"closed"`) {
338 t.Fatalf("na merge\n1 %s\n2 %s", one, two)
339 }
340 foundClosed := 0
341 for _, raw := range bodies {
342 var doc map[string]any
343 if json.Unmarshal(raw, &doc) != nil || doc["object_kind"] != "issue" {
344 continue
345 }
346 iss, _ := doc["issue"].(map[string]any)
347 if iss != nil && iss["action"] == "closed" {
348 foundClosed++
349 }
350 }
351 if foundClosed < 2 {
352 t.Fatalf("webhooks gesloten %d", foundClosed)
353 }
354
355 git(t, work, "checkout", "master")
356 git(t, work, "pull", "--ff-only", "origin", "master")
357 writeFile(t, filepath.Join(work, "README.md"), "b\n")
358 git(t, work, "add", "README.md")
359 git(t, work, "commit", "-m", "Resolves #3")
360 git(t, work, "push", "origin", "master")
361 three := read(t, getBearer(t, ts.URL+"/api/v1/repos/tim/bugs/issues/3", token))
362 if !strings.Contains(three, `"status":"closed"`) {
363 t.Fatalf("push sluit niet %s", three)
364 }
365}
366
367func postJSON(t *testing.T, method, raw, token string, body any) *http.Response {
368 t.Helper()
369 var buf bytes.Buffer
370 if body != nil {
371 if err := json.NewEncoder(&buf).Encode(body); err != nil {
372 t.Fatal(err)
373 }
374 }
375 req, err := http.NewRequest(method, raw, &buf)
376 if err != nil {
377 t.Fatal(err)
378 }
379 if token != "" {
380 req.Header.Set("Authorization", "Bearer "+token)
381 }
382 req.Header.Set("Content-Type", "application/json")
383 res, err := http.DefaultClient.Do(req)
384 if err != nil {
385 t.Fatal(err)
386 }
387 return res
388}
389
390func issuePayload(t *testing.T, bodies [][]byte, action string) map[string]any {
391 t.Helper()
392 for i := len(bodies) - 1; i >= 0; i-- {
393 var doc map[string]any
394 if err := json.Unmarshal(bodies[i], &doc); err != nil {
395 continue
396 }
397 iss, _ := doc["issue"].(map[string]any)
398 if iss != nil && iss["action"] == action {
399 return doc
400 }
401 }
402 t.Fatalf("geen issue-actie %s", action)
403 return nil
404}
internal/server/mr_page.go +4 −4
@@ -62,7 +62,7 @@ func (s *Server) newMR(w http.ResponseWriter, r *http.Request) {
62 62 }
63 63
64 64 func (s *Server) previewMarkdown(w http.ResponseWriter, r *http.Request) {
65 u, _, _, ok := s.guard(w, r, access.RoleReadonly)
65 u, repo, _, ok := s.guard(w, r, access.RoleReadonly)
66 66 if !ok || !s.csrfOK(w, r) {
67 67 return
68 68 }
@@ -75,7 +75,7 @@ func (s *Server) previewMarkdown(w http.ResponseWriter, r *http.Request) {
75 75 body = body[:20000]
76 76 }
77 77 w.Header().Set("Content-Type", "text/html; charset=utf-8")
78 _, _ = w.Write([]byte(markdown.Render(body, "", "")))
78 _, _ = w.Write([]byte(markdown.Render(body, "", "", "/"+repo.FullPath())))
79 79 }
80 80
81 81 func (s *Server) updateMR(w http.ResponseWriter, r *http.Request) {
@@ -96,7 +96,7 @@ func (s *Server) updateMR(w http.ResponseWriter, r *http.Request) {
96 96 }
97 97
98 98 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, "", ""))
99 v.DescHTML = template.HTML(markdown.Render(mr.Description, "", "", "/"+repo.FullPath()))
100 100 v.Labels = splitLabels(mr.Labels)
101 101 v.CanEditMR = mr.Status == "open" && u.ID != 0 && (u.ID == mr.AuthorID || v.CanWrite)
102 102 switch r.URL.Query().Get("tab") {
@@ -107,7 +107,7 @@ func (s *Server) finishMR(r *http.Request, v *View, repo store.Repo, mr store.Me
107 107 }
108 108 s.fillCompare(r, v, repo, mr.TargetBranch, mr.SourceBranch)
109 109 raw, _ := s.Store.ListNotes(r.Context(), mr.ID)
110 rows := buildNoteRows(raw, s.langOf(r))
110 rows := buildNoteRows(raw, s.langOf(r), "/"+repo.FullPath())
111 111 v.Notes = stampNotes(v.CommitDiff, rows)
112 112 s.fillTimeline(r, v, repo, mr, rows)
113 113 }
@@ -62,7 +62,7 @@ func (s *Server) newMR(w http.ResponseWriter, r *http.Request) {
62}
62}
63
63
64func (s *Server) previewMarkdown(w http.ResponseWriter, r *http.Request) {
64func (s *Server) previewMarkdown(w http.ResponseWriter, r *http.Request) {
65 u, _, _, ok := s.guard(w, r, access.RoleReadonly)
65 u, repo, _, ok := s.guard(w, r, access.RoleReadonly)
66 if !ok || !s.csrfOK(w, r) {
66 if !ok || !s.csrfOK(w, r) {
67 return
67 return
68 }
68 }
@@ -75,7 +75,7 @@ func (s *Server) previewMarkdown(w http.ResponseWriter, r *http.Request) {
75 body = body[:20000]
75 body = body[:20000]
76 }
76 }
77 w.Header().Set("Content-Type", "text/html; charset=utf-8")
77 w.Header().Set("Content-Type", "text/html; charset=utf-8")
78 _, _ = w.Write([]byte(markdown.Render(body, "", "")))
78 _, _ = w.Write([]byte(markdown.Render(body, "", "", "/"+repo.FullPath())))
79}
79}
80
80
81func (s *Server) updateMR(w http.ResponseWriter, r *http.Request) {
81func (s *Server) updateMR(w http.ResponseWriter, r *http.Request) {
@@ -96,7 +96,7 @@ func (s *Server) updateMR(w http.ResponseWriter, r *http.Request) {
96}
96}
97
97
98func (s *Server) finishMR(r *http.Request, v *View, repo store.Repo, mr store.MergeRequest, u store.User) {
98func (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, "", ""))
99 v.DescHTML = template.HTML(markdown.Render(mr.Description, "", "", "/"+repo.FullPath()))
100 v.Labels = splitLabels(mr.Labels)
100 v.Labels = splitLabels(mr.Labels)
101 v.CanEditMR = mr.Status == "open" && u.ID != 0 && (u.ID == mr.AuthorID || v.CanWrite)
101 v.CanEditMR = mr.Status == "open" && u.ID != 0 && (u.ID == mr.AuthorID || v.CanWrite)
102 switch r.URL.Query().Get("tab") {
102 switch r.URL.Query().Get("tab") {
@@ -107,7 +107,7 @@ func (s *Server) finishMR(r *http.Request, v *View, repo store.Repo, mr store.Me
107 }
107 }
108 s.fillCompare(r, v, repo, mr.TargetBranch, mr.SourceBranch)
108 s.fillCompare(r, v, repo, mr.TargetBranch, mr.SourceBranch)
109 raw, _ := s.Store.ListNotes(r.Context(), mr.ID)
109 raw, _ := s.Store.ListNotes(r.Context(), mr.ID)
110 rows := buildNoteRows(raw, s.langOf(r))
110 rows := buildNoteRows(raw, s.langOf(r), "/"+repo.FullPath())
111 v.Notes = stampNotes(v.CommitDiff, rows)
111 v.Notes = stampNotes(v.CommitDiff, rows)
112 s.fillTimeline(r, v, repo, mr, rows)
112 s.fillTimeline(r, v, repo, mr, rows)
113}
113}
internal/server/ops_mr.go +1 −0
@@ -287,6 +287,7 @@ func (s *Server) opMergeMR(r *http.Request, user store.User, repo store.Repo, nu
287 287 _ = s.Store.AddMREvent(ctx, repo.ID, mr.ID, user.ID, "merged", "")
288 288 mr.Status = "merged"
289 289 s.mrHook(repo, mr, user.Username, "merged", "")
290 s.closeIssueNumbers(ctx, repo, user, closingNumbers(s.mergeCloseTexts(r, repo, mr)...))
290 291 return nil
291 292 }
292 293
@@ -287,6 +287,7 @@ func (s *Server) opMergeMR(r *http.Request, user store.User, repo store.Repo, nu
287 _ = s.Store.AddMREvent(ctx, repo.ID, mr.ID, user.ID, "merged", "")
287 _ = s.Store.AddMREvent(ctx, repo.ID, mr.ID, user.ID, "merged", "")
288 mr.Status = "merged"
288 mr.Status = "merged"
289 s.mrHook(repo, mr, user.Username, "merged", "")
289 s.mrHook(repo, mr, user.Username, "merged", "")
290 s.closeIssueNumbers(ctx, repo, user, closingNumbers(s.mergeCloseTexts(r, repo, mr)...))
290 return nil
291 return nil
291}
292}
292
293
internal/server/project.go +1 −1
@@ -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))
43 v.Readme = template.HTML(markdown.Render(text, base, v.Rev, "/"+repo.FullPath()))
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 = readme
41 v.ReadmeName = readme
42 base := "/" + repo.FullPath() + "/-/blob/"
42 base := "/" + repo.FullPath() + "/-/blob/"
43 v.Readme = template.HTML(markdown.Render(text, base, v.Rev))
43 v.Readme = template.HTML(markdown.Render(text, base, v.Rev, "/"+repo.FullPath()))
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)
internal/server/server.go +20 −0
@@ -119,6 +119,16 @@ func (s *Server) Handler() http.Handler {
119 119 mux.HandleFunc("GET /api/v1/repos/{owner}/{repo}/jobs/{id}/log", s.jobLogAPI)
120 120 mux.HandleFunc("GET /api/v1/repos/{owner}/{repo}/commits/{sha}/diff", s.commitDiffAPI)
121 121 mux.HandleFunc("GET /api/v1/repos/{owner}/{repo}/merge-requests/{number}/diff", s.mrDiffAPI)
122 mux.HandleFunc("GET /api/v1/repos/{owner}/{repo}/issues", s.issuesAPI)
123 mux.HandleFunc("POST /api/v1/repos/{owner}/{repo}/issues", s.issuesAPI)
124 mux.HandleFunc("GET /api/v1/repos/{owner}/{repo}/issues/{number}", s.issueAPI)
125 mux.HandleFunc("PUT /api/v1/repos/{owner}/{repo}/issues/{number}", s.issueAPI)
126 mux.HandleFunc("DELETE /api/v1/repos/{owner}/{repo}/issues/{number}", s.issueAPI)
127 mux.HandleFunc("POST /api/v1/repos/{owner}/{repo}/issues/{number}/notes", s.issueNoteAPI)
128 mux.HandleFunc("GET /api/v1/repos/{owner}/{repo}/labels", s.labelsAPI)
129 mux.HandleFunc("POST /api/v1/repos/{owner}/{repo}/labels", s.labelsAPI)
130 mux.HandleFunc("GET /api/v1/repos/{owner}/{repo}/milestones", s.milestonesAPI)
131 mux.HandleFunc("POST /api/v1/repos/{owner}/{repo}/milestones", s.milestonesAPI)
122 132 mux.HandleFunc("GET /api/v1/repos/{owner}/{repo}/webhook-secrets", s.repoWebhookSecrets)
123 133 mux.HandleFunc("POST /api/v1/repos/{owner}/{repo}/webhooks", s.repoWebhookAPI)
124 134 mux.HandleFunc("PUT /api/v1/repos/{owner}/{repo}/webhooks/{id}", s.repoWebhookUpdate)
@@ -165,6 +175,13 @@ func (s *Server) Handler() http.Handler {
165 175 mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests/{number}/reviews/dismiss", s.dismissReview)
166 176 mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests/{number}/notes", s.createNote)
167 177 mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests/{number}/suggestions", s.applySuggestions)
178 mux.HandleFunc("GET /{owner}/{repo}/-/issues", s.issuesPage)
179 mux.HandleFunc("GET /{owner}/{repo}/-/issues/new", s.newIssue)
180 mux.HandleFunc("POST /{owner}/{repo}/-/issues", s.createIssue)
181 mux.HandleFunc("POST /{owner}/{repo}/-/issues/labels", s.createIssueLabel)
182 mux.HandleFunc("POST /{owner}/{repo}/-/issues/milestones", s.createIssueMilestone)
183 mux.HandleFunc("GET /{owner}/{repo}/-/issues/{number}", s.showIssue)
184 mux.HandleFunc("POST /{owner}/{repo}/-/issues/{number}", s.postIssue)
168 185 mux.HandleFunc("GET /{owner}/{repo}/-/pipelines", s.pipelines)
169 186 mux.HandleFunc("POST /{owner}/{repo}/-/pipelines", s.runPipeline)
170 187 mux.HandleFunc("GET /{owner}/{repo}/-/pipelines/{id}", s.pipeline)
@@ -585,6 +602,8 @@ type View struct {
585 602 FormTitle string
586 603 Labels []string
587 604 CanEditMR bool
605 Issues *IssueBoard
606 IssueDoc string
588 607 }
589 608
590 609 // LangChoice is één taal in de instellingen.
@@ -726,6 +745,7 @@ type HookDraft struct {
726 745 OnOK bool
727 746 OnFail bool
728 747 OnRel bool
748 OnIssue bool
729 749 }
730 750
731 751 func repoURL(repo store.Repo) string { return "/" + repo.FullPath() }
@@ -119,6 +119,16 @@ func (s *Server) Handler() http.Handler {
119 mux.HandleFunc("GET /api/v1/repos/{owner}/{repo}/jobs/{id}/log", s.jobLogAPI)
119 mux.HandleFunc("GET /api/v1/repos/{owner}/{repo}/jobs/{id}/log", s.jobLogAPI)
120 mux.HandleFunc("GET /api/v1/repos/{owner}/{repo}/commits/{sha}/diff", s.commitDiffAPI)
120 mux.HandleFunc("GET /api/v1/repos/{owner}/{repo}/commits/{sha}/diff", s.commitDiffAPI)
121 mux.HandleFunc("GET /api/v1/repos/{owner}/{repo}/merge-requests/{number}/diff", s.mrDiffAPI)
121 mux.HandleFunc("GET /api/v1/repos/{owner}/{repo}/merge-requests/{number}/diff", s.mrDiffAPI)
122 mux.HandleFunc("GET /api/v1/repos/{owner}/{repo}/issues", s.issuesAPI)
123 mux.HandleFunc("POST /api/v1/repos/{owner}/{repo}/issues", s.issuesAPI)
124 mux.HandleFunc("GET /api/v1/repos/{owner}/{repo}/issues/{number}", s.issueAPI)
125 mux.HandleFunc("PUT /api/v1/repos/{owner}/{repo}/issues/{number}", s.issueAPI)
126 mux.HandleFunc("DELETE /api/v1/repos/{owner}/{repo}/issues/{number}", s.issueAPI)
127 mux.HandleFunc("POST /api/v1/repos/{owner}/{repo}/issues/{number}/notes", s.issueNoteAPI)
128 mux.HandleFunc("GET /api/v1/repos/{owner}/{repo}/labels", s.labelsAPI)
129 mux.HandleFunc("POST /api/v1/repos/{owner}/{repo}/labels", s.labelsAPI)
130 mux.HandleFunc("GET /api/v1/repos/{owner}/{repo}/milestones", s.milestonesAPI)
131 mux.HandleFunc("POST /api/v1/repos/{owner}/{repo}/milestones", s.milestonesAPI)
122 mux.HandleFunc("GET /api/v1/repos/{owner}/{repo}/webhook-secrets", s.repoWebhookSecrets)
132 mux.HandleFunc("GET /api/v1/repos/{owner}/{repo}/webhook-secrets", s.repoWebhookSecrets)
123 mux.HandleFunc("POST /api/v1/repos/{owner}/{repo}/webhooks", s.repoWebhookAPI)
133 mux.HandleFunc("POST /api/v1/repos/{owner}/{repo}/webhooks", s.repoWebhookAPI)
124 mux.HandleFunc("PUT /api/v1/repos/{owner}/{repo}/webhooks/{id}", s.repoWebhookUpdate)
134 mux.HandleFunc("PUT /api/v1/repos/{owner}/{repo}/webhooks/{id}", s.repoWebhookUpdate)
@@ -165,6 +175,13 @@ func (s *Server) Handler() http.Handler {
165 mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests/{number}/reviews/dismiss", s.dismissReview)
175 mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests/{number}/reviews/dismiss", s.dismissReview)
166 mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests/{number}/notes", s.createNote)
176 mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests/{number}/notes", s.createNote)
167 mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests/{number}/suggestions", s.applySuggestions)
177 mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests/{number}/suggestions", s.applySuggestions)
178 mux.HandleFunc("GET /{owner}/{repo}/-/issues", s.issuesPage)
179 mux.HandleFunc("GET /{owner}/{repo}/-/issues/new", s.newIssue)
180 mux.HandleFunc("POST /{owner}/{repo}/-/issues", s.createIssue)
181 mux.HandleFunc("POST /{owner}/{repo}/-/issues/labels", s.createIssueLabel)
182 mux.HandleFunc("POST /{owner}/{repo}/-/issues/milestones", s.createIssueMilestone)
183 mux.HandleFunc("GET /{owner}/{repo}/-/issues/{number}", s.showIssue)
184 mux.HandleFunc("POST /{owner}/{repo}/-/issues/{number}", s.postIssue)
168 mux.HandleFunc("GET /{owner}/{repo}/-/pipelines", s.pipelines)
185 mux.HandleFunc("GET /{owner}/{repo}/-/pipelines", s.pipelines)
169 mux.HandleFunc("POST /{owner}/{repo}/-/pipelines", s.runPipeline)
186 mux.HandleFunc("POST /{owner}/{repo}/-/pipelines", s.runPipeline)
170 mux.HandleFunc("GET /{owner}/{repo}/-/pipelines/{id}", s.pipeline)
187 mux.HandleFunc("GET /{owner}/{repo}/-/pipelines/{id}", s.pipeline)
@@ -585,6 +602,8 @@ type View struct {
585 FormTitle string
602 FormTitle string
586 Labels []string
603 Labels []string
587 CanEditMR bool
604 CanEditMR bool
605 Issues *IssueBoard
606 IssueDoc string
588}
607}
589
608
590// LangChoice is één taal in de instellingen.
609// LangChoice is één taal in de instellingen.
@@ -726,6 +745,7 @@ type HookDraft struct {
726 OnOK bool
745 OnOK bool
727 OnFail bool
746 OnFail bool
728 OnRel bool
747 OnRel bool
748 OnIssue bool
729}
749}
730
750
731func repoURL(repo store.Repo) string { return "/" + repo.FullPath() }
751func repoURL(repo store.Repo) string { return "/" + repo.FullPath() }
internal/server/settings_handlers.go +2 −0
@@ -150,6 +150,8 @@ func draftFrom(h store.Webhook) HookDraft {
150 150 d.OnFail = true
151 151 case webhook.EventRelease:
152 152 d.OnRel = true
153 case webhook.EventIssue:
154 d.OnIssue = true
153 155 }
154 156 }
155 157 if d.Preset == "" {
@@ -150,6 +150,8 @@ func draftFrom(h store.Webhook) HookDraft {
150 d.OnFail = true
150 d.OnFail = true
151 case webhook.EventRelease:
151 case webhook.EventRelease:
152 d.OnRel = true
152 d.OnRel = true
153 case webhook.EventIssue:
154 d.OnIssue = true
153 }
155 }
154 }
156 }
155 if d.Preset == "" {
157 if d.Preset == "" {
internal/server/static/style.css +5 −0
@@ -879,3 +879,8 @@ form.wh .grid-2 label { margin-top: 0; }
879 879 .pagehead { align-items: flex-start; }
880 880 .pageacts { flex-wrap: wrap; justify-content: flex-end; }
881 881 }
882 .issuelist { list-style: none; margin: 0; padding: 0; }
883 .issuelist > li { border-bottom: 1px solid var(--line); padding: 0.6rem 0; min-height: 2.4rem; }
884 .lab { display: inline-block; color: #fff; border-radius: 999px; padding: 0.05rem 0.45rem; font-size: 0.78rem; margin: 0 0.2rem; }
885 .issue-meta { display: flex; flex-wrap: wrap; gap: 0.35rem; align-items: center; margin: 0.4rem 0; }
886 .checks label { display: block; margin: 0.2rem 0; }
@@ -879,3 +879,8 @@ form.wh .grid-2 label { margin-top: 0; }
879 .pagehead { align-items: flex-start; }
879 .pagehead { align-items: flex-start; }
880 .pageacts { flex-wrap: wrap; justify-content: flex-end; }
880 .pageacts { flex-wrap: wrap; justify-content: flex-end; }
881}
881}
882.issuelist { list-style: none; margin: 0; padding: 0; }
883.issuelist > li { border-bottom: 1px solid var(--line); padding: 0.6rem 0; min-height: 2.4rem; }
884.lab { display: inline-block; color: #fff; border-radius: 999px; padding: 0.05rem 0.45rem; font-size: 0.78rem; margin: 0 0.2rem; }
885.issue-meta { display: flex; flex-wrap: wrap; gap: 0.35rem; align-items: center; margin: 0.4rem 0; }
886.checks label { display: block; margin: 0.2rem 0; }
internal/server/suggest.go +4 −4
@@ -13,7 +13,7 @@ import (
13 13 "gitlab.com/Timfa/bluegit/internal/store"
14 14 )
15 15
16 func buildNoteRows(notes []store.Note, lang i18n.Lang) []NoteRow {
16 func buildNoteRows(notes []store.Note, lang i18n.Lang, repoPath string) []NoteRow {
17 17 rows := make([]NoteRow, len(notes))
18 18 index := map[int64]int{}
19 19 for i, n := range notes {
@@ -21,7 +21,7 @@ func buildNoteRows(notes []store.Note, lang i18n.Lang) []NoteRow {
21 21 ID: n.ID, Author: n.Author, Body: n.Body, Path: n.FilePath,
22 22 Start: n.LineStart, End: n.LineEnd, HasSuggestion: n.Suggestion != "",
23 23 When: i18n.FormatDate(lang, n.CreatedAt), At: n.CreatedAt, ParentID: n.ParentID,
24 HTML: template.HTML(markdown.Render(n.Body, "", "")),
24 HTML: template.HTML(markdown.Render(n.Body, "", "", repoPath)),
25 25 }
26 26 index[n.ID] = i
27 27 }
@@ -40,8 +40,8 @@ func buildNoteRows(notes []store.Note, lang i18n.Lang) []NoteRow {
40 40 return rows
41 41 }
42 42
43 func arrangeNotes(notes []store.Note, files []gitrepo.DiffFile, lang i18n.Lang) ([]NoteRow, []DiffFileView) {
44 rows := buildNoteRows(notes, lang)
43 func arrangeNotes(notes []store.Note, files []gitrepo.DiffFile, lang i18n.Lang, repoPath string) ([]NoteRow, []DiffFileView) {
44 rows := buildNoteRows(notes, lang, repoPath)
45 45 placed := map[int64]bool{}
46 46 var views []DiffFileView
47 47 for _, f := range files {
@@ -13,7 +13,7 @@ import (
13 "gitlab.com/Timfa/bluegit/internal/store"
13 "gitlab.com/Timfa/bluegit/internal/store"
14)
14)
15
15
16func buildNoteRows(notes []store.Note, lang i18n.Lang) []NoteRow {
16func buildNoteRows(notes []store.Note, lang i18n.Lang, repoPath string) []NoteRow {
17 rows := make([]NoteRow, len(notes))
17 rows := make([]NoteRow, len(notes))
18 index := map[int64]int{}
18 index := map[int64]int{}
19 for i, n := range notes {
19 for i, n := range notes {
@@ -21,7 +21,7 @@ func buildNoteRows(notes []store.Note, lang i18n.Lang) []NoteRow {
21 ID: n.ID, Author: n.Author, Body: n.Body, Path: n.FilePath,
21 ID: n.ID, Author: n.Author, Body: n.Body, Path: n.FilePath,
22 Start: n.LineStart, End: n.LineEnd, HasSuggestion: n.Suggestion != "",
22 Start: n.LineStart, End: n.LineEnd, HasSuggestion: n.Suggestion != "",
23 When: i18n.FormatDate(lang, n.CreatedAt), At: n.CreatedAt, ParentID: n.ParentID,
23 When: i18n.FormatDate(lang, n.CreatedAt), At: n.CreatedAt, ParentID: n.ParentID,
24 HTML: template.HTML(markdown.Render(n.Body, "", "")),
24 HTML: template.HTML(markdown.Render(n.Body, "", "", repoPath)),
25 }
25 }
26 index[n.ID] = i
26 index[n.ID] = i
27 }
27 }
@@ -40,8 +40,8 @@ func buildNoteRows(notes []store.Note, lang i18n.Lang) []NoteRow {
40 return rows
40 return rows
41}
41}
42
42
43func arrangeNotes(notes []store.Note, files []gitrepo.DiffFile, lang i18n.Lang) ([]NoteRow, []DiffFileView) {
43func arrangeNotes(notes []store.Note, files []gitrepo.DiffFile, lang i18n.Lang, repoPath string) ([]NoteRow, []DiffFileView) {
44 rows := buildNoteRows(notes, lang)
44 rows := buildNoteRows(notes, lang, repoPath)
45 placed := map[int64]bool{}
45 placed := map[int64]bool{}
46 var views []DiffFileView
46 var views []DiffFileView
47 for _, f := range files {
47 for _, f := range files {
internal/server/templates/collab.html +4 −1
@@ -103,7 +103,7 @@
103 103 {{if .Body}}<pre class="pushlist">{{.Body}}</pre>{{end}}
104 104 {{if .HTML}}<div class="mdbody">{{.HTML}}</div>{{end}}
105 105 {{range .Replies}}<div class="reply"><strong>{{.Actor}}</strong> <span class="muted">{{.When}}</span><div class="mdbody">{{.HTML}}</div></div>{{end}}
106 {{if and (eq .Kind "comment") $.CanComment}}<button type="button" class="ghost" data-reply="{{.ID}}" data-reply-name="{{.Actor}}">{{t "mr.reply"}}</button>{{end}}
106 {{if and (eq .Kind "comment") $.CanComment}}<button type="button" class="ghost" data-reply="{{.ID}}" data-reply-name="{{.Actor}}">{{t "mr.reply"}}</button> <a href="/{{$.Repo.FullPath}}/-/issues/new?from=mr&amp;mr={{$.MR.Number}}&amp;note={{.ID}}">{{t "issue.fromComment"}}</a>{{end}}
107 107 </li>
108 108 {{end}}
109 109 </ol>
@@ -427,6 +427,7 @@
427 427 {{define "roleselect"}}
428 428 <select name="role">
429 429 <option value="readonly" {{if eq . "readonly"}}selected{{end}}>{{t "role.readonly"}}</option>
430 <option value="reporter" {{if eq . "reporter"}}selected{{end}}>{{t "role.reporter"}}</option>
430 431 <option value="developer" {{if eq . "developer"}}selected{{end}}>{{t "role.developer"}}</option>
431 432 <option value="maintainer" {{if eq . "maintainer"}}selected{{end}}>{{t "role.maintainer"}}</option>
432 433 </select>
@@ -653,6 +654,7 @@
653 654 <label><input type="checkbox" name="event_pipeline_success" value="1" {{if .HookEdit.OnOK}}checked{{end}}> {{t "set.ev.ok"}}</label>
654 655 <label><input type="checkbox" name="event_pipeline_failure" value="1" {{if .HookEdit.OnFail}}checked{{end}}> {{t "set.ev.fail"}}</label>
655 656 <label><input type="checkbox" name="event_release_published" value="1" {{if .HookEdit.OnRel}}checked{{end}}> {{t "set.ev.release"}}</label>
657 <label><input type="checkbox" name="event_issue" value="1" {{if .HookEdit.OnIssue}}checked{{end}}> {{t "set.ev.issue"}}</label>
656 658 </div>
657 659 <div class="acts">
658 660 <button class="fit" type="submit">{{if .HookEdit.ID}}{{t "wh.update"}}{{else}}{{t "set.saveWebhook"}}{{end}}</button>
@@ -726,6 +728,7 @@
726 728 <label>{{t "group.defaultRole"}}
727 729 <select name="default_role">
728 730 <option value="readonly" {{if eq (printf "%s" .Group.DefaultRole) "readonly"}}selected{{end}}>{{t "role.readonly"}}</option>
731 <option value="reporter" {{if eq (printf "%s" .Group.DefaultRole) "reporter"}}selected{{end}}>{{t "role.reporter"}}</option>
729 732 <option value="developer" {{if eq (printf "%s" .Group.DefaultRole) "developer"}}selected{{end}}>{{t "role.developer"}}</option>
730 733 <option value="maintainer" {{if eq (printf "%s" .Group.DefaultRole) "maintainer"}}selected{{end}}>{{t "role.maintainer"}}</option>
731 734 </select>
@@ -103,7 +103,7 @@
103 {{if .Body}}<pre class="pushlist">{{.Body}}</pre>{{end}}
103 {{if .Body}}<pre class="pushlist">{{.Body}}</pre>{{end}}
104 {{if .HTML}}<div class="mdbody">{{.HTML}}</div>{{end}}
104 {{if .HTML}}<div class="mdbody">{{.HTML}}</div>{{end}}
105 {{range .Replies}}<div class="reply"><strong>{{.Actor}}</strong> <span class="muted">{{.When}}</span><div class="mdbody">{{.HTML}}</div></div>{{end}}
105 {{range .Replies}}<div class="reply"><strong>{{.Actor}}</strong> <span class="muted">{{.When}}</span><div class="mdbody">{{.HTML}}</div></div>{{end}}
106 {{if and (eq .Kind "comment") $.CanComment}}<button type="button" class="ghost" data-reply="{{.ID}}" data-reply-name="{{.Actor}}">{{t "mr.reply"}}</button>{{end}}
106 {{if and (eq .Kind "comment") $.CanComment}}<button type="button" class="ghost" data-reply="{{.ID}}" data-reply-name="{{.Actor}}">{{t "mr.reply"}}</button> <a href="/{{$.Repo.FullPath}}/-/issues/new?from=mr&amp;mr={{$.MR.Number}}&amp;note={{.ID}}">{{t "issue.fromComment"}}</a>{{end}}
107 </li>
107 </li>
108 {{end}}
108 {{end}}
109 </ol>
109 </ol>
@@ -427,6 +427,7 @@
427{{define "roleselect"}}
427{{define "roleselect"}}
428<select name="role">
428<select name="role">
429 <option value="readonly" {{if eq . "readonly"}}selected{{end}}>{{t "role.readonly"}}</option>
429 <option value="readonly" {{if eq . "readonly"}}selected{{end}}>{{t "role.readonly"}}</option>
430 <option value="reporter" {{if eq . "reporter"}}selected{{end}}>{{t "role.reporter"}}</option>
430 <option value="developer" {{if eq . "developer"}}selected{{end}}>{{t "role.developer"}}</option>
431 <option value="developer" {{if eq . "developer"}}selected{{end}}>{{t "role.developer"}}</option>
431 <option value="maintainer" {{if eq . "maintainer"}}selected{{end}}>{{t "role.maintainer"}}</option>
432 <option value="maintainer" {{if eq . "maintainer"}}selected{{end}}>{{t "role.maintainer"}}</option>
432</select>
433</select>
@@ -653,6 +654,7 @@
653 <label><input type="checkbox" name="event_pipeline_success" value="1" {{if .HookEdit.OnOK}}checked{{end}}> {{t "set.ev.ok"}}</label>
654 <label><input type="checkbox" name="event_pipeline_success" value="1" {{if .HookEdit.OnOK}}checked{{end}}> {{t "set.ev.ok"}}</label>
654 <label><input type="checkbox" name="event_pipeline_failure" value="1" {{if .HookEdit.OnFail}}checked{{end}}> {{t "set.ev.fail"}}</label>
655 <label><input type="checkbox" name="event_pipeline_failure" value="1" {{if .HookEdit.OnFail}}checked{{end}}> {{t "set.ev.fail"}}</label>
655 <label><input type="checkbox" name="event_release_published" value="1" {{if .HookEdit.OnRel}}checked{{end}}> {{t "set.ev.release"}}</label>
656 <label><input type="checkbox" name="event_release_published" value="1" {{if .HookEdit.OnRel}}checked{{end}}> {{t "set.ev.release"}}</label>
657 <label><input type="checkbox" name="event_issue" value="1" {{if .HookEdit.OnIssue}}checked{{end}}> {{t "set.ev.issue"}}</label>
656 </div>
658 </div>
657 <div class="acts">
659 <div class="acts">
658 <button class="fit" type="submit">{{if .HookEdit.ID}}{{t "wh.update"}}{{else}}{{t "set.saveWebhook"}}{{end}}</button>
660 <button class="fit" type="submit">{{if .HookEdit.ID}}{{t "wh.update"}}{{else}}{{t "set.saveWebhook"}}{{end}}</button>
@@ -726,6 +728,7 @@
726 <label>{{t "group.defaultRole"}}
728 <label>{{t "group.defaultRole"}}
727 <select name="default_role">
729 <select name="default_role">
728 <option value="readonly" {{if eq (printf "%s" .Group.DefaultRole) "readonly"}}selected{{end}}>{{t "role.readonly"}}</option>
730 <option value="readonly" {{if eq (printf "%s" .Group.DefaultRole) "readonly"}}selected{{end}}>{{t "role.readonly"}}</option>
731 <option value="reporter" {{if eq (printf "%s" .Group.DefaultRole) "reporter"}}selected{{end}}>{{t "role.reporter"}}</option>
729 <option value="developer" {{if eq (printf "%s" .Group.DefaultRole) "developer"}}selected{{end}}>{{t "role.developer"}}</option>
732 <option value="developer" {{if eq (printf "%s" .Group.DefaultRole) "developer"}}selected{{end}}>{{t "role.developer"}}</option>
730 <option value="maintainer" {{if eq (printf "%s" .Group.DefaultRole) "maintainer"}}selected{{end}}>{{t "role.maintainer"}}</option>
733 <option value="maintainer" {{if eq (printf "%s" .Group.DefaultRole) "maintainer"}}selected{{end}}>{{t "role.maintainer"}}</option>
731 </select>
734 </select>
internal/server/templates/info.html +3 −0
@@ -62,6 +62,9 @@
62 62 <p>{{t "info.wh.lead"}}</p>
63 63 <p><a href="/api/v1/webhooks/openapi.json">{{t "info.wh.spec"}}</a></p>
64 64 <pre class="spec-example">{{.HookDoc}}</pre>
65 <h2 id="issues">{{t "info.sec.issues"}}</h2>
66 <p>{{t "info.issue.lead"}}</p>
67 <pre class="spec-example">{{.IssueDoc}}</pre>
65 68 <script type="application/json" id="bluegit-ci-spec">{{.SpecJSON}}</script>
66 69 <script type="application/json" id="bluegit-api">{{.APIJSON}}</script>
67 70 </article>
@@ -62,6 +62,9 @@
62 <p>{{t "info.wh.lead"}}</p>
62 <p>{{t "info.wh.lead"}}</p>
63 <p><a href="/api/v1/webhooks/openapi.json">{{t "info.wh.spec"}}</a></p>
63 <p><a href="/api/v1/webhooks/openapi.json">{{t "info.wh.spec"}}</a></p>
64 <pre class="spec-example">{{.HookDoc}}</pre>
64 <pre class="spec-example">{{.HookDoc}}</pre>
65 <h2 id="issues">{{t "info.sec.issues"}}</h2>
66 <p>{{t "info.issue.lead"}}</p>
67 <pre class="spec-example">{{.IssueDoc}}</pre>
65 <script type="application/json" id="bluegit-ci-spec">{{.SpecJSON}}</script>
68 <script type="application/json" id="bluegit-ci-spec">{{.SpecJSON}}</script>
66 <script type="application/json" id="bluegit-api">{{.APIJSON}}</script>
69 <script type="application/json" id="bluegit-api">{{.APIJSON}}</script>
67</article>
70</article>
internal/server/templates/issues.html added +182 −0
@@ -0,0 +1,182 @@
1 {{define "issues"}}
2 {{template "layout-start" .}}
3 <header class="pagehead"><h1>{{t "tab.issues"}}</h1></header>
4 {{if .Issues.CanCreate}}<p><a class="btn" href="/{{.Repo.FullPath}}/-/issues/new">{{t "issue.new"}}</a></p>{{end}}
5 <form class="row" method="get" action="/{{.Repo.FullPath}}/-/issues">
6 <input name="q" value="{{.Issues.Query}}" placeholder="{{t "issue.search"}}">
7 <select name="state">
8 <option value="open"{{if eq .Issues.State "open"}} selected{{end}}>{{t "issue.open"}}</option>
9 <option value="closed"{{if eq .Issues.State "closed"}} selected{{end}}>{{t "issue.closed"}}</option>
10 <option value="all"{{if eq .Issues.State "all"}} selected{{end}}>{{t "issue.all"}}</option>
11 </select>
12 <select name="label">
13 <option value="">{{t "issue.anyLabel"}}</option>
14 {{range .Issues.Labels}}<option value="{{.Name}}"{{if eq .Name $.Issues.Label}} selected{{end}}>{{.Name}}</option>{{end}}
15 </select>
16 <select name="assignee">
17 <option value="">{{t "issue.anyAssignee"}}</option>
18 {{range .Issues.People}}<option value="{{.Name}}"{{if eq .Name $.Issues.Assignee}} selected{{end}}>{{.Name}}</option>{{end}}
19 </select>
20 <button type="submit">{{t "issue.filter"}}</button>
21 </form>
22 <ul class="issuelist">
23 {{range .Issues.List}}
24 <li>
25 <a href="/{{$.Repo.FullPath}}/-/issues/{{.Number}}"><strong>#{{.Number}}</strong> {{.Title}}</a>
26 {{if eq .Status "closed"}}<span class="pill">{{t "issue.closed"}}</span>{{else}}<span class="pill">{{t "issue.open"}}</span>{{end}}
27 {{if .Confidential}}<span class="pill">{{t "issue.confidential"}}</span>{{end}}
28 {{range .Labels}}<span class="lab" style="background:{{.Color}}">{{.Name}}</span>{{end}}
29 <span class="muted">{{.Author}}{{if .Assignees}} · {{.Assignees}}{{end}}{{if .Milestone}} · {{.Milestone}}{{end}}{{if .Due}} · {{.Due}}{{end}}</span>
30 </li>
31 {{else}}
32 <li class="muted">{{t "issue.none"}}</li>
33 {{end}}
34 </ul>
35 {{if .CanAdmin}}
36 <h2>{{t "issue.addLabel"}}</h2>
37 <form class="row" method="post" action="/{{.Repo.FullPath}}/-/issues/labels">
38 <input type="hidden" name="csrf" value="{{.CSRF}}">
39 <input name="name" placeholder="{{t "issue.labels"}}" required>
40 <input name="color" type="color" value="#428fdc">
41 <button type="submit">{{t "issue.addLabel"}}</button>
42 </form>
43 <h2>{{t "issue.addMilestone"}}</h2>
44 <form class="row" method="post" action="/{{.Repo.FullPath}}/-/issues/milestones">
45 <input type="hidden" name="csrf" value="{{.CSRF}}">
46 <input name="title" placeholder="{{t "issue.milestone"}}" required>
47 <input name="due_on" type="date">
48 <button type="submit">{{t "issue.addMilestone"}}</button>
49 </form>
50 {{end}}
51 {{template "layout-end" .}}
52 {{end}}
53
54 {{define "issuenew"}}
55 {{template "layout-start" .}}
56 <header class="pagehead"><h1>{{t "issue.new"}}</h1></header>
57 <form class="panel" method="post" action="/{{.Repo.FullPath}}/-/issues">
58 <input type="hidden" name="csrf" value="{{.CSRF}}">
59 <label>{{t "issue.title"}} <input name="title" value="{{.Issues.FormTitle}}" required></label>
60 <p class="fieldlabel">{{t "issue.description"}}</p>
61 <div class="mdbox" data-md-box data-md-url="/{{.Repo.FullPath}}/-/markdown">
62 <div class="mdtabs" role="tablist">
63 <button type="button" data-md-tab="write" aria-selected="true">{{t "mr.write"}}</button>
64 <button type="button" data-md-tab="preview" aria-selected="false">{{t "mr.preview"}}</button>
65 </div>
66 <div data-md-write><textarea name="description">{{.Issues.FormBody}}</textarea></div>
67 <div class="mdbody" data-md-preview hidden></div>
68 </div>
69 <label class="row"><input type="checkbox" name="confidential" value="1"> {{t "issue.confidential"}}</label>
70 {{if .Issues.CanTriage}}{{template "issuemeta" .}}{{end}}
71 {{if .Issues.Relate}}<label class="row"><input type="checkbox" name="relate" value="{{.Issues.Relate}}" checked> {{t "issue.relate" .Issues.Relate}}</label>{{end}}
72 <button type="submit">{{t "issue.create"}}</button>
73 </form>
74 <script src="/assets/mr.js"></script>
75 {{template "layout-end" .}}
76 {{end}}
77
78 {{define "issuemeta"}}
79 <fieldset class="checks">
80 <legend>{{t "issue.labels"}}</legend>
81 {{range .Issues.Labels}}<label><input type="checkbox" name="label" value="{{.Name}}"{{if .On}} checked{{end}}> <span class="lab" style="background:{{.Color}}">{{.Name}}</span></label>{{else}}<p class="muted">{{t "issue.none"}}</p>{{end}}
82 </fieldset>
83 <fieldset class="checks">
84 <legend>{{t "issue.assignees"}}</legend>
85 {{range .Issues.People}}<label><input type="checkbox" name="assignee" value="{{.Name}}"{{if .On}} checked{{end}}> {{.Name}}</label>{{end}}
86 </fieldset>
87 <label>{{t "issue.milestone"}}
88 <select name="milestone">
89 <option value="">{{t "issue.noMilestone"}}</option>
90 {{range .Issues.Milestones}}<option value="{{.Title}}"{{if eq .Title $.Issues.Milestone}} selected{{end}}>{{.Title}}</option>{{end}}
91 </select>
92 </label>
93 <label>{{t "issue.due"}} <input name="due_on" type="date" value="{{.Issues.Due}}"></label>
94 {{end}}
95
96 {{define "issue"}}
97 {{template "layout-start" .}}
98 <header class="pagehead"><h1>#{{.Issues.One.Number}} {{.Issues.One.Title}}</h1></header>
99 <p class="issue-meta">
100 {{if eq .Issues.One.Status "closed"}}<span class="pill">{{t "issue.closed"}}</span>{{else}}<span class="pill">{{t "issue.open"}}</span>{{end}}
101 {{if .Issues.One.Confidential}}<span class="pill">{{t "issue.confidential"}}</span>{{end}}
102 {{range .Issues.One.Labels}}<span class="lab" style="background:{{.Color}}">{{.Name}}</span>{{end}}
103 <span class="muted">{{t "issue.by" .Issues.One.Author}}{{if .Issues.One.Assignees}} · {{.Issues.One.Assignees}}{{end}}{{if .Issues.One.Milestone}} · {{.Issues.One.Milestone}}{{end}}{{if .Issues.One.Due}} · {{.Issues.One.Due}}{{end}}</span>
104 </p>
105 <div class="mdbody">{{.Issues.One.HTML}}</div>
106 {{if .Issues.Related}}
107 <h2>{{t "issue.related"}}</h2>
108 <ul class="clean">{{range .Issues.Related}}<li><a href="/{{$.Repo.FullPath}}/-/issues/{{.Number}}">#{{.Number}} {{.Title}}</a></li>{{end}}</ul>
109 {{end}}
110 {{if .Issues.CanCreate}}<p><a href="/{{.Repo.FullPath}}/-/issues/new?relate={{.Issues.One.Number}}">{{t "issue.relatedNew"}}</a></p>{{end}}
111 {{if .Issues.CanClose}}
112 <form method="post" action="/{{.Repo.FullPath}}/-/issues/{{.Issues.One.Number}}">
113 <input type="hidden" name="csrf" value="{{.CSRF}}">
114 <input type="hidden" name="action" value="close">
115 <button type="submit">{{t "issue.close"}}</button>
116 </form>
117 {{end}}
118 {{if .Issues.CanReopen}}
119 <form method="post" action="/{{.Repo.FullPath}}/-/issues/{{.Issues.One.Number}}">
120 <input type="hidden" name="csrf" value="{{.CSRF}}">
121 <input type="hidden" name="action" value="reopen">
122 <button type="submit">{{t "issue.reopen"}}</button>
123 </form>
124 {{end}}
125 {{if .Issues.CanEdit}}
126 <h2>{{t "issue.edit"}}</h2>
127 <form class="panel" method="post" action="/{{.Repo.FullPath}}/-/issues/{{.Issues.One.Number}}">
128 <input type="hidden" name="csrf" value="{{.CSRF}}">
129 <input type="hidden" name="action" value="update">
130 <label>{{t "issue.title"}} <input name="title" value="{{.Issues.FormTitle}}" required></label>
131 <p class="fieldlabel">{{t "issue.description"}}</p>
132 <div class="mdbox" data-md-box data-md-url="/{{.Repo.FullPath}}/-/markdown">
133 <div class="mdtabs" role="tablist">
134 <button type="button" data-md-tab="write" aria-selected="true">{{t "mr.write"}}</button>
135 <button type="button" data-md-tab="preview" aria-selected="false">{{t "mr.preview"}}</button>
136 </div>
137 <div data-md-write><textarea name="description">{{.Issues.FormBody}}</textarea></div>
138 <div class="mdbody" data-md-preview hidden></div>
139 </div>
140 <button type="submit">{{t "issue.save"}}</button>
141 </form>
142 {{end}}
143 {{if .Issues.CanTriage}}
144 <h2>{{t "issue.meta"}}</h2>
145 <form class="panel" method="post" action="/{{.Repo.FullPath}}/-/issues/{{.Issues.One.Number}}">
146 <input type="hidden" name="csrf" value="{{.CSRF}}">
147 <input type="hidden" name="action" value="meta">
148 {{template "issuemeta" .}}
149 <label class="row"><input type="checkbox" name="confidential" value="1"{{if .Issues.Confidential}} checked{{end}}> {{t "issue.confidential"}}</label>
150 <button type="submit">{{t "issue.save"}}</button>
151 </form>
152 {{end}}
153 {{if .Issues.CanDelete}}
154 <form method="post" action="/{{.Repo.FullPath}}/-/issues/{{.Issues.One.Number}}">
155 <input type="hidden" name="csrf" value="{{.CSRF}}">
156 <input type="hidden" name="action" value="delete">
157 <button type="submit" class="ghost">{{t "issue.delete"}}</button>
158 </form>
159 {{end}}
160 <h2>{{t "issue.comments"}}</h2>
161 {{range .Issues.Notes}}
162 <article class="panel"><strong>{{.Author}}</strong> <span class="muted">{{.When}}</span><div class="mdbody">{{.HTML}}</div></article>
163 {{else}}<p class="muted">{{t "issue.none"}}</p>{{end}}
164 {{if .Issues.CanCreate}}
165 <form class="panel" method="post" action="/{{.Repo.FullPath}}/-/issues/{{.Issues.One.Number}}">
166 <input type="hidden" name="csrf" value="{{.CSRF}}">
167 <input type="hidden" name="action" value="note">
168 <p class="fieldlabel">{{t "issue.comment"}}</p>
169 <div class="mdbox" data-md-box data-md-url="/{{.Repo.FullPath}}/-/markdown">
170 <div class="mdtabs" role="tablist">
171 <button type="button" data-md-tab="write" aria-selected="true">{{t "mr.write"}}</button>
172 <button type="button" data-md-tab="preview" aria-selected="false">{{t "mr.preview"}}</button>
173 </div>
174 <div data-md-write><textarea name="body" required></textarea></div>
175 <div class="mdbody" data-md-preview hidden></div>
176 </div>
177 <button type="submit">{{t "action.post"}}</button>
178 </form>
179 <script src="/assets/mr.js"></script>
180 {{end}}
181 {{template "layout-end" .}}
182 {{end}}
@@ -0,0 +1,182 @@
1{{define "issues"}}
2{{template "layout-start" .}}
3<header class="pagehead"><h1>{{t "tab.issues"}}</h1></header>
4{{if .Issues.CanCreate}}<p><a class="btn" href="/{{.Repo.FullPath}}/-/issues/new">{{t "issue.new"}}</a></p>{{end}}
5<form class="row" method="get" action="/{{.Repo.FullPath}}/-/issues">
6 <input name="q" value="{{.Issues.Query}}" placeholder="{{t "issue.search"}}">
7 <select name="state">
8 <option value="open"{{if eq .Issues.State "open"}} selected{{end}}>{{t "issue.open"}}</option>
9 <option value="closed"{{if eq .Issues.State "closed"}} selected{{end}}>{{t "issue.closed"}}</option>
10 <option value="all"{{if eq .Issues.State "all"}} selected{{end}}>{{t "issue.all"}}</option>
11 </select>
12 <select name="label">
13 <option value="">{{t "issue.anyLabel"}}</option>
14 {{range .Issues.Labels}}<option value="{{.Name}}"{{if eq .Name $.Issues.Label}} selected{{end}}>{{.Name}}</option>{{end}}
15 </select>
16 <select name="assignee">
17 <option value="">{{t "issue.anyAssignee"}}</option>
18 {{range .Issues.People}}<option value="{{.Name}}"{{if eq .Name $.Issues.Assignee}} selected{{end}}>{{.Name}}</option>{{end}}
19 </select>
20 <button type="submit">{{t "issue.filter"}}</button>
21</form>
22<ul class="issuelist">
23 {{range .Issues.List}}
24 <li>
25 <a href="/{{$.Repo.FullPath}}/-/issues/{{.Number}}"><strong>#{{.Number}}</strong> {{.Title}}</a>
26 {{if eq .Status "closed"}}<span class="pill">{{t "issue.closed"}}</span>{{else}}<span class="pill">{{t "issue.open"}}</span>{{end}}
27 {{if .Confidential}}<span class="pill">{{t "issue.confidential"}}</span>{{end}}
28 {{range .Labels}}<span class="lab" style="background:{{.Color}}">{{.Name}}</span>{{end}}
29 <span class="muted">{{.Author}}{{if .Assignees}} · {{.Assignees}}{{end}}{{if .Milestone}} · {{.Milestone}}{{end}}{{if .Due}} · {{.Due}}{{end}}</span>
30 </li>
31 {{else}}
32 <li class="muted">{{t "issue.none"}}</li>
33 {{end}}
34</ul>
35{{if .CanAdmin}}
36<h2>{{t "issue.addLabel"}}</h2>
37<form class="row" method="post" action="/{{.Repo.FullPath}}/-/issues/labels">
38 <input type="hidden" name="csrf" value="{{.CSRF}}">
39 <input name="name" placeholder="{{t "issue.labels"}}" required>
40 <input name="color" type="color" value="#428fdc">
41 <button type="submit">{{t "issue.addLabel"}}</button>
42</form>
43<h2>{{t "issue.addMilestone"}}</h2>
44<form class="row" method="post" action="/{{.Repo.FullPath}}/-/issues/milestones">
45 <input type="hidden" name="csrf" value="{{.CSRF}}">
46 <input name="title" placeholder="{{t "issue.milestone"}}" required>
47 <input name="due_on" type="date">
48 <button type="submit">{{t "issue.addMilestone"}}</button>
49</form>
50{{end}}
51{{template "layout-end" .}}
52{{end}}
53
54{{define "issuenew"}}
55{{template "layout-start" .}}
56<header class="pagehead"><h1>{{t "issue.new"}}</h1></header>
57<form class="panel" method="post" action="/{{.Repo.FullPath}}/-/issues">
58 <input type="hidden" name="csrf" value="{{.CSRF}}">
59 <label>{{t "issue.title"}} <input name="title" value="{{.Issues.FormTitle}}" required></label>
60 <p class="fieldlabel">{{t "issue.description"}}</p>
61 <div class="mdbox" data-md-box data-md-url="/{{.Repo.FullPath}}/-/markdown">
62 <div class="mdtabs" role="tablist">
63 <button type="button" data-md-tab="write" aria-selected="true">{{t "mr.write"}}</button>
64 <button type="button" data-md-tab="preview" aria-selected="false">{{t "mr.preview"}}</button>
65 </div>
66 <div data-md-write><textarea name="description">{{.Issues.FormBody}}</textarea></div>
67 <div class="mdbody" data-md-preview hidden></div>
68 </div>
69 <label class="row"><input type="checkbox" name="confidential" value="1"> {{t "issue.confidential"}}</label>
70 {{if .Issues.CanTriage}}{{template "issuemeta" .}}{{end}}
71 {{if .Issues.Relate}}<label class="row"><input type="checkbox" name="relate" value="{{.Issues.Relate}}" checked> {{t "issue.relate" .Issues.Relate}}</label>{{end}}
72 <button type="submit">{{t "issue.create"}}</button>
73</form>
74<script src="/assets/mr.js"></script>
75{{template "layout-end" .}}
76{{end}}
77
78{{define "issuemeta"}}
79<fieldset class="checks">
80 <legend>{{t "issue.labels"}}</legend>
81 {{range .Issues.Labels}}<label><input type="checkbox" name="label" value="{{.Name}}"{{if .On}} checked{{end}}> <span class="lab" style="background:{{.Color}}">{{.Name}}</span></label>{{else}}<p class="muted">{{t "issue.none"}}</p>{{end}}
82</fieldset>
83<fieldset class="checks">
84 <legend>{{t "issue.assignees"}}</legend>
85 {{range .Issues.People}}<label><input type="checkbox" name="assignee" value="{{.Name}}"{{if .On}} checked{{end}}> {{.Name}}</label>{{end}}
86</fieldset>
87<label>{{t "issue.milestone"}}
88 <select name="milestone">
89 <option value="">{{t "issue.noMilestone"}}</option>
90 {{range .Issues.Milestones}}<option value="{{.Title}}"{{if eq .Title $.Issues.Milestone}} selected{{end}}>{{.Title}}</option>{{end}}
91 </select>
92</label>
93<label>{{t "issue.due"}} <input name="due_on" type="date" value="{{.Issues.Due}}"></label>
94{{end}}
95
96{{define "issue"}}
97{{template "layout-start" .}}
98<header class="pagehead"><h1>#{{.Issues.One.Number}} {{.Issues.One.Title}}</h1></header>
99<p class="issue-meta">
100 {{if eq .Issues.One.Status "closed"}}<span class="pill">{{t "issue.closed"}}</span>{{else}}<span class="pill">{{t "issue.open"}}</span>{{end}}
101 {{if .Issues.One.Confidential}}<span class="pill">{{t "issue.confidential"}}</span>{{end}}
102 {{range .Issues.One.Labels}}<span class="lab" style="background:{{.Color}}">{{.Name}}</span>{{end}}
103 <span class="muted">{{t "issue.by" .Issues.One.Author}}{{if .Issues.One.Assignees}} · {{.Issues.One.Assignees}}{{end}}{{if .Issues.One.Milestone}} · {{.Issues.One.Milestone}}{{end}}{{if .Issues.One.Due}} · {{.Issues.One.Due}}{{end}}</span>
104</p>
105<div class="mdbody">{{.Issues.One.HTML}}</div>
106{{if .Issues.Related}}
107<h2>{{t "issue.related"}}</h2>
108<ul class="clean">{{range .Issues.Related}}<li><a href="/{{$.Repo.FullPath}}/-/issues/{{.Number}}">#{{.Number}} {{.Title}}</a></li>{{end}}</ul>
109{{end}}
110{{if .Issues.CanCreate}}<p><a href="/{{.Repo.FullPath}}/-/issues/new?relate={{.Issues.One.Number}}">{{t "issue.relatedNew"}}</a></p>{{end}}
111{{if .Issues.CanClose}}
112<form method="post" action="/{{.Repo.FullPath}}/-/issues/{{.Issues.One.Number}}">
113 <input type="hidden" name="csrf" value="{{.CSRF}}">
114 <input type="hidden" name="action" value="close">
115 <button type="submit">{{t "issue.close"}}</button>
116</form>
117{{end}}
118{{if .Issues.CanReopen}}
119<form method="post" action="/{{.Repo.FullPath}}/-/issues/{{.Issues.One.Number}}">
120 <input type="hidden" name="csrf" value="{{.CSRF}}">
121 <input type="hidden" name="action" value="reopen">
122 <button type="submit">{{t "issue.reopen"}}</button>
123</form>
124{{end}}
125{{if .Issues.CanEdit}}
126<h2>{{t "issue.edit"}}</h2>
127<form class="panel" method="post" action="/{{.Repo.FullPath}}/-/issues/{{.Issues.One.Number}}">
128 <input type="hidden" name="csrf" value="{{.CSRF}}">
129 <input type="hidden" name="action" value="update">
130 <label>{{t "issue.title"}} <input name="title" value="{{.Issues.FormTitle}}" required></label>
131 <p class="fieldlabel">{{t "issue.description"}}</p>
132 <div class="mdbox" data-md-box data-md-url="/{{.Repo.FullPath}}/-/markdown">
133 <div class="mdtabs" role="tablist">
134 <button type="button" data-md-tab="write" aria-selected="true">{{t "mr.write"}}</button>
135 <button type="button" data-md-tab="preview" aria-selected="false">{{t "mr.preview"}}</button>
136 </div>
137 <div data-md-write><textarea name="description">{{.Issues.FormBody}}</textarea></div>
138 <div class="mdbody" data-md-preview hidden></div>
139 </div>
140 <button type="submit">{{t "issue.save"}}</button>
141</form>
142{{end}}
143{{if .Issues.CanTriage}}
144<h2>{{t "issue.meta"}}</h2>
145<form class="panel" method="post" action="/{{.Repo.FullPath}}/-/issues/{{.Issues.One.Number}}">
146 <input type="hidden" name="csrf" value="{{.CSRF}}">
147 <input type="hidden" name="action" value="meta">
148 {{template "issuemeta" .}}
149 <label class="row"><input type="checkbox" name="confidential" value="1"{{if .Issues.Confidential}} checked{{end}}> {{t "issue.confidential"}}</label>
150 <button type="submit">{{t "issue.save"}}</button>
151</form>
152{{end}}
153{{if .Issues.CanDelete}}
154<form method="post" action="/{{.Repo.FullPath}}/-/issues/{{.Issues.One.Number}}">
155 <input type="hidden" name="csrf" value="{{.CSRF}}">
156 <input type="hidden" name="action" value="delete">
157 <button type="submit" class="ghost">{{t "issue.delete"}}</button>
158</form>
159{{end}}
160<h2>{{t "issue.comments"}}</h2>
161{{range .Issues.Notes}}
162<article class="panel"><strong>{{.Author}}</strong> <span class="muted">{{.When}}</span><div class="mdbody">{{.HTML}}</div></article>
163{{else}}<p class="muted">{{t "issue.none"}}</p>{{end}}
164{{if .Issues.CanCreate}}
165<form class="panel" method="post" action="/{{.Repo.FullPath}}/-/issues/{{.Issues.One.Number}}">
166 <input type="hidden" name="csrf" value="{{.CSRF}}">
167 <input type="hidden" name="action" value="note">
168 <p class="fieldlabel">{{t "issue.comment"}}</p>
169 <div class="mdbox" data-md-box data-md-url="/{{.Repo.FullPath}}/-/markdown">
170 <div class="mdtabs" role="tablist">
171 <button type="button" data-md-tab="write" aria-selected="true">{{t "mr.write"}}</button>
172 <button type="button" data-md-tab="preview" aria-selected="false">{{t "mr.preview"}}</button>
173 </div>
174 <div data-md-write><textarea name="body" required></textarea></div>
175 <div class="mdbody" data-md-preview hidden></div>
176 </div>
177 <button type="submit">{{t "action.post"}}</button>
178</form>
179<script src="/assets/mr.js"></script>
180{{end}}
181{{template "layout-end" .}}
182{{end}}
internal/server/templates/layout.html +1 −0
@@ -66,6 +66,7 @@
66 66 <a href="/{{.Repo.FullPath}}/-/branches"{{if eq .Page "branches"}} class="on"{{end}}>{{t "tab.branches"}}</a>
67 67 <a href="/{{.Repo.FullPath}}/-/tags"{{if eq .Page "tags"}} class="on"{{end}}>{{t "tab.tags"}}</a>
68 68 <a href="/{{.Repo.FullPath}}/-/merge-requests"{{if or (eq .Page "mrs") (eq .Page "mr")}} class="on"{{end}}>{{t "tab.mrs"}}</a>
69 <a href="/{{.Repo.FullPath}}/-/issues"{{if or (eq .Page "issues") (eq .Page "issue") (eq .Page "issuenew")}} class="on"{{end}}>{{t "tab.issues"}}</a>
69 70 <a href="/{{.Repo.FullPath}}/-/pipelines"{{if or (eq .Page "pipelines") (eq .Page "editor")}} class="on"{{end}}>{{t "tab.pipelines"}}</a>
70 71 <a href="/{{.Repo.FullPath}}/-/releases"{{if eq .Page "releases"}} class="on"{{end}}>{{t "tab.releases"}}</a>
71 72 {{if .CanAdmin}}<a href="/{{.Repo.FullPath}}/-/settings"{{if eq .Page "settings"}} class="on"{{end}}>{{t "tab.settings"}}</a>{{end}}
@@ -66,6 +66,7 @@
66 <a href="/{{.Repo.FullPath}}/-/branches"{{if eq .Page "branches"}} class="on"{{end}}>{{t "tab.branches"}}</a>
66 <a href="/{{.Repo.FullPath}}/-/branches"{{if eq .Page "branches"}} class="on"{{end}}>{{t "tab.branches"}}</a>
67 <a href="/{{.Repo.FullPath}}/-/tags"{{if eq .Page "tags"}} class="on"{{end}}>{{t "tab.tags"}}</a>
67 <a href="/{{.Repo.FullPath}}/-/tags"{{if eq .Page "tags"}} class="on"{{end}}>{{t "tab.tags"}}</a>
68 <a href="/{{.Repo.FullPath}}/-/merge-requests"{{if or (eq .Page "mrs") (eq .Page "mr")}} class="on"{{end}}>{{t "tab.mrs"}}</a>
68 <a href="/{{.Repo.FullPath}}/-/merge-requests"{{if or (eq .Page "mrs") (eq .Page "mr")}} class="on"{{end}}>{{t "tab.mrs"}}</a>
69 <a href="/{{.Repo.FullPath}}/-/issues"{{if or (eq .Page "issues") (eq .Page "issue") (eq .Page "issuenew")}} class="on"{{end}}>{{t "tab.issues"}}</a>
69 <a href="/{{.Repo.FullPath}}/-/pipelines"{{if or (eq .Page "pipelines") (eq .Page "editor")}} class="on"{{end}}>{{t "tab.pipelines"}}</a>
70 <a href="/{{.Repo.FullPath}}/-/pipelines"{{if or (eq .Page "pipelines") (eq .Page "editor")}} class="on"{{end}}>{{t "tab.pipelines"}}</a>
70 <a href="/{{.Repo.FullPath}}/-/releases"{{if eq .Page "releases"}} class="on"{{end}}>{{t "tab.releases"}}</a>
71 <a href="/{{.Repo.FullPath}}/-/releases"{{if eq .Page "releases"}} class="on"{{end}}>{{t "tab.releases"}}</a>
71 {{if .CanAdmin}}<a href="/{{.Repo.FullPath}}/-/settings"{{if eq .Page "settings"}} class="on"{{end}}>{{t "tab.settings"}}</a>{{end}}
72 {{if .CanAdmin}}<a href="/{{.Repo.FullPath}}/-/settings"{{if eq .Page "settings"}} class="on"{{end}}>{{t "tab.settings"}}</a>{{end}}
internal/server/templates/pages.html +1 −0
@@ -144,6 +144,7 @@
144 144 <label>{{t "new.role"}}
145 145 <select name="default_role">
146 146 <option value="readonly">{{t "role.readonly"}}</option>
147 <option value="reporter">{{t "role.reporter"}}</option>
147 148 <option value="developer" selected>{{t "role.developer"}}</option>
148 149 <option value="maintainer">{{t "role.maintainer"}}</option>
149 150 </select>
@@ -144,6 +144,7 @@
144 <label>{{t "new.role"}}
144 <label>{{t "new.role"}}
145 <select name="default_role">
145 <select name="default_role">
146 <option value="readonly">{{t "role.readonly"}}</option>
146 <option value="readonly">{{t "role.readonly"}}</option>
147 <option value="reporter">{{t "role.reporter"}}</option>
147 <option value="developer" selected>{{t "role.developer"}}</option>
148 <option value="developer" selected>{{t "role.developer"}}</option>
148 <option value="maintainer">{{t "role.maintainer"}}</option>
149 <option value="maintainer">{{t "role.maintainer"}}</option>
149 </select>
150 </select>
internal/store/issues.go added +688 −0
@@ -0,0 +1,688 @@
1 package store
2
3 import (
4 "context"
5 "database/sql"
6 "errors"
7 "regexp"
8 "sort"
9 "strconv"
10 "strings"
11 "time"
12 "unicode"
13
14 "gitlab.com/Timfa/bluegit/internal/i18n"
15 )
16
17 // Label is een label binnen één repository.
18 type Label struct {
19 ID int64
20 RepoID int64
21 Name string
22 Color string
23 }
24
25 // Milestone is een mijlpaal binnen één repository.
26 type Milestone struct {
27 ID int64
28 RepoID int64
29 Title string
30 DueOn string
31 State string
32 }
33
34 // Issue is één issue, genummerd per repository.
35 type Issue struct {
36 ID int64
37 RepoID int64
38 Number int64
39 Title string
40 Description string
41 AuthorID int64
42 Author string
43 Status string
44 Confidential bool
45 MilestoneID int64
46 Milestone string
47 DueOn string
48 CreatedAt time.Time
49 UpdatedAt time.Time
50 ClosedAt time.Time
51 Labels []Label
52 AssigneeIDs []int64
53 Assignees []string
54 }
55
56 // IssueNote is een reactie op een issue.
57 type IssueNote struct {
58 ID int64
59 RepoID int64
60 IssueID int64
61 AuthorID int64
62 Author string
63 Body string
64 CreatedAt time.Time
65 }
66
67 // IssueFilter beperkt de lijst. State is open, closed of all.
68 type IssueFilter struct {
69 State string
70 Query string
71 Label string
72 Assignee string
73 ViewerID int64
74 Triage bool
75 }
76
77 // NewIssue is de invoer voor een nieuw issue.
78 type NewIssue struct {
79 Title string
80 Description string
81 Confidential bool
82 MilestoneID int64
83 DueOn string
84 LabelIDs []int64
85 AssigneeIDs []int64
86 }
87
88 var labelColor = regexp.MustCompile(`^#[0-9a-fA-F]{6}$`)
89
90 // ValidDue eist leeg of YYYY-MM-DD.
91 func ValidDue(s string) error {
92 s = strings.TrimSpace(s)
93 if s == "" {
94 return nil
95 }
96 if _, err := time.Parse("2006-01-02", s); err != nil {
97 return i18n.E("err.issueDue")
98 }
99 return nil
100 }
101
102 // ValidLabelName eist letters, cijfers, spaties, streepjes of underscores.
103 func ValidLabelName(s string) error {
104 s = strings.TrimSpace(s)
105 if s == "" || len([]rune(s)) > 50 {
106 return i18n.E("err.labelName")
107 }
108 for _, r := range s {
109 if r == ' ' || r == '-' || r == '_' || unicode.IsLetter(r) || unicode.IsDigit(r) {
110 continue
111 }
112 return i18n.E("err.labelName")
113 }
114 return nil
115 }
116
117 // NormalizeColor vult de standaardkleur aan of keurt een hexkleur goed.
118 func NormalizeColor(s string) (string, error) {
119 s = strings.TrimSpace(s)
120 if s == "" {
121 return "#428fdc", nil
122 }
123 if !labelColor.MatchString(s) {
124 return "", i18n.E("err.labelColor")
125 }
126 return strings.ToLower(s), nil
127 }
128
129 // ValidMilestoneTitle eist een korte titel.
130 func ValidMilestoneTitle(s string) error {
131 s = strings.TrimSpace(s)
132 if s == "" || len([]rune(s)) > 80 {
133 return i18n.E("err.milestoneName")
134 }
135 for _, r := range s {
136 if r == ' ' || r == '-' || r == '_' || r == '.' || unicode.IsLetter(r) || unicode.IsDigit(r) {
137 continue
138 }
139 return i18n.E("err.milestoneName")
140 }
141 return nil
142 }
143
144 func limitIssueText(s string) error {
145 if len([]rune(s)) > 20000 {
146 return i18n.E("err.issueBody")
147 }
148 return nil
149 }
150
151 // UpsertLabel maakt een label of werkt de kleur bij.
152 func (s *Store) UpsertLabel(ctx context.Context, repoID int64, name, color string) (Label, error) {
153 name = strings.TrimSpace(name)
154 if err := ValidLabelName(name); err != nil {
155 return Label{}, err
156 }
157 color, err := NormalizeColor(color)
158 if err != nil {
159 return Label{}, err
160 }
161 if _, err := s.db.ExecContext(ctx, `INSERT INTO labels (repo_id, name, color) VALUES (?, ?, ?)
162 ON CONFLICT(repo_id, name) DO UPDATE SET color = excluded.color`, repoID, name, color); err != nil {
163 return Label{}, err
164 }
165 return s.LabelByName(ctx, repoID, name)
166 }
167
168 // LabelByName leest één label.
169 func (s *Store) LabelByName(ctx context.Context, repoID int64, name string) (Label, error) {
170 var l Label
171 err := s.db.QueryRowContext(ctx, `SELECT id, repo_id, name, color FROM labels WHERE repo_id = ? AND name = ?`, repoID, strings.TrimSpace(name)).
172 Scan(&l.ID, &l.RepoID, &l.Name, &l.Color)
173 if errors.Is(err, sql.ErrNoRows) {
174 return Label{}, errNotFound
175 }
176 return l, err
177 }
178
179 // ListLabels geeft de labels op naam.
180 func (s *Store) ListLabels(ctx context.Context, repoID int64) ([]Label, error) {
181 rows, err := s.db.QueryContext(ctx, `SELECT id, repo_id, name, color FROM labels WHERE repo_id = ? ORDER BY name`, repoID)
182 if err != nil {
183 return nil, err
184 }
185 defer rows.Close()
186 out := []Label{}
187 for rows.Next() {
188 var l Label
189 if err := rows.Scan(&l.ID, &l.RepoID, &l.Name, &l.Color); err != nil {
190 return nil, err
191 }
192 out = append(out, l)
193 }
194 return out, rows.Err()
195 }
196
197 // UpsertMilestone maakt een mijlpaal of werkt de datum bij.
198 func (s *Store) UpsertMilestone(ctx context.Context, repoID int64, title, due string) (Milestone, error) {
199 title = strings.TrimSpace(title)
200 if err := ValidMilestoneTitle(title); err != nil {
201 return Milestone{}, err
202 }
203 due = strings.TrimSpace(due)
204 if err := ValidDue(due); err != nil {
205 return Milestone{}, err
206 }
207 if _, err := s.db.ExecContext(ctx, `INSERT INTO milestones (repo_id, title, due_on, state) VALUES (?, ?, ?, 'open')
208 ON CONFLICT(repo_id, title) DO UPDATE SET due_on = excluded.due_on`, repoID, title, due); err != nil {
209 return Milestone{}, err
210 }
211 return s.MilestoneByTitle(ctx, repoID, title)
212 }
213
214 // MilestoneByTitle leest één mijlpaal.
215 func (s *Store) MilestoneByTitle(ctx context.Context, repoID int64, title string) (Milestone, error) {
216 var m Milestone
217 err := s.db.QueryRowContext(ctx, `SELECT id, repo_id, title, due_on, state FROM milestones WHERE repo_id = ? AND title = ?`, repoID, strings.TrimSpace(title)).
218 Scan(&m.ID, &m.RepoID, &m.Title, &m.DueOn, &m.State)
219 if errors.Is(err, sql.ErrNoRows) {
220 return Milestone{}, errNotFound
221 }
222 return m, err
223 }
224
225 // ListMilestones geeft de mijlpalen op titel.
226 func (s *Store) ListMilestones(ctx context.Context, repoID int64) ([]Milestone, error) {
227 rows, err := s.db.QueryContext(ctx, `SELECT id, repo_id, title, due_on, state FROM milestones WHERE repo_id = ? ORDER BY title`, repoID)
228 if err != nil {
229 return nil, err
230 }
231 defer rows.Close()
232 out := []Milestone{}
233 for rows.Next() {
234 var m Milestone
235 if err := rows.Scan(&m.ID, &m.RepoID, &m.Title, &m.DueOn, &m.State); err != nil {
236 return nil, err
237 }
238 out = append(out, m)
239 }
240 return out, rows.Err()
241 }
242
243 const issueSelect = `SELECT i.id, i.repo_id, i.number, i.title, i.description, i.author_id, u.username,
244 i.status, i.confidential, i.milestone_id, COALESCE(m.title, ''), i.due_on, i.created_at, i.updated_at, i.closed_at,
245 COALESCE((SELECT group_concat(l.id || char(31) || l.name || char(31) || l.color, char(30)) FROM issue_labels il JOIN labels l ON l.id = il.label_id WHERE il.issue_id = i.id), ''),
246 COALESCE((SELECT group_concat(au.id || char(31) || au.username, char(30)) FROM issue_assignees ia JOIN users au ON au.id = ia.user_id WHERE ia.issue_id = i.id), '')
247 FROM issues i
248 JOIN users u ON u.id = i.author_id
249 LEFT JOIN milestones m ON m.id = i.milestone_id AND m.id <> 0`
250
251 // CreateIssue nummert per repository en zet labels en toewijzingen.
252 func (s *Store) CreateIssue(ctx context.Context, repoID, authorID int64, in NewIssue) (Issue, error) {
253 title := trim(strings.TrimSpace(in.Title), 200)
254 if title == "" {
255 return Issue{}, i18n.E("err.issueTitle")
256 }
257 if err := limitIssueText(in.Description); err != nil {
258 return Issue{}, err
259 }
260 in.DueOn = strings.TrimSpace(in.DueOn)
261 if err := ValidDue(in.DueOn); err != nil {
262 return Issue{}, err
263 }
264 tx, err := s.db.BeginTx(ctx, nil)
265 if err != nil {
266 return Issue{}, err
267 }
268 defer func() { _ = tx.Rollback() }()
269 if err := ensureIssueRefs(ctx, tx, repoID, in.MilestoneID, in.LabelIDs, in.AssigneeIDs); err != nil {
270 return Issue{}, err
271 }
272 var n int64
273 if err := tx.QueryRowContext(ctx, `SELECT COALESCE(MAX(number), 0) FROM issues WHERE repo_id = ?`, repoID).Scan(&n); err != nil {
274 return Issue{}, err
275 }
276 ts := now()
277 conf := 0
278 if in.Confidential {
279 conf = 1
280 }
281 res, err := tx.ExecContext(ctx, `INSERT INTO issues (repo_id, number, title, description, author_id, status, confidential, milestone_id, due_on, created_at, updated_at)
282 VALUES (?, ?, ?, ?, ?, 'open', ?, ?, ?, ?, ?)`, repoID, n+1, title, in.Description, authorID, conf, in.MilestoneID, in.DueOn, ts, ts)
283 if err != nil {
284 return Issue{}, err
285 }
286 id, _ := res.LastInsertId()
287 if err := replaceIssueLinks(ctx, tx, id, in.LabelIDs, in.AssigneeIDs); err != nil {
288 return Issue{}, err
289 }
290 if err := tx.Commit(); err != nil {
291 return Issue{}, err
292 }
293 return s.IssueByNumber(ctx, repoID, n+1)
294 }
295
296 // IssueByNumber leest #nummer.
297 func (s *Store) IssueByNumber(ctx context.Context, repoID, number int64) (Issue, error) {
298 row := s.db.QueryRowContext(ctx, issueSelect+` WHERE i.repo_id = ? AND i.number = ?`, repoID, number)
299 return scanIssue(row)
300 }
301
302 // ListIssues geeft issues, nieuwste nummer eerst.
303 // Zonder triage blijven andermans vertrouwelijke issues weg.
304 func (s *Store) ListIssues(ctx context.Context, repoID int64, f IssueFilter) ([]Issue, error) {
305 q := issueSelect + ` WHERE i.repo_id = ?`
306 args := []any{repoID}
307 if !f.Triage {
308 q += ` AND (i.confidential = 0 OR i.author_id = ?)`
309 args = append(args, f.ViewerID)
310 }
311 switch f.State {
312 case "closed":
313 q += ` AND i.status = 'closed'`
314 case "all":
315 default:
316 q += ` AND i.status = 'open'`
317 }
318 if strings.TrimSpace(f.Query) != "" {
319 q += ` AND (instr(lower(i.title), lower(?)) > 0 OR instr(lower(i.description), lower(?)) > 0)`
320 args = append(args, strings.TrimSpace(f.Query), strings.TrimSpace(f.Query))
321 }
322 if strings.TrimSpace(f.Label) != "" {
323 q += ` AND EXISTS (SELECT 1 FROM issue_labels il JOIN labels l ON l.id = il.label_id WHERE il.issue_id = i.id AND l.name = ?)`
324 args = append(args, strings.TrimSpace(f.Label))
325 }
326 if strings.TrimSpace(f.Assignee) != "" {
327 q += ` AND EXISTS (SELECT 1 FROM issue_assignees ia JOIN users au ON au.id = ia.user_id WHERE ia.issue_id = i.id AND au.username = ?)`
328 args = append(args, strings.ToLower(strings.TrimSpace(f.Assignee)))
329 }
330 q += ` ORDER BY i.number DESC`
331 rows, err := s.db.QueryContext(ctx, q, args...)
332 if err != nil {
333 return nil, err
334 }
335 defer rows.Close()
336 out := []Issue{}
337 for rows.Next() {
338 iss, err := scanIssue(rows)
339 if err != nil {
340 return nil, err
341 }
342 out = append(out, iss)
343 }
344 return out, rows.Err()
345 }
346
347 // UpdateIssueText wijzigt titel en beschrijving.
348 func (s *Store) UpdateIssueText(ctx context.Context, id int64, title, description string) error {
349 title = trim(strings.TrimSpace(title), 200)
350 if title == "" {
351 return i18n.E("err.issueTitle")
352 }
353 if err := limitIssueText(description); err != nil {
354 return err
355 }
356 _, err := s.db.ExecContext(ctx, `UPDATE issues SET title = ?, description = ?, updated_at = ? WHERE id = ?`, title, description, now(), id)
357 return err
358 }
359
360 // SetIssueMeta wijzigt vertrouwelijkheid, mijlpaal en vervaldatum.
361 func (s *Store) SetIssueMeta(ctx context.Context, repoID, id, milestoneID int64, confidential bool, due string) error {
362 due = strings.TrimSpace(due)
363 if err := ValidDue(due); err != nil {
364 return err
365 }
366 if err := ensureIssueRefs(ctx, s.db, repoID, milestoneID, nil, nil); err != nil {
367 return err
368 }
369 flag := 0
370 if confidential {
371 flag = 1
372 }
373 _, err := s.db.ExecContext(ctx, `UPDATE issues SET confidential = ?, milestone_id = ?, due_on = ?, updated_at = ? WHERE id = ?`, flag, milestoneID, due, now(), id)
374 return err
375 }
376
377 // SetIssueLabels vervangt de labels van een issue.
378 func (s *Store) SetIssueLabels(ctx context.Context, repoID, id int64, labelIDs []int64) error {
379 tx, err := s.db.BeginTx(ctx, nil)
380 if err != nil {
381 return err
382 }
383 defer func() { _ = tx.Rollback() }()
384 if err := ensureIssueRefs(ctx, tx, repoID, 0, labelIDs, nil); err != nil {
385 return err
386 }
387 if _, err := tx.ExecContext(ctx, `DELETE FROM issue_labels WHERE issue_id = ?`, id); err != nil {
388 return err
389 }
390 for _, lid := range labelIDs {
391 if _, err := tx.ExecContext(ctx, `INSERT INTO issue_labels (issue_id, label_id) VALUES (?, ?)`, id, lid); err != nil {
392 return err
393 }
394 }
395 if _, err := tx.ExecContext(ctx, `UPDATE issues SET updated_at = ? WHERE id = ?`, now(), id); err != nil {
396 return err
397 }
398 return tx.Commit()
399 }
400
401 // SetIssueAssignees vervangt de toewijzingen.
402 func (s *Store) SetIssueAssignees(ctx context.Context, repoID, id int64, userIDs []int64) error {
403 tx, err := s.db.BeginTx(ctx, nil)
404 if err != nil {
405 return err
406 }
407 defer func() { _ = tx.Rollback() }()
408 if err := ensureIssueRefs(ctx, tx, repoID, 0, nil, userIDs); err != nil {
409 return err
410 }
411 if _, err := tx.ExecContext(ctx, `DELETE FROM issue_assignees WHERE issue_id = ?`, id); err != nil {
412 return err
413 }
414 for _, uid := range userIDs {
415 if _, err := tx.ExecContext(ctx, `INSERT INTO issue_assignees (issue_id, user_id) VALUES (?, ?)`, id, uid); err != nil {
416 return err
417 }
418 }
419 if _, err := tx.ExecContext(ctx, `UPDATE issues SET updated_at = ? WHERE id = ?`, now(), id); err != nil {
420 return err
421 }
422 return tx.Commit()
423 }
424
425 // SetIssueState zet open of closed. changed is onwaar als de status al zo was.
426 func (s *Store) SetIssueState(ctx context.Context, id int64, status string) (bool, error) {
427 if status != "open" && status != "closed" {
428 return false, i18n.E("err.issueState")
429 }
430 closed := ""
431 if status == "closed" {
432 closed = now()
433 }
434 res, err := s.db.ExecContext(ctx, `UPDATE issues SET status = ?, closed_at = ?, updated_at = ? WHERE id = ? AND status <> ?`, status, closed, now(), id, status)
435 if err != nil {
436 return false, err
437 }
438 n, _ := res.RowsAffected()
439 return n > 0, nil
440 }
441
442 // DeleteIssue verwijdert een issue met reacties, labels en koppelingen.
443 func (s *Store) DeleteIssue(ctx context.Context, repoID, id int64) error {
444 tx, err := s.db.BeginTx(ctx, nil)
445 if err != nil {
446 return err
447 }
448 defer func() { _ = tx.Rollback() }()
449 for _, q := range []string{
450 `DELETE FROM issue_notes WHERE issue_id = ?`,
451 `DELETE FROM issue_labels WHERE issue_id = ?`,
452 `DELETE FROM issue_assignees WHERE issue_id = ?`,
453 } {
454 if _, err := tx.ExecContext(ctx, q, id); err != nil {
455 return err
456 }
457 }
458 if _, err := tx.ExecContext(ctx, `DELETE FROM issue_links WHERE a = ? OR b = ?`, id, id); err != nil {
459 return err
460 }
461 res, err := tx.ExecContext(ctx, `DELETE FROM issues WHERE id = ? AND repo_id = ?`, id, repoID)
462 if err != nil {
463 return err
464 }
465 n, _ := res.RowsAffected()
466 if n == 0 {
467 return errNotFound
468 }
469 return tx.Commit()
470 }
471
472 // AddIssueNote bewaart een reactie.
473 func (s *Store) AddIssueNote(ctx context.Context, repoID, issueID, authorID int64, body string) (IssueNote, error) {
474 body = strings.TrimSpace(body)
475 if body == "" {
476 return IssueNote{}, i18n.E("err.issueNote")
477 }
478 if err := limitIssueText(body); err != nil {
479 return IssueNote{}, err
480 }
481 ts := now()
482 res, err := s.db.ExecContext(ctx, `INSERT INTO issue_notes (repo_id, issue_id, author_id, body, created_at) VALUES (?, ?, ?, ?, ?)`, repoID, issueID, authorID, body, ts)
483 if err != nil {
484 return IssueNote{}, err
485 }
486 _, _ = s.db.ExecContext(ctx, `UPDATE issues SET updated_at = ? WHERE id = ?`, ts, issueID)
487 id, _ := res.LastInsertId()
488 return s.issueNote(ctx, id)
489 }
490
491 // ListIssueNotes geeft reacties, oudste eerst.
492 func (s *Store) ListIssueNotes(ctx context.Context, issueID int64) ([]IssueNote, error) {
493 rows, err := s.db.QueryContext(ctx, `SELECT n.id, n.repo_id, n.issue_id, n.author_id, u.username, n.body, n.created_at
494 FROM issue_notes n JOIN users u ON u.id = n.author_id WHERE n.issue_id = ? ORDER BY n.id`, issueID)
495 if err != nil {
496 return nil, err
497 }
498 defer rows.Close()
499 out := []IssueNote{}
500 for rows.Next() {
501 n, err := scanIssueNote(rows)
502 if err != nil {
503 return nil, err
504 }
505 out = append(out, n)
506 }
507 return out, rows.Err()
508 }
509
510 // LinkIssues koppelt twee issues in beide richtingen.
511 func (s *Store) LinkIssues(ctx context.Context, repoID, a, b int64) error {
512 if a == 0 || b == 0 || a == b {
513 return nil
514 }
515 _, err := s.db.ExecContext(ctx, `INSERT OR IGNORE INTO issue_links (repo_id, a, b) VALUES (?, ?, ?), (?, ?, ?)`, repoID, a, b, repoID, b, a)
516 return err
517 }
518
519 // RelatedIssues geeft de gekoppelde issues.
520 func (s *Store) RelatedIssues(ctx context.Context, repoID, issueID int64) ([]Issue, error) {
521 rows, err := s.db.QueryContext(ctx, `SELECT b FROM issue_links WHERE repo_id = ? AND a = ? ORDER BY b`, repoID, issueID)
522 if err != nil {
523 return nil, err
524 }
525 defer rows.Close()
526 var ids []int64
527 for rows.Next() {
528 var id int64
529 if err := rows.Scan(&id); err != nil {
530 return nil, err
531 }
532 ids = append(ids, id)
533 }
534 if err := rows.Err(); err != nil {
535 return nil, err
536 }
537 out := []Issue{}
538 for _, id := range ids {
539 iss, err := s.issueByID(ctx, repoID, id)
540 if err != nil {
541 continue
542 }
543 out = append(out, iss)
544 }
545 return out, nil
546 }
547
548 func (s *Store) issueByID(ctx context.Context, repoID, id int64) (Issue, error) {
549 row := s.db.QueryRowContext(ctx, issueSelect+` WHERE i.repo_id = ? AND i.id = ?`, repoID, id)
550 return scanIssue(row)
551 }
552
553 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_at
555 FROM issue_notes n JOIN users u ON u.id = n.author_id WHERE n.id = ?`, id)
556 return scanIssueNote(row)
557 }
558
559 type rowScanner interface {
560 Scan(dest ...any) error
561 }
562
563 func scanIssue(sc rowScanner) (Issue, error) {
564 var iss Issue
565 var created, updated, closed, packedLabels, packedUsers string
566 var conf int
567 if err := sc.Scan(&iss.ID, &iss.RepoID, &iss.Number, &iss.Title, &iss.Description, &iss.AuthorID, &iss.Author,
568 &iss.Status, &conf, &iss.MilestoneID, &iss.Milestone, &iss.DueOn, &created, &updated, &closed, &packedLabels, &packedUsers); err != nil {
569 if errors.Is(err, sql.ErrNoRows) {
570 return Issue{}, errNotFound
571 }
572 return Issue{}, err
573 }
574 iss.Confidential = conf == 1
575 iss.CreatedAt = parseTime(created)
576 iss.UpdatedAt = parseTime(updated)
577 iss.ClosedAt = parseTime(closed)
578 iss.Labels = parsePackedLabels(packedLabels)
579 iss.AssigneeIDs, iss.Assignees = parsePackedUsers(packedUsers)
580 return iss, nil
581 }
582
583 func scanIssueNote(sc rowScanner) (IssueNote, error) {
584 var n IssueNote
585 var created string
586 if err := sc.Scan(&n.ID, &n.RepoID, &n.IssueID, &n.AuthorID, &n.Author, &n.Body, &created); err != nil {
587 if errors.Is(err, sql.ErrNoRows) {
588 return IssueNote{}, errNotFound
589 }
590 return IssueNote{}, err
591 }
592 n.CreatedAt = parseTime(created)
593 return n, nil
594 }
595
596 func parsePackedLabels(raw string) []Label {
597 out := []Label{}
598 if raw == "" {
599 return out
600 }
601 for _, part := range strings.Split(raw, "\x1e") {
602 bits := strings.Split(part, "\x1f")
603 if len(bits) != 3 {
604 continue
605 }
606 id, _ := strconv.ParseInt(bits[0], 10, 64)
607 out = append(out, Label{ID: id, Name: bits[1], Color: bits[2]})
608 }
609 sort.Slice(out, func(i, j int) bool { return out[i].Name < out[j].Name })
610 return out
611 }
612
613 func parsePackedUsers(raw string) ([]int64, []string) {
614 type pair struct {
615 id int64
616 name string
617 }
618 var pairs []pair
619 if raw != "" {
620 for _, part := range strings.Split(raw, "\x1e") {
621 bits := strings.SplitN(part, "\x1f", 2)
622 if len(bits) != 2 {
623 continue
624 }
625 id, _ := strconv.ParseInt(bits[0], 10, 64)
626 pairs = append(pairs, pair{id, bits[1]})
627 }
628 }
629 sort.Slice(pairs, func(i, j int) bool { return pairs[i].name < pairs[j].name })
630 ids := []int64{}
631 names := []string{}
632 for _, p := range pairs {
633 ids = append(ids, p.id)
634 names = append(names, p.name)
635 }
636 return ids, names
637 }
638
639 type execQuerier interface {
640 ExecContext(ctx context.Context, query string, args ...any) (sql.Result, error)
641 QueryRowContext(ctx context.Context, query string, args ...any) *sql.Row
642 }
643
644 func ensureIssueRefs(ctx context.Context, q execQuerier, repoID, milestoneID int64, labelIDs, userIDs []int64) error {
645 if milestoneID != 0 {
646 var n int
647 if err := q.QueryRowContext(ctx, `SELECT COUNT(*) FROM milestones WHERE id = ? AND repo_id = ?`, milestoneID, repoID).Scan(&n); err != nil {
648 return err
649 }
650 if n != 1 {
651 return i18n.E("err.milestone")
652 }
653 }
654 for _, id := range labelIDs {
655 var n int
656 if err := q.QueryRowContext(ctx, `SELECT COUNT(*) FROM labels WHERE id = ? AND repo_id = ?`, id, repoID).Scan(&n); err != nil {
657 return err
658 }
659 if n != 1 {
660 return i18n.E("err.labelMissing", id)
661 }
662 }
663 for _, id := range userIDs {
664 var name string
665 err := q.QueryRowContext(ctx, `SELECT username FROM users WHERE id = ?`, id).Scan(&name)
666 if errors.Is(err, sql.ErrNoRows) {
667 return i18n.E("err.assignee", id)
668 }
669 if err != nil {
670 return err
671 }
672 }
673 return nil
674 }
675
676 func replaceIssueLinks(ctx context.Context, tx *sql.Tx, issueID int64, labelIDs, userIDs []int64) error {
677 for _, id := range labelIDs {
678 if _, err := tx.ExecContext(ctx, `INSERT OR IGNORE INTO issue_labels (issue_id, label_id) VALUES (?, ?)`, issueID, id); err != nil {
679 return err
680 }
681 }
682 for _, id := range userIDs {
683 if _, err := tx.ExecContext(ctx, `INSERT OR IGNORE INTO issue_assignees (issue_id, user_id) VALUES (?, ?)`, issueID, id); err != nil {
684 return err
685 }
686 }
687 return nil
688 }
@@ -0,0 +1,688 @@
1package store
2
3import (
4 "context"
5 "database/sql"
6 "errors"
7 "regexp"
8 "sort"
9 "strconv"
10 "strings"
11 "time"
12 "unicode"
13
14 "gitlab.com/Timfa/bluegit/internal/i18n"
15)
16
17// Label is een label binnen één repository.
18type Label struct {
19 ID int64
20 RepoID int64
21 Name string
22 Color string
23}
24
25// Milestone is een mijlpaal binnen één repository.
26type Milestone struct {
27 ID int64
28 RepoID int64
29 Title string
30 DueOn string
31 State string
32}
33
34// Issue is één issue, genummerd per repository.
35type Issue struct {
36 ID int64
37 RepoID int64
38 Number int64
39 Title string
40 Description string
41 AuthorID int64
42 Author string
43 Status string
44 Confidential bool
45 MilestoneID int64
46 Milestone string
47 DueOn string
48 CreatedAt time.Time
49 UpdatedAt time.Time
50 ClosedAt time.Time
51 Labels []Label
52 AssigneeIDs []int64
53 Assignees []string
54}
55
56// IssueNote is een reactie op een issue.
57type IssueNote struct {
58 ID int64
59 RepoID int64
60 IssueID int64
61 AuthorID int64
62 Author string
63 Body string
64 CreatedAt time.Time
65}
66
67// IssueFilter beperkt de lijst. State is open, closed of all.
68type IssueFilter struct {
69 State string
70 Query string
71 Label string
72 Assignee string
73 ViewerID int64
74 Triage bool
75}
76
77// NewIssue is de invoer voor een nieuw issue.
78type NewIssue struct {
79 Title string
80 Description string
81 Confidential bool
82 MilestoneID int64
83 DueOn string
84 LabelIDs []int64
85 AssigneeIDs []int64
86}
87
88var labelColor = regexp.MustCompile(`^#[0-9a-fA-F]{6}$`)
89
90// ValidDue eist leeg of YYYY-MM-DD.
91func ValidDue(s string) error {
92 s = strings.TrimSpace(s)
93 if s == "" {
94 return nil
95 }
96 if _, err := time.Parse("2006-01-02", s); err != nil {
97 return i18n.E("err.issueDue")
98 }
99 return nil
100}
101
102// ValidLabelName eist letters, cijfers, spaties, streepjes of underscores.
103func ValidLabelName(s string) error {
104 s = strings.TrimSpace(s)
105 if s == "" || len([]rune(s)) > 50 {
106 return i18n.E("err.labelName")
107 }
108 for _, r := range s {
109 if r == ' ' || r == '-' || r == '_' || unicode.IsLetter(r) || unicode.IsDigit(r) {
110 continue
111 }
112 return i18n.E("err.labelName")
113 }
114 return nil
115}
116
117// NormalizeColor vult de standaardkleur aan of keurt een hexkleur goed.
118func NormalizeColor(s string) (string, error) {
119 s = strings.TrimSpace(s)
120 if s == "" {
121 return "#428fdc", nil
122 }
123 if !labelColor.MatchString(s) {
124 return "", i18n.E("err.labelColor")
125 }
126 return strings.ToLower(s), nil
127}
128
129// ValidMilestoneTitle eist een korte titel.
130func ValidMilestoneTitle(s string) error {
131 s = strings.TrimSpace(s)
132 if s == "" || len([]rune(s)) > 80 {
133 return i18n.E("err.milestoneName")
134 }
135 for _, r := range s {
136 if r == ' ' || r == '-' || r == '_' || r == '.' || unicode.IsLetter(r) || unicode.IsDigit(r) {
137 continue
138 }
139 return i18n.E("err.milestoneName")
140 }
141 return nil
142}
143
144func limitIssueText(s string) error {
145 if len([]rune(s)) > 20000 {
146 return i18n.E("err.issueBody")
147 }
148 return nil
149}
150
151// UpsertLabel maakt een label of werkt de kleur bij.
152func (s *Store) UpsertLabel(ctx context.Context, repoID int64, name, color string) (Label, error) {
153 name = strings.TrimSpace(name)
154 if err := ValidLabelName(name); err != nil {
155 return Label{}, err
156 }
157 color, err := NormalizeColor(color)
158 if err != nil {
159 return Label{}, err
160 }
161 if _, err := s.db.ExecContext(ctx, `INSERT INTO labels (repo_id, name, color) VALUES (?, ?, ?)
162 ON CONFLICT(repo_id, name) DO UPDATE SET color = excluded.color`, repoID, name, color); err != nil {
163 return Label{}, err
164 }
165 return s.LabelByName(ctx, repoID, name)
166}
167
168// LabelByName leest één label.
169func (s *Store) LabelByName(ctx context.Context, repoID int64, name string) (Label, error) {
170 var l Label
171 err := s.db.QueryRowContext(ctx, `SELECT id, repo_id, name, color FROM labels WHERE repo_id = ? AND name = ?`, repoID, strings.TrimSpace(name)).
172 Scan(&l.ID, &l.RepoID, &l.Name, &l.Color)
173 if errors.Is(err, sql.ErrNoRows) {
174 return Label{}, errNotFound
175 }
176 return l, err
177}
178
179// ListLabels geeft de labels op naam.
180func (s *Store) ListLabels(ctx context.Context, repoID int64) ([]Label, error) {
181 rows, err := s.db.QueryContext(ctx, `SELECT id, repo_id, name, color FROM labels WHERE repo_id = ? ORDER BY name`, repoID)
182 if err != nil {
183 return nil, err
184 }
185 defer rows.Close()
186 out := []Label{}
187 for rows.Next() {
188 var l Label
189 if err := rows.Scan(&l.ID, &l.RepoID, &l.Name, &l.Color); err != nil {
190 return nil, err
191 }
192 out = append(out, l)
193 }
194 return out, rows.Err()
195}
196
197// UpsertMilestone maakt een mijlpaal of werkt de datum bij.
198func (s *Store) UpsertMilestone(ctx context.Context, repoID int64, title, due string) (Milestone, error) {
199 title = strings.TrimSpace(title)
200 if err := ValidMilestoneTitle(title); err != nil {
201 return Milestone{}, err
202 }
203 due = strings.TrimSpace(due)
204 if err := ValidDue(due); err != nil {
205 return Milestone{}, err
206 }
207 if _, err := s.db.ExecContext(ctx, `INSERT INTO milestones (repo_id, title, due_on, state) VALUES (?, ?, ?, 'open')
208 ON CONFLICT(repo_id, title) DO UPDATE SET due_on = excluded.due_on`, repoID, title, due); err != nil {
209 return Milestone{}, err
210 }
211 return s.MilestoneByTitle(ctx, repoID, title)
212}
213
214// MilestoneByTitle leest één mijlpaal.
215func (s *Store) MilestoneByTitle(ctx context.Context, repoID int64, title string) (Milestone, error) {
216 var m Milestone
217 err := s.db.QueryRowContext(ctx, `SELECT id, repo_id, title, due_on, state FROM milestones WHERE repo_id = ? AND title = ?`, repoID, strings.TrimSpace(title)).
218 Scan(&m.ID, &m.RepoID, &m.Title, &m.DueOn, &m.State)
219 if errors.Is(err, sql.ErrNoRows) {
220 return Milestone{}, errNotFound
221 }
222 return m, err
223}
224
225// ListMilestones geeft de mijlpalen op titel.
226func (s *Store) ListMilestones(ctx context.Context, repoID int64) ([]Milestone, error) {
227 rows, err := s.db.QueryContext(ctx, `SELECT id, repo_id, title, due_on, state FROM milestones WHERE repo_id = ? ORDER BY title`, repoID)
228 if err != nil {
229 return nil, err
230 }
231 defer rows.Close()
232 out := []Milestone{}
233 for rows.Next() {
234 var m Milestone
235 if err := rows.Scan(&m.ID, &m.RepoID, &m.Title, &m.DueOn, &m.State); err != nil {
236 return nil, err
237 }
238 out = append(out, m)
239 }
240 return out, rows.Err()
241}
242
243const issueSelect = `SELECT i.id, i.repo_id, i.number, i.title, i.description, i.author_id, u.username,
244i.status, i.confidential, i.milestone_id, COALESCE(m.title, ''), i.due_on, i.created_at, i.updated_at, i.closed_at,
245COALESCE((SELECT group_concat(l.id || char(31) || l.name || char(31) || l.color, char(30)) FROM issue_labels il JOIN labels l ON l.id = il.label_id WHERE il.issue_id = i.id), ''),
246COALESCE((SELECT group_concat(au.id || char(31) || au.username, char(30)) FROM issue_assignees ia JOIN users au ON au.id = ia.user_id WHERE ia.issue_id = i.id), '')
247FROM issues i
248JOIN users u ON u.id = i.author_id
249LEFT JOIN milestones m ON m.id = i.milestone_id AND m.id <> 0`
250
251// CreateIssue nummert per repository en zet labels en toewijzingen.
252func (s *Store) CreateIssue(ctx context.Context, repoID, authorID int64, in NewIssue) (Issue, error) {
253 title := trim(strings.TrimSpace(in.Title), 200)
254 if title == "" {
255 return Issue{}, i18n.E("err.issueTitle")
256 }
257 if err := limitIssueText(in.Description); err != nil {
258 return Issue{}, err
259 }
260 in.DueOn = strings.TrimSpace(in.DueOn)
261 if err := ValidDue(in.DueOn); err != nil {
262 return Issue{}, err
263 }
264 tx, err := s.db.BeginTx(ctx, nil)
265 if err != nil {
266 return Issue{}, err
267 }
268 defer func() { _ = tx.Rollback() }()
269 if err := ensureIssueRefs(ctx, tx, repoID, in.MilestoneID, in.LabelIDs, in.AssigneeIDs); err != nil {
270 return Issue{}, err
271 }
272 var n int64
273 if err := tx.QueryRowContext(ctx, `SELECT COALESCE(MAX(number), 0) FROM issues WHERE repo_id = ?`, repoID).Scan(&n); err != nil {
274 return Issue{}, err
275 }
276 ts := now()
277 conf := 0
278 if in.Confidential {
279 conf = 1
280 }
281 res, err := tx.ExecContext(ctx, `INSERT INTO issues (repo_id, number, title, description, author_id, status, confidential, milestone_id, due_on, created_at, updated_at)
282 VALUES (?, ?, ?, ?, ?, 'open', ?, ?, ?, ?, ?)`, repoID, n+1, title, in.Description, authorID, conf, in.MilestoneID, in.DueOn, ts, ts)
283 if err != nil {
284 return Issue{}, err
285 }
286 id, _ := res.LastInsertId()
287 if err := replaceIssueLinks(ctx, tx, id, in.LabelIDs, in.AssigneeIDs); err != nil {
288 return Issue{}, err
289 }
290 if err := tx.Commit(); err != nil {
291 return Issue{}, err
292 }
293 return s.IssueByNumber(ctx, repoID, n+1)
294}
295
296// IssueByNumber leest #nummer.
297func (s *Store) IssueByNumber(ctx context.Context, repoID, number int64) (Issue, error) {
298 row := s.db.QueryRowContext(ctx, issueSelect+` WHERE i.repo_id = ? AND i.number = ?`, repoID, number)
299 return scanIssue(row)
300}
301
302// ListIssues geeft issues, nieuwste nummer eerst.
303// Zonder triage blijven andermans vertrouwelijke issues weg.
304func (s *Store) ListIssues(ctx context.Context, repoID int64, f IssueFilter) ([]Issue, error) {
305 q := issueSelect + ` WHERE i.repo_id = ?`
306 args := []any{repoID}
307 if !f.Triage {
308 q += ` AND (i.confidential = 0 OR i.author_id = ?)`
309 args = append(args, f.ViewerID)
310 }
311 switch f.State {
312 case "closed":
313 q += ` AND i.status = 'closed'`
314 case "all":
315 default:
316 q += ` AND i.status = 'open'`
317 }
318 if strings.TrimSpace(f.Query) != "" {
319 q += ` AND (instr(lower(i.title), lower(?)) > 0 OR instr(lower(i.description), lower(?)) > 0)`
320 args = append(args, strings.TrimSpace(f.Query), strings.TrimSpace(f.Query))
321 }
322 if strings.TrimSpace(f.Label) != "" {
323 q += ` AND EXISTS (SELECT 1 FROM issue_labels il JOIN labels l ON l.id = il.label_id WHERE il.issue_id = i.id AND l.name = ?)`
324 args = append(args, strings.TrimSpace(f.Label))
325 }
326 if strings.TrimSpace(f.Assignee) != "" {
327 q += ` AND EXISTS (SELECT 1 FROM issue_assignees ia JOIN users au ON au.id = ia.user_id WHERE ia.issue_id = i.id AND au.username = ?)`
328 args = append(args, strings.ToLower(strings.TrimSpace(f.Assignee)))
329 }
330 q += ` ORDER BY i.number DESC`
331 rows, err := s.db.QueryContext(ctx, q, args...)
332 if err != nil {
333 return nil, err
334 }
335 defer rows.Close()
336 out := []Issue{}
337 for rows.Next() {
338 iss, err := scanIssue(rows)
339 if err != nil {
340 return nil, err
341 }
342 out = append(out, iss)
343 }
344 return out, rows.Err()
345}
346
347// UpdateIssueText wijzigt titel en beschrijving.
348func (s *Store) UpdateIssueText(ctx context.Context, id int64, title, description string) error {
349 title = trim(strings.TrimSpace(title), 200)
350 if title == "" {
351 return i18n.E("err.issueTitle")
352 }
353 if err := limitIssueText(description); err != nil {
354 return err
355 }
356 _, err := s.db.ExecContext(ctx, `UPDATE issues SET title = ?, description = ?, updated_at = ? WHERE id = ?`, title, description, now(), id)
357 return err
358}
359
360// SetIssueMeta wijzigt vertrouwelijkheid, mijlpaal en vervaldatum.
361func (s *Store) SetIssueMeta(ctx context.Context, repoID, id, milestoneID int64, confidential bool, due string) error {
362 due = strings.TrimSpace(due)
363 if err := ValidDue(due); err != nil {
364 return err
365 }
366 if err := ensureIssueRefs(ctx, s.db, repoID, milestoneID, nil, nil); err != nil {
367 return err
368 }
369 flag := 0
370 if confidential {
371 flag = 1
372 }
373 _, err := s.db.ExecContext(ctx, `UPDATE issues SET confidential = ?, milestone_id = ?, due_on = ?, updated_at = ? WHERE id = ?`, flag, milestoneID, due, now(), id)
374 return err
375}
376
377// SetIssueLabels vervangt de labels van een issue.
378func (s *Store) SetIssueLabels(ctx context.Context, repoID, id int64, labelIDs []int64) error {
379 tx, err := s.db.BeginTx(ctx, nil)
380 if err != nil {
381 return err
382 }
383 defer func() { _ = tx.Rollback() }()
384 if err := ensureIssueRefs(ctx, tx, repoID, 0, labelIDs, nil); err != nil {
385 return err
386 }
387 if _, err := tx.ExecContext(ctx, `DELETE FROM issue_labels WHERE issue_id = ?`, id); err != nil {
388 return err
389 }
390 for _, lid := range labelIDs {
391 if _, err := tx.ExecContext(ctx, `INSERT INTO issue_labels (issue_id, label_id) VALUES (?, ?)`, id, lid); err != nil {
392 return err
393 }
394 }
395 if _, err := tx.ExecContext(ctx, `UPDATE issues SET updated_at = ? WHERE id = ?`, now(), id); err != nil {
396 return err
397 }
398 return tx.Commit()
399}
400
401// SetIssueAssignees vervangt de toewijzingen.
402func (s *Store) SetIssueAssignees(ctx context.Context, repoID, id int64, userIDs []int64) error {
403 tx, err := s.db.BeginTx(ctx, nil)
404 if err != nil {
405 return err
406 }
407 defer func() { _ = tx.Rollback() }()
408 if err := ensureIssueRefs(ctx, tx, repoID, 0, nil, userIDs); err != nil {
409 return err
410 }
411 if _, err := tx.ExecContext(ctx, `DELETE FROM issue_assignees WHERE issue_id = ?`, id); err != nil {
412 return err
413 }
414 for _, uid := range userIDs {
415 if _, err := tx.ExecContext(ctx, `INSERT INTO issue_assignees (issue_id, user_id) VALUES (?, ?)`, id, uid); err != nil {
416 return err
417 }
418 }
419 if _, err := tx.ExecContext(ctx, `UPDATE issues SET updated_at = ? WHERE id = ?`, now(), id); err != nil {
420 return err
421 }
422 return tx.Commit()
423}
424
425// SetIssueState zet open of closed. changed is onwaar als de status al zo was.
426func (s *Store) SetIssueState(ctx context.Context, id int64, status string) (bool, error) {
427 if status != "open" && status != "closed" {
428 return false, i18n.E("err.issueState")
429 }
430 closed := ""
431 if status == "closed" {
432 closed = now()
433 }
434 res, err := s.db.ExecContext(ctx, `UPDATE issues SET status = ?, closed_at = ?, updated_at = ? WHERE id = ? AND status <> ?`, status, closed, now(), id, status)
435 if err != nil {
436 return false, err
437 }
438 n, _ := res.RowsAffected()
439 return n > 0, nil
440}
441
442// DeleteIssue verwijdert een issue met reacties, labels en koppelingen.
443func (s *Store) DeleteIssue(ctx context.Context, repoID, id int64) error {
444 tx, err := s.db.BeginTx(ctx, nil)
445 if err != nil {
446 return err
447 }
448 defer func() { _ = tx.Rollback() }()
449 for _, q := range []string{
450 `DELETE FROM issue_notes WHERE issue_id = ?`,
451 `DELETE FROM issue_labels WHERE issue_id = ?`,
452 `DELETE FROM issue_assignees WHERE issue_id = ?`,
453 } {
454 if _, err := tx.ExecContext(ctx, q, id); err != nil {
455 return err
456 }
457 }
458 if _, err := tx.ExecContext(ctx, `DELETE FROM issue_links WHERE a = ? OR b = ?`, id, id); err != nil {
459 return err
460 }
461 res, err := tx.ExecContext(ctx, `DELETE FROM issues WHERE id = ? AND repo_id = ?`, id, repoID)
462 if err != nil {
463 return err
464 }
465 n, _ := res.RowsAffected()
466 if n == 0 {
467 return errNotFound
468 }
469 return tx.Commit()
470}
471
472// AddIssueNote bewaart een reactie.
473func (s *Store) AddIssueNote(ctx context.Context, repoID, issueID, authorID int64, body string) (IssueNote, error) {
474 body = strings.TrimSpace(body)
475 if body == "" {
476 return IssueNote{}, i18n.E("err.issueNote")
477 }
478 if err := limitIssueText(body); err != nil {
479 return IssueNote{}, err
480 }
481 ts := now()
482 res, err := s.db.ExecContext(ctx, `INSERT INTO issue_notes (repo_id, issue_id, author_id, body, created_at) VALUES (?, ?, ?, ?, ?)`, repoID, issueID, authorID, body, ts)
483 if err != nil {
484 return IssueNote{}, err
485 }
486 _, _ = s.db.ExecContext(ctx, `UPDATE issues SET updated_at = ? WHERE id = ?`, ts, issueID)
487 id, _ := res.LastInsertId()
488 return s.issueNote(ctx, id)
489}
490
491// ListIssueNotes geeft reacties, oudste eerst.
492func (s *Store) ListIssueNotes(ctx context.Context, issueID int64) ([]IssueNote, error) {
493 rows, err := s.db.QueryContext(ctx, `SELECT n.id, n.repo_id, n.issue_id, n.author_id, u.username, n.body, n.created_at
494 FROM issue_notes n JOIN users u ON u.id = n.author_id WHERE n.issue_id = ? ORDER BY n.id`, issueID)
495 if err != nil {
496 return nil, err
497 }
498 defer rows.Close()
499 out := []IssueNote{}
500 for rows.Next() {
501 n, err := scanIssueNote(rows)
502 if err != nil {
503 return nil, err
504 }
505 out = append(out, n)
506 }
507 return out, rows.Err()
508}
509
510// LinkIssues koppelt twee issues in beide richtingen.
511func (s *Store) LinkIssues(ctx context.Context, repoID, a, b int64) error {
512 if a == 0 || b == 0 || a == b {
513 return nil
514 }
515 _, err := s.db.ExecContext(ctx, `INSERT OR IGNORE INTO issue_links (repo_id, a, b) VALUES (?, ?, ?), (?, ?, ?)`, repoID, a, b, repoID, b, a)
516 return err
517}
518
519// RelatedIssues geeft de gekoppelde issues.
520func (s *Store) RelatedIssues(ctx context.Context, repoID, issueID int64) ([]Issue, error) {
521 rows, err := s.db.QueryContext(ctx, `SELECT b FROM issue_links WHERE repo_id = ? AND a = ? ORDER BY b`, repoID, issueID)
522 if err != nil {
523 return nil, err
524 }
525 defer rows.Close()
526 var ids []int64
527 for rows.Next() {
528 var id int64
529 if err := rows.Scan(&id); err != nil {
530 return nil, err
531 }
532 ids = append(ids, id)
533 }
534 if err := rows.Err(); err != nil {
535 return nil, err
536 }
537 out := []Issue{}
538 for _, id := range ids {
539 iss, err := s.issueByID(ctx, repoID, id)
540 if err != nil {
541 continue
542 }
543 out = append(out, iss)
544 }
545 return out, nil
546}
547
548func (s *Store) issueByID(ctx context.Context, repoID, id int64) (Issue, error) {
549 row := s.db.QueryRowContext(ctx, issueSelect+` WHERE i.repo_id = ? AND i.id = ?`, repoID, id)
550 return scanIssue(row)
551}
552
553func (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_at
555 FROM issue_notes n JOIN users u ON u.id = n.author_id WHERE n.id = ?`, id)
556 return scanIssueNote(row)
557}
558
559type rowScanner interface {
560 Scan(dest ...any) error
561}
562
563func scanIssue(sc rowScanner) (Issue, error) {
564 var iss Issue
565 var created, updated, closed, packedLabels, packedUsers string
566 var conf int
567 if err := sc.Scan(&iss.ID, &iss.RepoID, &iss.Number, &iss.Title, &iss.Description, &iss.AuthorID, &iss.Author,
568 &iss.Status, &conf, &iss.MilestoneID, &iss.Milestone, &iss.DueOn, &created, &updated, &closed, &packedLabels, &packedUsers); err != nil {
569 if errors.Is(err, sql.ErrNoRows) {
570 return Issue{}, errNotFound
571 }
572 return Issue{}, err
573 }
574 iss.Confidential = conf == 1
575 iss.CreatedAt = parseTime(created)
576 iss.UpdatedAt = parseTime(updated)
577 iss.ClosedAt = parseTime(closed)
578 iss.Labels = parsePackedLabels(packedLabels)
579 iss.AssigneeIDs, iss.Assignees = parsePackedUsers(packedUsers)
580 return iss, nil
581}
582
583func scanIssueNote(sc rowScanner) (IssueNote, error) {
584 var n IssueNote
585 var created string
586 if err := sc.Scan(&n.ID, &n.RepoID, &n.IssueID, &n.AuthorID, &n.Author, &n.Body, &created); err != nil {
587 if errors.Is(err, sql.ErrNoRows) {
588 return IssueNote{}, errNotFound
589 }
590 return IssueNote{}, err
591 }
592 n.CreatedAt = parseTime(created)
593 return n, nil
594}
595
596func parsePackedLabels(raw string) []Label {
597 out := []Label{}
598 if raw == "" {
599 return out
600 }
601 for _, part := range strings.Split(raw, "\x1e") {
602 bits := strings.Split(part, "\x1f")
603 if len(bits) != 3 {
604 continue
605 }
606 id, _ := strconv.ParseInt(bits[0], 10, 64)
607 out = append(out, Label{ID: id, Name: bits[1], Color: bits[2]})
608 }
609 sort.Slice(out, func(i, j int) bool { return out[i].Name < out[j].Name })
610 return out
611}
612
613func parsePackedUsers(raw string) ([]int64, []string) {
614 type pair struct {
615 id int64
616 name string
617 }
618 var pairs []pair
619 if raw != "" {
620 for _, part := range strings.Split(raw, "\x1e") {
621 bits := strings.SplitN(part, "\x1f", 2)
622 if len(bits) != 2 {
623 continue
624 }
625 id, _ := strconv.ParseInt(bits[0], 10, 64)
626 pairs = append(pairs, pair{id, bits[1]})
627 }
628 }
629 sort.Slice(pairs, func(i, j int) bool { return pairs[i].name < pairs[j].name })
630 ids := []int64{}
631 names := []string{}
632 for _, p := range pairs {
633 ids = append(ids, p.id)
634 names = append(names, p.name)
635 }
636 return ids, names
637}
638
639type execQuerier interface {
640 ExecContext(ctx context.Context, query string, args ...any) (sql.Result, error)
641 QueryRowContext(ctx context.Context, query string, args ...any) *sql.Row
642}
643
644func ensureIssueRefs(ctx context.Context, q execQuerier, repoID, milestoneID int64, labelIDs, userIDs []int64) error {
645 if milestoneID != 0 {
646 var n int
647 if err := q.QueryRowContext(ctx, `SELECT COUNT(*) FROM milestones WHERE id = ? AND repo_id = ?`, milestoneID, repoID).Scan(&n); err != nil {
648 return err
649 }
650 if n != 1 {
651 return i18n.E("err.milestone")
652 }
653 }
654 for _, id := range labelIDs {
655 var n int
656 if err := q.QueryRowContext(ctx, `SELECT COUNT(*) FROM labels WHERE id = ? AND repo_id = ?`, id, repoID).Scan(&n); err != nil {
657 return err
658 }
659 if n != 1 {
660 return i18n.E("err.labelMissing", id)
661 }
662 }
663 for _, id := range userIDs {
664 var name string
665 err := q.QueryRowContext(ctx, `SELECT username FROM users WHERE id = ?`, id).Scan(&name)
666 if errors.Is(err, sql.ErrNoRows) {
667 return i18n.E("err.assignee", id)
668 }
669 if err != nil {
670 return err
671 }
672 }
673 return nil
674}
675
676func replaceIssueLinks(ctx context.Context, tx *sql.Tx, issueID int64, labelIDs, userIDs []int64) error {
677 for _, id := range labelIDs {
678 if _, err := tx.ExecContext(ctx, `INSERT OR IGNORE INTO issue_labels (issue_id, label_id) VALUES (?, ?)`, issueID, id); err != nil {
679 return err
680 }
681 }
682 for _, id := range userIDs {
683 if _, err := tx.ExecContext(ctx, `INSERT OR IGNORE INTO issue_assignees (issue_id, user_id) VALUES (?, ?)`, issueID, id); err != nil {
684 return err
685 }
686 }
687 return nil
688}
internal/store/issues_test.go added +80 −0
@@ -0,0 +1,80 @@
1 package store
2
3 import (
4 "context"
5 "testing"
6 )
7
8 func TestIssueNumbersFilterAndConfidential(t *testing.T) {
9 s := openStore(t)
10 ctx := context.Background()
11 tim, err := s.UpsertUser(ctx, 1, "tim", "", false)
12 if err != nil {
13 t.Fatal(err)
14 }
15 ada, err := s.UpsertUser(ctx, 2, "ada", "", false)
16 if err != nil {
17 t.Fatal(err)
18 }
19 repo, err := s.CreateRepo(ctx, "user", tim.ID, "app", "", "master", "private")
20 if err != nil {
21 t.Fatal(err)
22 }
23 lab, err := s.UpsertLabel(ctx, repo.ID, "bug", "#428FDC")
24 if err != nil || lab.Color != "#428fdc" {
25 t.Fatalf("label %v %v", lab, err)
26 }
27 mile, err := s.UpsertMilestone(ctx, repo.ID, "v1", "2026-11-01")
28 if err != nil {
29 t.Fatal(err)
30 }
31 first, err := s.CreateIssue(ctx, repo.ID, ada.ID, NewIssue{
32 Title: "Geheim", Description: "niet delen", Confidential: true,
33 LabelIDs: []int64{lab.ID}, AssigneeIDs: []int64{tim.ID}, MilestoneID: mile.ID, DueOn: "2026-12-01",
34 })
35 if err != nil || first.Number != 1 || !first.Confidential || first.Milestone != "v1" || len(first.Labels) != 1 || first.Assignees[0] != "tim" {
36 t.Fatalf("eerste %+v %v", first, err)
37 }
38 second, err := s.CreateIssue(ctx, repo.ID, tim.ID, NewIssue{Title: "Zichtbaar", Description: "hallo bug"})
39 if err != nil || second.Number != 2 {
40 t.Fatalf("tweede %+v %v", second, err)
41 }
42 hidden, err := s.ListIssues(ctx, repo.ID, IssueFilter{State: "open", ViewerID: tim.ID})
43 if err != nil || len(hidden) != 1 || hidden[0].Number != 2 {
44 t.Fatalf("zonder triage %+v", hidden)
45 }
46 all, err := s.ListIssues(ctx, repo.ID, IssueFilter{State: "open", Triage: true, Query: "geheim", Label: "bug", Assignee: "tim"})
47 if err != nil || len(all) != 1 || all[0].Number != 1 {
48 t.Fatalf("filter %+v %v", all, err)
49 }
50 if _, err := s.CreateIssue(ctx, repo.ID, tim.ID, NewIssue{Title: "x", DueOn: "morgen"}); err == nil {
51 t.Fatal("datum hoort afgekeurd")
52 }
53 note, err := s.AddIssueNote(ctx, repo.ID, first.ID, ada.ID, "zie #2")
54 if err != nil || note.Author != "ada" {
55 t.Fatal(err)
56 }
57 notes, err := s.ListIssueNotes(ctx, first.ID)
58 if err != nil || len(notes) != 1 || notes[0].Body != "zie #2" {
59 t.Fatalf("notes %+v", notes)
60 }
61 if err := s.LinkIssues(ctx, repo.ID, first.ID, second.ID); err != nil {
62 t.Fatal(err)
63 }
64 rel, err := s.RelatedIssues(ctx, repo.ID, first.ID)
65 if err != nil || len(rel) != 1 || rel[0].Number != 2 {
66 t.Fatalf("koppeling %+v", rel)
67 }
68 changed, err := s.SetIssueState(ctx, first.ID, "closed")
69 if err != nil || !changed || first.Status == "closed" {
70 t.Fatal(changed, err)
71 }
72 again, err := s.SetIssueState(ctx, first.ID, "closed")
73 if err != nil || again {
74 t.Fatal("tweede sluiten hoort niets te doen")
75 }
76 closed, err := s.IssueByNumber(ctx, repo.ID, 1)
77 if err != nil || closed.Status != "closed" || closed.ClosedAt.IsZero() {
78 t.Fatalf("gesloten %+v", closed)
79 }
80 }
@@ -0,0 +1,80 @@
1package store
2
3import (
4 "context"
5 "testing"
6)
7
8func TestIssueNumbersFilterAndConfidential(t *testing.T) {
9 s := openStore(t)
10 ctx := context.Background()
11 tim, err := s.UpsertUser(ctx, 1, "tim", "", false)
12 if err != nil {
13 t.Fatal(err)
14 }
15 ada, err := s.UpsertUser(ctx, 2, "ada", "", false)
16 if err != nil {
17 t.Fatal(err)
18 }
19 repo, err := s.CreateRepo(ctx, "user", tim.ID, "app", "", "master", "private")
20 if err != nil {
21 t.Fatal(err)
22 }
23 lab, err := s.UpsertLabel(ctx, repo.ID, "bug", "#428FDC")
24 if err != nil || lab.Color != "#428fdc" {
25 t.Fatalf("label %v %v", lab, err)
26 }
27 mile, err := s.UpsertMilestone(ctx, repo.ID, "v1", "2026-11-01")
28 if err != nil {
29 t.Fatal(err)
30 }
31 first, err := s.CreateIssue(ctx, repo.ID, ada.ID, NewIssue{
32 Title: "Geheim", Description: "niet delen", Confidential: true,
33 LabelIDs: []int64{lab.ID}, AssigneeIDs: []int64{tim.ID}, MilestoneID: mile.ID, DueOn: "2026-12-01",
34 })
35 if err != nil || first.Number != 1 || !first.Confidential || first.Milestone != "v1" || len(first.Labels) != 1 || first.Assignees[0] != "tim" {
36 t.Fatalf("eerste %+v %v", first, err)
37 }
38 second, err := s.CreateIssue(ctx, repo.ID, tim.ID, NewIssue{Title: "Zichtbaar", Description: "hallo bug"})
39 if err != nil || second.Number != 2 {
40 t.Fatalf("tweede %+v %v", second, err)
41 }
42 hidden, err := s.ListIssues(ctx, repo.ID, IssueFilter{State: "open", ViewerID: tim.ID})
43 if err != nil || len(hidden) != 1 || hidden[0].Number != 2 {
44 t.Fatalf("zonder triage %+v", hidden)
45 }
46 all, err := s.ListIssues(ctx, repo.ID, IssueFilter{State: "open", Triage: true, Query: "geheim", Label: "bug", Assignee: "tim"})
47 if err != nil || len(all) != 1 || all[0].Number != 1 {
48 t.Fatalf("filter %+v %v", all, err)
49 }
50 if _, err := s.CreateIssue(ctx, repo.ID, tim.ID, NewIssue{Title: "x", DueOn: "morgen"}); err == nil {
51 t.Fatal("datum hoort afgekeurd")
52 }
53 note, err := s.AddIssueNote(ctx, repo.ID, first.ID, ada.ID, "zie #2")
54 if err != nil || note.Author != "ada" {
55 t.Fatal(err)
56 }
57 notes, err := s.ListIssueNotes(ctx, first.ID)
58 if err != nil || len(notes) != 1 || notes[0].Body != "zie #2" {
59 t.Fatalf("notes %+v", notes)
60 }
61 if err := s.LinkIssues(ctx, repo.ID, first.ID, second.ID); err != nil {
62 t.Fatal(err)
63 }
64 rel, err := s.RelatedIssues(ctx, repo.ID, first.ID)
65 if err != nil || len(rel) != 1 || rel[0].Number != 2 {
66 t.Fatalf("koppeling %+v", rel)
67 }
68 changed, err := s.SetIssueState(ctx, first.ID, "closed")
69 if err != nil || !changed || first.Status == "closed" {
70 t.Fatal(changed, err)
71 }
72 again, err := s.SetIssueState(ctx, first.ID, "closed")
73 if err != nil || again {
74 t.Fatal("tweede sluiten hoort niets te doen")
75 }
76 closed, err := s.IssueByNumber(ctx, repo.ID, 1)
77 if err != nil || closed.Status != "closed" || closed.ClosedAt.IsZero() {
78 t.Fatalf("gesloten %+v", closed)
79 }
80}
internal/store/store.go +56 −0
@@ -408,6 +408,62 @@ CREATE TABLE IF NOT EXISTS reviews (
408 408 updated_at TEXT NOT NULL,
409 409 UNIQUE(mr_id, user_id)
410 410 );
411 CREATE TABLE IF NOT EXISTS labels (
412 id INTEGER PRIMARY KEY,
413 repo_id INTEGER NOT NULL,
414 name TEXT NOT NULL,
415 color TEXT NOT NULL,
416 UNIQUE(repo_id, name)
417 );
418 CREATE TABLE IF NOT EXISTS milestones (
419 id INTEGER PRIMARY KEY,
420 repo_id INTEGER NOT NULL,
421 title TEXT NOT NULL,
422 due_on TEXT NOT NULL DEFAULT '',
423 state TEXT NOT NULL DEFAULT 'open',
424 UNIQUE(repo_id, title)
425 );
426 CREATE TABLE IF NOT EXISTS issues (
427 id INTEGER PRIMARY KEY,
428 repo_id INTEGER NOT NULL,
429 number INTEGER NOT NULL,
430 title TEXT NOT NULL,
431 description TEXT NOT NULL DEFAULT '',
432 author_id INTEGER NOT NULL,
433 status TEXT NOT NULL DEFAULT 'open',
434 confidential INTEGER NOT NULL DEFAULT 0,
435 milestone_id INTEGER NOT NULL DEFAULT 0,
436 due_on TEXT NOT NULL DEFAULT '',
437 created_at TEXT NOT NULL,
438 updated_at TEXT NOT NULL,
439 closed_at TEXT NOT NULL DEFAULT '',
440 UNIQUE(repo_id, number)
441 );
442 CREATE TABLE IF NOT EXISTS issue_labels (
443 issue_id INTEGER NOT NULL,
444 label_id INTEGER NOT NULL,
445 PRIMARY KEY(issue_id, label_id)
446 );
447 CREATE TABLE IF NOT EXISTS issue_assignees (
448 issue_id INTEGER NOT NULL,
449 user_id INTEGER NOT NULL,
450 PRIMARY KEY(issue_id, user_id)
451 );
452 CREATE TABLE IF NOT EXISTS issue_notes (
453 id INTEGER PRIMARY KEY,
454 repo_id INTEGER NOT NULL,
455 issue_id INTEGER NOT NULL,
456 author_id INTEGER NOT NULL,
457 body TEXT NOT NULL,
458 created_at TEXT NOT NULL
459 );
460 CREATE TABLE IF NOT EXISTS issue_links (
461 repo_id INTEGER NOT NULL,
462 a INTEGER NOT NULL,
463 b INTEGER NOT NULL,
464 PRIMARY KEY (a, b)
465 );
466 CREATE INDEX IF NOT EXISTS issues_repo ON issues(repo_id, number);
411 467 `
412 468
413 469 func now() string { return time.Now().UTC().Format(time.RFC3339) }
@@ -408,6 +408,62 @@ CREATE TABLE IF NOT EXISTS reviews (
408 updated_at TEXT NOT NULL,
408 updated_at TEXT NOT NULL,
409 UNIQUE(mr_id, user_id)
409 UNIQUE(mr_id, user_id)
410);
410);
411CREATE TABLE IF NOT EXISTS labels (
412 id INTEGER PRIMARY KEY,
413 repo_id INTEGER NOT NULL,
414 name TEXT NOT NULL,
415 color TEXT NOT NULL,
416 UNIQUE(repo_id, name)
417);
418CREATE TABLE IF NOT EXISTS milestones (
419 id INTEGER PRIMARY KEY,
420 repo_id INTEGER NOT NULL,
421 title TEXT NOT NULL,
422 due_on TEXT NOT NULL DEFAULT '',
423 state TEXT NOT NULL DEFAULT 'open',
424 UNIQUE(repo_id, title)
425);
426CREATE TABLE IF NOT EXISTS issues (
427 id INTEGER PRIMARY KEY,
428 repo_id INTEGER NOT NULL,
429 number INTEGER NOT NULL,
430 title TEXT NOT NULL,
431 description TEXT NOT NULL DEFAULT '',
432 author_id INTEGER NOT NULL,
433 status TEXT NOT NULL DEFAULT 'open',
434 confidential INTEGER NOT NULL DEFAULT 0,
435 milestone_id INTEGER NOT NULL DEFAULT 0,
436 due_on TEXT NOT NULL DEFAULT '',
437 created_at TEXT NOT NULL,
438 updated_at TEXT NOT NULL,
439 closed_at TEXT NOT NULL DEFAULT '',
440 UNIQUE(repo_id, number)
441);
442CREATE TABLE IF NOT EXISTS issue_labels (
443 issue_id INTEGER NOT NULL,
444 label_id INTEGER NOT NULL,
445 PRIMARY KEY(issue_id, label_id)
446);
447CREATE TABLE IF NOT EXISTS issue_assignees (
448 issue_id INTEGER NOT NULL,
449 user_id INTEGER NOT NULL,
450 PRIMARY KEY(issue_id, user_id)
451);
452CREATE TABLE IF NOT EXISTS issue_notes (
453 id INTEGER PRIMARY KEY,
454 repo_id INTEGER NOT NULL,
455 issue_id INTEGER NOT NULL,
456 author_id INTEGER NOT NULL,
457 body TEXT NOT NULL,
458 created_at TEXT NOT NULL
459);
460CREATE TABLE IF NOT EXISTS issue_links (
461 repo_id INTEGER NOT NULL,
462 a INTEGER NOT NULL,
463 b INTEGER NOT NULL,
464 PRIMARY KEY (a, b)
465);
466CREATE INDEX IF NOT EXISTS issues_repo ON issues(repo_id, number);
411`
467`
412
468
413func now() string { return time.Now().UTC().Format(time.RFC3339) }
469func now() string { return time.Now().UTC().Format(time.RFC3339) }
internal/webhook/openapi.go +101 −1
@@ -50,7 +50,10 @@ func OpenAPI() []byte {
50 50 "diff_url for a merge request is GET /api/v1/repos/{owner}/{repo}/merge-requests/{id}/diff. " +
51 51 "Both diff requests need Authorization Bearer and a personal token that can read the repo. " +
52 52 "A merge request uses action opened, merged or commented, and commented includes the comment text. " +
53 "A release lists the tag, name, commit and asset URLs.",
53 "A release lists the tag, name, commit and asset URLs. " +
54 "An issue event has object_kind issue and action opened, updated, closed, reopened or commented. " +
55 "It includes the issue number, title, description, status, confidential flag, author, assignees, labels, milestone and due date. " +
56 "A commented action also includes the comment text.",
54 57 },
55 58 "servers": []any{map[string]any{"url": "/api/v1"}},
56 59 "paths": map[string]any{
@@ -117,12 +120,85 @@ func OpenAPI() []byte {
117 120 },
118 121 },
119 122 },
123 "/repos/{owner}/{repo}/issues": map[string]any{
124 "get": map[string]any{
125 "summary": "List issues",
126 "description": "Lists issues. Query state is open, closed or all. Query q searches title and description. Query label and assignee filter. Confidential issues of other people are omitted unless the token is Reporter or higher. A personal token is required. On a public repo any valid personal token can read. Job tokens are rejected.",
127 "security": []any{map[string]any{"bearer": []any{}}},
128 "parameters": []any{
129 map[string]any{"name": "owner", "in": "path", "required": true, "schema": map[string]any{"type": "string"}},
130 map[string]any{"name": "repo", "in": "path", "required": true, "schema": map[string]any{"type": "string"}},
131 map[string]any{"name": "state", "in": "query", "schema": map[string]any{"type": "string"}},
132 map[string]any{"name": "q", "in": "query", "schema": map[string]any{"type": "string"}},
133 map[string]any{"name": "label", "in": "query", "schema": map[string]any{"type": "string"}},
134 map[string]any{"name": "assignee", "in": "query", "schema": map[string]any{"type": "string"}},
135 },
136 "responses": map[string]any{
137 "200": map[string]any{"description": "Issue list."},
138 "401": map[string]any{"description": "Missing or invalid token."},
139 "403": map[string]any{"description": "The token cannot read this private repo."},
140 },
141 },
142 "post": map[string]any{
143 "summary": "Create an issue",
144 "description": "Creates an issue. Title is required. Readonly may set confidential. Labels, assignees, milestone and due_date need Reporter or higher. A label or milestone must already exist.",
145 "security": []any{map[string]any{"bearer": []any{}}},
146 "responses": map[string]any{
147 "201": map[string]any{"description": "Created issue."},
148 "401": map[string]any{"description": "Missing or invalid token."},
149 "403": map[string]any{"description": "The token cannot create an issue, or it sent triage fields without Reporter."},
150 },
151 },
152 },
153 "/repos/{owner}/{repo}/issues/{number}": map[string]any{
154 "get": map[string]any{
155 "summary": "Read an issue",
156 "description": "Returns one issue and its comments. A confidential issue is 404 unless the token belongs to the author or a Reporter.",
157 "security": []any{map[string]any{"bearer": []any{}}},
158 "responses": map[string]any{
159 "200": map[string]any{"description": "The issue."},
160 "401": map[string]any{"description": "Missing or invalid token."},
161 "404": map[string]any{"description": "Unknown issue, or a confidential issue you cannot see."},
162 },
163 },
164 "put": map[string]any{
165 "summary": "Update an issue",
166 "description": "Omitted fields stay as they are. The author may change title, description and state. Labels, assignees, milestone, due_date and confidential need Reporter. State is open or closed.",
167 "security": []any{map[string]any{"bearer": []any{}}},
168 "responses": map[string]any{
169 "200": map[string]any{"description": "Updated issue."},
170 "401": map[string]any{"description": "Missing or invalid token."},
171 "403": map[string]any{"description": "The token cannot change this field."},
172 },
173 },
174 },
175 "/repos/{owner}/{repo}/issues/{number}/notes": map[string]any{
176 "post": map[string]any{
177 "summary": "Comment on an issue",
178 "description": "Adds a comment. Readonly is enough. Sends an issue webhook with action commented.",
179 "security": []any{map[string]any{"bearer": []any{}}},
180 "responses": map[string]any{
181 "201": map[string]any{"description": "Created comment."},
182 "401": map[string]any{"description": "Missing or invalid token."},
183 "403": map[string]any{"description": "The token cannot comment."},
184 },
185 },
186 },
187 "/repos/{owner}/{repo}/labels": map[string]any{
188 "get": map[string]any{"summary": "List labels", "security": []any{map[string]any{"bearer": []any{}}}, "responses": map[string]any{"200": map[string]any{"description": "Labels."}}},
189 "post": map[string]any{"summary": "Create or update a label", "description": "Maintainer only. Name uses letters, digits, spaces, hyphens or underscores. Color is # and six hex digits.", "security": []any{map[string]any{"bearer": []any{}}}, "responses": map[string]any{"201": map[string]any{"description": "Saved label."}, "403": map[string]any{"description": "Not a maintainer."}}},
190 },
191 "/repos/{owner}/{repo}/milestones": map[string]any{
192 "get": map[string]any{"summary": "List milestones", "security": []any{map[string]any{"bearer": []any{}}}, "responses": map[string]any{"200": map[string]any{"description": "Milestones."}}},
193 "post": map[string]any{"summary": "Create or update a milestone", "description": "Maintainer only. due_on is YYYY-MM-DD or empty.", "security": []any{map[string]any{"bearer": []any{}}}, "responses": map[string]any{"201": map[string]any{"description": "Saved milestone."}, "403": map[string]any{"description": "Not a maintainer."}}},
194 },
120 195 },
121 196 "webhooks": map[string]any{
122 197 "pipeline": post("Pipeline finished", "#/components/schemas/PipelineEvent"),
123 198 "push": post("Push", "#/components/schemas/PushEvent"),
124 199 "merge_request": post("Merge request", "#/components/schemas/MergeRequestEvent"),
125 200 "release": post("Release published", "#/components/schemas/ReleaseEvent"),
201 "issue": post("Issue", "#/components/schemas/IssueEvent"),
126 202 },
127 203 "components": map[string]any{
128 204 "securitySchemes": map[string]any{
@@ -249,6 +325,30 @@ func OpenAPI() []byte {
249 325 "url": str("Download URL."),
250 326 "size": map[string]any{"type": "integer", "description": "Size in bytes."},
251 327 }, []string{"name", "url", "size"}),
328 "IssueEvent": obj("Opened, updated, closed, reopened or commented.", map[string]any{
329 "object_kind": str("Always issue."),
330 "type": str("Always issue."),
331 "project": str("owner/name."),
332 "actor": str("User who did this action."),
333 "summary": str("One-line summary."),
334 "url": str("Issue page."),
335 "issue": map[string]any{"$ref": "#/components/schemas/Issue"},
336 "comment": str("Comment text. Present only when action is commented."),
337 }, []string{"object_kind", "type", "project", "issue"}),
338 "Issue": obj("The issue this event is about.", map[string]any{
339 "id": map[string]any{"type": "integer", "description": "Number in the project."},
340 "title": str("Title."),
341 "description": str("Description. May be empty."),
342 "status": str("open or closed."),
343 "confidential": boolean("True when the issue is confidential."),
344 "author": str("User who opened the issue."),
345 "assignees": map[string]any{"type": "array", "items": map[string]any{"type": "string"}},
346 "labels": map[string]any{"type": "array", "items": map[string]any{"type": "string"}},
347 "milestone": str("Milestone title, or empty."),
348 "due_date": str("Due date as YYYY-MM-DD, or empty."),
349 "action": str("opened, updated, closed, reopened or commented."),
350 "url": str("Issue page."),
351 }, []string{"id", "title", "description", "status", "confidential", "author", "assignees", "labels", "milestone", "due_date", "action"}),
252 352 },
253 353 },
254 354 }
@@ -50,7 +50,10 @@ func OpenAPI() []byte {
50 "diff_url for a merge request is GET /api/v1/repos/{owner}/{repo}/merge-requests/{id}/diff. " +
50 "diff_url for a merge request is GET /api/v1/repos/{owner}/{repo}/merge-requests/{id}/diff. " +
51 "Both diff requests need Authorization Bearer and a personal token that can read the repo. " +
51 "Both diff requests need Authorization Bearer and a personal token that can read the repo. " +
52 "A merge request uses action opened, merged or commented, and commented includes the comment text. " +
52 "A merge request uses action opened, merged or commented, and commented includes the comment text. " +
53 "A release lists the tag, name, commit and asset URLs.",
53 "A release lists the tag, name, commit and asset URLs. " +
54 "An issue event has object_kind issue and action opened, updated, closed, reopened or commented. " +
55 "It includes the issue number, title, description, status, confidential flag, author, assignees, labels, milestone and due date. " +
56 "A commented action also includes the comment text.",
54 },
57 },
55 "servers": []any{map[string]any{"url": "/api/v1"}},
58 "servers": []any{map[string]any{"url": "/api/v1"}},
56 "paths": map[string]any{
59 "paths": map[string]any{
@@ -117,12 +120,85 @@ func OpenAPI() []byte {
117 },
120 },
118 },
121 },
119 },
122 },
123 "/repos/{owner}/{repo}/issues": map[string]any{
124 "get": map[string]any{
125 "summary": "List issues",
126 "description": "Lists issues. Query state is open, closed or all. Query q searches title and description. Query label and assignee filter. Confidential issues of other people are omitted unless the token is Reporter or higher. A personal token is required. On a public repo any valid personal token can read. Job tokens are rejected.",
127 "security": []any{map[string]any{"bearer": []any{}}},
128 "parameters": []any{
129 map[string]any{"name": "owner", "in": "path", "required": true, "schema": map[string]any{"type": "string"}},
130 map[string]any{"name": "repo", "in": "path", "required": true, "schema": map[string]any{"type": "string"}},
131 map[string]any{"name": "state", "in": "query", "schema": map[string]any{"type": "string"}},
132 map[string]any{"name": "q", "in": "query", "schema": map[string]any{"type": "string"}},
133 map[string]any{"name": "label", "in": "query", "schema": map[string]any{"type": "string"}},
134 map[string]any{"name": "assignee", "in": "query", "schema": map[string]any{"type": "string"}},
135 },
136 "responses": map[string]any{
137 "200": map[string]any{"description": "Issue list."},
138 "401": map[string]any{"description": "Missing or invalid token."},
139 "403": map[string]any{"description": "The token cannot read this private repo."},
140 },
141 },
142 "post": map[string]any{
143 "summary": "Create an issue",
144 "description": "Creates an issue. Title is required. Readonly may set confidential. Labels, assignees, milestone and due_date need Reporter or higher. A label or milestone must already exist.",
145 "security": []any{map[string]any{"bearer": []any{}}},
146 "responses": map[string]any{
147 "201": map[string]any{"description": "Created issue."},
148 "401": map[string]any{"description": "Missing or invalid token."},
149 "403": map[string]any{"description": "The token cannot create an issue, or it sent triage fields without Reporter."},
150 },
151 },
152 },
153 "/repos/{owner}/{repo}/issues/{number}": map[string]any{
154 "get": map[string]any{
155 "summary": "Read an issue",
156 "description": "Returns one issue and its comments. A confidential issue is 404 unless the token belongs to the author or a Reporter.",
157 "security": []any{map[string]any{"bearer": []any{}}},
158 "responses": map[string]any{
159 "200": map[string]any{"description": "The issue."},
160 "401": map[string]any{"description": "Missing or invalid token."},
161 "404": map[string]any{"description": "Unknown issue, or a confidential issue you cannot see."},
162 },
163 },
164 "put": map[string]any{
165 "summary": "Update an issue",
166 "description": "Omitted fields stay as they are. The author may change title, description and state. Labels, assignees, milestone, due_date and confidential need Reporter. State is open or closed.",
167 "security": []any{map[string]any{"bearer": []any{}}},
168 "responses": map[string]any{
169 "200": map[string]any{"description": "Updated issue."},
170 "401": map[string]any{"description": "Missing or invalid token."},
171 "403": map[string]any{"description": "The token cannot change this field."},
172 },
173 },
174 },
175 "/repos/{owner}/{repo}/issues/{number}/notes": map[string]any{
176 "post": map[string]any{
177 "summary": "Comment on an issue",
178 "description": "Adds a comment. Readonly is enough. Sends an issue webhook with action commented.",
179 "security": []any{map[string]any{"bearer": []any{}}},
180 "responses": map[string]any{
181 "201": map[string]any{"description": "Created comment."},
182 "401": map[string]any{"description": "Missing or invalid token."},
183 "403": map[string]any{"description": "The token cannot comment."},
184 },
185 },
186 },
187 "/repos/{owner}/{repo}/labels": map[string]any{
188 "get": map[string]any{"summary": "List labels", "security": []any{map[string]any{"bearer": []any{}}}, "responses": map[string]any{"200": map[string]any{"description": "Labels."}}},
189 "post": map[string]any{"summary": "Create or update a label", "description": "Maintainer only. Name uses letters, digits, spaces, hyphens or underscores. Color is # and six hex digits.", "security": []any{map[string]any{"bearer": []any{}}}, "responses": map[string]any{"201": map[string]any{"description": "Saved label."}, "403": map[string]any{"description": "Not a maintainer."}}},
190 },
191 "/repos/{owner}/{repo}/milestones": map[string]any{
192 "get": map[string]any{"summary": "List milestones", "security": []any{map[string]any{"bearer": []any{}}}, "responses": map[string]any{"200": map[string]any{"description": "Milestones."}}},
193 "post": map[string]any{"summary": "Create or update a milestone", "description": "Maintainer only. due_on is YYYY-MM-DD or empty.", "security": []any{map[string]any{"bearer": []any{}}}, "responses": map[string]any{"201": map[string]any{"description": "Saved milestone."}, "403": map[string]any{"description": "Not a maintainer."}}},
194 },
120 },
195 },
121 "webhooks": map[string]any{
196 "webhooks": map[string]any{
122 "pipeline": post("Pipeline finished", "#/components/schemas/PipelineEvent"),
197 "pipeline": post("Pipeline finished", "#/components/schemas/PipelineEvent"),
123 "push": post("Push", "#/components/schemas/PushEvent"),
198 "push": post("Push", "#/components/schemas/PushEvent"),
124 "merge_request": post("Merge request", "#/components/schemas/MergeRequestEvent"),
199 "merge_request": post("Merge request", "#/components/schemas/MergeRequestEvent"),
125 "release": post("Release published", "#/components/schemas/ReleaseEvent"),
200 "release": post("Release published", "#/components/schemas/ReleaseEvent"),
201 "issue": post("Issue", "#/components/schemas/IssueEvent"),
126 },
202 },
127 "components": map[string]any{
203 "components": map[string]any{
128 "securitySchemes": map[string]any{
204 "securitySchemes": map[string]any{
@@ -249,6 +325,30 @@ func OpenAPI() []byte {
249 "url": str("Download URL."),
325 "url": str("Download URL."),
250 "size": map[string]any{"type": "integer", "description": "Size in bytes."},
326 "size": map[string]any{"type": "integer", "description": "Size in bytes."},
251 }, []string{"name", "url", "size"}),
327 }, []string{"name", "url", "size"}),
328 "IssueEvent": obj("Opened, updated, closed, reopened or commented.", map[string]any{
329 "object_kind": str("Always issue."),
330 "type": str("Always issue."),
331 "project": str("owner/name."),
332 "actor": str("User who did this action."),
333 "summary": str("One-line summary."),
334 "url": str("Issue page."),
335 "issue": map[string]any{"$ref": "#/components/schemas/Issue"},
336 "comment": str("Comment text. Present only when action is commented."),
337 }, []string{"object_kind", "type", "project", "issue"}),
338 "Issue": obj("The issue this event is about.", map[string]any{
339 "id": map[string]any{"type": "integer", "description": "Number in the project."},
340 "title": str("Title."),
341 "description": str("Description. May be empty."),
342 "status": str("open or closed."),
343 "confidential": boolean("True when the issue is confidential."),
344 "author": str("User who opened the issue."),
345 "assignees": map[string]any{"type": "array", "items": map[string]any{"type": "string"}},
346 "labels": map[string]any{"type": "array", "items": map[string]any{"type": "string"}},
347 "milestone": str("Milestone title, or empty."),
348 "due_date": str("Due date as YYYY-MM-DD, or empty."),
349 "action": str("opened, updated, closed, reopened or commented."),
350 "url": str("Issue page."),
351 }, []string{"id", "title", "description", "status", "confidential", "author", "assignees", "labels", "milestone", "due_date", "action"}),
252 },
352 },
253 },
353 },
254 }
354 }
internal/webhook/payload.go +54 −0
@@ -43,6 +43,7 @@ type Document struct {
43 43 Comment string `json:"comment,omitempty"`
44 44
45 45 Release *ReleaseInfo `json:"release,omitempty"`
46 Issue *IssueInfo `json:"issue,omitempty"`
46 47 }
47 48
48 49 // PipelineInfo is de pipeline waar het event over gaat.
@@ -140,6 +141,23 @@ type DiffStats struct {
140 141 Files []FileChange `json:"files"`
141 142 }
142 143
144 // IssueInfo is het issue van het event.
145 // Action is opened, updated, closed, reopened of commented.
146 type IssueInfo struct {
147 ID int64 `json:"id"`
148 Title string `json:"title"`
149 Description string `json:"description"`
150 Status string `json:"status"`
151 Confidential bool `json:"confidential"`
152 Author string `json:"author"`
153 Assignees []string `json:"assignees"`
154 Labels []string `json:"labels"`
155 Milestone string `json:"milestone"`
156 DueDate string `json:"due_date"`
157 Action string `json:"action"`
158 URL string `json:"url,omitempty"`
159 }
160
143 161 // ReleaseInfo is een gepubliceerde release.
144 162 type ReleaseInfo struct {
145 163 Tag string `json:"tag"`
@@ -175,6 +193,7 @@ func (ev Event) Document() Document {
175 193 After: ev.After,
176 194 MergeRequest: ev.MergeRequest,
177 195 Release: ev.Release,
196 Issue: ev.Issue,
178 197 }
179 198 switch ev.Type {
180 199 case EventPush:
@@ -219,6 +238,20 @@ func (ev Event) Document() Document {
219 238 d.Comment = ev.Comment
220 239 }
221 240 }
241 case EventIssue:
242 if ev.Issue != nil {
243 iss := *ev.Issue
244 if iss.Assignees == nil {
245 iss.Assignees = []string{}
246 }
247 if iss.Labels == nil {
248 iss.Labels = []string{}
249 }
250 d.Issue = &iss
251 if iss.Action == "commented" {
252 d.Comment = ev.Comment
253 }
254 }
222 255 }
223 256 if d.Release != nil && d.Release.Assets == nil {
224 257 rel := *d.Release
@@ -361,3 +394,24 @@ func Example() string {
361 394 }
362 395 return b.String()
363 396 }
397
398 // IssueExample is het voorbeeld van een issue-event op de infopagina.
399 func IssueExample() string {
400 ev := Event{
401 Type: EventIssue, Project: "tim/app", Actor: "ada",
402 Summary: "issue #12 opened: Inloggen faalt",
403 URL: "https://git.example/tim/app/-/issues/12",
404 Issue: &IssueInfo{
405 ID: 12, Title: "Inloggen faalt", Description: "Zie #3 en !4.",
406 Status: "open", Confidential: false, Author: "ada",
407 Assignees: []string{"tim"}, Labels: []string{"bug"},
408 Milestone: "v1", DueDate: "2026-11-01", Action: "opened",
409 URL: "https://git.example/tim/app/-/issues/12",
410 },
411 }
412 raw, err := json.MarshalIndent(ev.Document(), "", " ")
413 if err != nil {
414 return ""
415 }
416 return string(raw)
417 }
@@ -43,6 +43,7 @@ type Document struct {
43 Comment string `json:"comment,omitempty"`
43 Comment string `json:"comment,omitempty"`
44
44
45 Release *ReleaseInfo `json:"release,omitempty"`
45 Release *ReleaseInfo `json:"release,omitempty"`
46 Issue *IssueInfo `json:"issue,omitempty"`
46}
47}
47
48
48// PipelineInfo is de pipeline waar het event over gaat.
49// PipelineInfo is de pipeline waar het event over gaat.
@@ -140,6 +141,23 @@ type DiffStats struct {
140 Files []FileChange `json:"files"`
141 Files []FileChange `json:"files"`
141}
142}
142
143
144// IssueInfo is het issue van het event.
145// Action is opened, updated, closed, reopened of commented.
146type IssueInfo struct {
147 ID int64 `json:"id"`
148 Title string `json:"title"`
149 Description string `json:"description"`
150 Status string `json:"status"`
151 Confidential bool `json:"confidential"`
152 Author string `json:"author"`
153 Assignees []string `json:"assignees"`
154 Labels []string `json:"labels"`
155 Milestone string `json:"milestone"`
156 DueDate string `json:"due_date"`
157 Action string `json:"action"`
158 URL string `json:"url,omitempty"`
159}
160
143// ReleaseInfo is een gepubliceerde release.
161// ReleaseInfo is een gepubliceerde release.
144type ReleaseInfo struct {
162type ReleaseInfo struct {
145 Tag string `json:"tag"`
163 Tag string `json:"tag"`
@@ -175,6 +193,7 @@ func (ev Event) Document() Document {
175 After: ev.After,
193 After: ev.After,
176 MergeRequest: ev.MergeRequest,
194 MergeRequest: ev.MergeRequest,
177 Release: ev.Release,
195 Release: ev.Release,
196 Issue: ev.Issue,
178 }
197 }
179 switch ev.Type {
198 switch ev.Type {
180 case EventPush:
199 case EventPush:
@@ -219,6 +238,20 @@ func (ev Event) Document() Document {
219 d.Comment = ev.Comment
238 d.Comment = ev.Comment
220 }
239 }
221 }
240 }
241 case EventIssue:
242 if ev.Issue != nil {
243 iss := *ev.Issue
244 if iss.Assignees == nil {
245 iss.Assignees = []string{}
246 }
247 if iss.Labels == nil {
248 iss.Labels = []string{}
249 }
250 d.Issue = &iss
251 if iss.Action == "commented" {
252 d.Comment = ev.Comment
253 }
254 }
222 }
255 }
223 if d.Release != nil && d.Release.Assets == nil {
256 if d.Release != nil && d.Release.Assets == nil {
224 rel := *d.Release
257 rel := *d.Release
@@ -361,3 +394,24 @@ func Example() string {
361 }
394 }
362 return b.String()
395 return b.String()
363}
396}
397
398// IssueExample is het voorbeeld van een issue-event op de infopagina.
399func IssueExample() string {
400 ev := Event{
401 Type: EventIssue, Project: "tim/app", Actor: "ada",
402 Summary: "issue #12 opened: Inloggen faalt",
403 URL: "https://git.example/tim/app/-/issues/12",
404 Issue: &IssueInfo{
405 ID: 12, Title: "Inloggen faalt", Description: "Zie #3 en !4.",
406 Status: "open", Confidential: false, Author: "ada",
407 Assignees: []string{"tim"}, Labels: []string{"bug"},
408 Milestone: "v1", DueDate: "2026-11-01", Action: "opened",
409 URL: "https://git.example/tim/app/-/issues/12",
410 },
411 }
412 raw, err := json.MarshalIndent(ev.Document(), "", " ")
413 if err != nil {
414 return ""
415 }
416 return string(raw)
417}
internal/webhook/payload_test.go +32 −1
@@ -148,6 +148,37 @@ func TestDocumentShapes(t *testing.T) {
148 148 }
149 149 }
150 150
151 func TestIssueDocument(t *testing.T) {
152 ev := Event{
153 Type: EventIssue, Project: "tim/app", Actor: "ada", Comment: "hoort niet mee",
154 Issue: &IssueInfo{
155 ID: 3, Title: "Kapot", Description: "tekst", Status: "open",
156 Author: "ada", Action: "opened",
157 },
158 }
159 raw, err := json.Marshal(ev.Document())
160 if err != nil {
161 t.Fatal(err)
162 }
163 var doc map[string]any
164 if err := json.Unmarshal(raw, &doc); err != nil {
165 t.Fatal(err)
166 }
167 if doc["object_kind"] != "issue" || doc["comment"] != nil {
168 t.Fatalf("opened lekt een comment: %s", raw)
169 }
170 iss := doc["issue"].(map[string]any)
171 if iss["action"] != "opened" || iss["assignees"] == nil || iss["labels"] == nil || iss["confidential"] != false {
172 t.Fatalf("issue %s", raw)
173 }
174 ev.Issue.Action = "commented"
175 ev.Comment = "hoort mee"
176 raw, _ = json.Marshal(ev.Document())
177 if !strings.Contains(string(raw), `"comment":"hoort mee"`) {
178 t.Fatalf("comment ontbreekt: %s", raw)
179 }
180 }
181
151 182 func TestOpenAPIMatchesExample(t *testing.T) {
152 183 var spec map[string]any
153 184 if err := json.Unmarshal(OpenAPI(), &spec); err != nil {
@@ -158,7 +189,7 @@ func TestOpenAPIMatchesExample(t *testing.T) {
158 189 }
159 190 raw := string(OpenAPI())
160 191 for _, want := range []string{
161 "PipelineEvent", "PushEvent", "MergeRequestEvent", "ReleaseEvent",
192 "PipelineEvent", "PushEvent", "MergeRequestEvent", "ReleaseEvent", "IssueEvent",
162 193 "commit_message", "allow_failure", "log_truncated", "log_url",
163 194 "/repos/{owner}/{repo}/jobs/{id}/log",
164 195 "diff_url", "reviewers", "diff_stats", "/commits/{sha}/diff", "/merge-requests/{id}/diff",
@@ -148,6 +148,37 @@ func TestDocumentShapes(t *testing.T) {
148 }
148 }
149}
149}
150
150
151func TestIssueDocument(t *testing.T) {
152 ev := Event{
153 Type: EventIssue, Project: "tim/app", Actor: "ada", Comment: "hoort niet mee",
154 Issue: &IssueInfo{
155 ID: 3, Title: "Kapot", Description: "tekst", Status: "open",
156 Author: "ada", Action: "opened",
157 },
158 }
159 raw, err := json.Marshal(ev.Document())
160 if err != nil {
161 t.Fatal(err)
162 }
163 var doc map[string]any
164 if err := json.Unmarshal(raw, &doc); err != nil {
165 t.Fatal(err)
166 }
167 if doc["object_kind"] != "issue" || doc["comment"] != nil {
168 t.Fatalf("opened lekt een comment: %s", raw)
169 }
170 iss := doc["issue"].(map[string]any)
171 if iss["action"] != "opened" || iss["assignees"] == nil || iss["labels"] == nil || iss["confidential"] != false {
172 t.Fatalf("issue %s", raw)
173 }
174 ev.Issue.Action = "commented"
175 ev.Comment = "hoort mee"
176 raw, _ = json.Marshal(ev.Document())
177 if !strings.Contains(string(raw), `"comment":"hoort mee"`) {
178 t.Fatalf("comment ontbreekt: %s", raw)
179 }
180}
181
151func TestOpenAPIMatchesExample(t *testing.T) {
182func TestOpenAPIMatchesExample(t *testing.T) {
152 var spec map[string]any
183 var spec map[string]any
153 if err := json.Unmarshal(OpenAPI(), &spec); err != nil {
184 if err := json.Unmarshal(OpenAPI(), &spec); err != nil {
@@ -158,7 +189,7 @@ func TestOpenAPIMatchesExample(t *testing.T) {
158 }
189 }
159 raw := string(OpenAPI())
190 raw := string(OpenAPI())
160 for _, want := range []string{
191 for _, want := range []string{
161 "PipelineEvent", "PushEvent", "MergeRequestEvent", "ReleaseEvent",
192 "PipelineEvent", "PushEvent", "MergeRequestEvent", "ReleaseEvent", "IssueEvent",
162 "commit_message", "allow_failure", "log_truncated", "log_url",
193 "commit_message", "allow_failure", "log_truncated", "log_url",
163 "/repos/{owner}/{repo}/jobs/{id}/log",
194 "/repos/{owner}/{repo}/jobs/{id}/log",
164 "diff_url", "reviewers", "diff_stats", "/commits/{sha}/diff", "/merge-requests/{id}/diff",
195 "diff_url", "reviewers", "diff_stats", "/commits/{sha}/diff", "/merge-requests/{id}/diff",
internal/webhook/webhook.go +3 −1
@@ -16,11 +16,12 @@ const (
16 16 EventPipelineSuccess = "pipeline_success"
17 17 EventPipelineFailure = "pipeline_failure"
18 18 EventRelease = "release_published"
19 EventIssue = "issue"
19 20 )
20 21
21 22 // AllEvents is de vaste lijst die een webhook mag aanvinken.
22 23 func AllEvents() []string {
23 return []string{EventPush, EventMergeRequest, EventPipelineSuccess, EventPipelineFailure, EventRelease}
24 return []string{EventPush, EventMergeRequest, EventPipelineSuccess, EventPipelineFailure, EventRelease, EventIssue}
24 25 }
25 26
26 27 // KnownEvent meldt of name een ondersteunde gebeurtenis is.
@@ -65,6 +66,7 @@ type Event struct {
65 66 MergeRequest *MRInfo
66 67 Comment string
67 68 Release *ReleaseInfo
69 Issue *IssueInfo
68 70 }
69 71
70 72 // Hook is de opgeslagen configuratie, zonder geheimen al ingevuld.
@@ -16,11 +16,12 @@ const (
16 EventPipelineSuccess = "pipeline_success"
16 EventPipelineSuccess = "pipeline_success"
17 EventPipelineFailure = "pipeline_failure"
17 EventPipelineFailure = "pipeline_failure"
18 EventRelease = "release_published"
18 EventRelease = "release_published"
19 EventIssue = "issue"
19)
20)
20
21
21// AllEvents is de vaste lijst die een webhook mag aanvinken.
22// AllEvents is de vaste lijst die een webhook mag aanvinken.
22func AllEvents() []string {
23func AllEvents() []string {
23 return []string{EventPush, EventMergeRequest, EventPipelineSuccess, EventPipelineFailure, EventRelease}
24 return []string{EventPush, EventMergeRequest, EventPipelineSuccess, EventPipelineFailure, EventRelease, EventIssue}
24}
25}
25
26
26// KnownEvent meldt of name een ondersteunde gebeurtenis is.
27// KnownEvent meldt of name een ondersteunde gebeurtenis is.
@@ -65,6 +66,7 @@ type Event struct {
65 MergeRequest *MRInfo
66 MergeRequest *MRInfo
66 Comment string
67 Comment string
67 Release *ReleaseInfo
68 Release *ReleaseInfo
69 Issue *IssueInfo
68}
70}
69
71
70// Hook is de opgeslagen configuratie, zonder geheimen al ingevuld.
72// Hook is de opgeslagen configuratie, zonder geheimen al ingevuld.