pico

chore(pgs): add projects.blocked col rss

created pr with 15.1 on 2024-08-01T14:25:45Z · by c8ef7d19

added 15.2 on 2024-08-01T15:29:59Z · by c8ef7d19


                      1:  866976a = 1:  866976a feat(prose): live journal


                      -:  ------- > 2:  b82b2f7 chore: diff in post

cmds

checkout latest patchset:

ssh pr.pico.sh print 15 | git am -3

checkout any patchset in a patch request:

ssh pr.pico.sh print 15.[rev] | git am -3

add changes to patch request:

git format-patch main --stdout | ssh pr.pico.sh pr add 15

Patchset `15.2` on 2024-08-01T15:29:59Z · commit b82b2f7

feat(prose): live journal

Eric Bower 2024-08-01T14:24:47Z

→ chore: diff in post

Eric Bower 2024-08-01T15:29:31Z

chore: diff in post

Eric Bower 2024-08-01T15:29:31Z

Semantic diff summary

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

filehandlers/post_handler.go

function_declaration Write modified

prose/api.go

chunk lines 83-89 modified
function_declaration postHandler modified

prose/scp_hooks.go

chunk lines 1-7 modified
function_declaration diffText added
function_declaration FileMeta modified

shared/mdparser.go

chunk lines 40-46 modified
function_declaration ParseText modified

+1 -0 filehandlers/post_handler.go #

......@@ -139,6 +139,7 @@ func (h *ScpUploadHandler) Write(s ssh.Session, entry *utils.FileEntry) (string,

	if post != nil {
		metadata.Cur = post
		metadata.Data = post.Data
		metadata.Post.PublishAt = post.PublishAt
	}

+11 -0 prose/api.go #

......@@ -83,6 +83,7 @@ type PostPageData struct {
	Footer       template.HTML
	Favicon      template.URL
	Unlisted     bool
	Diff         template.HTML
}

type TransparencyPageData struct {

......@@ -399,6 +400,7 @@ func postHandler(w http.ResponseWriter, r *http.Request) {
		favicon = readmeParsed.Favicon
	}

	diff := ""
	post, err := dbpool.FindPostWithSlug(slug, user.ID, cfg.Space)
	if err == nil {
		parsedText, err := shared.ParseText(post.Text)

......@@ -414,6 +416,14 @@ func postHandler(w http.ResponseWriter, r *http.Request) {
			ogImageCard = parsedText.ImageCard
		}

		// if parsedText.Live {
		if post.Data.Diff != "" {
			str := "```diff\n" + post.Data.Diff + "\n```"
			diffParsed, _ := shared.ParseText(str)
			diff = diffParsed.Html
		}
		// }

		// track visit
		view, err := shared.AnalyticsVisitFromRequest(r, user.ID, cfg.Secret)
		if err == nil {

......@@ -451,6 +461,7 @@ func postHandler(w http.ResponseWriter, r *http.Request) {
			Favicon:      template.URL(favicon),
			Footer:       footerHTML,
			Unlisted:     unlisted,
			Diff:         template.HTML(diff),
		}
	} else {
		// TODO: HACK to support imgs slugs inside prose

+8 -1 prose/html/post.page.tmpl #

......@@ -62,9 +62,16 @@
    </div>
</header>
<main>
    {{if .Diff}}
    <details>
      <summary>diff</summary>
      <div class="md">{{.Diff}}</div>
    </details>
    {{end}}

    <article class="md">
        {{.Contents}}
        <div id="post-footer">{{.Footer}}</div>
        <div id="post-footer" class="box">{{.Footer}}</div>
    </article>
</main>
{{template "footer" .}}

+28 -3 prose/scp_hooks.go #

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

import (
	"bytes"
	"fmt"
	"strings"

......@@ -47,6 +48,26 @@ func (p *MarkdownHooks) FileValidate(s ssh.Session, data *filehandlers.PostMetaD
	return true, nil
}

func diffText(diffs []diffmatchpatch.Diff) string {
	var buff bytes.Buffer
	for _, diff := range diffs {
		text := diff.Text

		switch diff.Type {
		case diffmatchpatch.DiffInsert:
			_, _ = buff.WriteString("+")
			_, _ = buff.WriteString(text)
		case diffmatchpatch.DiffDelete:
			_, _ = buff.WriteString("-")
			_, _ = buff.WriteString(text)
		case diffmatchpatch.DiffEqual:
			_, _ = buff.WriteString(text)
		}
	}

	return buff.String()
}

func (p *MarkdownHooks) FileMeta(s ssh.Session, data *filehandlers.PostMetaData) error {
	parsedText, err := shared.ParseText(data.Text)
	if err != nil {

......@@ -63,9 +84,13 @@ func (p *MarkdownHooks) FileMeta(s ssh.Session, data *filehandlers.PostMetaData)
	data.Tags = parsedText.Tags
	data.Description = parsedText.Description

	dmp := diffmatchpatch.New()
	diffs := dmp.DiffMain(data.Cur.Text, data.Text, false)
	data.Data.Diff = dmp.DiffPrettyText(diffs)
	if data.Cur.Text == data.Text {
	} else {
		dmp := diffmatchpatch.New()
		diffs := dmp.DiffMain(data.Cur.Text, data.Text, false)
		fmt.Println(diffs)
		data.Data.Diff = diffText(diffs)
	}

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

+7 -0 shared/mdparser.go #

......@@ -40,6 +40,7 @@ type MetaData struct {
	ImageCard   string
	Favicon     string
	Hidden      bool
	Live        bool
}

type ParsedText struct {

......@@ -303,6 +304,12 @@ func ParseText(text string) (*ParsedText, error) {
	}
	parsed.MetaData.Favicon = favicon

	live, err := toBool(metaData["live"])
	if err != nil {
		return &parsed, fmt.Errorf("front-matter field (%s): %w", "live", err)
	}
	parsed.MetaData.Live = live

	var publishAt *time.Time = nil
	date, err := toString(metaData["date"])
	if err != nil {

...	...		@@ -139,6 +139,7 @@ func (h ScpUploadHandler) Write(s ssh.Session, entry utils.FileEntry) (string,
139	139
140	140		if post != nil {
141	141		metadata.Cur = post
	142	+	metadata.Data = post.Data
142	143		metadata.Post.PublishAt = post.PublishAt
143	144		}
144	145

...	...		@@ -414,6 +416,14 @@ func postHandler(w http.ResponseWriter, r *http.Request) {
414	416		ogImageCard = parsedText.ImageCard
415	417		}
416	418
	419	+	// if parsedText.Live {
	420	+	if post.Data.Diff != "" {
	421	+	str := "```diff\n" + post.Data.Diff + "\n```"
	422	+	diffParsed, _ := shared.ParseText(str)
	423	+	diff = diffParsed.Html
	424	+	}
	425	+	// }
	426	+
417	427		// track visit
418	428		view, err := shared.AnalyticsVisitFromRequest(r, user.ID, cfg.Secret)
419	429		if err == nil {

...	...		@@ -303,6 +304,12 @@ func ParseText(text string) (*ParsedText, error) {
303	304		}
304	305		parsed.MetaData.Favicon = favicon
305	306
	307	+	live, err := toBool(metaData["live"])
	308	+	if err != nil {
	309	+	return &parsed, fmt.Errorf("front-matter field (%s): %w", "live", err)
	310	+	}
	311	+	parsed.MetaData.Live = live
	312	+
306	313		var publishAt *time.Time = nil
307	314		date, err := toString(metaData["date"])
308	315		if err != nil {

...	...		@@ -83,6 +83,7 @@ type PostPageData struct {
83	83		Footer template.HTML
84	84		Favicon template.URL
85	85		Unlisted bool
	86	+	Diff template.HTML
86	87		}
87	88
88	89		type TransparencyPageData struct {

...	...		@@ -399,6 +400,7 @@ func postHandler(w http.ResponseWriter, r *http.Request) {
399	400		favicon = readmeParsed.Favicon
400	401		}
401	402
	403	+	diff := ""
402	404		post, err := dbpool.FindPostWithSlug(slug, user.ID, cfg.Space)
403	405		if err == nil {
404	406		parsedText, err := shared.ParseText(post.Text)

...	...		@@ -451,6 +461,7 @@ func postHandler(w http.ResponseWriter, r *http.Request) {
451	461		Favicon: template.URL(favicon),
452	462		Footer: footerHTML,
453	463		Unlisted: unlisted,
	464	+	Diff: template.HTML(diff),
454	465		}
455	466		} else {
456	467		// TODO: HACK to support imgs slugs inside prose

...	...		@@ -62,9 +62,16 @@
62	62		</div>
63	63		</header>
64	64		<main>
	65	+	{{if .Diff}}
	66	+	<details>
	67	+	<summary>diff</summary>
	68	+	<div class="md">{{.Diff}}</div>
	69	+	</details>
	70	+	{{end}}
	71	+
65	72		<article class="md">
66	73		{{.Contents}}
67		-	<div id="post-footer">{{.Footer}}</div>
	74	+	<div id="post-footer" class="box">{{.Footer}}</div>
68	75		</article>
69	76		</main>
70	77		{{template "footer" .}}

...	...		@@ -1,6 +1,7 @@
1	1		package prose
2	2
3	3		import (
	4	+	"bytes"
4	5		"fmt"
5	6		"strings"
6	7

...	...		@@ -47,6 +48,26 @@ func (p MarkdownHooks) FileValidate(s ssh.Session, data filehandlers.PostMetaD
47	48		return true, nil
48	49		}
49	50
	51	+	func diffText(diffs []diffmatchpatch.Diff) string {
	52	+	var buff bytes.Buffer
	53	+	for _, diff := range diffs {
	54	+	text := diff.Text
	55	+
	56	+	switch diff.Type {
	57	+	case diffmatchpatch.DiffInsert:
	58	+	_, _ = buff.WriteString("+")
	59	+	_, _ = buff.WriteString(text)
	60	+	case diffmatchpatch.DiffDelete:
	61	+	_, _ = buff.WriteString("-")
	62	+	_, _ = buff.WriteString(text)
	63	+	case diffmatchpatch.DiffEqual:
	64	+	_, _ = buff.WriteString(text)
	65	+	}
	66	+	}
	67	+
	68	+	return buff.String()
	69	+	}
	70	+
50	71		func (p MarkdownHooks) FileMeta(s ssh.Session, data filehandlers.PostMetaData) error {
51	72		parsedText, err := shared.ParseText(data.Text)
52	73		if err != nil {

...	...		@@ -63,9 +84,13 @@ func (p MarkdownHooks) FileMeta(s ssh.Session, data filehandlers.PostMetaData)
63	84		data.Tags = parsedText.Tags
64	85		data.Description = parsedText.Description
65	86
66		-	dmp := diffmatchpatch.New()
67		-	diffs := dmp.DiffMain(data.Cur.Text, data.Text, false)
68		-	data.Data.Diff = dmp.DiffPrettyText(diffs)
	87	+	if data.Cur.Text == data.Text {
	88	+	} else {
	89	+	dmp := diffmatchpatch.New()
	90	+	diffs := dmp.DiffMain(data.Cur.Text, data.Text, false)
	91	+	fmt.Println(diffs)
	92	+	data.Data.Diff = diffText(diffs)
	93	+	}
69	94
70	95		if parsedText.PublishAt != nil && !parsedText.PublishAt.IsZero() {
71	96		data.PublishAt = parsedText.MetaData.PublishAt

...	...		@@ -40,6 +40,7 @@ type MetaData struct {
40	40		ImageCard string
41	41		Favicon string
42	42		Hidden bool
	43	+	Live bool
43	44		}
44	45
45	46		type ParsedText struct {

pico

Patchset 15.2 on 2024-08-01T15:29:59Z · commit b82b2f7

Patchset `15.2` on 2024-08-01T15:29:59Z · commit b82b2f7