Merge branch 'upstream'

CHANGELOG.md

@@ -24,6 +24,8 @@
 * Added MathJax support for rendering Latex and math.
 * Added support for PseudocodeJS for rendering beautiful, standard, pseudocode.
 * Table of contents will now render if frontmatter `toc` is set to `true`.
+* Fixed a bug where backslashes in the summary of a post could break ActivityPub
+    JSON endpoints.
 
 ## 1.1.0
 

layouts/partials/articles_for_section.html

@@ -3,7 +3,6 @@
 {{ range $index, $element := $paginator.Pages }}
   <article class='post'>
     {{ partial "post_header_list.html" . }}
-    {{ partial "toc.html" . }}
     <section class='post-content'>
       {{.Content }}
     </section>

layouts/partials/body_single.html

@@ -3,7 +3,7 @@
     <article class='post'>
       {{ partial "post_header_single.html" . }}
       <section class='post-content'>
-        {{ if isset .Params "toc" }}{{ .TableOfContents }}{{ end}}
+        {{ partial "toc.html" . }}
         {{ .Content }}
         {{ if eq .Section "resource" }}{{ partial "backlinks.html" . }}{{ end }}
         {{ partial "article_footer.html" . }}

layouts/partials/status.ajson

+{{- $summaryClean := "" }}
+{{- if .Summary }}
+{{- $summaryClean = .Summary }}
+{{- $summaryClean = replace $summaryClean "\n" "<br>" }}
+{{- $summaryClean = replace $summaryClean "\r" "" }}
+{{- $summaryClean = replace $summaryClean "\\" "\\\\" }}
+{{- end }}
 {
   {{ partial "context.ajson" . }},
   "id": "{{ .Permalink }}",
@@ -12,7 +19,7 @@
   "sensitive": false,
   "atomUri": "{{ .Permalink }}",
   "inReplyToAtomUri": null,
-  "content": {{ printf "\"" | safeHTML }}<b>{{.Title}}</b>{{ if .Summary }}<br>{{ replace (replace .Summary "\n" "<br>") "\r" "" | safeHTML}}{{ end }}<br><br>Read more here:<br><a href='{{.Permalink}}'>{{.Permalink}}</a><br><br>{{ if .Site.Params.renderArticleHashtags }}{{ if .Params.tags }}{{ range $indexArticleTags, $elementArticleTag := .Params.tags }}{{ if ne $indexArticleTags 0 }} {{ end }}<a href='{{ site.BaseURL }}tags/{{ $elementArticleTag | lower }}' class='mention hashtag' rel='tag'>#<span>{{ $elementArticleTag }}</span></a>{{ end }}{{ end }}{{ end }} {{ if .Site.Params.renderDefaultHashtags }}{{ if .Site.Params.postHashtags }}{{ range $indexTags, $elementTag := .Site.Params.postHashtags }}{{ if ne $indexTags 0 }} {{ end }}<a href='#' class='mention hashtag' rel='tag'>#<span>{{ $elementTag }}</span></a>{{ end }}{{ end }}{{ end }}{{ printf "\"" | safeHTML }},
+  "content": {{ printf "\"" | safeHTML }}<b>{{.Title}}</b>{{ if .Summary }}<br>{{ $summaryClean | safeHTML}}{{ end }}<br><br>Read more here:<br><a href='{{.Permalink}}'>{{.Permalink}}</a><br><br>{{ if .Site.Params.renderArticleHashtags }}{{ if .Params.tags }}{{ range $indexArticleTags, $elementArticleTag := .Params.tags }}{{ if ne $indexArticleTags 0 }} {{ end }}<a href='{{ site.BaseURL }}tags/{{ $elementArticleTag | lower }}' class='mention hashtag' rel='tag'>#<span>{{ $elementArticleTag }}</span></a>{{ end }}{{ end }}{{ end }} {{ if .Site.Params.renderDefaultHashtags }}{{ if .Site.Params.postHashtags }}{{ range $indexTags, $elementTag := .Site.Params.postHashtags }}{{ if ne $indexTags 0 }} {{ end }}<a href='#' class='mention hashtag' rel='tag'>#<span>{{ $elementTag }}</span></a>{{ end }}{{ end }}{{ end }}{{ printf "\"" | safeHTML }},
   "attachment": [],
   {{ if (or (and .Site.Params.postHashtags .Site.Params.renderDefaultHashtags) (and .Params.tags .Site.Params.renderArticleHashtags)) }}
   "tag": [

layouts/partials/toc.html

-{{ .TableOfContents }}
+{{- if isset .Params "toc" }}{{ .TableOfContents }}{{ end}}