From 22e4f8acf585844bdf4ae28a6e88d01f8c221132 Mon Sep 17 00:00:00 2001
From: soxa <6390896+Soxasora@users.noreply.github.com>
Date: Tue, 15 Apr 2025 21:57:01 +0200
Subject: [PATCH] show sats on full view pinned comments (#2071)

* show sats on full view pinned comments; simplify conditions; pass topLevel as full status for comments

* comment view: show Pin instead of Boost also for own items

---------

Co-authored-by: Keyan <34140557+huumn@users.noreply.github.com>
---
 components/comment.js   | 13 ++++++++-----
 components/item-info.js |  5 ++++-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/components/comment.js b/components/comment.js
index 67b4bc84..73e64d0c 100644
--- a/components/comment.js
+++ b/components/comment.js
@@ -165,11 +165,13 @@ export default function Comment ({
       <div className={`${itemStyles.item} ${styles.item}`}>
         {item.outlawed && !me?.privates?.wildWestMode
           ? <Skull className={styles.dontLike} width={24} height={24} />
-          : item.mine
-            ? <Boost item={item} className={styles.upvote} />
-            : item.meDontLikeSats > item.meSats
-              ? <DownZap width={24} height={24} className={styles.dontLike} item={item} />
-              : pin ? <Pin width={22} height={22} className={styles.pin} /> : <UpVote item={item} className={styles.upvote} collapsed={collapse === 'yep'} />}
+          : pin
+            ? <Pin width={22} height={22} className={styles.pin} />
+            : item.mine
+              ? <Boost item={item} className={styles.upvote} />
+              : item.meDontLikeSats > item.meSats
+                ? <DownZap width={24} height={24} className={styles.dontLike} item={item} />
+                : <UpVote item={item} className={styles.upvote} collapsed={collapse === 'yep'} />}
         <div className={`${itemStyles.hunk} ${styles.hunk}`}>
           <div className='d-flex align-items-center'>
             {item.user?.meMute && !includeParent && collapse === 'yep'
@@ -182,6 +184,7 @@ export default function Comment ({
                 >reply from someone you muted
                 </span>)
               : <ItemInfo
+                  full={topLevel}
                   item={item}
                   commentsText='replies'
                   commentTextSingular='reply'
diff --git a/components/item-info.js b/components/item-info.js
index 100814b4..ec0a0958 100644
--- a/components/item-info.js
+++ b/components/item-info.js
@@ -89,11 +89,14 @@ export default function ItemInfo ({
   const myPost = (me && root && Number(me.id) === Number(root.user.id))
   const rootReply = item.path.split('.').length === 2
   const canPin = (isPost && mySub) || (myPost && rootReply)
+  const isPinnedPost = isPost && item.position && (pinnable || !item.subName)
+  const isPinnedSubReply = !isPost && item.position && !item.subName
+  const isAd = !item.parentId && Number(item.user?.id) === USER_ID.ad
   const meSats = (me ? item.meSats : item.meAnonSats) || 0
 
   return (
     <div className={className || `${styles.other}`}>
-      {!(item.position && (pinnable || !item.subName)) && !(!item.parentId && Number(item.user?.id) === USER_ID.ad) &&
+      {!isPinnedPost && !(isPinnedSubReply && !full) && !isAd &&
         <>
           <span title={itemTitle(item)}>
             {numWithUnits(item.sats)}