Don't highlight based on user in profile

aeharding · Jul 16, 2023 · 6b97b4b · 6b97b4b
1 parent 8e18c5f
commit 6b97b4b
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 6 deletions.
diff --git a/src/features/comment/Comment.tsx b/src/features/comment/Comment.tsx
@@ -180,6 +180,8 @@ interface CommentProps {
   className?: string;
 
   rootIndex?: number;
+
+  noUserHighlight?: boolean;
 }
 
 export default function Comment({
@@ -193,6 +195,7 @@ export default function Comment({
   routerLink,
   className,
   rootIndex,
+  noUserHighlight,
 }: CommentProps) {
   const commentById = useAppSelector((state) => state.comment.commentById);
   // eslint-disable-next-line no-undef
@@ -237,6 +240,7 @@ export default function Comment({
                   person={commentView.creator}
                   opId={commentView.post.creator_id}
                   distinguished={comment.distinguished}
+                  noUserHighlight={noUserHighlight}
                 />
                 <Vote item={commentView} />
                 <Edited item={commentView} />

diff --git a/src/features/comment/inFeed/FeedComment.tsx b/src/features/comment/inFeed/FeedComment.tsx
@@ -8,9 +8,14 @@ import { getHandle } from "../../../helpers/lemmy";
 interface FeedCommentProps {
   comment: CommentView;
   className?: string;
+  noUserHighlight?: boolean;
 }
 
-export default function FeedComment({ comment, className }: FeedCommentProps) {
+export default function FeedComment({
+  comment,
+  className,
+  noUserHighlight,
+}: FeedCommentProps) {
   const buildGeneralBrowseLink = useBuildGeneralBrowseLink();
   const router = useIonRouter();
 
@@ -21,6 +26,7 @@ export default function FeedComment({ comment, className }: FeedCommentProps) {
         <PostContext post={comment.post} community={comment.community} />
       }
       className={className}
+      noUserHighlight={noUserHighlight}
       onClick={() =>
         router.push(
           buildGeneralBrowseLink(

diff --git a/src/features/feed/PostCommentFeed.tsx b/src/features/feed/PostCommentFeed.tsx
@@ -27,12 +27,14 @@ interface PostCommentFeed
   extends Omit<FeedProps<PostCommentItem>, "renderItemContent"> {
   communityName?: string;
   filterHiddenPosts?: boolean;
+  noUserHighlight?: boolean;
 }
 
 export default function PostCommentFeed({
   communityName,
   fetchFn: _fetchFn,
   filterHiddenPosts = true,
+  noUserHighlight,
   ...rest
 }: PostCommentFeed) {
   const dispatch = useAppDispatch();
@@ -54,12 +56,23 @@ export default function PostCommentFeed({
     (item: PostCommentItem) => {
       if (isPost(item))
         return (
-          <Post post={item} communityMode={!!communityName} css={borderCss} />
+          <Post
+            post={item}
+            communityMode={!!communityName}
+            css={borderCss}
+            noUserHighlight={noUserHighlight}
+          />
         );
 
-      return <FeedComment comment={item} css={borderCss} />;
+      return (
+        <FeedComment
+          comment={item}
+          css={borderCss}
+          noUserHighlight={noUserHighlight}
+        />
+      );
     },
-    [communityName, borderCss]
+    [communityName, borderCss, noUserHighlight]
   );
 
   const renderItemContent = useCallback(

diff --git a/src/features/post/inFeed/Post.tsx b/src/features/post/inFeed/Post.tsx
@@ -30,6 +30,8 @@ export interface PostProps {
   communityMode?: boolean;
 
   className?: string;
+
+  noUserHighlight?: boolean;
 }
 
 export default function Post(props: PostProps) {

diff --git a/src/features/post/inFeed/compact/CompactPost.tsx b/src/features/post/inFeed/compact/CompactPost.tsx
@@ -94,7 +94,11 @@ const EndDetails = styled.div`
   margin-left: auto;
 `;
 
-export default function CompactPost({ post, communityMode }: PostProps) {
+export default function CompactPost({
+  post,
+  communityMode,
+  noUserHighlight,
+}: PostProps) {
   const compactThumbnailPositionType = useAppSelector(
     (state) => state.settings.appearance.compact.thumbnailsPosition
   );
@@ -125,6 +129,7 @@ export default function CompactPost({ post, communityMode }: PostProps) {
                 person={post.creator}
                 showInstanceWhenRemote
                 prefix="by"
+                noUserHighlight={noUserHighlight}
               />
             ) : (
               <CommunityLink community={post.community} />

diff --git a/src/features/post/inFeed/large/LargePost.tsx b/src/features/post/inFeed/large/LargePost.tsx
@@ -103,7 +103,11 @@ const ImageContainer = styled.div`
   margin: 0 -1rem;
 `;
 
-export default function LargePost({ post, communityMode }: PostProps) {
+export default function LargePost({
+  post,
+  communityMode,
+  noUserHighlight,
+}: PostProps) {
   const hasBeenRead: boolean =
     useAppSelector((state) => state.post.postReadById[post.post.id]) ||
     post.read;
@@ -195,6 +199,7 @@ export default function LargePost({ post, communityMode }: PostProps) {
                 person={post.creator}
                 showInstanceWhenRemote
                 prefix="by"
+                noUserHighlight={noUserHighlight}
               />
             ) : (
               <CommunityLink

diff --git a/src/features/user/Profile.tsx b/src/features/user/Profile.tsx
@@ -113,6 +113,7 @@ export default function Profile({ person }: ProfileProps) {
       fetchFn={fetchFn}
       header={header}
       filterHiddenPosts={false}
+      noUserHighlight={isSelf}
     />
   );
 }