pico

created pr with pico/102.1 on 2026-01-04T04:57:34Z · by c8ef7d19

added pico/102.2 on 2026-01-04T15:06:18Z · by c8ef7d19


                      1:  e265f5e ! 1:  ff673f6 feat(prose): lists are back bby

added pico/102.3 on 2026-01-04T15:36:38Z · by c8ef7d19


                      1:  ff673f6 ! 1:  c86f5a4 feat(prose): lists are back bby

cmds

checkout latest patchset:

ssh pr.pico.sh pull pico:102 | git am -3

checkout specific patchset revision:

ssh pr.pico.sh pull pico:102 [rev] | git am -3

add changes to patch request:

git format-patch main --stdout | ssh pr.pico.sh pico:102

add comment to patch request:

ssh pr.pico.sh comment pico:102 "lgtm!"

Patchset `pico/102.1` on 2026-01-04T04:57:34Z · commit e265f5e

→ feat(prose): lists are back bby

Eric Bower 2026-01-04T04:35:04Z

feat(prose): lists are back bby

Eric Bower 2026-01-04T04:35:04Z

Semantic diff summary

2 added, 7 modified, 0 signature changed, 1 removed across 5 analyzed files (2 files skipped: unsupported file type)

pkg/apps/prose/api.go

chunk lines 90-96 modified
function_declaration postHandler modified

pkg/apps/prose/config.go

function_declaration NewConfigSite modified

pkg/apps/prose/scp_hooks.go

chunk lines 2-8 modified
method_declaration metaLxt added
method_declaration metaMd added
method_declaration FileMeta removed

pkg/apps/prose/ssh.go

function_declaration StartSshServer modified

pkg/shared/listparser.go

chunk lines 34-50 modified
function_declaration TokenToMetaField modified

+43 -15 pkg/apps/prose/api.go #

......@@ -90,6 +90,7 @@ type PostPageData struct {
	Diff         template.HTML
	UpdatedAtISO string
	UpdatedAt    string
	List         *shared.ListParsedText
}

type HeaderTxt struct {

......@@ -427,22 +428,47 @@ func postHandler(w http.ResponseWriter, r *http.Request) {
	post, err := dbpool.FindPostWithSlug(slug, user.ID, cfg.Space)
	if err == nil {
		logger.Info("post found", "id", post.ID, "filename", post.FileSize)
		parsedText, err := shared.ParseText(post.Text)
		if err != nil {
			logger.Error("find post with slug", "err", err.Error())
		}
		ext := filepath.Ext(post.Filename)
		contents := template.HTML("")
		tags := []string{}
		unlisted := false
		var list *shared.ListParsedText

		switch ext {
		case ".lxt":
			list = shared.ListParseText(post.Text)

			// if parsedText.Image != "" {
			// 	ogImage = parsedText.Image
			// }
			//
			// if parsedText.ImageCard != "" {
			// 	ogImageCard = parsedText.ImageCard
			// }
			tags = list.Tags

			if post.Hidden || post.PublishAt.After(time.Now()) {
				unlisted = true
			}
		case ".md":
			parsedText, err := shared.ParseText(post.Text)
			if err != nil {
				logger.Error("could not parse md text", "err", err.Error())
			}

		if parsedText.Image != "" {
			ogImage = parsedText.Image
		}
			if parsedText.Image != "" {
				ogImage = parsedText.Image
			}

		if parsedText.ImageCard != "" {
			ogImageCard = parsedText.ImageCard
		}
			if parsedText.ImageCard != "" {
				ogImageCard = parsedText.ImageCard
			}
			tags = parsedText.Tags

		unlisted := false
		if post.Hidden || post.PublishAt.After(time.Now()) {
			unlisted = true
			if post.Hidden || post.PublishAt.After(time.Now()) {
				unlisted = true
			}
			contents = template.HTML(parsedText.Html)
		}

		data = PostPageData{

......@@ -459,10 +485,10 @@ func postHandler(w http.ResponseWriter, r *http.Request) {
			UpdatedAtISO: post.UpdatedAt.Format(time.RFC3339),
			Username:     username,
			BlogName:     blogName,
			Contents:     template.HTML(parsedText.Html),
			Contents:     contents,
			HasCSS:       hasCSS,
			CssURL:       template.URL(cfg.CssURL(username)),
			Tags:         parsedText.Tags,
			Tags:         tags,
			Image:        template.URL(ogImage),
			ImageCard:    ogImageCard,
			Favicon:      template.URL(favicon),

......@@ -470,6 +496,7 @@ func postHandler(w http.ResponseWriter, r *http.Request) {
			Unlisted:     unlisted,
			Diff:         template.HTML(diff),
			WithStyles:   withStyles,
			List:         list,
		}
	} else {
		logger.Info("post not found")

......@@ -522,6 +549,7 @@ func postHandler(w http.ResponseWriter, r *http.Request) {
	}

	ts, err := shared.RenderTemplate(cfg, []string{
		cfg.StaticPath("html/list.partial.tmpl"),
		cfg.StaticPath("html/post.page.tmpl"),
	})

+1 -0 pkg/apps/prose/config.go #

......@@ -28,6 +28,7 @@ func NewConfigSite(service string) *shared.ConfigSite {
		Space:    "prose",
		AllowedExt: []string{
			".md",
			".lxt",
			".jpg",
			".jpeg",
			".png",

+51 -0 pkg/apps/prose/html/list.partial.tmpl #

......@@ -0,0 +1,51 @@
{{define "list"}}
{{$indent := 0}}
{{$mod := 0}}
<ul style="list-style-type: {{.ListType}};">
    {{range .Items}}
        {{if lt $indent .Indent}}
        <ul style="list-style-type: {{$.ListType}};">
        {{else if gt $indent .Indent}}

        {{$mod = minus $indent .Indent}}
        {{range $y := intRange 1 $mod}}
        </li></ul>
        {{end}}

        {{else}}
        </li>
        {{end}}
        {{$indent = .Indent}}

        {{if .IsText}}
            {{if .Value}}
            <li>{{.Value}}
            {{end}}
        {{end}}

        {{if .IsURL}}
        <li><a href="{{.URL}}">{{.Value}}</a>
        {{end}}

        {{if .IsImg}}
        <li><img src="{{.URL}}" alt="{{.Value}}" />
        {{end}}

        {{if .IsBlock}}
        <li><blockquote>{{.Value}}</blockquote>
        {{end}}

        {{if .IsHeaderOne}}
        </ul><h2 class="text-xl font-bold">{{.Value}}</h2><ul style="list-style-type: {{$.ListType}};">
        {{end}}

        {{if .IsHeaderTwo}}
        </ul><h3 class="text-lg font-bold">{{.Value}}</h3><ul style="list-style-type: {{$.ListType}};">
        {{end}}

        {{if .IsPre}}
        <li><pre>{{.Value}}</pre>
        {{end}}
    {{end}}
</ul>
{{end}}

+5 -1 pkg/apps/prose/html/post.page.tmpl #

......@@ -65,7 +65,11 @@
</header>
<main>
    <article class="md">
        {{.Contents}}
        {{if .List}}
          {{template "list" .List}}
        {{else}}
          {{.Contents}}
        {{end}}

        <div class="tags">
          {{range .Tags}}

+43 -1 pkg/apps/prose/scp_hooks.go #

......@@ -2,6 +2,7 @@ package prose

import (
	"fmt"
	"path/filepath"
	"strings"

	"slices"

......@@ -62,7 +63,29 @@ func (p *MarkdownHooks) FileValidate(s *pssh.SSHServerConnSession, data *filehan
	return true, nil
}

func (p *MarkdownHooks) FileMeta(s *pssh.SSHServerConnSession, data *filehandlers.PostMetaData) error {
func (p *MarkdownHooks) metaLxt(data *filehandlers.PostMetaData) error {
	parsedText := shared.ListParseText(data.Text)

	if parsedText.Title == "" {
		data.Title = utils.ToUpper(data.Slug)
	} else {
		data.Title = parsedText.Title
	}

	data.Aliases = parsedText.Aliases
	data.Tags = parsedText.Tags
	data.Description = parsedText.Description

	if parsedText.PublishAt != nil && !parsedText.PublishAt.IsZero() {
		data.PublishAt = parsedText.PublishAt
	}

	isHiddenFilename := slices.Contains(p.Cfg.HiddenPosts, data.Filename)
	data.Hidden = parsedText.Hidden || isHiddenFilename
	return nil
}

func (p *MarkdownHooks) metaMd(data *filehandlers.PostMetaData) error {
	parsedText, err := shared.ParseText(data.Text)
	if err != nil {
		return fmt.Errorf("%s: %w", data.Filename, err)

......@@ -84,6 +107,25 @@ func (p *MarkdownHooks) FileMeta(s *pssh.SSHServerConnSession, data *filehandler

	isHiddenFilename := slices.Contains(p.Cfg.HiddenPosts, data.Filename)
	data.Hidden = parsedText.Hidden || isHiddenFilename
	return nil
}

func (p *MarkdownHooks) FileMeta(s *pssh.SSHServerConnSession, data *filehandlers.PostMetaData) error {
	ext := filepath.Ext(data.Filename)
	switch ext {
	case ".lxt":
		err := p.metaLxt(data)
		if err != nil {
			return fmt.Errorf("%s: %w", data.Filename, err)
		}
	case ".md":
		err := p.metaMd(data)
		if err != nil {
			return fmt.Errorf("%s: %w", data.Filename, err)
		}
	default:
		return fmt.Errorf("%s: invalid filetype", data.Filename)
	}

	return nil
}

+1 -0 pkg/apps/prose/ssh.go #

......@@ -55,6 +55,7 @@ func StartSshServer() {
		".md":      filehandlers.NewScpPostHandler(dbh, cfg, hooks),
		".txt":     filehandlers.NewScpPostHandler(dbh, cfg, hooks),
		".css":     filehandlers.NewScpPostHandler(dbh, cfg, hooks),
		".lxt":     filehandlers.NewScpPostHandler(dbh, cfg, hooks),
		"fallback": uploadimgs.NewUploadImgHandler(dbh, cfg, st),
	}
	handler := filehandlers.NewFileHandlerRouter(cfg, dbh, fileMap)

+23 -6 pkg/shared/listparser.go #

......@@ -34,12 +34,17 @@ type ListItem struct {
}

type ListMetaData struct {
	PublishAt      *time.Time
	Title          string
	Description    string
	Layout         string
	Tags           []string
	ListType       string // https://developer.mozilla.org/en-US/docs/Web/CSS/list-style-type
	// prose
	PublishAt   *time.Time
	Title       string
	Description string
	Layout      string
	Tags        []string
	Hidden      bool
	Aliases     []string
	ListType    string // https://developer.mozilla.org/en-US/docs/Web/CSS/list-style-type

	// feeds
	DigestInterval string
	Cron           string
	Email          string

......@@ -103,12 +108,24 @@ func TokenToMetaField(meta *ListMetaData, token *SplitToken) error {
		meta.Description = token.Value
	case "list_type":
		meta.ListType = token.Value
	case "hidden":
		if token.Value == "true" {
			meta.Hidden = true
		} else {
			meta.Hidden = false
		}
	case "tags":
		tags := strings.Split(token.Value, ",")
		meta.Tags = make([]string, 0)
		for _, tag := range tags {
			meta.Tags = append(meta.Tags, strings.TrimSpace(tag))
		}
	case "aliases":
		aliases := strings.Split(token.Value, ",")
		meta.Aliases = make([]string, 0)
		for _, alias := range aliases {
			meta.Aliases = append(meta.Aliases, strings.TrimSpace(alias))
		}
	case "layout":
		meta.Layout = token.Value
	case "digest_interval":

...	...		@@ -427,22 +428,47 @@ func postHandler(w http.ResponseWriter, r *http.Request) {
427	428		post, err := dbpool.FindPostWithSlug(slug, user.ID, cfg.Space)
428	429		if err == nil {
429	430		logger.Info("post found", "id", post.ID, "filename", post.FileSize)
430		-	parsedText, err := shared.ParseText(post.Text)
431		-	if err != nil {
432		-	logger.Error("find post with slug", "err", err.Error())
433		-	}
	431	+	ext := filepath.Ext(post.Filename)
	432	+	contents := template.HTML("")
	433	+	tags := []string{}
	434	+	unlisted := false
	435	+	var list *shared.ListParsedText
	436	+
	437	+	switch ext {
	438	+	case ".lxt":
	439	+	list = shared.ListParseText(post.Text)
	440	+
	441	+	// if parsedText.Image != "" {
	442	+	// ogImage = parsedText.Image
	443	+	// }
	444	+	//
	445	+	// if parsedText.ImageCard != "" {
	446	+	// ogImageCard = parsedText.ImageCard
	447	+	// }
	448	+	tags = list.Tags
	449	+
	450	+	if post.Hidden \|\| post.PublishAt.After(time.Now()) {
	451	+	unlisted = true
	452	+	}
	453	+	case ".md":
	454	+	parsedText, err := shared.ParseText(post.Text)
	455	+	if err != nil {
	456	+	logger.Error("could not parse md text", "err", err.Error())
	457	+	}
434	458
435		-	if parsedText.Image != "" {
436		-	ogImage = parsedText.Image
437		-	}
	459	+	if parsedText.Image != "" {
	460	+	ogImage = parsedText.Image
	461	+	}
438	462
439		-	if parsedText.ImageCard != "" {
440		-	ogImageCard = parsedText.ImageCard
441		-	}
	463	+	if parsedText.ImageCard != "" {
	464	+	ogImageCard = parsedText.ImageCard
	465	+	}
	466	+	tags = parsedText.Tags
442	467
443		-	unlisted := false
444		-	if post.Hidden \|\| post.PublishAt.After(time.Now()) {
445		-	unlisted = true
	468	+	if post.Hidden \|\| post.PublishAt.After(time.Now()) {
	469	+	unlisted = true
	470	+	}
	471	+	contents = template.HTML(parsedText.Html)
446	472		}
447	473
448	474		data = PostPageData{

...	...		@@ -459,10 +485,10 @@ func postHandler(w http.ResponseWriter, r *http.Request) {
459	485		UpdatedAtISO: post.UpdatedAt.Format(time.RFC3339),
460	486		Username: username,
461	487		BlogName: blogName,
462		-	Contents: template.HTML(parsedText.Html),
	488	+	Contents: contents,
463	489		HasCSS: hasCSS,
464	490		CssURL: template.URL(cfg.CssURL(username)),
465		-	Tags: parsedText.Tags,
	491	+	Tags: tags,
466	492		Image: template.URL(ogImage),
467	493		ImageCard: ogImageCard,
468	494		Favicon: template.URL(favicon),

...	...		@@ -522,6 +549,7 @@ func postHandler(w http.ResponseWriter, r *http.Request) {
522	549		}
523	550
524	551		ts, err := shared.RenderTemplate(cfg, []string{
	552	+	cfg.StaticPath("html/list.partial.tmpl"),
525	553		cfg.StaticPath("html/post.page.tmpl"),
526	554		})
527	555

...	...		@@ -84,6 +107,25 @@ func (p MarkdownHooks) FileMeta(s pssh.SSHServerConnSession, data *filehandler
84	107
85	108		isHiddenFilename := slices.Contains(p.Cfg.HiddenPosts, data.Filename)
86	109		data.Hidden = parsedText.Hidden \|\| isHiddenFilename
	110	+	return nil
	111	+	}
	112	+
	113	+	func (p MarkdownHooks) FileMeta(s pssh.SSHServerConnSession, data *filehandlers.PostMetaData) error {
	114	+	ext := filepath.Ext(data.Filename)
	115	+	switch ext {
	116	+	case ".lxt":
	117	+	err := p.metaLxt(data)
	118	+	if err != nil {
	119	+	return fmt.Errorf("%s: %w", data.Filename, err)
	120	+	}
	121	+	case ".md":
	122	+	err := p.metaMd(data)
	123	+	if err != nil {
	124	+	return fmt.Errorf("%s: %w", data.Filename, err)
	125	+	}
	126	+	default:
	127	+	return fmt.Errorf("%s: invalid filetype", data.Filename)
	128	+	}
87	129
88	130		return nil
89	131		}

...	...		@@ -103,12 +108,24 @@ func TokenToMetaField(meta ListMetaData, token SplitToken) error {
103	108		meta.Description = token.Value
104	109		case "list_type":
105	110		meta.ListType = token.Value
	111	+	case "hidden":
	112	+	if token.Value == "true" {
	113	+	meta.Hidden = true
	114	+	} else {
	115	+	meta.Hidden = false
	116	+	}
106	117		case "tags":
107	118		tags := strings.Split(token.Value, ",")
108	119		meta.Tags = make([]string, 0)
109	120		for _, tag := range tags {
110	121		meta.Tags = append(meta.Tags, strings.TrimSpace(tag))
111	122		}
	123	+	case "aliases":
	124	+	aliases := strings.Split(token.Value, ",")
	125	+	meta.Aliases = make([]string, 0)
	126	+	for _, alias := range aliases {
	127	+	meta.Aliases = append(meta.Aliases, strings.TrimSpace(alias))
	128	+	}
112	129		case "layout":
113	130		meta.Layout = token.Value
114	131		case "digest_interval":

...	...		@@ -90,6 +90,7 @@ type PostPageData struct {
90	90		Diff template.HTML
91	91		UpdatedAtISO string
92	92		UpdatedAt string
	93	+	List *shared.ListParsedText
93	94		}
94	95
95	96		type HeaderTxt struct {

...	...		@@ -470,6 +496,7 @@ func postHandler(w http.ResponseWriter, r *http.Request) {
470	496		Unlisted: unlisted,
471	497		Diff: template.HTML(diff),
472	498		WithStyles: withStyles,
	499	+	List: list,
473	500		}
474	501		} else {
475	502		logger.Info("post not found")

...	...		@@ -28,6 +28,7 @@ func NewConfigSite(service string) *shared.ConfigSite {
28	28		Space: "prose",
29	29		AllowedExt: []string{
30	30		".md",
	31	+	".lxt",
31	32		".jpg",
32	33		".jpeg",
33	34		".png",

...	...		@@ -0,0 +1,51 @@
	1	+	{{define "list"}}
	2	+	{{$indent := 0}}
	3	+	{{$mod := 0}}
	4	+	<ul style="list-style-type: {{.ListType}};">
	5	+	{{range .Items}}
	6	+	{{if lt $indent .Indent}}
	7	+	<ul style="list-style-type: {{$.ListType}};">
	8	+	{{else if gt $indent .Indent}}
	9	+
	10	+	{{$mod = minus $indent .Indent}}
	11	+	{{range $y := intRange 1 $mod}}
	12	+	</li></ul>
	13	+	{{end}}
	14	+
	15	+	{{else}}
	16	+	</li>
	17	+	{{end}}
	18	+	{{$indent = .Indent}}
	19	+
	20	+	{{if .IsText}}
	21	+	{{if .Value}}
	22	+	<li>{{.Value}}
	23	+	{{end}}
	24	+	{{end}}
	25	+
	26	+	{{if .IsURL}}
	27	+	<li><a href="{{.URL}}">{{.Value}}</a>
	28	+	{{end}}
	29	+
	30	+	{{if .IsImg}}
	31	+	<li><img src="{{.URL}}" alt="{{.Value}}" />
	32	+	{{end}}
	33	+
	34	+	{{if .IsBlock}}
	35	+	<li><blockquote>{{.Value}}</blockquote>
	36	+	{{end}}
	37	+
	38	+	{{if .IsHeaderOne}}
	39	+	</ul><h2 class="text-xl font-bold">{{.Value}}</h2><ul style="list-style-type: {{$.ListType}};">
	40	+	{{end}}
	41	+
	42	+	{{if .IsHeaderTwo}}
	43	+	</ul><h3 class="text-lg font-bold">{{.Value}}</h3><ul style="list-style-type: {{$.ListType}};">
	44	+	{{end}}
	45	+
	46	+	{{if .IsPre}}
	47	+	<li><pre>{{.Value}}</pre>
	48	+	{{end}}
	49	+	{{end}}
	50	+	</ul>
	51	+	{{end}}

...	...		@@ -65,7 +65,11 @@
65	65		</header>
66	66		<main>
67	67		<article class="md">
68		-	{{.Contents}}
	68	+	{{if .List}}
	69	+	{{template "list" .List}}
	70	+	{{else}}
	71	+	{{.Contents}}
	72	+	{{end}}
69	73
70	74		<div class="tags">
71	75		{{range .Tags}}

...	...		@@ -2,6 +2,7 @@ package prose
2	2
3	3		import (
4	4		"fmt"
	5	+	"path/filepath"
5	6		"strings"
6	7
7	8		"slices"

...	...		@@ -62,7 +63,29 @@ func (p MarkdownHooks) FileValidate(s pssh.SSHServerConnSession, data *filehan
62	63		return true, nil
63	64		}
64	65
65		-	func (p MarkdownHooks) FileMeta(s pssh.SSHServerConnSession, data *filehandlers.PostMetaData) error {
	66	+	func (p MarkdownHooks) metaLxt(data filehandlers.PostMetaData) error {
	67	+	parsedText := shared.ListParseText(data.Text)
	68	+
	69	+	if parsedText.Title == "" {
	70	+	data.Title = utils.ToUpper(data.Slug)
	71	+	} else {
	72	+	data.Title = parsedText.Title
	73	+	}
	74	+
	75	+	data.Aliases = parsedText.Aliases
	76	+	data.Tags = parsedText.Tags
	77	+	data.Description = parsedText.Description
	78	+
	79	+	if parsedText.PublishAt != nil && !parsedText.PublishAt.IsZero() {
	80	+	data.PublishAt = parsedText.PublishAt
	81	+	}
	82	+
	83	+	isHiddenFilename := slices.Contains(p.Cfg.HiddenPosts, data.Filename)
	84	+	data.Hidden = parsedText.Hidden \|\| isHiddenFilename
	85	+	return nil
	86	+	}
	87	+
	88	+	func (p MarkdownHooks) metaMd(data filehandlers.PostMetaData) error {
66	89		parsedText, err := shared.ParseText(data.Text)
67	90		if err != nil {
68	91		return fmt.Errorf("%s: %w", data.Filename, err)

...	...		@@ -55,6 +55,7 @@ func StartSshServer() {
55	55		".md": filehandlers.NewScpPostHandler(dbh, cfg, hooks),
56	56		".txt": filehandlers.NewScpPostHandler(dbh, cfg, hooks),
57	57		".css": filehandlers.NewScpPostHandler(dbh, cfg, hooks),
	58	+	".lxt": filehandlers.NewScpPostHandler(dbh, cfg, hooks),
58	59		"fallback": uploadimgs.NewUploadImgHandler(dbh, cfg, st),
59	60		}
60	61		handler := filehandlers.NewFileHandlerRouter(cfg, dbh, fileMap)

...	...		@@ -34,12 +34,17 @@ type ListItem struct {
34	34		}
35	35
36	36		type ListMetaData struct {
37		-	PublishAt *time.Time
38		-	Title string
39		-	Description string
40		-	Layout string
41		-	Tags []string
42		-	ListType string // https://developer.mozilla.org/en-US/docs/Web/CSS/list-style-type
	37	+	// prose
	38	+	PublishAt *time.Time
	39	+	Title string
	40	+	Description string
	41	+	Layout string
	42	+	Tags []string
	43	+	Hidden bool
	44	+	Aliases []string
	45	+	ListType string // https://developer.mozilla.org/en-US/docs/Web/CSS/list-style-type
	46	+
	47	+	// feeds
43	48		DigestInterval string
44	49		Cron string
45	50		Email string

pico

Patchset pico/102.1 on 2026-01-04T04:57:34Z · commit e265f5e

Patchset `pico/102.1` on 2026-01-04T04:57:34Z · commit e265f5e