From 4ddf2f784a60738c11cdece59bea294c6f5d8df1 Mon Sep 17 00:00:00 2001
From: "4 raccoons in a trenchcoat. / luna vivian" <nightlyonie@airmail.cc>
Date: Thu, 20 Apr 2023 00:38:15 +0200
Subject: [PATCH] =?UTF-8?q?squashed=20bugs,=20made=20stuff=20neater,=20typ?=
 =?UTF-8?q?ical=20yada=20yada=20-finally=20fixed=20favourites=20page=20for?=
 =?UTF-8?q?=20good=20-made=20favourites=20and=20feed=20pages=20look=20Neat?=
 =?UTF-8?q?er=E2=84=A2=20-maybe=20broke=20the=20search=20results=20page=20?=
 =?UTF-8?q?idk=20lmao?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/themes/default-v2/elements/item.html | 4 ++--
 templates/themes/default-v2/fav.html           | 5 +++--
 templates/themes/default-v2/feed.html          | 9 +++++----
 webroot/fav.shs                                | 2 +-
 webroot/feed.shs                               | 2 +-
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/templates/themes/default-v2/elements/item.html b/templates/themes/default-v2/elements/item.html
index 618a7d6..4664364 100644
--- a/templates/themes/default-v2/elements/item.html
+++ b/templates/themes/default-v2/elements/item.html
@@ -1,4 +1,4 @@
 <a href='/watch?v=${.id}'>
 	<img src='https://i.ytimg.com/vi/${.id}/mqdefault.jpg'><br>${.title}
-</a> | ${.runtime} seconds | ${.views} views<br>
-Uploaded by <a href='/channel/${.channel_id}'>${.channel}</a><br>
+</a> | ${.runtime} seconds<br>
+Uploaded by <a href='/channel/${.channel_id}'>${.channel}</a> · ${.views} views<br>
diff --git a/templates/themes/default-v2/fav.html b/templates/themes/default-v2/fav.html
index 9159af3..40408df 100644
--- a/templates/themes/default-v2/fav.html
+++ b/templates/themes/default-v2/fav.html
@@ -1,15 +1,16 @@
 <h1>Your favourites</h1>
 {{_info}}
-{{_fav}}
+<div style='display: grid; grid-template-columns: repeat(auto-fill, minmax(300px, 1fr));'>
 {{start ?fav}}
 	{{start _fav}}
 	<div>
 		<a href='watch?v={{.id}}'>
 			<img src='https://i.ytimg.com/vi/{{.id}}/mqdefault.jpg'><br>
 			<b>{{.name}}</b>
-		</a><br>
+		</a>
 	</div>
 	{{end _fav}}
 {{else ?fav}}
 	Meow? no faves?
 {{end ?fav}}
+</div>
\ No newline at end of file
diff --git a/templates/themes/default-v2/feed.html b/templates/themes/default-v2/feed.html
index 922551c..307eadb 100644
--- a/templates/themes/default-v2/feed.html
+++ b/templates/themes/default-v2/feed.html
@@ -1,17 +1,18 @@
 <h1>Your Feed</h1>
 
-You can unclutter your feed by going to your <a href="/subscribe.shs">subscribed channels</a>.<br><br>
+You can unclutter your feed by going to your <a href="/subscribe.shs">list of subscribed channels</a>.<br><br>
 
+<div style='display: grid; grid-template-columns: repeat(auto-fill, minmax(300px, 1fr));'>
 {{start ?feed}}
 	{{start _feed}}
 	<div class='video-image-container'>
 		<a href='watch?v={{.id}}'>
 			<div class='video-image' style='background-image: url(http://i.ytimg.com/vi/{{.id}}/mqdefault.jpg)'></div>
-			{{.title}}
-		</a>
-		{{.date}}
+			<b>{{.title}}</b></a><br>
+		Uploaded <!--by {{.uploader}} -->on <b>{{.date}}</b>
 	</div>
 	{{end _feed}}
 {{else ?feed}}
 	Eh. something went wrong. Check if you're logged in and if you <a href="/subscribe.shs">subscribe</a> to anyone :p
 {{end ?feed}}
+</div>
\ No newline at end of file
diff --git a/webroot/fav.shs b/webroot/fav.shs
index acf3897..fd224d3 100644
--- a/webroot/fav.shs
+++ b/webroot/fav.shs
@@ -33,7 +33,7 @@ for i in $(tac storage/faves | grep -P "^$(session_get_username ${cookies[sh_ses
 	nested_add fav fav_
 done
 
-[[ ${fav_[id]} != '' ]] && strings[?sub]=true
+[[ ${fav_[id]} != '' ]] && strings[?fav]=true
 strings[_fav]="fav"
 strings[_info]="info"
 
diff --git a/webroot/feed.shs b/webroot/feed.shs
index 6db59a7..e433568 100644
--- a/webroot/feed.shs
+++ b/webroot/feed.shs
@@ -29,7 +29,7 @@ if session_verify "${cookies[sh_session]}"; then
 	while read i; do
 		feed_[id]="${video_id[$i]}"
 		feed_[title]="${video_title[$i]}"
-		feed_[date]="$(date -d "@${video_date[$i]}" "+%H:%M, %d %h %Y")"
+		feed_[date]="$(date -d "@${video_date[$i]}" "+%d %h %Y, %H:%M")"
 		feed_[uploader]="${video_uploader[$i]}"
 		#strings[feed]+="<div class='video-image-container'><a href='watch?v='><div class='video-image' style='background-image: url(http://i.ytimg.com/vi/${video_id[$i]}/mqdefault.jpg)'></div></a></div>"
 		nested_add feed feed_