BlueGit

timfa bluegit

Merge branch 'cursor/profielblok-674d' into 'master'

timfa

Authored 2026-10-23 · 3 weeks ago

Hash
30ced8e1140b5ecb5fa617754f959b291c8d2778
Pipeline
Warning
28 files changed +878 −124
internal/i18n/catalog.go +11 −1
@@ -336,7 +336,14 @@ var en = map[string]string{
336 336 "acct.add": "Add",
337 337 "acct.remove": "Remove",
338 338 "acct.export": "Download your data (JSON)",
339 "acct.language": "Language",
339 "acct.language": "Language",
340 "acct.name": "Display name",
341 "acct.bio": "Bio",
342 "acct.bioHint": "A short text on your profile. At most 280 characters.",
343 "profile.since": "Member since %s",
344 "profile.contrib": "Contributions",
345 "profile.copy": "Copy profile URL",
346 "profile.edit": "Edit profile",
340 347
341 348 "setup.choose": "Choose storage",
342 349 "setup.pathTitle": "Storage path",
@@ -365,6 +372,7 @@ var en = map[string]string{
365 372 "flash.sshRemoved": "Key removed",
366 373 "flash.pipeline": "Pipeline started",
367 374 "flash.language": "Language saved",
375 "flash.profile": "Profile saved",
368 376 "flash.logo": "Logo saved",
369 377 "flash.star": "Star updated",
370 378
@@ -415,6 +423,8 @@ var en = map[string]string{
415 423 "err.pattern": "pattern %q cannot be used",
416 424 "err.emptyValue": "the value is empty",
417 425 "err.userTaken": "username %s is already in use",
426 "err.profileName": "the display name is too long or contains a line break",
427 "err.profileBio": "the bio is too long",
418 428 "err.tokenNeedsName": "give the token a name",
419 429 "err.sshDup": "this key is already registered",
420 430 "err.notFound": "not found",
@@ -336,7 +336,14 @@ var en = map[string]string{
336 "acct.add": "Add",
336 "acct.add": "Add",
337 "acct.remove": "Remove",
337 "acct.remove": "Remove",
338 "acct.export": "Download your data (JSON)",
338 "acct.export": "Download your data (JSON)",
339 "acct.language": "Language",
339 "acct.language": "Language",
340 "acct.name": "Display name",
341 "acct.bio": "Bio",
342 "acct.bioHint": "A short text on your profile. At most 280 characters.",
343 "profile.since": "Member since %s",
344 "profile.contrib": "Contributions",
345 "profile.copy": "Copy profile URL",
346 "profile.edit": "Edit profile",
340
347
341 "setup.choose": "Choose storage",
348 "setup.choose": "Choose storage",
342 "setup.pathTitle": "Storage path",
349 "setup.pathTitle": "Storage path",
@@ -365,6 +372,7 @@ var en = map[string]string{
365 "flash.sshRemoved": "Key removed",
372 "flash.sshRemoved": "Key removed",
366 "flash.pipeline": "Pipeline started",
373 "flash.pipeline": "Pipeline started",
367 "flash.language": "Language saved",
374 "flash.language": "Language saved",
375 "flash.profile": "Profile saved",
368 "flash.logo": "Logo saved",
376 "flash.logo": "Logo saved",
369 "flash.star": "Star updated",
377 "flash.star": "Star updated",
370
378
@@ -415,6 +423,8 @@ var en = map[string]string{
415 "err.pattern": "pattern %q cannot be used",
423 "err.pattern": "pattern %q cannot be used",
416 "err.emptyValue": "the value is empty",
424 "err.emptyValue": "the value is empty",
417 "err.userTaken": "username %s is already in use",
425 "err.userTaken": "username %s is already in use",
426 "err.profileName": "the display name is too long or contains a line break",
427 "err.profileBio": "the bio is too long",
418 "err.tokenNeedsName": "give the token a name",
428 "err.tokenNeedsName": "give the token a name",
419 "err.sshDup": "this key is already registered",
429 "err.sshDup": "this key is already registered",
420 "err.notFound": "not found",
430 "err.notFound": "not found",
internal/i18n/catalog_issues.go +4 −4
@@ -39,7 +39,7 @@ var issueEN = map[string]string{
39 39 "issue.relatedNew": "New related issue",
40 40 "issue.relate": "Mark this issue as related to #%d",
41 41 "issue.fromComment": "New issue from comment",
42 "issue.by": "opened by %s",
42 "issue.by": "opened by",
43 43 "issue.edit": "Edit",
44 44 "issue.meta": "Labels and assignees",
45 45 "issue.addLabel": "Add label",
@@ -103,7 +103,7 @@ var issueNL = map[string]string{
103 103 "issue.relatedNew": "Nieuw gerelateerd issue",
104 104 "issue.relate": "Markeer dit issue als gerelateerd aan #%d",
105 105 "issue.fromComment": "Nieuw issue uit reactie",
106 "issue.by": "geopend door %s",
106 "issue.by": "geopend door",
107 107 "issue.edit": "Bewerken",
108 108 "issue.meta": "Labels en toewijzing",
109 109 "issue.addLabel": "Label toevoegen",
@@ -167,7 +167,7 @@ var issueDE = map[string]string{
167 167 "issue.relatedNew": "Neues verwandtes Issue",
168 168 "issue.relate": "Dieses Issue als verwandt mit #%d markieren",
169 169 "issue.fromComment": "Neues Issue aus Kommentar",
170 "issue.by": "geöffnet von %s",
170 "issue.by": "geöffnet von",
171 171 "issue.edit": "Bearbeiten",
172 172 "issue.meta": "Labels und Zuweisung",
173 173 "issue.addLabel": "Label hinzufügen",
@@ -231,7 +231,7 @@ var issueFR = map[string]string{
231 231 "issue.relatedNew": "Nouveau ticket lié",
232 232 "issue.relate": "Marquer ce ticket comme lié à #%d",
233 233 "issue.fromComment": "Nouveau ticket depuis le commentaire",
234 "issue.by": "ouvert par %s",
234 "issue.by": "ouvert par",
235 235 "issue.edit": "Modifier",
236 236 "issue.meta": "Étiquettes et assignation",
237 237 "issue.addLabel": "Ajouter une étiquette",
@@ -39,7 +39,7 @@ var issueEN = map[string]string{
39 "issue.relatedNew": "New related issue",
39 "issue.relatedNew": "New related issue",
40 "issue.relate": "Mark this issue as related to #%d",
40 "issue.relate": "Mark this issue as related to #%d",
41 "issue.fromComment": "New issue from comment",
41 "issue.fromComment": "New issue from comment",
42 "issue.by": "opened by %s",
42 "issue.by": "opened by",
43 "issue.edit": "Edit",
43 "issue.edit": "Edit",
44 "issue.meta": "Labels and assignees",
44 "issue.meta": "Labels and assignees",
45 "issue.addLabel": "Add label",
45 "issue.addLabel": "Add label",
@@ -103,7 +103,7 @@ var issueNL = map[string]string{
103 "issue.relatedNew": "Nieuw gerelateerd issue",
103 "issue.relatedNew": "Nieuw gerelateerd issue",
104 "issue.relate": "Markeer dit issue als gerelateerd aan #%d",
104 "issue.relate": "Markeer dit issue als gerelateerd aan #%d",
105 "issue.fromComment": "Nieuw issue uit reactie",
105 "issue.fromComment": "Nieuw issue uit reactie",
106 "issue.by": "geopend door %s",
106 "issue.by": "geopend door",
107 "issue.edit": "Bewerken",
107 "issue.edit": "Bewerken",
108 "issue.meta": "Labels en toewijzing",
108 "issue.meta": "Labels en toewijzing",
109 "issue.addLabel": "Label toevoegen",
109 "issue.addLabel": "Label toevoegen",
@@ -167,7 +167,7 @@ var issueDE = map[string]string{
167 "issue.relatedNew": "Neues verwandtes Issue",
167 "issue.relatedNew": "Neues verwandtes Issue",
168 "issue.relate": "Dieses Issue als verwandt mit #%d markieren",
168 "issue.relate": "Dieses Issue als verwandt mit #%d markieren",
169 "issue.fromComment": "Neues Issue aus Kommentar",
169 "issue.fromComment": "Neues Issue aus Kommentar",
170 "issue.by": "geöffnet von %s",
170 "issue.by": "geöffnet von",
171 "issue.edit": "Bearbeiten",
171 "issue.edit": "Bearbeiten",
172 "issue.meta": "Labels und Zuweisung",
172 "issue.meta": "Labels und Zuweisung",
173 "issue.addLabel": "Label hinzufügen",
173 "issue.addLabel": "Label hinzufügen",
@@ -231,7 +231,7 @@ var issueFR = map[string]string{
231 "issue.relatedNew": "Nouveau ticket lié",
231 "issue.relatedNew": "Nouveau ticket lié",
232 "issue.relate": "Marquer ce ticket comme lié à #%d",
232 "issue.relate": "Marquer ce ticket comme lié à #%d",
233 "issue.fromComment": "Nouveau ticket depuis le commentaire",
233 "issue.fromComment": "Nouveau ticket depuis le commentaire",
234 "issue.by": "ouvert par %s",
234 "issue.by": "ouvert par",
235 "issue.edit": "Modifier",
235 "issue.edit": "Modifier",
236 "issue.meta": "Étiquettes et assignation",
236 "issue.meta": "Étiquettes et assignation",
237 "issue.addLabel": "Ajouter une étiquette",
237 "issue.addLabel": "Ajouter une étiquette",
internal/i18n/catalog_lang.go +30 −0
@@ -340,6 +340,13 @@ var nl = map[string]string{
340 340 "acct.remove": "Verwijderen",
341 341 "acct.export": "Gegevens downloaden (JSON)",
342 342 "acct.language": "Taal",
343 "acct.name": "Weergavenaam",
344 "acct.bio": "Bio",
345 "acct.bioHint": "Een korte tekst op je profiel. Hoogstens 280 tekens.",
346 "profile.since": "Lid sinds %s",
347 "profile.contrib": "Bijdragen",
348 "profile.copy": "Profiel-URL kopiëren",
349 "profile.edit": "Profiel bewerken",
343 350 "setup.choose": "Opslag kiezen",
344 351 "setup.pathTitle": "Opslagpad",
345 352 "setup.changeWarn": "Het pad wijzigen verplaatst geen repositories, artifacts of releases.",
@@ -366,6 +373,7 @@ var nl = map[string]string{
366 373 "flash.sshRemoved": "Sleutel verwijderd",
367 374 "flash.pipeline": "Pipeline gestart",
368 375 "flash.language": "Taal opgeslagen",
376 "flash.profile": "Profiel opgeslagen",
369 377 "flash.logo": "Logo opgeslagen",
370 378 "flash.star": "Ster bijgewerkt",
371 379 "err.forbidden": "geen toegang",
@@ -414,6 +422,8 @@ var nl = map[string]string{
414 422 "err.pattern": "patroon %q is niet bruikbaar",
415 423 "err.emptyValue": "de waarde is leeg",
416 424 "err.userTaken": "gebruikersnaam %s is al in gebruik",
425 "err.profileName": "de weergavenaam is te lang of bevat een regeleinde",
426 "err.profileBio": "de bio is te lang",
417 427 "err.tokenNeedsName": "geef het token een naam",
418 428 "err.sshDup": "deze sleutel staat al geregistreerd",
419 429 "err.notFound": "niet gevonden",
@@ -951,6 +961,13 @@ var de = map[string]string{
951 961 "acct.remove": "Entfernen",
952 962 "acct.export": "Daten herunterladen (JSON)",
953 963 "acct.language": "Sprache",
964 "acct.name": "Anzeigename",
965 "acct.bio": "Bio",
966 "acct.bioHint": "Ein kurzer Text auf deinem Profil. Höchstens 280 Zeichen.",
967 "profile.since": "Mitglied seit %s",
968 "profile.contrib": "Beiträge",
969 "profile.copy": "Profil-URL kopieren",
970 "profile.edit": "Profil bearbeiten",
954 971 "setup.choose": "Speicher wählen",
955 972 "setup.pathTitle": "Speicherpfad",
956 973 "setup.changeWarn": "Eine Pfadänderung verschiebt keine Repositories, Artefakte oder Releases.",
@@ -977,6 +994,7 @@ var de = map[string]string{
977 994 "flash.sshRemoved": "Schlüssel entfernt",
978 995 "flash.pipeline": "Pipeline gestartet",
979 996 "flash.language": "Sprache gespeichert",
997 "flash.profile": "Profil gespeichert",
980 998 "flash.logo": "Logo gespeichert",
981 999 "flash.star": "Stern aktualisiert",
982 1000 "err.forbidden": "kein Zugriff",
@@ -1025,6 +1043,8 @@ var de = map[string]string{
1025 1043 "err.pattern": "Muster %q ist nicht verwendbar",
1026 1044 "err.emptyValue": "der Wert ist leer",
1027 1045 "err.userTaken": "Benutzername %s ist bereits vergeben",
1046 "err.profileName": "der Anzeigename ist zu lang oder enthält einen Zeilenumbruch",
1047 "err.profileBio": "die Bio ist zu lang",
1028 1048 "err.tokenNeedsName": "gib dem Token einen Namen",
1029 1049 "err.sshDup": "dieser Schlüssel ist bereits registriert",
1030 1050 "err.notFound": "nicht gefunden",
@@ -1562,6 +1582,13 @@ var fr = map[string]string{
1562 1582 "acct.remove": "Supprimer",
1563 1583 "acct.export": "Télécharger tes données (JSON)",
1564 1584 "acct.language": "Langue",
1585 "acct.name": "Nom affiché",
1586 "acct.bio": "Bio",
1587 "acct.bioHint": "Un court texte sur ton profil. 280 caractères au plus.",
1588 "profile.since": "Membre depuis le %s",
1589 "profile.contrib": "Contributions",
1590 "profile.copy": "Copier l’URL du profil",
1591 "profile.edit": "Modifier le profil",
1565 1592 "setup.choose": "Choisir le stockage",
1566 1593 "setup.pathTitle": "Chemin de stockage",
1567 1594 "setup.changeWarn": "Changer le chemin ne déplace ni les dépôts, ni les artefacts, ni les versions.",
@@ -1588,6 +1615,7 @@ var fr = map[string]string{
1588 1615 "flash.sshRemoved": "Clé supprimée",
1589 1616 "flash.pipeline": "Pipeline démarrée",
1590 1617 "flash.language": "Langue enregistrée",
1618 "flash.profile": "Profil enregistré",
1591 1619 "flash.logo": "Logo enregistré",
1592 1620 "flash.star": "Étoile mise à jour",
1593 1621 "err.forbidden": "accès refusé",
@@ -1636,6 +1664,8 @@ var fr = map[string]string{
1636 1664 "err.pattern": "le motif %q n’est pas utilisable",
1637 1665 "err.emptyValue": "la valeur est vide",
1638 1666 "err.userTaken": "le nom d’utilisateur %s est déjà utilisé",
1667 "err.profileName": "le nom affiché est trop long ou contient un saut de ligne",
1668 "err.profileBio": "la bio est trop longue",
1639 1669 "err.tokenNeedsName": "donne un nom au jeton",
1640 1670 "err.sshDup": "cette clé est déjà enregistrée",
1641 1671 "err.notFound": "introuvable",
@@ -340,6 +340,13 @@ var nl = map[string]string{
340 "acct.remove": "Verwijderen",
340 "acct.remove": "Verwijderen",
341 "acct.export": "Gegevens downloaden (JSON)",
341 "acct.export": "Gegevens downloaden (JSON)",
342 "acct.language": "Taal",
342 "acct.language": "Taal",
343 "acct.name": "Weergavenaam",
344 "acct.bio": "Bio",
345 "acct.bioHint": "Een korte tekst op je profiel. Hoogstens 280 tekens.",
346 "profile.since": "Lid sinds %s",
347 "profile.contrib": "Bijdragen",
348 "profile.copy": "Profiel-URL kopiëren",
349 "profile.edit": "Profiel bewerken",
343 "setup.choose": "Opslag kiezen",
350 "setup.choose": "Opslag kiezen",
344 "setup.pathTitle": "Opslagpad",
351 "setup.pathTitle": "Opslagpad",
345 "setup.changeWarn": "Het pad wijzigen verplaatst geen repositories, artifacts of releases.",
352 "setup.changeWarn": "Het pad wijzigen verplaatst geen repositories, artifacts of releases.",
@@ -366,6 +373,7 @@ var nl = map[string]string{
366 "flash.sshRemoved": "Sleutel verwijderd",
373 "flash.sshRemoved": "Sleutel verwijderd",
367 "flash.pipeline": "Pipeline gestart",
374 "flash.pipeline": "Pipeline gestart",
368 "flash.language": "Taal opgeslagen",
375 "flash.language": "Taal opgeslagen",
376 "flash.profile": "Profiel opgeslagen",
369 "flash.logo": "Logo opgeslagen",
377 "flash.logo": "Logo opgeslagen",
370 "flash.star": "Ster bijgewerkt",
378 "flash.star": "Ster bijgewerkt",
371 "err.forbidden": "geen toegang",
379 "err.forbidden": "geen toegang",
@@ -414,6 +422,8 @@ var nl = map[string]string{
414 "err.pattern": "patroon %q is niet bruikbaar",
422 "err.pattern": "patroon %q is niet bruikbaar",
415 "err.emptyValue": "de waarde is leeg",
423 "err.emptyValue": "de waarde is leeg",
416 "err.userTaken": "gebruikersnaam %s is al in gebruik",
424 "err.userTaken": "gebruikersnaam %s is al in gebruik",
425 "err.profileName": "de weergavenaam is te lang of bevat een regeleinde",
426 "err.profileBio": "de bio is te lang",
417 "err.tokenNeedsName": "geef het token een naam",
427 "err.tokenNeedsName": "geef het token een naam",
418 "err.sshDup": "deze sleutel staat al geregistreerd",
428 "err.sshDup": "deze sleutel staat al geregistreerd",
419 "err.notFound": "niet gevonden",
429 "err.notFound": "niet gevonden",
@@ -951,6 +961,13 @@ var de = map[string]string{
951 "acct.remove": "Entfernen",
961 "acct.remove": "Entfernen",
952 "acct.export": "Daten herunterladen (JSON)",
962 "acct.export": "Daten herunterladen (JSON)",
953 "acct.language": "Sprache",
963 "acct.language": "Sprache",
964 "acct.name": "Anzeigename",
965 "acct.bio": "Bio",
966 "acct.bioHint": "Ein kurzer Text auf deinem Profil. Höchstens 280 Zeichen.",
967 "profile.since": "Mitglied seit %s",
968 "profile.contrib": "Beiträge",
969 "profile.copy": "Profil-URL kopieren",
970 "profile.edit": "Profil bearbeiten",
954 "setup.choose": "Speicher wählen",
971 "setup.choose": "Speicher wählen",
955 "setup.pathTitle": "Speicherpfad",
972 "setup.pathTitle": "Speicherpfad",
956 "setup.changeWarn": "Eine Pfadänderung verschiebt keine Repositories, Artefakte oder Releases.",
973 "setup.changeWarn": "Eine Pfadänderung verschiebt keine Repositories, Artefakte oder Releases.",
@@ -977,6 +994,7 @@ var de = map[string]string{
977 "flash.sshRemoved": "Schlüssel entfernt",
994 "flash.sshRemoved": "Schlüssel entfernt",
978 "flash.pipeline": "Pipeline gestartet",
995 "flash.pipeline": "Pipeline gestartet",
979 "flash.language": "Sprache gespeichert",
996 "flash.language": "Sprache gespeichert",
997 "flash.profile": "Profil gespeichert",
980 "flash.logo": "Logo gespeichert",
998 "flash.logo": "Logo gespeichert",
981 "flash.star": "Stern aktualisiert",
999 "flash.star": "Stern aktualisiert",
982 "err.forbidden": "kein Zugriff",
1000 "err.forbidden": "kein Zugriff",
@@ -1025,6 +1043,8 @@ var de = map[string]string{
1025 "err.pattern": "Muster %q ist nicht verwendbar",
1043 "err.pattern": "Muster %q ist nicht verwendbar",
1026 "err.emptyValue": "der Wert ist leer",
1044 "err.emptyValue": "der Wert ist leer",
1027 "err.userTaken": "Benutzername %s ist bereits vergeben",
1045 "err.userTaken": "Benutzername %s ist bereits vergeben",
1046 "err.profileName": "der Anzeigename ist zu lang oder enthält einen Zeilenumbruch",
1047 "err.profileBio": "die Bio ist zu lang",
1028 "err.tokenNeedsName": "gib dem Token einen Namen",
1048 "err.tokenNeedsName": "gib dem Token einen Namen",
1029 "err.sshDup": "dieser Schlüssel ist bereits registriert",
1049 "err.sshDup": "dieser Schlüssel ist bereits registriert",
1030 "err.notFound": "nicht gefunden",
1050 "err.notFound": "nicht gefunden",
@@ -1562,6 +1582,13 @@ var fr = map[string]string{
1562 "acct.remove": "Supprimer",
1582 "acct.remove": "Supprimer",
1563 "acct.export": "Télécharger tes données (JSON)",
1583 "acct.export": "Télécharger tes données (JSON)",
1564 "acct.language": "Langue",
1584 "acct.language": "Langue",
1585 "acct.name": "Nom affiché",
1586 "acct.bio": "Bio",
1587 "acct.bioHint": "Un court texte sur ton profil. 280 caractères au plus.",
1588 "profile.since": "Membre depuis le %s",
1589 "profile.contrib": "Contributions",
1590 "profile.copy": "Copier l’URL du profil",
1591 "profile.edit": "Modifier le profil",
1565 "setup.choose": "Choisir le stockage",
1592 "setup.choose": "Choisir le stockage",
1566 "setup.pathTitle": "Chemin de stockage",
1593 "setup.pathTitle": "Chemin de stockage",
1567 "setup.changeWarn": "Changer le chemin ne déplace ni les dépôts, ni les artefacts, ni les versions.",
1594 "setup.changeWarn": "Changer le chemin ne déplace ni les dépôts, ni les artefacts, ni les versions.",
@@ -1588,6 +1615,7 @@ var fr = map[string]string{
1588 "flash.sshRemoved": "Clé supprimée",
1615 "flash.sshRemoved": "Clé supprimée",
1589 "flash.pipeline": "Pipeline démarrée",
1616 "flash.pipeline": "Pipeline démarrée",
1590 "flash.language": "Langue enregistrée",
1617 "flash.language": "Langue enregistrée",
1618 "flash.profile": "Profil enregistré",
1591 "flash.logo": "Logo enregistré",
1619 "flash.logo": "Logo enregistré",
1592 "flash.star": "Étoile mise à jour",
1620 "flash.star": "Étoile mise à jour",
1593 "err.forbidden": "accès refusé",
1621 "err.forbidden": "accès refusé",
@@ -1636,6 +1664,8 @@ var fr = map[string]string{
1636 "err.pattern": "le motif %q n’est pas utilisable",
1664 "err.pattern": "le motif %q n’est pas utilisable",
1637 "err.emptyValue": "la valeur est vide",
1665 "err.emptyValue": "la valeur est vide",
1638 "err.userTaken": "le nom d’utilisateur %s est déjà utilisé",
1666 "err.userTaken": "le nom d’utilisateur %s est déjà utilisé",
1667 "err.profileName": "le nom affiché est trop long ou contient un saut de ligne",
1668 "err.profileBio": "la bio est trop longue",
1639 "err.tokenNeedsName": "donne un nom au jeton",
1669 "err.tokenNeedsName": "donne un nom au jeton",
1640 "err.sshDup": "cette clé est déjà enregistrée",
1670 "err.sshDup": "cette clé est déjà enregistrée",
1641 "err.notFound": "introuvable",
1671 "err.notFound": "introuvable",
internal/server/api_account.go +74 −8
@@ -3,6 +3,7 @@ package server
3 3 import (
4 4 "net/http"
5 5 "strconv"
6 "strings"
6 7 "time"
7 8
8 9 "gitlab.com/Timfa/bluegit/internal/access"
@@ -17,9 +18,14 @@ func rfcTime(t time.Time) any {
17 18 return t.UTC().Format(time.RFC3339)
18 19 }
19 20
20 func userJSON(u store.User, self bool) map[string]any {
21 func userJSON(u store.User, self bool, web string) map[string]any {
21 22 out := map[string]any{
22 23 "id": u.ID, "username": u.Username, "avatar_url": u.AvatarURL,
24 "name": strings.TrimSpace(u.DisplayName), "bio": u.Bio,
25 "created_at": rfcTime(u.CreatedAt),
26 }
27 if web != "" {
28 out["web_url"] = web
23 29 }
24 30 if self {
25 31 out["instance_admin"] = u.InstanceAdmin
@@ -43,24 +49,43 @@ func tokenJSON(t store.TokenInfo, plain string) map[string]any {
43 49 }
44 50
45 51 func (s *Server) apiGetUser(w http.ResponseWriter, r *http.Request) {
46 writeJSON(w, http.StatusOK, userJSON(apiUser(r), true))
52 u := apiUser(r)
53 writeJSON(w, http.StatusOK, userJSON(u, true, s.absURL("/users/"+u.Username)))
47 54 }
48 55
49 56 func (s *Server) apiPutUser(w http.ResponseWriter, r *http.Request) {
50 57 var in struct {
51 Language string `json:"language"`
58 Language *string `json:"language"`
59 Name *string `json:"name"`
60 Bio *string `json:"bio"`
52 61 }
53 62 if err := readJSON(r, &in); err != nil {
54 63 s.writeAPIErr(w, r, fail(400, i18n.E("err.json")))
55 64 return
56 65 }
57 lang, err := s.opSetLanguage(r.Context(), apiUser(r), in.Language)
66 u := apiUser(r)
67 if in.Language != nil {
68 if _, err := s.opSetLanguage(r.Context(), u, *in.Language); !s.apiOK(w, r, err) {
69 return
70 }
71 }
72 if in.Name != nil || in.Bio != nil {
73 name, bio := u.DisplayName, u.Bio
74 if in.Name != nil {
75 name = *in.Name
76 }
77 if in.Bio != nil {
78 bio = *in.Bio
79 }
80 if _, err := s.opSetProfile(r.Context(), u, name, bio); !s.apiOK(w, r, err) {
81 return
82 }
83 }
84 fresh, err := s.Store.UserByID(r.Context(), u.ID)
58 85 if !s.apiOK(w, r, err) {
59 86 return
60 87 }
61 u := apiUser(r)
62 u.Language = string(lang)
63 writeJSON(w, http.StatusOK, userJSON(u, true))
88 writeJSON(w, http.StatusOK, userJSON(fresh, true, s.absURL("/users/"+fresh.Username)))
64 89 }
65 90
66 91 func (s *Server) apiExport(w http.ResponseWriter, r *http.Request) {
@@ -73,7 +98,48 @@ func (s *Server) apiUserByName(w http.ResponseWriter, r *http.Request) {
73 98 s.writeAPIErr(w, r, fail(404, i18n.E("err.notFound")))
74 99 return
75 100 }
76 writeJSON(w, http.StatusOK, userJSON(u, false))
101 viewer := apiUser(r).ID
102 ids, err := s.Store.ListRepoIDs(r.Context(), viewer)
103 if err != nil {
104 ids = nil
105 }
106 heat := s.heatmap(r.Context(), u.ID, ids, s.langOf(r))
107 total := 0
108 if heat != nil {
109 total = heat.Total
110 }
111 card, repos, groups := s.profileCard(r, u, viewer, total)
112 out := userJSON(u, viewer == u.ID, card.URL)
113 out["counts"] = map[string]any{
114 "repos": card.Repos, "groups": card.Groups, "contributions": card.Contrib,
115 }
116 out["repos"] = repoBriefs(s, repos)
117 out["groups"] = groupBriefs(s, groups)
118 writeJSON(w, http.StatusOK, out)
119 }
120
121 func repoBriefs(s *Server, repos []store.Repo) []map[string]any {
122 out := make([]map[string]any, 0, len(repos))
123 for _, repo := range repos {
124 out = append(out, map[string]any{
125 "id": repo.ID, "name": repo.Name, "path": repo.FullPath(),
126 "description": repo.Description, "visibility": repo.Visibility,
127 "web_url": s.absURL("/" + repo.FullPath()),
128 })
129 }
130 return out
131 }
132
133 func groupBriefs(s *Server, groups []store.Group) []map[string]any {
134 out := make([]map[string]any, 0, len(groups))
135 for _, g := range groups {
136 out = append(out, map[string]any{
137 "id": g.ID, "name": g.Name, "path": g.Path,
138 "description": g.Description, "visibility": g.Visibility,
139 "web_url": s.absURL("/groups/" + g.Path),
140 })
141 }
142 return out
77 143 }
78 144
79 145 func (s *Server) apiListTokens(w http.ResponseWriter, r *http.Request) {
@@ -3,6 +3,7 @@ package server
3import (
3import (
4 "net/http"
4 "net/http"
5 "strconv"
5 "strconv"
6 "strings"
6 "time"
7 "time"
7
8
8 "gitlab.com/Timfa/bluegit/internal/access"
9 "gitlab.com/Timfa/bluegit/internal/access"
@@ -17,9 +18,14 @@ func rfcTime(t time.Time) any {
17 return t.UTC().Format(time.RFC3339)
18 return t.UTC().Format(time.RFC3339)
18}
19}
19
20
20func userJSON(u store.User, self bool) map[string]any {
21func userJSON(u store.User, self bool, web string) map[string]any {
21 out := map[string]any{
22 out := map[string]any{
22 "id": u.ID, "username": u.Username, "avatar_url": u.AvatarURL,
23 "id": u.ID, "username": u.Username, "avatar_url": u.AvatarURL,
24 "name": strings.TrimSpace(u.DisplayName), "bio": u.Bio,
25 "created_at": rfcTime(u.CreatedAt),
26 }
27 if web != "" {
28 out["web_url"] = web
23 }
29 }
24 if self {
30 if self {
25 out["instance_admin"] = u.InstanceAdmin
31 out["instance_admin"] = u.InstanceAdmin
@@ -43,24 +49,43 @@ func tokenJSON(t store.TokenInfo, plain string) map[string]any {
43}
49}
44
50
45func (s *Server) apiGetUser(w http.ResponseWriter, r *http.Request) {
51func (s *Server) apiGetUser(w http.ResponseWriter, r *http.Request) {
46 writeJSON(w, http.StatusOK, userJSON(apiUser(r), true))
52 u := apiUser(r)
53 writeJSON(w, http.StatusOK, userJSON(u, true, s.absURL("/users/"+u.Username)))
47}
54}
48
55
49func (s *Server) apiPutUser(w http.ResponseWriter, r *http.Request) {
56func (s *Server) apiPutUser(w http.ResponseWriter, r *http.Request) {
50 var in struct {
57 var in struct {
51 Language string `json:"language"`
58 Language *string `json:"language"`
59 Name *string `json:"name"`
60 Bio *string `json:"bio"`
52 }
61 }
53 if err := readJSON(r, &in); err != nil {
62 if err := readJSON(r, &in); err != nil {
54 s.writeAPIErr(w, r, fail(400, i18n.E("err.json")))
63 s.writeAPIErr(w, r, fail(400, i18n.E("err.json")))
55 return
64 return
56 }
65 }
57 lang, err := s.opSetLanguage(r.Context(), apiUser(r), in.Language)
66 u := apiUser(r)
67 if in.Language != nil {
68 if _, err := s.opSetLanguage(r.Context(), u, *in.Language); !s.apiOK(w, r, err) {
69 return
70 }
71 }
72 if in.Name != nil || in.Bio != nil {
73 name, bio := u.DisplayName, u.Bio
74 if in.Name != nil {
75 name = *in.Name
76 }
77 if in.Bio != nil {
78 bio = *in.Bio
79 }
80 if _, err := s.opSetProfile(r.Context(), u, name, bio); !s.apiOK(w, r, err) {
81 return
82 }
83 }
84 fresh, err := s.Store.UserByID(r.Context(), u.ID)
58 if !s.apiOK(w, r, err) {
85 if !s.apiOK(w, r, err) {
59 return
86 return
60 }
87 }
61 u := apiUser(r)
88 writeJSON(w, http.StatusOK, userJSON(fresh, true, s.absURL("/users/"+fresh.Username)))
62 u.Language = string(lang)
63 writeJSON(w, http.StatusOK, userJSON(u, true))
64}
89}
65
90
66func (s *Server) apiExport(w http.ResponseWriter, r *http.Request) {
91func (s *Server) apiExport(w http.ResponseWriter, r *http.Request) {
@@ -73,7 +98,48 @@ func (s *Server) apiUserByName(w http.ResponseWriter, r *http.Request) {
73 s.writeAPIErr(w, r, fail(404, i18n.E("err.notFound")))
98 s.writeAPIErr(w, r, fail(404, i18n.E("err.notFound")))
74 return
99 return
75 }
100 }
76 writeJSON(w, http.StatusOK, userJSON(u, false))
101 viewer := apiUser(r).ID
102 ids, err := s.Store.ListRepoIDs(r.Context(), viewer)
103 if err != nil {
104 ids = nil
105 }
106 heat := s.heatmap(r.Context(), u.ID, ids, s.langOf(r))
107 total := 0
108 if heat != nil {
109 total = heat.Total
110 }
111 card, repos, groups := s.profileCard(r, u, viewer, total)
112 out := userJSON(u, viewer == u.ID, card.URL)
113 out["counts"] = map[string]any{
114 "repos": card.Repos, "groups": card.Groups, "contributions": card.Contrib,
115 }
116 out["repos"] = repoBriefs(s, repos)
117 out["groups"] = groupBriefs(s, groups)
118 writeJSON(w, http.StatusOK, out)
119}
120
121func repoBriefs(s *Server, repos []store.Repo) []map[string]any {
122 out := make([]map[string]any, 0, len(repos))
123 for _, repo := range repos {
124 out = append(out, map[string]any{
125 "id": repo.ID, "name": repo.Name, "path": repo.FullPath(),
126 "description": repo.Description, "visibility": repo.Visibility,
127 "web_url": s.absURL("/" + repo.FullPath()),
128 })
129 }
130 return out
131}
132
133func groupBriefs(s *Server, groups []store.Group) []map[string]any {
134 out := make([]map[string]any, 0, len(groups))
135 for _, g := range groups {
136 out = append(out, map[string]any{
137 "id": g.ID, "name": g.Name, "path": g.Path,
138 "description": g.Description, "visibility": g.Visibility,
139 "web_url": s.absURL("/groups/" + g.Path),
140 })
141 }
142 return out
77}
143}
78
144
79func (s *Server) apiListTokens(w http.ResponseWriter, r *http.Request) {
145func (s *Server) apiListTokens(w http.ResponseWriter, r *http.Request) {
internal/server/api_openapi.go +43 −0
@@ -84,6 +84,10 @@ func apiBinds() []apiBind {
84 84 branch = branches + "/{branch}"
85 85 )
86 86 return []apiBind{
87 {path: "/user", method: "GET", code: "200", resp: "User"},
88 {path: "/user", method: "PUT", code: "200", body: "UserUpdate", resp: "User"},
89 {path: "/users/{username}", method: "GET", code: "200", resp: "User"},
90
87 91 {path: mrs, method: "GET", code: "200", resp: "MergeRequest", array: true},
88 92 {path: mrs, method: "POST", code: "201", body: "MergeRequestCreate", resp: "MergeRequest"},
89 93 {path: mr, method: "GET", code: "200", resp: "MergeRequest"},
@@ -267,6 +271,45 @@ func apiSchemas() map[string]any {
267 271 "branch_filter": str("Branch filter. Empty matches every branch."),
268 272 "active": boolean("Hook is enabled."),
269 273 }),
274 "User": obj("User. counts, repos and groups are present on GET /users/{username}. instance_admin and language are present for the signed-in user.", map[string]any{
275 "id": integer("User id."),
276 "username": str("Username."),
277 "name": str("Display name. Empty when unset."),
278 "bio": str("Profile text. Empty when unset."),
279 "avatar_url": str("Avatar URL."),
280 "created_at": when,
281 "web_url": str("Profile page at /users/{username}."),
282 "instance_admin": boolean("Instance administrator. Only on the signed-in user."),
283 "language": str("Interface language. Only on the signed-in user."),
284 "counts": obj("Totals the viewer is allowed to see.", map[string]any{
285 "repos": integer("Owned repositories visible to the viewer."),
286 "groups": integer("Groups the user belongs to that the viewer may see."),
287 "contributions": integer("Contributions in the last 12 months in repositories the viewer may see."),
288 }),
289 "repos": map[string]any{"type": "array", "description": "Owned repositories visible to the viewer.", "items": schemaRef("UserRepo")},
290 "groups": map[string]any{"type": "array", "description": "Groups visible to the viewer.", "items": schemaRef("UserGroup")},
291 }),
292 "UserUpdate": obj("Fields to change on the signed-in user. Omitted fields stay unchanged.", map[string]any{
293 "name": str("Display name. Empty clears it."),
294 "bio": str("Profile text. Empty clears it. Newlines are kept."),
295 "language": str("Interface language."),
296 }),
297 "UserRepo": obj("Repository on a user profile.", map[string]any{
298 "id": integer("Repository id."),
299 "name": str("Repository name."),
300 "path": str("Full path, owner/name."),
301 "description": str("Description."),
302 "visibility": str("public or private."),
303 "web_url": str("Full page URL."),
304 }),
305 "UserGroup": obj("Group on a user profile.", map[string]any{
306 "id": integer("Group id."),
307 "name": str("Group name."),
308 "path": str("Group path."),
309 "description": str("Description."),
310 "visibility": str("public or private."),
311 "web_url": str("Full page URL."),
312 }),
270 313 "WebhookCreate": obj("Create a webhook. Preset fields depend on the chosen preset.", map[string]any{
271 314 "name": str("Display name."),
272 315 "preset": str("Preset name."),
@@ -84,6 +84,10 @@ func apiBinds() []apiBind {
84 branch = branches + "/{branch}"
84 branch = branches + "/{branch}"
85 )
85 )
86 return []apiBind{
86 return []apiBind{
87 {path: "/user", method: "GET", code: "200", resp: "User"},
88 {path: "/user", method: "PUT", code: "200", body: "UserUpdate", resp: "User"},
89 {path: "/users/{username}", method: "GET", code: "200", resp: "User"},
90
87 {path: mrs, method: "GET", code: "200", resp: "MergeRequest", array: true},
91 {path: mrs, method: "GET", code: "200", resp: "MergeRequest", array: true},
88 {path: mrs, method: "POST", code: "201", body: "MergeRequestCreate", resp: "MergeRequest"},
92 {path: mrs, method: "POST", code: "201", body: "MergeRequestCreate", resp: "MergeRequest"},
89 {path: mr, method: "GET", code: "200", resp: "MergeRequest"},
93 {path: mr, method: "GET", code: "200", resp: "MergeRequest"},
@@ -267,6 +271,45 @@ func apiSchemas() map[string]any {
267 "branch_filter": str("Branch filter. Empty matches every branch."),
271 "branch_filter": str("Branch filter. Empty matches every branch."),
268 "active": boolean("Hook is enabled."),
272 "active": boolean("Hook is enabled."),
269 }),
273 }),
274 "User": obj("User. counts, repos and groups are present on GET /users/{username}. instance_admin and language are present for the signed-in user.", map[string]any{
275 "id": integer("User id."),
276 "username": str("Username."),
277 "name": str("Display name. Empty when unset."),
278 "bio": str("Profile text. Empty when unset."),
279 "avatar_url": str("Avatar URL."),
280 "created_at": when,
281 "web_url": str("Profile page at /users/{username}."),
282 "instance_admin": boolean("Instance administrator. Only on the signed-in user."),
283 "language": str("Interface language. Only on the signed-in user."),
284 "counts": obj("Totals the viewer is allowed to see.", map[string]any{
285 "repos": integer("Owned repositories visible to the viewer."),
286 "groups": integer("Groups the user belongs to that the viewer may see."),
287 "contributions": integer("Contributions in the last 12 months in repositories the viewer may see."),
288 }),
289 "repos": map[string]any{"type": "array", "description": "Owned repositories visible to the viewer.", "items": schemaRef("UserRepo")},
290 "groups": map[string]any{"type": "array", "description": "Groups visible to the viewer.", "items": schemaRef("UserGroup")},
291 }),
292 "UserUpdate": obj("Fields to change on the signed-in user. Omitted fields stay unchanged.", map[string]any{
293 "name": str("Display name. Empty clears it."),
294 "bio": str("Profile text. Empty clears it. Newlines are kept."),
295 "language": str("Interface language."),
296 }),
297 "UserRepo": obj("Repository on a user profile.", map[string]any{
298 "id": integer("Repository id."),
299 "name": str("Repository name."),
300 "path": str("Full path, owner/name."),
301 "description": str("Description."),
302 "visibility": str("public or private."),
303 "web_url": str("Full page URL."),
304 }),
305 "UserGroup": obj("Group on a user profile.", map[string]any{
306 "id": integer("Group id."),
307 "name": str("Group name."),
308 "path": str("Group path."),
309 "description": str("Description."),
310 "visibility": str("public or private."),
311 "web_url": str("Full page URL."),
312 }),
270 "WebhookCreate": obj("Create a webhook. Preset fields depend on the chosen preset.", map[string]any{
313 "WebhookCreate": obj("Create a webhook. Preset fields depend on the chosen preset.", map[string]any{
271 "name": str("Display name."),
314 "name": str("Display name."),
272 "preset": str("Preset name."),
315 "preset": str("Preset name."),
internal/server/api_openapi_test.go +11 −1
@@ -14,7 +14,7 @@ import (
14 14 func TestOpenAPISchemas(t *testing.T) {
15 15 doc := openAPIDoc()
16 16 schemas := doc["components"].(map[string]any)["schemas"].(map[string]any)
17 for _, name := range []string{"Error", "MergeRequest", "Issue", "Pipeline", "Job", "Branch", "Webhook"} {
17 for _, name := range []string{"Error", "MergeRequest", "Issue", "Pipeline", "Job", "Branch", "Webhook", "User", "UserUpdate"} {
18 18 if _, ok := schemas[name]; !ok {
19 19 t.Errorf("schema %s ontbreekt", name)
20 20 }
@@ -61,6 +61,16 @@ func TestOpenAPISchemas(t *testing.T) {
61 61 assertResp(t, paths, "/projects/{owner}/{repo}/webhooks", "post", "201", "#/components/schemas/Webhook")
62 62 assertItems(t, paths, "/groups/{path}/webhooks", "get", "200", "#/components/schemas/Webhook")
63 63 assertBody(t, paths, "/groups/{path}/webhooks", "post", "WebhookCreate")
64
65 user := schemas["User"].(map[string]any)["properties"].(map[string]any)
66 for _, key := range []string{"name", "bio", "web_url", "counts", "repos", "groups"} {
67 if _, ok := user[key]; !ok {
68 t.Errorf("User mist %s", key)
69 }
70 }
71 assertBody(t, paths, "/user", "put", "UserUpdate")
72 assertResp(t, paths, "/user", "get", "200", "#/components/schemas/User")
73 assertResp(t, paths, "/users/{username}", "get", "200", "#/components/schemas/User")
64 74 }
65 75
66 76 func TestResourceWebURL(t *testing.T) {
@@ -14,7 +14,7 @@ import (
14func TestOpenAPISchemas(t *testing.T) {
14func TestOpenAPISchemas(t *testing.T) {
15 doc := openAPIDoc()
15 doc := openAPIDoc()
16 schemas := doc["components"].(map[string]any)["schemas"].(map[string]any)
16 schemas := doc["components"].(map[string]any)["schemas"].(map[string]any)
17 for _, name := range []string{"Error", "MergeRequest", "Issue", "Pipeline", "Job", "Branch", "Webhook"} {
17 for _, name := range []string{"Error", "MergeRequest", "Issue", "Pipeline", "Job", "Branch", "Webhook", "User", "UserUpdate"} {
18 if _, ok := schemas[name]; !ok {
18 if _, ok := schemas[name]; !ok {
19 t.Errorf("schema %s ontbreekt", name)
19 t.Errorf("schema %s ontbreekt", name)
20 }
20 }
@@ -61,6 +61,16 @@ func TestOpenAPISchemas(t *testing.T) {
61 assertResp(t, paths, "/projects/{owner}/{repo}/webhooks", "post", "201", "#/components/schemas/Webhook")
61 assertResp(t, paths, "/projects/{owner}/{repo}/webhooks", "post", "201", "#/components/schemas/Webhook")
62 assertItems(t, paths, "/groups/{path}/webhooks", "get", "200", "#/components/schemas/Webhook")
62 assertItems(t, paths, "/groups/{path}/webhooks", "get", "200", "#/components/schemas/Webhook")
63 assertBody(t, paths, "/groups/{path}/webhooks", "post", "WebhookCreate")
63 assertBody(t, paths, "/groups/{path}/webhooks", "post", "WebhookCreate")
64
65 user := schemas["User"].(map[string]any)["properties"].(map[string]any)
66 for _, key := range []string{"name", "bio", "web_url", "counts", "repos", "groups"} {
67 if _, ok := user[key]; !ok {
68 t.Errorf("User mist %s", key)
69 }
70 }
71 assertBody(t, paths, "/user", "put", "UserUpdate")
72 assertResp(t, paths, "/user", "get", "200", "#/components/schemas/User")
73 assertResp(t, paths, "/users/{username}", "get", "200", "#/components/schemas/User")
64}
74}
65
75
66func TestResourceWebURL(t *testing.T) {
76func TestResourceWebURL(t *testing.T) {
internal/server/api_routes.go +1 −1
@@ -11,7 +11,7 @@ var apiCatalog = []apiRoute{
11 11 {http.MethodGet, "/api/v1/ci/presets", access.ScopePublic, authPublic, "CI image presets", (*Server).apiPresets},
12 12
13 13 {http.MethodGet, "/api/v1/user", access.ScopeRead, authUser, "Current user", (*Server).apiGetUser},
14 {http.MethodPut, "/api/v1/user", access.ScopeWrite, authUser, "Update profile language", (*Server).apiPutUser},
14 {http.MethodPut, "/api/v1/user", access.ScopeWrite, authUser, "Update profile", (*Server).apiPutUser},
15 15 {http.MethodGet, "/api/v1/user/export", access.ScopeRead, authUser, "Export account", (*Server).apiExport},
16 16 {http.MethodGet, "/api/v1/users/{username}", access.ScopeRead, authUser, "User profile", (*Server).apiUserByName},
17 17 {http.MethodGet, "/api/v1/user/tokens", access.ScopeRead, authUser, "List access tokens", (*Server).apiListTokens},
@@ -11,7 +11,7 @@ var apiCatalog = []apiRoute{
11 {http.MethodGet, "/api/v1/ci/presets", access.ScopePublic, authPublic, "CI image presets", (*Server).apiPresets},
11 {http.MethodGet, "/api/v1/ci/presets", access.ScopePublic, authPublic, "CI image presets", (*Server).apiPresets},
12
12
13 {http.MethodGet, "/api/v1/user", access.ScopeRead, authUser, "Current user", (*Server).apiGetUser},
13 {http.MethodGet, "/api/v1/user", access.ScopeRead, authUser, "Current user", (*Server).apiGetUser},
14 {http.MethodPut, "/api/v1/user", access.ScopeWrite, authUser, "Update profile language", (*Server).apiPutUser},
14 {http.MethodPut, "/api/v1/user", access.ScopeWrite, authUser, "Update profile", (*Server).apiPutUser},
15 {http.MethodGet, "/api/v1/user/export", access.ScopeRead, authUser, "Export account", (*Server).apiExport},
15 {http.MethodGet, "/api/v1/user/export", access.ScopeRead, authUser, "Export account", (*Server).apiExport},
16 {http.MethodGet, "/api/v1/users/{username}", access.ScopeRead, authUser, "User profile", (*Server).apiUserByName},
16 {http.MethodGet, "/api/v1/users/{username}", access.ScopeRead, authUser, "User profile", (*Server).apiUserByName},
17 {http.MethodGet, "/api/v1/user/tokens", access.ScopeRead, authUser, "List access tokens", (*Server).apiListTokens},
17 {http.MethodGet, "/api/v1/user/tokens", access.ScopeRead, authUser, "List access tokens", (*Server).apiListTokens},
internal/server/auth_handlers.go +7 −0
@@ -113,6 +113,13 @@ func (s *Server) home(w http.ResponseWriter, r *http.Request) {
113 113 v.Title = s.tr(r, "nav.dashboard")
114 114 v.Page = "dashboard"
115 115 v.Heat = s.heatmap(r.Context(), v.User.ID, ids, s.langOf(r))
116 total := 0
117 if v.Heat != nil {
118 total = v.Heat.Total
119 }
120 card, _, _ := s.profileCard(r, *v.User, v.User.ID, total)
121 card.Heading = "h2"
122 v.Card = &card
116 123 s.render(w, "dashboard", v)
117 124 return
118 125 }
@@ -113,6 +113,13 @@ func (s *Server) home(w http.ResponseWriter, r *http.Request) {
113 v.Title = s.tr(r, "nav.dashboard")
113 v.Title = s.tr(r, "nav.dashboard")
114 v.Page = "dashboard"
114 v.Page = "dashboard"
115 v.Heat = s.heatmap(r.Context(), v.User.ID, ids, s.langOf(r))
115 v.Heat = s.heatmap(r.Context(), v.User.ID, ids, s.langOf(r))
116 total := 0
117 if v.Heat != nil {
118 total = v.Heat.Total
119 }
120 card, _, _ := s.profileCard(r, *v.User, v.User.ID, total)
121 card.Heading = "h2"
122 v.Card = &card
116 s.render(w, "dashboard", v)
123 s.render(w, "dashboard", v)
117 return
124 return
118 }
125 }
internal/server/issues.go +17 −7
@@ -59,6 +59,7 @@ type IssueRow struct {
59 59 Title string
60 60 Status string
61 61 Author string
62 AuthorURL string
62 63 Confidential bool
63 64 Milestone string
64 65 Due string
@@ -70,9 +71,10 @@ type IssueRow struct {
70 71
71 72 // IssueNoteRow is een gerenderde reactie.
72 73 type IssueNoteRow struct {
73 Author string
74 When string
75 HTML template.HTML
74 Author string
75 AuthorURL string
76 When string
77 HTML template.HTML
76 78 }
77 79
78 80 var (
@@ -227,10 +229,14 @@ func (s *Server) showIssue(w http.ResponseWriter, r *http.Request) {
227 229 b.People = markChoices(b.People, iss.Assignees)
228 230 notes, _ := s.Store.ListIssueNotes(r.Context(), iss.ID)
229 231 for _, n := range notes {
232 noteURL := ""
233 if n.Author != "" {
234 noteURL = "/users/" + n.Author
235 }
230 236 b.Notes = append(b.Notes, IssueNoteRow{
231 Author: n.Author,
232 When: i18n.FormatDate(s.langOf(r), n.CreatedAt),
233 HTML: template.HTML(markdown.RenderTasks(n.Body, "", "", "/"+repo.FullPath(), s.taskOpt(r, v.CSRF, repo, "issue-note", strconv.FormatInt(n.ID, 10), u.ID != 0 && u.ID == n.AuthorID))),
237 Author: n.Author, AuthorURL: noteURL,
238 When: i18n.FormatDate(s.langOf(r), n.CreatedAt),
239 HTML: template.HTML(markdown.RenderTasks(n.Body, "", "", "/"+repo.FullPath(), s.taskOpt(r, v.CSRF, repo, "issue-note", strconv.FormatInt(n.ID, 10), u.ID != 0 && u.ID == n.AuthorID))),
234 240 })
235 241 }
236 242 related, _ := s.Store.RelatedIssues(r.Context(), repo.ID, iss.ID)
@@ -442,8 +448,12 @@ func (s *Server) issueBoard(r *http.Request, repo store.Repo, role access.Role,
442 448 }
443 449
444 450 func (s *Server) issueRow(r *http.Request, repo store.Repo, iss store.Issue) IssueRow {
451 url := ""
452 if iss.Author != "" {
453 url = "/users/" + iss.Author
454 }
445 455 return IssueRow{
446 Number: iss.Number, Title: iss.Title, Status: iss.Status, Author: iss.Author,
456 Number: iss.Number, Title: iss.Title, Status: iss.Status, Author: iss.Author, AuthorURL: url,
447 457 Confidential: iss.Confidential, Milestone: iss.Milestone, Due: iss.DueOn,
448 458 When: i18n.FormatDate(s.langOf(r), iss.CreatedAt), Assignees: strings.Join(iss.Assignees, ", "),
449 459 Labels: iss.Labels, HTML: template.HTML(markdown.Render(iss.Description, "", "", "/"+repo.FullPath())),
@@ -59,6 +59,7 @@ type IssueRow struct {
59 Title string
59 Title string
60 Status string
60 Status string
61 Author string
61 Author string
62 AuthorURL string
62 Confidential bool
63 Confidential bool
63 Milestone string
64 Milestone string
64 Due string
65 Due string
@@ -70,9 +71,10 @@ type IssueRow struct {
70
71
71// IssueNoteRow is een gerenderde reactie.
72// IssueNoteRow is een gerenderde reactie.
72type IssueNoteRow struct {
73type IssueNoteRow struct {
73 Author string
74 Author string
74 When string
75 AuthorURL string
75 HTML template.HTML
76 When string
77 HTML template.HTML
76}
78}
77
79
78var (
80var (
@@ -227,10 +229,14 @@ func (s *Server) showIssue(w http.ResponseWriter, r *http.Request) {
227 b.People = markChoices(b.People, iss.Assignees)
229 b.People = markChoices(b.People, iss.Assignees)
228 notes, _ := s.Store.ListIssueNotes(r.Context(), iss.ID)
230 notes, _ := s.Store.ListIssueNotes(r.Context(), iss.ID)
229 for _, n := range notes {
231 for _, n := range notes {
232 noteURL := ""
233 if n.Author != "" {
234 noteURL = "/users/" + n.Author
235 }
230 b.Notes = append(b.Notes, IssueNoteRow{
236 b.Notes = append(b.Notes, IssueNoteRow{
231 Author: n.Author,
237 Author: n.Author, AuthorURL: noteURL,
232 When: i18n.FormatDate(s.langOf(r), n.CreatedAt),
238 When: i18n.FormatDate(s.langOf(r), n.CreatedAt),
233 HTML: template.HTML(markdown.RenderTasks(n.Body, "", "", "/"+repo.FullPath(), s.taskOpt(r, v.CSRF, repo, "issue-note", strconv.FormatInt(n.ID, 10), u.ID != 0 && u.ID == n.AuthorID))),
239 HTML: template.HTML(markdown.RenderTasks(n.Body, "", "", "/"+repo.FullPath(), s.taskOpt(r, v.CSRF, repo, "issue-note", strconv.FormatInt(n.ID, 10), u.ID != 0 && u.ID == n.AuthorID))),
234 })
240 })
235 }
241 }
236 related, _ := s.Store.RelatedIssues(r.Context(), repo.ID, iss.ID)
242 related, _ := s.Store.RelatedIssues(r.Context(), repo.ID, iss.ID)
@@ -442,8 +448,12 @@ func (s *Server) issueBoard(r *http.Request, repo store.Repo, role access.Role,
442}
448}
443
449
444func (s *Server) issueRow(r *http.Request, repo store.Repo, iss store.Issue) IssueRow {
450func (s *Server) issueRow(r *http.Request, repo store.Repo, iss store.Issue) IssueRow {
451 url := ""
452 if iss.Author != "" {
453 url = "/users/" + iss.Author
454 }
445 return IssueRow{
455 return IssueRow{
446 Number: iss.Number, Title: iss.Title, Status: iss.Status, Author: iss.Author,
456 Number: iss.Number, Title: iss.Title, Status: iss.Status, Author: iss.Author, AuthorURL: url,
447 Confidential: iss.Confidential, Milestone: iss.Milestone, Due: iss.DueOn,
457 Confidential: iss.Confidential, Milestone: iss.Milestone, Due: iss.DueOn,
448 When: i18n.FormatDate(s.langOf(r), iss.CreatedAt), Assignees: strings.Join(iss.Assignees, ", "),
458 When: i18n.FormatDate(s.langOf(r), iss.CreatedAt), Assignees: strings.Join(iss.Assignees, ", "),
449 Labels: iss.Labels, HTML: template.HTML(markdown.Render(iss.Description, "", "", "/"+repo.FullPath())),
459 Labels: iss.Labels, HTML: template.HTML(markdown.Render(iss.Description, "", "", "/"+repo.FullPath())),
internal/server/media.go +12 −0
@@ -54,6 +54,18 @@ func (s *Server) csrfValue(w http.ResponseWriter, r *http.Request) bool {
54 54 return true
55 55 }
56 56
57 func (s *Server) saveProfile(w http.ResponseWriter, r *http.Request) {
58 u, ok := s.loginRequired(w, r)
59 if !ok || !s.csrfOK(w, r) {
60 return
61 }
62 if _, err := s.opSetProfile(r.Context(), u, r.FormValue("name"), r.FormValue("bio")); err != nil {
63 s.redirect(w, r, "/settings", "", s.trErr(r, err))
64 return
65 }
66 s.redirect(w, r, "/settings", s.tr(r, "flash.profile"), "")
67 }
68
57 69 func (s *Server) saveLanguage(w http.ResponseWriter, r *http.Request) {
58 70 u, ok := s.loginRequired(w, r)
59 71 if !ok || !s.csrfOK(w, r) {
@@ -54,6 +54,18 @@ func (s *Server) csrfValue(w http.ResponseWriter, r *http.Request) bool {
54 return true
54 return true
55}
55}
56
56
57func (s *Server) saveProfile(w http.ResponseWriter, r *http.Request) {
58 u, ok := s.loginRequired(w, r)
59 if !ok || !s.csrfOK(w, r) {
60 return
61 }
62 if _, err := s.opSetProfile(r.Context(), u, r.FormValue("name"), r.FormValue("bio")); err != nil {
63 s.redirect(w, r, "/settings", "", s.trErr(r, err))
64 return
65 }
66 s.redirect(w, r, "/settings", s.tr(r, "flash.profile"), "")
67}
68
57func (s *Server) saveLanguage(w http.ResponseWriter, r *http.Request) {
69func (s *Server) saveLanguage(w http.ResponseWriter, r *http.Request) {
58 u, ok := s.loginRequired(w, r)
70 u, ok := s.loginRequired(w, r)
59 if !ok || !s.csrfOK(w, r) {
71 if !ok || !s.csrfOK(w, r) {
internal/server/mr_page.go +16 −7
@@ -158,8 +158,14 @@ func (s *Server) fillCompare(r *http.Request, v *View, repo store.Repo, from, to
158 158
159 159 func (s *Server) fillTimeline(r *http.Request, v *View, repo store.Repo, mr store.MergeRequest, rows []NoteRow) {
160 160 lang := s.langOf(r)
161 known := map[string]store.User{}
162 who := func(name string) (string, string) {
163 shown, _, url := s.actorOf(r, name, known)
164 return shown, url
165 }
166 opened, openedURL := who(mr.Author)
161 167 items := []TimelineItem{{
162 Kind: "opened", Actor: mr.Author, Text: s.tr(r, "mr.opened"),
168 Kind: "opened", Actor: opened, ActorURL: openedURL, Text: s.tr(r, "mr.opened"),
163 169 When: i18n.FormatDate(lang, mr.CreatedAt), At: mr.CreatedAt, Rank: 0,
164 170 }}
165 171 events, _ := s.Store.ListMREvents(r.Context(), mr.ID)
@@ -168,15 +174,17 @@ func (s *Server) fillTimeline(r *http.Request, v *View, repo store.Repo, mr stor
168 174 if key == "" {
169 175 continue
170 176 }
177 actor, actorURL := who(e.Actor)
171 178 items = append(items, TimelineItem{
172 Kind: e.Kind, Actor: e.Actor, Text: s.tr(r, key), Body: e.Body,
179 Kind: e.Kind, Actor: actor, ActorURL: actorURL, Text: s.tr(r, key), Body: e.Body,
173 180 When: i18n.FormatDate(lang, e.CreatedAt), At: e.CreatedAt, Rank: 2,
174 181 })
175 182 }
176 183 revs, _ := s.Store.ListReviews(r.Context(), mr.ID)
177 184 for _, rev := range revs {
185 actor, actorURL := who(rev.Username)
178 186 items = append(items, TimelineItem{
179 Kind: "review", Actor: rev.Username, Text: s.tr(r, "rev."+rev.Status),
187 Kind: "review", Actor: actor, ActorURL: actorURL, Text: s.tr(r, "rev."+rev.Status),
180 188 When: i18n.FormatDate(lang, rev.UpdatedAt), At: rev.UpdatedAt, Rank: 3,
181 189 })
182 190 }
@@ -185,9 +193,10 @@ func (s *Server) fillTimeline(r *http.Request, v *View, repo store.Repo, mr stor
185 193 jobs, _ := s.Store.JobsByPipeline(r.Context(), p.ID)
186 194 status := displayStatus(p.Status, jobs)
187 195 label := s.tr(r, "pipe."+status)
188 v.PipeRows = append(v.PipeRows, s.pipeRow(r, lang, repo, p, map[string]store.User{}, s.queueRanks(r.Context())))
196 row := s.pipeRow(r, lang, repo, p, known, s.queueRanks(r.Context()))
197 v.PipeRows = append(v.PipeRows, row)
189 198 items = append(items, TimelineItem{
190 Kind: "pipeline", Actor: p.Actor,
199 Kind: "pipeline", Actor: row.Actor, ActorURL: row.ActorURL,
191 200 Text: s.tr(r, "mr.pipeEvent", p.ID, label),
192 201 URL: repoURL(repo) + "/-/pipelines/" + strconv.FormatInt(p.ID, 10),
193 202 When: i18n.FormatDate(lang, p.CreatedAt), At: p.CreatedAt, Rank: 1,
@@ -198,11 +207,11 @@ func (s *Server) fillTimeline(r *http.Request, v *View, repo store.Repo, mr stor
198 207 continue
199 208 }
200 209 item := TimelineItem{
201 ID: n.ID, Kind: "comment", Actor: n.Author, Text: s.tr(r, "mr.commented"),
210 ID: n.ID, Kind: "comment", Actor: n.Author, ActorURL: n.AuthorURL, Text: s.tr(r, "mr.commented"),
202 211 HTML: n.HTML, When: n.When, At: n.At, Rank: 4,
203 212 }
204 213 for _, rp := range n.Replies {
205 item.Replies = append(item.Replies, TimelineItem{Actor: rp.Author, HTML: rp.HTML, When: rp.When})
214 item.Replies = append(item.Replies, TimelineItem{Actor: rp.Author, ActorURL: rp.AuthorURL, HTML: rp.HTML, When: rp.When})
206 215 }
207 216 items = append(items, item)
208 217 }
@@ -158,8 +158,14 @@ func (s *Server) fillCompare(r *http.Request, v *View, repo store.Repo, from, to
158
158
159func (s *Server) fillTimeline(r *http.Request, v *View, repo store.Repo, mr store.MergeRequest, rows []NoteRow) {
159func (s *Server) fillTimeline(r *http.Request, v *View, repo store.Repo, mr store.MergeRequest, rows []NoteRow) {
160 lang := s.langOf(r)
160 lang := s.langOf(r)
161 known := map[string]store.User{}
162 who := func(name string) (string, string) {
163 shown, _, url := s.actorOf(r, name, known)
164 return shown, url
165 }
166 opened, openedURL := who(mr.Author)
161 items := []TimelineItem{{
167 items := []TimelineItem{{
162 Kind: "opened", Actor: mr.Author, Text: s.tr(r, "mr.opened"),
168 Kind: "opened", Actor: opened, ActorURL: openedURL, Text: s.tr(r, "mr.opened"),
163 When: i18n.FormatDate(lang, mr.CreatedAt), At: mr.CreatedAt, Rank: 0,
169 When: i18n.FormatDate(lang, mr.CreatedAt), At: mr.CreatedAt, Rank: 0,
164 }}
170 }}
165 events, _ := s.Store.ListMREvents(r.Context(), mr.ID)
171 events, _ := s.Store.ListMREvents(r.Context(), mr.ID)
@@ -168,15 +174,17 @@ func (s *Server) fillTimeline(r *http.Request, v *View, repo store.Repo, mr stor
168 if key == "" {
174 if key == "" {
169 continue
175 continue
170 }
176 }
177 actor, actorURL := who(e.Actor)
171 items = append(items, TimelineItem{
178 items = append(items, TimelineItem{
172 Kind: e.Kind, Actor: e.Actor, Text: s.tr(r, key), Body: e.Body,
179 Kind: e.Kind, Actor: actor, ActorURL: actorURL, Text: s.tr(r, key), Body: e.Body,
173 When: i18n.FormatDate(lang, e.CreatedAt), At: e.CreatedAt, Rank: 2,
180 When: i18n.FormatDate(lang, e.CreatedAt), At: e.CreatedAt, Rank: 2,
174 })
181 })
175 }
182 }
176 revs, _ := s.Store.ListReviews(r.Context(), mr.ID)
183 revs, _ := s.Store.ListReviews(r.Context(), mr.ID)
177 for _, rev := range revs {
184 for _, rev := range revs {
185 actor, actorURL := who(rev.Username)
178 items = append(items, TimelineItem{
186 items = append(items, TimelineItem{
179 Kind: "review", Actor: rev.Username, Text: s.tr(r, "rev."+rev.Status),
187 Kind: "review", Actor: actor, ActorURL: actorURL, Text: s.tr(r, "rev."+rev.Status),
180 When: i18n.FormatDate(lang, rev.UpdatedAt), At: rev.UpdatedAt, Rank: 3,
188 When: i18n.FormatDate(lang, rev.UpdatedAt), At: rev.UpdatedAt, Rank: 3,
181 })
189 })
182 }
190 }
@@ -185,9 +193,10 @@ func (s *Server) fillTimeline(r *http.Request, v *View, repo store.Repo, mr stor
185 jobs, _ := s.Store.JobsByPipeline(r.Context(), p.ID)
193 jobs, _ := s.Store.JobsByPipeline(r.Context(), p.ID)
186 status := displayStatus(p.Status, jobs)
194 status := displayStatus(p.Status, jobs)
187 label := s.tr(r, "pipe."+status)
195 label := s.tr(r, "pipe."+status)
188 v.PipeRows = append(v.PipeRows, s.pipeRow(r, lang, repo, p, map[string]store.User{}, s.queueRanks(r.Context())))
196 row := s.pipeRow(r, lang, repo, p, known, s.queueRanks(r.Context()))
197 v.PipeRows = append(v.PipeRows, row)
189 items = append(items, TimelineItem{
198 items = append(items, TimelineItem{
190 Kind: "pipeline", Actor: p.Actor,
199 Kind: "pipeline", Actor: row.Actor, ActorURL: row.ActorURL,
191 Text: s.tr(r, "mr.pipeEvent", p.ID, label),
200 Text: s.tr(r, "mr.pipeEvent", p.ID, label),
192 URL: repoURL(repo) + "/-/pipelines/" + strconv.FormatInt(p.ID, 10),
201 URL: repoURL(repo) + "/-/pipelines/" + strconv.FormatInt(p.ID, 10),
193 When: i18n.FormatDate(lang, p.CreatedAt), At: p.CreatedAt, Rank: 1,
202 When: i18n.FormatDate(lang, p.CreatedAt), At: p.CreatedAt, Rank: 1,
@@ -198,11 +207,11 @@ func (s *Server) fillTimeline(r *http.Request, v *View, repo store.Repo, mr stor
198 continue
207 continue
199 }
208 }
200 item := TimelineItem{
209 item := TimelineItem{
201 ID: n.ID, Kind: "comment", Actor: n.Author, Text: s.tr(r, "mr.commented"),
210 ID: n.ID, Kind: "comment", Actor: n.Author, ActorURL: n.AuthorURL, Text: s.tr(r, "mr.commented"),
202 HTML: n.HTML, When: n.When, At: n.At, Rank: 4,
211 HTML: n.HTML, When: n.When, At: n.At, Rank: 4,
203 }
212 }
204 for _, rp := range n.Replies {
213 for _, rp := range n.Replies {
205 item.Replies = append(item.Replies, TimelineItem{Actor: rp.Author, HTML: rp.HTML, When: rp.When})
214 item.Replies = append(item.Replies, TimelineItem{Actor: rp.Author, ActorURL: rp.AuthorURL, HTML: rp.HTML, When: rp.When})
206 }
215 }
207 items = append(items, item)
216 items = append(items, item)
208 }
217 }
internal/server/ops_account.go +24 −0
@@ -4,6 +4,7 @@ import (
4 4 "context"
5 5 "strings"
6 6 "time"
7 "unicode/utf8"
7 8
8 9 "gitlab.com/Timfa/bluegit/internal/access"
9 10 "gitlab.com/Timfa/bluegit/internal/i18n"
@@ -50,6 +51,29 @@ func (s *Server) opRemoveSSH(ctx context.Context, user store.User, id int64) err
50 51 return nil
51 52 }
52 53
54 func cleanProfile(name, bio string) (string, string, error) {
55 name = strings.TrimSpace(name)
56 bio = strings.TrimSpace(bio)
57 if strings.ContainsAny(name, "\r\n\x00") || utf8.RuneCountInString(name) > 80 {
58 return "", "", i18n.E("err.profileName")
59 }
60 if strings.ContainsRune(bio, 0) || utf8.RuneCountInString(bio) > 280 {
61 return "", "", i18n.E("err.profileBio")
62 }
63 return name, bio, nil
64 }
65
66 func (s *Server) opSetProfile(ctx context.Context, user store.User, name, bio string) (store.User, error) {
67 name, bio, err := cleanProfile(name, bio)
68 if err != nil {
69 return user, fail(400, err)
70 }
71 if err := s.Store.SetProfile(ctx, user.ID, name, bio); err != nil {
72 return user, fail(400, err)
73 }
74 return s.Store.UserByID(ctx, user.ID)
75 }
76
53 77 func (s *Server) opSetLanguage(ctx context.Context, user store.User, raw string) (i18n.Lang, error) {
54 78 lang := i18n.Parse(raw)
55 79 if err := s.Store.SetLanguage(ctx, user.ID, string(lang)); err != nil {
@@ -4,6 +4,7 @@ import (
4 "context"
4 "context"
5 "strings"
5 "strings"
6 "time"
6 "time"
7 "unicode/utf8"
7
8
8 "gitlab.com/Timfa/bluegit/internal/access"
9 "gitlab.com/Timfa/bluegit/internal/access"
9 "gitlab.com/Timfa/bluegit/internal/i18n"
10 "gitlab.com/Timfa/bluegit/internal/i18n"
@@ -50,6 +51,29 @@ func (s *Server) opRemoveSSH(ctx context.Context, user store.User, id int64) err
50 return nil
51 return nil
51}
52}
52
53
54func cleanProfile(name, bio string) (string, string, error) {
55 name = strings.TrimSpace(name)
56 bio = strings.TrimSpace(bio)
57 if strings.ContainsAny(name, "\r\n\x00") || utf8.RuneCountInString(name) > 80 {
58 return "", "", i18n.E("err.profileName")
59 }
60 if strings.ContainsRune(bio, 0) || utf8.RuneCountInString(bio) > 280 {
61 return "", "", i18n.E("err.profileBio")
62 }
63 return name, bio, nil
64}
65
66func (s *Server) opSetProfile(ctx context.Context, user store.User, name, bio string) (store.User, error) {
67 name, bio, err := cleanProfile(name, bio)
68 if err != nil {
69 return user, fail(400, err)
70 }
71 if err := s.Store.SetProfile(ctx, user.ID, name, bio); err != nil {
72 return user, fail(400, err)
73 }
74 return s.Store.UserByID(ctx, user.ID)
75}
76
53func (s *Server) opSetLanguage(ctx context.Context, user store.User, raw string) (i18n.Lang, error) {
77func (s *Server) opSetLanguage(ctx context.Context, user store.User, raw string) (i18n.Lang, error) {
54 lang := i18n.Parse(raw)
78 lang := i18n.Parse(raw)
55 if err := s.Store.SetLanguage(ctx, user.ID, string(lang)); err != nil {
79 if err := s.Store.SetLanguage(ctx, user.ID, string(lang)); err != nil {
internal/server/people.go +71 −0
@@ -29,9 +29,80 @@ func (s *Server) profile(w http.ResponseWriter, r *http.Request) {
29 29 ids = nil
30 30 }
31 31 v.Heat = s.heatmap(r.Context(), u.ID, ids, s.langOf(r))
32 total := 0
33 if v.Heat != nil {
34 total = v.Heat.Total
35 }
36 card, repos, groups := s.profileCard(r, u, viewer, total)
37 card.Heading = "h1"
38 v.Card = &card
39 v.Repos = repos
40 v.Groups = groups
32 41 s.render(w, "profile", v)
33 42 }
34 43
44 // profileCard bouwt het blok en de lijsten van iemands eigen repositories
45 // en groepen, beperkt tot wat de kijker mag zien.
46 func (s *Server) profileCard(r *http.Request, person store.User, viewer int64, contrib int) (ProfileCard, []store.Repo, []store.Group) {
47 repos := s.ownedReposVisible(r.Context(), person.ID, viewer)
48 groups := s.groupsVisible(r.Context(), person.ID, viewer)
49 name := strings.TrimSpace(person.DisplayName)
50 if name == "" {
51 name = person.Username
52 }
53 card := ProfileCard{
54 User: person, Name: name, Since: i18n.FormatDate(s.langOf(r), person.CreatedAt),
55 Bio: strings.TrimSpace(person.Bio), URL: s.absURL("/users/" + person.Username),
56 Repos: len(repos), Groups: len(groups), Contrib: contrib,
57 Own: viewer != 0 && viewer == person.ID,
58 }
59 return card, repos, groups
60 }
61
62 func (s *Server) ownedReposVisible(ctx context.Context, owner, viewer int64) []store.Repo {
63 all, err := s.Store.ReposByOwner(ctx, owner)
64 if err != nil {
65 return nil
66 }
67 allowed, err := s.Store.ListRepoIDs(ctx, viewer)
68 if err != nil {
69 return nil
70 }
71 set := map[int64]bool{}
72 for _, id := range allowed {
73 set[id] = true
74 }
75 var out []store.Repo
76 for _, repo := range all {
77 if set[repo.ID] {
78 out = append(out, repo)
79 }
80 }
81 return out
82 }
83
84 func (s *Server) groupsVisible(ctx context.Context, member, viewer int64) []store.Group {
85 all, err := s.Store.ListGroups(ctx, member)
86 if err != nil {
87 return nil
88 }
89 var out []store.Group
90 for _, g := range all {
91 if g.Visibility == "public" {
92 out = append(out, g)
93 continue
94 }
95 if viewer == 0 {
96 continue
97 }
98 role, err := s.Store.GroupRole(ctx, g.ID, viewer)
99 if err == nil && role.CanRead() {
100 out = append(out, g)
101 }
102 }
103 return out
104 }
105
35 106 func (s *Server) presentCommits(ctx context.Context, repoID int64, in []gitrepo.Commit, lang i18n.Lang) []CommitRow {
36 107 shas := make([]string, 0, len(in))
37 108 for _, c := range in {
@@ -29,9 +29,80 @@ func (s *Server) profile(w http.ResponseWriter, r *http.Request) {
29 ids = nil
29 ids = nil
30 }
30 }
31 v.Heat = s.heatmap(r.Context(), u.ID, ids, s.langOf(r))
31 v.Heat = s.heatmap(r.Context(), u.ID, ids, s.langOf(r))
32 total := 0
33 if v.Heat != nil {
34 total = v.Heat.Total
35 }
36 card, repos, groups := s.profileCard(r, u, viewer, total)
37 card.Heading = "h1"
38 v.Card = &card
39 v.Repos = repos
40 v.Groups = groups
32 s.render(w, "profile", v)
41 s.render(w, "profile", v)
33}
42}
34
43
44// profileCard bouwt het blok en de lijsten van iemands eigen repositories
45// en groepen, beperkt tot wat de kijker mag zien.
46func (s *Server) profileCard(r *http.Request, person store.User, viewer int64, contrib int) (ProfileCard, []store.Repo, []store.Group) {
47 repos := s.ownedReposVisible(r.Context(), person.ID, viewer)
48 groups := s.groupsVisible(r.Context(), person.ID, viewer)
49 name := strings.TrimSpace(person.DisplayName)
50 if name == "" {
51 name = person.Username
52 }
53 card := ProfileCard{
54 User: person, Name: name, Since: i18n.FormatDate(s.langOf(r), person.CreatedAt),
55 Bio: strings.TrimSpace(person.Bio), URL: s.absURL("/users/" + person.Username),
56 Repos: len(repos), Groups: len(groups), Contrib: contrib,
57 Own: viewer != 0 && viewer == person.ID,
58 }
59 return card, repos, groups
60}
61
62func (s *Server) ownedReposVisible(ctx context.Context, owner, viewer int64) []store.Repo {
63 all, err := s.Store.ReposByOwner(ctx, owner)
64 if err != nil {
65 return nil
66 }
67 allowed, err := s.Store.ListRepoIDs(ctx, viewer)
68 if err != nil {
69 return nil
70 }
71 set := map[int64]bool{}
72 for _, id := range allowed {
73 set[id] = true
74 }
75 var out []store.Repo
76 for _, repo := range all {
77 if set[repo.ID] {
78 out = append(out, repo)
79 }
80 }
81 return out
82}
83
84func (s *Server) groupsVisible(ctx context.Context, member, viewer int64) []store.Group {
85 all, err := s.Store.ListGroups(ctx, member)
86 if err != nil {
87 return nil
88 }
89 var out []store.Group
90 for _, g := range all {
91 if g.Visibility == "public" {
92 out = append(out, g)
93 continue
94 }
95 if viewer == 0 {
96 continue
97 }
98 role, err := s.Store.GroupRole(ctx, g.ID, viewer)
99 if err == nil && role.CanRead() {
100 out = append(out, g)
101 }
102 }
103 return out
104}
105
35func (s *Server) presentCommits(ctx context.Context, repoID int64, in []gitrepo.Commit, lang i18n.Lang) []CommitRow {
106func (s *Server) presentCommits(ctx context.Context, repoID int64, in []gitrepo.Commit, lang i18n.Lang) []CommitRow {
36 shas := make([]string, 0, len(in))
107 shas := make([]string, 0, len(in))
37 for _, c := range in {
108 for _, c := range in {
internal/server/pipeline_page.go +10 −8
@@ -31,6 +31,7 @@ type PipeRow struct {
31 31 SourceLabel string
32 32 MRNumber int64
33 33 Actor string
34 ActorURL string
34 35 Avatar string
35 36 Initial string
36 37 Stages []StageView
@@ -64,6 +65,7 @@ type JobPage struct {
64 65 Status string
65 66 Label string
66 67 Actor string
68 ActorURL string
67 69 Avatar string
68 70 Initial string
69 71 When string
@@ -152,7 +154,7 @@ func (s *Server) pipeRow(r *http.Request, lang i18n.Lang, repo store.Repo, p sto
152 154 jobs, _ := s.Store.JobsByPipeline(r.Context(), p.ID)
153 155 name, kind := ci.SplitRef(p.Ref)
154 156 status := displayStatus(p.Status, jobs)
155 actor, avatar := s.actorOf(r, p.Actor, users)
157 actor, avatar, actorURL := s.actorOf(r, p.Actor, users)
156 158 initial := ""
157 159 if actor != "" {
158 160 initial = strings.ToUpper(actor[:1])
@@ -163,7 +165,7 @@ func (s *Server) pipeRow(r *http.Request, lang i18n.Lang, repo store.Repo, p sto
163 165 Duration: pipelineClock(p), When: i18n.Ago(lang, p.CreatedAt.Unix()),
164 166 Title: p.CommitTitle, SHA: p.CommitSHA, Short: shortSHA(p.CommitSHA),
165 167 Ref: name, RefKind: kind, Source: p.Source, SourceLabel: sourceLabel, MRNumber: mrNumber,
166 Actor: actor, Avatar: avatar, Initial: initial,
168 Actor: actor, ActorURL: actorURL, Avatar: avatar, Initial: initial,
167 169 Stages: stageViews(jobs, ranks, func(key string, args ...any) string { return s.tr(r, key, args...) }),
168 170 }
169 171 }
@@ -201,10 +203,10 @@ func (s *Server) pipelineSourceText(r *http.Request, repo store.Repo, p store.Pi
201 203 return label + " !" + strconv.FormatInt(number, 10)
202 204 }
203 205
204 func (s *Server) actorOf(r *http.Request, name string, cache map[string]store.User) (string, string) {
206 func (s *Server) actorOf(r *http.Request, name string, cache map[string]store.User) (string, string, string) {
205 207 name = strings.TrimSpace(name)
206 208 if name == "" {
207 return "", ""
209 return "", "", ""
208 210 }
209 211 u, ok := cache[name]
210 212 if !ok {
@@ -215,9 +217,9 @@ func (s *Server) actorOf(r *http.Request, name string, cache map[string]store.Us
215 217 cache[name] = u
216 218 }
217 219 if u.ID == 0 {
218 return name, ""
220 return name, "", ""
219 221 }
220 return u.Username, u.AvatarURL
222 return u.Username, u.AvatarURL, "/users/" + u.Username
221 223 }
222 224
223 225 func pipeMatches(row PipeRow, q string) bool {
@@ -488,7 +490,7 @@ func (s *Server) jobPage(r *http.Request, repo store.Repo, p store.Pipeline, job
488 490 lang := s.langOf(r)
489 491 jobs, _ := s.Store.JobsByPipeline(r.Context(), p.ID)
490 492 users := map[string]store.User{}
491 actor, avatar := s.actorOf(r, p.Actor, users)
493 actor, avatar, actorURL := s.actorOf(r, p.Actor, users)
492 494 initial := ""
493 495 if actor != "" {
494 496 initial = strings.ToUpper(actor[:1])
@@ -544,7 +546,7 @@ func (s *Server) jobPage(r *http.Request, repo store.Repo, p store.Pipeline, job
544 546 }
545 547 return &JobPage{
546 548 Job: job, Pipe: p, Name: job.Name, Status: status, Label: s.tr(r, "pipe."+status),
547 Actor: actor, Avatar: avatar, Initial: initial, When: i18n.Ago(lang, p.CreatedAt.Unix()),
549 Actor: actor, ActorURL: actorURL, Avatar: avatar, Initial: initial, When: i18n.Ago(lang, p.CreatedAt.Unix()),
548 550 Duration: dur, Finished: finished, Queued: queued, Timeout: timeout, Source: source,
549 551 Ref: name, RefKind: kind, Short: shortSHA(p.CommitSHA), Title: p.CommitTitle, Stage: job.Stage,
550 552 PipeStatus: pipeStatus, PipeLabel: s.tr(r, "pipe."+pipeStatus),
@@ -31,6 +31,7 @@ type PipeRow struct {
31 SourceLabel string
31 SourceLabel string
32 MRNumber int64
32 MRNumber int64
33 Actor string
33 Actor string
34 ActorURL string
34 Avatar string
35 Avatar string
35 Initial string
36 Initial string
36 Stages []StageView
37 Stages []StageView
@@ -64,6 +65,7 @@ type JobPage struct {
64 Status string
65 Status string
65 Label string
66 Label string
66 Actor string
67 Actor string
68 ActorURL string
67 Avatar string
69 Avatar string
68 Initial string
70 Initial string
69 When string
71 When string
@@ -152,7 +154,7 @@ func (s *Server) pipeRow(r *http.Request, lang i18n.Lang, repo store.Repo, p sto
152 jobs, _ := s.Store.JobsByPipeline(r.Context(), p.ID)
154 jobs, _ := s.Store.JobsByPipeline(r.Context(), p.ID)
153 name, kind := ci.SplitRef(p.Ref)
155 name, kind := ci.SplitRef(p.Ref)
154 status := displayStatus(p.Status, jobs)
156 status := displayStatus(p.Status, jobs)
155 actor, avatar := s.actorOf(r, p.Actor, users)
157 actor, avatar, actorURL := s.actorOf(r, p.Actor, users)
156 initial := ""
158 initial := ""
157 if actor != "" {
159 if actor != "" {
158 initial = strings.ToUpper(actor[:1])
160 initial = strings.ToUpper(actor[:1])
@@ -163,7 +165,7 @@ func (s *Server) pipeRow(r *http.Request, lang i18n.Lang, repo store.Repo, p sto
163 Duration: pipelineClock(p), When: i18n.Ago(lang, p.CreatedAt.Unix()),
165 Duration: pipelineClock(p), When: i18n.Ago(lang, p.CreatedAt.Unix()),
164 Title: p.CommitTitle, SHA: p.CommitSHA, Short: shortSHA(p.CommitSHA),
166 Title: p.CommitTitle, SHA: p.CommitSHA, Short: shortSHA(p.CommitSHA),
165 Ref: name, RefKind: kind, Source: p.Source, SourceLabel: sourceLabel, MRNumber: mrNumber,
167 Ref: name, RefKind: kind, Source: p.Source, SourceLabel: sourceLabel, MRNumber: mrNumber,
166 Actor: actor, Avatar: avatar, Initial: initial,
168 Actor: actor, ActorURL: actorURL, Avatar: avatar, Initial: initial,
167 Stages: stageViews(jobs, ranks, func(key string, args ...any) string { return s.tr(r, key, args...) }),
169 Stages: stageViews(jobs, ranks, func(key string, args ...any) string { return s.tr(r, key, args...) }),
168 }
170 }
169}
171}
@@ -201,10 +203,10 @@ func (s *Server) pipelineSourceText(r *http.Request, repo store.Repo, p store.Pi
201 return label + " !" + strconv.FormatInt(number, 10)
203 return label + " !" + strconv.FormatInt(number, 10)
202}
204}
203
205
204func (s *Server) actorOf(r *http.Request, name string, cache map[string]store.User) (string, string) {
206func (s *Server) actorOf(r *http.Request, name string, cache map[string]store.User) (string, string, string) {
205 name = strings.TrimSpace(name)
207 name = strings.TrimSpace(name)
206 if name == "" {
208 if name == "" {
207 return "", ""
209 return "", "", ""
208 }
210 }
209 u, ok := cache[name]
211 u, ok := cache[name]
210 if !ok {
212 if !ok {
@@ -215,9 +217,9 @@ func (s *Server) actorOf(r *http.Request, name string, cache map[string]store.Us
215 cache[name] = u
217 cache[name] = u
216 }
218 }
217 if u.ID == 0 {
219 if u.ID == 0 {
218 return name, ""
220 return name, "", ""
219 }
221 }
220 return u.Username, u.AvatarURL
222 return u.Username, u.AvatarURL, "/users/" + u.Username
221}
223}
222
224
223func pipeMatches(row PipeRow, q string) bool {
225func pipeMatches(row PipeRow, q string) bool {
@@ -488,7 +490,7 @@ func (s *Server) jobPage(r *http.Request, repo store.Repo, p store.Pipeline, job
488 lang := s.langOf(r)
490 lang := s.langOf(r)
489 jobs, _ := s.Store.JobsByPipeline(r.Context(), p.ID)
491 jobs, _ := s.Store.JobsByPipeline(r.Context(), p.ID)
490 users := map[string]store.User{}
492 users := map[string]store.User{}
491 actor, avatar := s.actorOf(r, p.Actor, users)
493 actor, avatar, actorURL := s.actorOf(r, p.Actor, users)
492 initial := ""
494 initial := ""
493 if actor != "" {
495 if actor != "" {
494 initial = strings.ToUpper(actor[:1])
496 initial = strings.ToUpper(actor[:1])
@@ -544,7 +546,7 @@ func (s *Server) jobPage(r *http.Request, repo store.Repo, p store.Pipeline, job
544 }
546 }
545 return &JobPage{
547 return &JobPage{
546 Job: job, Pipe: p, Name: job.Name, Status: status, Label: s.tr(r, "pipe."+status),
548 Job: job, Pipe: p, Name: job.Name, Status: status, Label: s.tr(r, "pipe."+status),
547 Actor: actor, Avatar: avatar, Initial: initial, When: i18n.Ago(lang, p.CreatedAt.Unix()),
549 Actor: actor, ActorURL: actorURL, Avatar: avatar, Initial: initial, When: i18n.Ago(lang, p.CreatedAt.Unix()),
548 Duration: dur, Finished: finished, Queued: queued, Timeout: timeout, Source: source,
550 Duration: dur, Finished: finished, Queued: queued, Timeout: timeout, Source: source,
549 Ref: name, RefKind: kind, Short: shortSHA(p.CommitSHA), Title: p.CommitTitle, Stage: job.Stage,
551 Ref: name, RefKind: kind, Short: shortSHA(p.CommitSHA), Title: p.CommitTitle, Stage: job.Stage,
550 PipeStatus: pipeStatus, PipeLabel: s.tr(r, "pipe."+pipeStatus),
552 PipeStatus: pipeStatus, PipeLabel: s.tr(r, "pipe."+pipeStatus),
internal/server/profile_test.go added +337 −0
@@ -0,0 +1,337 @@
1 package server
2
3 import (
4 "context"
5 "encoding/json"
6 "net/http"
7 "net/http/cookiejar"
8 "net/http/httptest"
9 "net/url"
10 "path/filepath"
11 "strings"
12 "testing"
13 "time"
14
15 "gitlab.com/Timfa/bluegit/internal/access"
16 "gitlab.com/Timfa/bluegit/internal/auth"
17 "gitlab.com/Timfa/bluegit/internal/config"
18 "gitlab.com/Timfa/bluegit/internal/store"
19 )
20
21 func TestProfilePage(t *testing.T) {
22 storage := t.TempDir()
23 st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())
24 if err != nil {
25 t.Fatal(err)
26 }
27 t.Cleanup(func() { _ = st.Close() })
28 cfg := config.Config{
29 BaseURL: "http://127.0.0.1:9", Listen: "127.0.0.1:0", StoragePath: storage,
30 Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test"},
31 Git: config.Git{Binary: "git", DefaultBranch: "master"},
32 }
33 cfg.Auth.BaseURL = "https://auth.timfalken.com"
34 srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true"}
35 ts := httptest.NewServer(srv.Handler())
36 t.Cleanup(ts.Close)
37 srv.Cfg.BaseURL = ts.URL
38
39 jar, _ := cookiejar.New(nil)
40 client := &http.Client{Jar: jar}
41 res, err := client.Get(ts.URL + "/login")
42 if err != nil {
43 t.Fatal(err)
44 }
45 page := read(t, res)
46 ctx := context.Background()
47 tim, err := st.UserByUsername(ctx, "tim")
48 if err != nil {
49 t.Fatal(err)
50 }
51 ada, err := st.UpsertUser(ctx, 2, "ada", "", false)
52 if err != nil {
53 t.Fatal(err)
54 }
55 plein, err := st.CreateGroup(ctx, tim.ID, "Plein", "plein", "open plein", access.RoleDeveloper)
56 if err != nil {
57 t.Fatal(err)
58 }
59 if err := st.UpdateGroup(ctx, plein.ID, "open plein", "public", access.RoleDeveloper); err != nil {
60 t.Fatal(err)
61 }
62 if err := st.SetLogoMIME(ctx, "group", plein.ID, "image/png"); err != nil {
63 t.Fatal(err)
64 }
65 kluis, err := st.CreateGroup(ctx, tim.ID, "Kluis", "kluis", "dichte kluis", access.RoleDeveloper)
66 if err != nil {
67 t.Fatal(err)
68 }
69 zichtbaar, err := st.CreateRepo(ctx, "user", tim.ID, "zichtbaar", "Zichtbare repo", "master", "public")
70 if err != nil {
71 t.Fatal(err)
72 }
73 if err := st.SetLogoMIME(ctx, "repo", zichtbaar.ID, "image/png"); err != nil {
74 t.Fatal(err)
75 }
76 if _, err := st.CreateRepo(ctx, "user", tim.ID, "geheim", "Geheim project", "master", "private"); err != nil {
77 t.Fatal(err)
78 }
79 if _, err := st.CreateRepo(ctx, "group", plein.ID, "gedeeld", "Groepsrepo", "master", "public"); err != nil {
80 t.Fatal(err)
81 }
82 if err := st.SetMember(ctx, "repo", repoID(t, st, "tim", "geheim"), "ada", access.RoleDeveloper); err != nil {
83 t.Fatal(err)
84 }
85 if err := st.SetMember(ctx, "group", kluis.ID, "ada", access.RoleDeveloper); err != nil {
86 t.Fatal(err)
87 }
88
89 share := ts.URL + "/users/tim"
90 res, err = client.Get(ts.URL + "/")
91 if err != nil {
92 t.Fatal(err)
93 }
94 dash := read(t, res)
95 for _, want := range []string{
96 `class="usercard panel"`,
97 `<h2>tim</h2>`,
98 `@tim`,
99 `data-copy="` + share + `"`,
100 `href="/settings">Edit profile`,
101 `href="/users/tim"`,
102 `<strong>2</strong> <span>Repositories</span>`,
103 `<strong>2</strong> <span>Groups</span>`,
104 "plein/gedeeld",
105 "Activity",
106 } {
107 if !strings.Contains(dash, want) {
108 t.Fatalf("dashboard mist %q", want)
109 }
110 }
111 if strings.Index(dash, "Activity") > strings.Index(dash, "<h2>Repositories</h2>") {
112 t.Fatal("heatmap staat onder de repositorylijst")
113 }
114
115 anon := &http.Client{}
116 res, err = anon.Get(share)
117 if err != nil {
118 t.Fatal(err)
119 }
120 pub := read(t, res)
121 for _, want := range []string{
122 "<h1>tim</h1>",
123 `@tim`,
124 "Member since",
125 `data-copy="` + share + `"`,
126 `src="/tim/zichtbaar/-/logo"`,
127 `href="/tim/zichtbaar"`,
128 "Zichtbare repo",
129 `src="/groups/plein/logo"`,
130 `href="/groups/plein"`,
131 `<strong>1</strong> <span>Repositories</span>`,
132 `<strong>1</strong> <span>Groups</span>`,
133 } {
134 if !strings.Contains(pub, want) {
135 t.Fatalf("openbaar profiel mist %q", want)
136 }
137 }
138 for _, ban := range []string{"geheim", "Geheim project", "kluis", "Kluis", "Edit profile", "plein/gedeeld"} {
139 if strings.Contains(pub, ban) {
140 t.Fatalf("openbaar profiel toont %q", ban)
141 }
142 }
143
144 adaJar, _ := cookiejar.New(nil)
145 adaClient := &http.Client{Jar: adaJar}
146 sess, err := st.CreateSession(ctx, ada.ID, "dev", time.Now().Add(time.Hour))
147 if err != nil {
148 t.Fatal(err)
149 }
150 u, _ := url.Parse(ts.URL)
151 adaJar.SetCookies(u, []*http.Cookie{{Name: "bluegit_session", Value: sess.ID, Path: "/"}})
152 res, err = adaClient.Get(share)
153 if err != nil {
154 t.Fatal(err)
155 }
156 adaPage := read(t, res)
157 for _, want := range []string{
158 `href="/tim/geheim"`,
159 "Geheim project",
160 `href="/groups/kluis"`,
161 `<strong>2</strong> <span>Repositories</span>`,
162 `<strong>2</strong> <span>Groups</span>`,
163 } {
164 if !strings.Contains(adaPage, want) {
165 t.Fatalf("ada ziet niet %q", want)
166 }
167 }
168 if strings.Contains(adaPage, "Edit profile") || strings.Contains(adaPage, "plein/gedeeld") {
169 t.Fatal("ada ziet Tims bewerkknop of een groepsrepository")
170 }
171
172 res, err = client.Get(ts.URL + "/settings")
173 if err != nil {
174 t.Fatal(err)
175 }
176 settings := read(t, res)
177 if !strings.Contains(settings, "Display name") || !strings.Contains(settings, "Bio") {
178 t.Fatal("instellingen missen weergavenaam of bio")
179 }
180 res, err = client.PostForm(ts.URL+"/settings/profile", url.Values{
181 "csrf": {csrfOf(t, settings)}, "name": {"Regel\neen"}, "bio": {"nee"},
182 })
183 if err != nil {
184 t.Fatal(err)
185 }
186 bad := read(t, res)
187 if !strings.Contains(bad, "line break") {
188 t.Fatalf("ongeldige naam:\n%s", bad)
189 }
190 res, err = client.PostForm(ts.URL+"/settings/profile", url.Values{
191 "csrf": {csrfOf(t, bad)}, "name": {"Tim Falken"}, "bio": {"Bouwt BlueGit."},
192 })
193 if err != nil {
194 t.Fatal(err)
195 }
196 saved := read(t, res)
197 if !strings.Contains(saved, "Profile saved") || !strings.Contains(saved, `value="Tim Falken"`) {
198 t.Fatalf("profiel opslaan:\n%s", saved)
199 }
200 res, err = client.Get(share)
201 if err != nil {
202 t.Fatal(err)
203 }
204 named := read(t, res)
205 for _, want := range []string{"<h1>Tim Falken</h1>", "@tim", "Bouwt BlueGit.", "Edit profile"} {
206 if !strings.Contains(named, want) {
207 t.Fatalf("profiel na opslaan mist %q", want)
208 }
209 }
210
211 timToken, err := st.CreateToken(ctx, tim.ID, "tim")
212 if err != nil {
213 t.Fatal(err)
214 }
215 adaToken, err := st.CreateToken(ctx, ada.ID, "ada")
216 if err != nil {
217 t.Fatal(err)
218 }
219 mine := apiGet(t, ts.URL+"/api/v1/users/tim", timToken)
220 if mine["name"] != "Tim Falken" || mine["bio"] != "Bouwt BlueGit." || mine["web_url"] != share {
221 t.Fatalf("api zelf: %#v", mine)
222 }
223 if mine["instance_admin"] != true || mine["language"] != "en" {
224 t.Fatalf("api zelf mist eigen velden: %#v", mine)
225 }
226 counts := mine["counts"].(map[string]any)
227 if counts["repos"] != 2.0 || counts["groups"] != 2.0 || counts["contributions"] != 0.0 {
228 t.Fatalf("api tellingen: %#v", counts)
229 }
230 if !apiPaths(mine["repos"]).has("tim/zichtbaar", "tim/geheim") || apiPaths(mine["repos"]).has("plein/gedeeld") {
231 t.Fatalf("api repos: %#v", mine["repos"])
232 }
233 if !apiPaths(mine["groups"]).has("plein", "kluis") {
234 t.Fatalf("api groepen: %#v", mine["groups"])
235 }
236 other := apiGet(t, ts.URL+"/api/v1/users/tim", adaToken)
237 if _, ok := other["instance_admin"]; ok || other["language"] != nil {
238 t.Fatalf("api van ada toont Tims privévelden: %#v", other)
239 }
240 if !apiPaths(other["repos"]).has("tim/geheim") || !apiPaths(other["groups"]).has("kluis") {
241 t.Fatalf("api van ada mist privé: %#v %#v", other["repos"], other["groups"])
242 }
243 req, err := http.NewRequest(http.MethodPut, ts.URL+"/api/v1/user", strings.NewReader(`{"bio":"alleen bio"}`))
244 if err != nil {
245 t.Fatal(err)
246 }
247 req.Header.Set("Authorization", "Bearer "+timToken)
248 req.Header.Set("Content-Type", "application/json")
249 res, err = http.DefaultClient.Do(req)
250 if err != nil {
251 t.Fatal(err)
252 }
253 put := decodeJSON(t, res)
254 if put["bio"] != "alleen bio" || put["name"] != "Tim Falken" || put["language"] != "en" {
255 t.Fatalf("put bio: %#v", put)
256 }
257
258 noredir := &http.Client{CheckRedirect: func(*http.Request, []*http.Request) error { return http.ErrUseLastResponse }}
259 res, err = noredir.Get(ts.URL + "/tim")
260 if err != nil {
261 t.Fatal(err)
262 }
263 loc := res.Header.Get("Location")
264 if res.StatusCode != http.StatusNotFound || loc != "" {
265 t.Fatalf("/tim is %d locatie %q", res.StatusCode, loc)
266 }
267 _ = res.Body.Close()
268 res, err = anon.Get(ts.URL + "/users/nobody")
269 if err != nil {
270 t.Fatal(err)
271 }
272 if res.StatusCode != http.StatusNotFound {
273 t.Fatalf("onbekend profiel %d", res.StatusCode)
274 }
275 _ = res.Body.Close()
276 _ = page
277 }
278
279 func repoID(t *testing.T, st *store.Store, owner, name string) int64 {
280 t.Helper()
281 repo, err := st.RepoByPath(context.Background(), owner, name)
282 if err != nil {
283 t.Fatal(err)
284 }
285 return repo.ID
286 }
287
288 func apiGet(t *testing.T, rawURL, token string) map[string]any {
289 t.Helper()
290 req, err := http.NewRequest(http.MethodGet, rawURL, nil)
291 if err != nil {
292 t.Fatal(err)
293 }
294 req.Header.Set("Authorization", "Bearer "+token)
295 res, err := http.DefaultClient.Do(req)
296 if err != nil {
297 t.Fatal(err)
298 }
299 body := decodeJSON(t, res)
300 if res.StatusCode != http.StatusOK {
301 t.Fatalf("api %s: %d %#v", rawURL, res.StatusCode, body)
302 }
303 return body
304 }
305
306 func decodeJSON(t *testing.T, res *http.Response) map[string]any {
307 t.Helper()
308 defer res.Body.Close()
309 var body map[string]any
310 if err := json.NewDecoder(res.Body).Decode(&body); err != nil {
311 t.Fatal(err)
312 }
313 return body
314 }
315
316 type pathSet map[string]bool
317
318 func apiPaths(v any) pathSet {
319 out := pathSet{}
320 list, _ := v.([]any)
321 for _, item := range list {
322 row, _ := item.(map[string]any)
323 if p, ok := row["path"].(string); ok {
324 out[p] = true
325 }
326 }
327 return out
328 }
329
330 func (p pathSet) has(want ...string) bool {
331 for _, w := range want {
332 if !p[w] {
333 return false
334 }
335 }
336 return true
337 }
@@ -0,0 +1,337 @@
1package server
2
3import (
4 "context"
5 "encoding/json"
6 "net/http"
7 "net/http/cookiejar"
8 "net/http/httptest"
9 "net/url"
10 "path/filepath"
11 "strings"
12 "testing"
13 "time"
14
15 "gitlab.com/Timfa/bluegit/internal/access"
16 "gitlab.com/Timfa/bluegit/internal/auth"
17 "gitlab.com/Timfa/bluegit/internal/config"
18 "gitlab.com/Timfa/bluegit/internal/store"
19)
20
21func TestProfilePage(t *testing.T) {
22 storage := t.TempDir()
23 st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())
24 if err != nil {
25 t.Fatal(err)
26 }
27 t.Cleanup(func() { _ = st.Close() })
28 cfg := config.Config{
29 BaseURL: "http://127.0.0.1:9", Listen: "127.0.0.1:0", StoragePath: storage,
30 Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test"},
31 Git: config.Git{Binary: "git", DefaultBranch: "master"},
32 }
33 cfg.Auth.BaseURL = "https://auth.timfalken.com"
34 srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true"}
35 ts := httptest.NewServer(srv.Handler())
36 t.Cleanup(ts.Close)
37 srv.Cfg.BaseURL = ts.URL
38
39 jar, _ := cookiejar.New(nil)
40 client := &http.Client{Jar: jar}
41 res, err := client.Get(ts.URL + "/login")
42 if err != nil {
43 t.Fatal(err)
44 }
45 page := read(t, res)
46 ctx := context.Background()
47 tim, err := st.UserByUsername(ctx, "tim")
48 if err != nil {
49 t.Fatal(err)
50 }
51 ada, err := st.UpsertUser(ctx, 2, "ada", "", false)
52 if err != nil {
53 t.Fatal(err)
54 }
55 plein, err := st.CreateGroup(ctx, tim.ID, "Plein", "plein", "open plein", access.RoleDeveloper)
56 if err != nil {
57 t.Fatal(err)
58 }
59 if err := st.UpdateGroup(ctx, plein.ID, "open plein", "public", access.RoleDeveloper); err != nil {
60 t.Fatal(err)
61 }
62 if err := st.SetLogoMIME(ctx, "group", plein.ID, "image/png"); err != nil {
63 t.Fatal(err)
64 }
65 kluis, err := st.CreateGroup(ctx, tim.ID, "Kluis", "kluis", "dichte kluis", access.RoleDeveloper)
66 if err != nil {
67 t.Fatal(err)
68 }
69 zichtbaar, err := st.CreateRepo(ctx, "user", tim.ID, "zichtbaar", "Zichtbare repo", "master", "public")
70 if err != nil {
71 t.Fatal(err)
72 }
73 if err := st.SetLogoMIME(ctx, "repo", zichtbaar.ID, "image/png"); err != nil {
74 t.Fatal(err)
75 }
76 if _, err := st.CreateRepo(ctx, "user", tim.ID, "geheim", "Geheim project", "master", "private"); err != nil {
77 t.Fatal(err)
78 }
79 if _, err := st.CreateRepo(ctx, "group", plein.ID, "gedeeld", "Groepsrepo", "master", "public"); err != nil {
80 t.Fatal(err)
81 }
82 if err := st.SetMember(ctx, "repo", repoID(t, st, "tim", "geheim"), "ada", access.RoleDeveloper); err != nil {
83 t.Fatal(err)
84 }
85 if err := st.SetMember(ctx, "group", kluis.ID, "ada", access.RoleDeveloper); err != nil {
86 t.Fatal(err)
87 }
88
89 share := ts.URL + "/users/tim"
90 res, err = client.Get(ts.URL + "/")
91 if err != nil {
92 t.Fatal(err)
93 }
94 dash := read(t, res)
95 for _, want := range []string{
96 `class="usercard panel"`,
97 `<h2>tim</h2>`,
98 `@tim`,
99 `data-copy="` + share + `"`,
100 `href="/settings">Edit profile`,
101 `href="/users/tim"`,
102 `<strong>2</strong> <span>Repositories</span>`,
103 `<strong>2</strong> <span>Groups</span>`,
104 "plein/gedeeld",
105 "Activity",
106 } {
107 if !strings.Contains(dash, want) {
108 t.Fatalf("dashboard mist %q", want)
109 }
110 }
111 if strings.Index(dash, "Activity") > strings.Index(dash, "<h2>Repositories</h2>") {
112 t.Fatal("heatmap staat onder de repositorylijst")
113 }
114
115 anon := &http.Client{}
116 res, err = anon.Get(share)
117 if err != nil {
118 t.Fatal(err)
119 }
120 pub := read(t, res)
121 for _, want := range []string{
122 "<h1>tim</h1>",
123 `@tim`,
124 "Member since",
125 `data-copy="` + share + `"`,
126 `src="/tim/zichtbaar/-/logo"`,
127 `href="/tim/zichtbaar"`,
128 "Zichtbare repo",
129 `src="/groups/plein/logo"`,
130 `href="/groups/plein"`,
131 `<strong>1</strong> <span>Repositories</span>`,
132 `<strong>1</strong> <span>Groups</span>`,
133 } {
134 if !strings.Contains(pub, want) {
135 t.Fatalf("openbaar profiel mist %q", want)
136 }
137 }
138 for _, ban := range []string{"geheim", "Geheim project", "kluis", "Kluis", "Edit profile", "plein/gedeeld"} {
139 if strings.Contains(pub, ban) {
140 t.Fatalf("openbaar profiel toont %q", ban)
141 }
142 }
143
144 adaJar, _ := cookiejar.New(nil)
145 adaClient := &http.Client{Jar: adaJar}
146 sess, err := st.CreateSession(ctx, ada.ID, "dev", time.Now().Add(time.Hour))
147 if err != nil {
148 t.Fatal(err)
149 }
150 u, _ := url.Parse(ts.URL)
151 adaJar.SetCookies(u, []*http.Cookie{{Name: "bluegit_session", Value: sess.ID, Path: "/"}})
152 res, err = adaClient.Get(share)
153 if err != nil {
154 t.Fatal(err)
155 }
156 adaPage := read(t, res)
157 for _, want := range []string{
158 `href="/tim/geheim"`,
159 "Geheim project",
160 `href="/groups/kluis"`,
161 `<strong>2</strong> <span>Repositories</span>`,
162 `<strong>2</strong> <span>Groups</span>`,
163 } {
164 if !strings.Contains(adaPage, want) {
165 t.Fatalf("ada ziet niet %q", want)
166 }
167 }
168 if strings.Contains(adaPage, "Edit profile") || strings.Contains(adaPage, "plein/gedeeld") {
169 t.Fatal("ada ziet Tims bewerkknop of een groepsrepository")
170 }
171
172 res, err = client.Get(ts.URL + "/settings")
173 if err != nil {
174 t.Fatal(err)
175 }
176 settings := read(t, res)
177 if !strings.Contains(settings, "Display name") || !strings.Contains(settings, "Bio") {
178 t.Fatal("instellingen missen weergavenaam of bio")
179 }
180 res, err = client.PostForm(ts.URL+"/settings/profile", url.Values{
181 "csrf": {csrfOf(t, settings)}, "name": {"Regel\neen"}, "bio": {"nee"},
182 })
183 if err != nil {
184 t.Fatal(err)
185 }
186 bad := read(t, res)
187 if !strings.Contains(bad, "line break") {
188 t.Fatalf("ongeldige naam:\n%s", bad)
189 }
190 res, err = client.PostForm(ts.URL+"/settings/profile", url.Values{
191 "csrf": {csrfOf(t, bad)}, "name": {"Tim Falken"}, "bio": {"Bouwt BlueGit."},
192 })
193 if err != nil {
194 t.Fatal(err)
195 }
196 saved := read(t, res)
197 if !strings.Contains(saved, "Profile saved") || !strings.Contains(saved, `value="Tim Falken"`) {
198 t.Fatalf("profiel opslaan:\n%s", saved)
199 }
200 res, err = client.Get(share)
201 if err != nil {
202 t.Fatal(err)
203 }
204 named := read(t, res)
205 for _, want := range []string{"<h1>Tim Falken</h1>", "@tim", "Bouwt BlueGit.", "Edit profile"} {
206 if !strings.Contains(named, want) {
207 t.Fatalf("profiel na opslaan mist %q", want)
208 }
209 }
210
211 timToken, err := st.CreateToken(ctx, tim.ID, "tim")
212 if err != nil {
213 t.Fatal(err)
214 }
215 adaToken, err := st.CreateToken(ctx, ada.ID, "ada")
216 if err != nil {
217 t.Fatal(err)
218 }
219 mine := apiGet(t, ts.URL+"/api/v1/users/tim", timToken)
220 if mine["name"] != "Tim Falken" || mine["bio"] != "Bouwt BlueGit." || mine["web_url"] != share {
221 t.Fatalf("api zelf: %#v", mine)
222 }
223 if mine["instance_admin"] != true || mine["language"] != "en" {
224 t.Fatalf("api zelf mist eigen velden: %#v", mine)
225 }
226 counts := mine["counts"].(map[string]any)
227 if counts["repos"] != 2.0 || counts["groups"] != 2.0 || counts["contributions"] != 0.0 {
228 t.Fatalf("api tellingen: %#v", counts)
229 }
230 if !apiPaths(mine["repos"]).has("tim/zichtbaar", "tim/geheim") || apiPaths(mine["repos"]).has("plein/gedeeld") {
231 t.Fatalf("api repos: %#v", mine["repos"])
232 }
233 if !apiPaths(mine["groups"]).has("plein", "kluis") {
234 t.Fatalf("api groepen: %#v", mine["groups"])
235 }
236 other := apiGet(t, ts.URL+"/api/v1/users/tim", adaToken)
237 if _, ok := other["instance_admin"]; ok || other["language"] != nil {
238 t.Fatalf("api van ada toont Tims privévelden: %#v", other)
239 }
240 if !apiPaths(other["repos"]).has("tim/geheim") || !apiPaths(other["groups"]).has("kluis") {
241 t.Fatalf("api van ada mist privé: %#v %#v", other["repos"], other["groups"])
242 }
243 req, err := http.NewRequest(http.MethodPut, ts.URL+"/api/v1/user", strings.NewReader(`{"bio":"alleen bio"}`))
244 if err != nil {
245 t.Fatal(err)
246 }
247 req.Header.Set("Authorization", "Bearer "+timToken)
248 req.Header.Set("Content-Type", "application/json")
249 res, err = http.DefaultClient.Do(req)
250 if err != nil {
251 t.Fatal(err)
252 }
253 put := decodeJSON(t, res)
254 if put["bio"] != "alleen bio" || put["name"] != "Tim Falken" || put["language"] != "en" {
255 t.Fatalf("put bio: %#v", put)
256 }
257
258 noredir := &http.Client{CheckRedirect: func(*http.Request, []*http.Request) error { return http.ErrUseLastResponse }}
259 res, err = noredir.Get(ts.URL + "/tim")
260 if err != nil {
261 t.Fatal(err)
262 }
263 loc := res.Header.Get("Location")
264 if res.StatusCode != http.StatusNotFound || loc != "" {
265 t.Fatalf("/tim is %d locatie %q", res.StatusCode, loc)
266 }
267 _ = res.Body.Close()
268 res, err = anon.Get(ts.URL + "/users/nobody")
269 if err != nil {
270 t.Fatal(err)
271 }
272 if res.StatusCode != http.StatusNotFound {
273 t.Fatalf("onbekend profiel %d", res.StatusCode)
274 }
275 _ = res.Body.Close()
276 _ = page
277}
278
279func repoID(t *testing.T, st *store.Store, owner, name string) int64 {
280 t.Helper()
281 repo, err := st.RepoByPath(context.Background(), owner, name)
282 if err != nil {
283 t.Fatal(err)
284 }
285 return repo.ID
286}
287
288func apiGet(t *testing.T, rawURL, token string) map[string]any {
289 t.Helper()
290 req, err := http.NewRequest(http.MethodGet, rawURL, nil)
291 if err != nil {
292 t.Fatal(err)
293 }
294 req.Header.Set("Authorization", "Bearer "+token)
295 res, err := http.DefaultClient.Do(req)
296 if err != nil {
297 t.Fatal(err)
298 }
299 body := decodeJSON(t, res)
300 if res.StatusCode != http.StatusOK {
301 t.Fatalf("api %s: %d %#v", rawURL, res.StatusCode, body)
302 }
303 return body
304}
305
306func decodeJSON(t *testing.T, res *http.Response) map[string]any {
307 t.Helper()
308 defer res.Body.Close()
309 var body map[string]any
310 if err := json.NewDecoder(res.Body).Decode(&body); err != nil {
311 t.Fatal(err)
312 }
313 return body
314}
315
316type pathSet map[string]bool
317
318func apiPaths(v any) pathSet {
319 out := pathSet{}
320 list, _ := v.([]any)
321 for _, item := range list {
322 row, _ := item.(map[string]any)
323 if p, ok := row["path"].(string); ok {
324 out[p] = true
325 }
326 }
327 return out
328}
329
330func (p pathSet) has(want ...string) bool {
331 for _, w := range want {
332 if !p[w] {
333 return false
334 }
335 }
336 return true
337}
internal/server/server.go +29 −18
@@ -99,6 +99,7 @@ func (s *Server) Handler() http.Handler {
99 99 mux.HandleFunc("POST /setup", s.setupSave)
100 100 mux.HandleFunc("GET /settings", s.account)
101 101 mux.HandleFunc("POST /settings/language", s.saveLanguage)
102 mux.HandleFunc("POST /settings/profile", s.saveProfile)
102 103 mux.HandleFunc("POST /settings/tokens", s.createToken)
103 104 mux.HandleFunc("POST /settings/tokens/delete", s.deleteToken)
104 105 mux.HandleFunc("POST /settings/ssh", s.addSSH)
@@ -608,6 +609,7 @@ type View struct {
608 609 Heat *activity.Calendar
609 610 Notes []NoteRow
610 611 Profile *store.User
612 Card *ProfileCard
611 613 DescHTML template.HTML
612 614 Timeline []TimelineItem
613 615 CompareFrom string
@@ -636,16 +638,25 @@ type RepoCard struct {
636 638 When string
637 639 }
638 640
641 // ProfileCard is het blok over een gebruiker, boven de activiteitenkalender.
642 type ProfileCard struct {
643 User store.User
644 Name, Since, Bio, URL string
645 Heading string
646 Repos, Groups, Contrib int
647 Own bool
648 }
649
639 650 // NoteRow is een reactie in de interface.
640 651 type NoteRow struct {
641 ID int64
642 Author, Body, When, Path string
643 Start, End int
644 HasSuggestion bool
645 ParentID int64
646 HTML template.HTML
647 Replies []NoteRow
648 At time.Time
652 ID int64
653 Author, AuthorURL, Body, When, Path string
654 Start, End int
655 HasSuggestion bool
656 ParentID int64
657 HTML template.HTML
658 Replies []NoteRow
659 At time.Time
649 660 }
650 661
651 662 // DiffFileView is één bestand in de merge-request-diff.
@@ -713,16 +724,16 @@ type BranchRow struct {
713 724
714 725 // TimelineItem is één gebeurtenis of reactie op een merge request.
715 726 type TimelineItem struct {
716 ID int64
717 Kind string
718 Actor, Text string
719 When string
720 Body string
721 HTML template.HTML
722 URL string
723 Replies []TimelineItem
724 At time.Time
725 Rank int
727 ID int64
728 Kind string
729 Actor, ActorURL, Text string
730 When string
731 Body string
732 HTML template.HTML
733 URL string
734 Replies []TimelineItem
735 At time.Time
736 Rank int
726 737 }
727 738
728 739 // HookView is een webhook plus de laatste pogingen.
@@ -99,6 +99,7 @@ func (s *Server) Handler() http.Handler {
99 mux.HandleFunc("POST /setup", s.setupSave)
99 mux.HandleFunc("POST /setup", s.setupSave)
100 mux.HandleFunc("GET /settings", s.account)
100 mux.HandleFunc("GET /settings", s.account)
101 mux.HandleFunc("POST /settings/language", s.saveLanguage)
101 mux.HandleFunc("POST /settings/language", s.saveLanguage)
102 mux.HandleFunc("POST /settings/profile", s.saveProfile)
102 mux.HandleFunc("POST /settings/tokens", s.createToken)
103 mux.HandleFunc("POST /settings/tokens", s.createToken)
103 mux.HandleFunc("POST /settings/tokens/delete", s.deleteToken)
104 mux.HandleFunc("POST /settings/tokens/delete", s.deleteToken)
104 mux.HandleFunc("POST /settings/ssh", s.addSSH)
105 mux.HandleFunc("POST /settings/ssh", s.addSSH)
@@ -608,6 +609,7 @@ type View struct {
608 Heat *activity.Calendar
609 Heat *activity.Calendar
609 Notes []NoteRow
610 Notes []NoteRow
610 Profile *store.User
611 Profile *store.User
612 Card *ProfileCard
611 DescHTML template.HTML
613 DescHTML template.HTML
612 Timeline []TimelineItem
614 Timeline []TimelineItem
613 CompareFrom string
615 CompareFrom string
@@ -636,16 +638,25 @@ type RepoCard struct {
636 When string
638 When string
637}
639}
638
640
641// ProfileCard is het blok over een gebruiker, boven de activiteitenkalender.
642type ProfileCard struct {
643 User store.User
644 Name, Since, Bio, URL string
645 Heading string
646 Repos, Groups, Contrib int
647 Own bool
648}
649
639// NoteRow is een reactie in de interface.
650// NoteRow is een reactie in de interface.
640type NoteRow struct {
651type NoteRow struct {
641 ID int64
652 ID int64
642 Author, Body, When, Path string
653 Author, AuthorURL, Body, When, Path string
643 Start, End int
654 Start, End int
644 HasSuggestion bool
655 HasSuggestion bool
645 ParentID int64
656 ParentID int64
646 HTML template.HTML
657 HTML template.HTML
647 Replies []NoteRow
658 Replies []NoteRow
648 At time.Time
659 At time.Time
649}
660}
650
661
651// DiffFileView is één bestand in de merge-request-diff.
662// DiffFileView is één bestand in de merge-request-diff.
@@ -713,16 +724,16 @@ type BranchRow struct {
713
724
714// TimelineItem is één gebeurtenis of reactie op een merge request.
725// TimelineItem is één gebeurtenis of reactie op een merge request.
715type TimelineItem struct {
726type TimelineItem struct {
716 ID int64
727 ID int64
717 Kind string
728 Kind string
718 Actor, Text string
729 Actor, ActorURL, Text string
719 When string
730 When string
720 Body string
731 Body string
721 HTML template.HTML
732 HTML template.HTML
722 URL string
733 URL string
723 Replies []TimelineItem
734 Replies []TimelineItem
724 At time.Time
735 At time.Time
725 Rank int
736 Rank int
726}
737}
727
738
728// HookView is een webhook plus de laatste pogingen.
739// HookView is een webhook plus de laatste pogingen.
internal/server/social.go +9 −1
@@ -390,8 +390,16 @@ func (s *Server) userCard(ctx context.Context, name, page, img, oem string) card
390 390 return card.Site(page, img, oem)
391 391 }
392 392 n, _ := s.Store.CountRepos(ctx, "user", u.ID, true)
393 title := u.Username
394 if name := strings.TrimSpace(u.DisplayName); name != "" {
395 title = name
396 }
397 desc := "Public profile"
398 if bio := strings.TrimSpace(u.Bio); bio != "" {
399 desc = card.Excerpt(bio, 180)
400 }
393 401 return card.Render{Meta: card.Meta{
394 Title: u.Username, Description: "Public profile", URL: page, Image: img, OEmbed: oem,
402 Title: title, Description: desc, URL: page, Image: img, OEmbed: oem,
395 403 Theme: "#1f6feb", Kind: "user", Facts: []string{repoLabel(n)}, Initial: u.Username,
396 404 }}
397 405 }
@@ -390,8 +390,16 @@ func (s *Server) userCard(ctx context.Context, name, page, img, oem string) card
390 return card.Site(page, img, oem)
390 return card.Site(page, img, oem)
391 }
391 }
392 n, _ := s.Store.CountRepos(ctx, "user", u.ID, true)
392 n, _ := s.Store.CountRepos(ctx, "user", u.ID, true)
393 title := u.Username
394 if name := strings.TrimSpace(u.DisplayName); name != "" {
395 title = name
396 }
397 desc := "Public profile"
398 if bio := strings.TrimSpace(u.Bio); bio != "" {
399 desc = card.Excerpt(bio, 180)
400 }
393 return card.Render{Meta: card.Meta{
401 return card.Render{Meta: card.Meta{
394 Title: u.Username, Description: "Public profile", URL: page, Image: img, OEmbed: oem,
402 Title: title, Description: desc, URL: page, Image: img, OEmbed: oem,
395 Theme: "#1f6feb", Kind: "user", Facts: []string{repoLabel(n)}, Initial: u.Username,
403 Theme: "#1f6feb", Kind: "user", Facts: []string{repoLabel(n)}, Initial: u.Username,
396 }}
404 }}
397}
405}
internal/server/static/float.js +44 −0
@@ -263,3 +263,47 @@
263 263 });
264 264 });
265 265 })();
266
267 (function () {
268 function copyNow(value) {
269 var area = document.createElement("textarea");
270 area.value = value;
271 area.setAttribute("readonly", "");
272 area.style.position = "fixed";
273 area.style.top = "0";
274 area.style.left = "0";
275 area.style.opacity = "0";
276 document.body.appendChild(area);
277 area.focus();
278 area.select();
279 var ok = false;
280 try {
281 ok = document.execCommand("copy");
282 } catch (e) {
283 ok = false;
284 }
285 document.body.removeChild(area);
286 return ok;
287 }
288 document.querySelectorAll("[data-copy]").forEach(function (btn) {
289 btn.addEventListener("click", function () {
290 var value = btn.getAttribute("data-copy") || "";
291 var shown = false;
292 function mark() {
293 if (shown) {
294 return;
295 }
296 shown = true;
297 var old = btn.textContent;
298 btn.textContent = document.body.getAttribute("data-copied") || "Copied";
299 setTimeout(function () { btn.textContent = old; }, 2500);
300 }
301 if (copyNow(value)) {
302 mark();
303 }
304 if (navigator.clipboard && window.isSecureContext) {
305 navigator.clipboard.writeText(value).then(mark).catch(function () {});
306 }
307 });
308 });
309 })();
@@ -263,3 +263,47 @@
263 });
263 });
264 });
264 });
265})();
265})();
266
267(function () {
268 function copyNow(value) {
269 var area = document.createElement("textarea");
270 area.value = value;
271 area.setAttribute("readonly", "");
272 area.style.position = "fixed";
273 area.style.top = "0";
274 area.style.left = "0";
275 area.style.opacity = "0";
276 document.body.appendChild(area);
277 area.focus();
278 area.select();
279 var ok = false;
280 try {
281 ok = document.execCommand("copy");
282 } catch (e) {
283 ok = false;
284 }
285 document.body.removeChild(area);
286 return ok;
287 }
288 document.querySelectorAll("[data-copy]").forEach(function (btn) {
289 btn.addEventListener("click", function () {
290 var value = btn.getAttribute("data-copy") || "";
291 var shown = false;
292 function mark() {
293 if (shown) {
294 return;
295 }
296 shown = true;
297 var old = btn.textContent;
298 btn.textContent = document.body.getAttribute("data-copied") || "Copied";
299 setTimeout(function () { btn.textContent = old; }, 2500);
300 }
301 if (copyNow(value)) {
302 mark();
303 }
304 if (navigator.clipboard && window.isSecureContext) {
305 navigator.clipboard.writeText(value).then(mark).catch(function () {});
306 }
307 });
308 });
309})();
internal/server/static/repo.js +0 −41
@@ -1,45 +1,4 @@
1 1 (function () {
2 function copyNow(value) {
3 var area = document.createElement("textarea");
4 area.value = value;
5 area.setAttribute("readonly", "");
6 area.style.position = "fixed";
7 area.style.top = "0";
8 area.style.left = "0";
9 area.style.opacity = "0";
10 document.body.appendChild(area);
11 area.focus();
12 area.select();
13 var ok = false;
14 try {
15 ok = document.execCommand("copy");
16 } catch (e) {
17 ok = false;
18 }
19 document.body.removeChild(area);
20 return ok;
21 }
22 document.querySelectorAll("[data-copy]").forEach(function (btn) {
23 btn.addEventListener("click", function () {
24 var value = btn.getAttribute("data-copy") || "";
25 var shown = false;
26 function mark() {
27 if (shown) {
28 return;
29 }
30 shown = true;
31 var old = btn.textContent;
32 btn.textContent = document.body.getAttribute("data-copied") || "Copied";
33 setTimeout(function () { btn.textContent = old; }, 1200);
34 }
35 if (copyNow(value)) {
36 mark();
37 }
38 if (navigator.clipboard && window.isSecureContext) {
39 navigator.clipboard.writeText(value).then(mark).catch(function () {});
40 }
41 });
42 });
43 2 document.querySelectorAll("select[data-rev]").forEach(function (sel) {
44 3 sel.addEventListener("change", function () {
45 4 var url = new URL(window.location.href);
@@ -1,45 +1,4 @@
1(function () {
1(function () {
2 function copyNow(value) {
3 var area = document.createElement("textarea");
4 area.value = value;
5 area.setAttribute("readonly", "");
6 area.style.position = "fixed";
7 area.style.top = "0";
8 area.style.left = "0";
9 area.style.opacity = "0";
10 document.body.appendChild(area);
11 area.focus();
12 area.select();
13 var ok = false;
14 try {
15 ok = document.execCommand("copy");
16 } catch (e) {
17 ok = false;
18 }
19 document.body.removeChild(area);
20 return ok;
21 }
22 document.querySelectorAll("[data-copy]").forEach(function (btn) {
23 btn.addEventListener("click", function () {
24 var value = btn.getAttribute("data-copy") || "";
25 var shown = false;
26 function mark() {
27 if (shown) {
28 return;
29 }
30 shown = true;
31 var old = btn.textContent;
32 btn.textContent = document.body.getAttribute("data-copied") || "Copied";
33 setTimeout(function () { btn.textContent = old; }, 1200);
34 }
35 if (copyNow(value)) {
36 mark();
37 }
38 if (navigator.clipboard && window.isSecureContext) {
39 navigator.clipboard.writeText(value).then(mark).catch(function () {});
40 }
41 });
42 });
43 document.querySelectorAll("select[data-rev]").forEach(function (sel) {
2 document.querySelectorAll("select[data-rev]").forEach(function (sel) {
44 sel.addEventListener("change", function () {
3 sel.addEventListener("change", function () {
45 var url = new URL(window.location.href);
4 var url = new URL(window.location.href);
internal/server/static/style.css +16 −0
@@ -236,6 +236,20 @@ td, th { text-align: left; padding: var(--sp-2) var(--sp-3); border-bottom: 1px
236 236 }
237 237 img.avatar { object-fit: cover; display: block; }
238 238 .avatar.lg { width: 64px; height: 64px; font-size: 1.35rem; }
239 .avatar.xl { width: 96px; height: 96px; font-size: 2rem; }
240 a.avatarlink { display: inline-grid; color: inherit; text-decoration: none; line-height: 0; }
241 a.avatarlink:hover { text-decoration: none; }
242 .usercard {
243 display: grid; grid-template-columns: auto minmax(0, 1fr) auto;
244 gap: 1.1rem; align-items: start; margin: 0.4rem 0 1.1rem;
245 }
246 .usercard h1, .usercard h2 { margin: 0; }
247 .usercard .handle { margin: 0.15rem 0 0.35rem; color: var(--muted); }
248 .usercard .bio { margin: 0.15rem 0 0.4rem; white-space: pre-wrap; }
249 .usercounts { display: flex; flex-wrap: wrap; gap: 0.4rem 1.15rem; list-style: none; padding: 0; margin: 0.55rem 0 0; }
250 .usercounts li { display: flex; flex-direction: column; min-width: 5.5rem; }
251 .usercounts strong { font-size: 1.15rem; line-height: 1.2; }
252 .usercard-actions { display: flex; flex-direction: column; gap: 0.45rem; align-items: stretch; }
239 253 .commitwho a { color: var(--ink); font-weight: 650; text-decoration: none; }
240 254 .commitwho a:hover { text-decoration: underline; }
241 255 ul.clean li.commitline { display: flex; gap: 0.65rem; align-items: center; }
@@ -908,6 +922,8 @@ form.wh .grid-2 label { margin-top: 0; }
908 922 .heat-foot { flex-direction: column; align-items: flex-start; }
909 923 .heat-legend, .heat-foot .muted { justify-content: flex-start; text-align: left; }
910 924 .repolist > li { flex-wrap: wrap; }
925 .usercard { grid-template-columns: auto minmax(0, 1fr); }
926 .usercard-actions { grid-column: 1 / -1; flex-direction: row; flex-wrap: wrap; }
911 927 .pagehead { align-items: flex-start; }
912 928 .pageacts { flex-wrap: wrap; justify-content: flex-end; }
913 929 }
@@ -236,6 +236,20 @@ td, th { text-align: left; padding: var(--sp-2) var(--sp-3); border-bottom: 1px
236}
236}
237img.avatar { object-fit: cover; display: block; }
237img.avatar { object-fit: cover; display: block; }
238.avatar.lg { width: 64px; height: 64px; font-size: 1.35rem; }
238.avatar.lg { width: 64px; height: 64px; font-size: 1.35rem; }
239.avatar.xl { width: 96px; height: 96px; font-size: 2rem; }
240a.avatarlink { display: inline-grid; color: inherit; text-decoration: none; line-height: 0; }
241a.avatarlink:hover { text-decoration: none; }
242.usercard {
243 display: grid; grid-template-columns: auto minmax(0, 1fr) auto;
244 gap: 1.1rem; align-items: start; margin: 0.4rem 0 1.1rem;
245}
246.usercard h1, .usercard h2 { margin: 0; }
247.usercard .handle { margin: 0.15rem 0 0.35rem; color: var(--muted); }
248.usercard .bio { margin: 0.15rem 0 0.4rem; white-space: pre-wrap; }
249.usercounts { display: flex; flex-wrap: wrap; gap: 0.4rem 1.15rem; list-style: none; padding: 0; margin: 0.55rem 0 0; }
250.usercounts li { display: flex; flex-direction: column; min-width: 5.5rem; }
251.usercounts strong { font-size: 1.15rem; line-height: 1.2; }
252.usercard-actions { display: flex; flex-direction: column; gap: 0.45rem; align-items: stretch; }
239.commitwho a { color: var(--ink); font-weight: 650; text-decoration: none; }
253.commitwho a { color: var(--ink); font-weight: 650; text-decoration: none; }
240.commitwho a:hover { text-decoration: underline; }
254.commitwho a:hover { text-decoration: underline; }
241ul.clean li.commitline { display: flex; gap: 0.65rem; align-items: center; }
255ul.clean li.commitline { display: flex; gap: 0.65rem; align-items: center; }
@@ -908,6 +922,8 @@ form.wh .grid-2 label { margin-top: 0; }
908 .heat-foot { flex-direction: column; align-items: flex-start; }
922 .heat-foot { flex-direction: column; align-items: flex-start; }
909 .heat-legend, .heat-foot .muted { justify-content: flex-start; text-align: left; }
923 .heat-legend, .heat-foot .muted { justify-content: flex-start; text-align: left; }
910 .repolist > li { flex-wrap: wrap; }
924 .repolist > li { flex-wrap: wrap; }
925 .usercard { grid-template-columns: auto minmax(0, 1fr); }
926 .usercard-actions { grid-column: 1 / -1; flex-direction: row; flex-wrap: wrap; }
911 .pagehead { align-items: flex-start; }
927 .pagehead { align-items: flex-start; }
912 .pageacts { flex-wrap: wrap; justify-content: flex-end; }
928 .pageacts { flex-wrap: wrap; justify-content: flex-end; }
913}
929}
internal/server/suggest.go +5 −1
@@ -26,8 +26,12 @@ func buildNoteRows(notes []store.Note, lang i18n.Lang, opt noteRender) []NoteRow
26 26 rows := make([]NoteRow, len(notes))
27 27 index := map[int64]int{}
28 28 for i, n := range notes {
29 url := ""
30 if n.AuthorID != 0 && n.Author != "" {
31 url = "/users/" + n.Author
32 }
29 33 rows[i] = NoteRow{
30 ID: n.ID, Author: n.Author, Body: n.Body, Path: n.FilePath,
34 ID: n.ID, Author: n.Author, AuthorURL: url, Body: n.Body, Path: n.FilePath,
31 35 Start: n.LineStart, End: n.LineEnd, HasSuggestion: n.Suggestion != "",
32 36 When: i18n.FormatDate(lang, n.CreatedAt), At: n.CreatedAt, ParentID: n.ParentID,
33 37 HTML: template.HTML(markdown.RenderTasks(n.Body, "", "", opt.RepoPath, markdown.Tasks{
@@ -26,8 +26,12 @@ func buildNoteRows(notes []store.Note, lang i18n.Lang, opt noteRender) []NoteRow
26 rows := make([]NoteRow, len(notes))
26 rows := make([]NoteRow, len(notes))
27 index := map[int64]int{}
27 index := map[int64]int{}
28 for i, n := range notes {
28 for i, n := range notes {
29 url := ""
30 if n.AuthorID != 0 && n.Author != "" {
31 url = "/users/" + n.Author
32 }
29 rows[i] = NoteRow{
33 rows[i] = NoteRow{
30 ID: n.ID, Author: n.Author, Body: n.Body, Path: n.FilePath,
34 ID: n.ID, Author: n.Author, AuthorURL: url, Body: n.Body, Path: n.FilePath,
31 Start: n.LineStart, End: n.LineEnd, HasSuggestion: n.Suggestion != "",
35 Start: n.LineStart, End: n.LineEnd, HasSuggestion: n.Suggestion != "",
32 When: i18n.FormatDate(lang, n.CreatedAt), At: n.CreatedAt, ParentID: n.ParentID,
36 When: i18n.FormatDate(lang, n.CreatedAt), At: n.CreatedAt, ParentID: n.ParentID,
33 HTML: template.HTML(markdown.RenderTasks(n.Body, "", "", opt.RepoPath, markdown.Tasks{
37 HTML: template.HTML(markdown.RenderTasks(n.Body, "", "", opt.RepoPath, markdown.Tasks{
internal/server/templates/collab.html +9 −9
@@ -23,7 +23,7 @@
23 23 <span class="pill">{{.MR.Status}}</span>
24 24 {{if .MR.Draft}}<span class="pill">{{t "mr.draft"}}</span>{{end}}
25 25 {{range .Labels}}<span class="pill">{{.}}</span>{{end}}
26 {{.MR.SourceBranch}} → {{.MR.TargetBranch}} · {{.MR.Author}}
26 {{.MR.SourceBranch}} → {{.MR.TargetBranch}} · {{if .MR.Author}}<a href="/users/{{.MR.Author}}">{{.MR.Author}}</a>{{end}}
27 27 </p>
28 28 <h2>{{t "mr.pipeline"}}</h2>
29 29 {{if .MRPipe}}
@@ -83,7 +83,7 @@
83 83 {{end}}
84 84 <h2>{{t "rev.title"}}</h2>
85 85 <ul class="clean">
86 {{range .Reviews}}<li><strong>{{.Username}}</strong> <span class="pill">{{.Label}}</span>
86 {{range .Reviews}}<li><strong><a href="/users/{{.Username}}">{{.Username}}</a></strong> <span class="pill">{{.Label}}</span>
87 87 {{if and $.CanDismiss (or (eq .Status "changes") (eq .Status "rejected"))}}
88 88 <form method="post" action="/{{$.Repo.FullPath}}/-/merge-requests/{{$.MR.Number}}/reviews/dismiss">
89 89 <input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="user_id" value="{{.UserID}}">
@@ -124,12 +124,12 @@
124 124 <ol class="timeline">
125 125 {{range .Timeline}}
126 126 <li>
127 {{if .Actor}}<strong>{{.Actor}}</strong>{{end}}
127 {{if .Actor}}{{if .ActorURL}}<a href="{{.ActorURL}}"><strong>{{.Actor}}</strong></a>{{else}}<strong>{{.Actor}}</strong>{{end}}{{end}}
128 128 {{if .URL}}<a href="{{.URL}}">{{.Text}}</a>{{else}}{{.Text}}{{end}}
129 129 <span class="muted">{{.When}}</span>
130 130 {{if .Body}}<pre class="pushlist">{{.Body}}</pre>{{end}}
131 131 {{if .HTML}}<div class="mdbody">{{.HTML}}</div>{{end}}
132 {{range .Replies}}<div class="reply"><strong>{{.Actor}}</strong> <span class="muted">{{.When}}</span><div class="mdbody">{{.HTML}}</div></div>{{end}}
132 {{range .Replies}}<div class="reply">{{if .ActorURL}}<a href="{{.ActorURL}}"><strong>{{.Actor}}</strong></a>{{else}}<strong>{{.Actor}}</strong>{{end}} <span class="muted">{{.When}}</span><div class="mdbody">{{.HTML}}</div></div>{{end}}
133 133 {{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}}
134 134 </li>
135 135 {{end}}
@@ -278,10 +278,10 @@
278 278 {{if .Ref}}<a class="chip" href="/{{$.Repo.FullPath}}/-/commits?rev={{.Ref}}"><svg class="ico" viewBox="0 0 16 16" aria-hidden="true">{{if eq .RefKind "tag"}}<path d="M2.2 2.2h5.2l6.2 6.2-5.2 5.2-6.2-6.2V2.2z" fill="none" stroke="currentColor" stroke-width="1.3"/><circle cx="5.2" cy="5.2" r="1" fill="currentColor"/>{{else}}<circle cx="4" cy="3.2" r="1.5" fill="currentColor"/><circle cx="4" cy="12.8" r="1.5" fill="currentColor"/><circle cx="12" cy="6.4" r="1.5" fill="currentColor"/><path d="M4 4.7v6.6M4 6.4c2.4 0 4.2.2 6 .2 1.2 0 2 1 2 1.8" fill="none" stroke="currentColor" stroke-width="1.3"/>{{end}}</svg>{{.Ref}}</a>{{end}}
279 279 {{if .Short}}<a class="chip" href="/{{$.Repo.FullPath}}/-/commit/{{.SHA}}"><svg class="ico" viewBox="0 0 16 16" aria-hidden="true"><circle cx="8" cy="8" r="2.1" fill="currentColor"/><path d="M8 1.8v3.4M8 10.8v3.4" stroke="currentColor" stroke-width="1.4"/></svg>{{.Short}}</a>{{end}}
280 280 {{if .SourceLabel}}<span class="chip">{{.SourceLabel}}{{if .MRNumber}} !{{.MRNumber}}{{end}}</span>{{end}}
281 {{if .Actor}}{{if .Avatar}}<img class="avatar sm" src="{{.Avatar}}" alt="">{{else}}<span class="avatar sm">{{.Initial}}</span>{{end}}{{end}}
281 {{if .Actor}}{{if .ActorURL}}<a class="avatarlink" href="{{.ActorURL}}">{{end}}{{if .Avatar}}<img class="avatar sm" src="{{.Avatar}}" alt="">{{else}}<span class="avatar sm">{{.Initial}}</span>{{end}}{{if .ActorURL}}</a>{{end}}{{end}}
282 282 </div>
283 283 </td>
284 <td>{{if .Actor}}{{if .Avatar}}<img class="avatar" src="{{.Avatar}}" alt="{{.Actor}}">{{else}}<span class="avatar">{{.Initial}}</span>{{end}}{{end}}</td>
284 <td>{{if .Actor}}{{if .ActorURL}}<a class="avatarlink" href="{{.ActorURL}}">{{end}}{{if .Avatar}}<img class="avatar" src="{{.Avatar}}" alt="{{.Actor}}">{{else}}<span class="avatar">{{.Initial}}</span>{{end}}{{if .ActorURL}}</a>{{end}}{{end}}</td>
285 285 <td>
286 286 <div class="stages">
287 287 {{range .Stages}}
@@ -307,7 +307,7 @@
307 307 {{template "pipenav" $}}
308 308 {{with .JobPage}}
309 309 {{$page := .}}
310 <p class="jobhead"><span class="status {{.Status}}" data-job-status><span class="mark"></span><span data-job-label>{{.Label}}</span></span>{{if .Queue}} <span class="queue" data-queue>{{.Queue}}</span>{{end}} <span class="muted">{{t "pipe.started"}} {{.When}} {{t "pipe.by"}}</span> {{if .Avatar}}<img class="avatar sm" src="{{.Avatar}}" alt="">{{else if .Actor}}<span class="avatar sm">{{.Initial}}</span>{{end}} <strong>{{.Actor}}</strong></p>
310 <p class="jobhead"><span class="status {{.Status}}" data-job-status><span class="mark"></span><span data-job-label>{{.Label}}</span></span>{{if .Queue}} <span class="queue" data-queue>{{.Queue}}</span>{{end}} <span class="muted">{{t "pipe.started"}} {{.When}} {{t "pipe.by"}}</span> {{if .ActorURL}}<a class="avatarlink" href="{{.ActorURL}}">{{end}}{{if .Avatar}}<img class="avatar sm" src="{{.Avatar}}" alt="">{{else if .Actor}}<span class="avatar sm">{{.Initial}}</span>{{end}} <strong>{{.Actor}}</strong>{{if .ActorURL}}</a>{{end}}</p>
311 311 <div class="joblayout">
312 312 <section class="console-wrap" data-console data-log-url="/{{$.Repo.FullPath}}/-/pipelines/{{.Pipe.ID}}/jobs/{{.Job.ID}}/log" data-offset="{{.LogBytes}}" data-running="{{if .Running}}1{{end}}">
313 313 <div class="conbar">
@@ -485,7 +485,7 @@
485 485 </div>
486 486 </form>
487 487 <ul class="clean">
488 {{range .Members}}<li>{{.Username}} · {{roleName .Role}} {{if .Pending}}<span class="pill">{{t "set.pending"}}</span>{{end}}
488 {{range .Members}}<li>{{if and (not .Pending) .UserID}}<a href="/users/{{.Username}}">{{.Username}}</a>{{else}}{{.Username}}{{end}} · {{roleName .Role}} {{if .Pending}}<span class="pill">{{t "set.pending"}}</span>{{end}}
489 489 {{if not .Pending}}<form method="post" action="/{{$.Repo.FullPath}}/-/members/remove"><input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="username" value="{{.Username}}"><button class="ghost" type="submit">{{t "action.remove"}}</button></form>{{end}}
490 490 </li>{{end}}
491 491 </ul>
@@ -740,7 +740,7 @@
740 740 </div>
741 741 </form>
742 742 {{end}}
743 <ul class="clean">{{range .Members}}<li>{{.Username}} · {{roleName .Role}} {{if eq .UserID $.Group.OwnerID}}<span class="pill">{{t "group.owner"}}</span>{{end}} {{if .Pending}}<span class="pill">{{t "set.pending"}}</span>{{end}}
743 <ul class="clean">{{range .Members}}<li>{{if and (not .Pending) .UserID}}<a href="/users/{{.Username}}">{{.Username}}</a>{{else}}{{.Username}}{{end}} · {{roleName .Role}} {{if eq .UserID $.Group.OwnerID}}<span class="pill">{{t "group.owner"}}</span>{{end}} {{if .Pending}}<span class="pill">{{t "set.pending"}}</span>{{end}}
744 744 {{if and $.CanAdmin (not .Pending) (ne .UserID $.Group.OwnerID)}}<form method="post" action="/groups/{{$.Group.Path}}/members/remove"><input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="username" value="{{.Username}}"><button class="ghost" type="submit">{{t "action.remove"}}</button></form>{{end}}
745 745 </li>{{end}}</ul>
746 746 {{else if eq .Tab "settings"}}
@@ -23,7 +23,7 @@
23 <span class="pill">{{.MR.Status}}</span>
23 <span class="pill">{{.MR.Status}}</span>
24 {{if .MR.Draft}}<span class="pill">{{t "mr.draft"}}</span>{{end}}
24 {{if .MR.Draft}}<span class="pill">{{t "mr.draft"}}</span>{{end}}
25 {{range .Labels}}<span class="pill">{{.}}</span>{{end}}
25 {{range .Labels}}<span class="pill">{{.}}</span>{{end}}
26 {{.MR.SourceBranch}} → {{.MR.TargetBranch}} · {{.MR.Author}}
26 {{.MR.SourceBranch}} → {{.MR.TargetBranch}} · {{if .MR.Author}}<a href="/users/{{.MR.Author}}">{{.MR.Author}}</a>{{end}}
27</p>
27</p>
28<h2>{{t "mr.pipeline"}}</h2>
28<h2>{{t "mr.pipeline"}}</h2>
29{{if .MRPipe}}
29{{if .MRPipe}}
@@ -83,7 +83,7 @@
83{{end}}
83{{end}}
84<h2>{{t "rev.title"}}</h2>
84<h2>{{t "rev.title"}}</h2>
85<ul class="clean">
85<ul class="clean">
86 {{range .Reviews}}<li><strong>{{.Username}}</strong> <span class="pill">{{.Label}}</span>
86 {{range .Reviews}}<li><strong><a href="/users/{{.Username}}">{{.Username}}</a></strong> <span class="pill">{{.Label}}</span>
87 {{if and $.CanDismiss (or (eq .Status "changes") (eq .Status "rejected"))}}
87 {{if and $.CanDismiss (or (eq .Status "changes") (eq .Status "rejected"))}}
88 <form method="post" action="/{{$.Repo.FullPath}}/-/merge-requests/{{$.MR.Number}}/reviews/dismiss">
88 <form method="post" action="/{{$.Repo.FullPath}}/-/merge-requests/{{$.MR.Number}}/reviews/dismiss">
89 <input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="user_id" value="{{.UserID}}">
89 <input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="user_id" value="{{.UserID}}">
@@ -124,12 +124,12 @@
124 <ol class="timeline">
124 <ol class="timeline">
125 {{range .Timeline}}
125 {{range .Timeline}}
126 <li>
126 <li>
127 {{if .Actor}}<strong>{{.Actor}}</strong>{{end}}
127 {{if .Actor}}{{if .ActorURL}}<a href="{{.ActorURL}}"><strong>{{.Actor}}</strong></a>{{else}}<strong>{{.Actor}}</strong>{{end}}{{end}}
128 {{if .URL}}<a href="{{.URL}}">{{.Text}}</a>{{else}}{{.Text}}{{end}}
128 {{if .URL}}<a href="{{.URL}}">{{.Text}}</a>{{else}}{{.Text}}{{end}}
129 <span class="muted">{{.When}}</span>
129 <span class="muted">{{.When}}</span>
130 {{if .Body}}<pre class="pushlist">{{.Body}}</pre>{{end}}
130 {{if .Body}}<pre class="pushlist">{{.Body}}</pre>{{end}}
131 {{if .HTML}}<div class="mdbody">{{.HTML}}</div>{{end}}
131 {{if .HTML}}<div class="mdbody">{{.HTML}}</div>{{end}}
132 {{range .Replies}}<div class="reply"><strong>{{.Actor}}</strong> <span class="muted">{{.When}}</span><div class="mdbody">{{.HTML}}</div></div>{{end}}
132 {{range .Replies}}<div class="reply">{{if .ActorURL}}<a href="{{.ActorURL}}"><strong>{{.Actor}}</strong></a>{{else}}<strong>{{.Actor}}</strong>{{end}} <span class="muted">{{.When}}</span><div class="mdbody">{{.HTML}}</div></div>{{end}}
133 {{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}}
133 {{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}}
134 </li>
134 </li>
135 {{end}}
135 {{end}}
@@ -278,10 +278,10 @@
278 {{if .Ref}}<a class="chip" href="/{{$.Repo.FullPath}}/-/commits?rev={{.Ref}}"><svg class="ico" viewBox="0 0 16 16" aria-hidden="true">{{if eq .RefKind "tag"}}<path d="M2.2 2.2h5.2l6.2 6.2-5.2 5.2-6.2-6.2V2.2z" fill="none" stroke="currentColor" stroke-width="1.3"/><circle cx="5.2" cy="5.2" r="1" fill="currentColor"/>{{else}}<circle cx="4" cy="3.2" r="1.5" fill="currentColor"/><circle cx="4" cy="12.8" r="1.5" fill="currentColor"/><circle cx="12" cy="6.4" r="1.5" fill="currentColor"/><path d="M4 4.7v6.6M4 6.4c2.4 0 4.2.2 6 .2 1.2 0 2 1 2 1.8" fill="none" stroke="currentColor" stroke-width="1.3"/>{{end}}</svg>{{.Ref}}</a>{{end}}
278 {{if .Ref}}<a class="chip" href="/{{$.Repo.FullPath}}/-/commits?rev={{.Ref}}"><svg class="ico" viewBox="0 0 16 16" aria-hidden="true">{{if eq .RefKind "tag"}}<path d="M2.2 2.2h5.2l6.2 6.2-5.2 5.2-6.2-6.2V2.2z" fill="none" stroke="currentColor" stroke-width="1.3"/><circle cx="5.2" cy="5.2" r="1" fill="currentColor"/>{{else}}<circle cx="4" cy="3.2" r="1.5" fill="currentColor"/><circle cx="4" cy="12.8" r="1.5" fill="currentColor"/><circle cx="12" cy="6.4" r="1.5" fill="currentColor"/><path d="M4 4.7v6.6M4 6.4c2.4 0 4.2.2 6 .2 1.2 0 2 1 2 1.8" fill="none" stroke="currentColor" stroke-width="1.3"/>{{end}}</svg>{{.Ref}}</a>{{end}}
279 {{if .Short}}<a class="chip" href="/{{$.Repo.FullPath}}/-/commit/{{.SHA}}"><svg class="ico" viewBox="0 0 16 16" aria-hidden="true"><circle cx="8" cy="8" r="2.1" fill="currentColor"/><path d="M8 1.8v3.4M8 10.8v3.4" stroke="currentColor" stroke-width="1.4"/></svg>{{.Short}}</a>{{end}}
279 {{if .Short}}<a class="chip" href="/{{$.Repo.FullPath}}/-/commit/{{.SHA}}"><svg class="ico" viewBox="0 0 16 16" aria-hidden="true"><circle cx="8" cy="8" r="2.1" fill="currentColor"/><path d="M8 1.8v3.4M8 10.8v3.4" stroke="currentColor" stroke-width="1.4"/></svg>{{.Short}}</a>{{end}}
280 {{if .SourceLabel}}<span class="chip">{{.SourceLabel}}{{if .MRNumber}} !{{.MRNumber}}{{end}}</span>{{end}}
280 {{if .SourceLabel}}<span class="chip">{{.SourceLabel}}{{if .MRNumber}} !{{.MRNumber}}{{end}}</span>{{end}}
281 {{if .Actor}}{{if .Avatar}}<img class="avatar sm" src="{{.Avatar}}" alt="">{{else}}<span class="avatar sm">{{.Initial}}</span>{{end}}{{end}}
281 {{if .Actor}}{{if .ActorURL}}<a class="avatarlink" href="{{.ActorURL}}">{{end}}{{if .Avatar}}<img class="avatar sm" src="{{.Avatar}}" alt="">{{else}}<span class="avatar sm">{{.Initial}}</span>{{end}}{{if .ActorURL}}</a>{{end}}{{end}}
282 </div>
282 </div>
283 </td>
283 </td>
284 <td>{{if .Actor}}{{if .Avatar}}<img class="avatar" src="{{.Avatar}}" alt="{{.Actor}}">{{else}}<span class="avatar">{{.Initial}}</span>{{end}}{{end}}</td>
284 <td>{{if .Actor}}{{if .ActorURL}}<a class="avatarlink" href="{{.ActorURL}}">{{end}}{{if .Avatar}}<img class="avatar" src="{{.Avatar}}" alt="{{.Actor}}">{{else}}<span class="avatar">{{.Initial}}</span>{{end}}{{if .ActorURL}}</a>{{end}}{{end}}</td>
285 <td>
285 <td>
286 <div class="stages">
286 <div class="stages">
287 {{range .Stages}}
287 {{range .Stages}}
@@ -307,7 +307,7 @@
307{{template "pipenav" $}}
307{{template "pipenav" $}}
308{{with .JobPage}}
308{{with .JobPage}}
309{{$page := .}}
309{{$page := .}}
310<p class="jobhead"><span class="status {{.Status}}" data-job-status><span class="mark"></span><span data-job-label>{{.Label}}</span></span>{{if .Queue}} <span class="queue" data-queue>{{.Queue}}</span>{{end}} <span class="muted">{{t "pipe.started"}} {{.When}} {{t "pipe.by"}}</span> {{if .Avatar}}<img class="avatar sm" src="{{.Avatar}}" alt="">{{else if .Actor}}<span class="avatar sm">{{.Initial}}</span>{{end}} <strong>{{.Actor}}</strong></p>
310<p class="jobhead"><span class="status {{.Status}}" data-job-status><span class="mark"></span><span data-job-label>{{.Label}}</span></span>{{if .Queue}} <span class="queue" data-queue>{{.Queue}}</span>{{end}} <span class="muted">{{t "pipe.started"}} {{.When}} {{t "pipe.by"}}</span> {{if .ActorURL}}<a class="avatarlink" href="{{.ActorURL}}">{{end}}{{if .Avatar}}<img class="avatar sm" src="{{.Avatar}}" alt="">{{else if .Actor}}<span class="avatar sm">{{.Initial}}</span>{{end}} <strong>{{.Actor}}</strong>{{if .ActorURL}}</a>{{end}}</p>
311<div class="joblayout">
311<div class="joblayout">
312 <section class="console-wrap" data-console data-log-url="/{{$.Repo.FullPath}}/-/pipelines/{{.Pipe.ID}}/jobs/{{.Job.ID}}/log" data-offset="{{.LogBytes}}" data-running="{{if .Running}}1{{end}}">
312 <section class="console-wrap" data-console data-log-url="/{{$.Repo.FullPath}}/-/pipelines/{{.Pipe.ID}}/jobs/{{.Job.ID}}/log" data-offset="{{.LogBytes}}" data-running="{{if .Running}}1{{end}}">
313 <div class="conbar">
313 <div class="conbar">
@@ -485,7 +485,7 @@
485 </div>
485 </div>
486</form>
486</form>
487<ul class="clean">
487<ul class="clean">
488 {{range .Members}}<li>{{.Username}} · {{roleName .Role}} {{if .Pending}}<span class="pill">{{t "set.pending"}}</span>{{end}}
488 {{range .Members}}<li>{{if and (not .Pending) .UserID}}<a href="/users/{{.Username}}">{{.Username}}</a>{{else}}{{.Username}}{{end}} · {{roleName .Role}} {{if .Pending}}<span class="pill">{{t "set.pending"}}</span>{{end}}
489 {{if not .Pending}}<form method="post" action="/{{$.Repo.FullPath}}/-/members/remove"><input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="username" value="{{.Username}}"><button class="ghost" type="submit">{{t "action.remove"}}</button></form>{{end}}
489 {{if not .Pending}}<form method="post" action="/{{$.Repo.FullPath}}/-/members/remove"><input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="username" value="{{.Username}}"><button class="ghost" type="submit">{{t "action.remove"}}</button></form>{{end}}
490 </li>{{end}}
490 </li>{{end}}
491</ul>
491</ul>
@@ -740,7 +740,7 @@
740 </div>
740 </div>
741</form>
741</form>
742{{end}}
742{{end}}
743<ul class="clean">{{range .Members}}<li>{{.Username}} · {{roleName .Role}} {{if eq .UserID $.Group.OwnerID}}<span class="pill">{{t "group.owner"}}</span>{{end}} {{if .Pending}}<span class="pill">{{t "set.pending"}}</span>{{end}}
743<ul class="clean">{{range .Members}}<li>{{if and (not .Pending) .UserID}}<a href="/users/{{.Username}}">{{.Username}}</a>{{else}}{{.Username}}{{end}} · {{roleName .Role}} {{if eq .UserID $.Group.OwnerID}}<span class="pill">{{t "group.owner"}}</span>{{end}} {{if .Pending}}<span class="pill">{{t "set.pending"}}</span>{{end}}
744 {{if and $.CanAdmin (not .Pending) (ne .UserID $.Group.OwnerID)}}<form method="post" action="/groups/{{$.Group.Path}}/members/remove"><input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="username" value="{{.Username}}"><button class="ghost" type="submit">{{t "action.remove"}}</button></form>{{end}}
744 {{if and $.CanAdmin (not .Pending) (ne .UserID $.Group.OwnerID)}}<form method="post" action="/groups/{{$.Group.Path}}/members/remove"><input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="username" value="{{.Username}}"><button class="ghost" type="submit">{{t "action.remove"}}</button></form>{{end}}
745</li>{{end}}</ul>
745</li>{{end}}</ul>
746{{else if eq .Tab "settings"}}
746{{else if eq .Tab "settings"}}
internal/server/templates/commit.html +2 −2
@@ -88,10 +88,10 @@
88 88 </div>
89 89 {{if $.CanComment}}{{range .Notes}}
90 90 <article class="linenote" id="note-{{.ID}}">
91 <strong>{{.Author}}</strong> <span class="muted">{{.When}}</span>
91 {{if .AuthorURL}}<a href="{{.AuthorURL}}"><strong>{{.Author}}</strong></a>{{else}}<strong>{{.Author}}</strong>{{end}} <span class="muted">{{.When}}</span>
92 92 <div class="mdbody">{{.HTML}}</div>
93 93 {{if and $.CanApply .HasSuggestion}}<label class="sugcheck"><input type="checkbox" data-suggestion="{{.ID}}"> {{t "sug.include"}}</label>{{end}}
94 {{range .Replies}}<div class="reply"><strong>{{.Author}}</strong> <span class="muted">{{.When}}</span><div class="mdbody">{{.HTML}}</div></div>{{end}}
94 {{range .Replies}}<div class="reply">{{if .AuthorURL}}<a href="{{.AuthorURL}}"><strong>{{.Author}}</strong></a>{{else}}<strong>{{.Author}}</strong>{{end}} <span class="muted">{{.When}}</span><div class="mdbody">{{.HTML}}</div></div>{{end}}
95 95 </article>
96 96 {{end}}{{end}}
97 97 {{end}}
@@ -88,10 +88,10 @@
88 </div>
88 </div>
89 {{if $.CanComment}}{{range .Notes}}
89 {{if $.CanComment}}{{range .Notes}}
90 <article class="linenote" id="note-{{.ID}}">
90 <article class="linenote" id="note-{{.ID}}">
91 <strong>{{.Author}}</strong> <span class="muted">{{.When}}</span>
91 {{if .AuthorURL}}<a href="{{.AuthorURL}}"><strong>{{.Author}}</strong></a>{{else}}<strong>{{.Author}}</strong>{{end}} <span class="muted">{{.When}}</span>
92 <div class="mdbody">{{.HTML}}</div>
92 <div class="mdbody">{{.HTML}}</div>
93 {{if and $.CanApply .HasSuggestion}}<label class="sugcheck"><input type="checkbox" data-suggestion="{{.ID}}"> {{t "sug.include"}}</label>{{end}}
93 {{if and $.CanApply .HasSuggestion}}<label class="sugcheck"><input type="checkbox" data-suggestion="{{.ID}}"> {{t "sug.include"}}</label>{{end}}
94 {{range .Replies}}<div class="reply"><strong>{{.Author}}</strong> <span class="muted">{{.When}}</span><div class="mdbody">{{.HTML}}</div></div>{{end}}
94 {{range .Replies}}<div class="reply">{{if .AuthorURL}}<a href="{{.AuthorURL}}"><strong>{{.Author}}</strong></a>{{else}}<strong>{{.Author}}</strong>{{end}} <span class="muted">{{.When}}</span><div class="mdbody">{{.HTML}}</div></div>{{end}}
95 </article>
95 </article>
96 {{end}}{{end}}
96 {{end}}{{end}}
97 {{end}}
97 {{end}}
internal/server/templates/issues.html +3 −3
@@ -26,7 +26,7 @@
26 26 {{if eq .Status "closed"}}<span class="pill">{{t "issue.closed"}}</span>{{else}}<span class="pill">{{t "issue.open"}}</span>{{end}}
27 27 {{if .Confidential}}<span class="pill">{{t "issue.confidential"}}</span>{{end}}
28 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>
29 <span class="muted">{{if .AuthorURL}}<a href="{{.AuthorURL}}">{{.Author}}</a>{{else}}{{.Author}}{{end}}{{if .Assignees}} · {{.Assignees}}{{end}}{{if .Milestone}} · {{.Milestone}}{{end}}{{if .Due}} · {{.Due}}{{end}}</span>
30 30 </li>
31 31 {{else}}
32 32 <li class="muted">{{t "issue.none"}}</li>
@@ -112,7 +112,7 @@
112 112 {{if eq .Issues.One.Status "closed"}}<span class="pill">{{t "issue.closed"}}</span>{{else}}<span class="pill">{{t "issue.open"}}</span>{{end}}
113 113 {{if .Issues.One.Confidential}}<span class="pill">{{t "issue.confidential"}}</span>{{end}}
114 114 {{range .Issues.One.Labels}}<span class="lab" style="background:{{.Color}}">{{.Name}}</span>{{end}}
115 <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>
115 <span class="muted">{{t "issue.by"}} {{if .Issues.One.AuthorURL}}<a href="{{.Issues.One.AuthorURL}}">{{.Issues.One.Author}}</a>{{else}}{{.Issues.One.Author}}{{end}}{{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>
116 116 </p>
117 117 <div class="mdbody">{{.Issues.One.HTML}}</div>
118 118 {{if .Issues.Related}}
@@ -171,7 +171,7 @@
171 171 {{end}}
172 172 <h2>{{t "issue.comments"}}</h2>
173 173 {{range .Issues.Notes}}
174 <article class="panel"><strong>{{.Author}}</strong> <span class="muted">{{.When}}</span><div class="mdbody">{{.HTML}}</div></article>
174 <article class="panel">{{if .AuthorURL}}<a href="{{.AuthorURL}}"><strong>{{.Author}}</strong></a>{{else}}<strong>{{.Author}}</strong>{{end}} <span class="muted">{{.When}}</span><div class="mdbody">{{.HTML}}</div></article>
175 175 {{else}}<p class="muted">{{t "issue.none"}}</p>{{end}}
176 176 {{if .Issues.CanCreate}}
177 177 <form class="panel" method="post" action="/{{.Repo.FullPath}}/-/issues/{{.Issues.One.Number}}">
@@ -26,7 +26,7 @@
26 {{if eq .Status "closed"}}<span class="pill">{{t "issue.closed"}}</span>{{else}}<span class="pill">{{t "issue.open"}}</span>{{end}}
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}}
27 {{if .Confidential}}<span class="pill">{{t "issue.confidential"}}</span>{{end}}
28 {{range .Labels}}<span class="lab" style="background:{{.Color}}">{{.Name}}</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>
29 <span class="muted">{{if .AuthorURL}}<a href="{{.AuthorURL}}">{{.Author}}</a>{{else}}{{.Author}}{{end}}{{if .Assignees}} · {{.Assignees}}{{end}}{{if .Milestone}} · {{.Milestone}}{{end}}{{if .Due}} · {{.Due}}{{end}}</span>
30 </li>
30 </li>
31 {{else}}
31 {{else}}
32 <li class="muted">{{t "issue.none"}}</li>
32 <li class="muted">{{t "issue.none"}}</li>
@@ -112,7 +112,7 @@
112 {{if eq .Issues.One.Status "closed"}}<span class="pill">{{t "issue.closed"}}</span>{{else}}<span class="pill">{{t "issue.open"}}</span>{{end}}
112 {{if eq .Issues.One.Status "closed"}}<span class="pill">{{t "issue.closed"}}</span>{{else}}<span class="pill">{{t "issue.open"}}</span>{{end}}
113 {{if .Issues.One.Confidential}}<span class="pill">{{t "issue.confidential"}}</span>{{end}}
113 {{if .Issues.One.Confidential}}<span class="pill">{{t "issue.confidential"}}</span>{{end}}
114 {{range .Issues.One.Labels}}<span class="lab" style="background:{{.Color}}">{{.Name}}</span>{{end}}
114 {{range .Issues.One.Labels}}<span class="lab" style="background:{{.Color}}">{{.Name}}</span>{{end}}
115 <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>
115 <span class="muted">{{t "issue.by"}} {{if .Issues.One.AuthorURL}}<a href="{{.Issues.One.AuthorURL}}">{{.Issues.One.Author}}</a>{{else}}{{.Issues.One.Author}}{{end}}{{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>
116</p>
116</p>
117<div class="mdbody">{{.Issues.One.HTML}}</div>
117<div class="mdbody">{{.Issues.One.HTML}}</div>
118{{if .Issues.Related}}
118{{if .Issues.Related}}
@@ -171,7 +171,7 @@
171{{end}}
171{{end}}
172<h2>{{t "issue.comments"}}</h2>
172<h2>{{t "issue.comments"}}</h2>
173{{range .Issues.Notes}}
173{{range .Issues.Notes}}
174<article class="panel"><strong>{{.Author}}</strong> <span class="muted">{{.When}}</span><div class="mdbody">{{.HTML}}</div></article>
174<article class="panel">{{if .AuthorURL}}<a href="{{.AuthorURL}}"><strong>{{.Author}}</strong></a>{{else}}<strong>{{.Author}}</strong>{{end}} <span class="muted">{{.When}}</span><div class="mdbody">{{.HTML}}</div></article>
175{{else}}<p class="muted">{{t "issue.none"}}</p>{{end}}
175{{else}}<p class="muted">{{t "issue.none"}}</p>{{end}}
176{{if .Issues.CanCreate}}
176{{if .Issues.CanCreate}}
177<form class="panel" method="post" action="/{{.Repo.FullPath}}/-/issues/{{.Issues.One.Number}}">
177<form class="panel" method="post" action="/{{.Repo.FullPath}}/-/issues/{{.Issues.One.Number}}">
internal/server/templates/layout.html +2 −2
@@ -35,7 +35,7 @@
35 35 <a href="/new">{{t "nav.new"}}</a>
36 36 <a href="/-/info">{{t "nav.info"}}</a>
37 37 {{if .User.InstanceAdmin}}<a href="/setup">{{t "nav.storage"}}</a>{{end}}
38 <a href="/settings">{{.User.Username}}</a>
38 <a href="/users/{{.User.Username}}">{{.User.Username}}</a>
39 39 <form method="post" action="/logout"><input type="hidden" name="csrf" value="{{.CSRF}}"><button type="submit">{{t "nav.signout"}}</button></form>
40 40 {{else}}
41 41 <a href="/-/info">{{t "nav.info"}}</a>
@@ -122,7 +122,7 @@
122 122
123 123 {{define "dashside"}}
124 124 <aside class="sidenav">
125 <a class="sidecontext" href="/">
125 <a class="sidecontext" href="/users/{{.User.Username}}">
126 126 {{if .User.AvatarURL}}<img class="avatar" src="{{.User.AvatarURL}}" alt="">{{else}}<span class="avatar">{{initial .User.Username}}</span>{{end}}
127 127 <span class="sidename">{{.User.Username}}</span>
128 128 </a>
@@ -35,7 +35,7 @@
35 <a href="/new">{{t "nav.new"}}</a>
35 <a href="/new">{{t "nav.new"}}</a>
36 <a href="/-/info">{{t "nav.info"}}</a>
36 <a href="/-/info">{{t "nav.info"}}</a>
37 {{if .User.InstanceAdmin}}<a href="/setup">{{t "nav.storage"}}</a>{{end}}
37 {{if .User.InstanceAdmin}}<a href="/setup">{{t "nav.storage"}}</a>{{end}}
38 <a href="/settings">{{.User.Username}}</a>
38 <a href="/users/{{.User.Username}}">{{.User.Username}}</a>
39 <form method="post" action="/logout"><input type="hidden" name="csrf" value="{{.CSRF}}"><button type="submit">{{t "nav.signout"}}</button></form>
39 <form method="post" action="/logout"><input type="hidden" name="csrf" value="{{.CSRF}}"><button type="submit">{{t "nav.signout"}}</button></form>
40 {{else}}
40 {{else}}
41 <a href="/-/info">{{t "nav.info"}}</a>
41 <a href="/-/info">{{t "nav.info"}}</a>
@@ -122,7 +122,7 @@
122
122
123{{define "dashside"}}
123{{define "dashside"}}
124<aside class="sidenav">
124<aside class="sidenav">
125 <a class="sidecontext" href="/">
125 <a class="sidecontext" href="/users/{{.User.Username}}">
126 {{if .User.AvatarURL}}<img class="avatar" src="{{.User.AvatarURL}}" alt="">{{else}}<span class="avatar">{{initial .User.Username}}</span>{{end}}
126 {{if .User.AvatarURL}}<img class="avatar" src="{{.User.AvatarURL}}" alt="">{{else}}<span class="avatar">{{initial .User.Username}}</span>{{end}}
127 <span class="sidename">{{.User.Username}}</span>
127 <span class="sidename">{{.User.Username}}</span>
128 </a>
128 </a>
internal/server/templates/pages.html +64 −7
@@ -48,6 +48,7 @@
48 48 <div class="pageacts"><a class="btn" href="/new">{{t "nav.new"}}</a></div>
49 49 </header>
50 50 {{if .StorageUnset}}<p class="flash bad">{{t "home.storage"}}</p>{{end}}
51 {{if .Card}}{{template "usercard" .Card}}{{end}}
51 52 {{if .Heat}}{{template "heatmap" .Heat}}{{end}}
52 53 <div class="grid-2">
53 54 <section class="panel">
@@ -70,16 +71,60 @@
70 71
71 72 {{define "profile"}}
72 73 {{template "layout-start" .}}
73 <header class="pagehead">
74 <div class="projhead">
75 {{if .Profile.AvatarURL}}<img class="avatar lg" src="{{.Profile.AvatarURL}}" alt="">{{else}}<span class="avatar lg">{{initial .Profile.Username}}</span>{{end}}
76 <h1>{{.Profile.Username}}</h1>
77 </div>
78 </header>
74 {{if .Card}}{{template "usercard" .Card}}{{end}}
79 75 {{if .Heat}}{{template "heatmap" .Heat}}{{end}}
76 <div class="grid-2">
77 <section>
78 <h2>{{t "dash.repos"}}</h2>
79 <ul class="repolist">
80 {{range .Repos}}
81 <li>
82 {{if .HasLogo}}<img class="tile" src="/{{.FullPath}}/-/logo" alt="">{{else}}<span class="tile">{{initial .Name}}</span>{{end}}
83 <a class="reponame" href="/{{.FullPath}}">{{.Name}}</a>
84 {{template "visicon" .Visibility}}
85 <span class="muted grown">{{.Description}}</span>
86 </li>
87 {{else}}<li class="muted">{{t "dash.noRepos"}}</li>{{end}}
88 </ul>
89 </section>
90 <section>
91 <h2>{{t "dash.groups"}}</h2>
92 <ul class="repolist">
93 {{range .Groups}}
94 <li>
95 {{if .HasLogo}}<img class="tile" src="/groups/{{.Path}}/logo" alt="">{{else}}<span class="tile">{{initial .Name}}</span>{{end}}
96 <a class="reponame" href="/groups/{{.Path}}">{{.Name}}</a>
97 {{template "visicon" .Visibility}}
98 <span class="muted grown">{{.Path}}</span>
99 </li>
100 {{else}}<li class="muted">{{t "dash.noGroups"}}</li>{{end}}
101 </ul>
102 </section>
103 </div>
80 104 {{template "layout-end" .}}
81 105 {{end}}
82 106
107 {{define "usercard"}}
108 <section class="usercard panel">
109 {{if .User.AvatarURL}}<img class="avatar xl" src="{{.User.AvatarURL}}" alt="">{{else}}<span class="avatar xl">{{initial .User.Username}}</span>{{end}}
110 <div>
111 {{if eq .Heading "h1"}}<h1>{{.Name}}</h1>{{else}}<h2>{{.Name}}</h2>{{end}}
112 <p class="handle">@{{.User.Username}}</p>
113 {{if .Bio}}<p class="bio">{{.Bio}}</p>{{end}}
114 {{if .Since}}<p class="muted">{{t "profile.since" .Since}}</p>{{end}}
115 <ul class="usercounts">
116 <li><strong>{{.Repos}}</strong> <span>{{t "dash.repos"}}</span></li>
117 <li><strong>{{.Groups}}</strong> <span>{{t "dash.groups"}}</span></li>
118 <li><strong>{{.Contrib}}</strong> <span>{{t "profile.contrib"}}</span></li>
119 </ul>
120 </div>
121 <div class="usercard-actions">
122 <button type="button" class="ghost" data-copy="{{.URL}}">{{t "profile.copy"}}</button>
123 {{if .Own}}<a class="btn" href="/settings">{{t "profile.edit"}}</a>{{end}}
124 </div>
125 </section>
126 {{end}}
127
83 128 {{define "heatmap"}}
84 129 <section class="heat" aria-label="{{t "heat.title"}}">
85 130 <h2>{{t "heat.title"}}</h2>
@@ -163,6 +208,16 @@
163 208 {{template "layout-start" .}}
164 209 <header class="pagehead"><h1>{{t "title.account"}}</h1></header>
165 210 <p class="muted">{{t "acct.hint"}}</p>
211 <section class="panel">
212 <h2>{{t "profile.edit"}}</h2>
213 <form method="post" action="/settings/profile">
214 <input type="hidden" name="csrf" value="{{.CSRF}}">
215 <label>{{t "acct.name"}} <input name="name" value="{{.User.DisplayName}}" maxlength="80"></label>
216 <label>{{t "acct.bio"}} <textarea name="bio" maxlength="280" rows="3">{{.User.Bio}}</textarea></label>
217 <p class="muted">{{t "acct.bioHint"}}</p>
218 <button type="submit">{{t "action.save"}}</button>
219 </form>
220 </section>
166 221 <section class="panel">
167 222 <h2>{{t "acct.language"}}</h2>
168 223 <form method="post" action="/settings/language">
@@ -277,10 +332,12 @@
277 332 {{end}}
278 333
279 334 {{define "avatar"}}
335 {{if .UserURL}}<a class="avatarlink" href="{{.UserURL}}">{{end}}
280 336 {{if .Avatar}}<img class="avatar" src="{{.Avatar}}" alt="">{{else}}<span class="avatar">{{if .Initial}}{{.Initial}}{{else}}{{initial .Author}}{{end}}</span>{{end}}
337 {{if .UserURL}}</a>{{end}}
281 338 {{end}}
282 339
283 {{define "commitwho"}}<span class="commitwho">{{if .UserURL}}<a href="{{.UserURL}}">{{.Author}}</a>{{else}}{{.Author}}{{end}}{{if .RawName}} {{.RawName}}{{end}}{{if .PushedBy}} · {{t "commit.pushedBy" .PushedBy}}{{end}}</span>{{end}}
340 {{define "commitwho"}}<span class="commitwho">{{if .UserURL}}<a href="{{.UserURL}}">{{.Author}}</a>{{else}}{{.Author}}{{end}}{{if .RawName}} {{.RawName}}{{end}}{{if .PushedBy}} · <a href="/users/{{.PushedBy}}">{{t "commit.pushedBy" .PushedBy}}</a>{{end}}</span>{{end}}
284 341
285 342 {{define "commitbar"}}
286 343 {{if .Head}}
@@ -48,6 +48,7 @@
48 <div class="pageacts"><a class="btn" href="/new">{{t "nav.new"}}</a></div>
48 <div class="pageacts"><a class="btn" href="/new">{{t "nav.new"}}</a></div>
49</header>
49</header>
50{{if .StorageUnset}}<p class="flash bad">{{t "home.storage"}}</p>{{end}}
50{{if .StorageUnset}}<p class="flash bad">{{t "home.storage"}}</p>{{end}}
51{{if .Card}}{{template "usercard" .Card}}{{end}}
51{{if .Heat}}{{template "heatmap" .Heat}}{{end}}
52{{if .Heat}}{{template "heatmap" .Heat}}{{end}}
52<div class="grid-2">
53<div class="grid-2">
53 <section class="panel">
54 <section class="panel">
@@ -70,16 +71,60 @@
70
71
71{{define "profile"}}
72{{define "profile"}}
72{{template "layout-start" .}}
73{{template "layout-start" .}}
73<header class="pagehead">
74{{if .Card}}{{template "usercard" .Card}}{{end}}
74 <div class="projhead">
75 {{if .Profile.AvatarURL}}<img class="avatar lg" src="{{.Profile.AvatarURL}}" alt="">{{else}}<span class="avatar lg">{{initial .Profile.Username}}</span>{{end}}
76 <h1>{{.Profile.Username}}</h1>
77 </div>
78</header>
79{{if .Heat}}{{template "heatmap" .Heat}}{{end}}
75{{if .Heat}}{{template "heatmap" .Heat}}{{end}}
76<div class="grid-2">
77 <section>
78 <h2>{{t "dash.repos"}}</h2>
79 <ul class="repolist">
80 {{range .Repos}}
81 <li>
82 {{if .HasLogo}}<img class="tile" src="/{{.FullPath}}/-/logo" alt="">{{else}}<span class="tile">{{initial .Name}}</span>{{end}}
83 <a class="reponame" href="/{{.FullPath}}">{{.Name}}</a>
84 {{template "visicon" .Visibility}}
85 <span class="muted grown">{{.Description}}</span>
86 </li>
87 {{else}}<li class="muted">{{t "dash.noRepos"}}</li>{{end}}
88 </ul>
89 </section>
90 <section>
91 <h2>{{t "dash.groups"}}</h2>
92 <ul class="repolist">
93 {{range .Groups}}
94 <li>
95 {{if .HasLogo}}<img class="tile" src="/groups/{{.Path}}/logo" alt="">{{else}}<span class="tile">{{initial .Name}}</span>{{end}}
96 <a class="reponame" href="/groups/{{.Path}}">{{.Name}}</a>
97 {{template "visicon" .Visibility}}
98 <span class="muted grown">{{.Path}}</span>
99 </li>
100 {{else}}<li class="muted">{{t "dash.noGroups"}}</li>{{end}}
101 </ul>
102 </section>
103</div>
80{{template "layout-end" .}}
104{{template "layout-end" .}}
81{{end}}
105{{end}}
82
106
107{{define "usercard"}}
108<section class="usercard panel">
109 {{if .User.AvatarURL}}<img class="avatar xl" src="{{.User.AvatarURL}}" alt="">{{else}}<span class="avatar xl">{{initial .User.Username}}</span>{{end}}
110 <div>
111 {{if eq .Heading "h1"}}<h1>{{.Name}}</h1>{{else}}<h2>{{.Name}}</h2>{{end}}
112 <p class="handle">@{{.User.Username}}</p>
113 {{if .Bio}}<p class="bio">{{.Bio}}</p>{{end}}
114 {{if .Since}}<p class="muted">{{t "profile.since" .Since}}</p>{{end}}
115 <ul class="usercounts">
116 <li><strong>{{.Repos}}</strong> <span>{{t "dash.repos"}}</span></li>
117 <li><strong>{{.Groups}}</strong> <span>{{t "dash.groups"}}</span></li>
118 <li><strong>{{.Contrib}}</strong> <span>{{t "profile.contrib"}}</span></li>
119 </ul>
120 </div>
121 <div class="usercard-actions">
122 <button type="button" class="ghost" data-copy="{{.URL}}">{{t "profile.copy"}}</button>
123 {{if .Own}}<a class="btn" href="/settings">{{t "profile.edit"}}</a>{{end}}
124 </div>
125</section>
126{{end}}
127
83{{define "heatmap"}}
128{{define "heatmap"}}
84<section class="heat" aria-label="{{t "heat.title"}}">
129<section class="heat" aria-label="{{t "heat.title"}}">
85 <h2>{{t "heat.title"}}</h2>
130 <h2>{{t "heat.title"}}</h2>
@@ -163,6 +208,16 @@
163{{template "layout-start" .}}
208{{template "layout-start" .}}
164<header class="pagehead"><h1>{{t "title.account"}}</h1></header>
209<header class="pagehead"><h1>{{t "title.account"}}</h1></header>
165<p class="muted">{{t "acct.hint"}}</p>
210<p class="muted">{{t "acct.hint"}}</p>
211<section class="panel">
212 <h2>{{t "profile.edit"}}</h2>
213 <form method="post" action="/settings/profile">
214 <input type="hidden" name="csrf" value="{{.CSRF}}">
215 <label>{{t "acct.name"}} <input name="name" value="{{.User.DisplayName}}" maxlength="80"></label>
216 <label>{{t "acct.bio"}} <textarea name="bio" maxlength="280" rows="3">{{.User.Bio}}</textarea></label>
217 <p class="muted">{{t "acct.bioHint"}}</p>
218 <button type="submit">{{t "action.save"}}</button>
219 </form>
220</section>
166<section class="panel">
221<section class="panel">
167 <h2>{{t "acct.language"}}</h2>
222 <h2>{{t "acct.language"}}</h2>
168 <form method="post" action="/settings/language">
223 <form method="post" action="/settings/language">
@@ -277,10 +332,12 @@
277{{end}}
332{{end}}
278
333
279{{define "avatar"}}
334{{define "avatar"}}
335{{if .UserURL}}<a class="avatarlink" href="{{.UserURL}}">{{end}}
280{{if .Avatar}}<img class="avatar" src="{{.Avatar}}" alt="">{{else}}<span class="avatar">{{if .Initial}}{{.Initial}}{{else}}{{initial .Author}}{{end}}</span>{{end}}
336{{if .Avatar}}<img class="avatar" src="{{.Avatar}}" alt="">{{else}}<span class="avatar">{{if .Initial}}{{.Initial}}{{else}}{{initial .Author}}{{end}}</span>{{end}}
337{{if .UserURL}}</a>{{end}}
281{{end}}
338{{end}}
282
339
283{{define "commitwho"}}<span class="commitwho">{{if .UserURL}}<a href="{{.UserURL}}">{{.Author}}</a>{{else}}{{.Author}}{{end}}{{if .RawName}} {{.RawName}}{{end}}{{if .PushedBy}} · {{t "commit.pushedBy" .PushedBy}}{{end}}</span>{{end}}
340{{define "commitwho"}}<span class="commitwho">{{if .UserURL}}<a href="{{.UserURL}}">{{.Author}}</a>{{else}}{{.Author}}{{end}}{{if .RawName}} {{.RawName}}{{end}}{{if .PushedBy}} · <a href="/users/{{.PushedBy}}">{{t "commit.pushedBy" .PushedBy}}</a>{{end}}</span>{{end}}
284
341
285{{define "commitbar"}}
342{{define "commitbar"}}
286{{if .Head}}
343{{if .Head}}
internal/store/repos.go +10 −0
@@ -303,6 +303,16 @@ func (s *Store) ListRepoIDs(ctx context.Context, userID int64) ([]int64, error)
303 303 return ids, rows.Err()
304 304 }
305 305
306 // ReposByOwner geeft de repositories van een gebruiker, op naam.
307 func (s *Store) ReposByOwner(ctx context.Context, userID int64) ([]Repo, error) {
308 rows, err := s.db.QueryContext(ctx, repoSelect+` WHERE r.owner_kind = 'user' AND r.owner_id = ? ORDER BY r.name`, userID)
309 if err != nil {
310 return nil, err
311 }
312 defer rows.Close()
313 return scanRepos(rows)
314 }
315
306 316 // CountRepos telt repositories van een eigenaar. publicOnly slaat privé over.
307 317 func (s *Store) CountRepos(ctx context.Context, ownerKind string, ownerID int64, publicOnly bool) (int, error) {
308 318 q := `SELECT COUNT(*) FROM repos WHERE owner_kind = ? AND owner_id = ?`
@@ -303,6 +303,16 @@ func (s *Store) ListRepoIDs(ctx context.Context, userID int64) ([]int64, error)
303 return ids, rows.Err()
303 return ids, rows.Err()
304}
304}
305
305
306// ReposByOwner geeft de repositories van een gebruiker, op naam.
307func (s *Store) ReposByOwner(ctx context.Context, userID int64) ([]Repo, error) {
308 rows, err := s.db.QueryContext(ctx, repoSelect+` WHERE r.owner_kind = 'user' AND r.owner_id = ? ORDER BY r.name`, userID)
309 if err != nil {
310 return nil, err
311 }
312 defer rows.Close()
313 return scanRepos(rows)
314}
315
306// CountRepos telt repositories van een eigenaar. publicOnly slaat privé over.
316// CountRepos telt repositories van een eigenaar. publicOnly slaat privé over.
307func (s *Store) CountRepos(ctx context.Context, ownerKind string, ownerID int64, publicOnly bool) (int, error) {
317func (s *Store) CountRepos(ctx context.Context, ownerKind string, ownerID int64, publicOnly bool) (int, error) {
308 q := `SELECT COUNT(*) FROM repos WHERE owner_kind = ? AND owner_id = ?`
318 q := `SELECT COUNT(*) FROM repos WHERE owner_kind = ? AND owner_id = ?`
internal/store/store.go +17 −3
@@ -100,6 +100,8 @@ func (s *Store) migrate() error {
100 100 `ALTER TABLE webhooks ADD COLUMN fields_json TEXT NOT NULL DEFAULT ''`,
101 101 `ALTER TABLE access_tokens ADD COLUMN scopes TEXT NOT NULL DEFAULT 'api'`,
102 102 `ALTER TABLE pipelines ADD COLUMN target_sha TEXT NOT NULL DEFAULT ''`,
103 `ALTER TABLE users ADD COLUMN display_name TEXT NOT NULL DEFAULT ''`,
104 `ALTER TABLE users ADD COLUMN bio TEXT NOT NULL DEFAULT ''`,
103 105 }
104 106 for _, q := range alters {
105 107 if _, err := s.db.Exec(q); err != nil && !strings.Contains(strings.ToLower(err.Error()), "duplicate column") {
@@ -121,6 +123,8 @@ CREATE TABLE IF NOT EXISTS users (
121 123 auth_admin INTEGER NOT NULL DEFAULT 0,
122 124 instance_admin INTEGER NOT NULL DEFAULT 0,
123 125 language TEXT NOT NULL DEFAULT 'en',
126 display_name TEXT NOT NULL DEFAULT '',
127 bio TEXT NOT NULL DEFAULT '',
124 128 created_at TEXT NOT NULL,
125 129 updated_at TEXT NOT NULL
126 130 );
@@ -492,6 +496,8 @@ type User struct {
492 496 AuthAdmin bool
493 497 InstanceAdmin bool
494 498 Language string
499 DisplayName string
500 Bio string
495 501 CreatedAt time.Time
496 502 }
497 503
@@ -615,21 +621,29 @@ func claimPending(ctx context.Context, tx *sql.Tx, userID int64, username string
615 621
616 622 // UserByID leest één account.
617 623 func (s *Store) UserByID(ctx context.Context, id int64) (User, error) {
618 row := s.db.QueryRowContext(ctx, `SELECT id, auth_id, username, avatar_url, auth_admin, instance_admin, language, created_at FROM users WHERE id = ?`, id)
624 row := s.db.QueryRowContext(ctx, `SELECT `+userCols+` FROM users WHERE id = ?`, id)
619 625 return scanUser(row)
620 626 }
621 627
622 628 // UserByUsername leest op naam.
623 629 func (s *Store) UserByUsername(ctx context.Context, username string) (User, error) {
624 row := s.db.QueryRowContext(ctx, `SELECT id, auth_id, username, avatar_url, auth_admin, instance_admin, language, created_at FROM users WHERE username = ?`, strings.ToLower(username))
630 row := s.db.QueryRowContext(ctx, `SELECT `+userCols+` FROM users WHERE username = ?`, strings.ToLower(username))
625 631 return scanUser(row)
626 632 }
627 633
634 const userCols = `id, auth_id, username, avatar_url, auth_admin, instance_admin, language, display_name, bio, created_at`
635
636 // SetProfile bewaart de weergavenaam en de bio. Lege tekst wist het veld.
637 func (s *Store) SetProfile(ctx context.Context, userID int64, name, bio string) error {
638 _, err := s.db.ExecContext(ctx, `UPDATE users SET display_name = ?, bio = ?, updated_at = ? WHERE id = ?`, name, bio, now(), userID)
639 return err
640 }
641
628 642 func scanUser(row *sql.Row) (User, error) {
629 643 var u User
630 644 var admin, inst int
631 645 var created string
632 if err := row.Scan(&u.ID, &u.AuthID, &u.Username, &u.AvatarURL, &admin, &inst, &u.Language, &created); err != nil {
646 if err := row.Scan(&u.ID, &u.AuthID, &u.Username, &u.AvatarURL, &admin, &inst, &u.Language, &u.DisplayName, &u.Bio, &created); err != nil {
633 647 if errors.Is(err, sql.ErrNoRows) {
634 648 return User{}, errNotFound
635 649 }
@@ -100,6 +100,8 @@ func (s *Store) migrate() error {
100 `ALTER TABLE webhooks ADD COLUMN fields_json TEXT NOT NULL DEFAULT ''`,
100 `ALTER TABLE webhooks ADD COLUMN fields_json TEXT NOT NULL DEFAULT ''`,
101 `ALTER TABLE access_tokens ADD COLUMN scopes TEXT NOT NULL DEFAULT 'api'`,
101 `ALTER TABLE access_tokens ADD COLUMN scopes TEXT NOT NULL DEFAULT 'api'`,
102 `ALTER TABLE pipelines ADD COLUMN target_sha TEXT NOT NULL DEFAULT ''`,
102 `ALTER TABLE pipelines ADD COLUMN target_sha TEXT NOT NULL DEFAULT ''`,
103 `ALTER TABLE users ADD COLUMN display_name TEXT NOT NULL DEFAULT ''`,
104 `ALTER TABLE users ADD COLUMN bio TEXT NOT NULL DEFAULT ''`,
103 }
105 }
104 for _, q := range alters {
106 for _, q := range alters {
105 if _, err := s.db.Exec(q); err != nil && !strings.Contains(strings.ToLower(err.Error()), "duplicate column") {
107 if _, err := s.db.Exec(q); err != nil && !strings.Contains(strings.ToLower(err.Error()), "duplicate column") {
@@ -121,6 +123,8 @@ CREATE TABLE IF NOT EXISTS users (
121 auth_admin INTEGER NOT NULL DEFAULT 0,
123 auth_admin INTEGER NOT NULL DEFAULT 0,
122 instance_admin INTEGER NOT NULL DEFAULT 0,
124 instance_admin INTEGER NOT NULL DEFAULT 0,
123 language TEXT NOT NULL DEFAULT 'en',
125 language TEXT NOT NULL DEFAULT 'en',
126 display_name TEXT NOT NULL DEFAULT '',
127 bio TEXT NOT NULL DEFAULT '',
124 created_at TEXT NOT NULL,
128 created_at TEXT NOT NULL,
125 updated_at TEXT NOT NULL
129 updated_at TEXT NOT NULL
126);
130);
@@ -492,6 +496,8 @@ type User struct {
492 AuthAdmin bool
496 AuthAdmin bool
493 InstanceAdmin bool
497 InstanceAdmin bool
494 Language string
498 Language string
499 DisplayName string
500 Bio string
495 CreatedAt time.Time
501 CreatedAt time.Time
496}
502}
497
503
@@ -615,21 +621,29 @@ func claimPending(ctx context.Context, tx *sql.Tx, userID int64, username string
615
621
616// UserByID leest één account.
622// UserByID leest één account.
617func (s *Store) UserByID(ctx context.Context, id int64) (User, error) {
623func (s *Store) UserByID(ctx context.Context, id int64) (User, error) {
618 row := s.db.QueryRowContext(ctx, `SELECT id, auth_id, username, avatar_url, auth_admin, instance_admin, language, created_at FROM users WHERE id = ?`, id)
624 row := s.db.QueryRowContext(ctx, `SELECT `+userCols+` FROM users WHERE id = ?`, id)
619 return scanUser(row)
625 return scanUser(row)
620}
626}
621
627
622// UserByUsername leest op naam.
628// UserByUsername leest op naam.
623func (s *Store) UserByUsername(ctx context.Context, username string) (User, error) {
629func (s *Store) UserByUsername(ctx context.Context, username string) (User, error) {
624 row := s.db.QueryRowContext(ctx, `SELECT id, auth_id, username, avatar_url, auth_admin, instance_admin, language, created_at FROM users WHERE username = ?`, strings.ToLower(username))
630 row := s.db.QueryRowContext(ctx, `SELECT `+userCols+` FROM users WHERE username = ?`, strings.ToLower(username))
625 return scanUser(row)
631 return scanUser(row)
626}
632}
627
633
634const userCols = `id, auth_id, username, avatar_url, auth_admin, instance_admin, language, display_name, bio, created_at`
635
636// SetProfile bewaart de weergavenaam en de bio. Lege tekst wist het veld.
637func (s *Store) SetProfile(ctx context.Context, userID int64, name, bio string) error {
638 _, err := s.db.ExecContext(ctx, `UPDATE users SET display_name = ?, bio = ?, updated_at = ? WHERE id = ?`, name, bio, now(), userID)
639 return err
640}
641
628func scanUser(row *sql.Row) (User, error) {
642func scanUser(row *sql.Row) (User, error) {
629 var u User
643 var u User
630 var admin, inst int
644 var admin, inst int
631 var created string
645 var created string
632 if err := row.Scan(&u.ID, &u.AuthID, &u.Username, &u.AvatarURL, &admin, &inst, &u.Language, &created); err != nil {
646 if err := row.Scan(&u.ID, &u.AuthID, &u.Username, &u.AvatarURL, &admin, &inst, &u.Language, &u.DisplayName, &u.Bio, &created); err != nil {
633 if errors.Is(err, sql.ErrNoRows) {
647 if errors.Is(err, sql.ErrNoRows) {
634 return User{}, errNotFound
648 return User{}, errNotFound
635 }
649 }