Merged
feat: toon repositories en groepen op het profiel
timfa
wants to merge
1 commit
from
cursor/profielblok-674d
into
master
Overview Commits 1 Pipelines 1 Changes 28
Er stond nog geen open profiel-MR. Deze MR bouwt daarom voort op de bestaande pagina /users/<username> (bijvoorbeeld /users/timfa). Die URL blijft de deelbare link. Een redirect vanaf /<username> is er niet.
De pagina en het eigen overzicht krijgen bovenaan een kaart: avatar, weergavenaam en @gebruikersnaam, bio als die er is, lid sinds, en tellers voor zichtbare repositories, groepen en bijdragen van de laatste 12 maanden. Op je eigen kaart staat ook Profiel bewerken, naar de accountinstellingen. Profiel-URL kopiëren zet de absolute /users/<username>-link op het klembord.
Onder de activiteitenkalender staan de repositories en groepen van die persoon, met logo of initiaal. Alleen wat de kijker mag zien: openbare dingen, en privé alleen voor de eigenaar of een lid. Een groepsrepository staat niet in de persoonlijke repositorylijst.
GET /api/v1/users/{username} is uitgebreid met naam, bio, web_url, tellingen en diezelfde lijsten. PUT /api/v1/user kan de weergavenaam en bio zetten zonder de taal te wissen als je die weglaat.
Namen en avatars linken naar /users/<username>: navigatie, commit, merge request, review, tijdlijn, pipeline, issue en ledenlijsten. Een onbekende of nog uitgenodigde naam blijft gewone tekst.
Activity
- timfa Pipeline #79 is Passed 23 October 2026
- timfa opened this merge request 23 October 2026
- timfa merged this merge request 23 October 2026
Commits
Pipelines
- #79 Passed
Changes
@@ -336,7 +336,14 @@ var en = map[string]string{
"acct.add": "Add",
"acct.remove": "Remove",
"acct.export": "Download your data (JSON)",
"acct.language": "Language",
"acct.language": "Language",
"acct.name": "Display name",
"acct.bio": "Bio",
"acct.bioHint": "A short text on your profile. At most 280 characters.",
"profile.since": "Member since %s",
"profile.contrib": "Contributions",
"profile.copy": "Copy profile URL",
"profile.edit": "Edit profile",
"setup.choose": "Choose storage",
"setup.pathTitle": "Storage path",
@@ -365,6 +372,7 @@ var en = map[string]string{
"flash.sshRemoved": "Key removed",
"flash.pipeline": "Pipeline started",
"flash.language": "Language saved",
"flash.profile": "Profile saved",
"flash.logo": "Logo saved",
"flash.star": "Star updated",
@@ -415,6 +423,8 @@ var en = map[string]string{
"err.pattern": "pattern %q cannot be used",
"err.emptyValue": "the value is empty",
"err.userTaken": "username %s is already in use",
"err.profileName": "the display name is too long or contains a line break",
"err.profileBio": "the bio is too long",
"err.tokenNeedsName": "give the token a name",
"err.sshDup": "this key is already registered",
"err.notFound": "not found",
@@ -336,7 +336,14 @@ var en = map[string]string{ "acct.add": "Add", "acct.add": "Add", "acct.remove": "Remove", "acct.remove": "Remove", "acct.export": "Download your data (JSON)", "acct.export": "Download your data (JSON)", "acct.language": "Language", "acct.language": "Language", "acct.name": "Display name", "acct.bio": "Bio", "acct.bioHint": "A short text on your profile. At most 280 characters.", "profile.since": "Member since %s", "profile.contrib": "Contributions", "profile.copy": "Copy profile URL", "profile.edit": "Edit profile", "setup.choose": "Choose storage", "setup.choose": "Choose storage", "setup.pathTitle": "Storage path", "setup.pathTitle": "Storage path",@@ -365,6 +372,7 @@ var en = map[string]string{ "flash.sshRemoved": "Key removed", "flash.sshRemoved": "Key removed", "flash.pipeline": "Pipeline started", "flash.pipeline": "Pipeline started", "flash.language": "Language saved", "flash.language": "Language saved", "flash.profile": "Profile saved", "flash.logo": "Logo saved", "flash.logo": "Logo saved", "flash.star": "Star updated", "flash.star": "Star updated",@@ -415,6 +423,8 @@ var en = map[string]string{ "err.pattern": "pattern %q cannot be used", "err.pattern": "pattern %q cannot be used", "err.emptyValue": "the value is empty", "err.emptyValue": "the value is empty", "err.userTaken": "username %s is already in use", "err.userTaken": "username %s is already in use", "err.profileName": "the display name is too long or contains a line break", "err.profileBio": "the bio is too long", "err.tokenNeedsName": "give the token a name", "err.tokenNeedsName": "give the token a name", "err.sshDup": "this key is already registered", "err.sshDup": "this key is already registered", "err.notFound": "not found", "err.notFound": "not found",@@ -39,7 +39,7 @@ var issueEN = map[string]string{
"issue.relatedNew": "New related issue",
"issue.relate": "Mark this issue as related to #%d",
"issue.fromComment": "New issue from comment",
"issue.by": "opened by %s",
"issue.by": "opened by",
"issue.edit": "Edit",
"issue.meta": "Labels and assignees",
"issue.addLabel": "Add label",
@@ -103,7 +103,7 @@ var issueNL = map[string]string{
"issue.relatedNew": "Nieuw gerelateerd issue",
"issue.relate": "Markeer dit issue als gerelateerd aan #%d",
"issue.fromComment": "Nieuw issue uit reactie",
"issue.by": "geopend door %s",
"issue.by": "geopend door",
"issue.edit": "Bewerken",
"issue.meta": "Labels en toewijzing",
"issue.addLabel": "Label toevoegen",
@@ -167,7 +167,7 @@ var issueDE = map[string]string{
"issue.relatedNew": "Neues verwandtes Issue",
"issue.relate": "Dieses Issue als verwandt mit #%d markieren",
"issue.fromComment": "Neues Issue aus Kommentar",
"issue.by": "geöffnet von %s",
"issue.by": "geöffnet von",
"issue.edit": "Bearbeiten",
"issue.meta": "Labels und Zuweisung",
"issue.addLabel": "Label hinzufügen",
@@ -231,7 +231,7 @@ var issueFR = map[string]string{
"issue.relatedNew": "Nouveau ticket lié",
"issue.relate": "Marquer ce ticket comme lié à #%d",
"issue.fromComment": "Nouveau ticket depuis le commentaire",
"issue.by": "ouvert par %s",
"issue.by": "ouvert par",
"issue.edit": "Modifier",
"issue.meta": "Étiquettes et assignation",
"issue.addLabel": "Ajouter une étiquette",
@@ -39,7 +39,7 @@ var issueEN = map[string]string{ "issue.relatedNew": "New related issue", "issue.relatedNew": "New related issue", "issue.relate": "Mark this issue as related to #%d", "issue.relate": "Mark this issue as related to #%d", "issue.fromComment": "New issue from comment", "issue.fromComment": "New issue from comment", "issue.by": "opened by %s", "issue.by": "opened by", "issue.edit": "Edit", "issue.edit": "Edit", "issue.meta": "Labels and assignees", "issue.meta": "Labels and assignees", "issue.addLabel": "Add label", "issue.addLabel": "Add label",@@ -103,7 +103,7 @@ var issueNL = map[string]string{ "issue.relatedNew": "Nieuw gerelateerd issue", "issue.relatedNew": "Nieuw gerelateerd issue", "issue.relate": "Markeer dit issue als gerelateerd aan #%d", "issue.relate": "Markeer dit issue als gerelateerd aan #%d", "issue.fromComment": "Nieuw issue uit reactie", "issue.fromComment": "Nieuw issue uit reactie", "issue.by": "geopend door %s", "issue.by": "geopend door", "issue.edit": "Bewerken", "issue.edit": "Bewerken", "issue.meta": "Labels en toewijzing", "issue.meta": "Labels en toewijzing", "issue.addLabel": "Label toevoegen", "issue.addLabel": "Label toevoegen",@@ -167,7 +167,7 @@ var issueDE = map[string]string{ "issue.relatedNew": "Neues verwandtes Issue", "issue.relatedNew": "Neues verwandtes Issue", "issue.relate": "Dieses Issue als verwandt mit #%d markieren", "issue.relate": "Dieses Issue als verwandt mit #%d markieren", "issue.fromComment": "Neues Issue aus Kommentar", "issue.fromComment": "Neues Issue aus Kommentar", "issue.by": "geöffnet von %s", "issue.by": "geöffnet von", "issue.edit": "Bearbeiten", "issue.edit": "Bearbeiten", "issue.meta": "Labels und Zuweisung", "issue.meta": "Labels und Zuweisung", "issue.addLabel": "Label hinzufügen", "issue.addLabel": "Label hinzufügen",@@ -231,7 +231,7 @@ var issueFR = map[string]string{ "issue.relatedNew": "Nouveau ticket lié", "issue.relatedNew": "Nouveau ticket lié", "issue.relate": "Marquer ce ticket comme lié à #%d", "issue.relate": "Marquer ce ticket comme lié à #%d", "issue.fromComment": "Nouveau ticket depuis le commentaire", "issue.fromComment": "Nouveau ticket depuis le commentaire", "issue.by": "ouvert par %s", "issue.by": "ouvert par", "issue.edit": "Modifier", "issue.edit": "Modifier", "issue.meta": "Étiquettes et assignation", "issue.meta": "Étiquettes et assignation", "issue.addLabel": "Ajouter une étiquette", "issue.addLabel": "Ajouter une étiquette",@@ -340,6 +340,13 @@ var nl = map[string]string{
"acct.remove": "Verwijderen",
"acct.export": "Gegevens downloaden (JSON)",
"acct.language": "Taal",
"acct.name": "Weergavenaam",
"acct.bio": "Bio",
"acct.bioHint": "Een korte tekst op je profiel. Hoogstens 280 tekens.",
"profile.since": "Lid sinds %s",
"profile.contrib": "Bijdragen",
"profile.copy": "Profiel-URL kopiëren",
"profile.edit": "Profiel bewerken",
"setup.choose": "Opslag kiezen",
"setup.pathTitle": "Opslagpad",
"setup.changeWarn": "Het pad wijzigen verplaatst geen repositories, artifacts of releases.",
@@ -366,6 +373,7 @@ var nl = map[string]string{
"flash.sshRemoved": "Sleutel verwijderd",
"flash.pipeline": "Pipeline gestart",
"flash.language": "Taal opgeslagen",
"flash.profile": "Profiel opgeslagen",
"flash.logo": "Logo opgeslagen",
"flash.star": "Ster bijgewerkt",
"err.forbidden": "geen toegang",
@@ -414,6 +422,8 @@ var nl = map[string]string{
"err.pattern": "patroon %q is niet bruikbaar",
"err.emptyValue": "de waarde is leeg",
"err.userTaken": "gebruikersnaam %s is al in gebruik",
"err.profileName": "de weergavenaam is te lang of bevat een regeleinde",
"err.profileBio": "de bio is te lang",
"err.tokenNeedsName": "geef het token een naam",
"err.sshDup": "deze sleutel staat al geregistreerd",
"err.notFound": "niet gevonden",
@@ -951,6 +961,13 @@ var de = map[string]string{
"acct.remove": "Entfernen",
"acct.export": "Daten herunterladen (JSON)",
"acct.language": "Sprache",
"acct.name": "Anzeigename",
"acct.bio": "Bio",
"acct.bioHint": "Ein kurzer Text auf deinem Profil. Höchstens 280 Zeichen.",
"profile.since": "Mitglied seit %s",
"profile.contrib": "Beiträge",
"profile.copy": "Profil-URL kopieren",
"profile.edit": "Profil bearbeiten",
"setup.choose": "Speicher wählen",
"setup.pathTitle": "Speicherpfad",
"setup.changeWarn": "Eine Pfadänderung verschiebt keine Repositories, Artefakte oder Releases.",
@@ -977,6 +994,7 @@ var de = map[string]string{
"flash.sshRemoved": "Schlüssel entfernt",
"flash.pipeline": "Pipeline gestartet",
"flash.language": "Sprache gespeichert",
"flash.profile": "Profil gespeichert",
"flash.logo": "Logo gespeichert",
"flash.star": "Stern aktualisiert",
"err.forbidden": "kein Zugriff",
@@ -1025,6 +1043,8 @@ var de = map[string]string{
"err.pattern": "Muster %q ist nicht verwendbar",
"err.emptyValue": "der Wert ist leer",
"err.userTaken": "Benutzername %s ist bereits vergeben",
"err.profileName": "der Anzeigename ist zu lang oder enthält einen Zeilenumbruch",
"err.profileBio": "die Bio ist zu lang",
"err.tokenNeedsName": "gib dem Token einen Namen",
"err.sshDup": "dieser Schlüssel ist bereits registriert",
"err.notFound": "nicht gefunden",
@@ -1562,6 +1582,13 @@ var fr = map[string]string{
"acct.remove": "Supprimer",
"acct.export": "Télécharger tes données (JSON)",
"acct.language": "Langue",
"acct.name": "Nom affiché",
"acct.bio": "Bio",
"acct.bioHint": "Un court texte sur ton profil. 280 caractères au plus.",
"profile.since": "Membre depuis le %s",
"profile.contrib": "Contributions",
"profile.copy": "Copier l’URL du profil",
"profile.edit": "Modifier le profil",
"setup.choose": "Choisir le stockage",
"setup.pathTitle": "Chemin de stockage",
"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{
"flash.sshRemoved": "Clé supprimée",
"flash.pipeline": "Pipeline démarrée",
"flash.language": "Langue enregistrée",
"flash.profile": "Profil enregistré",
"flash.logo": "Logo enregistré",
"flash.star": "Étoile mise à jour",
"err.forbidden": "accès refusé",
@@ -1636,6 +1664,8 @@ var fr = map[string]string{
"err.pattern": "le motif %q n’est pas utilisable",
"err.emptyValue": "la valeur est vide",
"err.userTaken": "le nom d’utilisateur %s est déjà utilisé",
"err.profileName": "le nom affiché est trop long ou contient un saut de ligne",
"err.profileBio": "la bio est trop longue",
"err.tokenNeedsName": "donne un nom au jeton",
"err.sshDup": "cette clé est déjà enregistrée",
"err.notFound": "introuvable",
@@ -340,6 +340,13 @@ var nl = map[string]string{ "acct.remove": "Verwijderen", "acct.remove": "Verwijderen", "acct.export": "Gegevens downloaden (JSON)", "acct.export": "Gegevens downloaden (JSON)", "acct.language": "Taal", "acct.language": "Taal", "acct.name": "Weergavenaam", "acct.bio": "Bio", "acct.bioHint": "Een korte tekst op je profiel. Hoogstens 280 tekens.", "profile.since": "Lid sinds %s", "profile.contrib": "Bijdragen", "profile.copy": "Profiel-URL kopiëren", "profile.edit": "Profiel bewerken", "setup.choose": "Opslag kiezen", "setup.choose": "Opslag kiezen", "setup.pathTitle": "Opslagpad", "setup.pathTitle": "Opslagpad", "setup.changeWarn": "Het pad wijzigen verplaatst geen repositories, artifacts of releases.", "setup.changeWarn": "Het pad wijzigen verplaatst geen repositories, artifacts of releases.",@@ -366,6 +373,7 @@ var nl = map[string]string{ "flash.sshRemoved": "Sleutel verwijderd", "flash.sshRemoved": "Sleutel verwijderd", "flash.pipeline": "Pipeline gestart", "flash.pipeline": "Pipeline gestart", "flash.language": "Taal opgeslagen", "flash.language": "Taal opgeslagen", "flash.profile": "Profiel opgeslagen", "flash.logo": "Logo opgeslagen", "flash.logo": "Logo opgeslagen", "flash.star": "Ster bijgewerkt", "flash.star": "Ster bijgewerkt", "err.forbidden": "geen toegang", "err.forbidden": "geen toegang",@@ -414,6 +422,8 @@ var nl = map[string]string{ "err.pattern": "patroon %q is niet bruikbaar", "err.pattern": "patroon %q is niet bruikbaar", "err.emptyValue": "de waarde is leeg", "err.emptyValue": "de waarde is leeg", "err.userTaken": "gebruikersnaam %s is al in gebruik", "err.userTaken": "gebruikersnaam %s is al in gebruik", "err.profileName": "de weergavenaam is te lang of bevat een regeleinde", "err.profileBio": "de bio is te lang", "err.tokenNeedsName": "geef het token een naam", "err.tokenNeedsName": "geef het token een naam", "err.sshDup": "deze sleutel staat al geregistreerd", "err.sshDup": "deze sleutel staat al geregistreerd", "err.notFound": "niet gevonden", "err.notFound": "niet gevonden",@@ -951,6 +961,13 @@ var de = map[string]string{ "acct.remove": "Entfernen", "acct.remove": "Entfernen", "acct.export": "Daten herunterladen (JSON)", "acct.export": "Daten herunterladen (JSON)", "acct.language": "Sprache", "acct.language": "Sprache", "acct.name": "Anzeigename", "acct.bio": "Bio", "acct.bioHint": "Ein kurzer Text auf deinem Profil. Höchstens 280 Zeichen.", "profile.since": "Mitglied seit %s", "profile.contrib": "Beiträge", "profile.copy": "Profil-URL kopieren", "profile.edit": "Profil bearbeiten", "setup.choose": "Speicher wählen", "setup.choose": "Speicher wählen", "setup.pathTitle": "Speicherpfad", "setup.pathTitle": "Speicherpfad", "setup.changeWarn": "Eine Pfadänderung verschiebt keine Repositories, Artefakte oder Releases.", "setup.changeWarn": "Eine Pfadänderung verschiebt keine Repositories, Artefakte oder Releases.",@@ -977,6 +994,7 @@ var de = map[string]string{ "flash.sshRemoved": "Schlüssel entfernt", "flash.sshRemoved": "Schlüssel entfernt", "flash.pipeline": "Pipeline gestartet", "flash.pipeline": "Pipeline gestartet", "flash.language": "Sprache gespeichert", "flash.language": "Sprache gespeichert", "flash.profile": "Profil gespeichert", "flash.logo": "Logo gespeichert", "flash.logo": "Logo gespeichert", "flash.star": "Stern aktualisiert", "flash.star": "Stern aktualisiert", "err.forbidden": "kein Zugriff", "err.forbidden": "kein Zugriff",@@ -1025,6 +1043,8 @@ var de = map[string]string{ "err.pattern": "Muster %q ist nicht verwendbar", "err.pattern": "Muster %q ist nicht verwendbar", "err.emptyValue": "der Wert ist leer", "err.emptyValue": "der Wert ist leer", "err.userTaken": "Benutzername %s ist bereits vergeben", "err.userTaken": "Benutzername %s ist bereits vergeben", "err.profileName": "der Anzeigename ist zu lang oder enthält einen Zeilenumbruch", "err.profileBio": "die Bio ist zu lang", "err.tokenNeedsName": "gib dem Token einen Namen", "err.tokenNeedsName": "gib dem Token einen Namen", "err.sshDup": "dieser Schlüssel ist bereits registriert", "err.sshDup": "dieser Schlüssel ist bereits registriert", "err.notFound": "nicht gefunden", "err.notFound": "nicht gefunden",@@ -1562,6 +1582,13 @@ var fr = map[string]string{ "acct.remove": "Supprimer", "acct.remove": "Supprimer", "acct.export": "Télécharger tes données (JSON)", "acct.export": "Télécharger tes données (JSON)", "acct.language": "Langue", "acct.language": "Langue", "acct.name": "Nom affiché", "acct.bio": "Bio", "acct.bioHint": "Un court texte sur ton profil. 280 caractères au plus.", "profile.since": "Membre depuis le %s", "profile.contrib": "Contributions", "profile.copy": "Copier l’URL du profil", "profile.edit": "Modifier le profil", "setup.choose": "Choisir le stockage", "setup.choose": "Choisir le stockage", "setup.pathTitle": "Chemin de stockage", "setup.pathTitle": "Chemin de stockage", "setup.changeWarn": "Changer le chemin ne déplace ni les dépôts, ni les artefacts, ni les versions.", "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{ "flash.sshRemoved": "Clé supprimée", "flash.sshRemoved": "Clé supprimée", "flash.pipeline": "Pipeline démarrée", "flash.pipeline": "Pipeline démarrée", "flash.language": "Langue enregistrée", "flash.language": "Langue enregistrée", "flash.profile": "Profil enregistré", "flash.logo": "Logo enregistré", "flash.logo": "Logo enregistré", "flash.star": "Étoile mise à jour", "flash.star": "Étoile mise à jour", "err.forbidden": "accès refusé", "err.forbidden": "accès refusé",@@ -1636,6 +1664,8 @@ var fr = map[string]string{ "err.pattern": "le motif %q n’est pas utilisable", "err.pattern": "le motif %q n’est pas utilisable", "err.emptyValue": "la valeur est vide", "err.emptyValue": "la valeur est vide", "err.userTaken": "le nom d’utilisateur %s est déjà utilisé", "err.userTaken": "le nom d’utilisateur %s est déjà utilisé", "err.profileName": "le nom affiché est trop long ou contient un saut de ligne", "err.profileBio": "la bio est trop longue", "err.tokenNeedsName": "donne un nom au jeton", "err.tokenNeedsName": "donne un nom au jeton", "err.sshDup": "cette clé est déjà enregistrée", "err.sshDup": "cette clé est déjà enregistrée", "err.notFound": "introuvable", "err.notFound": "introuvable",@@ -3,6 +3,7 @@ package server
import (
"net/http"
"strconv"
"strings"
"time"
"gitlab.com/Timfa/bluegit/internal/access"
@@ -17,9 +18,14 @@ func rfcTime(t time.Time) any {
return t.UTC().Format(time.RFC3339)
}
func userJSON(u store.User, self bool) map[string]any {
func userJSON(u store.User, self bool, web string) map[string]any {
out := map[string]any{
"id": u.ID, "username": u.Username, "avatar_url": u.AvatarURL,
"name": strings.TrimSpace(u.DisplayName), "bio": u.Bio,
"created_at": rfcTime(u.CreatedAt),
}
if web != "" {
out["web_url"] = web
}
if self {
out["instance_admin"] = u.InstanceAdmin
@@ -43,24 +49,43 @@ func tokenJSON(t store.TokenInfo, plain string) map[string]any {
}
func (s *Server) apiGetUser(w http.ResponseWriter, r *http.Request) {
writeJSON(w, http.StatusOK, userJSON(apiUser(r), true))
u := apiUser(r)
writeJSON(w, http.StatusOK, userJSON(u, true, s.absURL("/users/"+u.Username)))
}
func (s *Server) apiPutUser(w http.ResponseWriter, r *http.Request) {
var in struct {
Language string `json:"language"`
Language *string `json:"language"`
Name *string `json:"name"`
Bio *string `json:"bio"`
}
if err := readJSON(r, &in); err != nil {
s.writeAPIErr(w, r, fail(400, i18n.E("err.json")))
return
}
lang, err := s.opSetLanguage(r.Context(), apiUser(r), in.Language)
u := apiUser(r)
if in.Language != nil {
if _, err := s.opSetLanguage(r.Context(), u, *in.Language); !s.apiOK(w, r, err) {
return
}
}
if in.Name != nil || in.Bio != nil {
name, bio := u.DisplayName, u.Bio
if in.Name != nil {
name = *in.Name
}
if in.Bio != nil {
bio = *in.Bio
}
if _, err := s.opSetProfile(r.Context(), u, name, bio); !s.apiOK(w, r, err) {
return
}
}
fresh, err := s.Store.UserByID(r.Context(), u.ID)
if !s.apiOK(w, r, err) {
return
}
u := apiUser(r)
u.Language = string(lang)
writeJSON(w, http.StatusOK, userJSON(u, true))
writeJSON(w, http.StatusOK, userJSON(fresh, true, s.absURL("/users/"+fresh.Username)))
}
func (s *Server) apiExport(w http.ResponseWriter, r *http.Request) {
@@ -73,7 +98,48 @@ func (s *Server) apiUserByName(w http.ResponseWriter, r *http.Request) {
s.writeAPIErr(w, r, fail(404, i18n.E("err.notFound")))
return
}
writeJSON(w, http.StatusOK, userJSON(u, false))
viewer := apiUser(r).ID
ids, err := s.Store.ListRepoIDs(r.Context(), viewer)
if err != nil {
ids = nil
}
heat := s.heatmap(r.Context(), u.ID, ids, s.langOf(r))
total := 0
if heat != nil {
total = heat.Total
}
card, repos, groups := s.profileCard(r, u, viewer, total)
out := userJSON(u, viewer == u.ID, card.URL)
out["counts"] = map[string]any{
"repos": card.Repos, "groups": card.Groups, "contributions": card.Contrib,
}
out["repos"] = repoBriefs(s, repos)
out["groups"] = groupBriefs(s, groups)
writeJSON(w, http.StatusOK, out)
}
func repoBriefs(s *Server, repos []store.Repo) []map[string]any {
out := make([]map[string]any, 0, len(repos))
for _, repo := range repos {
out = append(out, map[string]any{
"id": repo.ID, "name": repo.Name, "path": repo.FullPath(),
"description": repo.Description, "visibility": repo.Visibility,
"web_url": s.absURL("/" + repo.FullPath()),
})
}
return out
}
func groupBriefs(s *Server, groups []store.Group) []map[string]any {
out := make([]map[string]any, 0, len(groups))
for _, g := range groups {
out = append(out, map[string]any{
"id": g.ID, "name": g.Name, "path": g.Path,
"description": g.Description, "visibility": g.Visibility,
"web_url": s.absURL("/groups/" + g.Path),
})
}
return out
}
func (s *Server) apiListTokens(w http.ResponseWriter, r *http.Request) {
@@ -3,6 +3,7 @@ package serverimport (import ( "net/http" "net/http" "strconv" "strconv" "strings" "time" "time" "gitlab.com/Timfa/bluegit/internal/access" "gitlab.com/Timfa/bluegit/internal/access"@@ -17,9 +18,14 @@ func rfcTime(t time.Time) any { return t.UTC().Format(time.RFC3339) return t.UTC().Format(time.RFC3339)}}func userJSON(u store.User, self bool) map[string]any {func userJSON(u store.User, self bool, web string) map[string]any { out := map[string]any{ out := map[string]any{ "id": u.ID, "username": u.Username, "avatar_url": u.AvatarURL, "id": u.ID, "username": u.Username, "avatar_url": u.AvatarURL, "name": strings.TrimSpace(u.DisplayName), "bio": u.Bio, "created_at": rfcTime(u.CreatedAt), } if web != "" { out["web_url"] = web } } if self { if self { out["instance_admin"] = u.InstanceAdmin out["instance_admin"] = u.InstanceAdmin@@ -43,24 +49,43 @@ func tokenJSON(t store.TokenInfo, plain string) map[string]any {}}func (s *Server) apiGetUser(w http.ResponseWriter, r *http.Request) {func (s *Server) apiGetUser(w http.ResponseWriter, r *http.Request) { writeJSON(w, http.StatusOK, userJSON(apiUser(r), true)) u := apiUser(r) writeJSON(w, http.StatusOK, userJSON(u, true, s.absURL("/users/"+u.Username)))}}func (s *Server) apiPutUser(w http.ResponseWriter, r *http.Request) {func (s *Server) apiPutUser(w http.ResponseWriter, r *http.Request) { var in struct { var in struct { Language string `json:"language"` Language *string `json:"language"` Name *string `json:"name"` Bio *string `json:"bio"` } } if err := readJSON(r, &in); err != nil { if err := readJSON(r, &in); err != nil { s.writeAPIErr(w, r, fail(400, i18n.E("err.json"))) s.writeAPIErr(w, r, fail(400, i18n.E("err.json"))) return return } } lang, err := s.opSetLanguage(r.Context(), apiUser(r), in.Language) u := apiUser(r) if in.Language != nil { if _, err := s.opSetLanguage(r.Context(), u, *in.Language); !s.apiOK(w, r, err) { return } } if in.Name != nil || in.Bio != nil { name, bio := u.DisplayName, u.Bio if in.Name != nil { name = *in.Name } if in.Bio != nil { bio = *in.Bio } if _, err := s.opSetProfile(r.Context(), u, name, bio); !s.apiOK(w, r, err) { return } } fresh, err := s.Store.UserByID(r.Context(), u.ID) if !s.apiOK(w, r, err) { if !s.apiOK(w, r, err) { return return } } u := apiUser(r) writeJSON(w, http.StatusOK, userJSON(fresh, true, s.absURL("/users/"+fresh.Username))) u.Language = string(lang) writeJSON(w, http.StatusOK, userJSON(u, true))}}func (s *Server) apiExport(w http.ResponseWriter, r *http.Request) {func (s *Server) apiExport(w http.ResponseWriter, r *http.Request) {@@ -73,7 +98,48 @@ func (s *Server) apiUserByName(w http.ResponseWriter, r *http.Request) { s.writeAPIErr(w, r, fail(404, i18n.E("err.notFound"))) s.writeAPIErr(w, r, fail(404, i18n.E("err.notFound"))) return return } } writeJSON(w, http.StatusOK, userJSON(u, false)) viewer := apiUser(r).ID ids, err := s.Store.ListRepoIDs(r.Context(), viewer) if err != nil { ids = nil } heat := s.heatmap(r.Context(), u.ID, ids, s.langOf(r)) total := 0 if heat != nil { total = heat.Total } card, repos, groups := s.profileCard(r, u, viewer, total) out := userJSON(u, viewer == u.ID, card.URL) out["counts"] = map[string]any{ "repos": card.Repos, "groups": card.Groups, "contributions": card.Contrib, } out["repos"] = repoBriefs(s, repos) out["groups"] = groupBriefs(s, groups) writeJSON(w, http.StatusOK, out)}func repoBriefs(s *Server, repos []store.Repo) []map[string]any { out := make([]map[string]any, 0, len(repos)) for _, repo := range repos { out = append(out, map[string]any{ "id": repo.ID, "name": repo.Name, "path": repo.FullPath(), "description": repo.Description, "visibility": repo.Visibility, "web_url": s.absURL("/" + repo.FullPath()), }) } return out}func groupBriefs(s *Server, groups []store.Group) []map[string]any { out := make([]map[string]any, 0, len(groups)) for _, g := range groups { out = append(out, map[string]any{ "id": g.ID, "name": g.Name, "path": g.Path, "description": g.Description, "visibility": g.Visibility, "web_url": s.absURL("/groups/" + g.Path), }) } return out}}func (s *Server) apiListTokens(w http.ResponseWriter, r *http.Request) {func (s *Server) apiListTokens(w http.ResponseWriter, r *http.Request) {@@ -84,6 +84,10 @@ func apiBinds() []apiBind {
branch = branches + "/{branch}"
)
return []apiBind{
{path: "/user", method: "GET", code: "200", resp: "User"},
{path: "/user", method: "PUT", code: "200", body: "UserUpdate", resp: "User"},
{path: "/users/{username}", method: "GET", code: "200", resp: "User"},
{path: mrs, method: "GET", code: "200", resp: "MergeRequest", array: true},
{path: mrs, method: "POST", code: "201", body: "MergeRequestCreate", resp: "MergeRequest"},
{path: mr, method: "GET", code: "200", resp: "MergeRequest"},
@@ -267,6 +271,45 @@ func apiSchemas() map[string]any {
"branch_filter": str("Branch filter. Empty matches every branch."),
"active": boolean("Hook is enabled."),
}),
"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{
"id": integer("User id."),
"username": str("Username."),
"name": str("Display name. Empty when unset."),
"bio": str("Profile text. Empty when unset."),
"avatar_url": str("Avatar URL."),
"created_at": when,
"web_url": str("Profile page at /users/{username}."),
"instance_admin": boolean("Instance administrator. Only on the signed-in user."),
"language": str("Interface language. Only on the signed-in user."),
"counts": obj("Totals the viewer is allowed to see.", map[string]any{
"repos": integer("Owned repositories visible to the viewer."),
"groups": integer("Groups the user belongs to that the viewer may see."),
"contributions": integer("Contributions in the last 12 months in repositories the viewer may see."),
}),
"repos": map[string]any{"type": "array", "description": "Owned repositories visible to the viewer.", "items": schemaRef("UserRepo")},
"groups": map[string]any{"type": "array", "description": "Groups visible to the viewer.", "items": schemaRef("UserGroup")},
}),
"UserUpdate": obj("Fields to change on the signed-in user. Omitted fields stay unchanged.", map[string]any{
"name": str("Display name. Empty clears it."),
"bio": str("Profile text. Empty clears it. Newlines are kept."),
"language": str("Interface language."),
}),
"UserRepo": obj("Repository on a user profile.", map[string]any{
"id": integer("Repository id."),
"name": str("Repository name."),
"path": str("Full path, owner/name."),
"description": str("Description."),
"visibility": str("public or private."),
"web_url": str("Full page URL."),
}),
"UserGroup": obj("Group on a user profile.", map[string]any{
"id": integer("Group id."),
"name": str("Group name."),
"path": str("Group path."),
"description": str("Description."),
"visibility": str("public or private."),
"web_url": str("Full page URL."),
}),
"WebhookCreate": obj("Create a webhook. Preset fields depend on the chosen preset.", map[string]any{
"name": str("Display name."),
"preset": str("Preset name."),
@@ -84,6 +84,10 @@ func apiBinds() []apiBind { branch = branches + "/{branch}" branch = branches + "/{branch}" ) ) return []apiBind{ return []apiBind{ {path: "/user", method: "GET", code: "200", resp: "User"}, {path: "/user", method: "PUT", code: "200", body: "UserUpdate", resp: "User"}, {path: "/users/{username}", method: "GET", code: "200", resp: "User"}, {path: mrs, method: "GET", code: "200", resp: "MergeRequest", array: true}, {path: mrs, method: "GET", code: "200", resp: "MergeRequest", array: true}, {path: mrs, method: "POST", code: "201", body: "MergeRequestCreate", resp: "MergeRequest"}, {path: mrs, method: "POST", code: "201", body: "MergeRequestCreate", resp: "MergeRequest"}, {path: mr, method: "GET", code: "200", resp: "MergeRequest"}, {path: mr, method: "GET", code: "200", resp: "MergeRequest"},@@ -267,6 +271,45 @@ func apiSchemas() map[string]any { "branch_filter": str("Branch filter. Empty matches every branch."), "branch_filter": str("Branch filter. Empty matches every branch."), "active": boolean("Hook is enabled."), "active": boolean("Hook is enabled."), }), }), "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{ "id": integer("User id."), "username": str("Username."), "name": str("Display name. Empty when unset."), "bio": str("Profile text. Empty when unset."), "avatar_url": str("Avatar URL."), "created_at": when, "web_url": str("Profile page at /users/{username}."), "instance_admin": boolean("Instance administrator. Only on the signed-in user."), "language": str("Interface language. Only on the signed-in user."), "counts": obj("Totals the viewer is allowed to see.", map[string]any{ "repos": integer("Owned repositories visible to the viewer."), "groups": integer("Groups the user belongs to that the viewer may see."), "contributions": integer("Contributions in the last 12 months in repositories the viewer may see."), }), "repos": map[string]any{"type": "array", "description": "Owned repositories visible to the viewer.", "items": schemaRef("UserRepo")}, "groups": map[string]any{"type": "array", "description": "Groups visible to the viewer.", "items": schemaRef("UserGroup")}, }), "UserUpdate": obj("Fields to change on the signed-in user. Omitted fields stay unchanged.", map[string]any{ "name": str("Display name. Empty clears it."), "bio": str("Profile text. Empty clears it. Newlines are kept."), "language": str("Interface language."), }), "UserRepo": obj("Repository on a user profile.", map[string]any{ "id": integer("Repository id."), "name": str("Repository name."), "path": str("Full path, owner/name."), "description": str("Description."), "visibility": str("public or private."), "web_url": str("Full page URL."), }), "UserGroup": obj("Group on a user profile.", map[string]any{ "id": integer("Group id."), "name": str("Group name."), "path": str("Group path."), "description": str("Description."), "visibility": str("public or private."), "web_url": str("Full page URL."), }), "WebhookCreate": obj("Create a webhook. Preset fields depend on the chosen preset.", map[string]any{ "WebhookCreate": obj("Create a webhook. Preset fields depend on the chosen preset.", map[string]any{ "name": str("Display name."), "name": str("Display name."), "preset": str("Preset name."), "preset": str("Preset name."),@@ -14,7 +14,7 @@ import (
func TestOpenAPISchemas(t *testing.T) {
doc := openAPIDoc()
schemas := doc["components"].(map[string]any)["schemas"].(map[string]any)
for _, name := range []string{"Error", "MergeRequest", "Issue", "Pipeline", "Job", "Branch", "Webhook"} {
for _, name := range []string{"Error", "MergeRequest", "Issue", "Pipeline", "Job", "Branch", "Webhook", "User", "UserUpdate"} {
if _, ok := schemas[name]; !ok {
t.Errorf("schema %s ontbreekt", name)
}
@@ -61,6 +61,16 @@ func TestOpenAPISchemas(t *testing.T) {
assertResp(t, paths, "/projects/{owner}/{repo}/webhooks", "post", "201", "#/components/schemas/Webhook")
assertItems(t, paths, "/groups/{path}/webhooks", "get", "200", "#/components/schemas/Webhook")
assertBody(t, paths, "/groups/{path}/webhooks", "post", "WebhookCreate")
user := schemas["User"].(map[string]any)["properties"].(map[string]any)
for _, key := range []string{"name", "bio", "web_url", "counts", "repos", "groups"} {
if _, ok := user[key]; !ok {
t.Errorf("User mist %s", key)
}
}
assertBody(t, paths, "/user", "put", "UserUpdate")
assertResp(t, paths, "/user", "get", "200", "#/components/schemas/User")
assertResp(t, paths, "/users/{username}", "get", "200", "#/components/schemas/User")
}
func TestResourceWebURL(t *testing.T) {
@@ -14,7 +14,7 @@ import (func TestOpenAPISchemas(t *testing.T) {func TestOpenAPISchemas(t *testing.T) { doc := openAPIDoc() doc := openAPIDoc() schemas := doc["components"].(map[string]any)["schemas"].(map[string]any) schemas := doc["components"].(map[string]any)["schemas"].(map[string]any) for _, name := range []string{"Error", "MergeRequest", "Issue", "Pipeline", "Job", "Branch", "Webhook"} { for _, name := range []string{"Error", "MergeRequest", "Issue", "Pipeline", "Job", "Branch", "Webhook", "User", "UserUpdate"} { if _, ok := schemas[name]; !ok { if _, ok := schemas[name]; !ok { t.Errorf("schema %s ontbreekt", name) t.Errorf("schema %s ontbreekt", name) } }@@ -61,6 +61,16 @@ func TestOpenAPISchemas(t *testing.T) { assertResp(t, paths, "/projects/{owner}/{repo}/webhooks", "post", "201", "#/components/schemas/Webhook") assertResp(t, paths, "/projects/{owner}/{repo}/webhooks", "post", "201", "#/components/schemas/Webhook") assertItems(t, paths, "/groups/{path}/webhooks", "get", "200", "#/components/schemas/Webhook") assertItems(t, paths, "/groups/{path}/webhooks", "get", "200", "#/components/schemas/Webhook") assertBody(t, paths, "/groups/{path}/webhooks", "post", "WebhookCreate") assertBody(t, paths, "/groups/{path}/webhooks", "post", "WebhookCreate") user := schemas["User"].(map[string]any)["properties"].(map[string]any) for _, key := range []string{"name", "bio", "web_url", "counts", "repos", "groups"} { if _, ok := user[key]; !ok { t.Errorf("User mist %s", key) } } assertBody(t, paths, "/user", "put", "UserUpdate") assertResp(t, paths, "/user", "get", "200", "#/components/schemas/User") assertResp(t, paths, "/users/{username}", "get", "200", "#/components/schemas/User")}}func TestResourceWebURL(t *testing.T) {func TestResourceWebURL(t *testing.T) {@@ -11,7 +11,7 @@ var apiCatalog = []apiRoute{
{http.MethodGet, "/api/v1/ci/presets", access.ScopePublic, authPublic, "CI image presets", (*Server).apiPresets},
{http.MethodGet, "/api/v1/user", access.ScopeRead, authUser, "Current user", (*Server).apiGetUser},
{http.MethodPut, "/api/v1/user", access.ScopeWrite, authUser, "Update profile language", (*Server).apiPutUser},
{http.MethodPut, "/api/v1/user", access.ScopeWrite, authUser, "Update profile", (*Server).apiPutUser},
{http.MethodGet, "/api/v1/user/export", access.ScopeRead, authUser, "Export account", (*Server).apiExport},
{http.MethodGet, "/api/v1/users/{username}", access.ScopeRead, authUser, "User profile", (*Server).apiUserByName},
{http.MethodGet, "/api/v1/user/tokens", access.ScopeRead, authUser, "List access tokens", (*Server).apiListTokens},
@@ -11,7 +11,7 @@ var apiCatalog = []apiRoute{ {http.MethodGet, "/api/v1/ci/presets", access.ScopePublic, authPublic, "CI image presets", (*Server).apiPresets}, {http.MethodGet, "/api/v1/ci/presets", access.ScopePublic, authPublic, "CI image presets", (*Server).apiPresets}, {http.MethodGet, "/api/v1/user", access.ScopeRead, authUser, "Current user", (*Server).apiGetUser}, {http.MethodGet, "/api/v1/user", access.ScopeRead, authUser, "Current user", (*Server).apiGetUser}, {http.MethodPut, "/api/v1/user", access.ScopeWrite, authUser, "Update profile language", (*Server).apiPutUser}, {http.MethodPut, "/api/v1/user", access.ScopeWrite, authUser, "Update profile", (*Server).apiPutUser}, {http.MethodGet, "/api/v1/user/export", access.ScopeRead, authUser, "Export account", (*Server).apiExport}, {http.MethodGet, "/api/v1/user/export", access.ScopeRead, authUser, "Export account", (*Server).apiExport}, {http.MethodGet, "/api/v1/users/{username}", access.ScopeRead, authUser, "User profile", (*Server).apiUserByName}, {http.MethodGet, "/api/v1/users/{username}", access.ScopeRead, authUser, "User profile", (*Server).apiUserByName}, {http.MethodGet, "/api/v1/user/tokens", access.ScopeRead, authUser, "List access tokens", (*Server).apiListTokens}, {http.MethodGet, "/api/v1/user/tokens", access.ScopeRead, authUser, "List access tokens", (*Server).apiListTokens},@@ -113,6 +113,13 @@ func (s *Server) home(w http.ResponseWriter, r *http.Request) {
v.Title = s.tr(r, "nav.dashboard")
v.Page = "dashboard"
v.Heat = s.heatmap(r.Context(), v.User.ID, ids, s.langOf(r))
total := 0
if v.Heat != nil {
total = v.Heat.Total
}
card, _, _ := s.profileCard(r, *v.User, v.User.ID, total)
card.Heading = "h2"
v.Card = &card
s.render(w, "dashboard", v)
return
}
@@ -113,6 +113,13 @@ func (s *Server) home(w http.ResponseWriter, r *http.Request) { v.Title = s.tr(r, "nav.dashboard") v.Title = s.tr(r, "nav.dashboard") v.Page = "dashboard" v.Page = "dashboard" v.Heat = s.heatmap(r.Context(), v.User.ID, ids, s.langOf(r)) v.Heat = s.heatmap(r.Context(), v.User.ID, ids, s.langOf(r)) total := 0 if v.Heat != nil { total = v.Heat.Total } card, _, _ := s.profileCard(r, *v.User, v.User.ID, total) card.Heading = "h2" v.Card = &card s.render(w, "dashboard", v) s.render(w, "dashboard", v) return return } }@@ -59,6 +59,7 @@ type IssueRow struct {
Title string
Status string
Author string
AuthorURL string
Confidential bool
Milestone string
Due string
@@ -70,9 +71,10 @@ type IssueRow struct {
// IssueNoteRow is een gerenderde reactie.
type IssueNoteRow struct {
Author string
When string
HTML template.HTML
Author string
AuthorURL string
When string
HTML template.HTML
}
var (
@@ -227,10 +229,14 @@ func (s *Server) showIssue(w http.ResponseWriter, r *http.Request) {
b.People = markChoices(b.People, iss.Assignees)
notes, _ := s.Store.ListIssueNotes(r.Context(), iss.ID)
for _, n := range notes {
noteURL := ""
if n.Author != "" {
noteURL = "/users/" + n.Author
}
b.Notes = append(b.Notes, IssueNoteRow{
Author: n.Author,
When: i18n.FormatDate(s.langOf(r), n.CreatedAt),
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))),
Author: n.Author, AuthorURL: noteURL,
When: i18n.FormatDate(s.langOf(r), n.CreatedAt),
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))),
})
}
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,
}
func (s *Server) issueRow(r *http.Request, repo store.Repo, iss store.Issue) IssueRow {
url := ""
if iss.Author != "" {
url = "/users/" + iss.Author
}
return IssueRow{
Number: iss.Number, Title: iss.Title, Status: iss.Status, Author: iss.Author,
Number: iss.Number, Title: iss.Title, Status: iss.Status, Author: iss.Author, AuthorURL: url,
Confidential: iss.Confidential, Milestone: iss.Milestone, Due: iss.DueOn,
When: i18n.FormatDate(s.langOf(r), iss.CreatedAt), Assignees: strings.Join(iss.Assignees, ", "),
Labels: iss.Labels, HTML: template.HTML(markdown.Render(iss.Description, "", "", "/"+repo.FullPath())),
@@ -59,6 +59,7 @@ type IssueRow struct { Title string Title string Status string Status string Author string Author string AuthorURL string Confidential bool Confidential bool Milestone string Milestone string Due string Due string@@ -70,9 +71,10 @@ type IssueRow struct {// IssueNoteRow is een gerenderde reactie.// IssueNoteRow is een gerenderde reactie.type IssueNoteRow struct {type IssueNoteRow struct { Author string Author string When string AuthorURL string HTML template.HTML When string HTML template.HTML}}var (var (@@ -227,10 +229,14 @@ func (s *Server) showIssue(w http.ResponseWriter, r *http.Request) { b.People = markChoices(b.People, iss.Assignees) b.People = markChoices(b.People, iss.Assignees) notes, _ := s.Store.ListIssueNotes(r.Context(), iss.ID) notes, _ := s.Store.ListIssueNotes(r.Context(), iss.ID) for _, n := range notes { for _, n := range notes { noteURL := "" if n.Author != "" { noteURL = "/users/" + n.Author } b.Notes = append(b.Notes, IssueNoteRow{ b.Notes = append(b.Notes, IssueNoteRow{ Author: n.Author, Author: n.Author, AuthorURL: noteURL, When: i18n.FormatDate(s.langOf(r), n.CreatedAt), When: i18n.FormatDate(s.langOf(r), n.CreatedAt), 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))), 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))), }) }) } } related, _ := s.Store.RelatedIssues(r.Context(), repo.ID, iss.ID) 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,}}func (s *Server) issueRow(r *http.Request, repo store.Repo, iss store.Issue) IssueRow {func (s *Server) issueRow(r *http.Request, repo store.Repo, iss store.Issue) IssueRow { url := "" if iss.Author != "" { url = "/users/" + iss.Author } return IssueRow{ return IssueRow{ Number: iss.Number, Title: iss.Title, Status: iss.Status, Author: iss.Author, Number: iss.Number, Title: iss.Title, Status: iss.Status, Author: iss.Author, AuthorURL: url, Confidential: iss.Confidential, Milestone: iss.Milestone, Due: iss.DueOn, Confidential: iss.Confidential, Milestone: iss.Milestone, Due: iss.DueOn, When: i18n.FormatDate(s.langOf(r), iss.CreatedAt), Assignees: strings.Join(iss.Assignees, ", "), When: i18n.FormatDate(s.langOf(r), iss.CreatedAt), Assignees: strings.Join(iss.Assignees, ", "), Labels: iss.Labels, HTML: template.HTML(markdown.Render(iss.Description, "", "", "/"+repo.FullPath())), Labels: iss.Labels, HTML: template.HTML(markdown.Render(iss.Description, "", "", "/"+repo.FullPath())),@@ -54,6 +54,18 @@ func (s *Server) csrfValue(w http.ResponseWriter, r *http.Request) bool {
return true
}
func (s *Server) saveProfile(w http.ResponseWriter, r *http.Request) {
u, ok := s.loginRequired(w, r)
if !ok || !s.csrfOK(w, r) {
return
}
if _, err := s.opSetProfile(r.Context(), u, r.FormValue("name"), r.FormValue("bio")); err != nil {
s.redirect(w, r, "/settings", "", s.trErr(r, err))
return
}
s.redirect(w, r, "/settings", s.tr(r, "flash.profile"), "")
}
func (s *Server) saveLanguage(w http.ResponseWriter, r *http.Request) {
u, ok := s.loginRequired(w, r)
if !ok || !s.csrfOK(w, r) {
@@ -54,6 +54,18 @@ func (s *Server) csrfValue(w http.ResponseWriter, r *http.Request) bool { return true return true}}func (s *Server) saveProfile(w http.ResponseWriter, r *http.Request) { u, ok := s.loginRequired(w, r) if !ok || !s.csrfOK(w, r) { return } if _, err := s.opSetProfile(r.Context(), u, r.FormValue("name"), r.FormValue("bio")); err != nil { s.redirect(w, r, "/settings", "", s.trErr(r, err)) return } s.redirect(w, r, "/settings", s.tr(r, "flash.profile"), "")}func (s *Server) saveLanguage(w http.ResponseWriter, r *http.Request) {func (s *Server) saveLanguage(w http.ResponseWriter, r *http.Request) { u, ok := s.loginRequired(w, r) u, ok := s.loginRequired(w, r) if !ok || !s.csrfOK(w, r) { if !ok || !s.csrfOK(w, r) {@@ -158,8 +158,14 @@ func (s *Server) fillCompare(r *http.Request, v *View, repo store.Repo, from, to
func (s *Server) fillTimeline(r *http.Request, v *View, repo store.Repo, mr store.MergeRequest, rows []NoteRow) {
lang := s.langOf(r)
known := map[string]store.User{}
who := func(name string) (string, string) {
shown, _, url := s.actorOf(r, name, known)
return shown, url
}
opened, openedURL := who(mr.Author)
items := []TimelineItem{{
Kind: "opened", Actor: mr.Author, Text: s.tr(r, "mr.opened"),
Kind: "opened", Actor: opened, ActorURL: openedURL, Text: s.tr(r, "mr.opened"),
When: i18n.FormatDate(lang, mr.CreatedAt), At: mr.CreatedAt, Rank: 0,
}}
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
if key == "" {
continue
}
actor, actorURL := who(e.Actor)
items = append(items, TimelineItem{
Kind: e.Kind, Actor: e.Actor, Text: s.tr(r, key), Body: e.Body,
Kind: e.Kind, Actor: actor, ActorURL: actorURL, Text: s.tr(r, key), Body: e.Body,
When: i18n.FormatDate(lang, e.CreatedAt), At: e.CreatedAt, Rank: 2,
})
}
revs, _ := s.Store.ListReviews(r.Context(), mr.ID)
for _, rev := range revs {
actor, actorURL := who(rev.Username)
items = append(items, TimelineItem{
Kind: "review", Actor: rev.Username, Text: s.tr(r, "rev."+rev.Status),
Kind: "review", Actor: actor, ActorURL: actorURL, Text: s.tr(r, "rev."+rev.Status),
When: i18n.FormatDate(lang, rev.UpdatedAt), At: rev.UpdatedAt, Rank: 3,
})
}
@@ -185,9 +193,10 @@ func (s *Server) fillTimeline(r *http.Request, v *View, repo store.Repo, mr stor
jobs, _ := s.Store.JobsByPipeline(r.Context(), p.ID)
status := displayStatus(p.Status, jobs)
label := s.tr(r, "pipe."+status)
v.PipeRows = append(v.PipeRows, s.pipeRow(r, lang, repo, p, map[string]store.User{}, s.queueRanks(r.Context())))
row := s.pipeRow(r, lang, repo, p, known, s.queueRanks(r.Context()))
v.PipeRows = append(v.PipeRows, row)
items = append(items, TimelineItem{
Kind: "pipeline", Actor: p.Actor,
Kind: "pipeline", Actor: row.Actor, ActorURL: row.ActorURL,
Text: s.tr(r, "mr.pipeEvent", p.ID, label),
URL: repoURL(repo) + "/-/pipelines/" + strconv.FormatInt(p.ID, 10),
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
continue
}
item := TimelineItem{
ID: n.ID, Kind: "comment", Actor: n.Author, Text: s.tr(r, "mr.commented"),
ID: n.ID, Kind: "comment", Actor: n.Author, ActorURL: n.AuthorURL, Text: s.tr(r, "mr.commented"),
HTML: n.HTML, When: n.When, At: n.At, Rank: 4,
}
for _, rp := range n.Replies {
item.Replies = append(item.Replies, TimelineItem{Actor: rp.Author, HTML: rp.HTML, When: rp.When})
item.Replies = append(item.Replies, TimelineItem{Actor: rp.Author, ActorURL: rp.AuthorURL, HTML: rp.HTML, When: rp.When})
}
items = append(items, item)
}
@@ -158,8 +158,14 @@ func (s *Server) fillCompare(r *http.Request, v *View, repo store.Repo, from, tofunc (s *Server) fillTimeline(r *http.Request, v *View, repo store.Repo, mr store.MergeRequest, rows []NoteRow) {func (s *Server) fillTimeline(r *http.Request, v *View, repo store.Repo, mr store.MergeRequest, rows []NoteRow) { lang := s.langOf(r) lang := s.langOf(r) known := map[string]store.User{} who := func(name string) (string, string) { shown, _, url := s.actorOf(r, name, known) return shown, url } opened, openedURL := who(mr.Author) items := []TimelineItem{{ items := []TimelineItem{{ Kind: "opened", Actor: mr.Author, Text: s.tr(r, "mr.opened"), Kind: "opened", Actor: opened, ActorURL: openedURL, Text: s.tr(r, "mr.opened"), When: i18n.FormatDate(lang, mr.CreatedAt), At: mr.CreatedAt, Rank: 0, When: i18n.FormatDate(lang, mr.CreatedAt), At: mr.CreatedAt, Rank: 0, }} }} events, _ := s.Store.ListMREvents(r.Context(), mr.ID) 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 if key == "" { if key == "" { continue continue } } actor, actorURL := who(e.Actor) items = append(items, TimelineItem{ items = append(items, TimelineItem{ Kind: e.Kind, Actor: e.Actor, Text: s.tr(r, key), Body: e.Body, Kind: e.Kind, Actor: actor, ActorURL: actorURL, Text: s.tr(r, key), Body: e.Body, When: i18n.FormatDate(lang, e.CreatedAt), At: e.CreatedAt, Rank: 2, When: i18n.FormatDate(lang, e.CreatedAt), At: e.CreatedAt, Rank: 2, }) }) } } revs, _ := s.Store.ListReviews(r.Context(), mr.ID) revs, _ := s.Store.ListReviews(r.Context(), mr.ID) for _, rev := range revs { for _, rev := range revs { actor, actorURL := who(rev.Username) items = append(items, TimelineItem{ items = append(items, TimelineItem{ Kind: "review", Actor: rev.Username, Text: s.tr(r, "rev."+rev.Status), Kind: "review", Actor: actor, ActorURL: actorURL, Text: s.tr(r, "rev."+rev.Status), When: i18n.FormatDate(lang, rev.UpdatedAt), At: rev.UpdatedAt, Rank: 3, When: i18n.FormatDate(lang, rev.UpdatedAt), At: rev.UpdatedAt, Rank: 3, }) }) } }@@ -185,9 +193,10 @@ func (s *Server) fillTimeline(r *http.Request, v *View, repo store.Repo, mr stor jobs, _ := s.Store.JobsByPipeline(r.Context(), p.ID) jobs, _ := s.Store.JobsByPipeline(r.Context(), p.ID) status := displayStatus(p.Status, jobs) status := displayStatus(p.Status, jobs) label := s.tr(r, "pipe."+status) label := s.tr(r, "pipe."+status) v.PipeRows = append(v.PipeRows, s.pipeRow(r, lang, repo, p, map[string]store.User{}, s.queueRanks(r.Context()))) row := s.pipeRow(r, lang, repo, p, known, s.queueRanks(r.Context())) v.PipeRows = append(v.PipeRows, row) items = append(items, TimelineItem{ items = append(items, TimelineItem{ Kind: "pipeline", Actor: p.Actor, Kind: "pipeline", Actor: row.Actor, ActorURL: row.ActorURL, Text: s.tr(r, "mr.pipeEvent", p.ID, label), Text: s.tr(r, "mr.pipeEvent", p.ID, label), URL: repoURL(repo) + "/-/pipelines/" + strconv.FormatInt(p.ID, 10), URL: repoURL(repo) + "/-/pipelines/" + strconv.FormatInt(p.ID, 10), When: i18n.FormatDate(lang, p.CreatedAt), At: p.CreatedAt, Rank: 1, 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 continue continue } } item := TimelineItem{ item := TimelineItem{ ID: n.ID, Kind: "comment", Actor: n.Author, Text: s.tr(r, "mr.commented"), ID: n.ID, Kind: "comment", Actor: n.Author, ActorURL: n.AuthorURL, Text: s.tr(r, "mr.commented"), HTML: n.HTML, When: n.When, At: n.At, Rank: 4, HTML: n.HTML, When: n.When, At: n.At, Rank: 4, } } for _, rp := range n.Replies { for _, rp := range n.Replies { item.Replies = append(item.Replies, TimelineItem{Actor: rp.Author, HTML: rp.HTML, When: rp.When}) item.Replies = append(item.Replies, TimelineItem{Actor: rp.Author, ActorURL: rp.AuthorURL, HTML: rp.HTML, When: rp.When}) } } items = append(items, item) items = append(items, item) } }@@ -4,6 +4,7 @@ import (
"context"
"strings"
"time"
"unicode/utf8"
"gitlab.com/Timfa/bluegit/internal/access"
"gitlab.com/Timfa/bluegit/internal/i18n"
@@ -50,6 +51,29 @@ func (s *Server) opRemoveSSH(ctx context.Context, user store.User, id int64) err
return nil
}
func cleanProfile(name, bio string) (string, string, error) {
name = strings.TrimSpace(name)
bio = strings.TrimSpace(bio)
if strings.ContainsAny(name, "\r\n\x00") || utf8.RuneCountInString(name) > 80 {
return "", "", i18n.E("err.profileName")
}
if strings.ContainsRune(bio, 0) || utf8.RuneCountInString(bio) > 280 {
return "", "", i18n.E("err.profileBio")
}
return name, bio, nil
}
func (s *Server) opSetProfile(ctx context.Context, user store.User, name, bio string) (store.User, error) {
name, bio, err := cleanProfile(name, bio)
if err != nil {
return user, fail(400, err)
}
if err := s.Store.SetProfile(ctx, user.ID, name, bio); err != nil {
return user, fail(400, err)
}
return s.Store.UserByID(ctx, user.ID)
}
func (s *Server) opSetLanguage(ctx context.Context, user store.User, raw string) (i18n.Lang, error) {
lang := i18n.Parse(raw)
if err := s.Store.SetLanguage(ctx, user.ID, string(lang)); err != nil {
@@ -4,6 +4,7 @@ import ( "context" "context" "strings" "strings" "time" "time" "unicode/utf8" "gitlab.com/Timfa/bluegit/internal/access" "gitlab.com/Timfa/bluegit/internal/access" "gitlab.com/Timfa/bluegit/internal/i18n" "gitlab.com/Timfa/bluegit/internal/i18n"@@ -50,6 +51,29 @@ func (s *Server) opRemoveSSH(ctx context.Context, user store.User, id int64) err return nil return nil}}func cleanProfile(name, bio string) (string, string, error) { name = strings.TrimSpace(name) bio = strings.TrimSpace(bio) if strings.ContainsAny(name, "\r\n\x00") || utf8.RuneCountInString(name) > 80 { return "", "", i18n.E("err.profileName") } if strings.ContainsRune(bio, 0) || utf8.RuneCountInString(bio) > 280 { return "", "", i18n.E("err.profileBio") } return name, bio, nil}func (s *Server) opSetProfile(ctx context.Context, user store.User, name, bio string) (store.User, error) { name, bio, err := cleanProfile(name, bio) if err != nil { return user, fail(400, err) } if err := s.Store.SetProfile(ctx, user.ID, name, bio); err != nil { return user, fail(400, err) } return s.Store.UserByID(ctx, user.ID)}func (s *Server) opSetLanguage(ctx context.Context, user store.User, raw string) (i18n.Lang, error) {func (s *Server) opSetLanguage(ctx context.Context, user store.User, raw string) (i18n.Lang, error) { lang := i18n.Parse(raw) lang := i18n.Parse(raw) if err := s.Store.SetLanguage(ctx, user.ID, string(lang)); err != nil { if err := s.Store.SetLanguage(ctx, user.ID, string(lang)); err != nil {@@ -29,9 +29,80 @@ func (s *Server) profile(w http.ResponseWriter, r *http.Request) {
ids = nil
}
v.Heat = s.heatmap(r.Context(), u.ID, ids, s.langOf(r))
total := 0
if v.Heat != nil {
total = v.Heat.Total
}
card, repos, groups := s.profileCard(r, u, viewer, total)
card.Heading = "h1"
v.Card = &card
v.Repos = repos
v.Groups = groups
s.render(w, "profile", v)
}
// profileCard bouwt het blok en de lijsten van iemands eigen repositories
// en groepen, beperkt tot wat de kijker mag zien.
func (s *Server) profileCard(r *http.Request, person store.User, viewer int64, contrib int) (ProfileCard, []store.Repo, []store.Group) {
repos := s.ownedReposVisible(r.Context(), person.ID, viewer)
groups := s.groupsVisible(r.Context(), person.ID, viewer)
name := strings.TrimSpace(person.DisplayName)
if name == "" {
name = person.Username
}
card := ProfileCard{
User: person, Name: name, Since: i18n.FormatDate(s.langOf(r), person.CreatedAt),
Bio: strings.TrimSpace(person.Bio), URL: s.absURL("/users/" + person.Username),
Repos: len(repos), Groups: len(groups), Contrib: contrib,
Own: viewer != 0 && viewer == person.ID,
}
return card, repos, groups
}
func (s *Server) ownedReposVisible(ctx context.Context, owner, viewer int64) []store.Repo {
all, err := s.Store.ReposByOwner(ctx, owner)
if err != nil {
return nil
}
allowed, err := s.Store.ListRepoIDs(ctx, viewer)
if err != nil {
return nil
}
set := map[int64]bool{}
for _, id := range allowed {
set[id] = true
}
var out []store.Repo
for _, repo := range all {
if set[repo.ID] {
out = append(out, repo)
}
}
return out
}
func (s *Server) groupsVisible(ctx context.Context, member, viewer int64) []store.Group {
all, err := s.Store.ListGroups(ctx, member)
if err != nil {
return nil
}
var out []store.Group
for _, g := range all {
if g.Visibility == "public" {
out = append(out, g)
continue
}
if viewer == 0 {
continue
}
role, err := s.Store.GroupRole(ctx, g.ID, viewer)
if err == nil && role.CanRead() {
out = append(out, g)
}
}
return out
}
func (s *Server) presentCommits(ctx context.Context, repoID int64, in []gitrepo.Commit, lang i18n.Lang) []CommitRow {
shas := make([]string, 0, len(in))
for _, c := range in {
@@ -29,9 +29,80 @@ func (s *Server) profile(w http.ResponseWriter, r *http.Request) { ids = nil ids = nil } } v.Heat = s.heatmap(r.Context(), u.ID, ids, s.langOf(r)) v.Heat = s.heatmap(r.Context(), u.ID, ids, s.langOf(r)) total := 0 if v.Heat != nil { total = v.Heat.Total } card, repos, groups := s.profileCard(r, u, viewer, total) card.Heading = "h1" v.Card = &card v.Repos = repos v.Groups = groups s.render(w, "profile", v) s.render(w, "profile", v)}}// profileCard bouwt het blok en de lijsten van iemands eigen repositories// en groepen, beperkt tot wat de kijker mag zien.func (s *Server) profileCard(r *http.Request, person store.User, viewer int64, contrib int) (ProfileCard, []store.Repo, []store.Group) { repos := s.ownedReposVisible(r.Context(), person.ID, viewer) groups := s.groupsVisible(r.Context(), person.ID, viewer) name := strings.TrimSpace(person.DisplayName) if name == "" { name = person.Username } card := ProfileCard{ User: person, Name: name, Since: i18n.FormatDate(s.langOf(r), person.CreatedAt), Bio: strings.TrimSpace(person.Bio), URL: s.absURL("/users/" + person.Username), Repos: len(repos), Groups: len(groups), Contrib: contrib, Own: viewer != 0 && viewer == person.ID, } return card, repos, groups}func (s *Server) ownedReposVisible(ctx context.Context, owner, viewer int64) []store.Repo { all, err := s.Store.ReposByOwner(ctx, owner) if err != nil { return nil } allowed, err := s.Store.ListRepoIDs(ctx, viewer) if err != nil { return nil } set := map[int64]bool{} for _, id := range allowed { set[id] = true } var out []store.Repo for _, repo := range all { if set[repo.ID] { out = append(out, repo) } } return out}func (s *Server) groupsVisible(ctx context.Context, member, viewer int64) []store.Group { all, err := s.Store.ListGroups(ctx, member) if err != nil { return nil } var out []store.Group for _, g := range all { if g.Visibility == "public" { out = append(out, g) continue } if viewer == 0 { continue } role, err := s.Store.GroupRole(ctx, g.ID, viewer) if err == nil && role.CanRead() { out = append(out, g) } } return out}func (s *Server) presentCommits(ctx context.Context, repoID int64, in []gitrepo.Commit, lang i18n.Lang) []CommitRow {func (s *Server) presentCommits(ctx context.Context, repoID int64, in []gitrepo.Commit, lang i18n.Lang) []CommitRow { shas := make([]string, 0, len(in)) shas := make([]string, 0, len(in)) for _, c := range in { for _, c := range in {@@ -31,6 +31,7 @@ type PipeRow struct {
SourceLabel string
MRNumber int64
Actor string
ActorURL string
Avatar string
Initial string
Stages []StageView
@@ -64,6 +65,7 @@ type JobPage struct {
Status string
Label string
Actor string
ActorURL string
Avatar string
Initial string
When string
@@ -152,7 +154,7 @@ func (s *Server) pipeRow(r *http.Request, lang i18n.Lang, repo store.Repo, p sto
jobs, _ := s.Store.JobsByPipeline(r.Context(), p.ID)
name, kind := ci.SplitRef(p.Ref)
status := displayStatus(p.Status, jobs)
actor, avatar := s.actorOf(r, p.Actor, users)
actor, avatar, actorURL := s.actorOf(r, p.Actor, users)
initial := ""
if actor != "" {
initial = strings.ToUpper(actor[:1])
@@ -163,7 +165,7 @@ func (s *Server) pipeRow(r *http.Request, lang i18n.Lang, repo store.Repo, p sto
Duration: pipelineClock(p), When: i18n.Ago(lang, p.CreatedAt.Unix()),
Title: p.CommitTitle, SHA: p.CommitSHA, Short: shortSHA(p.CommitSHA),
Ref: name, RefKind: kind, Source: p.Source, SourceLabel: sourceLabel, MRNumber: mrNumber,
Actor: actor, Avatar: avatar, Initial: initial,
Actor: actor, ActorURL: actorURL, Avatar: avatar, Initial: initial,
Stages: stageViews(jobs, ranks, func(key string, args ...any) string { return s.tr(r, key, args...) }),
}
}
@@ -201,10 +203,10 @@ func (s *Server) pipelineSourceText(r *http.Request, repo store.Repo, p store.Pi
return label + " !" + strconv.FormatInt(number, 10)
}
func (s *Server) actorOf(r *http.Request, name string, cache map[string]store.User) (string, string) {
func (s *Server) actorOf(r *http.Request, name string, cache map[string]store.User) (string, string, string) {
name = strings.TrimSpace(name)
if name == "" {
return "", ""
return "", "", ""
}
u, ok := cache[name]
if !ok {
@@ -215,9 +217,9 @@ func (s *Server) actorOf(r *http.Request, name string, cache map[string]store.Us
cache[name] = u
}
if u.ID == 0 {
return name, ""
return name, "", ""
}
return u.Username, u.AvatarURL
return u.Username, u.AvatarURL, "/users/" + u.Username
}
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
lang := s.langOf(r)
jobs, _ := s.Store.JobsByPipeline(r.Context(), p.ID)
users := map[string]store.User{}
actor, avatar := s.actorOf(r, p.Actor, users)
actor, avatar, actorURL := s.actorOf(r, p.Actor, users)
initial := ""
if actor != "" {
initial = strings.ToUpper(actor[:1])
@@ -544,7 +546,7 @@ func (s *Server) jobPage(r *http.Request, repo store.Repo, p store.Pipeline, job
}
return &JobPage{
Job: job, Pipe: p, Name: job.Name, Status: status, Label: s.tr(r, "pipe."+status),
Actor: actor, Avatar: avatar, Initial: initial, When: i18n.Ago(lang, p.CreatedAt.Unix()),
Actor: actor, ActorURL: actorURL, Avatar: avatar, Initial: initial, When: i18n.Ago(lang, p.CreatedAt.Unix()),
Duration: dur, Finished: finished, Queued: queued, Timeout: timeout, Source: source,
Ref: name, RefKind: kind, Short: shortSHA(p.CommitSHA), Title: p.CommitTitle, Stage: job.Stage,
PipeStatus: pipeStatus, PipeLabel: s.tr(r, "pipe."+pipeStatus),
@@ -31,6 +31,7 @@ type PipeRow struct { SourceLabel string SourceLabel string MRNumber int64 MRNumber int64 Actor string Actor string ActorURL string Avatar string Avatar string Initial string Initial string Stages []StageView Stages []StageView@@ -64,6 +65,7 @@ type JobPage struct { Status string Status string Label string Label string Actor string Actor string ActorURL string Avatar string Avatar string Initial string Initial string When string When string@@ -152,7 +154,7 @@ func (s *Server) pipeRow(r *http.Request, lang i18n.Lang, repo store.Repo, p sto jobs, _ := s.Store.JobsByPipeline(r.Context(), p.ID) jobs, _ := s.Store.JobsByPipeline(r.Context(), p.ID) name, kind := ci.SplitRef(p.Ref) name, kind := ci.SplitRef(p.Ref) status := displayStatus(p.Status, jobs) status := displayStatus(p.Status, jobs) actor, avatar := s.actorOf(r, p.Actor, users) actor, avatar, actorURL := s.actorOf(r, p.Actor, users) initial := "" initial := "" if actor != "" { if actor != "" { initial = strings.ToUpper(actor[:1]) initial = strings.ToUpper(actor[:1])@@ -163,7 +165,7 @@ func (s *Server) pipeRow(r *http.Request, lang i18n.Lang, repo store.Repo, p sto Duration: pipelineClock(p), When: i18n.Ago(lang, p.CreatedAt.Unix()), Duration: pipelineClock(p), When: i18n.Ago(lang, p.CreatedAt.Unix()), Title: p.CommitTitle, SHA: p.CommitSHA, Short: shortSHA(p.CommitSHA), Title: p.CommitTitle, SHA: p.CommitSHA, Short: shortSHA(p.CommitSHA), Ref: name, RefKind: kind, Source: p.Source, SourceLabel: sourceLabel, MRNumber: mrNumber, Ref: name, RefKind: kind, Source: p.Source, SourceLabel: sourceLabel, MRNumber: mrNumber, Actor: actor, Avatar: avatar, Initial: initial, Actor: actor, ActorURL: actorURL, Avatar: avatar, Initial: initial, Stages: stageViews(jobs, ranks, func(key string, args ...any) string { return s.tr(r, key, args...) }), Stages: stageViews(jobs, ranks, func(key string, args ...any) string { return s.tr(r, key, args...) }), } }}}@@ -201,10 +203,10 @@ func (s *Server) pipelineSourceText(r *http.Request, repo store.Repo, p store.Pi return label + " !" + strconv.FormatInt(number, 10) return label + " !" + strconv.FormatInt(number, 10)}}func (s *Server) actorOf(r *http.Request, name string, cache map[string]store.User) (string, string) {func (s *Server) actorOf(r *http.Request, name string, cache map[string]store.User) (string, string, string) { name = strings.TrimSpace(name) name = strings.TrimSpace(name) if name == "" { if name == "" { return "", "" return "", "", "" } } u, ok := cache[name] u, ok := cache[name] if !ok { if !ok {@@ -215,9 +217,9 @@ func (s *Server) actorOf(r *http.Request, name string, cache map[string]store.Us cache[name] = u cache[name] = u } } if u.ID == 0 { if u.ID == 0 { return name, "" return name, "", "" } } return u.Username, u.AvatarURL return u.Username, u.AvatarURL, "/users/" + u.Username}}func pipeMatches(row PipeRow, q string) bool {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 lang := s.langOf(r) lang := s.langOf(r) jobs, _ := s.Store.JobsByPipeline(r.Context(), p.ID) jobs, _ := s.Store.JobsByPipeline(r.Context(), p.ID) users := map[string]store.User{} users := map[string]store.User{} actor, avatar := s.actorOf(r, p.Actor, users) actor, avatar, actorURL := s.actorOf(r, p.Actor, users) initial := "" initial := "" if actor != "" { if actor != "" { initial = strings.ToUpper(actor[:1]) initial = strings.ToUpper(actor[:1])@@ -544,7 +546,7 @@ func (s *Server) jobPage(r *http.Request, repo store.Repo, p store.Pipeline, job } } return &JobPage{ return &JobPage{ Job: job, Pipe: p, Name: job.Name, Status: status, Label: s.tr(r, "pipe."+status), Job: job, Pipe: p, Name: job.Name, Status: status, Label: s.tr(r, "pipe."+status), Actor: actor, Avatar: avatar, Initial: initial, When: i18n.Ago(lang, p.CreatedAt.Unix()), Actor: actor, ActorURL: actorURL, Avatar: avatar, Initial: initial, When: i18n.Ago(lang, p.CreatedAt.Unix()), Duration: dur, Finished: finished, Queued: queued, Timeout: timeout, Source: source, Duration: dur, Finished: finished, Queued: queued, Timeout: timeout, Source: source, Ref: name, RefKind: kind, Short: shortSHA(p.CommitSHA), Title: p.CommitTitle, Stage: job.Stage, Ref: name, RefKind: kind, Short: shortSHA(p.CommitSHA), Title: p.CommitTitle, Stage: job.Stage, PipeStatus: pipeStatus, PipeLabel: s.tr(r, "pipe."+pipeStatus), PipeStatus: pipeStatus, PipeLabel: s.tr(r, "pipe."+pipeStatus),@@ -0,0 +1,337 @@
package server
import (
"context"
"encoding/json"
"net/http"
"net/http/cookiejar"
"net/http/httptest"
"net/url"
"path/filepath"
"strings"
"testing"
"time"
"gitlab.com/Timfa/bluegit/internal/access"
"gitlab.com/Timfa/bluegit/internal/auth"
"gitlab.com/Timfa/bluegit/internal/config"
"gitlab.com/Timfa/bluegit/internal/store"
)
func TestProfilePage(t *testing.T) {
storage := t.TempDir()
st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())
if err != nil {
t.Fatal(err)
}
t.Cleanup(func() { _ = st.Close() })
cfg := config.Config{
BaseURL: "http://127.0.0.1:9", Listen: "127.0.0.1:0", StoragePath: storage,
Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test"},
Git: config.Git{Binary: "git", DefaultBranch: "master"},
}
cfg.Auth.BaseURL = "https://auth.timfalken.com"
srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true"}
ts := httptest.NewServer(srv.Handler())
t.Cleanup(ts.Close)
srv.Cfg.BaseURL = ts.URL
jar, _ := cookiejar.New(nil)
client := &http.Client{Jar: jar}
res, err := client.Get(ts.URL + "/login")
if err != nil {
t.Fatal(err)
}
page := read(t, res)
ctx := context.Background()
tim, err := st.UserByUsername(ctx, "tim")
if err != nil {
t.Fatal(err)
}
ada, err := st.UpsertUser(ctx, 2, "ada", "", false)
if err != nil {
t.Fatal(err)
}
plein, err := st.CreateGroup(ctx, tim.ID, "Plein", "plein", "open plein", access.RoleDeveloper)
if err != nil {
t.Fatal(err)
}
if err := st.UpdateGroup(ctx, plein.ID, "open plein", "public", access.RoleDeveloper); err != nil {
t.Fatal(err)
}
if err := st.SetLogoMIME(ctx, "group", plein.ID, "image/png"); err != nil {
t.Fatal(err)
}
kluis, err := st.CreateGroup(ctx, tim.ID, "Kluis", "kluis", "dichte kluis", access.RoleDeveloper)
if err != nil {
t.Fatal(err)
}
zichtbaar, err := st.CreateRepo(ctx, "user", tim.ID, "zichtbaar", "Zichtbare repo", "master", "public")
if err != nil {
t.Fatal(err)
}
if err := st.SetLogoMIME(ctx, "repo", zichtbaar.ID, "image/png"); err != nil {
t.Fatal(err)
}
if _, err := st.CreateRepo(ctx, "user", tim.ID, "geheim", "Geheim project", "master", "private"); err != nil {
t.Fatal(err)
}
if _, err := st.CreateRepo(ctx, "group", plein.ID, "gedeeld", "Groepsrepo", "master", "public"); err != nil {
t.Fatal(err)
}
if err := st.SetMember(ctx, "repo", repoID(t, st, "tim", "geheim"), "ada", access.RoleDeveloper); err != nil {
t.Fatal(err)
}
if err := st.SetMember(ctx, "group", kluis.ID, "ada", access.RoleDeveloper); err != nil {
t.Fatal(err)
}
share := ts.URL + "/users/tim"
res, err = client.Get(ts.URL + "/")
if err != nil {
t.Fatal(err)
}
dash := read(t, res)
for _, want := range []string{
`class="usercard panel"`,
`<h2>tim</h2>`,
`@tim`,
`data-copy="` + share + `"`,
`href="/settings">Edit profile`,
`href="/users/tim"`,
`<strong>2</strong> <span>Repositories</span>`,
`<strong>2</strong> <span>Groups</span>`,
"plein/gedeeld",
"Activity",
} {
if !strings.Contains(dash, want) {
t.Fatalf("dashboard mist %q", want)
}
}
if strings.Index(dash, "Activity") > strings.Index(dash, "<h2>Repositories</h2>") {
t.Fatal("heatmap staat onder de repositorylijst")
}
anon := &http.Client{}
res, err = anon.Get(share)
if err != nil {
t.Fatal(err)
}
pub := read(t, res)
for _, want := range []string{
"<h1>tim</h1>",
`@tim`,
"Member since",
`data-copy="` + share + `"`,
`src="/tim/zichtbaar/-/logo"`,
`href="/tim/zichtbaar"`,
"Zichtbare repo",
`src="/groups/plein/logo"`,
`href="/groups/plein"`,
`<strong>1</strong> <span>Repositories</span>`,
`<strong>1</strong> <span>Groups</span>`,
} {
if !strings.Contains(pub, want) {
t.Fatalf("openbaar profiel mist %q", want)
}
}
for _, ban := range []string{"geheim", "Geheim project", "kluis", "Kluis", "Edit profile", "plein/gedeeld"} {
if strings.Contains(pub, ban) {
t.Fatalf("openbaar profiel toont %q", ban)
}
}
adaJar, _ := cookiejar.New(nil)
adaClient := &http.Client{Jar: adaJar}
sess, err := st.CreateSession(ctx, ada.ID, "dev", time.Now().Add(time.Hour))
if err != nil {
t.Fatal(err)
}
u, _ := url.Parse(ts.URL)
adaJar.SetCookies(u, []*http.Cookie{{Name: "bluegit_session", Value: sess.ID, Path: "/"}})
res, err = adaClient.Get(share)
if err != nil {
t.Fatal(err)
}
adaPage := read(t, res)
for _, want := range []string{
`href="/tim/geheim"`,
"Geheim project",
`href="/groups/kluis"`,
`<strong>2</strong> <span>Repositories</span>`,
`<strong>2</strong> <span>Groups</span>`,
} {
if !strings.Contains(adaPage, want) {
t.Fatalf("ada ziet niet %q", want)
}
}
if strings.Contains(adaPage, "Edit profile") || strings.Contains(adaPage, "plein/gedeeld") {
t.Fatal("ada ziet Tims bewerkknop of een groepsrepository")
}
res, err = client.Get(ts.URL + "/settings")
if err != nil {
t.Fatal(err)
}
settings := read(t, res)
if !strings.Contains(settings, "Display name") || !strings.Contains(settings, "Bio") {
t.Fatal("instellingen missen weergavenaam of bio")
}
res, err = client.PostForm(ts.URL+"/settings/profile", url.Values{
"csrf": {csrfOf(t, settings)}, "name": {"Regel\neen"}, "bio": {"nee"},
})
if err != nil {
t.Fatal(err)
}
bad := read(t, res)
if !strings.Contains(bad, "line break") {
t.Fatalf("ongeldige naam:\n%s", bad)
}
res, err = client.PostForm(ts.URL+"/settings/profile", url.Values{
"csrf": {csrfOf(t, bad)}, "name": {"Tim Falken"}, "bio": {"Bouwt BlueGit."},
})
if err != nil {
t.Fatal(err)
}
saved := read(t, res)
if !strings.Contains(saved, "Profile saved") || !strings.Contains(saved, `value="Tim Falken"`) {
t.Fatalf("profiel opslaan:\n%s", saved)
}
res, err = client.Get(share)
if err != nil {
t.Fatal(err)
}
named := read(t, res)
for _, want := range []string{"<h1>Tim Falken</h1>", "@tim", "Bouwt BlueGit.", "Edit profile"} {
if !strings.Contains(named, want) {
t.Fatalf("profiel na opslaan mist %q", want)
}
}
timToken, err := st.CreateToken(ctx, tim.ID, "tim")
if err != nil {
t.Fatal(err)
}
adaToken, err := st.CreateToken(ctx, ada.ID, "ada")
if err != nil {
t.Fatal(err)
}
mine := apiGet(t, ts.URL+"/api/v1/users/tim", timToken)
if mine["name"] != "Tim Falken" || mine["bio"] != "Bouwt BlueGit." || mine["web_url"] != share {
t.Fatalf("api zelf: %#v", mine)
}
if mine["instance_admin"] != true || mine["language"] != "en" {
t.Fatalf("api zelf mist eigen velden: %#v", mine)
}
counts := mine["counts"].(map[string]any)
if counts["repos"] != 2.0 || counts["groups"] != 2.0 || counts["contributions"] != 0.0 {
t.Fatalf("api tellingen: %#v", counts)
}
if !apiPaths(mine["repos"]).has("tim/zichtbaar", "tim/geheim") || apiPaths(mine["repos"]).has("plein/gedeeld") {
t.Fatalf("api repos: %#v", mine["repos"])
}
if !apiPaths(mine["groups"]).has("plein", "kluis") {
t.Fatalf("api groepen: %#v", mine["groups"])
}
other := apiGet(t, ts.URL+"/api/v1/users/tim", adaToken)
if _, ok := other["instance_admin"]; ok || other["language"] != nil {
t.Fatalf("api van ada toont Tims privévelden: %#v", other)
}
if !apiPaths(other["repos"]).has("tim/geheim") || !apiPaths(other["groups"]).has("kluis") {
t.Fatalf("api van ada mist privé: %#v %#v", other["repos"], other["groups"])
}
req, err := http.NewRequest(http.MethodPut, ts.URL+"/api/v1/user", strings.NewReader(`{"bio":"alleen bio"}`))
if err != nil {
t.Fatal(err)
}
req.Header.Set("Authorization", "Bearer "+timToken)
req.Header.Set("Content-Type", "application/json")
res, err = http.DefaultClient.Do(req)
if err != nil {
t.Fatal(err)
}
put := decodeJSON(t, res)
if put["bio"] != "alleen bio" || put["name"] != "Tim Falken" || put["language"] != "en" {
t.Fatalf("put bio: %#v", put)
}
noredir := &http.Client{CheckRedirect: func(*http.Request, []*http.Request) error { return http.ErrUseLastResponse }}
res, err = noredir.Get(ts.URL + "/tim")
if err != nil {
t.Fatal(err)
}
loc := res.Header.Get("Location")
if res.StatusCode != http.StatusNotFound || loc != "" {
t.Fatalf("/tim is %d locatie %q", res.StatusCode, loc)
}
_ = res.Body.Close()
res, err = anon.Get(ts.URL + "/users/nobody")
if err != nil {
t.Fatal(err)
}
if res.StatusCode != http.StatusNotFound {
t.Fatalf("onbekend profiel %d", res.StatusCode)
}
_ = res.Body.Close()
_ = page
}
func repoID(t *testing.T, st *store.Store, owner, name string) int64 {
t.Helper()
repo, err := st.RepoByPath(context.Background(), owner, name)
if err != nil {
t.Fatal(err)
}
return repo.ID
}
func apiGet(t *testing.T, rawURL, token string) map[string]any {
t.Helper()
req, err := http.NewRequest(http.MethodGet, rawURL, nil)
if err != nil {
t.Fatal(err)
}
req.Header.Set("Authorization", "Bearer "+token)
res, err := http.DefaultClient.Do(req)
if err != nil {
t.Fatal(err)
}
body := decodeJSON(t, res)
if res.StatusCode != http.StatusOK {
t.Fatalf("api %s: %d %#v", rawURL, res.StatusCode, body)
}
return body
}
func decodeJSON(t *testing.T, res *http.Response) map[string]any {
t.Helper()
defer res.Body.Close()
var body map[string]any
if err := json.NewDecoder(res.Body).Decode(&body); err != nil {
t.Fatal(err)
}
return body
}
type pathSet map[string]bool
func apiPaths(v any) pathSet {
out := pathSet{}
list, _ := v.([]any)
for _, item := range list {
row, _ := item.(map[string]any)
if p, ok := row["path"].(string); ok {
out[p] = true
}
}
return out
}
func (p pathSet) has(want ...string) bool {
for _, w := range want {
if !p[w] {
return false
}
}
return true
}
@@ -0,0 +1,337 @@package serverimport ( "context" "encoding/json" "net/http" "net/http/cookiejar" "net/http/httptest" "net/url" "path/filepath" "strings" "testing" "time" "gitlab.com/Timfa/bluegit/internal/access" "gitlab.com/Timfa/bluegit/internal/auth" "gitlab.com/Timfa/bluegit/internal/config" "gitlab.com/Timfa/bluegit/internal/store")func TestProfilePage(t *testing.T) { storage := t.TempDir() st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32()) if err != nil { t.Fatal(err) } t.Cleanup(func() { _ = st.Close() }) cfg := config.Config{ BaseURL: "http://127.0.0.1:9", Listen: "127.0.0.1:0", StoragePath: storage, Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test"}, Git: config.Git{Binary: "git", DefaultBranch: "master"}, } cfg.Auth.BaseURL = "https://auth.timfalken.com" srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true"} ts := httptest.NewServer(srv.Handler()) t.Cleanup(ts.Close) srv.Cfg.BaseURL = ts.URL jar, _ := cookiejar.New(nil) client := &http.Client{Jar: jar} res, err := client.Get(ts.URL + "/login") if err != nil { t.Fatal(err) } page := read(t, res) ctx := context.Background() tim, err := st.UserByUsername(ctx, "tim") if err != nil { t.Fatal(err) } ada, err := st.UpsertUser(ctx, 2, "ada", "", false) if err != nil { t.Fatal(err) } plein, err := st.CreateGroup(ctx, tim.ID, "Plein", "plein", "open plein", access.RoleDeveloper) if err != nil { t.Fatal(err) } if err := st.UpdateGroup(ctx, plein.ID, "open plein", "public", access.RoleDeveloper); err != nil { t.Fatal(err) } if err := st.SetLogoMIME(ctx, "group", plein.ID, "image/png"); err != nil { t.Fatal(err) } kluis, err := st.CreateGroup(ctx, tim.ID, "Kluis", "kluis", "dichte kluis", access.RoleDeveloper) if err != nil { t.Fatal(err) } zichtbaar, err := st.CreateRepo(ctx, "user", tim.ID, "zichtbaar", "Zichtbare repo", "master", "public") if err != nil { t.Fatal(err) } if err := st.SetLogoMIME(ctx, "repo", zichtbaar.ID, "image/png"); err != nil { t.Fatal(err) } if _, err := st.CreateRepo(ctx, "user", tim.ID, "geheim", "Geheim project", "master", "private"); err != nil { t.Fatal(err) } if _, err := st.CreateRepo(ctx, "group", plein.ID, "gedeeld", "Groepsrepo", "master", "public"); err != nil { t.Fatal(err) } if err := st.SetMember(ctx, "repo", repoID(t, st, "tim", "geheim"), "ada", access.RoleDeveloper); err != nil { t.Fatal(err) } if err := st.SetMember(ctx, "group", kluis.ID, "ada", access.RoleDeveloper); err != nil { t.Fatal(err) } share := ts.URL + "/users/tim" res, err = client.Get(ts.URL + "/") if err != nil { t.Fatal(err) } dash := read(t, res) for _, want := range []string{ `class="usercard panel"`, `<h2>tim</h2>`, `@tim`, `data-copy="` + share + `"`, `href="/settings">Edit profile`, `href="/users/tim"`, `<strong>2</strong> <span>Repositories</span>`, `<strong>2</strong> <span>Groups</span>`, "plein/gedeeld", "Activity", } { if !strings.Contains(dash, want) { t.Fatalf("dashboard mist %q", want) } } if strings.Index(dash, "Activity") > strings.Index(dash, "<h2>Repositories</h2>") { t.Fatal("heatmap staat onder de repositorylijst") } anon := &http.Client{} res, err = anon.Get(share) if err != nil { t.Fatal(err) } pub := read(t, res) for _, want := range []string{ "<h1>tim</h1>", `@tim`, "Member since", `data-copy="` + share + `"`, `src="/tim/zichtbaar/-/logo"`, `href="/tim/zichtbaar"`, "Zichtbare repo", `src="/groups/plein/logo"`, `href="/groups/plein"`, `<strong>1</strong> <span>Repositories</span>`, `<strong>1</strong> <span>Groups</span>`, } { if !strings.Contains(pub, want) { t.Fatalf("openbaar profiel mist %q", want) } } for _, ban := range []string{"geheim", "Geheim project", "kluis", "Kluis", "Edit profile", "plein/gedeeld"} { if strings.Contains(pub, ban) { t.Fatalf("openbaar profiel toont %q", ban) } } adaJar, _ := cookiejar.New(nil) adaClient := &http.Client{Jar: adaJar} sess, err := st.CreateSession(ctx, ada.ID, "dev", time.Now().Add(time.Hour)) if err != nil { t.Fatal(err) } u, _ := url.Parse(ts.URL) adaJar.SetCookies(u, []*http.Cookie{{Name: "bluegit_session", Value: sess.ID, Path: "/"}}) res, err = adaClient.Get(share) if err != nil { t.Fatal(err) } adaPage := read(t, res) for _, want := range []string{ `href="/tim/geheim"`, "Geheim project", `href="/groups/kluis"`, `<strong>2</strong> <span>Repositories</span>`, `<strong>2</strong> <span>Groups</span>`, } { if !strings.Contains(adaPage, want) { t.Fatalf("ada ziet niet %q", want) } } if strings.Contains(adaPage, "Edit profile") || strings.Contains(adaPage, "plein/gedeeld") { t.Fatal("ada ziet Tims bewerkknop of een groepsrepository") } res, err = client.Get(ts.URL + "/settings") if err != nil { t.Fatal(err) } settings := read(t, res) if !strings.Contains(settings, "Display name") || !strings.Contains(settings, "Bio") { t.Fatal("instellingen missen weergavenaam of bio") } res, err = client.PostForm(ts.URL+"/settings/profile", url.Values{ "csrf": {csrfOf(t, settings)}, "name": {"Regel\neen"}, "bio": {"nee"}, }) if err != nil { t.Fatal(err) } bad := read(t, res) if !strings.Contains(bad, "line break") { t.Fatalf("ongeldige naam:\n%s", bad) } res, err = client.PostForm(ts.URL+"/settings/profile", url.Values{ "csrf": {csrfOf(t, bad)}, "name": {"Tim Falken"}, "bio": {"Bouwt BlueGit."}, }) if err != nil { t.Fatal(err) } saved := read(t, res) if !strings.Contains(saved, "Profile saved") || !strings.Contains(saved, `value="Tim Falken"`) { t.Fatalf("profiel opslaan:\n%s", saved) } res, err = client.Get(share) if err != nil { t.Fatal(err) } named := read(t, res) for _, want := range []string{"<h1>Tim Falken</h1>", "@tim", "Bouwt BlueGit.", "Edit profile"} { if !strings.Contains(named, want) { t.Fatalf("profiel na opslaan mist %q", want) } } timToken, err := st.CreateToken(ctx, tim.ID, "tim") if err != nil { t.Fatal(err) } adaToken, err := st.CreateToken(ctx, ada.ID, "ada") if err != nil { t.Fatal(err) } mine := apiGet(t, ts.URL+"/api/v1/users/tim", timToken) if mine["name"] != "Tim Falken" || mine["bio"] != "Bouwt BlueGit." || mine["web_url"] != share { t.Fatalf("api zelf: %#v", mine) } if mine["instance_admin"] != true || mine["language"] != "en" { t.Fatalf("api zelf mist eigen velden: %#v", mine) } counts := mine["counts"].(map[string]any) if counts["repos"] != 2.0 || counts["groups"] != 2.0 || counts["contributions"] != 0.0 { t.Fatalf("api tellingen: %#v", counts) } if !apiPaths(mine["repos"]).has("tim/zichtbaar", "tim/geheim") || apiPaths(mine["repos"]).has("plein/gedeeld") { t.Fatalf("api repos: %#v", mine["repos"]) } if !apiPaths(mine["groups"]).has("plein", "kluis") { t.Fatalf("api groepen: %#v", mine["groups"]) } other := apiGet(t, ts.URL+"/api/v1/users/tim", adaToken) if _, ok := other["instance_admin"]; ok || other["language"] != nil { t.Fatalf("api van ada toont Tims privévelden: %#v", other) } if !apiPaths(other["repos"]).has("tim/geheim") || !apiPaths(other["groups"]).has("kluis") { t.Fatalf("api van ada mist privé: %#v %#v", other["repos"], other["groups"]) } req, err := http.NewRequest(http.MethodPut, ts.URL+"/api/v1/user", strings.NewReader(`{"bio":"alleen bio"}`)) if err != nil { t.Fatal(err) } req.Header.Set("Authorization", "Bearer "+timToken) req.Header.Set("Content-Type", "application/json") res, err = http.DefaultClient.Do(req) if err != nil { t.Fatal(err) } put := decodeJSON(t, res) if put["bio"] != "alleen bio" || put["name"] != "Tim Falken" || put["language"] != "en" { t.Fatalf("put bio: %#v", put) } noredir := &http.Client{CheckRedirect: func(*http.Request, []*http.Request) error { return http.ErrUseLastResponse }} res, err = noredir.Get(ts.URL + "/tim") if err != nil { t.Fatal(err) } loc := res.Header.Get("Location") if res.StatusCode != http.StatusNotFound || loc != "" { t.Fatalf("/tim is %d locatie %q", res.StatusCode, loc) } _ = res.Body.Close() res, err = anon.Get(ts.URL + "/users/nobody") if err != nil { t.Fatal(err) } if res.StatusCode != http.StatusNotFound { t.Fatalf("onbekend profiel %d", res.StatusCode) } _ = res.Body.Close() _ = page}func repoID(t *testing.T, st *store.Store, owner, name string) int64 { t.Helper() repo, err := st.RepoByPath(context.Background(), owner, name) if err != nil { t.Fatal(err) } return repo.ID}func apiGet(t *testing.T, rawURL, token string) map[string]any { t.Helper() req, err := http.NewRequest(http.MethodGet, rawURL, nil) if err != nil { t.Fatal(err) } req.Header.Set("Authorization", "Bearer "+token) res, err := http.DefaultClient.Do(req) if err != nil { t.Fatal(err) } body := decodeJSON(t, res) if res.StatusCode != http.StatusOK { t.Fatalf("api %s: %d %#v", rawURL, res.StatusCode, body) } return body}func decodeJSON(t *testing.T, res *http.Response) map[string]any { t.Helper() defer res.Body.Close() var body map[string]any if err := json.NewDecoder(res.Body).Decode(&body); err != nil { t.Fatal(err) } return body}type pathSet map[string]boolfunc apiPaths(v any) pathSet { out := pathSet{} list, _ := v.([]any) for _, item := range list { row, _ := item.(map[string]any) if p, ok := row["path"].(string); ok { out[p] = true } } return out}func (p pathSet) has(want ...string) bool { for _, w := range want { if !p[w] { return false } } return true}@@ -99,6 +99,7 @@ func (s *Server) Handler() http.Handler {
mux.HandleFunc("POST /setup", s.setupSave)
mux.HandleFunc("GET /settings", s.account)
mux.HandleFunc("POST /settings/language", s.saveLanguage)
mux.HandleFunc("POST /settings/profile", s.saveProfile)
mux.HandleFunc("POST /settings/tokens", s.createToken)
mux.HandleFunc("POST /settings/tokens/delete", s.deleteToken)
mux.HandleFunc("POST /settings/ssh", s.addSSH)
@@ -608,6 +609,7 @@ type View struct {
Heat *activity.Calendar
Notes []NoteRow
Profile *store.User
Card *ProfileCard
DescHTML template.HTML
Timeline []TimelineItem
CompareFrom string
@@ -636,16 +638,25 @@ type RepoCard struct {
When string
}
// ProfileCard is het blok over een gebruiker, boven de activiteitenkalender.
type ProfileCard struct {
User store.User
Name, Since, Bio, URL string
Heading string
Repos, Groups, Contrib int
Own bool
}
// NoteRow is een reactie in de interface.
type NoteRow struct {
ID int64
Author, Body, When, Path string
Start, End int
HasSuggestion bool
ParentID int64
HTML template.HTML
Replies []NoteRow
At time.Time
ID int64
Author, AuthorURL, Body, When, Path string
Start, End int
HasSuggestion bool
ParentID int64
HTML template.HTML
Replies []NoteRow
At time.Time
}
// DiffFileView is één bestand in de merge-request-diff.
@@ -713,16 +724,16 @@ type BranchRow struct {
// TimelineItem is één gebeurtenis of reactie op een merge request.
type TimelineItem struct {
ID int64
Kind string
Actor, Text string
When string
Body string
HTML template.HTML
URL string
Replies []TimelineItem
At time.Time
Rank int
ID int64
Kind string
Actor, ActorURL, Text string
When string
Body string
HTML template.HTML
URL string
Replies []TimelineItem
At time.Time
Rank int
}
// HookView is een webhook plus de laatste pogingen.
@@ -99,6 +99,7 @@ func (s *Server) Handler() http.Handler { mux.HandleFunc("POST /setup", s.setupSave) mux.HandleFunc("POST /setup", s.setupSave) mux.HandleFunc("GET /settings", s.account) mux.HandleFunc("GET /settings", s.account) mux.HandleFunc("POST /settings/language", s.saveLanguage) mux.HandleFunc("POST /settings/language", s.saveLanguage) mux.HandleFunc("POST /settings/profile", s.saveProfile) mux.HandleFunc("POST /settings/tokens", s.createToken) mux.HandleFunc("POST /settings/tokens", s.createToken) mux.HandleFunc("POST /settings/tokens/delete", s.deleteToken) mux.HandleFunc("POST /settings/tokens/delete", s.deleteToken) mux.HandleFunc("POST /settings/ssh", s.addSSH) mux.HandleFunc("POST /settings/ssh", s.addSSH)@@ -608,6 +609,7 @@ type View struct { Heat *activity.Calendar Heat *activity.Calendar Notes []NoteRow Notes []NoteRow Profile *store.User Profile *store.User Card *ProfileCard DescHTML template.HTML DescHTML template.HTML Timeline []TimelineItem Timeline []TimelineItem CompareFrom string CompareFrom string@@ -636,16 +638,25 @@ type RepoCard struct { When string When string}}// ProfileCard is het blok over een gebruiker, boven de activiteitenkalender.type ProfileCard struct { User store.User Name, Since, Bio, URL string Heading string Repos, Groups, Contrib int Own bool}// NoteRow is een reactie in de interface.// NoteRow is een reactie in de interface.type NoteRow struct {type NoteRow struct { ID int64 ID int64 Author, Body, When, Path string Author, AuthorURL, Body, When, Path string Start, End int Start, End int HasSuggestion bool HasSuggestion bool ParentID int64 ParentID int64 HTML template.HTML HTML template.HTML Replies []NoteRow Replies []NoteRow At time.Time At time.Time}}// DiffFileView is één bestand in de merge-request-diff.// DiffFileView is één bestand in de merge-request-diff.@@ -713,16 +724,16 @@ type BranchRow struct {// TimelineItem is één gebeurtenis of reactie op een merge request.// TimelineItem is één gebeurtenis of reactie op een merge request.type TimelineItem struct {type TimelineItem struct { ID int64 ID int64 Kind string Kind string Actor, Text string Actor, ActorURL, Text string When string When string Body string Body string HTML template.HTML HTML template.HTML URL string URL string Replies []TimelineItem Replies []TimelineItem At time.Time At time.Time Rank int Rank int}}// HookView is een webhook plus de laatste pogingen.// HookView is een webhook plus de laatste pogingen.@@ -390,8 +390,16 @@ func (s *Server) userCard(ctx context.Context, name, page, img, oem string) card
return card.Site(page, img, oem)
}
n, _ := s.Store.CountRepos(ctx, "user", u.ID, true)
title := u.Username
if name := strings.TrimSpace(u.DisplayName); name != "" {
title = name
}
desc := "Public profile"
if bio := strings.TrimSpace(u.Bio); bio != "" {
desc = card.Excerpt(bio, 180)
}
return card.Render{Meta: card.Meta{
Title: u.Username, Description: "Public profile", URL: page, Image: img, OEmbed: oem,
Title: title, Description: desc, URL: page, Image: img, OEmbed: oem,
Theme: "#1f6feb", Kind: "user", Facts: []string{repoLabel(n)}, Initial: u.Username,
}}
}
@@ -390,8 +390,16 @@ func (s *Server) userCard(ctx context.Context, name, page, img, oem string) card return card.Site(page, img, oem) return card.Site(page, img, oem) } } n, _ := s.Store.CountRepos(ctx, "user", u.ID, true) n, _ := s.Store.CountRepos(ctx, "user", u.ID, true) title := u.Username if name := strings.TrimSpace(u.DisplayName); name != "" { title = name } desc := "Public profile" if bio := strings.TrimSpace(u.Bio); bio != "" { desc = card.Excerpt(bio, 180) } return card.Render{Meta: card.Meta{ return card.Render{Meta: card.Meta{ Title: u.Username, Description: "Public profile", URL: page, Image: img, OEmbed: oem, Title: title, Description: desc, URL: page, Image: img, OEmbed: oem, Theme: "#1f6feb", Kind: "user", Facts: []string{repoLabel(n)}, Initial: u.Username, Theme: "#1f6feb", Kind: "user", Facts: []string{repoLabel(n)}, Initial: u.Username, }} }}}}@@ -263,3 +263,47 @@
});
});
})();
(function () {
function copyNow(value) {
var area = document.createElement("textarea");
area.value = value;
area.setAttribute("readonly", "");
area.style.position = "fixed";
area.style.top = "0";
area.style.left = "0";
area.style.opacity = "0";
document.body.appendChild(area);
area.focus();
area.select();
var ok = false;
try {
ok = document.execCommand("copy");
} catch (e) {
ok = false;
}
document.body.removeChild(area);
return ok;
}
document.querySelectorAll("[data-copy]").forEach(function (btn) {
btn.addEventListener("click", function () {
var value = btn.getAttribute("data-copy") || "";
var shown = false;
function mark() {
if (shown) {
return;
}
shown = true;
var old = btn.textContent;
btn.textContent = document.body.getAttribute("data-copied") || "Copied";
setTimeout(function () { btn.textContent = old; }, 2500);
}
if (copyNow(value)) {
mark();
}
if (navigator.clipboard && window.isSecureContext) {
navigator.clipboard.writeText(value).then(mark).catch(function () {});
}
});
});
})();
@@ -263,3 +263,47 @@ }); }); }); });})();})();(function () { function copyNow(value) { var area = document.createElement("textarea"); area.value = value; area.setAttribute("readonly", ""); area.style.position = "fixed"; area.style.top = "0"; area.style.left = "0"; area.style.opacity = "0"; document.body.appendChild(area); area.focus(); area.select(); var ok = false; try { ok = document.execCommand("copy"); } catch (e) { ok = false; } document.body.removeChild(area); return ok; } document.querySelectorAll("[data-copy]").forEach(function (btn) { btn.addEventListener("click", function () { var value = btn.getAttribute("data-copy") || ""; var shown = false; function mark() { if (shown) { return; } shown = true; var old = btn.textContent; btn.textContent = document.body.getAttribute("data-copied") || "Copied"; setTimeout(function () { btn.textContent = old; }, 2500); } if (copyNow(value)) { mark(); } if (navigator.clipboard && window.isSecureContext) { navigator.clipboard.writeText(value).then(mark).catch(function () {}); } }); });})();@@ -1,45 +1,4 @@
(function () {
function copyNow(value) {
var area = document.createElement("textarea");
area.value = value;
area.setAttribute("readonly", "");
area.style.position = "fixed";
area.style.top = "0";
area.style.left = "0";
area.style.opacity = "0";
document.body.appendChild(area);
area.focus();
area.select();
var ok = false;
try {
ok = document.execCommand("copy");
} catch (e) {
ok = false;
}
document.body.removeChild(area);
return ok;
}
document.querySelectorAll("[data-copy]").forEach(function (btn) {
btn.addEventListener("click", function () {
var value = btn.getAttribute("data-copy") || "";
var shown = false;
function mark() {
if (shown) {
return;
}
shown = true;
var old = btn.textContent;
btn.textContent = document.body.getAttribute("data-copied") || "Copied";
setTimeout(function () { btn.textContent = old; }, 1200);
}
if (copyNow(value)) {
mark();
}
if (navigator.clipboard && window.isSecureContext) {
navigator.clipboard.writeText(value).then(mark).catch(function () {});
}
});
});
document.querySelectorAll("select[data-rev]").forEach(function (sel) {
sel.addEventListener("change", function () {
var url = new URL(window.location.href);
@@ -1,45 +1,4 @@(function () {(function () { function copyNow(value) { var area = document.createElement("textarea"); area.value = value; area.setAttribute("readonly", ""); area.style.position = "fixed"; area.style.top = "0"; area.style.left = "0"; area.style.opacity = "0"; document.body.appendChild(area); area.focus(); area.select(); var ok = false; try { ok = document.execCommand("copy"); } catch (e) { ok = false; } document.body.removeChild(area); return ok; } document.querySelectorAll("[data-copy]").forEach(function (btn) { btn.addEventListener("click", function () { var value = btn.getAttribute("data-copy") || ""; var shown = false; function mark() { if (shown) { return; } shown = true; var old = btn.textContent; btn.textContent = document.body.getAttribute("data-copied") || "Copied"; setTimeout(function () { btn.textContent = old; }, 1200); } if (copyNow(value)) { mark(); } if (navigator.clipboard && window.isSecureContext) { navigator.clipboard.writeText(value).then(mark).catch(function () {}); } }); }); document.querySelectorAll("select[data-rev]").forEach(function (sel) { document.querySelectorAll("select[data-rev]").forEach(function (sel) { sel.addEventListener("change", function () { sel.addEventListener("change", function () { var url = new URL(window.location.href); var url = new URL(window.location.href);@@ -236,6 +236,20 @@ td, th { text-align: left; padding: var(--sp-2) var(--sp-3); border-bottom: 1px
}
img.avatar { object-fit: cover; display: block; }
.avatar.lg { width: 64px; height: 64px; font-size: 1.35rem; }
.avatar.xl { width: 96px; height: 96px; font-size: 2rem; }
a.avatarlink { display: inline-grid; color: inherit; text-decoration: none; line-height: 0; }
a.avatarlink:hover { text-decoration: none; }
.usercard {
display: grid; grid-template-columns: auto minmax(0, 1fr) auto;
gap: 1.1rem; align-items: start; margin: 0.4rem 0 1.1rem;
}
.usercard h1, .usercard h2 { margin: 0; }
.usercard .handle { margin: 0.15rem 0 0.35rem; color: var(--muted); }
.usercard .bio { margin: 0.15rem 0 0.4rem; white-space: pre-wrap; }
.usercounts { display: flex; flex-wrap: wrap; gap: 0.4rem 1.15rem; list-style: none; padding: 0; margin: 0.55rem 0 0; }
.usercounts li { display: flex; flex-direction: column; min-width: 5.5rem; }
.usercounts strong { font-size: 1.15rem; line-height: 1.2; }
.usercard-actions { display: flex; flex-direction: column; gap: 0.45rem; align-items: stretch; }
.commitwho a { color: var(--ink); font-weight: 650; text-decoration: none; }
.commitwho a:hover { text-decoration: underline; }
ul.clean li.commitline { display: flex; gap: 0.65rem; align-items: center; }
@@ -908,6 +922,8 @@ form.wh .grid-2 label { margin-top: 0; }
.heat-foot { flex-direction: column; align-items: flex-start; }
.heat-legend, .heat-foot .muted { justify-content: flex-start; text-align: left; }
.repolist > li { flex-wrap: wrap; }
.usercard { grid-template-columns: auto minmax(0, 1fr); }
.usercard-actions { grid-column: 1 / -1; flex-direction: row; flex-wrap: wrap; }
.pagehead { align-items: flex-start; }
.pageacts { flex-wrap: wrap; justify-content: flex-end; }
}
@@ -236,6 +236,20 @@ td, th { text-align: left; padding: var(--sp-2) var(--sp-3); border-bottom: 1px}}img.avatar { object-fit: cover; display: block; }img.avatar { object-fit: cover; display: block; }.avatar.lg { width: 64px; height: 64px; font-size: 1.35rem; }.avatar.lg { width: 64px; height: 64px; font-size: 1.35rem; }.avatar.xl { width: 96px; height: 96px; font-size: 2rem; }a.avatarlink { display: inline-grid; color: inherit; text-decoration: none; line-height: 0; }a.avatarlink:hover { text-decoration: none; }.usercard { display: grid; grid-template-columns: auto minmax(0, 1fr) auto; gap: 1.1rem; align-items: start; margin: 0.4rem 0 1.1rem;}.usercard h1, .usercard h2 { margin: 0; }.usercard .handle { margin: 0.15rem 0 0.35rem; color: var(--muted); }.usercard .bio { margin: 0.15rem 0 0.4rem; white-space: pre-wrap; }.usercounts { display: flex; flex-wrap: wrap; gap: 0.4rem 1.15rem; list-style: none; padding: 0; margin: 0.55rem 0 0; }.usercounts li { display: flex; flex-direction: column; min-width: 5.5rem; }.usercounts strong { font-size: 1.15rem; line-height: 1.2; }.usercard-actions { display: flex; flex-direction: column; gap: 0.45rem; align-items: stretch; }.commitwho a { color: var(--ink); font-weight: 650; text-decoration: none; }.commitwho a { color: var(--ink); font-weight: 650; text-decoration: none; }.commitwho a:hover { text-decoration: underline; }.commitwho a:hover { text-decoration: underline; }ul.clean li.commitline { display: flex; gap: 0.65rem; align-items: center; }ul.clean li.commitline { display: flex; gap: 0.65rem; align-items: center; }@@ -908,6 +922,8 @@ form.wh .grid-2 label { margin-top: 0; } .heat-foot { flex-direction: column; align-items: flex-start; } .heat-foot { flex-direction: column; align-items: flex-start; } .heat-legend, .heat-foot .muted { justify-content: flex-start; text-align: left; } .heat-legend, .heat-foot .muted { justify-content: flex-start; text-align: left; } .repolist > li { flex-wrap: wrap; } .repolist > li { flex-wrap: wrap; } .usercard { grid-template-columns: auto minmax(0, 1fr); } .usercard-actions { grid-column: 1 / -1; flex-direction: row; flex-wrap: wrap; } .pagehead { align-items: flex-start; } .pagehead { align-items: flex-start; } .pageacts { flex-wrap: wrap; justify-content: flex-end; } .pageacts { flex-wrap: wrap; justify-content: flex-end; }}}@@ -26,8 +26,12 @@ func buildNoteRows(notes []store.Note, lang i18n.Lang, opt noteRender) []NoteRow
rows := make([]NoteRow, len(notes))
index := map[int64]int{}
for i, n := range notes {
url := ""
if n.AuthorID != 0 && n.Author != "" {
url = "/users/" + n.Author
}
rows[i] = NoteRow{
ID: n.ID, Author: n.Author, Body: n.Body, Path: n.FilePath,
ID: n.ID, Author: n.Author, AuthorURL: url, Body: n.Body, Path: n.FilePath,
Start: n.LineStart, End: n.LineEnd, HasSuggestion: n.Suggestion != "",
When: i18n.FormatDate(lang, n.CreatedAt), At: n.CreatedAt, ParentID: n.ParentID,
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 rows := make([]NoteRow, len(notes)) rows := make([]NoteRow, len(notes)) index := map[int64]int{} index := map[int64]int{} for i, n := range notes { for i, n := range notes { url := "" if n.AuthorID != 0 && n.Author != "" { url = "/users/" + n.Author } rows[i] = NoteRow{ rows[i] = NoteRow{ ID: n.ID, Author: n.Author, Body: n.Body, Path: n.FilePath, ID: n.ID, Author: n.Author, AuthorURL: url, Body: n.Body, Path: n.FilePath, Start: n.LineStart, End: n.LineEnd, HasSuggestion: n.Suggestion != "", Start: n.LineStart, End: n.LineEnd, HasSuggestion: n.Suggestion != "", When: i18n.FormatDate(lang, n.CreatedAt), At: n.CreatedAt, ParentID: n.ParentID, When: i18n.FormatDate(lang, n.CreatedAt), At: n.CreatedAt, ParentID: n.ParentID, HTML: template.HTML(markdown.RenderTasks(n.Body, "", "", opt.RepoPath, markdown.Tasks{ HTML: template.HTML(markdown.RenderTasks(n.Body, "", "", opt.RepoPath, markdown.Tasks{@@ -23,7 +23,7 @@
<span class="pill">{{.MR.Status}}</span>
{{if .MR.Draft}}<span class="pill">{{t "mr.draft"}}</span>{{end}}
{{range .Labels}}<span class="pill">{{.}}</span>{{end}}
{{.MR.SourceBranch}} → {{.MR.TargetBranch}} · {{.MR.Author}}
{{.MR.SourceBranch}} → {{.MR.TargetBranch}} · {{if .MR.Author}}<a href="/users/{{.MR.Author}}">{{.MR.Author}}</a>{{end}}
</p>
<h2>{{t "mr.pipeline"}}</h2>
{{if .MRPipe}}
@@ -83,7 +83,7 @@
{{end}}
<h2>{{t "rev.title"}}</h2>
<ul class="clean">
{{range .Reviews}}<li><strong>{{.Username}}</strong> <span class="pill">{{.Label}}</span>
{{range .Reviews}}<li><strong><a href="/users/{{.Username}}">{{.Username}}</a></strong> <span class="pill">{{.Label}}</span>
{{if and $.CanDismiss (or (eq .Status "changes") (eq .Status "rejected"))}}
<form method="post" action="/{{$.Repo.FullPath}}/-/merge-requests/{{$.MR.Number}}/reviews/dismiss">
<input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="user_id" value="{{.UserID}}">
@@ -124,12 +124,12 @@
<ol class="timeline">
{{range .Timeline}}
<li>
{{if .Actor}}<strong>{{.Actor}}</strong>{{end}}
{{if .Actor}}{{if .ActorURL}}<a href="{{.ActorURL}}"><strong>{{.Actor}}</strong></a>{{else}}<strong>{{.Actor}}</strong>{{end}}{{end}}
{{if .URL}}<a href="{{.URL}}">{{.Text}}</a>{{else}}{{.Text}}{{end}}
<span class="muted">{{.When}}</span>
{{if .Body}}<pre class="pushlist">{{.Body}}</pre>{{end}}
{{if .HTML}}<div class="mdbody">{{.HTML}}</div>{{end}}
{{range .Replies}}<div class="reply"><strong>{{.Actor}}</strong> <span class="muted">{{.When}}</span><div class="mdbody">{{.HTML}}</div></div>{{end}}
{{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}}
{{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&mr={{$.MR.Number}}&note={{.ID}}">{{t "issue.fromComment"}}</a>{{end}}
</li>
{{end}}
@@ -278,10 +278,10 @@
{{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}}
{{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}}
{{if .SourceLabel}}<span class="chip">{{.SourceLabel}}{{if .MRNumber}} !{{.MRNumber}}{{end}}</span>{{end}}
{{if .Actor}}{{if .Avatar}}<img class="avatar sm" src="{{.Avatar}}" alt="">{{else}}<span class="avatar sm">{{.Initial}}</span>{{end}}{{end}}
{{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}}
</div>
</td>
<td>{{if .Actor}}{{if .Avatar}}<img class="avatar" src="{{.Avatar}}" alt="{{.Actor}}">{{else}}<span class="avatar">{{.Initial}}</span>{{end}}{{end}}</td>
<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>
<td>
<div class="stages">
{{range .Stages}}
@@ -307,7 +307,7 @@
{{template "pipenav" $}}
{{with .JobPage}}
{{$page := .}}
<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>
<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>
<div class="joblayout">
<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}}">
<div class="conbar">
@@ -485,7 +485,7 @@
</div>
</form>
<ul class="clean">
{{range .Members}}<li>{{.Username}} · {{roleName .Role}} {{if .Pending}}<span class="pill">{{t "set.pending"}}</span>{{end}}
{{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}}
{{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}}
</li>{{end}}
</ul>
@@ -740,7 +740,7 @@
</div>
</form>
{{end}}
<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}}
<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}}
{{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}}
</li>{{end}}</ul>
{{else if eq .Tab "settings"}}
@@ -23,7 +23,7 @@ <span class="pill">{{.MR.Status}}</span> <span class="pill">{{.MR.Status}}</span> {{if .MR.Draft}}<span class="pill">{{t "mr.draft"}}</span>{{end}} {{if .MR.Draft}}<span class="pill">{{t "mr.draft"}}</span>{{end}} {{range .Labels}}<span class="pill">{{.}}</span>{{end}} {{range .Labels}}<span class="pill">{{.}}</span>{{end}} {{.MR.SourceBranch}} → {{.MR.TargetBranch}} · {{.MR.Author}} {{.MR.SourceBranch}} → {{.MR.TargetBranch}} · {{if .MR.Author}}<a href="/users/{{.MR.Author}}">{{.MR.Author}}</a>{{end}}</p></p><h2>{{t "mr.pipeline"}}</h2><h2>{{t "mr.pipeline"}}</h2>{{if .MRPipe}}{{if .MRPipe}}@@ -83,7 +83,7 @@{{end}}{{end}}<h2>{{t "rev.title"}}</h2><h2>{{t "rev.title"}}</h2><ul class="clean"><ul class="clean"> {{range .Reviews}}<li><strong>{{.Username}}</strong> <span class="pill">{{.Label}}</span> {{range .Reviews}}<li><strong><a href="/users/{{.Username}}">{{.Username}}</a></strong> <span class="pill">{{.Label}}</span> {{if and $.CanDismiss (or (eq .Status "changes") (eq .Status "rejected"))}} {{if and $.CanDismiss (or (eq .Status "changes") (eq .Status "rejected"))}} <form method="post" action="/{{$.Repo.FullPath}}/-/merge-requests/{{$.MR.Number}}/reviews/dismiss"> <form method="post" action="/{{$.Repo.FullPath}}/-/merge-requests/{{$.MR.Number}}/reviews/dismiss"> <input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="user_id" value="{{.UserID}}"> <input type="hidden" name="csrf" value="{{$.CSRF}}"><input type="hidden" name="user_id" value="{{.UserID}}">@@ -124,12 +124,12 @@ <ol class="timeline"> <ol class="timeline"> {{range .Timeline}} {{range .Timeline}} <li> <li> {{if .Actor}}<strong>{{.Actor}}</strong>{{end}} {{if .Actor}}{{if .ActorURL}}<a href="{{.ActorURL}}"><strong>{{.Actor}}</strong></a>{{else}}<strong>{{.Actor}}</strong>{{end}}{{end}} {{if .URL}}<a href="{{.URL}}">{{.Text}}</a>{{else}}{{.Text}}{{end}} {{if .URL}}<a href="{{.URL}}">{{.Text}}</a>{{else}}{{.Text}}{{end}} <span class="muted">{{.When}}</span> <span class="muted">{{.When}}</span> {{if .Body}}<pre class="pushlist">{{.Body}}</pre>{{end}} {{if .Body}}<pre class="pushlist">{{.Body}}</pre>{{end}} {{if .HTML}}<div class="mdbody">{{.HTML}}</div>{{end}} {{if .HTML}}<div class="mdbody">{{.HTML}}</div>{{end}} {{range .Replies}}<div class="reply"><strong>{{.Actor}}</strong> <span class="muted">{{.When}}</span><div class="mdbody">{{.HTML}}</div></div>{{end}} {{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}} {{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&mr={{$.MR.Number}}&note={{.ID}}">{{t "issue.fromComment"}}</a>{{end}} {{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&mr={{$.MR.Number}}&note={{.ID}}">{{t "issue.fromComment"}}</a>{{end}} </li> </li> {{end}} {{end}}@@ -278,10 +278,10 @@ {{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}} {{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}} {{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}} {{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}} {{if .SourceLabel}}<span class="chip">{{.SourceLabel}}{{if .MRNumber}} !{{.MRNumber}}{{end}}</span>{{end}} {{if .SourceLabel}}<span class="chip">{{.SourceLabel}}{{if .MRNumber}} !{{.MRNumber}}{{end}}</span>{{end}} {{if .Actor}}{{if .Avatar}}<img class="avatar sm" src="{{.Avatar}}" alt="">{{else}}<span class="avatar sm">{{.Initial}}</span>{{end}}{{end}} {{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}} </div> </div> </td> </td> <td>{{if .Actor}}{{if .Avatar}}<img class="avatar" src="{{.Avatar}}" alt="{{.Actor}}">{{else}}<span class="avatar">{{.Initial}}</span>{{end}}{{end}}</td> <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> <td> <td> <div class="stages"> <div class="stages"> {{range .Stages}} {{range .Stages}}@@ -307,7 +307,7 @@{{template "pipenav" $}}{{template "pipenav" $}}{{with .JobPage}}{{with .JobPage}}{{$page := .}}{{$page := .}}<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><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><div class="joblayout"><div class="joblayout"> <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}}"> <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}}"> <div class="conbar"> <div class="conbar">@@ -485,7 +485,7 @@ </div> </div></form></form><ul class="clean"><ul class="clean"> {{range .Members}}<li>{{.Username}} · {{roleName .Role}} {{if .Pending}}<span class="pill">{{t "set.pending"}}</span>{{end}} {{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}} {{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}} {{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}} </li>{{end}} </li>{{end}}</ul></ul>@@ -740,7 +740,7 @@ </div> </div></form></form>{{end}}{{end}}<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}}<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}} {{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}} {{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}}</li>{{end}}</ul></li>{{end}}</ul>{{else if eq .Tab "settings"}}{{else if eq .Tab "settings"}}@@ -88,10 +88,10 @@
</div>
{{if $.CanComment}}{{range .Notes}}
<article class="linenote" id="note-{{.ID}}">
<strong>{{.Author}}</strong> <span class="muted">{{.When}}</span>
{{if .AuthorURL}}<a href="{{.AuthorURL}}"><strong>{{.Author}}</strong></a>{{else}}<strong>{{.Author}}</strong>{{end}} <span class="muted">{{.When}}</span>
<div class="mdbody">{{.HTML}}</div>
{{if and $.CanApply .HasSuggestion}}<label class="sugcheck"><input type="checkbox" data-suggestion="{{.ID}}"> {{t "sug.include"}}</label>{{end}}
{{range .Replies}}<div class="reply"><strong>{{.Author}}</strong> <span class="muted">{{.When}}</span><div class="mdbody">{{.HTML}}</div></div>{{end}}
{{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}}
</article>
{{end}}{{end}}
{{end}}
@@ -88,10 +88,10 @@ </div> </div> {{if $.CanComment}}{{range .Notes}} {{if $.CanComment}}{{range .Notes}} <article class="linenote" id="note-{{.ID}}"> <article class="linenote" id="note-{{.ID}}"> <strong>{{.Author}}</strong> <span class="muted">{{.When}}</span> {{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 class="mdbody">{{.HTML}}</div> {{if and $.CanApply .HasSuggestion}}<label class="sugcheck"><input type="checkbox" data-suggestion="{{.ID}}"> {{t "sug.include"}}</label>{{end}} {{if and $.CanApply .HasSuggestion}}<label class="sugcheck"><input type="checkbox" data-suggestion="{{.ID}}"> {{t "sug.include"}}</label>{{end}} {{range .Replies}}<div class="reply"><strong>{{.Author}}</strong> <span class="muted">{{.When}}</span><div class="mdbody">{{.HTML}}</div></div>{{end}} {{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}} </article> </article> {{end}}{{end}} {{end}}{{end}} {{end}} {{end}}@@ -26,7 +26,7 @@
{{if eq .Status "closed"}}<span class="pill">{{t "issue.closed"}}</span>{{else}}<span class="pill">{{t "issue.open"}}</span>{{end}}
{{if .Confidential}}<span class="pill">{{t "issue.confidential"}}</span>{{end}}
{{range .Labels}}<span class="lab" style="background:{{.Color}}">{{.Name}}</span>{{end}}
<span class="muted">{{.Author}}{{if .Assignees}} · {{.Assignees}}{{end}}{{if .Milestone}} · {{.Milestone}}{{end}}{{if .Due}} · {{.Due}}{{end}}</span>
<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>
</li>
{{else}}
<li class="muted">{{t "issue.none"}}</li>
@@ -112,7 +112,7 @@
{{if eq .Issues.One.Status "closed"}}<span class="pill">{{t "issue.closed"}}</span>{{else}}<span class="pill">{{t "issue.open"}}</span>{{end}}
{{if .Issues.One.Confidential}}<span class="pill">{{t "issue.confidential"}}</span>{{end}}
{{range .Issues.One.Labels}}<span class="lab" style="background:{{.Color}}">{{.Name}}</span>{{end}}
<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>
<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>
</p>
<div class="mdbody">{{.Issues.One.HTML}}</div>
{{if .Issues.Related}}
@@ -171,7 +171,7 @@
{{end}}
<h2>{{t "issue.comments"}}</h2>
{{range .Issues.Notes}}
<article class="panel"><strong>{{.Author}}</strong> <span class="muted">{{.When}}</span><div class="mdbody">{{.HTML}}</div></article>
<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>
{{else}}<p class="muted">{{t "issue.none"}}</p>{{end}}
{{if .Issues.CanCreate}}
<form class="panel" method="post" action="/{{.Repo.FullPath}}/-/issues/{{.Issues.One.Number}}">
@@ -26,7 +26,7 @@ {{if eq .Status "closed"}}<span class="pill">{{t "issue.closed"}}</span>{{else}}<span class="pill">{{t "issue.open"}}</span>{{end}} {{if eq .Status "closed"}}<span class="pill">{{t "issue.closed"}}</span>{{else}}<span class="pill">{{t "issue.open"}}</span>{{end}} {{if .Confidential}}<span class="pill">{{t "issue.confidential"}}</span>{{end}} {{if .Confidential}}<span class="pill">{{t "issue.confidential"}}</span>{{end}} {{range .Labels}}<span class="lab" style="background:{{.Color}}">{{.Name}}</span>{{end}} {{range .Labels}}<span class="lab" style="background:{{.Color}}">{{.Name}}</span>{{end}} <span class="muted">{{.Author}}{{if .Assignees}} · {{.Assignees}}{{end}}{{if .Milestone}} · {{.Milestone}}{{end}}{{if .Due}} · {{.Due}}{{end}}</span> <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> </li> </li> {{else}} {{else}} <li class="muted">{{t "issue.none"}}</li> <li class="muted">{{t "issue.none"}}</li>@@ -112,7 +112,7 @@ {{if eq .Issues.One.Status "closed"}}<span class="pill">{{t "issue.closed"}}</span>{{else}}<span class="pill">{{t "issue.open"}}</span>{{end}} {{if eq .Issues.One.Status "closed"}}<span class="pill">{{t "issue.closed"}}</span>{{else}}<span class="pill">{{t "issue.open"}}</span>{{end}} {{if .Issues.One.Confidential}}<span class="pill">{{t "issue.confidential"}}</span>{{end}} {{if .Issues.One.Confidential}}<span class="pill">{{t "issue.confidential"}}</span>{{end}} {{range .Issues.One.Labels}}<span class="lab" style="background:{{.Color}}">{{.Name}}</span>{{end}} {{range .Issues.One.Labels}}<span class="lab" style="background:{{.Color}}">{{.Name}}</span>{{end}} <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> <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></p></p><div class="mdbody">{{.Issues.One.HTML}}</div><div class="mdbody">{{.Issues.One.HTML}}</div>{{if .Issues.Related}}{{if .Issues.Related}}@@ -171,7 +171,7 @@{{end}}{{end}}<h2>{{t "issue.comments"}}</h2><h2>{{t "issue.comments"}}</h2>{{range .Issues.Notes}}{{range .Issues.Notes}}<article class="panel"><strong>{{.Author}}</strong> <span class="muted">{{.When}}</span><div class="mdbody">{{.HTML}}</div></article><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>{{else}}<p class="muted">{{t "issue.none"}}</p>{{end}}{{else}}<p class="muted">{{t "issue.none"}}</p>{{end}}{{if .Issues.CanCreate}}{{if .Issues.CanCreate}}<form class="panel" method="post" action="/{{.Repo.FullPath}}/-/issues/{{.Issues.One.Number}}"><form class="panel" method="post" action="/{{.Repo.FullPath}}/-/issues/{{.Issues.One.Number}}">@@ -35,7 +35,7 @@
<a href="/new">{{t "nav.new"}}</a>
<a href="/-/info">{{t "nav.info"}}</a>
{{if .User.InstanceAdmin}}<a href="/setup">{{t "nav.storage"}}</a>{{end}}
<a href="/settings">{{.User.Username}}</a>
<a href="/users/{{.User.Username}}">{{.User.Username}}</a>
<form method="post" action="/logout"><input type="hidden" name="csrf" value="{{.CSRF}}"><button type="submit">{{t "nav.signout"}}</button></form>
{{else}}
<a href="/-/info">{{t "nav.info"}}</a>
@@ -122,7 +122,7 @@
{{define "dashside"}}
<aside class="sidenav">
<a class="sidecontext" href="/">
<a class="sidecontext" href="/users/{{.User.Username}}">
{{if .User.AvatarURL}}<img class="avatar" src="{{.User.AvatarURL}}" alt="">{{else}}<span class="avatar">{{initial .User.Username}}</span>{{end}}
<span class="sidename">{{.User.Username}}</span>
</a>
@@ -35,7 +35,7 @@ <a href="/new">{{t "nav.new"}}</a> <a href="/new">{{t "nav.new"}}</a> <a href="/-/info">{{t "nav.info"}}</a> <a href="/-/info">{{t "nav.info"}}</a> {{if .User.InstanceAdmin}}<a href="/setup">{{t "nav.storage"}}</a>{{end}} {{if .User.InstanceAdmin}}<a href="/setup">{{t "nav.storage"}}</a>{{end}} <a href="/settings">{{.User.Username}}</a> <a href="/users/{{.User.Username}}">{{.User.Username}}</a> <form method="post" action="/logout"><input type="hidden" name="csrf" value="{{.CSRF}}"><button type="submit">{{t "nav.signout"}}</button></form> <form method="post" action="/logout"><input type="hidden" name="csrf" value="{{.CSRF}}"><button type="submit">{{t "nav.signout"}}</button></form> {{else}} {{else}} <a href="/-/info">{{t "nav.info"}}</a> <a href="/-/info">{{t "nav.info"}}</a>@@ -122,7 +122,7 @@{{define "dashside"}}{{define "dashside"}}<aside class="sidenav"><aside class="sidenav"> <a class="sidecontext" href="/"> <a class="sidecontext" href="/users/{{.User.Username}}"> {{if .User.AvatarURL}}<img class="avatar" src="{{.User.AvatarURL}}" alt="">{{else}}<span class="avatar">{{initial .User.Username}}</span>{{end}} {{if .User.AvatarURL}}<img class="avatar" src="{{.User.AvatarURL}}" alt="">{{else}}<span class="avatar">{{initial .User.Username}}</span>{{end}} <span class="sidename">{{.User.Username}}</span> <span class="sidename">{{.User.Username}}</span> </a> </a>@@ -48,6 +48,7 @@
<div class="pageacts"><a class="btn" href="/new">{{t "nav.new"}}</a></div>
</header>
{{if .StorageUnset}}<p class="flash bad">{{t "home.storage"}}</p>{{end}}
{{if .Card}}{{template "usercard" .Card}}{{end}}
{{if .Heat}}{{template "heatmap" .Heat}}{{end}}
<div class="grid-2">
<section class="panel">
@@ -70,16 +71,60 @@
{{define "profile"}}
{{template "layout-start" .}}
<header class="pagehead">
<div class="projhead">
{{if .Profile.AvatarURL}}<img class="avatar lg" src="{{.Profile.AvatarURL}}" alt="">{{else}}<span class="avatar lg">{{initial .Profile.Username}}</span>{{end}}
<h1>{{.Profile.Username}}</h1>
</div>
</header>
{{if .Card}}{{template "usercard" .Card}}{{end}}
{{if .Heat}}{{template "heatmap" .Heat}}{{end}}
<div class="grid-2">
<section>
<h2>{{t "dash.repos"}}</h2>
<ul class="repolist">
{{range .Repos}}
<li>
{{if .HasLogo}}<img class="tile" src="/{{.FullPath}}/-/logo" alt="">{{else}}<span class="tile">{{initial .Name}}</span>{{end}}
<a class="reponame" href="/{{.FullPath}}">{{.Name}}</a>
{{template "visicon" .Visibility}}
<span class="muted grown">{{.Description}}</span>
</li>
{{else}}<li class="muted">{{t "dash.noRepos"}}</li>{{end}}
</ul>
</section>
<section>
<h2>{{t "dash.groups"}}</h2>
<ul class="repolist">
{{range .Groups}}
<li>
{{if .HasLogo}}<img class="tile" src="/groups/{{.Path}}/logo" alt="">{{else}}<span class="tile">{{initial .Name}}</span>{{end}}
<a class="reponame" href="/groups/{{.Path}}">{{.Name}}</a>
{{template "visicon" .Visibility}}
<span class="muted grown">{{.Path}}</span>
</li>
{{else}}<li class="muted">{{t "dash.noGroups"}}</li>{{end}}
</ul>
</section>
</div>
{{template "layout-end" .}}
{{end}}
{{define "usercard"}}
<section class="usercard panel">
{{if .User.AvatarURL}}<img class="avatar xl" src="{{.User.AvatarURL}}" alt="">{{else}}<span class="avatar xl">{{initial .User.Username}}</span>{{end}}
<div>
{{if eq .Heading "h1"}}<h1>{{.Name}}</h1>{{else}}<h2>{{.Name}}</h2>{{end}}
<p class="handle">@{{.User.Username}}</p>
{{if .Bio}}<p class="bio">{{.Bio}}</p>{{end}}
{{if .Since}}<p class="muted">{{t "profile.since" .Since}}</p>{{end}}
<ul class="usercounts">
<li><strong>{{.Repos}}</strong> <span>{{t "dash.repos"}}</span></li>
<li><strong>{{.Groups}}</strong> <span>{{t "dash.groups"}}</span></li>
<li><strong>{{.Contrib}}</strong> <span>{{t "profile.contrib"}}</span></li>
</ul>
</div>
<div class="usercard-actions">
<button type="button" class="ghost" data-copy="{{.URL}}">{{t "profile.copy"}}</button>
{{if .Own}}<a class="btn" href="/settings">{{t "profile.edit"}}</a>{{end}}
</div>
</section>
{{end}}
{{define "heatmap"}}
<section class="heat" aria-label="{{t "heat.title"}}">
<h2>{{t "heat.title"}}</h2>
@@ -163,6 +208,16 @@
{{template "layout-start" .}}
<header class="pagehead"><h1>{{t "title.account"}}</h1></header>
<p class="muted">{{t "acct.hint"}}</p>
<section class="panel">
<h2>{{t "profile.edit"}}</h2>
<form method="post" action="/settings/profile">
<input type="hidden" name="csrf" value="{{.CSRF}}">
<label>{{t "acct.name"}} <input name="name" value="{{.User.DisplayName}}" maxlength="80"></label>
<label>{{t "acct.bio"}} <textarea name="bio" maxlength="280" rows="3">{{.User.Bio}}</textarea></label>
<p class="muted">{{t "acct.bioHint"}}</p>
<button type="submit">{{t "action.save"}}</button>
</form>
</section>
<section class="panel">
<h2>{{t "acct.language"}}</h2>
<form method="post" action="/settings/language">
@@ -277,10 +332,12 @@
{{end}}
{{define "avatar"}}
{{if .UserURL}}<a class="avatarlink" href="{{.UserURL}}">{{end}}
{{if .Avatar}}<img class="avatar" src="{{.Avatar}}" alt="">{{else}}<span class="avatar">{{if .Initial}}{{.Initial}}{{else}}{{initial .Author}}{{end}}</span>{{end}}
{{if .UserURL}}</a>{{end}}
{{end}}
{{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}}
{{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}}
{{define "commitbar"}}
{{if .Head}}
@@ -48,6 +48,7 @@ <div class="pageacts"><a class="btn" href="/new">{{t "nav.new"}}</a></div> <div class="pageacts"><a class="btn" href="/new">{{t "nav.new"}}</a></div></header></header>{{if .StorageUnset}}<p class="flash bad">{{t "home.storage"}}</p>{{end}}{{if .StorageUnset}}<p class="flash bad">{{t "home.storage"}}</p>{{end}}{{if .Card}}{{template "usercard" .Card}}{{end}}{{if .Heat}}{{template "heatmap" .Heat}}{{end}}{{if .Heat}}{{template "heatmap" .Heat}}{{end}}<div class="grid-2"><div class="grid-2"> <section class="panel"> <section class="panel">@@ -70,16 +71,60 @@{{define "profile"}}{{define "profile"}}{{template "layout-start" .}}{{template "layout-start" .}}<header class="pagehead">{{if .Card}}{{template "usercard" .Card}}{{end}} <div class="projhead"> {{if .Profile.AvatarURL}}<img class="avatar lg" src="{{.Profile.AvatarURL}}" alt="">{{else}}<span class="avatar lg">{{initial .Profile.Username}}</span>{{end}} <h1>{{.Profile.Username}}</h1> </div></header>{{if .Heat}}{{template "heatmap" .Heat}}{{end}}{{if .Heat}}{{template "heatmap" .Heat}}{{end}}<div class="grid-2"> <section> <h2>{{t "dash.repos"}}</h2> <ul class="repolist"> {{range .Repos}} <li> {{if .HasLogo}}<img class="tile" src="/{{.FullPath}}/-/logo" alt="">{{else}}<span class="tile">{{initial .Name}}</span>{{end}} <a class="reponame" href="/{{.FullPath}}">{{.Name}}</a> {{template "visicon" .Visibility}} <span class="muted grown">{{.Description}}</span> </li> {{else}}<li class="muted">{{t "dash.noRepos"}}</li>{{end}} </ul> </section> <section> <h2>{{t "dash.groups"}}</h2> <ul class="repolist"> {{range .Groups}} <li> {{if .HasLogo}}<img class="tile" src="/groups/{{.Path}}/logo" alt="">{{else}}<span class="tile">{{initial .Name}}</span>{{end}} <a class="reponame" href="/groups/{{.Path}}">{{.Name}}</a> {{template "visicon" .Visibility}} <span class="muted grown">{{.Path}}</span> </li> {{else}}<li class="muted">{{t "dash.noGroups"}}</li>{{end}} </ul> </section></div>{{template "layout-end" .}}{{template "layout-end" .}}{{end}}{{end}}{{define "usercard"}}<section class="usercard panel"> {{if .User.AvatarURL}}<img class="avatar xl" src="{{.User.AvatarURL}}" alt="">{{else}}<span class="avatar xl">{{initial .User.Username}}</span>{{end}} <div> {{if eq .Heading "h1"}}<h1>{{.Name}}</h1>{{else}}<h2>{{.Name}}</h2>{{end}} <p class="handle">@{{.User.Username}}</p> {{if .Bio}}<p class="bio">{{.Bio}}</p>{{end}} {{if .Since}}<p class="muted">{{t "profile.since" .Since}}</p>{{end}} <ul class="usercounts"> <li><strong>{{.Repos}}</strong> <span>{{t "dash.repos"}}</span></li> <li><strong>{{.Groups}}</strong> <span>{{t "dash.groups"}}</span></li> <li><strong>{{.Contrib}}</strong> <span>{{t "profile.contrib"}}</span></li> </ul> </div> <div class="usercard-actions"> <button type="button" class="ghost" data-copy="{{.URL}}">{{t "profile.copy"}}</button> {{if .Own}}<a class="btn" href="/settings">{{t "profile.edit"}}</a>{{end}} </div></section>{{end}}{{define "heatmap"}}{{define "heatmap"}}<section class="heat" aria-label="{{t "heat.title"}}"><section class="heat" aria-label="{{t "heat.title"}}"> <h2>{{t "heat.title"}}</h2> <h2>{{t "heat.title"}}</h2>@@ -163,6 +208,16 @@{{template "layout-start" .}}{{template "layout-start" .}}<header class="pagehead"><h1>{{t "title.account"}}</h1></header><header class="pagehead"><h1>{{t "title.account"}}</h1></header><p class="muted">{{t "acct.hint"}}</p><p class="muted">{{t "acct.hint"}}</p><section class="panel"> <h2>{{t "profile.edit"}}</h2> <form method="post" action="/settings/profile"> <input type="hidden" name="csrf" value="{{.CSRF}}"> <label>{{t "acct.name"}} <input name="name" value="{{.User.DisplayName}}" maxlength="80"></label> <label>{{t "acct.bio"}} <textarea name="bio" maxlength="280" rows="3">{{.User.Bio}}</textarea></label> <p class="muted">{{t "acct.bioHint"}}</p> <button type="submit">{{t "action.save"}}</button> </form></section><section class="panel"><section class="panel"> <h2>{{t "acct.language"}}</h2> <h2>{{t "acct.language"}}</h2> <form method="post" action="/settings/language"> <form method="post" action="/settings/language">@@ -277,10 +332,12 @@{{end}}{{end}}{{define "avatar"}}{{define "avatar"}}{{if .UserURL}}<a class="avatarlink" href="{{.UserURL}}">{{end}}{{if .Avatar}}<img class="avatar" src="{{.Avatar}}" alt="">{{else}}<span class="avatar">{{if .Initial}}{{.Initial}}{{else}}{{initial .Author}}{{end}}</span>{{end}}{{if .Avatar}}<img class="avatar" src="{{.Avatar}}" alt="">{{else}}<span class="avatar">{{if .Initial}}{{.Initial}}{{else}}{{initial .Author}}{{end}}</span>{{end}}{{if .UserURL}}</a>{{end}}{{end}}{{end}}{{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}}{{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}}{{define "commitbar"}}{{define "commitbar"}}{{if .Head}}{{if .Head}}@@ -303,6 +303,16 @@ func (s *Store) ListRepoIDs(ctx context.Context, userID int64) ([]int64, error)
return ids, rows.Err()
}
// ReposByOwner geeft de repositories van een gebruiker, op naam.
func (s *Store) ReposByOwner(ctx context.Context, userID int64) ([]Repo, error) {
rows, err := s.db.QueryContext(ctx, repoSelect+` WHERE r.owner_kind = 'user' AND r.owner_id = ? ORDER BY r.name`, userID)
if err != nil {
return nil, err
}
defer rows.Close()
return scanRepos(rows)
}
// CountRepos telt repositories van een eigenaar. publicOnly slaat privé over.
func (s *Store) CountRepos(ctx context.Context, ownerKind string, ownerID int64, publicOnly bool) (int, error) {
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) return ids, rows.Err() return ids, rows.Err()}}// ReposByOwner geeft de repositories van een gebruiker, op naam.func (s *Store) ReposByOwner(ctx context.Context, userID int64) ([]Repo, error) { rows, err := s.db.QueryContext(ctx, repoSelect+` WHERE r.owner_kind = 'user' AND r.owner_id = ? ORDER BY r.name`, userID) if err != nil { return nil, err } defer rows.Close() return scanRepos(rows)}// CountRepos telt repositories van een eigenaar. publicOnly slaat privé over.// CountRepos telt repositories van een eigenaar. publicOnly slaat privé over.func (s *Store) CountRepos(ctx context.Context, ownerKind string, ownerID int64, publicOnly bool) (int, error) {func (s *Store) CountRepos(ctx context.Context, ownerKind string, ownerID int64, publicOnly bool) (int, error) { q := `SELECT COUNT(*) FROM repos WHERE owner_kind = ? AND owner_id = ?` q := `SELECT COUNT(*) FROM repos WHERE owner_kind = ? AND owner_id = ?`@@ -100,6 +100,8 @@ func (s *Store) migrate() error {
`ALTER TABLE webhooks ADD COLUMN fields_json TEXT NOT NULL DEFAULT ''`,
`ALTER TABLE access_tokens ADD COLUMN scopes TEXT NOT NULL DEFAULT 'api'`,
`ALTER TABLE pipelines ADD COLUMN target_sha TEXT NOT NULL DEFAULT ''`,
`ALTER TABLE users ADD COLUMN display_name TEXT NOT NULL DEFAULT ''`,
`ALTER TABLE users ADD COLUMN bio TEXT NOT NULL DEFAULT ''`,
}
for _, q := range alters {
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 (
auth_admin INTEGER NOT NULL DEFAULT 0,
instance_admin INTEGER NOT NULL DEFAULT 0,
language TEXT NOT NULL DEFAULT 'en',
display_name TEXT NOT NULL DEFAULT '',
bio TEXT NOT NULL DEFAULT '',
created_at TEXT NOT NULL,
updated_at TEXT NOT NULL
);
@@ -492,6 +496,8 @@ type User struct {
AuthAdmin bool
InstanceAdmin bool
Language string
DisplayName string
Bio string
CreatedAt time.Time
}
@@ -615,21 +621,29 @@ func claimPending(ctx context.Context, tx *sql.Tx, userID int64, username string
// UserByID leest één account.
func (s *Store) UserByID(ctx context.Context, id int64) (User, error) {
row := s.db.QueryRowContext(ctx, `SELECT id, auth_id, username, avatar_url, auth_admin, instance_admin, language, created_at FROM users WHERE id = ?`, id)
row := s.db.QueryRowContext(ctx, `SELECT `+userCols+` FROM users WHERE id = ?`, id)
return scanUser(row)
}
// UserByUsername leest op naam.
func (s *Store) UserByUsername(ctx context.Context, username string) (User, error) {
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))
row := s.db.QueryRowContext(ctx, `SELECT `+userCols+` FROM users WHERE username = ?`, strings.ToLower(username))
return scanUser(row)
}
const userCols = `id, auth_id, username, avatar_url, auth_admin, instance_admin, language, display_name, bio, created_at`
// SetProfile bewaart de weergavenaam en de bio. Lege tekst wist het veld.
func (s *Store) SetProfile(ctx context.Context, userID int64, name, bio string) error {
_, err := s.db.ExecContext(ctx, `UPDATE users SET display_name = ?, bio = ?, updated_at = ? WHERE id = ?`, name, bio, now(), userID)
return err
}
func scanUser(row *sql.Row) (User, error) {
var u User
var admin, inst int
var created string
if err := row.Scan(&u.ID, &u.AuthID, &u.Username, &u.AvatarURL, &admin, &inst, &u.Language, &created); err != nil {
if err := row.Scan(&u.ID, &u.AuthID, &u.Username, &u.AvatarURL, &admin, &inst, &u.Language, &u.DisplayName, &u.Bio, &created); err != nil {
if errors.Is(err, sql.ErrNoRows) {
return User{}, errNotFound
}
@@ -100,6 +100,8 @@ func (s *Store) migrate() error { `ALTER TABLE webhooks ADD COLUMN fields_json TEXT NOT NULL DEFAULT ''`, `ALTER TABLE webhooks ADD COLUMN fields_json TEXT NOT NULL DEFAULT ''`, `ALTER TABLE access_tokens ADD COLUMN scopes TEXT NOT NULL DEFAULT 'api'`, `ALTER TABLE access_tokens ADD COLUMN scopes TEXT NOT NULL DEFAULT 'api'`, `ALTER TABLE pipelines ADD COLUMN target_sha TEXT NOT NULL DEFAULT ''`, `ALTER TABLE pipelines ADD COLUMN target_sha TEXT NOT NULL DEFAULT ''`, `ALTER TABLE users ADD COLUMN display_name TEXT NOT NULL DEFAULT ''`, `ALTER TABLE users ADD COLUMN bio TEXT NOT NULL DEFAULT ''`, } } for _, q := range alters { for _, q := range alters { if _, err := s.db.Exec(q); err != nil && !strings.Contains(strings.ToLower(err.Error()), "duplicate column") { 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 ( auth_admin INTEGER NOT NULL DEFAULT 0, auth_admin INTEGER NOT NULL DEFAULT 0, instance_admin INTEGER NOT NULL DEFAULT 0, instance_admin INTEGER NOT NULL DEFAULT 0, language TEXT NOT NULL DEFAULT 'en', language TEXT NOT NULL DEFAULT 'en', display_name TEXT NOT NULL DEFAULT '', bio TEXT NOT NULL DEFAULT '', created_at TEXT NOT NULL, created_at TEXT NOT NULL, updated_at TEXT NOT NULL updated_at TEXT NOT NULL););@@ -492,6 +496,8 @@ type User struct { AuthAdmin bool AuthAdmin bool InstanceAdmin bool InstanceAdmin bool Language string Language string DisplayName string Bio string CreatedAt time.Time CreatedAt time.Time}}@@ -615,21 +621,29 @@ func claimPending(ctx context.Context, tx *sql.Tx, userID int64, username string// UserByID leest één account.// UserByID leest één account.func (s *Store) UserByID(ctx context.Context, id int64) (User, error) {func (s *Store) UserByID(ctx context.Context, id int64) (User, error) { row := s.db.QueryRowContext(ctx, `SELECT id, auth_id, username, avatar_url, auth_admin, instance_admin, language, created_at FROM users WHERE id = ?`, id) row := s.db.QueryRowContext(ctx, `SELECT `+userCols+` FROM users WHERE id = ?`, id) return scanUser(row) return scanUser(row)}}// UserByUsername leest op naam.// UserByUsername leest op naam.func (s *Store) UserByUsername(ctx context.Context, username string) (User, error) {func (s *Store) UserByUsername(ctx context.Context, username string) (User, error) { 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)) row := s.db.QueryRowContext(ctx, `SELECT `+userCols+` FROM users WHERE username = ?`, strings.ToLower(username)) return scanUser(row) return scanUser(row)}}const userCols = `id, auth_id, username, avatar_url, auth_admin, instance_admin, language, display_name, bio, created_at`// SetProfile bewaart de weergavenaam en de bio. Lege tekst wist het veld.func (s *Store) SetProfile(ctx context.Context, userID int64, name, bio string) error { _, err := s.db.ExecContext(ctx, `UPDATE users SET display_name = ?, bio = ?, updated_at = ? WHERE id = ?`, name, bio, now(), userID) return err}func scanUser(row *sql.Row) (User, error) {func scanUser(row *sql.Row) (User, error) { var u User var u User var admin, inst int var admin, inst int var created string var created string if err := row.Scan(&u.ID, &u.AuthID, &u.Username, &u.AvatarURL, &admin, &inst, &u.Language, &created); err != nil { if err := row.Scan(&u.ID, &u.AuthID, &u.Username, &u.AvatarURL, &admin, &inst, &u.Language, &u.DisplayName, &u.Bio, &created); err != nil { if errors.Is(err, sql.ErrNoRows) { if errors.Is(err, sql.ErrNoRows) { return User{}, errNotFound return User{}, errNotFound } }