From 0cefeeb2705bd2572d99c973f384f9a655367cb6 Mon Sep 17 00:00:00 2001
From: Brandon Rozek <rozekbrandon@gmail.com>
Date: Sun, 15 May 2022 22:11:38 -0400
Subject: [PATCH] Added links to social buttons on toots

---
 layouts/shortcodes/displayOnlineToot.html | 58 ++++++++++++------
 layouts/shortcodes/displayToot.html       | 58 ++++++++++++------
 layouts/shortcodes/displayToots.html      | 58 ++++++++++++------
 layouts/toots/list.html                   | 21 ++++++-
 layouts/toots/single.html                 | 71 ++++++++++++++---------
 5 files changed, 181 insertions(+), 85 deletions(-)

diff --git a/layouts/shortcodes/displayOnlineToot.html b/layouts/shortcodes/displayOnlineToot.html
index 67b9b46..5584190 100644
--- a/layouts/shortcodes/displayOnlineToot.html
+++ b/layouts/shortcodes/displayOnlineToot.html
@@ -6,26 +6,48 @@
 {{ with $dataJ }}
 {{ if ne .content "" }}
 <article class="toot h-entry">
-    <div class="e-content">
-        <img class="toot-avatar" width=50 src="{{ .account.avatar }}"/>
-        <p class="date">Tooted on <time class="dt-published" datetime='{{ .created_at }}'>{{ dateFormat "January 2, 2006 15:04" (time .created_at) }}</time></p>
-        {{ .content | safeHTML }}
-        {{ if gt (len .media_attachments) 0 }}
-        <div class="toot-photos">
-        {{ range .media_attachments}}
-            {{ if eq .type "image" }}
-            <img src="{{ .preview_url }}" alt="{{ .description }}"/>
-            {{ end }}
-        {{ end }}
-        </div>
-        {{ end }}
+    <div rel="author" class="h-card p-author toot-avatar">
+      <img class="u-photo" width=50 src="{{ .account.avatar }}"/>
+      <span style="display: none;">{{ .account.display_name }}</span>
     </div>
+    <p class="date">Tooted on <time class="dt-published" datetime='{{ .created_at }}'>{{ dateFormat "January 2, 2006 15:04" (time .created_at) }}</time></p>
+    <div class="e-content p-name">
+      {{ .content | safeHTML }}
+      {{ if gt (len .media_attachments) 0 }}
+      <div class="toot-photos">
+      {{ range .media_attachments}}
+        {{ if eq .type "image" }}
+        <img src="{{ .preview_url }}" alt="{{ .description }}"/>
+        {{ end }}
+      {{ end }}
+      </div>
+      {{ end }}
+    </div>
+    <a class="u-url" style="display: none">{{ .Permalink }}</a>
+    {{ range .tags }}
+    <a class="p-category" href="{{ .url }}" style="display: none;">{{ .name }}</a>
+    {{ end }}
     <div class="toot-social">
-        <span><i class='fas fa-share'></i> {{ .replies_count }} </span>
-        <span><i class='fas fa-retweet'></i> {{ .reblogs_count }} </span>
-        <span><i class='fas fa-star'></i> {{ .favourites_count }} </span>
-        <span>| Source: <a href="{{ .url }}">{{ .url }}</a></span>
+        {{ $post_url := urls.Parse .url }}
+        {{ $status_id := index (last 1 (split $post_url.Path "/")) 0 }}
+        {{ $social_url := printf "%s://%s/interact/%s" $post_url.Scheme $post_url.Host $status_id }}
+        {{ $reply_url := printf "%s?type=reply" $social_url }}
+        {{ $favorite_url := printf "%s?type=favourite" $social_url }}
+        {{ $boost_url := printf "%s?type=reblog" $social_url }}
+        <span>
+          <a class='fas fa-share' href="{{ $reply_url }}"></a>
+          {{ .Params.replies_count }}
+        </span>
+        <span>
+          <a class='fas fa-retweet' href="{{ $boost_url }}"></a>
+          {{ .Params.reblogs_count }}
+        </span>
+        <span>
+          <a class='fas fa-star' href="{{ $favorite_url }}"></a>
+          {{ .Params.favourites_count }}
+        </span>
+        <span>| Source: <a class="u-syndication" href="{{ .url }}">{{ .url }}</a></span>
     </div>
-</article>
+  </article>
 {{ end }}
 {{ end }}
diff --git a/layouts/shortcodes/displayToot.html b/layouts/shortcodes/displayToot.html
index 47b05c4..29e4e30 100644
--- a/layouts/shortcodes/displayToot.html
+++ b/layouts/shortcodes/displayToot.html
@@ -5,26 +5,48 @@
 {{ with $dataJ }}
 {{ if ne .content "" }}
 <article class="toot h-entry">
-    <div class="e-content">
-        <img class="toot-avatar" width=50 src="{{ .account.avatar }}"/>
-        <p class="date">Tooted on <time class="dt-published" datetime='{{ .created_at }}'>{{ dateFormat "January 2, 2006 15:04" (time .created_at) }}</time></p>
-        {{ .content | safeHTML }}
-        {{ if gt (len .media_attachments) 0 }}
-        <div class="toot-photos">
-        {{ range .media_attachments}}
-            {{ if eq .type "image" }}
-            <img src="{{ .preview_url }}" alt="{{ .description }}"/>
-            {{ end }}
-        {{ end }}
-        </div>
-        {{ end }}
+    <div rel="author" class="h-card p-author toot-avatar">
+      <img class="u-photo" width=50 src="{{ .account.avatar }}"/>
+      <span style="display: none;">{{ .account.display_name }}</span>
     </div>
+    <p class="date">Tooted on <time class="dt-published" datetime='{{ .created_at }}'>{{ dateFormat "January 2, 2006 15:04" (time .created_at) }}</time></p>
+    <div class="e-content p-name">
+      {{ .content | safeHTML }}
+      {{ if gt (len .media_attachments) 0 }}
+      <div class="toot-photos">
+      {{ range .media_attachments}}
+        {{ if eq .type "image" }}
+        <img src="{{ .preview_url }}" alt="{{ .description }}"/>
+        {{ end }}
+      {{ end }}
+      </div>
+      {{ end }}
+    </div>
+    <a class="u-url" style="display: none">{{ .Permalink }}</a>
+    {{ range .tags }}
+    <a class="p-category" href="{{ .url }}" style="display: none;">{{ .name }}</a>
+    {{ end }}
     <div class="toot-social">
-        <span><i class='fas fa-share'></i> {{ .replies_count }} </span>
-        <span><i class='fas fa-retweet'></i> {{ .reblogs_count }} </span>
-        <span><i class='fas fa-star'></i> {{ .favourites_count }} </span>
-        <span>| Source: <a href="{{ .url }}">{{ .url }}</a></span>
+        {{ $post_url := urls.Parse .url }}
+        {{ $status_id := index (last 1 (split $post_url.Path "/")) 0 }}
+        {{ $social_url := printf "%s://%s/interact/%s" $post_url.Scheme $post_url.Host $status_id }}
+        {{ $reply_url := printf "%s?type=reply" $social_url }}
+        {{ $favorite_url := printf "%s?type=favourite" $social_url }}
+        {{ $boost_url := printf "%s?type=reblog" $social_url }}
+        <span>
+          <a class='fas fa-share' href="{{ $reply_url }}"></a>
+          {{ .Params.replies_count }}
+        </span>
+        <span>
+          <a class='fas fa-retweet' href="{{ $boost_url }}"></a>
+          {{ .Params.reblogs_count }}
+        </span>
+        <span>
+          <a class='fas fa-star' href="{{ $favorite_url }}"></a>
+          {{ .Params.favourites_count }}
+        </span>
+        <span>| Source: <a class="u-syndication" href="{{ .url }}">{{ .url }}</a></span>
     </div>
-</article>
+  </article>
 {{ end }}
 {{ end }}
diff --git a/layouts/shortcodes/displayToots.html b/layouts/shortcodes/displayToots.html
index f34a188..7fd6378 100644
--- a/layouts/shortcodes/displayToots.html
+++ b/layouts/shortcodes/displayToots.html
@@ -5,26 +5,48 @@
 {{ range sort $dataJ "created_at" "desc" }}
 {{ if ne .content "" }}
 <article class="toot h-entry">
-    <div class="e-content">
-        <img class="toot-avatar" width=50 src="{{ .account.avatar }}"/>
-        <p class="date">Tooted on <time class="dt-published" datetime='{{ .created_at }}'>{{ dateFormat "January 2, 2006 15:04" (time .created_at) }}</time></p>
-        {{ .content | safeHTML }}
-        {{ if gt (len .media_attachments) 0 }}
-        <div class="toot-photos">
-        {{ range .media_attachments}}
-            {{ if eq .type "image" }}
-            <img src="{{ .preview_url }}" alt="{{ .description }}"/>
-            {{ end }}
-        {{ end }}
-        </div>
-        {{ end }}
+    <div rel="author" class="h-card p-author toot-avatar">
+      <img class="u-photo" width=50 src="{{ .account.avatar }}"/>
+      <span style="display: none;">{{ .account.display_name }}</span>
     </div>
+    <p class="date">Tooted on <time class="dt-published" datetime='{{ .created_at }}'>{{ dateFormat "January 2, 2006 15:04" (time .created_at) }}</time></p>
+    <div class="e-content p-name">
+      {{ .content | safeHTML }}
+      {{ if gt (len .media_attachments) 0 }}
+      <div class="toot-photos">
+      {{ range .media_attachments}}
+        {{ if eq .type "image" }}
+        <img src="{{ .preview_url }}" alt="{{ .description }}"/>
+        {{ end }}
+      {{ end }}
+      </div>
+      {{ end }}
+    </div>
+    <a class="u-url" style="display: none">{{ .Permalink }}</a>
+    {{ range .tags }}
+    <a class="p-category" href="{{ .url }}" style="display: none;">{{ .name }}</a>
+    {{ end }}
     <div class="toot-social">
-        <span><i class='fas fa-share'></i> {{ .replies_count }} </span>
-        <span><i class='fas fa-retweet'></i> {{ .reblogs_count }} </span>
-        <span><i class='fas fa-star'></i> {{ .favourites_count }} </span>
-        <span>| Source: <a href="{{ .url }}">{{ .url }}</a></span>
+        {{ $post_url := urls.Parse .url }}
+        {{ $status_id := index (last 1 (split $post_url.Path "/")) 0 }}
+        {{ $social_url := printf "%s://%s/interact/%s" $post_url.Scheme $post_url.Host $status_id }}
+        {{ $reply_url := printf "%s?type=reply" $social_url }}
+        {{ $favorite_url := printf "%s?type=favourite" $social_url }}
+        {{ $boost_url := printf "%s?type=reblog" $social_url }}
+        <span>
+          <a class='fas fa-share' href="{{ $reply_url }}"></a>
+          {{ .Params.replies_count }}
+        </span>
+        <span>
+          <a class='fas fa-retweet' href="{{ $boost_url }}"></a>
+          {{ .Params.reblogs_count }}
+        </span>
+        <span>
+          <a class='fas fa-star' href="{{ $favorite_url }}"></a>
+          {{ .Params.favourites_count }}
+        </span>
+        <span>| Source: <a class="u-syndication" href="{{ .url }}">{{ .url }}</a></span>
     </div>
-</article>
+  </article>
 {{ end }}
 {{ end }}
diff --git a/layouts/toots/list.html b/layouts/toots/list.html
index d26a543..71104f5 100644
--- a/layouts/toots/list.html
+++ b/layouts/toots/list.html
@@ -35,9 +35,24 @@
         <a class="p-category" href="{{ .url }}" style="display: none;">{{ .name }}</a>
         {{ end }}
         <div class="toot-social">
-            <span><i class='fas fa-share'></i> {{ .Params.replies_count }} </span>
-            <span><i class='fas fa-retweet'></i> {{ .Params.reblogs_count }} </span>
-            <span><i class='fas fa-star'></i> {{ .Params.favourites_count }} </span>
+            {{ $post_url := urls.Parse .Params.syndication }}
+            {{ $status_id := index (last 1 (split $post_url.Path "/")) 0 }}
+            {{ $social_url := printf "%s://%s/interact/%s" $post_url.Scheme $post_url.Host $status_id }}
+            {{ $reply_url := printf "%s?type=reply" $social_url }}
+            {{ $favorite_url := printf "%s?type=favourite" $social_url }}
+            {{ $boost_url := printf "%s?type=reblog" $social_url }}
+            <span>
+              <a class='fas fa-share' href="{{ $reply_url }}"></a>
+              {{ .Params.replies_count }}
+            </span>
+            <span>
+              <a class='fas fa-retweet' href="{{ $boost_url }}"></a>
+              {{ .Params.reblogs_count }}
+            </span>
+            <span>
+              <a class='fas fa-star' href="{{ $favorite_url }}"></a>
+              {{ .Params.favourites_count }}
+            </span>
             <span>| Source: <a class="u-syndication" href="{{ .Params.syndication }}">{{ .Params.syndication }}</a></span>
         </div>
       </article>
diff --git a/layouts/toots/single.html b/layouts/toots/single.html
index 451d647..7fc0ab0 100644
--- a/layouts/toots/single.html
+++ b/layouts/toots/single.html
@@ -4,35 +4,50 @@
 {{ .Scratch.Set "customTitleHeaderLink" "/toots" }}
 {{ partial "header.html" . }}
 <main>
-    <article class="toot h-entry">
-        <div rel="author" class="h-card p-author toot-avatar">
-          <img class="u-photo" width=50 src="{{ .Params.account.avatar }}"/>
-          <span style="display: none;">{{ .Params.account.display_name }}</span>
-        </div>
-        <p class="date">Tooted on <time class="dt-published" datetime='{{ .Date }}'>{{ dateFormat "January 2, 2006 15:04" (time .Date) }}</time></p>
-        <div class="e-content p-name">
-          {{ .Content | safeHTML }}
-          {{ if gt (len .Params.media_attachments) 0 }}
-          <div class="toot-photos">
-          {{ range .Params.media_attachments}}
-            {{ if eq .type "image" }}
-            <img src="{{ .preview_url }}" alt="{{ .description }}"/>
-            {{ end }}
-          {{ end }}
-          </div>
-          {{ end }}
-        </div>
-        <a class="u-url" style="display: none">{{ .Permalink }}</a>
-        {{ range .Params.tags }}
-        <a class="p-category" href="{{ .url }}" style="display: none;">{{ .name }}</a>
+  <article class="toot h-entry">
+    <div rel="author" class="h-card p-author toot-avatar">
+      <img class="u-photo" width=50 src="{{ .Params.account.avatar }}"/>
+      <span style="display: none;">{{ .Params.account.display_name }}</span>
+    </div>
+    <p class="date">Tooted on <time class="dt-published" datetime='{{ .Date }}'>{{ dateFormat "January 2, 2006 15:04" (time .Date) }}</time></p>
+    <div class="e-content p-name">
+      {{ .Content | safeHTML }}
+      {{ if gt (len .Params.media_attachments) 0 }}
+      <div class="toot-photos">
+      {{ range .Params.media_attachments}}
+        {{ if eq .type "image" }}
+        <img src="{{ .preview_url }}" alt="{{ .description }}"/>
         {{ end }}
-        <div class="toot-social">
-            <span><i class='fas fa-share'></i> {{ .Params.replies_count }} </span>
-            <span><i class='fas fa-retweet'></i> {{ .Params.reblogs_count }} </span>
-            <span><i class='fas fa-star'></i> {{ .Params.favourites_count }} </span>
-            <span>| Source: <a class="u-syndication" href="{{ .Params.syndication }}">{{ .Params.syndication }}</a></span>
-        </div>
-    </article>
+      {{ end }}
+      </div>
+      {{ end }}
+    </div>
+    <a class="u-url" style="display: none">{{ .Permalink }}</a>
+    {{ range .Params.tags }}
+    <a class="p-category" href="{{ .url }}" style="display: none;">{{ .name }}</a>
+    {{ end }}
+    <div class="toot-social">
+        {{ $post_url := urls.Parse .Params.syndication }}
+        {{ $status_id := index (last 1 (split $post_url.Path "/")) 0 }}
+        {{ $social_url := printf "%s://%s/interact/%s" $post_url.Scheme $post_url.Host $status_id }}
+        {{ $reply_url := printf "%s?type=reply" $social_url }}
+        {{ $favorite_url := printf "%s?type=favourite" $social_url }}
+        {{ $boost_url := printf "%s?type=reblog" $social_url }}
+        <span>
+          <a class='fas fa-share' href="{{ $reply_url }}"></a>
+          {{ .Params.replies_count }}
+        </span>
+        <span>
+          <a class='fas fa-retweet' href="{{ $boost_url }}"></a>
+          {{ .Params.reblogs_count }}
+        </span>
+        <span>
+          <a class='fas fa-star' href="{{ $favorite_url }}"></a>
+          {{ .Params.favourites_count }}
+        </span>
+        <span>| Source: <a class="u-syndication" href="{{ .Params.syndication }}">{{ .Params.syndication }}</a></span>
+    </div>
+  </article>
 </main>
 {{ partial "footer.html" . }}
 {{ end }}