diff --git a/app/[leaflet_id]/actions/PublishButton.tsx b/app/[leaflet_id]/actions/PublishButton.tsx index 4c2e8a29..f0140132 100644 --- a/app/[leaflet_id]/actions/PublishButton.tsx +++ b/app/[leaflet_id]/actions/PublishButton.tsx @@ -136,7 +136,9 @@ const UpdateButton = () => { content: (
{pub.doc ? "Updated! " : "Published! "} - link + + See Published Post +
), type: "success", diff --git a/app/lish/[did]/[publication]/[rkey]/CanvasPage.tsx b/app/lish/[did]/[publication]/[rkey]/CanvasPage.tsx index 222b46fa..1ea95dcc 100644 --- a/app/lish/[did]/[publication]/[rkey]/CanvasPage.tsx +++ b/app/lish/[did]/[publication]/[rkey]/CanvasPage.tsx @@ -217,6 +217,7 @@ const CanvasMetadata = (props: { quotesCount={props.quotesCount || 0} commentsCount={props.commentsCount || 0} showComments={props.preferences.showComments} + showMentions={props.preferences.showMentions} pageId={props.pageId} /> {!props.isSubpage && ( diff --git a/app/lish/[did]/[publication]/[rkey]/Interactions/Interactions.tsx b/app/lish/[did]/[publication]/[rkey]/Interactions/Interactions.tsx index 1f545f88..a612f7e7 100644 --- a/app/lish/[did]/[publication]/[rkey]/Interactions/Interactions.tsx +++ b/app/lish/[did]/[publication]/[rkey]/Interactions/Interactions.tsx @@ -108,6 +108,7 @@ export const Interactions = (props: { commentsCount: number; className?: string; showComments?: boolean; + showMentions?: boolean; pageId?: string; }) => { const data = useContext(PostPageContext); @@ -131,7 +132,7 @@ export const Interactions = (props: {
{tagCount > 0 && } - {props.quotesCount > 0 && ( + {props.quotesCount === 0 || props.showMentions === false ? null : ( - )} - {props.showComments === false ? null : ( - )} - - )} -
+ {props.showComments === false ? null : ( + + )} + + + )} + {subscribed && publication && ( diff --git a/app/lish/[did]/[publication]/[rkey]/PostHeader/PostHeader.tsx b/app/lish/[did]/[publication]/[rkey]/PostHeader/PostHeader.tsx index 63c6896b..364dfac5 100644 --- a/app/lish/[did]/[publication]/[rkey]/PostHeader/PostHeader.tsx +++ b/app/lish/[did]/[publication]/[rkey]/PostHeader/PostHeader.tsx @@ -23,7 +23,7 @@ import { ProfilePopover } from "components/ProfilePopover"; export function PostHeader(props: { data: PostPageData; profile: ProfileViewDetailed; - preferences: { showComments?: boolean }; + preferences: { showComments?: boolean; showMentions?: boolean }; }) { let { identity } = useIdentityData(); let document = props.data; @@ -91,6 +91,7 @@ export function PostHeader(props: { diff --git a/app/lish/[did]/[publication]/[rkey]/PostPages.tsx b/app/lish/[did]/[publication]/[rkey]/PostPages.tsx index b8f93dcf..13db075c 100644 --- a/app/lish/[did]/[publication]/[rkey]/PostPages.tsx +++ b/app/lish/[did]/[publication]/[rkey]/PostPages.tsx @@ -275,7 +275,11 @@ export function PostPages({ ? [] : document.comments_on_documents } - quotesAndMentions={quotesAndMentions} + quotesAndMentions={ + pubRecord?.preferences?.showMentions === false + ? [] + : quotesAndMentions + } did={did} /> )} @@ -362,7 +366,11 @@ export function PostPages({ ? [] : document.comments_on_documents } - quotesAndMentions={quotesAndMentions} + quotesAndMentions={ + pubRecord?.preferences?.showMentions === false + ? [] + : quotesAndMentions + } did={did} /> )} diff --git a/app/lish/[did]/[publication]/[rkey]/QuoteHandler.tsx b/app/lish/[did]/[publication]/[rkey]/QuoteHandler.tsx index 742602c8..beb835e3 100644 --- a/app/lish/[did]/[publication]/[rkey]/QuoteHandler.tsx +++ b/app/lish/[did]/[publication]/[rkey]/QuoteHandler.tsx @@ -186,7 +186,7 @@ export const QuoteOptionButtons = (props: { position: string }) => { Bluesky - + {pubRecord?.preferences?.showComments !== false && identity?.atp_did && ( <> - + +