improve outlawed comment ux

api/resolvers/item.js

@@ -22,25 +22,6 @@ import { datePivot, whenRange } from '../../lib/time'
 import { imageFeesInfo, uploadIdsFromText } from './image'
 import assertGofacYourself from './ofac'
 
-export async function commentFilterClause (me, models) {
-  let clause = ` AND ("Item"."weightedVotes" - "Item"."weightedDownVotes" > -${ITEM_FILTER_THRESHOLD}`
-  if (me) {
-    const user = await models.user.findUnique({ where: { id: me.id } })
-    // wild west mode has everything
-    if (user.wildWestMode) {
-      return ''
-    }
-
-    // always include if it's mine
-    clause += ` OR "Item"."userId" = ${me.id}`
-  }
-
-  // close the clause
-  clause += ')'
-
-  return clause
-}
-
 function commentsOrderByClause (me, models, sort) {
   if (sort === 'recent') {
     return 'ORDER BY "Item".created_at DESC, "Item".id DESC'
@@ -70,7 +51,7 @@ function commentsOrderByClause (me, models, sort) {
 async function comments (me, models, id, sort) {
   const orderBy = commentsOrderByClause(me, models, sort)
 
-  const filter = await commentFilterClause(me, models)
+  const filter = '' // empty filter as we filter clientside now
   if (me) {
     const [{ item_comments_zaprank_with_me: comments }] = await models.$queryRawUnsafe(
       'SELECT item_comments_zaprank_with_me($1::INTEGER, $2::INTEGER, $3::INTEGER, $4::INTEGER, $5, $6)', Number(id), GLOBAL_SEED, Number(me.id), COMMENT_DEPTH_LIMIT, filter, orderBy)

components/comment.js

@@ -22,6 +22,7 @@ import { RootProvider, useRoot } from './root'
 import { useMe } from './me'
 import { useQuoteReply } from './use-quote-reply'
 import { DownZap } from './dont-link-this'
+import Skull from '../svgs/death-skull.svg'
 
 function Parent ({ item, rootText }) {
   const root = useRoot()
@@ -102,7 +103,7 @@ export default function Comment ({
   const me = useMe()
   const isHiddenFreebie = !me?.privates?.wildWestMode && !me?.privates?.greeterMode && !item.mine && item.freebie && !item.freedFreebie
   const [collapse, setCollapse] = useState(
-    isHiddenFreebie || item?.user?.meMute
+    (isHiddenFreebie || item?.user?.meMute || (item?.outlawed && !me?.privates?.wildWestMode)) && !includeParent
       ? 'yep'
       : 'nope')
   const ref = useRef(null)
@@ -145,9 +146,11 @@ export default function Comment ({
       onTouchStart={() => ref.current.classList.add('outline-new-comment-unset')}
     >
       <div className={`${itemStyles.item} ${styles.item}`}>
-        {item.meDontLikeSats > item.meSats
+        {item.outlawed && !me?.privates?.wildWestMode
-          ? <DownZap width={24} height={24} className={styles.dontLike} id={item.id} meDontLikeSats={item.meDontLikeSats} />
+          ? <Skull className={styles.dontLike} width={24} height={24} />
-          : <UpVote item={item} className={styles.upvote} />}
+          : item.meDontLikeSats > item.meSats
+            ? <DownZap width={24} height={24} className={styles.dontLike} id={item.id} meDontLikeSats={item.meDontLikeSats} />
+            : <UpVote item={item} className={styles.upvote} />}
         <div className={`${itemStyles.hunk} ${styles.hunk}`}>
           <div className='d-flex align-items-center'>
             {item.user?.meMute && !includeParent && collapse === 'yep'
@@ -213,7 +216,9 @@ export default function Comment ({
                   ? <SearchText text={item.searchText} />
                   : (
                     <Text itemId={item.id} topLevel={topLevel} nofollow={item.sats + item.boost < NOFOLLOW_LIMIT} imgproxyUrls={item.imgproxyUrls}>
-                      {truncate ? truncateString(item.text) : item.text}
+                      {item.outlawed && !me?.privates?.wildWestMode
+                        ? '*stackers have outlawed this. turn on wild west mode in your [settings](/settings) to see outlawed content.*'
+                        : truncate ? truncateString(item.text) : item.text}
                     </Text>)}
               </div>
               )}
@@ -224,10 +229,12 @@ export default function Comment ({
           ? <div className={styles.children}><ReplyOnAnotherPage item={item} /></div>
           : (
             <div className={styles.children}>
-              {!noReply &&
+              {item.outlawed && !me?.privates?.wildWestMode
-                <Reply depth={depth + 1} item={item} replyOpen={replyOpen} onCancelQuote={cancelQuote} onQuoteReply={quoteReply} quote={quote}>
+                ? <div className='py-2' />
-                  {root.bounty && !bountyPaid && <PayBounty item={item} />}
+                : !noReply &&
-                </Reply>}
+                  <Reply depth={depth + 1} item={item} replyOpen={replyOpen} onCancelQuote={cancelQuote} onQuoteReply={quoteReply} quote={quote}>
+                    {root.bounty && !bountyPaid && <PayBounty item={item} />}
+                  </Reply>}
               {children}
               <div className={styles.comments}>
                 {item.comments && !noComments

components/comment.module.css

@@ -12,7 +12,7 @@
 
 .dontLike {
     fill: #a5a5a5;
-    margin-right: .2rem;
+    margin-right: .35rem;
     padding: 2px;
     margin-left: 1px;
     margin-top: 9px;
@@ -43,7 +43,7 @@
     display: none;
 }
 
-.collapsed .upvote {
+.collapsed .upvote, .collapsed .dontLike {
     visibility: hidden;
     height: 0;
 }