+3 -9

actions/getIdentityData.ts

··· 1 1 "use server"; 2 2 3 3 import { IdResolver } from "@atproto/identity"; 4 4 - import { createServerClient } from "@supabase/ssr"; 5 4 import { cookies } from "next/headers"; 6 6 - import { Database } from "supabase/database.types"; 5 5 + import { supabaseServerClient } from "supabase/serverClient"; 7 6 8 8 - let supabase = createServerClient<Database>( 9 9 - process.env.NEXT_PUBLIC_SUPABASE_API_URL as string, 10 10 - process.env.SUPABASE_SERVICE_ROLE_KEY as string, 11 11 - { cookies: {} }, 12 12 - ); 13 7 let idResolver = new IdResolver(); 14 8 export async function getIdentityData() { 15 9 let cookieStore = await cookies(); 16 10 let auth_token = cookieStore.get("auth_token")?.value; 17 11 let auth_res = auth_token 18 18 - ? await supabase 12 12 + ? await supabaseServerClient 19 13 .from("email_auth_tokens") 20 14 .select( 21 15 `*, ··· 34 28 if (!auth_res?.data?.identities) return null; 35 29 if (auth_res.data.identities.atp_did) { 36 30 //I should create a relationship table so I can do this in the above query 37 37 - let { data: publications } = await supabase 31 31 + let { data: publications } = await supabaseServerClient 38 32 .from("publications") 39 33 .select("*") 40 34 .eq("identity_did", auth_res.data.identities.atp_did);

+1

app/home/LeafletList.tsx

··· 58 58 <div className="grid auto-rows-max md:grid-cols-4 sm:grid-cols-3 grid-cols-2 gap-y-4 gap-x-4 sm:gap-6 grow pt-3 pb-28 px-2 sm:pt-6 sm:pb-12 sm:pl-6 sm:pr-1"> 59 59 {leaflets.map((leaflet, index) => ( 60 60 <ReplicacheProvider 61 61 + disablePull 61 62 initialFactsOnly={!!identity} 62 63 key={leaflet.id} 63 64 rootEntity={leaflet.root_entity}

+4 -10

app/home/page.tsx

··· 1 1 import { cookies } from "next/headers"; 2 2 import { Fact, ReplicacheProvider } from "src/replicache"; 3 3 - import { createServerClient } from "@supabase/ssr"; 4 4 - import { Database } from "supabase/database.types"; 5 3 import { Attributes } from "src/replicache/attributes"; 6 4 import { 7 5 ThemeBackgroundProvider, ··· 18 16 import { HomeSidebar } from "./HomeSidebar"; 19 17 import { HomeFooter } from "./HomeFooter"; 20 18 import { MyPublicationList } from "./Publications"; 19 19 + import { supabaseServerClient } from "supabase/serverClient"; 21 20 22 22 - let supabase = createServerClient<Database>( 23 23 - process.env.NEXT_PUBLIC_SUPABASE_API_URL as string, 24 24 - process.env.SUPABASE_SERVICE_ROLE_KEY as string, 25 25 - { cookies: {} }, 26 26 - ); 27 21 export default async function Home() { 28 22 let cookieStore = await cookies(); 29 23 ··· 52 46 53 47 let permission_token = auth_res?.home_leaflet; 54 48 if (!permission_token) { 55 55 - let res = await supabase 49 49 + let res = await supabaseServerClient 56 50 .from("identities") 57 51 .select( 58 52 `*, ··· 66 60 67 61 if (!permission_token) return <div>no home page wierdly</div>; 68 62 let [homeLeafletFacts, allLeafletFacts] = await Promise.all([ 69 69 - supabase.rpc("get_facts", { 63 63 + supabaseServerClient.rpc("get_facts", { 70 64 root: permission_token.root_entity, 71 65 }), 72 66 auth_res ··· 76 70 (r) => r.permission_tokens.root_entity, 77 71 ), 78 72 }, 79 79 - { supabase }, 73 73 + { supabase: supabaseServerClient }, 80 74 ) 81 75 : undefined, 82 76 ]);

+2 -6

src/replicache/attributes.ts

··· 1 1 - import { AppBskyFeedGetPostThread } from "@atproto/api"; 2 2 - import { 3 3 - PostView, 4 4 - ThreadViewPost, 5 5 - } from "@atproto/api/dist/client/types/app/bsky/feed/defs"; 6 6 - import { DeepAsReadonlyJSONValue } from "./utils"; 1 1 + import type { AppBskyFeedGetPostThread } from "@atproto/api"; 2 2 + import type { DeepAsReadonlyJSONValue } from "./utils"; 7 3 8 4 const RootAttributes = { 9 5 "root/page": {

+12 -6

src/replicache/index.tsx

··· 24 24 import { UndoManager } from "@rocicorp/undo"; 25 25 import { addShortcut } from "src/shortcuts"; 26 26 import { createUndoManager } from "src/undoManager"; 27 27 + import { RealtimeChannel } from "@supabase/supabase-js"; 27 28 28 29 export type Fact<A extends keyof typeof Attributes> = { 29 30 id: string; ··· 69 70 name: string; 70 71 children: React.ReactNode; 71 72 initialFactsOnly?: boolean; 73 73 + disablePull?: boolean; 72 74 }) { 73 75 let [rep, setRep] = useState<null | Replicache<ReplicacheMutators>>(null); 74 76 let [undoManager] = useState(createUndoManager()); ··· 103 105 if (props.initialFactsOnly) return; 104 106 let supabase = supabaseBrowserClient(); 105 107 let newRep = new Replicache({ 108 108 + pullInterval: props.disablePull ? null : undefined, 106 109 pushDelay: 500, 107 110 mutators: Object.fromEntries( 108 111 Object.keys(mutations).map((m) => { ··· 158 161 }, 159 162 }); 160 163 setRep(newRep); 161 161 - let channel = supabase.channel(`rootEntity:${props.name}`); 164 164 + let channel: RealtimeChannel | null = null; 165 165 + if (!props.disablePull) { 166 166 + channel = supabase.channel(`rootEntity:${props.name}`); 162 167 163 163 - channel.on("broadcast", { event: "poke" }, () => { 164 164 - newRep.pull(); 165 165 - }); 166 166 - channel.subscribe(); 168 168 + channel.on("broadcast", { event: "poke" }, () => { 169 169 + newRep.pull(); 170 170 + }); 171 171 + channel.subscribe(); 172 172 + } 167 173 return () => { 168 174 newRep.close(); 169 175 setRep(null); 170 170 - channel.unsubscribe(); 176 176 + channel?.unsubscribe(); 171 177 }; 172 178 }, [props.name, props.initialFactsOnly, props.token]); 173 179 return (

+1 -1

supabase/serverClient.ts

··· 1 1 import { createClient } from "@supabase/supabase-js"; 2 2 - import { Database } from "supabase/database.types"; 2 2 + import type { Database } from "supabase/database.types"; 3 3 export const supabaseServerClient = createClient<Database>( 4 4 process.env.NEXT_PUBLIC_SUPABASE_API_URL as string, 5 5 process.env.SUPABASE_SERVICE_ROLE_KEY as string,