From 511419989e8b25077f5bcfa85c41672fc7db2a5c Mon Sep 17 00:00:00 2001
From: Ewan <git@ewancroft.uk>
Date: Fri, 21 Nov 2025 01:03:28 +0000
Subject: [PATCH] fix: prevent user from subscribing to own publication

---
 app/lish/Subscribe.tsx                                 | 10 ++++++++++
 .../[did]/[publication]/[rkey]/LinearDocumentPage.tsx  |  4 ++++
 app/lish/[did]/[publication]/page.tsx                  |  1 +
 3 files changed, 15 insertions(+)

diff --git a/app/lish/Subscribe.tsx b/app/lish/Subscribe.tsx
index 001ff6f..aa2bd1d 100644
--- a/app/lish/Subscribe.tsx
+++ b/app/lish/Subscribe.tsx
@@ -186,6 +186,7 @@ export const SubscribeWithBluesky = (props: {
   pub_uri: string;
   base_url: string;
   subscribers: { identity: string }[];
+  pub_creator?: string;
 }) => {
   let { identity } = useIdentityData();
   let searchParams = useSearchParams();
@@ -195,6 +196,9 @@ export const SubscribeWithBluesky = (props: {
   let subscribed =
     identity?.atp_did &&
     props.subscribers.find((s) => s.identity === identity.atp_did);
+  
+  // Check if the logged-in user is the publication owner
+  let isOwner = identity?.atp_did && props.pub_creator === identity.atp_did;
 
   if (successModalOpen)
     return (
@@ -203,6 +207,12 @@ export const SubscribeWithBluesky = (props: {
         setOpen={setSuccessModalOpen}
       />
     );
+  
+  // Don't allow users to subscribe to their own publication
+  if (isOwner) {
+    return null;
+  }
+  
   if (subscribed) {
     return <ManageSubscription {...props} />;
   }
diff --git a/app/lish/[did]/[publication]/[rkey]/LinearDocumentPage.tsx b/app/lish/[did]/[publication]/[rkey]/LinearDocumentPage.tsx
index ffa27a2..d64d594 100644
--- a/app/lish/[did]/[publication]/[rkey]/LinearDocumentPage.tsx
+++ b/app/lish/[did]/[publication]/[rkey]/LinearDocumentPage.tsx
@@ -129,6 +129,10 @@ export function LinearDocumentPage({
                   pubName={
                     document.documents_in_publications[0].publications.name
                   }
+                  pub_creator={
+                    document.documents_in_publications[0].publications
+                      .identity_did
+                  }
                 />
               )}
             </div>
diff --git a/app/lish/[did]/[publication]/page.tsx b/app/lish/[did]/[publication]/page.tsx
index 0d21712..45fef66 100644
--- a/app/lish/[did]/[publication]/page.tsx
+++ b/app/lish/[did]/[publication]/page.tsx
@@ -107,6 +107,7 @@ export default async function Publication(props: {
                     pubName={publication.name}
                     pub_uri={publication.uri}
                     subscribers={publication.publication_subscriptions}
+                    pub_creator={publication.identity_did}
                   />
                 </div>
               </div>
-- 
2.43.0


From d8c60bc844947e556431334e6db83276bac65366 Mon Sep 17 00:00:00 2001
From: Ewan <git@ewancroft.uk>
Date: Fri, 21 Nov 2025 19:31:17 +0000
Subject: [PATCH] feat: add Edit Publication button for owners on publication
 homepage

Replace subscribe section with "Edit Publication" button when viewing own publication.
Button links to dashboard and matches styling of existing edit post button.
---
 app/lish/[did]/[publication]/page.tsx | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/app/lish/[did]/[publication]/page.tsx b/app/lish/[did]/[publication]/page.tsx
index 45fef66..ac36223 100644
--- a/app/lish/[did]/[publication]/page.tsx
+++ b/app/lish/[did]/[publication]/page.tsx
@@ -15,6 +15,8 @@ import { SpeedyLink } from "components/SpeedyLink";
 import { QuoteTiny } from "components/Icons/QuoteTiny";
 import { CommentTiny } from "components/Icons/CommentTiny";
 import { LocalizedDate } from "./LocalizedDate";
+import { EditTiny } from "components/Icons/EditTiny";
+import { getIdentityData } from "actions/getIdentityData";
 
 export default async function Publication(props: {
   params: Promise<{ publication: string; did: string }>;
@@ -22,6 +24,7 @@ export default async function Publication(props: {
   let params = await props.params;
   let did = decodeURIComponent(params.did);
   if (!did) return <PubNotFound />;
+  let identity = await getIdentityData();
   let agent = new BskyAgent({ service: "https://public.api.bsky.app" });
   let uri;
   let publication_name = decodeURIComponent(params.publication);
@@ -102,13 +105,22 @@ export default async function Publication(props: {
                   </p>
                 )}
                 <div className="sm:pt-4 pt-4">
-                  <SubscribeWithBluesky
-                    base_url={getPublicationURL(publication)}
-                    pubName={publication.name}
-                    pub_uri={publication.uri}
-                    subscribers={publication.publication_subscriptions}
-                    pub_creator={publication.identity_did}
-                  />
+                  {identity?.atp_did === publication.identity_did ? (
+                    <a
+                      href={`${getPublicationURL(publication)}/dashboard`}
+                      className="flex gap-2 items-center hover:!no-underline selected-outline px-4 py-2 bg-accent-1 text-accent-2 font-bold w-fit rounded-lg !border-accent-1 !outline-accent-1 mx-auto text-base"
+                    >
+                      <EditTiny /> Edit Publication
+                    </a>
+                  ) : (
+                    <SubscribeWithBluesky
+                      base_url={getPublicationURL(publication)}
+                      pubName={publication.name}
+                      pub_uri={publication.uri}
+                      subscribers={publication.publication_subscriptions}
+                      pub_creator={publication.identity_did}
+                    />
+                  )}
                 </div>
               </div>
               <div className="publicationPostList w-full flex flex-col gap-4">
-- 
2.43.0


From f5cdaff3e4a53f1ff37b89aa869f01cf198667a3 Mon Sep 17 00:00:00 2001
From: Ewan <git@ewancroft.uk>
Date: Wed, 3 Dec 2025 11:11:16 +0000
Subject: [PATCH] refactor: streamline LinearDocumentPage and enhance
 Publication layout

---
 .../[rkey]/LinearDocumentPage.tsx             |  90 +++----
 app/lish/[did]/[publication]/page.tsx         | 244 +++++++++---------
 2 files changed, 162 insertions(+), 172 deletions(-)

diff --git a/app/lish/[did]/[publication]/[rkey]/LinearDocumentPage.tsx b/app/lish/[did]/[publication]/[rkey]/LinearDocumentPage.tsx
index d64d594..968de98 100644
--- a/app/lish/[did]/[publication]/[rkey]/LinearDocumentPage.tsx
+++ b/app/lish/[did]/[publication]/[rkey]/LinearDocumentPage.tsx
@@ -23,43 +23,35 @@ import { useDrawerOpen } from "./Interactions/InteractionDrawer";
 import { PageWrapper } from "components/Pages/Page";
 import { decodeQuotePosition } from "./quotePosition";
 import { PollData } from "./fetchPollData";
+import { SharedPageProps } from "./PostPages";
 
 export function LinearDocumentPage({
-  document,
   blocks,
-  did,
-  profile,
-  preferences,
-  pubRecord,
-  prerenderedCodeBlocks,
-  bskyPostData,
-  document_uri,
-  pageId,
-  pageOptions,
-  pollData,
-  fullPageScroll,
-}: {
-  document_uri: string;
-  document: PostPageData;
+  ...props
+}: Omit<SharedPageProps, "allPages"> & {
   blocks: PubLeafletPagesLinearDocument.Block[];
-  profile?: ProfileViewDetailed;
-  pubRecord: PubLeafletPublication.Record;
-  did: string;
-  prerenderedCodeBlocks?: Map<string, string>;
-  bskyPostData: AppBskyFeedDefs.PostView[];
-  pollData: PollData[];
-  preferences: { showComments?: boolean };
-  pageId?: string;
-  pageOptions?: React.ReactNode;
-  fullPageScroll: boolean;
 }) {
+  const {
+    document,
+    did,
+    profile,
+    preferences,
+    pubRecord,
+    theme,
+    prerenderedCodeBlocks,
+    bskyPostData,
+    pollData,
+    document_uri,
+    pageId,
+    pageOptions,
+    fullPageScroll,
+    hasPageBackground,
+  } = props;
   let { identity } = useIdentityData();
   let drawer = useDrawerOpen(document_uri);
 
-  if (!document || !document.documents_in_publications[0].publications)
-    return null;
+  if (!document) return null;
 
-  let hasPageBackground = !!pubRecord.theme?.showPageBackground;
   let record = document.data as PubLeafletDocument.Record;
 
   const isSubpage = !!pageId;
@@ -114,26 +106,28 @@ export function LinearDocumentPage({
                   <EditTiny /> Edit Post
                 </a>
               ) : (
-                <SubscribeWithBluesky
-                  isPost
-                  base_url={getPublicationURL(
-                    document.documents_in_publications[0].publications,
-                  )}
-                  pub_uri={
-                    document.documents_in_publications[0].publications.uri
-                  }
-                  subscribers={
-                    document.documents_in_publications[0].publications
-                      .publication_subscriptions
-                  }
-                  pubName={
-                    document.documents_in_publications[0].publications.name
-                  }
-                  pub_creator={
-                    document.documents_in_publications[0].publications
-                      .identity_did
-                  }
-                />
+                document.documents_in_publications[0]?.publications && (
+                  <SubscribeWithBluesky
+                    isPost
+                    base_url={getPublicationURL(
+                      document.documents_in_publications[0].publications,
+                    )}
+                    pub_uri={
+                      document.documents_in_publications[0].publications.uri
+                    }
+                    subscribers={
+                      document.documents_in_publications[0].publications
+                        .publication_subscriptions
+                    }
+                    pubName={
+                      document.documents_in_publications[0].publications.name
+                    }
+                    pub_creator={
+                      document.documents_in_publications[0].publications
+                        .identity_did
+                    }
+                  />
+                )
               )}
             </div>
           </>
diff --git a/app/lish/[did]/[publication]/page.tsx b/app/lish/[did]/[publication]/page.tsx
index ac36223..8fab538 100644
--- a/app/lish/[did]/[publication]/page.tsx
+++ b/app/lish/[did]/[publication]/page.tsx
@@ -15,6 +15,7 @@ import { SpeedyLink } from "components/SpeedyLink";
 import { QuoteTiny } from "components/Icons/QuoteTiny";
 import { CommentTiny } from "components/Icons/CommentTiny";
 import { LocalizedDate } from "./LocalizedDate";
+import { PublicationHomeLayout } from "./PublicationHomeLayout";
 import { EditTiny } from "components/Icons/EditTiny";
 import { getIdentityData } from "actions/getIdentityData";
 
@@ -62,148 +63,143 @@ export default async function Publication(props: {
   try {
     return (
       <PublicationThemeProvider
-        record={record}
+        theme={record?.theme}
         pub_creator={publication.identity_did}
       >
         <PublicationBackgroundProvider
-          record={record}
+          theme={record?.theme}
           pub_creator={publication.identity_did}
         >
-          <div
-            className={`pubWrapper flex flex-col sm:py-6 h-full   ${showPageBackground ? "max-w-prose mx-auto sm:px-0 px-[6px] py-2" : "w-full overflow-y-scroll"}`}
+          <PublicationHomeLayout
+            uri={publication.uri}
+            showPageBackground={!!showPageBackground}
           >
-            <div
-              className={`pub sm:max-w-prose max-w-(--page-width-units) w-[1000px] mx-auto px-3 sm:px-4 py-5  ${showPageBackground ? "overflow-auto h-full bg-[rgba(var(--bg-page),var(--bg-page-alpha))] border border-border rounded-lg" : "h-fit"}`}
-            >
-              <div className="pubHeader flex flex-col pb-8 w-full text-center justify-center ">
-                {record?.icon && (
-                  <div
-                    className="shrink-0 w-10 h-10 rounded-full mx-auto"
-                    style={{
-                      backgroundImage: `url(/api/atproto_images?did=${did}&cid=${(record.icon.ref as unknown as { $link: string })["$link"]})`,
-                      backgroundRepeat: "no-repeat",
-                      backgroundPosition: "center",
-                      backgroundSize: "cover",
-                    }}
-                  />
-                )}
-                <h2 className="text-accent-contrast sm:text-xl text-[22px] pt-1 ">
-                  {publication.name}
-                </h2>
-                <p className="sm:text-lg text-secondary">
-                  {record?.description}{" "}
+            <div className="pubHeader flex flex-col pb-8 w-full text-center justify-center ">
+              {record?.icon && (
+                <div
+                  className="shrink-0 w-10 h-10 rounded-full mx-auto"
+                  style={{
+                    backgroundImage: `url(/api/atproto_images?did=${did}&cid=${(record.icon.ref as unknown as { $link: string })["$link"]})`,
+                    backgroundRepeat: "no-repeat",
+                    backgroundPosition: "center",
+                    backgroundSize: "cover",
+                  }}
+                />
+              )}
+              <h2 className="text-accent-contrast sm:text-xl text-[22px] pt-1 ">
+                {publication.name}
+              </h2>
+              <p className="sm:text-lg text-secondary">
+                {record?.description}{" "}
+              </p>
+              {profile && (
+                <p className="italic text-tertiary sm:text-base text-sm">
+                  <strong className="">by {profile.displayName}</strong>{" "}
+                  <a
+                    className="text-tertiary"
+                    href={`https://bsky.app/profile/${profile.handle}`}
+                  >
+                    @{profile.handle}
+                  </a>
                 </p>
-                {profile && (
-                  <p className="italic text-tertiary sm:text-base text-sm">
-                    <strong className="">by {profile.displayName}</strong>{" "}
-                    <a
-                      className="text-tertiary"
-                      href={`https://bsky.app/profile/${profile.handle}`}
-                    >
-                      @{profile.handle}
-                    </a>
-                  </p>
+              )}
+              <div className="sm:pt-4 pt-4">
+                {identity?.atp_did === publication.identity_did ? (
+                  <a
+                    href={`${getPublicationURL(publication)}/dashboard`}
+                    className="flex gap-2 items-center hover:!no-underline selected-outline px-4 py-2 bg-accent-1 text-accent-2 font-bold w-fit rounded-lg !border-accent-1 !outline-accent-1 mx-auto text-base"
+                  >
+                    <EditTiny /> Edit Publication
+                  </a>
+                ) : (
+                  <SubscribeWithBluesky
+                    base_url={getPublicationURL(publication)}
+                    pubName={publication.name}
+                    pub_uri={publication.uri}
+                    subscribers={publication.publication_subscriptions}
+                    pub_creator={publication.identity_did}
+                  />
                 )}
-                <div className="sm:pt-4 pt-4">
-                  {identity?.atp_did === publication.identity_did ? (
-                    <a
-                      href={`${getPublicationURL(publication)}/dashboard`}
-                      className="flex gap-2 items-center hover:!no-underline selected-outline px-4 py-2 bg-accent-1 text-accent-2 font-bold w-fit rounded-lg !border-accent-1 !outline-accent-1 mx-auto text-base"
-                    >
-                      <EditTiny /> Edit Publication
-                    </a>
-                  ) : (
-                    <SubscribeWithBluesky
-                      base_url={getPublicationURL(publication)}
-                      pubName={publication.name}
-                      pub_uri={publication.uri}
-                      subscribers={publication.publication_subscriptions}
-                      pub_creator={publication.identity_did}
-                    />
-                  )}
-                </div>
               </div>
-              <div className="publicationPostList w-full flex flex-col gap-4">
-                {publication.documents_in_publications
-                  .filter((d) => !!d?.documents)
-                  .sort((a, b) => {
-                    let aRecord = a.documents
-                      ?.data! as PubLeafletDocument.Record;
-                    let bRecord = b.documents
-                      ?.data! as PubLeafletDocument.Record;
-                    const aDate = aRecord.publishedAt
-                      ? new Date(aRecord.publishedAt)
-                      : new Date(0);
-                    const bDate = bRecord.publishedAt
-                      ? new Date(bRecord.publishedAt)
-                      : new Date(0);
-                    return bDate.getTime() - aDate.getTime(); // Sort by most recent first
-                  })
-                  .map((doc) => {
-                    if (!doc.documents) return null;
-                    let uri = new AtUri(doc.documents.uri);
-                    let doc_record = doc.documents
-                      .data as PubLeafletDocument.Record;
-                    let quotes =
-                      doc.documents.document_mentions_in_bsky[0].count || 0;
-                    let comments =
-                      record?.preferences?.showComments === false
-                        ? 0
-                        : doc.documents.comments_on_documents[0].count || 0;
+            </div>
+            <div className="publicationPostList w-full flex flex-col gap-4">
+              {publication.documents_in_publications
+                .filter((d) => !!d?.documents)
+                .sort((a, b) => {
+                  let aRecord = a.documents?.data! as PubLeafletDocument.Record;
+                  let bRecord = b.documents?.data! as PubLeafletDocument.Record;
+                  const aDate = aRecord.publishedAt
+                    ? new Date(aRecord.publishedAt)
+                    : new Date(0);
+                  const bDate = bRecord.publishedAt
+                    ? new Date(bRecord.publishedAt)
+                    : new Date(0);
+                  return bDate.getTime() - aDate.getTime(); // Sort by most recent first
+                })
+                .map((doc) => {
+                  if (!doc.documents) return null;
+                  let uri = new AtUri(doc.documents.uri);
+                  let doc_record = doc.documents
+                    .data as PubLeafletDocument.Record;
+                  let quotes =
+                    doc.documents.document_mentions_in_bsky[0].count || 0;
+                  let comments =
+                    record?.preferences?.showComments === false
+                      ? 0
+                      : doc.documents.comments_on_documents[0].count || 0;
 
-                    return (
-                      <React.Fragment key={doc.documents?.uri}>
-                        <div className="flex w-full grow flex-col ">
-                          <SpeedyLink
-                            href={`${getPublicationURL(publication)}/${uri.rkey}`}
-                            className="publishedPost hover:no-underline! flex flex-col"
-                          >
-                            <h3 className="text-primary">{doc_record.title}</h3>
-                            <p className="italic text-secondary">
-                              {doc_record.description}
-                            </p>
-                          </SpeedyLink>
+                  return (
+                    <React.Fragment key={doc.documents?.uri}>
+                      <div className="flex w-full grow flex-col ">
+                        <SpeedyLink
+                          href={`${getPublicationURL(publication)}/${uri.rkey}`}
+                          className="publishedPost hover:no-underline! flex flex-col"
+                        >
+                          <h3 className="text-primary">{doc_record.title}</h3>
+                          <p className="italic text-secondary">
+                            {doc_record.description}
+                          </p>
+                        </SpeedyLink>
 
-                          <div className="text-sm text-tertiary flex gap-1 flex-wrap pt-2">
-                            <p className="text-sm text-tertiary ">
-                              {doc_record.publishedAt && (
-                                <LocalizedDate
-                                  dateString={doc_record.publishedAt}
-                                  options={{
-                                    year: "numeric",
-                                    month: "long",
-                                    day: "2-digit",
-                                  }}
-                                />
-                              )}{" "}
-                            </p>
-                            {comments > 0 || quotes > 0 ? "| " : ""}
-                            {quotes > 0 && (
+                        <div className="text-sm text-tertiary flex gap-1 flex-wrap pt-2">
+                          <p className="text-sm text-tertiary ">
+                            {doc_record.publishedAt && (
+                              <LocalizedDate
+                                dateString={doc_record.publishedAt}
+                                options={{
+                                  year: "numeric",
+                                  month: "long",
+                                  day: "2-digit",
+                                }}
+                              />
+                            )}{" "}
+                          </p>
+                          {comments > 0 || quotes > 0 ? "| " : ""}
+                          {quotes > 0 && (
+                            <SpeedyLink
+                              href={`${getPublicationURL(publication)}/${uri.rkey}?interactionDrawer=quotes`}
+                              className="flex flex-row gap-0 text-sm text-tertiary items-center flex-wrap"
+                            >
+                              <QuoteTiny /> {quotes}
+                            </SpeedyLink>
+                          )}
+                          {comments > 0 &&
+                            record?.preferences?.showComments !== false && (
                               <SpeedyLink
-                                href={`${getPublicationURL(publication)}/${uri.rkey}?interactionDrawer=quotes`}
+                                href={`${getPublicationURL(publication)}/${uri.rkey}?interactionDrawer=comments`}
                                 className="flex flex-row gap-0 text-sm text-tertiary items-center flex-wrap"
                               >
-                                <QuoteTiny /> {quotes}
+                                <CommentTiny /> {comments}
                               </SpeedyLink>
                             )}
-                            {comments > 0 &&
-                              record?.preferences?.showComments !== false && (
-                                <SpeedyLink
-                                  href={`${getPublicationURL(publication)}/${uri.rkey}?interactionDrawer=comments`}
-                                  className="flex flex-row gap-0 text-sm text-tertiary items-center flex-wrap"
-                                >
-                                  <CommentTiny /> {comments}
-                                </SpeedyLink>
-                              )}
-                          </div>
                         </div>
-                        <hr className="last:hidden border-border-light" />
-                      </React.Fragment>
-                    );
-                  })}
-              </div>
+                      </div>
+                      <hr className="last:hidden border-border-light" />
+                    </React.Fragment>
+                  );
+                })}
             </div>
-          </div>
+          </PublicationHomeLayout>
         </PublicationBackgroundProvider>
       </PublicationThemeProvider>
     );
-- 
2.43.0