diff --git a/src/components/PollComponents.tsx b/src/components/PollComponents.tsx index efa392a..09dd764 100644 --- a/src/components/PollComponents.tsx +++ b/src/components/PollComponents.tsx @@ -4,7 +4,7 @@ import * as React from "react"; import { usePollData, - usePollMutationQueue, + //usePollMutationQueue, } from "~/providers/PollMutationQueueProvider"; //import { useAuth } from "~/providers/UnifiedAuthProvider"; import { renderSnack } from "~/routes/__root"; @@ -26,7 +26,8 @@ export function PollEmbed({ embedtryfall?: embedtryfall; }) { //const { agent } = useAuth(); - const { refreshPollData } = usePollMutationQueue(); + //const { refreshPollData } = usePollMutationQueue(); + const refreshPollData: (pollUri?: string | undefined) => void = () => {}; const pollUri = `at://${did}/app.reddwarf.embed.poll/${rkey}`; const { data: pollRecord, isLoading, error } = useQueryArbitrary(pollUri); const dontLoadPolls = embedtryfall && (isLoading || pollRecord === undefined || error !== null) || false diff --git a/src/components/PostEmbeds.tsx b/src/components/PostEmbeds.tsx index 3b8b726..6f13197 100644 --- a/src/components/PostEmbeds.tsx +++ b/src/components/PostEmbeds.tsx @@ -19,7 +19,7 @@ import ReactPlayer from "react-player"; import { FeedItemRenderAturiLoader } from "~/routes/profile.$did"; import type { LightboxProps } from "~/routes/profile.$did/post.$rkey.image.$i"; -import { PollEmbed } from "./PollComponents"; +//import { PollEmbed } from "./PollComponents"; import { UniversalPostRenderer, UniversalPostRendererATURILoader } from "./UniversalPostRenderer"; type Embed = @@ -553,14 +553,14 @@ export function PostEmbeds({ const hasPollLink = pollLinks && Object.keys(pollLinks).length > 0; const isfromappview = referral?.includes("appview") - if ((hasPollLink || isfromappview) && postid) { - // warning: i gave up and warpped it in a div lmao - return ( -
- -
- ); - } + // if (false && ((hasPollLink || isfromappview) && postid)) { + // // warning: i gave up and warpped it in a div lmao + // return ( + //
+ // {/* */} + //
+ // ); + // } const link = embed.external; return ( diff --git a/src/components/UniversalPostRenderer.tsx b/src/components/UniversalPostRenderer.tsx index 29658aa..84ed7e0 100644 --- a/src/components/UniversalPostRenderer.tsx +++ b/src/components/UniversalPostRenderer.tsx @@ -17,8 +17,9 @@ import { useEffect, useState } from "react"; import { FORCE_HIDE_LABELS, FORCE_HIDE_LABELS_WHITELISTED_SOURCE, UNAUTHED_PREVENT_OPENING_WARNS } from "~/../policy"; import defaultpfp from "~/../public/defaultpfp.png"; -import { getGetHydratedLabelDefs, useAutoLabels } from "~/hooks/useAutoLabels"; +import { getGetHydratedLabelDefs } from "~/hooks/useAutoLabels"; import { useLabelInfo } from "~/hooks/useLabelInfo"; +import type { HydratedLabelValueDefinition } from "~/providers/AutoLabelProvider"; //import { useModeration } from "~/hooks/useModeration"; import { useAuth } from "~/providers/UnifiedAuthProvider"; import { renderSnack } from "~/routes/__root"; @@ -850,13 +851,20 @@ export function UniversalPostRenderer({ post.uri, ] - const { - results: labelResults, - hydratedLabelDefs, - } = useAutoLabels({ - subjects, - type: "post", // or whatever you’re keying on for now - }) + // let { + // results: labelResults, + // hydratedLabelDefs, + // } = useAutoLabels({ + // subjects, + // type: "post", // or whatever you’re keying on for now + // }) + + const labelResults = new Map() + + const hydratedLabelDefs = new Map(); const ghld = getGetHydratedLabelDefs(hydratedLabelDefs) const accountResult = labelResults.get(post.author.did) @@ -874,19 +882,19 @@ export function UniversalPostRenderer({ const postLabelVerdict = postResult?.labelVerdict ?? "unknown" const contentLabels = postResult?.labels ?? [] - const combinedLabels = [...authorLabels, ...profileLabels, ...contentLabels] + const combinedLabels: ATPAPI.ComAtprotoLabelDefs.Label[] = [] //[...authorLabels, ...profileLabels, ...contentLabels] - const authorModUnknown = accountLabelVerdict === "unknown"; - const profileModUnknown = profileLabelVerdict === "unknown"; - const contentModUnknown = postLabelVerdict === "unknown"; + const authorModUnknown = false //accountLabelVerdict === "unknown"; + const profileModUnknown = false //profileLabelVerdict === "unknown"; + const contentModUnknown = false //postLabelVerdict === "unknown"; - const authorModLoading = accountLabelVerdict === "loading"; - const profileModLoading = profileLabelVerdict === "loading"; - const contentModLoading = postLabelVerdict === "loading"; + const authorModLoading = false //accountLabelVerdict === "loading"; + const profileModLoading = false //profileLabelVerdict === "loading"; + const contentModLoading = false //postLabelVerdict === "loading"; - const authorModError = accountLabelVerdict === "error"; - const profileModError = profileLabelVerdict === "error"; - const contentModError = postLabelVerdict === "error"; + const authorModError = false //accountLabelVerdict === "error"; + const profileModError = false //profileLabelVerdict === "error"; + const contentModError = false //postLabelVerdict === "error"; const verdictDebugString = `accountLabelVerdict: ${accountLabelVerdict}, profileLabelVerdict: ${profileLabelVerdict}, postLabelVerdict: ${postLabelVerdict}` //const verdictDebugStringCauses = diff --git a/src/routes/__root.tsx b/src/routes/__root.tsx index 54f26a2..54c0d30 100644 --- a/src/routes/__root.tsx +++ b/src/routes/__root.tsx @@ -2,6 +2,8 @@ // dont forget to run this // npx @tanstack/router-cli generate +import type { $Typed } from "@atproto/api"; +import type { SavedFeedsPrefV2 } from "@atproto/api/dist/client/types/app/bsky/actor/defs"; import type { QueryClient } from "@tanstack/react-query"; import { createRootRouteWithContext, @@ -28,9 +30,9 @@ import Logo from "~/components/LogoSvg"; //import { ModerationBatcher } from "~/components/ModerationBatcher"; //import { ModerationInitializer } from "~/components/ModerationInitializer"; import { NotFound } from "~/components/NotFound"; -import { AutoLabelProvider } from "~/providers/AutoLabelProvider"; +//import { AutoLabelProvider } from "~/providers/AutoLabelProvider"; import { LikeMutationQueueProvider } from "~/providers/LikeMutationQueueProvider"; -import { PollMutationQueueProvider } from "~/providers/PollMutationQueueProvider"; +//import { PollMutationQueueProvider } from "~/providers/PollMutationQueueProvider"; import { UnifiedAuthProvider, useAuth } from "~/providers/UnifiedAuthProvider"; import { FeedTabOnTop } from "~/routes/index"; import { composerAtom, hueAtom, imgCDNAtom, quickAuthAtom, useAtomCssVar } from "~/utils/atoms"; @@ -90,10 +92,10 @@ export const Route = createRootRouteWithContext<{ function RootComponent() { return ( - + {/* */} - - {/* + {/* + */} @@ -101,9 +103,9 @@ function RootComponent() { - + {/* */} - + {/* */} ); } @@ -1172,9 +1174,11 @@ function FeedListDesktopSidebar() { const prefs = prefsresultmaybe?.data; const savedFeeds = React.useMemo(() => { - const savedFeedsPref = prefs?.preferences?.find( - (p: any) => p?.$type === "app.bsky.actor.defs#savedFeedsPrefV2", + const savedFeedsPref = prefs?.preferences?.find( + (p): p is $Typed => + p?.$type === "app.bsky.actor.defs#savedFeedsPrefV2" ); + return savedFeedsPref?.items || []; }, [prefs]);