Merge branch 'preview'

pdelfan · Dec 17, 2023 · c8ba8f2 · c8ba8f2
2 parents 5f18f1a + 3dcacb6
commit c8ba8f2
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/src/app/dashboard/layout.tsx b/src/app/dashboard/layout.tsx
@@ -25,7 +25,7 @@ export default async function DashboardLayout({
       {profile && <Composer author={profile} />}
       <SidePanel />
       <section className="w-full md:max-w-xl">
-        <TopBar />
+        {profile && <TopBar profile={profile} />}
         {children}
       </section>
       <Aside />

diff --git a/src/components/navigational/topBar/TopBar.tsx b/src/components/navigational/topBar/TopBar.tsx
@@ -1,13 +1,15 @@
-import { getSessionFromServer } from "@/app/api/auth/[...nextauth]/route";
 import SignOut from "@/components/actions/signOut/SignOut";
 import Avatar from "@/components/dataDisplay/avatar/Avatar";
-import { getProfile } from "@/lib/api/bsky/actor";
+import { ProfileViewDetailed } from "@atproto/api/dist/client/types/app/bsky/actor/defs";
 import Image from "next/image";
 import Link from "next/link";
 
-export default async function TopBar() {
-  const session = await getSessionFromServer();
-  const profile = await getProfile(session?.user.bskySession.handle);
+interface Props {
+  profile: ProfileViewDetailed;
+}
+
+export default function TopBar(props: Props) {
+  const { profile } = props;
 
   return (
     <div className="flex justify-between bg-white border-b md:border-b-0 px-3 md:px-0 py-2.5 md:pt-0 sticky md:relative top-0 z-50 lg:hidden">

diff --git a/src/lib/api/bsky/actor/index.ts b/src/lib/api/bsky/actor/index.ts
@@ -19,7 +19,7 @@ export const getProfile = async (
   if (!agent) agent = await getAgent();
   const profile = await agent.getProfile({ actor: handle });
 
-  if (!profile.data) return null;
+  if (!profile.success) throw new Error("Could not get profile");
   return profile.data;
 };
 

diff --git a/src/lib/hooks/bsky/actor/useProfile.tsx b/src/lib/hooks/bsky/actor/useProfile.tsx
@@ -13,8 +13,6 @@ export default function useProfile(handle: string) {
     queryFn: () => getProfile(handle, agent),
   });
 
-  console.log(data)
-
   const updateFollowCount = (mode: "decrease" | "increase") => {
     queryClient.setQueryData(profileKey(handle), (oldData: any) => {
       return {