🔍 Rename publication to post for v3 preparation: v2 (#pre-lens-v3)

Summary: Renamed "publication" to "post" and updated related helper functions for v3. Highlights: • Replaced `isMirrorPublication` with `isRepost` in components and helpers. • Updated component props from `publication` to `post`. • Added `postHelpers.spec.ts` for testing new helper functions. Read more: https://pierre.co/hey/hey/pre-lens-v3
heyxyz · Nov 13, 2024 · c293673 · c293673 · vercel · Nov 13, 2024
1 parent 8e451b9
commit c293673
Show file tree

Hide file tree

Showing 46 changed files with 321 additions and 387 deletions.
diff --git a/apps/og/src/app/posts/[id]/page.tsx b/apps/og/src/app/posts/[id]/page.tsx
@@ -4,7 +4,7 @@ import { APP_NAME } from "@hey/data/constants";
 import getPostData from "@hey/helpers/getPostData";
 import getProfile from "@hey/helpers/getProfile";
 import logger from "@hey/helpers/logger";
-import { isMirrorPublication } from "@hey/helpers/publicationHelpers";
+import { isRepost } from "@hey/helpers/postHelpers";
 import type { AnyPublication } from "@hey/lens";
 import { PublicationDocument } from "@hey/lens";
 import { addTypenameToDocument } from "apollo-utilities";
@@ -39,20 +39,18 @@ export const generateMetadata = async ({
   }
 
   const publication = result.data.publication as AnyPublication;
-  const targetPublication = isMirrorPublication(publication)
-    ? publication.mirrorOn
-    : publication;
-  const { by: profile, metadata } = targetPublication;
+  const targetPost = isRepost(publication) ? publication.mirrorOn : publication;
+  const { by: profile, metadata } = targetPost;
   const filteredContent = getPostData(metadata)?.content || "";
   const filteredAsset = getPostData(metadata)?.asset;
   const assetIsAudio = filteredAsset?.type === "Audio";
 
   const { displayName, link, slugWithPrefix } = getProfile(profile);
-  const title = `${targetPublication.__typename} by ${slugWithPrefix} • ${APP_NAME}`;
+  const title = `${targetPost.__typename} by ${slugWithPrefix} • ${APP_NAME}`;
   const description = (filteredContent || title).slice(0, 155);
 
   return {
-    alternates: { canonical: `https://hey.xyz/posts/${targetPublication.id}` },
+    alternates: { canonical: `https://hey.xyz/posts/${targetPost.id}` },
     applicationName: APP_NAME,
     authors: {
       name: displayName,
@@ -79,22 +77,22 @@ export const generateMetadata = async ({
       displayName,
       slugWithPrefix
     ],
-    metadataBase: new URL(`https://hey.xyz/posts/${targetPublication.id}`),
+    metadataBase: new URL(`https://hey.xyz/posts/${targetPost.id}`),
     openGraph: {
       description: description,
       images: getPublicationOGImages(metadata) as any,
       siteName: "Hey",
       type: "article",
-      url: `https://hey.xyz/posts/${targetPublication.id}`
+      url: `https://hey.xyz/posts/${targetPost.id}`
     },
     other: {
-      "count:actions": targetPublication.stats.countOpenActions,
-      "count:comments": targetPublication.stats.comments,
-      "count:likes": targetPublication.stats.reactions,
-      "count:mirrors": targetPublication.stats.mirrors,
-      "count:quotes": targetPublication.stats.quotes,
-      "lens:id": targetPublication.id,
-      ...getCollectModuleMetadata(targetPublication)
+      "count:actions": targetPost.stats.countOpenActions,
+      "count:comments": targetPost.stats.comments,
+      "count:likes": targetPost.stats.reactions,
+      "count:mirrors": targetPost.stats.mirrors,
+      "count:quotes": targetPost.stats.quotes,
+      "lens:id": targetPost.id,
+      ...getCollectModuleMetadata(targetPost)
     },
     publisher: displayName,
     title: title,

diff --git a/apps/web/src/components/Bookmarks/BookmarksFeed.tsx b/apps/web/src/components/Bookmarks/BookmarksFeed.tsx
@@ -43,7 +43,7 @@ const BookmarksFeed: FC<BookmarksFeedProps> = ({ focus }) => {
     variables: { request }
   });
 
-  const publications = data?.publicationBookmarks?.items;
+  const posts = data?.publicationBookmarks?.items;
   const pageInfo = data?.publicationBookmarks?.pageInfo;
   const hasMore = pageInfo?.next;
 
@@ -73,7 +73,7 @@ const BookmarksFeed: FC<BookmarksFeedProps> = ({ focus }) => {
     return <PostsShimmer />;
   }
 
-  if (publications?.length === 0) {
+  if (posts?.length === 0) {
     return (
       <EmptyState
         icon={<BookmarkIcon className="size-8" />}
@@ -90,15 +90,15 @@ const BookmarksFeed: FC<BookmarksFeedProps> = ({ focus }) => {
     <Card>
       <Virtuoso
         className="virtual-divider-list-window"
-        computeItemKey={(index, publication) => `${publication.id}-${index}`}
-        data={publications}
+        computeItemKey={(index, post) => `${post.id}-${index}`}
+        data={posts}
         endReached={onEndReached}
         isScrolling={onScrolling}
-        itemContent={(index, publication) => (
+        itemContent={(index, post) => (
           <SinglePost
             isFirst={index === 0}
-            isLast={index === (publications?.length || 0) - 1}
-            publication={publication as AnyPublication}
+            isLast={index === (posts?.length || 0) - 1}
+            post={post as AnyPublication}
           />
         )}
         ref={virtuoso}

diff --git a/apps/web/src/components/Club/ClubFeed.tsx b/apps/web/src/components/Club/ClubFeed.tsx
@@ -44,7 +44,7 @@ const ClubFeed: FC<ClubFeedProps> = ({ handle }) => {
     variables: { request }
   });
 
-  const publications = data?.publications?.items;
+  const posts = data?.publications?.items;
   const pageInfo = data?.publications?.pageInfo;
   const hasMore = pageInfo?.next;
 
@@ -74,7 +74,7 @@ const ClubFeed: FC<ClubFeedProps> = ({ handle }) => {
     return <PostsShimmer />;
   }
 
-  if (publications?.length === 0) {
+  if (posts?.length === 0) {
     return (
       <EmptyState
         icon={<ChatBubbleBottomCenterIcon className="size-8" />}
@@ -96,15 +96,15 @@ const ClubFeed: FC<ClubFeedProps> = ({ handle }) => {
     <Card>
       <Virtuoso
         className="virtual-divider-list-window"
-        computeItemKey={(index, publication) => `${publication.id}-${index}`}
-        data={publications}
+        computeItemKey={(index, post) => `${post.id}-${index}`}
+        data={posts}
         endReached={onEndReached}
         isScrolling={onScrolling}
-        itemContent={(index, publication) => (
+        itemContent={(index, post) => (
           <SinglePost
             isFirst={index === 0}
-            isLast={index === (publications?.length || 0) - 1}
-            publication={publication as AnyPublication}
+            isLast={index === (posts?.length || 0) - 1}
+            post={post as AnyPublication}
           />
         )}
         ref={virtuoso}

diff --git a/apps/web/src/components/Comment/CommentFeed.tsx b/apps/web/src/components/Comment/CommentFeed.tsx
@@ -122,7 +122,7 @@ const CommentFeed: FC<CommentFeedProps> = ({ publicationId }) => {
               <SinglePost
                 isFirst={isFirst}
                 isLast={isLast}
-                publication={comment as Comment}
+                post={comment as Comment}
                 showType={false}
               />
             );

diff --git a/apps/web/src/components/Comment/NoneRelevantFeed.tsx b/apps/web/src/components/Comment/NoneRelevantFeed.tsx
@@ -109,7 +109,7 @@ const NoneRelevantFeed: FC<NoneRelevantFeedProps> = ({ publicationId }) => {
                 <SinglePost
                   isFirst={isFirst}
                   isLast={isLast}
-                  publication={comment as Comment}
+                  post={comment as Comment}
                   showType={false}
                 />
               );

diff --git a/apps/web/src/components/Composer/NewPublication.tsx b/apps/web/src/components/Composer/NewPublication.tsx
@@ -524,10 +524,7 @@ const NewPublication: FC<NewPublicationProps> = ({
       <NewAttachments attachments={attachments} />
       {quotedPublication ? (
         <Wrapper className="m-5" zeroPadding>
-          <QuotedPost
-            isNew
-            publication={removeQuoteOn(quotedPublication as Quote)}
-          />
+          <QuotedPost isNew post={removeQuoteOn(quotedPublication as Quote)} />
         </Wrapper>
       ) : null}
       <div className="divider mx-5" />

diff --git a/apps/web/src/components/Explore/ExploreFeed.tsx b/apps/web/src/components/Explore/ExploreFeed.tsx
@@ -53,7 +53,7 @@ const ExploreFeed: FC<ExploreFeedProps> = ({
     variables: { request }
   });
 
-  const publications = data?.explorePublications?.items;
+  const posts = data?.explorePublications?.items;
   const pageInfo = data?.explorePublications?.pageInfo;
   const hasMore = pageInfo?.next;
 
@@ -80,7 +80,7 @@ const ExploreFeed: FC<ExploreFeedProps> = ({
     return <PostsShimmer />;
   }
 
-  if (publications?.length === 0) {
+  if (posts?.length === 0) {
     return (
       <EmptyState
         icon={<ChatBubbleBottomCenterIcon className="size-8" />}
@@ -97,15 +97,15 @@ const ExploreFeed: FC<ExploreFeedProps> = ({
     <Card>
       <Virtuoso
         className="virtual-divider-list-window"
-        computeItemKey={(index, publication) => `${publication.id}-${index}`}
-        data={publications}
+        computeItemKey={(index, post) => `${post.id}-${index}`}
+        data={posts}
         endReached={onEndReached}
         isScrolling={onScrolling}
-        itemContent={(index, publication) => (
+        itemContent={(index, post) => (
           <SinglePost
             isFirst={index === 0}
-            isLast={index === (publications?.length || 0) - 1}
-            publication={publication as AnyPublication}
+            isLast={index === (posts?.length || 0) - 1}
+            post={post as AnyPublication}
           />
         )}
         ref={virtuoso}

diff --git a/apps/web/src/components/Home/ForYou.tsx b/apps/web/src/components/Home/ForYou.tsx
@@ -82,7 +82,7 @@ const ForYou: FC = () => {
             <SinglePost
               isFirst={index === 0}
               isLast={index === (publications?.length || 0) - 1}
-              publication={item.publication as AnyPublication}
+              post={item.publication as AnyPublication}
             />
           )}
           useWindowScroll

diff --git a/apps/web/src/components/Home/PaidActions/OpenActionPaidAction.tsx b/apps/web/src/components/Home/PaidActions/OpenActionPaidAction.tsx
@@ -1,7 +1,7 @@
 import SmallSingleProfile from "@components/Shared/SmallSingleProfile";
 import getCollectModuleData from "@hey/helpers/getCollectModuleData";
 import getTokenImage from "@hey/helpers/getTokenImage";
-import { isMirrorPublication } from "@hey/helpers/publicationHelpers";
+import { isRepost } from "@hey/helpers/postHelpers";
 import type {
   AnyPublication,
   LatestActed,
@@ -19,11 +19,9 @@ const OpenActionPaidAction: FC<OpenActionPaidActionProps> = ({
   latestActed,
   publication
 }) => {
-  const targetPublication = isMirrorPublication(publication)
-    ? publication.mirrorOn
-    : publication;
+  const targetPost = isRepost(publication) ? publication.mirrorOn : publication;
 
-  const openActions = targetPublication.openActionModules
+  const openActions = targetPost.openActionModules
     .filter(
       (module) =>
         module.__typename === "MultirecipientFeeCollectOpenActionSettings" ||

diff --git a/apps/web/src/components/Home/PaidActions/index.tsx b/apps/web/src/components/Home/PaidActions/index.tsx
@@ -66,7 +66,7 @@ const PaidActions: FC = () => {
             <SinglePost
               isFirst={false}
               isLast
-              publication={action.actedOn as AnyPublication}
+              post={action.actedOn as AnyPublication}
               showThread={false}
             />
           </Card>

diff --git a/apps/web/src/components/Home/Timeline/index.tsx b/apps/web/src/components/Home/Timeline/index.tsx
@@ -113,7 +113,7 @@ const Timeline: FC = () => {
               feedItem={feedItem as FeedItem}
               isFirst={index === 0}
               isLast={index === (feed?.length || 0) - 1}
-              publication={feedItem.root as AnyPublication}
+              post={feedItem.root as AnyPublication}
             />
           )}
           ref={virtuoso}

diff --git a/apps/web/src/components/List/ListFeed.tsx b/apps/web/src/components/List/ListFeed.tsx
@@ -77,7 +77,7 @@ const ListFeed: FC<ListFeedProps> = ({ list, showHeader = false }) => {
     variables: { request }
   });
 
-  const publications = publicationsData?.publications?.items || [];
+  const posts = publicationsData?.publications?.items || [];
 
   const onScrolling = (scrolling: boolean) => {
     if (!scrolling) {
@@ -107,7 +107,7 @@ const ListFeed: FC<ListFeedProps> = ({ list, showHeader = false }) => {
     );
   };
 
-  if (publications?.length === 0) {
+  if (posts?.length === 0) {
     return (
       <Card>
         <Header />
@@ -137,14 +137,14 @@ const ListFeed: FC<ListFeedProps> = ({ list, showHeader = false }) => {
       <Header />
       <Virtuoso
         className="virtual-divider-list-window"
-        computeItemKey={(index, publication) => `${publication.id}-${index}`}
-        data={publications}
+        computeItemKey={(index, post) => `${post.id}-${index}`}
+        data={posts}
         isScrolling={onScrolling}
-        itemContent={(index, publication) => (
+        itemContent={(index, post) => (
           <SinglePost
             isFirst={index === 0}
-            isLast={index === (publications?.length || 0) - 1}
-            publication={publication as AnyPublication}
+            isLast={index === (posts?.length || 0) - 1}
+            post={post as AnyPublication}
           />
         )}
         ref={virtuoso}

diff --git a/apps/web/src/components/Mod/LatestFeed.tsx b/apps/web/src/components/Mod/LatestFeed.tsx
@@ -47,7 +47,7 @@ const LatestFeed: FC = () => {
   const { data, error, fetchMore, loading, refetch } =
     useModExplorePublicationsQuery({ variables: { request } });
 
-  const publications = data?.modExplorePublications?.items;
+  const posts = data?.modExplorePublications?.items;
   const pageInfo = data?.modExplorePublications?.pageInfo;
   const hasMore = pageInfo?.next;
 
@@ -68,7 +68,7 @@ const LatestFeed: FC = () => {
     return <PostsShimmer />;
   }
 
-  if (publications?.length === 0) {
+  if (posts?.length === 0) {
     return (
       <EmptyState
         icon={<ChatBubbleBottomCenterIcon className="size-8" />}
@@ -87,23 +87,22 @@ const LatestFeed: FC = () => {
     <Virtuoso
       className="[&>div>div]:space-y-5"
       components={{ Footer: () => <div className="pb-5" /> }}
-      computeItemKey={(index, publication) => `${publication.id}-${index}`}
-      data={publications?.filter(
-        (publication) =>
-          !SKIPPED_PROFILE_IDS.includes(publication?.by?.id as string)
+      computeItemKey={(index, post) => `${post.id}-${index}`}
+      data={posts?.filter(
+        (post) => !SKIPPED_PROFILE_IDS.includes(post?.by?.id as string)
       )}
       endReached={onEndReached}
-      itemContent={(_, publication) => (
+      itemContent={(_, post) => (
         <Card>
           <SinglePost
             isFirst
             isLast={false}
-            publication={publication as AnyPublication}
+            post={post as AnyPublication}
             showActions={false}
             showThread={false}
           />
           <div className="divider" />
-          <HigherActions publication={publication as MirrorablePublication} />
+          <HigherActions publication={post as MirrorablePublication} />
         </Card>
       )}
       useWindowScroll

diff --git a/apps/web/src/components/Mod/ReportsFeed/Reports.tsx b/apps/web/src/components/Mod/ReportsFeed/Reports.tsx
@@ -75,7 +75,7 @@ const Reports: FC<ReportsProps> = ({ profileId, publicationId }) => {
           <Card>
             <SinglePost
               isFirst
-              publication={report.reportedPublication as AnyPublication}
+              post={report.reportedPublication as AnyPublication}
               showActions={false}
               showThread={false}
             />

diff --git a/apps/web/src/components/Mod/ReportsFeed/index.tsx b/apps/web/src/components/Mod/ReportsFeed/index.tsx
@@ -63,7 +63,7 @@ const ReportsFeed: FC = () => {
           <Card>
             <SinglePost
               isFirst
-              publication={report.reportedPublication as AnyPublication}
+              post={report.reportedPublication as AnyPublication}
               showActions={false}
               showThread={false}
             />