Refine message template

wabarc · May 19, 2023 · 4d0aa19 · 4d0aa19
1 parent 6d84837
commit 4d0aa19
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 24 deletions.
diff --git a/template/render/mastodon_test.go b/template/render/mastodon_test.go
@@ -15,9 +15,9 @@ import (
 func TestRenderMastodon(t *testing.T) {
 	const toot = `‹ Example ›
 
-• source
+• Source
 > https://example.com/
-
+ 
 ————
 
 • Internet Archive

diff --git a/template/render/nostr_test.go b/template/render/nostr_test.go
@@ -15,9 +15,9 @@ func TestRenderNostrForReply(t *testing.T) {
 func TestRenderNostrForPublish(t *testing.T) {
 	expected := `‹ Example ›
 
-• source
+• Source
 > https://example.com/
-
+ 
 ————
 
 • Internet Archive

diff --git a/template/render/relaychat.go b/template/render/relaychat.go
@@ -40,18 +40,18 @@ func (i *Relaychat) ForPublish() *Render {
 		tmplBytes.WriteString(" ›")
 		tmplBytes.WriteString("\n \n")
 	}
-	// tmplBytes.WriteString("Source:")
-	// tmplBytes.WriteString("• ")
-	// tmplBytes.WriteString("\n \n")
-	tmplBytes.Write(i.join(i.main()).Bytes())
+	// tmplBytes.WriteString("Source:\n")
+	tmplBytes.WriteString(original(i.Cols))
+	tmplBytes.WriteString(" \n")
+	tmplBytes.Write(i.main().Bytes())
 
-	return &Render{buf: *tmplBytes}
+	return &Render{buf: *i.join(tmplBytes)}
 }
 
 func (i *Relaychat) main() *bytes.Buffer {
 	tmplBytes := new(bytes.Buffer)
 
-	const tmpl = "{{range $ := .}}{{ $.Arc | name }}:\n• {{ $.Dst }}\n{{end}}"
+	const tmpl = "{{range $ := .}}• {{ $.Arc | name }}:\n> {{ $.Dst }}\n{{end}}"
 
 	tpl, err := template.New("relaychat").Funcs(funcMap()).Parse(tmpl)
 	if err != nil {

diff --git a/template/render/relaychat_test.go b/template/render/relaychat_test.go
@@ -9,18 +9,23 @@ import (
 )
 
 func TestRenderForIRC(t *testing.T) {
-	expected := `‹ Example ›
+	expected := `***** List of Archives *****
  
-***** List of Archives *****
+‹ Example ›
  
-Internet Archive:
-• https://web.archive.org/web/20211000000001/https://example.com/
-archive.today:
-• http://archive.today/abcdE
-IPFS:
-• https://ipfs.io/ipfs/QmTbDmpvQ3cPZG6TA5tnar4ZG6q9JMBYVmX2n3wypMQMtr
-Telegraph:
-• http://telegra.ph/title-01-01
+• Source
+> https://example.com/
+ 
+————
+ 
+• Internet Archive:
+> https://web.archive.org/web/20211000000001/https://example.com/
+• archive.today:
+> http://archive.today/abcdE
+• IPFS:
+> https://ipfs.io/ipfs/QmTbDmpvQ3cPZG6TA5tnar4ZG6q9JMBYVmX2n3wypMQMtr
+• Telegraph:
+> http://telegra.ph/title-01-01
  
 ***** End of Archives *****`
 

diff --git a/template/render/render.go b/template/render/render.go
@@ -234,11 +234,11 @@ func original(v interface{}) (o string) {
 	})
 
 	var sb strings.Builder
-	sb.WriteString("• source\n")
+	sb.WriteString("• Source\n")
 	for _, kv := range ss {
 		sb.WriteString(`> `)
 		sb.WriteString(kv.Key)
-		sb.WriteString("\n")
+		sb.WriteString("\n ")
 	}
 	sb.WriteString("\n————\n")
 

diff --git a/template/render/twitter_test.go b/template/render/twitter_test.go
@@ -29,9 +29,9 @@ func TestRenderTwitterForReply(t *testing.T) {
 func TestRenderTwitterForPublish(t *testing.T) {
 	const tweet = `‹ Example ›
 
-• source
+• Source
 > https://example.com/
-
+ 
 ————
 
 • Internet Archive