diff --git a/templates/postheadmeta.gohtml b/templates/postheadmeta.gohtml
index 0e5dd1e..ccdd5db 100644
--- a/templates/postheadmeta.gohtml
+++ b/templates/postheadmeta.gohtml
@@ -3,7 +3,7 @@
{{ end }}
- {{ with title .Data }}
+ {{ with .Data.Title }}
{{ end }}
diff --git a/templates/postmeta.gohtml b/templates/postmeta.gohtml
index 57665ef..61acd54 100644
--- a/templates/postmeta.gohtml
+++ b/templates/postmeta.gohtml
@@ -2,19 +2,17 @@
{{ include "summaryandpostmeta" . }}
{{ $bloglang := .Blog.Lang }}
- {{ $loc := ( p .Data "location" ) }}
- {{ if $loc }}
- {{ with geouri $loc }}
-
- {{ end }}
+ {{ $geo := .Data.GeoURI }}
+ {{ if $geo }}
+
{{ end }}
{{ $translations := (translations .Data) }}
{{ if gt (len $translations) 0 }}
-
{{ string .Blog.Lang "translations" }}: {{ $delimiter := "" }}{{ range $i, $t := $translations }}{{ $delimiter }}
{{ title $t }}{{ $delimiter = ", " }}{{ end }}
+
{{ string .Blog.Lang "translations" }}: {{ $delimiter := "" }}{{ range $i, $t := $translations }}{{ $delimiter }}
{{ $t.Title }}{{ $delimiter = ", " }}{{ end }}
{{ end }}
{{ $short := shorturl .Data }}
{{ if $short }}
{{ end }}
diff --git a/templates/posttax.gohtml b/templates/posttax.gohtml
index d878d82..0fe4dd8 100644
--- a/templates/posttax.gohtml
+++ b/templates/posttax.gohtml
@@ -6,7 +6,7 @@
{{ if gt (len $tvs) 0 }}
{{ $tax.Title }}:
{{ range $j, $tv := $tvs }}
- {{ $tv }}
+ {{ $tv }}
{{ end }}
{{ end }}
diff --git a/templates/summaryandpostmeta.gohtml b/templates/summaryandpostmeta.gohtml
index 56bbe57..4b68c18 100644
--- a/templates/summaryandpostmeta.gohtml
+++ b/templates/summaryandpostmeta.gohtml
@@ -1,6 +1,6 @@
{{ define "summaryandpostmeta" }}
{{ $section := (index .Blog.Sections .Data.Section) }}
- {{ if .Data.Published }}
{{ string .Blog.Lang "publishedon" }}
{{ if $section }} in
{{ $section.Title }}{{ end }}
{{ end }}
+ {{ if .Data.Published }}
{{ string .Blog.Lang "publishedon" }}
{{ if $section }} in
{{ $section.Title }}{{ end }}
{{ end }}
{{ if .Data.Updated }}
{{ string .Blog.Lang "updatedon" }}
{{ end }}
{{ if p .Data "replylink" }}
diff --git a/templates/taxonomy.gohtml b/templates/taxonomy.gohtml
index 3fde98b..c17b4df 100644
--- a/templates/taxonomy.gohtml
+++ b/templates/taxonomy.gohtml
@@ -12,7 +12,7 @@
{{ $valueGroup.Identifier }}
{{ range $i, $value := $valueGroup.Strings }}
- {{ if ne $i 0 }} • {{ end }}{{ . }}
+ {{ if ne $i 0 }} • {{ end }}{{ . }}
{{ end }}
{{ end }}
diff --git a/tor.go b/tor.go
index 3f04b26..565f290 100644
--- a/tor.go
+++ b/tor.go
@@ -16,7 +16,7 @@ import (
"github.com/go-chi/chi/v5/middleware"
)
-var torUsedKey requestContextKey = "tor"
+const torUsedKey requestContextKey = "tor"
func (a *goBlog) startOnionService(h http.Handler) error {
torDataPath, err := filepath.Abs("data/tor")
diff --git a/utils.go b/utils.go
index 37066b1..ba6f345 100644
--- a/utils.go
+++ b/utils.go
@@ -1,11 +1,13 @@
package main
import (
+ "html/template"
"io"
"net/http"
"net/url"
"sort"
"strings"
+ "time"
"unicode"
"github.com/PuerkitoBio/goquery"
@@ -156,6 +158,18 @@ func dateFormat(date string, format string) string {
return d.Local().Format(format)
}
+func isoDateFormat(date string) string {
+ return dateFormat(date, "2006-01-02")
+}
+
+func unixToLocalDateString(unix int64) string {
+ return time.Unix(unix, 0).Local().String()
+}
+
+func localNowString() string {
+ return time.Now().Local().String()
+}
+
type stringPair struct {
First, Second string
}
@@ -173,3 +187,7 @@ func charCount(s string) (count int) {
}
return count
}
+
+func wrapStringAsHTML(s string) template.HTML {
+ return template.HTML(s)
+}
diff --git a/webmention.go b/webmention.go
index eb56c29..dc2173a 100644
--- a/webmention.go
+++ b/webmention.go
@@ -8,6 +8,8 @@ import (
"net/http/httptest"
"strings"
"time"
+
+ "git.jlel.se/jlelse/GoBlog/pkgs/contenttype"
)
type webmentionStatus string
@@ -63,7 +65,7 @@ func (a *goBlog) handleWebmention(w http.ResponseWriter, r *http.Request) {
}
func extractMention(r *http.Request) (*mention, error) {
- if !strings.Contains(r.Header.Get(contentType), contentTypeWWWForm) {
+ if !strings.Contains(r.Header.Get(contentType), contenttype.WWWForm) {
return nil, errors.New("unsupported Content-Type")
}
err := r.ParseForm()
@@ -187,6 +189,15 @@ func (db *database) getWebmentions(config *webmentionsRequestConfig) ([]*mention
return mentions, nil
}
+func (db *database) getWebmentionsByAddress(address string) []*mention {
+ mentions, _ := db.getWebmentions(&webmentionsRequestConfig{
+ target: address,
+ status: webmentionStatusApproved,
+ asc: true,
+ })
+ return mentions
+}
+
func (db *database) countWebmentions(config *webmentionsRequestConfig) (count int, err error) {
query, params := buildWebmentionsQuery(config)
query = "select count(*) from (" + query + ")"
diff --git a/webmentionSending.go b/webmentionSending.go
index 1bc388a..9f978d4 100644
--- a/webmentionSending.go
+++ b/webmentionSending.go
@@ -8,6 +8,7 @@ import (
"net/url"
"strings"
+ "git.jlel.se/jlelse/GoBlog/pkgs/contenttype"
"github.com/PuerkitoBio/goquery"
"github.com/thoas/go-funk"
"github.com/tomnomnom/linkheader"
@@ -19,7 +20,7 @@ func (a *goBlog) sendWebmentions(p *post) error {
return nil
}
links := []string{}
- contentLinks, err := allLinksFromHTML(strings.NewReader(string(a.html(p))), a.fullPostURL(p))
+ contentLinks, err := allLinksFromHTML(strings.NewReader(string(a.postHtml(p))), a.fullPostURL(p))
if err != nil {
return err
}
@@ -67,7 +68,7 @@ func sendWebmention(endpoint, source, target string) error {
if err != nil {
return err
}
- req.Header.Set(contentType, contentTypeWWWForm)
+ req.Header.Set(contentType, contenttype.WWWForm)
req.Header.Set(userAgent, appUserAgent)
res, err := appHttpClient.Do(req)
if err != nil {
diff --git a/webmentionVerification.go b/webmentionVerification.go
index ba341c1..669e5be 100644
--- a/webmentionVerification.go
+++ b/webmentionVerification.go
@@ -84,6 +84,7 @@ func (a *goBlog) verifyMention(m *mention) error {
}
}
err = m.verifyReader(resp.Body)
+ _, _ = io.Copy(io.Discard, resp.Body)
_ = resp.Body.Close()
if err != nil {
_, err := a.db.exec("delete from webmentions where source = @source and target = @target", sql.Named("source", m.Source), sql.Named("target", m.Target))
@@ -162,41 +163,51 @@ func (m *mention) fill(mf *microformats.Microformat) bool {
}
}
// Title
- if name, ok := mf.Properties["name"]; ok && len(name) > 0 {
- if title, ok := name[0].(string); ok {
- m.Title = strings.TrimSpace(title)
- }
- }
+ m.fillTitle(mf)
// Content
- if contents, ok := mf.Properties["content"]; ok && len(contents) > 0 {
- if content, ok := contents[0].(map[string]string); ok {
- if contentValue, ok := content["value"]; ok {
- m.Content = strings.TrimSpace(contentValue)
- }
- }
- }
+ m.fillContent(mf)
// Author
- if authors, ok := mf.Properties["author"]; ok && len(authors) > 0 {
- if author, ok := authors[0].(*microformats.Microformat); ok {
- if names, ok := author.Properties["name"]; ok && len(names) > 0 {
- if name, ok := names[0].(string); ok {
- m.Author = strings.TrimSpace(name)
- }
- }
- }
- }
+ m.fillAuthor(mf)
return true
}
- if len(mf.Children) > 0 {
- for _, mfc := range mf.Children {
- if m.fill(mfc) {
- return true
- }
+ for _, mfc := range mf.Children {
+ if m.fill(mfc) {
+ return true
}
}
return false
}
+func (m *mention) fillTitle(mf *microformats.Microformat) {
+ if name, ok := mf.Properties["name"]; ok && len(name) > 0 {
+ if title, ok := name[0].(string); ok {
+ m.Title = strings.TrimSpace(title)
+ }
+ }
+}
+
+func (m *mention) fillContent(mf *microformats.Microformat) {
+ if contents, ok := mf.Properties["content"]; ok && len(contents) > 0 {
+ if content, ok := contents[0].(map[string]string); ok {
+ if contentValue, ok := content["value"]; ok {
+ m.Content = strings.TrimSpace(contentValue)
+ }
+ }
+ }
+}
+
+func (m *mention) fillAuthor(mf *microformats.Microformat) {
+ if authors, ok := mf.Properties["author"]; ok && len(authors) > 0 {
+ if author, ok := authors[0].(*microformats.Microformat); ok {
+ if names, ok := author.Properties["name"]; ok && len(names) > 0 {
+ if name, ok := names[0].(string); ok {
+ m.Author = strings.TrimSpace(name)
+ }
+ }
+ }
+ }
+}
+
func mfHasType(mf *microformats.Microformat, typ string) bool {
for _, t := range mf.Type {
if typ == t {