From 515d408140a1db322012c5d9cda647d567b1adaf Mon Sep 17 00:00:00 2001
From: Ben Pate <ben@pate.org>
Date: Thu, 29 Aug 2024 15:25:50 -0600
Subject: [PATCH] Improve following on default template

---
 _embed/templates/base-social/like-button.html | 14 +++++------
 .../stream-outbox-message/template.hjson      |  2 +-
 .../templates/stream-outbox-message/view.html | 25 +++++++++++++------
 _embed/templates/user-outbox/sidebar.html     |  2 +-
 4 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/_embed/templates/base-social/like-button.html b/_embed/templates/base-social/like-button.html
index 2c412c33..de4140f0 100644
--- a/_embed/templates/base-social/like-button.html
+++ b/_embed/templates/base-social/like-button.html
@@ -4,18 +4,18 @@
 <span hx-target="this" hx-swap="outerHTML" hx-push-url="false">
 
 	{{- if $responses.Like -}}
-		<button class="turboclick bold link" hx-post="{{.BasePath}}/like-button?url={{$url}}" hx-vals='{"type":"Like", "url":"{{$url}}", "exists":false}'>{{icon "thumbs-up-fill"}} Liked</button>
+		<button class="turboclick bold link" hx-post="{{.BasePath}}/like-button?url={{$url}}" hx-vals='{"type":"Like", "url":"{{$url}}", "exists":false}'><span aria-hidden="true" class="margin-left-xs">{{icon "thumbs-up-fill"}}</span> Liked</button>
 	{{- else if $responses.Dislike -}}
-		<button class="turboclick bold link" hx-post="{{.BasePath}}/like-button?url={{$url}}" hx-vals='{"type":"Dislike", "url":"{{$url}}", "exists":false}'>{{icon "thumbs-down-fill"}} Disiked</button>
+		<button class="turboclick bold link" hx-post="{{.BasePath}}/like-button?url={{$url}}" hx-vals='{"type":"Dislike", "url":"{{$url}}", "exists":false}'><span aria-hidden="true" class="margin-left-xs">{{icon "thumbs-down-fill"}}</span> Disiked</button>
 	{{- else -}}
-		<button class="turboclick bold" hx-post="{{.BasePath}}/like-button?url={{$url}}" hx-vals='{"type":"Like", "url": "{{$url}}", "exists":true}'>{{icon "thumbs-up"}}</button>
-		<button class="turboclick bold" hx-post="{{.BasePath}}/like-button?url={{$url}}" hx-vals='{"type":"Dislike", "url": "{{$url}}", "exists":true}'>{{icon "thumbs-down"}}</button>
+		<button class="turboclick bold" hx-post="{{.BasePath}}/like-button?url={{$url}}" hx-vals='{"type":"Like", "url": "{{$url}}", "exists":true}'><span aria-hidden="true" class="margin-left-xs">{{icon "thumbs-up"}}</span> Like</button>
+		<button class="turboclick bold" hx-post="{{.BasePath}}/like-button?url={{$url}}" hx-vals='{"type":"Dislike", "url": "{{$url}}", "exists":true}'><span aria-hidden="true" class="margin-left-xs">{{icon "thumbs-down"}}</span> Dislike</button>
 	{{- end -}}
 
 	{{- if $responses.Announce -}}
-		<button class="turboclick bold link" hx-post="{{.BasePath}}/like-button?url={{$url}}" hx-vals='{"type":"Announce", "url":"{{$url}}", "exists":false}'>{{icon "share-fill"}} Shared</button>
+		<button class="turboclick bold link" hx-post="{{.BasePath}}/like-button?url={{$url}}" hx-vals='{"type":"Announce", "url":"{{$url}}", "exists":false}'><span aria-hidden="true" class="margin-left-xs">{{icon "share-fill"}}</span> Shared</button>
 	{{- else -}}
-		<button class="turboclick bold" hx-post="{{.BasePath}}/like-button?url={{$url}}" hx-vals='{"type":"Announce", "url": "{{$url}}", "exists":true}'>{{icon "share"}}</button>
+		<button class="turboclick bold" hx-post="{{.BasePath}}/like-button?url={{$url}}" hx-vals='{"type":"Announce", "url": "{{$url}}", "exists":true}'><span aria-hidden="true" class="margin-left-xs">{{icon "share"}}</span> Shared</button>
 	{{- end -}}
 
-</span>
\ No newline at end of file
+</span>
diff --git a/_embed/templates/stream-outbox-message/template.hjson b/_embed/templates/stream-outbox-message/template.hjson
index 91f3d5b1..af887ff5 100644
--- a/_embed/templates/stream-outbox-message/template.hjson
+++ b/_embed/templates/stream-outbox-message/template.hjson
@@ -2,7 +2,7 @@
 	templateId:"outbox-message"
 	templateRole:"outbox-message"
 	socialRole:"Note"
-	extends:["base-social"]
+	extends:["base-social", "base-intent"]
 	model:"stream"
 	icon:"message"
 	label:"Post"
diff --git a/_embed/templates/stream-outbox-message/view.html b/_embed/templates/stream-outbox-message/view.html
index 40e2b46b..5618ded0 100644
--- a/_embed/templates/stream-outbox-message/view.html
+++ b/_embed/templates/stream-outbox-message/view.html
@@ -42,6 +42,20 @@
 					</div>
 				</div>
 			</a>
+
+			<div class="flex-row margin-vertical-sm text-sm">
+				<div class="flex-shrink-0 width-64 margin-right"></div>
+				<div>
+					{{- if .UserCan "like-button" -}}
+						{{.View "like-button"}}
+					{{- else -}}
+						<button hx-get="/{{.StreamID}}/intent?intent=like&object={{.Permalink}}"><span aria-hidden="true" class="margin-left-xs">{{icon "thumbs-up"}}</span> Like</button>
+						<button hx-get="/{{.StreamID}}/intent?intent=dislike&object={{.Permalink}}"><span aria-hidden="true" class="margin-left-xs">{{icon "thumbs-down"}}</span> Dislike</button>
+						<button hx-get="/{{.StreamID}}/intent?intent=create&content={{.Label}} {{.Permalink}}"><span aria-hidden="true" class="margin-left-xs">{{icon "share"}}</span> Share</button>
+						<button hx-get="/{{.StreamID}}/intent" aria-label="Manage Accounts">{{icon "more-horizontal"}}</button>
+					{{- end -}}
+				</div>
+			</div>
 		</div>
 
 		{{- if .UserCan "edit" -}}
@@ -52,9 +66,6 @@
 		
 	</div>
 
-	<div class="text-lg margin-vertical-lg">
-		{{.ContentHTML}}
-	</div>
 
 	{{- if ne .IconURL "" -}}
 		<div class="margin-vertical">
@@ -62,11 +73,9 @@
 		</div>
 	{{- end -}}
 
-	{{- if .UserCan "like-button" -}}
-		<div class="margin-vertical text-sm">
-			{{.View "like-button"}}
-		</div>
-	{{- end -}}
+	<div class="text-lg margin-vertical-lg" style="width:clamp(400px, 90%, 800px)">
+		{{.ContentHTML}}
+	</div>
 
 	{{- .View "responses-replies" -}}
 
diff --git a/_embed/templates/user-outbox/sidebar.html b/_embed/templates/user-outbox/sidebar.html
index 9e49c4a7..9c443331 100644
--- a/_embed/templates/user-outbox/sidebar.html
+++ b/_embed/templates/user-outbox/sidebar.html
@@ -26,7 +26,7 @@ <h1 class="p-name margin-none">{{.DisplayName}}</h1>
 		<div class="text-sm gray50 ellipsis">@{{.Username}}@{{.Hostname}}</div>
 		{{- if not .Myself -}}
 			<div class="margin-top">
-				<button type="button" class="primary width-100% ellipsis" hx-get="/@{{.UserID}}/follow">{{icon "add-circle"}} Follow {{.DisplayName}}</button>
+				<button type="button" class="primary width-100% ellipsis" hx-get="/@{{.UserID}}/intent?intent=follow&object={{.Permalink}}">{{icon "add-circle"}} Follow {{.DisplayName}}</button>
 			</div>
 		{{- end -}}