From ce86ff03865cea3d820c2e0fde9fb794e8324a9b Mon Sep 17 00:00:00 2001 From: Romain de Laage Date: Thu, 4 Mar 2021 09:27:50 +0100 Subject: [PATCH] Toot title is less important (h3), decode url query for tag, use account handle instead of username --- main.go | 2 +- server.go | 11 +++++++++++ util.go | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/main.go b/main.go index b6a9dd4..5fc12b1 100644 --- a/main.go +++ b/main.go @@ -38,7 +38,7 @@ type Config struct { type Account struct { Id string `json:"id"` DisplayName string `json:"display_name"` - Name string `json:"username"` + Name string `json:"acct"` Url string `json:"url"` } diff --git a/server.go b/server.go index fd0ff34..dc02cfd 100644 --- a/server.go +++ b/server.go @@ -292,6 +292,17 @@ func printTag(conn *tls.Conn, baseURL, tag string) { return } + //decode tag (url encoded char like space) + tag, err = url.QueryUnescape(tag) + if err != nil { + _, err = fmt.Fprintf(conn, "59 Invalid url encoded tag\r\n") + if err != nil { + log.Println("handleConn: %s", err) + return + } + return + } + // Print header _, err = fmt.Fprintf(conn, "20 text/gemini\r\n# Toots for %s\n", tag) if err != nil { diff --git a/util.go b/util.go index 2d855bc..b7fa6ef 100644 --- a/util.go +++ b/util.go @@ -99,5 +99,5 @@ func formatBlog(toot Blog) string { author = toot.Author.DisplayName } - return "## Written by " + author + " on " + toot.Date[0:10] + " at " + toot.Date[11:16] + "\n" + content + return "### Written by " + author + " on " + toot.Date[0:10] + " at " + toot.Date[11:16] + "\n" + content }