Merge branch 'pdelfan:main' into main

pdelfan · web-flow · commit d79cc08c48b6 · 2024-09-13T10:35:57.000-07:00
diff --git a/src/app/(auth)/login/layout.tsx b/src/app/(auth)/login/layout.tsx
@@ -2,7 +2,7 @@ import type { Metadata } from "next";
 import Image from "next/image";
 
 export const metadata: Metadata = {
-  title: "Ouranos — Login",
+  title: "Login",
   description: "Your Bluesky web client",
 };
 
diff --git a/src/app/(site)/about/layout.tsx b/src/app/(site)/about/layout.tsx
@@ -1,7 +1,7 @@
 import type { Metadata } from "next";
 
 export const metadata: Metadata = {
-  title: "Ouranos - About",
+  title: "About",
   description: "About Ouranos",
 };
 
diff --git a/src/app/dashboard/feeds/[feed]/layout.tsx b/src/app/dashboard/feeds/[feed]/layout.tsx
@@ -1,10 +1,3 @@
-import type { Metadata } from "next";
-
-export const metadata: Metadata = {
-  title: "Ouranos — Feed",
-  description: "Feed",
-};
-
 export default function FeedLayout({
   children,
 }: {
diff --git a/src/app/dashboard/feeds/[feed]/page.tsx b/src/app/dashboard/feeds/[feed]/page.tsx
@@ -1,5 +1,19 @@
 import FeedHeader from "@/components/contentDisplay/feedHeader/FeedHeader";
 import FeedContainer from "@/containers/posts/FeedContainer";
+import { getFeedInfo } from "@/lib/api/bsky/feed";
+import { Metadata } from "next";
+
+export async function generateMetadata({ searchParams }: Props): Promise<Metadata> {
+  const feedInfo = await getFeedInfo(searchParams.uri);
+  const title = feedInfo.view.displayName
+      ? feedInfo.view.displayName
+      : "Feed";
+  
+    return {
+      title: title + " — Ouranos",
+      description: "Feed",
+    };
+  }
 
 interface Props {
   searchParams: {
diff --git a/src/app/dashboard/feeds/layout.tsx b/src/app/dashboard/feeds/layout.tsx
@@ -2,7 +2,7 @@ import Layout from "@/containers/Layout";
 import type { Metadata } from "next";
 
 export const metadata: Metadata = {
-  title: "Ouranos — Feeds",
+  title: "Feeds",
   description: "Feeds",
 };
 
diff --git a/src/app/dashboard/home/[feed]/page.tsx b/src/app/dashboard/home/[feed]/page.tsx
@@ -1,4 +1,18 @@
 import FeedContainer from "@/containers/posts/FeedContainer";
+import { getFeedInfo } from "@/lib/api/bsky/feed";
+import { Metadata } from "next";
+
+export async function generateMetadata({ searchParams }: Props): Promise<Metadata> {
+  const feedInfo = await getFeedInfo(searchParams.uri);
+  const title = feedInfo.view.displayName
+      ? feedInfo.view.displayName
+      : "Feed";
+  
+    return {
+      title: title + " — Ouranos",
+      description: "Feed",
+    };
+  }
 
 interface Props {
   searchParams: {
diff --git a/src/app/dashboard/home/layout.tsx b/src/app/dashboard/home/layout.tsx
@@ -2,7 +2,7 @@ import FeedTabs from "@/components/navigational/feedTabs/FeedTabs";
 import type { Metadata } from "next";
 
 export const metadata: Metadata = {
-  title: "Ouranos — Home",
+  title: "Home",
   description: "Home",
 };
 
diff --git a/src/app/dashboard/layout.tsx b/src/app/dashboard/layout.tsx
@@ -8,7 +8,7 @@ import { getProfile } from "@/lib/api/bsky/actor";
 import { getSessionFromServer } from "@/lib/api/auth/session";
 
 export const metadata: Metadata = {
-  title: "Ouranos",
+  title: { template: "%s — Ouranos", default: "Ouranos" },
   description: "Home",
 };
 
diff --git a/src/app/dashboard/lists/layout.tsx b/src/app/dashboard/lists/layout.tsx
@@ -2,7 +2,7 @@ import Layout from "@/containers/Layout";
 import type { Metadata } from "next";
 
 export const metadata: Metadata = {
-  title: "Ouranos — Lists",
+  title: "Lists",
   description: "Lists",
 };
 
diff --git a/src/app/dashboard/notifications/layout.tsx b/src/app/dashboard/notifications/layout.tsx
@@ -2,7 +2,7 @@ import Layout from "@/containers/Layout";
 import type { Metadata } from "next";
 
 export const metadata: Metadata = {
-  title: "Ouranos — Notifications",
+  title: "Notifications",
   description: "Notifications",
 };
 
diff --git a/src/app/dashboard/search/layout.tsx b/src/app/dashboard/search/layout.tsx
@@ -2,7 +2,7 @@ import Layout from "@/containers/Layout";
 import type { Metadata } from "next";
 
 export const metadata: Metadata = {
-  title: "Ouranos — Search",
+  title: "Search",
   description: "Search",
 };
 
diff --git a/src/app/dashboard/settings/appearance/page.tsx b/src/app/dashboard/settings/appearance/page.tsx
@@ -1,4 +1,10 @@
 import AppearanceContainer from "@/containers/settings/AppearanceContainer/AppearanceContainer";
+import { Metadata } from "next";
+
+export const metadata: Metadata = {
+  title: "Appearance",
+  description: "Appearance",
+};
 
 export default function Page() {
   return <AppearanceContainer />;
diff --git a/src/app/dashboard/settings/blocked-users/page.tsx b/src/app/dashboard/settings/blocked-users/page.tsx
@@ -1,4 +1,11 @@
 import BlockedUsersContainer from "@/containers/settings/blockedUsersContainer/BlockedUsersContainer";
+import { Metadata } from "next";
+
+export const metadata: Metadata = {
+  title: "Blocked Users",
+  description: "Blocked Users",
+};
+
 
 export default function Page() {
   return <BlockedUsersContainer />;
diff --git a/src/app/dashboard/settings/content-filtering/page.tsx b/src/app/dashboard/settings/content-filtering/page.tsx
@@ -1,4 +1,10 @@
 import ContentFilteringContainer from "@/containers/settings/contentFilteringContainer/ContentFilteringContainer";
+import { Metadata } from "next";
+
+export const metadata: Metadata = {
+  title: "Content Filtering",
+  description: "Content Filtering",
+};
 
 export default function Page() {
   return <ContentFilteringContainer />;
diff --git a/src/app/dashboard/settings/home-feed/page.tsx b/src/app/dashboard/settings/home-feed/page.tsx
@@ -1,4 +1,10 @@
 import HomeFeedContainer from "@/containers/settings/homeFeedContainer/HomeFeedContainer";
+import { Metadata } from "next";
+
+export const metadata: Metadata = {
+  title: "Home Feed Preferences",
+  description: "Home Feed Preferences",
+};
 
 export default function Page() {
   return <HomeFeedContainer />;
diff --git a/src/app/dashboard/settings/layout.tsx b/src/app/dashboard/settings/layout.tsx
@@ -2,7 +2,7 @@ import Layout from "@/containers/Layout";
 import type { Metadata } from "next";
 
 export const metadata: Metadata = {
-  title: "Ouranos — Settings",
+  title: { template: "%s — Ouranos", default: "Settings" },
   description: "Settings",
 };
 
diff --git a/src/app/dashboard/settings/muted-users/page.tsx b/src/app/dashboard/settings/muted-users/page.tsx
@@ -1,4 +1,10 @@
 import MutedUsersContainer from "@/containers/settings/mutedUsersContainer/MutedUsersContainer";
+import { Metadata } from "next";
+
+export const metadata: Metadata = {
+  title: "Muted Users",
+  description: "Muted Users",
+};
 
 export default function Page() {
   return <MutedUsersContainer />;
diff --git a/src/app/dashboard/settings/my-feeds/page.tsx b/src/app/dashboard/settings/my-feeds/page.tsx
@@ -1,4 +1,10 @@
 import MyFeedsContainer from "@/containers/settings/myFeedsContainer/MyFeedsContainer";
+import { Metadata } from "next";
+
+export const metadata: Metadata = {
+  title: "My Feeds",
+  description: "My Feeds",
+};
 
 export default function Page() {
   return <MyFeedsContainer />;
diff --git a/src/app/dashboard/settings/thread-preferences/page.tsx b/src/app/dashboard/settings/thread-preferences/page.tsx
@@ -1,4 +1,10 @@
 import ThreadPreferencesContainer from "@/containers/settings/threadPreferencesContainer/ThreadPreferencesContainer";
+import { Metadata } from "next";
+
+export const metadata: Metadata = {
+  title: "Thread Preferences",
+  description: "Thread Preferences",
+};
 
 export default function Page() {
   return <ThreadPreferencesContainer />;
diff --git a/src/app/dashboard/user/[handle]/(content)/layout.tsx b/src/app/dashboard/user/[handle]/(content)/layout.tsx
@@ -1,10 +1,18 @@
 import type { Metadata } from "next";
 import ProfileHeader from "@/components/contentDisplay/profileHeader/ProfileHeader";
+import { getProfile } from "@/lib/api/bsky/actor";
 
-export const metadata: Metadata = {
-  title: "Ouranos — Profile",
-  description: "Profile",
-};
+export async function generateMetadata({ params }: Props): Promise<Metadata> {
+  const profile = await getProfile(params.handle);
+  const title = profile?.displayName
+    ? `${profile.displayName} (@${params.handle})`
+    : params.handle;
+
+  return {
+    title: title,
+    description: "Profile",
+  };
+}
 
 interface Props {
   params: { handle: string };
diff --git a/src/app/dashboard/user/[handle]/(follow)/known-followers/page.tsx b/src/app/dashboard/user/[handle]/(follow)/known-followers/page.tsx
@@ -1,5 +1,15 @@
-import FollowingContainer from "@/containers/users/FollowingContainer";
 import KnownFollowersContainer from "@/containers/users/KnownFollowersContainer";
+import type { Metadata } from "next";
+
+export function generateMetadata({ params }: Props): Metadata {
+  const title = `Followers of @${params.handle} that you know`;
+  const descripton = `Followers of @${params.handle} that you know`;
+
+  return {
+    title: title,
+    description: descripton,
+  };
+}
 
 interface Props {
   params: {
diff --git a/src/app/dashboard/user/[handle]/(post)/post/[id]/liked-by/layout.tsx b/src/app/dashboard/user/[handle]/(post)/post/[id]/liked-by/layout.tsx
@@ -1,10 +1,4 @@
 import Layout from "@/containers/Layout";
-import type { Metadata } from "next";
-
-export const metadata: Metadata = {
-  title: "Ouranos — Liked By",
-  description: "Liked By",
-};
 
 export default function LikedByLayout({
   children,
diff --git a/src/app/dashboard/user/[handle]/(post)/post/[id]/liked-by/page.tsx b/src/app/dashboard/user/[handle]/(post)/post/[id]/liked-by/page.tsx
@@ -1,4 +1,15 @@
 import LikedByContainer from "@/containers/thread/LikedByContainer";
+import type { Metadata } from "next";
+
+export function generateMetadata({ params }: Props): Metadata {
+  const title = `@${params.handle}'s Post Liked By`;
+  const descripton = `Users who have liked @${params.handle}'s post`;
+
+  return {
+    title: title,
+    description: descripton,
+  };
+}
 
 interface Props {
   params: {
diff --git a/src/app/dashboard/user/[handle]/(post)/post/[id]/page.tsx b/src/app/dashboard/user/[handle]/(post)/post/[id]/page.tsx
@@ -1,6 +1,33 @@
 import PostThreadContainer from "@/containers/thread/PostThreadContainer";
 import { getSessionFromServer } from "@/lib/api/auth/session";
 import { getProfile } from "@/lib/api/bsky/actor";
+import { getAgent } from "@/lib/api/bsky/agent";
+import { getPostThread } from "@/lib/api/bsky/feed";
+import { AppBskyFeedDefs, AppBskyFeedPost } from "@atproto/api";
+import { Metadata } from "next";
+
+export async function generateMetadata({ params }: Props): Promise<Metadata> {
+  const agent = await getAgent();
+  const { handle, id } = params;
+  const { data } = await agent.resolveHandle({ handle });
+  const uri = `at://${data.did}/app.bsky.feed.post/${id}`;
+  const post = await getPostThread(uri);
+
+  const isThreadViewPost = AppBskyFeedDefs.isThreadViewPost(post) ? true : false;
+  const threadPost = isThreadViewPost ? post.post as AppBskyFeedDefs.PostView : null;
+
+  const text =
+    threadPost && AppBskyFeedPost.isRecord(threadPost.record)
+      ? threadPost.record.text
+      : "";
+
+  const title = text !== "" ? `${threadPost?.author.displayName || params.handle}: "${text}"` : `Post by ${params.handle}`;
+
+  return {
+    title: title,
+    description: "Feed",
+  };
+}
 
 interface Props {
   params: {
diff --git a/src/app/dashboard/user/[handle]/(post)/post/[id]/quotes/layout.tsx b/src/app/dashboard/user/[handle]/(post)/post/[id]/quotes/layout.tsx
@@ -1,10 +1,4 @@
 import Layout from "@/containers/Layout";
-import type { Metadata } from "next";
-
-export const metadata: Metadata = {
-  title: "Ouranos — Quotes",
-  description: "Quotes for this post",
-};
 
 export default function RepostedByLayout({
   children,
diff --git a/src/app/dashboard/user/[handle]/(post)/post/[id]/quotes/page.tsx b/src/app/dashboard/user/[handle]/(post)/post/[id]/quotes/page.tsx
@@ -1,4 +1,15 @@
 import QuotesContainer from "@/containers/thread/QuotesContainer";
+import type { Metadata } from "next";
+
+export function generateMetadata({ params }: Props): Metadata {
+  const title = `@${params.handle}'s Post Quotes`;
+  const descripton = `Users who have quoted @${params.handle}'s post`;
+
+  return {
+    title: title,
+    description: descripton,
+  };
+}
 
 interface Props {
   params: {
diff --git a/src/app/dashboard/user/[handle]/(post)/post/[id]/reposted-by/layout.tsx b/src/app/dashboard/user/[handle]/(post)/post/[id]/reposted-by/layout.tsx
@@ -1,10 +1,4 @@
 import Layout from "@/containers/Layout";
-import type { Metadata } from "next";
-
-export const metadata: Metadata = {
-  title: "Ouranos — Reposted By",
-  description: "Reposted By",
-};
 
 export default function RepostedByLayout({
   children,
diff --git a/src/app/dashboard/user/[handle]/(post)/post/[id]/reposted-by/page.tsx b/src/app/dashboard/user/[handle]/(post)/post/[id]/reposted-by/page.tsx
@@ -1,4 +1,15 @@
 import RepostedByContainer from "@/containers/thread/RepostedByContainer";
+import type { Metadata } from "next";
+
+export function generateMetadata({ params }: Props): Metadata {
+  const title = `@${params.handle}'s Post Reposted By`;
+  const descripton = `Users who have reposted @${params.handle}'s post`;
+
+  return {
+    title: title,
+    description: descripton,
+  };
+}
 
 interface Props {
   params: {
diff --git a/src/app/dashboard/user/[handle]/lists/[list]/layout.tsx b/src/app/dashboard/user/[handle]/lists/[list]/layout.tsx
@@ -1,10 +1,3 @@
-import type { Metadata } from "next";
-
-export const metadata: Metadata = {
-  title: "Ouranos — List",
-  description: "List",
-};
-
 export default function ListsLayout({
   children,
 }: {
diff --git a/src/app/dashboard/user/[handle]/lists/[list]/page.tsx b/src/app/dashboard/user/[handle]/lists/[list]/page.tsx
@@ -1,4 +1,18 @@
 import ListContainer from "@/containers/lists/ListContainer";
+import { getListInfo } from "@/lib/api/bsky/list";
+import { Metadata } from "next";
+
+export async function generateMetadata({ searchParams }: Props): Promise<Metadata> {
+  const listInfo = await getListInfo(searchParams.uri);
+  const title = listInfo.list.name
+      ? listInfo.list.name
+      : "List";
+  
+    return {
+      title: title,
+      description: "Feed",
+    };
+  }
 
 interface Props {
   searchParams: {
diff --git a/src/app/dashboard/user/[handle]/lists/layout.tsx b/src/app/dashboard/user/[handle]/lists/layout.tsx
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
diff --git a/src/components/dataDisplay/postEmbed/ExternalEmbed.tsx b/src/components/dataDisplay/postEmbed/ExternalEmbed.tsx
diff --git a/src/containers/thread/PostThreadContainer.tsx b/src/containers/thread/PostThreadContainer.tsx
diff --git a/src/containers/thread/ThreadActionsContainer.tsx b/src/containers/thread/ThreadActionsContainer.tsx
diff --git a/src/lib/api/bsky/feed/index.ts b/src/lib/api/bsky/feed/index.ts
diff --git a/src/lib/api/bsky/list/index.tsx b/src/lib/api/bsky/list/index.tsx
diff --git a/src/lib/hooks/bsky/feed/useFeedInfo.tsx b/src/lib/hooks/bsky/feed/useFeedInfo.tsx
diff --git a/src/lib/hooks/bsky/list/useListInfo.tsx b/src/lib/hooks/bsky/list/useListInfo.tsx
