+1 -1

README.md

··· 8 8 ## running dev and build 9 9 in the `vite.config.ts` file you should change these values 10 10 ```ts 11 11 - const PROD_URL = "https://reddwarf.whey.party" 11 11 + const PROD_URL = "https://reddwarf.app" 12 12 const DEV_URL = "https://local3768forumtest.whey.party" 13 13 ``` 14 14 the PROD_URL is what will compile your oauth client metadata so it is very important to change that. same for DEV_URL if you are using a tunnel for dev work

+3

package-lock.json

··· 8 8 "dependencies": { 9 9 "@atproto/api": "^0.16.6", 10 10 "@atproto/oauth-client-browser": "^0.3.33", 11 11 + "@radix-ui/react-dialog": "^1.1.15", 11 12 "@radix-ui/react-dropdown-menu": "^2.1.16", 13 13 + "@radix-ui/react-hover-card": "^1.1.15", 12 14 "@radix-ui/react-slider": "^1.3.6", 13 15 "@tailwindcss/vite": "^4.0.6", 14 16 "@tanstack/query-sync-storage-persister": "^5.85.6", ··· 2401 2403 "version": "1.1.15", 2402 2404 "resolved": "https://registry.npmjs.org/@radix-ui/react-hover-card/-/react-hover-card-1.1.15.tgz", 2403 2405 "integrity": "sha512-qgTkjNT1CfKMoP0rcasmlH2r1DAiYicWsDsufxl940sT2wHNEWWv6FMWIQXWhVdmC1d/HYfbhQx60KYyAtKxjg==", 2406 2406 + "license": "MIT", 2404 2407 "dependencies": { 2405 2408 "@radix-ui/primitive": "1.1.3", 2406 2409 "@radix-ui/react-compose-refs": "1.1.2",

+2

package.json

··· 12 12 "dependencies": { 13 13 "@atproto/api": "^0.16.6", 14 14 "@atproto/oauth-client-browser": "^0.3.33", 15 15 + "@radix-ui/react-dialog": "^1.1.15", 15 16 "@radix-ui/react-dropdown-menu": "^2.1.16", 17 17 + "@radix-ui/react-hover-card": "^1.1.15", 16 18 "@radix-ui/react-slider": "^1.3.6", 17 19 "@tailwindcss/vite": "^4.0.6", 18 20 "@tanstack/query-sync-storage-persister": "^5.85.6",

+205 -112

src/components/Composer.tsx

··· 1 1 - import { RichText } from "@atproto/api"; 1 1 + import { AppBskyRichtextFacet, RichText } from "@atproto/api"; 2 2 import { useAtom } from "jotai"; 3 3 + import { Dialog } from "radix-ui"; 3 4 import { useEffect, useRef, useState } from "react"; 4 5 5 6 import { useAuth } from "~/providers/UnifiedAuthProvider"; ··· 7 8 import { useQueryPost } from "~/utils/useQuery"; 8 9 9 10 import { ProfileThing } from "./Login"; 11 11 + import { Button } from "./radix-m3-rd/Button"; 10 12 import { UniversalPostRendererATURILoader } from "./UniversalPostRenderer"; 11 13 12 12 - const MAX_POST_LENGTH = 300 14 14 + const MAX_POST_LENGTH = 300; 13 15 14 16 export function Composer() { 15 17 const [composerState, setComposerState] = useAtom(composerAtom); 18 18 + const [closeConfirmState, setCloseConfirmState] = useState<boolean>(false); 16 19 const { agent } = useAuth(); 17 20 18 21 const [postText, setPostText] = useState(""); ··· 31 34 composerState.kind === "reply" 32 35 ? composerState.parent 33 36 : composerState.kind === "quote" 34 34 - ? composerState.subject 35 35 - : undefined; 37 37 + ? composerState.subject 38 38 + : undefined; 36 39 37 37 - const { data: parentPost, isLoading: isParentLoading } = useQueryPost(parentUri); 40 40 + const { data: parentPost, isLoading: isParentLoading } = 41 41 + useQueryPost(parentUri); 38 42 39 43 async function handlePost() { 40 44 if (!agent || !postText.trim() || postText.length > MAX_POST_LENGTH) return; ··· 46 50 const rt = new RichText({ text: postText }); 47 51 await rt.detectFacets(agent); 48 52 53 53 + if (rt.facets?.length) { 54 54 + rt.facets = rt.facets.filter((item) => { 55 55 + if (item.$type !== "app.bsky.richtext.facet") return true; 56 56 + if (!item.features?.length) return true; 57 57 + 58 58 + item.features = item.features.filter((feature) => { 59 59 + if (feature.$type !== "app.bsky.richtext.facet#mention") return true; 60 60 + const did = feature.$type === "app.bsky.richtext.facet#mention" ? (feature as AppBskyRichtextFacet.Mention)?.did : undefined; 61 61 + return typeof did === "string" && did.startsWith("did:"); 62 62 + }); 63 63 + 64 64 + return item.features.length > 0; 65 65 + }); 66 66 + } 67 67 + 49 68 const record: Record<string, unknown> = { 50 69 $type: "app.bsky.feed.post", 51 70 text: rt.text, ··· 96 115 } 97 116 } 98 117 99 99 - if (composerState.kind === "closed") { 100 100 - return null; 101 101 - } 102 102 - 103 118 const getPlaceholder = () => { 104 119 switch (composerState.kind) { 105 120 case "reply": ··· 111 126 return "What's happening?!"; 112 127 } 113 128 }; 114 114 - 129 129 + 115 130 const charsLeft = MAX_POST_LENGTH - postText.length; 116 131 const isPostButtonDisabled = 117 117 - posting || 118 118 - !postText.trim() || 119 119 - isParentLoading || 120 120 - charsLeft < 0; 132 132 + posting || !postText.trim() || isParentLoading || charsLeft < 0; 133 133 + 134 134 + function handleAttemptClose() { 135 135 + if (postText.trim() && !posting) { 136 136 + setCloseConfirmState(true); 137 137 + } else { 138 138 + setComposerState({ kind: "closed" }); 139 139 + } 140 140 + } 141 141 + 142 142 + function handleConfirmClose() { 143 143 + setComposerState({ kind: "closed" }); 144 144 + setCloseConfirmState(false); 145 145 + setPostText(""); 146 146 + } 121 147 122 148 return ( 123 123 - <div className="fixed inset-0 z-50 flex items-start justify-center pt-10 sm:pt-20 bg-black/40 dark:bg-black/50"> 124 124 - <div className="bg-gray-50 dark:bg-gray-950 border border-gray-200 dark:border-gray-700 rounded-2xl shadow-xl w-full max-w-xl relative mx-4"> 125 125 - <div className="flex flex-row justify-between p-2"> 126 126 - <button 127 127 - className="h-8 w-8 flex items-center justify-center rounded-full text-gray-600 dark:text-gray-300 hover:bg-gray-100 dark:hover:bg-gray-800" 128 128 - onClick={() => !posting && setComposerState({ kind: "closed" })} 129 129 - disabled={posting} 130 130 - aria-label="Close" 131 131 - > 132 132 - <svg 133 133 - xmlns="http://www.w3.org/2000/svg" 134 134 - width="20" 135 135 - height="20" 136 136 - viewBox="0 0 24 24" 137 137 - fill="none" 138 138 - stroke="currentColor" 139 139 - strokeWidth="2.5" 140 140 - strokeLinecap="round" 141 141 - strokeLinejoin="round" 142 142 - > 143 143 - <line x1="18" y1="6" x2="6" y2="18"></line> 144 144 - <line x1="6" y1="6" x2="18" y2="18"></line> 145 145 - </svg> 146 146 - </button> 147 147 - <div className="flex-1" /> 148 148 - <div className="flex items-center gap-4"> 149 149 - <span className={`text-sm ${charsLeft < 0 ? 'text-red-500' : 'text-gray-500'}`}> 150 150 - {charsLeft} 151 151 - </span> 152 152 - 153 153 - <button 154 154 - className="bg-gray-600 hover:bg-gray-700 text-white font-bold py-1 px-4 rounded-full disabled:opacity-50 disabled:cursor-not-allowed transition-colors" 155 155 - onClick={handlePost} 156 156 - disabled={isPostButtonDisabled} 157 157 - > 158 158 - {posting ? "Posting..." : "Post"} 159 159 - </button> 160 160 - </div> 161 161 - </div> 149 149 + <> 150 150 + <Dialog.Root 151 151 + open={composerState.kind !== "closed"} 152 152 + onOpenChange={(open) => { 153 153 + if (!open) handleAttemptClose(); 154 154 + }} 155 155 + > 156 156 + <Dialog.Portal> 157 157 + <Dialog.Overlay className="disablegutter fixed inset-0 z-50 bg-black/40 dark:bg-black/50 data-[state=open]:animate-fadeIn" /> 158 158 + 159 159 + <Dialog.Content className="fixed overflow-y-auto gutter inset-0 z-50 flex items-start justify-center pt-10 sm:pt-20 pb-[50dvh] sm:pb-[50dvh]"> 160 160 + <div className="bg-gray-50 dark:bg-gray-950 border border-gray-200 dark:border-gray-700 rounded-2xl shadow-xl w-full max-w-xl relative mx-4"> 161 161 + <div className="flex flex-row justify-between p-2"> 162 162 + <Dialog.Close asChild> 163 163 + <button 164 164 + className="h-8 w-8 flex items-center justify-center rounded-full text-gray-600 dark:text-gray-300 hover:bg-gray-100 dark:hover:bg-gray-800" 165 165 + disabled={posting} 166 166 + aria-label="Close" 167 167 + onClick={handleAttemptClose} 168 168 + > 169 169 + <svg 170 170 + xmlns="http://www.w3.org/2000/svg" 171 171 + width="20" 172 172 + height="20" 173 173 + viewBox="0 0 24 24" 174 174 + fill="none" 175 175 + stroke="currentColor" 176 176 + strokeWidth="2.5" 177 177 + strokeLinecap="round" 178 178 + strokeLinejoin="round" 179 179 + > 180 180 + <line x1="18" y1="6" x2="6" y2="18"></line> 181 181 + <line x1="6" y1="6" x2="18" y2="18"></line> 182 182 + </svg> 183 183 + </button> 184 184 + </Dialog.Close> 185 185 + 186 186 + <div className="flex-1" /> 187 187 + <div className="flex items-center gap-4"> 188 188 + <span 189 189 + className={`text-sm ${charsLeft < 0 ? "text-red-500" : "text-gray-500"}`} 190 190 + > 191 191 + {charsLeft} 192 192 + </span> 193 193 + <Button 194 194 + onClick={handlePost} 195 195 + disabled={isPostButtonDisabled} 196 196 + > 197 197 + {posting ? "Posting..." : "Post"} 198 198 + </Button> 199 199 + </div> 200 200 + </div> 201 201 + 202 202 + {postSuccess ? ( 203 203 + <div className="flex flex-col items-center justify-center py-16"> 204 204 + <span className="text-gray-500 text-6xl mb-4">✓</span> 205 205 + <span className="text-xl font-bold text-black dark:text-white"> 206 206 + Posted! 207 207 + </span> 208 208 + </div> 209 209 + ) : ( 210 210 + <div className="px-4"> 211 211 + {composerState.kind === "reply" && ( 212 212 + <div className="mb-1 -mx-4"> 213 213 + {isParentLoading ? ( 214 214 + <div className="text-sm text-gray-500 animate-pulse"> 215 215 + Loading parent post... 216 216 + </div> 217 217 + ) : parentUri ? ( 218 218 + <UniversalPostRendererATURILoader 219 219 + atUri={parentUri} 220 220 + bottomReplyLine 221 221 + bottomBorder={false} 222 222 + /> 223 223 + ) : ( 224 224 + <div className="text-sm text-red-500 rounded-lg border border-red-500/50 p-3"> 225 225 + Could not load parent post. 226 226 + </div> 227 227 + )} 228 228 + </div> 229 229 + )} 162 230 163 163 - {postSuccess ? ( 164 164 - <div className="flex flex-col items-center justify-center py-16"> 165 165 - <span className="text-gray-500 text-6xl mb-4">✓</span> 166 166 - <span className="text-xl font-bold text-black dark:text-white">Posted!</span> 167 167 - </div> 168 168 - ) : ( 169 169 - <div className="px-4"> 170 170 - {(composerState.kind === "reply") && ( 171 171 - <div className="mb-1 -mx-4"> 172 172 - {isParentLoading ? ( 173 173 - <div className="text-sm text-gray-500 animate-pulse"> 174 174 - Loading parent post... 231 231 + <div className="flex w-full gap-1 flex-col"> 232 232 + <ProfileThing agent={agent} large /> 233 233 + <div className="flex pl-[50px]"> 234 234 + <AutoGrowTextarea 235 235 + className="w-full text-lg bg-transparent focus:outline-none resize-none placeholder:text-gray-500 text-black dark:text-white pb-2" 236 236 + rows={5} 237 237 + placeholder={getPlaceholder()} 238 238 + value={postText} 239 239 + onChange={(e) => setPostText(e.target.value)} 240 240 + disabled={posting} 241 241 + autoFocus 242 242 + /> 243 243 + </div> 175 244 </div> 176 176 - ) : parentUri ? ( 177 177 - <UniversalPostRendererATURILoader atUri={parentUri} bottomReplyLine bottomBorder={false} /> 178 178 - ) : ( 179 179 - <div className="text-sm text-red-500 rounded-lg border border-red-500/50 p-3"> 180 180 - Could not load parent post. 181 181 - </div> 182 182 - )} 245 245 + 246 246 + {composerState.kind === "quote" && ( 247 247 + <div className="mb-4 ml-[50px] rounded-lg border border-gray-200 dark:border-gray-700 overflow-hidden"> 248 248 + {isParentLoading ? ( 249 249 + <div className="text-sm text-gray-500 animate-pulse"> 250 250 + Loading parent post... 251 251 + </div> 252 252 + ) : parentUri ? ( 253 253 + <UniversalPostRendererATURILoader 254 254 + atUri={parentUri} 255 255 + isQuote 256 256 + /> 257 257 + ) : ( 258 258 + <div className="text-sm text-red-500 rounded-lg border border-red-500/50 p-3"> 259 259 + Could not load parent post. 260 260 + </div> 261 261 + )} 262 262 + </div> 263 263 + )} 264 264 + 265 265 + {postError && ( 266 266 + <div className="text-red-500 text-sm my-2 text-center"> 267 267 + {postError} 268 268 + </div> 269 269 + )} 270 270 + </div> 271 271 + )} 272 272 + </div> 273 273 + </Dialog.Content> 274 274 + </Dialog.Portal> 275 275 + </Dialog.Root> 276 276 + 277 277 + {/* Close confirmation dialog */} 278 278 + <Dialog.Root open={closeConfirmState} onOpenChange={setCloseConfirmState}> 279 279 + <Dialog.Portal> 280 280 + 281 281 + <Dialog.Overlay className="disablegutter fixed inset-0 z-50 bg-black/40 dark:bg-black/50 data-[state=open]:animate-fadeIn" /> 282 282 + 283 283 + <Dialog.Content className="fixed gutter inset-0 z-50 flex items-start justify-center pt-30 sm:pt-40"> 284 284 + <div className="bg-gray-50 dark:bg-gray-950 border border-gray-200 dark:border-gray-700 rounded-2xl shadow-xl w-full max-w-md relative mx-4 py-6"> 285 285 + <div className="text-xl mb-4 text-center"> 286 286 + Discard your post? 183 287 </div> 184 184 - )} 185 185 - 186 186 - <div className="flex w-full gap-1 flex-col"> 187 187 - <ProfileThing agent={agent} large/> 188 188 - <div className="flex pl-[50px]"> 189 189 - <AutoGrowTextarea 190 190 - className="w-full text-lg bg-transparent focus:outline-none resize-none placeholder:text-gray-500 text-black dark:text-white pb-2" 191 191 - rows={5} 192 192 - placeholder={getPlaceholder()} 193 193 - value={postText} 194 194 - onChange={(e) => setPostText(e.target.value)} 195 195 - disabled={posting} 196 196 - autoFocus 197 197 - /> 288 288 + <div className="text-md mb-4 text-center"> 289 289 + You will lose your draft 290 290 + </div> 291 291 + <div className="flex justify-end gap-2 px-6"> 292 292 + <Button 293 293 + onClick={handleConfirmClose} 294 294 + > 295 295 + Discard 296 296 + </Button> 297 297 + <Button 298 298 + variant={"outlined"} 299 299 + onClick={() => setCloseConfirmState(false)} 300 300 + > 301 301 + Cancel 302 302 + </Button> 198 303 </div> 199 304 </div> 200 200 - {(composerState.kind === "quote") && ( 201 201 - <div className="mb-4 ml-[50px] rounded-lg border border-gray-200 dark:border-gray-700 overflow-hidden"> 202 202 - {isParentLoading ? ( 203 203 - <div className="text-sm text-gray-500 animate-pulse"> 204 204 - Loading parent post... 205 205 - </div> 206 206 - ) : parentUri ? ( 207 207 - <UniversalPostRendererATURILoader atUri={parentUri} isQuote /> 208 208 - ) : ( 209 209 - <div className="text-sm text-red-500 rounded-lg border border-red-500/50 p-3"> 210 210 - Could not load parent post. 211 211 - </div> 212 212 - )} 213 213 - </div> 214 214 - )} 215 215 - 216 216 - {postError && ( 217 217 - <div className="text-red-500 text-sm my-2 text-center">{postError}</div> 218 218 - )} 219 219 - 220 220 - </div> 221 221 - )} 222 222 - </div> 223 223 - </div> 305 305 + </Dialog.Content> 306 306 + </Dialog.Portal> 307 307 + </Dialog.Root> 308 308 + </> 224 309 ); 225 310 } 226 311 227 227 - function AutoGrowTextarea({ value, className, onChange, ...props }: React.DetailedHTMLProps<React.TextareaHTMLAttributes<HTMLTextAreaElement>, HTMLTextAreaElement>) { 312 312 + function AutoGrowTextarea({ 313 313 + value, 314 314 + className, 315 315 + onChange, 316 316 + ...props 317 317 + }: React.DetailedHTMLProps< 318 318 + React.TextareaHTMLAttributes<HTMLTextAreaElement>, 319 319 + HTMLTextAreaElement 320 320 + >) { 228 321 const ref = useRef<HTMLTextAreaElement>(null); 229 322 230 323 useEffect(() => { ··· 243 336 {...props} 244 337 /> 245 338 ); 246 246 - } 339 339 + }

+150

src/components/Import.tsx

··· 1 1 + import { AtUri } from "@atproto/api"; 2 2 + import { useNavigate, type UseNavigateResult } from "@tanstack/react-router"; 3 3 + import { useState } from "react"; 4 4 + 5 5 + /** 6 6 + * Basically the best equivalent to Search that i can do 7 7 + */ 8 8 + export function Import() { 9 9 + const [textInput, setTextInput] = useState<string | undefined>(); 10 10 + const navigate = useNavigate(); 11 11 + 12 12 + const handleEnter = () => { 13 13 + if (!textInput) return; 14 14 + handleImport({ 15 15 + text: textInput, 16 16 + navigate, 17 17 + }); 18 18 + }; 19 19 + 20 20 + return ( 21 21 + <div className="w-full relative"> 22 22 + <IconMaterialSymbolsSearch className="w-5 h-5 absolute left-4 top-1/2 -translate-y-1/2 text-gray-400 dark:text-gray-500" /> 23 23 + 24 24 + <input 25 25 + type="text" 26 26 + placeholder="Import..." 27 27 + value={textInput} 28 28 + onChange={(e) => setTextInput(e.target.value)} 29 29 + onKeyDown={(e) => { 30 30 + if (e.key === "Enter") handleEnter(); 31 31 + }} 32 32 + className="w-full h-12 pl-12 pr-4 rounded-full bg-gray-100 dark:bg-gray-800 text-gray-800 dark:text-gray-200 placeholder-gray-400 dark:placeholder-gray-500 focus:outline-none focus:ring-2 focus:ring-gray-400 dark:focus:ring-gray-500 box-border transition" 33 33 + /> 34 34 + </div> 35 35 + ); 36 36 + } 37 37 + 38 38 + function handleImport({ 39 39 + text, 40 40 + navigate, 41 41 + }: { 42 42 + text: string; 43 43 + navigate: UseNavigateResult<string>; 44 44 + }) { 45 45 + const trimmed = text.trim(); 46 46 + // parse text 47 47 + /** 48 48 + * text might be 49 49 + * 1. bsky dot app url (reddwarf link segments might be uri encoded,) 50 50 + * 2. aturi 51 51 + * 3. plain handle 52 52 + * 4. plain did 53 53 + */ 54 54 + 55 55 + // 1. Check if it’s a URL 56 56 + try { 57 57 + const url = new URL(text); 58 58 + const knownHosts = [ 59 59 + "bsky.app", 60 60 + "social.daniela.lol", 61 61 + "deer.social", 62 62 + "reddwarf.whey.party", 63 63 + "reddwarf.app", 64 64 + "main.bsky.dev", 65 65 + "catsky.social", 66 66 + "blacksky.community", 67 67 + "red-dwarf-social-app.whey.party", 68 68 + "zeppelin.social", 69 69 + ]; 70 70 + if (knownHosts.includes(url.hostname)) { 71 71 + // parse path to get URI or handle 72 72 + const path = decodeURIComponent(url.pathname.slice(1)); // remove leading / 73 73 + console.log("BSky URL path:", path); 74 74 + navigate({ 75 75 + to: `/${path}`, 76 76 + }); 77 77 + return; 78 78 + } 79 79 + } catch { 80 80 + // not a URL, continue 81 81 + } 82 82 + 83 83 + // 2. Check if text looks like an at-uri 84 84 + try { 85 85 + if (text.startsWith("at://")) { 86 86 + console.log("AT URI detected:", text); 87 87 + const aturi = new AtUri(text); 88 88 + switch (aturi.collection) { 89 89 + case "app.bsky.feed.post": { 90 90 + navigate({ 91 91 + to: "/profile/$did/post/$rkey", 92 92 + params: { 93 93 + did: aturi.host, 94 94 + rkey: aturi.rkey, 95 95 + }, 96 96 + }); 97 97 + return; 98 98 + } 99 99 + case "app.bsky.actor.profile": { 100 100 + navigate({ 101 101 + to: "/profile/$did", 102 102 + params: { 103 103 + did: aturi.host, 104 104 + }, 105 105 + }); 106 106 + return; 107 107 + } 108 108 + // todo add more handlers as more routes are added. like feeds, lists, etc etc thanks! 109 109 + default: { 110 110 + // continue 111 111 + } 112 112 + } 113 113 + } 114 114 + } catch { 115 115 + // continue 116 116 + } 117 117 + 118 118 + // 3. Plain handle (starts with @) 119 119 + try { 120 120 + if (text.startsWith("@")) { 121 121 + const handle = text.slice(1); 122 122 + console.log("Handle detected:", handle); 123 123 + navigate({ to: "/profile/$did", params: { did: handle } }); 124 124 + return; 125 125 + } 126 126 + } catch { 127 127 + // continue 128 128 + } 129 129 + 130 130 + // 4. Plain DID (starts with did:) 131 131 + try { 132 132 + if (text.startsWith("did:")) { 133 133 + console.log("did detected:", text); 134 134 + navigate({ to: "/profile/$did", params: { did: text } }); 135 135 + return; 136 136 + } 137 137 + } catch { 138 138 + // continue 139 139 + } 140 140 + 141 141 + // if all else fails 142 142 + 143 143 + // try { 144 144 + // // probably a user? 145 145 + // navigate({ to: "/profile/$did", params: { did: text } }); 146 146 + // return; 147 147 + // } catch { 148 148 + // // continue 149 149 + // } 150 150 + }

+32 -6

src/components/InfiniteCustomFeed.tsx

··· 1 1 + import { useQueryClient } from "@tanstack/react-query"; 1 2 import * as React from "react"; 2 3 3 4 //import { useInView } from "react-intersection-observer"; ··· 37 38 isFetchingNextPage, 38 39 refetch, 39 40 isRefetching, 41 41 + queryKey, 40 42 } = useInfiniteQueryFeedSkeleton({ 41 43 feedUri: feedUri, 42 44 agent: agent ?? undefined, ··· 44 46 pdsUrl: pdsUrl, 45 47 feedServiceDid: feedServiceDid, 46 48 }); 49 49 + const queryClient = useQueryClient(); 50 50 + 47 51 48 52 const handleRefresh = () => { 53 53 + queryClient.removeQueries({queryKey: queryKey}); 54 54 + //queryClient.invalidateQueries(["infinite-feed", feedUri] as const); 49 55 refetch(); 50 56 }; 51 57 58 58 + const allPosts = React.useMemo(() => { 59 59 + const flattenedPosts = data?.pages.flatMap((page) => page?.feed) ?? []; 60 60 + 61 61 + const seenUris = new Set<string>(); 62 62 + 63 63 + return flattenedPosts.filter((item) => { 64 64 + if (!item?.post) return false; 65 65 + 66 66 + if (seenUris.has(item.post)) { 67 67 + return false; 68 68 + } 69 69 + 70 70 + seenUris.add(item.post); 71 71 + 72 72 + return true; 73 73 + }); 74 74 + }, [data]); 75 75 + 52 76 //const { ref, inView } = useInView(); 53 77 54 78 // React.useEffect(() => { ··· 67 91 ); 68 92 } 69 93 70 70 - const allPosts = 71 71 - data?.pages.flatMap((page) => { 72 72 - if (page) return page.feed; 73 73 - }) ?? []; 94 94 + // const allPosts = 95 95 + // data?.pages.flatMap((page) => { 96 96 + // if (page) return page.feed; 97 97 + // }) ?? []; 74 98 75 99 if (!allPosts || typeof allPosts !== "object" || allPosts.length === 0) { 76 100 return ( ··· 116 140 className="sticky lg:bottom-4 bottom-22 ml-4 w-[42px] h-[42px] z-10 bg-gray-200 dark:bg-gray-800 hover:bg-gray-300 dark:hover:bg-gray-700 text-gray-50 p-[9px] rounded-full shadow-lg transition-transform duration-200 ease-in-out hover:scale-110 disabled:dark:bg-gray-900 disabled:bg-gray-100 disabled:cursor-not-allowed" 117 141 aria-label="Refresh feed" 118 142 > 119 119 - <RefreshIcon className={`h-6 w-6 text-gray-600 dark:text-gray-400 ${isRefetching && "animate-spin"}`} /> 143 143 + <RefreshIcon 144 144 + className={`h-6 w-6 text-gray-600 dark:text-gray-400 ${isRefetching && "animate-spin"}`} 145 145 + /> 120 146 </button> 121 147 </> 122 148 ); ··· 139 165 d="M20 11A8.1 8.1 0 0 0 4.5 9M4 5v4h4m-4 4a8.1 8.1 0 0 0 15.5 2m.5 4v-4h-4" 140 166 ></path> 141 167 </svg> 142 142 - ); 168 168 + );

+11 -10

src/components/Login.tsx

··· 7 7 import { imgCDNAtom } from "~/utils/atoms"; 8 8 import { useQueryIdentity, useQueryProfile } from "~/utils/useQuery"; 9 9 10 10 + import { Button } from "./radix-m3-rd/Button"; 11 11 + 10 12 // --- 1. The Main Component (Orchestrator with `compact` prop) --- 11 13 export default function Login({ 12 14 compact = false, ··· 24 26 className={ 25 27 compact 26 28 ? "flex items-center justify-center p-1" 27 27 - : "p-6 bg-gray-100 dark:bg-gray-900 rounded-xl shadow border border-gray-200 dark:border-gray-800 mt-6 mx-4 flex justify-center items-center h-[280px]" 29 29 + : "p-6 bg-gray-100 dark:bg-gray-900 rounded-xl shadow border border-gray-200 dark:border-gray-800 mt-4 mx-4 flex justify-center items-center h-[280px]" 28 30 } 29 31 > 30 32 <span ··· 43 45 // Large view 44 46 if (!compact) { 45 47 return ( 46 46 - <div className="p-4 bg-gray-100 dark:bg-gray-900 rounded-xl border-gray-200 dark:border-gray-800 mt-6 mx-4"> 48 48 + <div className="p-4 bg-gray-100 dark:bg-gray-900 rounded-xl border-gray-200 dark:border-gray-800 mt-4 mx-4"> 47 49 <div className="flex flex-col items-center justify-center text-center"> 48 50 <p className="text-lg font-semibold mb-4 text-gray-800 dark:text-gray-100"> 49 51 You are logged in! 50 52 </p> 51 53 <ProfileThing agent={agent} large /> 52 52 - <button 54 54 + <Button 53 55 onClick={logout} 54 54 - className="bg-gray-600 mt-4 hover:bg-gray-700 text-white rounded-full px-6 py-2 font-semibold text-base transition-colors" 56 56 + className="mt-4" 55 57 > 56 58 Log out 57 57 - </button> 59 59 + </Button> 58 60 </div> 59 61 </div> 60 62 ); ··· 77 79 if (!compact) { 78 80 // Large view renders the form directly in the card 79 81 return ( 80 80 - <div className="p-4 bg-gray-100 dark:bg-gray-900 rounded-xl border-gray-200 dark:border-gray-800 mt-6 mx-4"> 82 82 + <div className="p-4 bg-gray-100 dark:bg-gray-900 rounded-xl border-gray-200 dark:border-gray-800 mt-4 mx-4"> 81 83 <UnifiedLoginForm /> 82 84 </div> 83 85 ); ··· 311 313 312 314 // --- Profile Component (now supports a `large` prop for styling) --- 313 315 export const ProfileThing = ({ 314 314 - agent: _unused, 316 316 + agent, 315 317 large = false, 316 318 }: { 317 317 - agent?: Agent | null; 319 319 + agent: Agent | null; 318 320 large?: boolean; 319 321 }) => { 320 320 - const { agent } = useAuth(); 321 321 - const did = ((agent as AtpAgent).session?.did ?? 322 322 + const did = ((agent as AtpAgent)?.session?.did ?? 322 323 (agent as AtpAgent)?.assertDid ?? 323 324 agent?.did) as string | undefined; 324 325 const { data: identity } = useQueryIdentity(did);

+140 -60

src/components/UniversalPostRenderer.tsx

··· 2 2 import DOMPurify from "dompurify"; 3 3 import { useAtom } from "jotai"; 4 4 import { DropdownMenu } from "radix-ui"; 5 5 + import { HoverCard } from "radix-ui"; 5 6 import * as React from "react"; 6 7 import { type SVGProps } from "react"; 7 8 8 8 - import { composerAtom, constellationURLAtom, imgCDNAtom, likedPostsAtom } from "~/utils/atoms"; 9 9 + import { 10 10 + composerAtom, 11 11 + constellationURLAtom, 12 12 + imgCDNAtom, 13 13 + likedPostsAtom, 14 14 + } from "~/utils/atoms"; 9 15 import { useHydratedEmbed } from "~/utils/useHydrated"; 10 16 import { 11 17 useQueryConstellation, ··· 150 156 maxReplies, 151 157 isQuote, 152 158 }: UniversalPostRendererATURILoaderProps) { 159 159 + // todo remove this once tree rendering is implemented, use a prop like isTree 160 160 + const TEMPLINEAR = true; 153 161 // /*mass comment*/ console.log("atUri", atUri); 154 162 //const { get, set } = usePersistentStore(); 155 163 //const [record, setRecord] = React.useState<any>(null); ··· 401 409 // path: ".reply.parent.uri", 402 410 // }); 403 411 404 404 - const [constellationurl] = useAtom(constellationURLAtom) 412 412 + const [constellationurl] = useAtom(constellationURLAtom); 405 413 406 414 const infinitequeryresults = useInfiniteQuery({ 407 415 ...yknowIReallyHateThisButWhateverGuardedConstructConstellationInfiniteQueryLinks( ··· 425 433 426 434 // auto-fetch all pages 427 435 useEffect(() => { 428 428 - if (!maxReplies || isQuote) return; 436 436 + if (!maxReplies || isQuote || TEMPLINEAR) return; 429 437 if ( 430 438 infinitequeryresults.hasNextPage && 431 439 !infinitequeryresults.isFetchingNextPage ··· 433 441 console.log("Fetching the next page..."); 434 442 infinitequeryresults.fetchNextPage(); 435 443 } 436 436 - }, [infinitequeryresults]); 444 444 + }, [TEMPLINEAR, infinitequeryresults, isQuote, maxReplies]); 437 445 438 446 const replyAturis = repliesData 439 447 ? repliesData.pages.flatMap((page) => ··· 510 518 ? true 511 519 : maxReplies && !oldestOpsReplyElseNewestNonOpsReply 512 520 ? false 513 513 - : bottomReplyLine 521 521 + : (maxReplies === 0 && (!replies || (!!replies && replies === 0))) ? false : bottomReplyLine 514 522 } 515 523 topReplyLine={topReplyLine} 516 524 //bottomBorder={maxReplies&&oldestOpsReplyElseNewestNonOpsReply ? false : bottomBorder} ··· 532 540 maxReplies={maxReplies} 533 541 isQuote={isQuote} 534 542 /> 543 543 + <> 544 544 + {(maxReplies && maxReplies === 0 && replies && replies > 0) ? ( 545 545 + <> 546 546 + {/* <div>hello</div> */} 547 547 + <MoreReplies atUri={atUri} /> 548 548 + </> 549 549 + ) : (<></>)} 550 550 + </> 535 551 {!isQuote && oldestOpsReplyElseNewestNonOpsReply && ( 536 552 <> 537 553 {/* <span>hello {maxReplies}</span> */} ··· 556 572 maxReplies && maxReplies > 0 ? maxReplies - 1 : undefined 557 573 } 558 574 /> 559 559 - {maxReplies && maxReplies - 1 === 0 && replies && replies > 0 && ( 560 560 - <MoreReplies atUri={oldestOpsReplyElseNewestNonOpsReply} /> 561 561 - )} 562 575 </> 563 576 )} 564 577 </> ··· 723 736 error: embedError, 724 737 } = useHydratedEmbed(postRecord?.value?.embed, resolved?.did); 725 738 726 726 - const [imgcdn] = useAtom(imgCDNAtom) 739 739 + const [imgcdn] = useAtom(imgCDNAtom); 727 740 728 741 const parsedaturi = new AtUri(aturi); //parseAtUri(aturi); 729 742 743 743 + const fakeprofileviewbasic = React.useMemo<AppBskyActorDefs.ProfileViewBasic>( 744 744 + () => ({ 745 745 + did: resolved?.did || "", 746 746 + handle: resolved?.handle || "", 747 747 + displayName: profileRecord?.value?.displayName || "", 748 748 + avatar: getAvatarUrl(profileRecord, resolved?.did, imgcdn) || "", 749 749 + viewer: undefined, 750 750 + labels: profileRecord?.labels || undefined, 751 751 + verification: undefined, 752 752 + }), 753 753 + [imgcdn, profileRecord, resolved?.did, resolved?.handle] 754 754 + ); 755 755 + 756 756 + const fakeprofileviewdetailed = 757 757 + React.useMemo<AppBskyActorDefs.ProfileViewDetailed>( 758 758 + () => ({ 759 759 + ...fakeprofileviewbasic, 760 760 + $type: "app.bsky.actor.defs#profileViewDetailed", 761 761 + description: profileRecord?.value?.description || undefined, 762 762 + }), 763 763 + [fakeprofileviewbasic, profileRecord?.value?.description] 764 764 + ); 765 765 + 730 766 const fakepost = React.useMemo<AppBskyFeedDefs.PostView>( 731 767 () => ({ 732 768 $type: "app.bsky.feed.defs#postView", 733 769 uri: aturi, 734 770 cid: postRecord?.cid || "", 735 735 - author: { 736 736 - did: resolved?.did || "", 737 737 - handle: resolved?.handle || "", 738 738 - displayName: profileRecord?.value?.displayName || "", 739 739 - avatar: getAvatarUrl(profileRecord, resolved?.did, imgcdn) || "", 740 740 - viewer: undefined, 741 741 - labels: profileRecord?.labels || undefined, 742 742 - verification: undefined, 743 743 - }, 771 771 + author: fakeprofileviewbasic, 744 772 record: postRecord?.value || {}, 745 773 embed: hydratedEmbed ?? undefined, 746 774 replyCount: repliesCount ?? 0, ··· 757 785 postRecord?.cid, 758 786 postRecord?.value, 759 787 postRecord?.labels, 760 760 - resolved?.did, 761 761 - resolved?.handle, 762 762 - profileRecord, 788 788 + fakeprofileviewbasic, 763 789 hydratedEmbed, 764 790 repliesCount, 765 791 repostsCount, 766 792 likesCount, 767 767 - imgcdn 768 793 ] 769 794 ); 770 795 ··· 837 862 } 838 863 }} 839 864 post={fakepost} 865 865 + uprrrsauthor={fakeprofileviewdetailed} 840 866 salt={aturi} 841 867 bottomReplyLine={bottomReplyLine} 842 868 topReplyLine={topReplyLine} ··· 1141 1167 //import Masonry from "@mui/lab/Masonry"; 1142 1168 import { 1143 1169 type $Typed, 1170 1170 + AppBskyActorDefs, 1144 1171 AppBskyEmbedDefs, 1145 1172 AppBskyEmbedExternal, 1146 1173 AppBskyEmbedImages, ··· 1170 1197 1171 1198 import defaultpfp from "~/../public/favicon.png"; 1172 1199 import { useAuth } from "~/providers/UnifiedAuthProvider"; 1200 1200 + import { FollowButton, Mutual } from "~/routes/profile.$did"; 1173 1201 import type { LightboxProps } from "~/routes/profile.$did/post.$rkey.image.$i"; 1174 1202 // import type { OutputSchema } from "@atproto/api/dist/client/types/app/bsky/feed/getFeed"; 1175 1203 // import type { ··· 1278 1306 1279 1307 function UniversalPostRenderer({ 1280 1308 post, 1309 1309 + uprrrsauthor, 1281 1310 //setMainItem, 1282 1311 //isMainItem, 1283 1312 onPostClick, ··· 1302 1331 maxReplies, 1303 1332 }: { 1304 1333 post: PostView; 1334 1334 + uprrrsauthor?: AppBskyActorDefs.ProfileViewDetailed; 1305 1335 // optional for now because i havent ported every use to this yet 1306 1336 // setMainItem?: React.Dispatch< 1307 1337 // React.SetStateAction<AppBskyFeedDefs.FeedViewPost> ··· 1485 1515 className="bg-gray-500 dark:bg-gray-400" 1486 1516 /> 1487 1517 )} 1488 1488 - <div 1489 1489 - style={{ 1490 1490 - position: "absolute", 1491 1491 - //top: isRepost ? "calc(16px + 1rem)" : 16, 1492 1492 - //left: 16, 1493 1493 - zIndex: 1, 1494 1494 - top: isRepost 1495 1495 - ? "calc(16px + 1rem)" 1496 1496 - : isQuote 1497 1497 - ? 12 1498 1498 - : topReplyLine 1499 1499 - ? 8 1500 1500 - : 16, 1501 1501 - left: isQuote ? 12 : 16, 1502 1502 - }} 1503 1503 - onClick={onProfileClick} 1504 1504 - > 1505 1505 - <img 1506 1506 - src={post.author.avatar || defaultpfp} 1507 1507 - alt="avatar" 1508 1508 - // transition={{ 1509 1509 - // type: "spring", 1510 1510 - // stiffness: 260, 1511 1511 - // damping: 20, 1512 1512 - // }} 1513 1513 - style={{ 1514 1514 - borderRadius: "50%", 1515 1515 - marginRight: 12, 1516 1516 - objectFit: "cover", 1517 1517 - //background: theme.border, 1518 1518 - //border: `1px solid ${theme.border}`, 1519 1519 - width: isQuote ? 16 : 42, 1520 1520 - height: isQuote ? 16 : 42, 1521 1521 - }} 1522 1522 - className="border border-gray-300 dark:border-gray-800 bg-gray-300 dark:bg-gray-600" 1523 1523 - /> 1524 1524 - </div> 1518 1518 + <HoverCard.Root> 1519 1519 + <HoverCard.Trigger asChild> 1520 1520 + <div 1521 1521 + className={`absolute`} 1522 1522 + style={{ 1523 1523 + top: isRepost 1524 1524 + ? "calc(16px + 1rem)" 1525 1525 + : isQuote 1526 1526 + ? 12 1527 1527 + : topReplyLine 1528 1528 + ? 8 1529 1529 + : 16, 1530 1530 + left: isQuote ? 12 : 16, 1531 1531 + }} 1532 1532 + onClick={onProfileClick} 1533 1533 + > 1534 1534 + <img 1535 1535 + src={post.author.avatar || defaultpfp} 1536 1536 + alt="avatar" 1537 1537 + className={`rounded-full object-cover border border-gray-300 dark:border-gray-800 bg-gray-300 dark:bg-gray-600`} 1538 1538 + style={{ 1539 1539 + width: isQuote ? 16 : 42, 1540 1540 + height: isQuote ? 16 : 42, 1541 1541 + }} 1542 1542 + /> 1543 1543 + </div> 1544 1544 + </HoverCard.Trigger> 1545 1545 + <HoverCard.Portal> 1546 1546 + <HoverCard.Content 1547 1547 + className="rounded-md p-4 w-72 bg-gray-50 dark:bg-gray-900 shadow-lg border border-gray-300 dark:border-gray-800 animate-slide-fade z-50" 1548 1548 + side={"bottom"} 1549 1549 + sideOffset={5} 1550 1550 + onClick={onProfileClick} 1551 1551 + > 1552 1552 + <div className="flex flex-col gap-2"> 1553 1553 + <div className="flex flex-row"> 1554 1554 + <img 1555 1555 + src={post.author.avatar || defaultpfp} 1556 1556 + alt="avatar" 1557 1557 + className="rounded-full w-[58px] h-[58px] object-cover border border-gray-300 dark:border-gray-800 bg-gray-300 dark:bg-gray-600" 1558 1558 + /> 1559 1559 + <div className=" flex-1 flex flex-row align-middle justify-end"> 1560 1560 + <div className=" flex flex-col justify-start"> 1561 1561 + <FollowButton targetdidorhandle={post.author.did} /> 1562 1562 + </div> 1563 1563 + </div> 1564 1564 + </div> 1565 1565 + <div className="flex flex-col gap-3"> 1566 1566 + <div> 1567 1567 + <div className="text-gray-900 dark:text-gray-100 font-medium text-md"> 1568 1568 + {post.author.displayName || post.author.handle}{" "} 1569 1569 + </div> 1570 1570 + <div className="text-gray-500 dark:text-gray-400 text-md flex flex-row gap-1"> 1571 1571 + <Mutual targetdidorhandle={post.author.did} />@{post.author.handle}{" "} 1572 1572 + </div> 1573 1573 + </div> 1574 1574 + {uprrrsauthor?.description && ( 1575 1575 + <div className="text-gray-700 dark:text-gray-300 text-sm text-left break-words line-clamp-3"> 1576 1576 + {uprrrsauthor.description} 1577 1577 + </div> 1578 1578 + )} 1579 1579 + {/* <div className="flex gap-4"> 1580 1580 + <div className="flex gap-1"> 1581 1581 + <div className="font-medium text-gray-900 dark:text-gray-100"> 1582 1582 + 0 1583 1583 + </div> 1584 1584 + <div className="text-gray-500 dark:text-gray-400"> 1585 1585 + Following 1586 1586 + </div> 1587 1587 + </div> 1588 1588 + <div className="flex gap-1"> 1589 1589 + <div className="font-medium text-gray-900 dark:text-gray-100"> 1590 1590 + 2,900 1591 1591 + </div> 1592 1592 + <div className="text-gray-500 dark:text-gray-400"> 1593 1593 + Followers 1594 1594 + </div> 1595 1595 + </div> 1596 1596 + </div> */} 1597 1597 + </div> 1598 1598 + </div> 1599 1599 + 1600 1600 + {/* <HoverCard.Arrow className="fill-gray-50 dark:fill-gray-900" /> */} 1601 1601 + </HoverCard.Content> 1602 1602 + </HoverCard.Portal> 1603 1603 + </HoverCard.Root> 1604 1604 + 1525 1605 <div style={{ display: "flex", alignItems: "flex-start", zIndex: 2 }}> 1526 1606 <div 1527 1607 style={{ ··· 2577 2657 return { start, end, feature: f.features[0] }; 2578 2658 }); 2579 2659 } 2580 2580 - function renderTextWithFacets({ 2660 2660 + export function renderTextWithFacets({ 2581 2661 text, 2582 2662 facets, 2583 2663 navigate,

+59

src/components/radix-m3-rd/Button.tsx

··· 1 1 + import { Slot } from "@radix-ui/react-slot"; 2 2 + import clsx from "clsx"; 3 3 + import * as React from "react"; 4 4 + 5 5 + export type ButtonVariant = "filled" | "outlined" | "text" | "secondary"; 6 6 + export type ButtonSize = "sm" | "md" | "lg"; 7 7 + 8 8 + const variantClasses: Record<ButtonVariant, string> = { 9 9 + filled: 10 10 + "bg-gray-300 text-gray-900 hover:bg-gray-400 dark:bg-gray-600 dark:text-white dark:hover:bg-gray-500", 11 11 + secondary: 12 12 + "bg-gray-300 text-gray-900 hover:bg-gray-400 dark:bg-gray-600 dark:text-white dark:hover:bg-gray-500", 13 13 + outlined: 14 14 + "border border-gray-800 text-gray-800 hover:bg-gray-100 dark:border-gray-200 dark:text-gray-200 dark:hover:bg-gray-800/10", 15 15 + text: "bg-transparent text-gray-800 hover:bg-gray-100 dark:text-gray-200 dark:hover:bg-gray-800/10", 16 16 + }; 17 17 + 18 18 + const sizeClasses: Record<ButtonSize, string> = { 19 19 + sm: "px-3 py-1.5 text-sm", 20 20 + md: "px-4 py-2 text-base", 21 21 + lg: "px-6 py-3 text-lg", 22 22 + }; 23 23 + 24 24 + export function Button({ 25 25 + variant = "filled", 26 26 + size = "md", 27 27 + asChild = false, 28 28 + ref, 29 29 + className, 30 30 + children, 31 31 + ...props 32 32 + }: { 33 33 + variant?: ButtonVariant; 34 34 + size?: ButtonSize; 35 35 + asChild?: boolean; 36 36 + className?: string; 37 37 + children?: React.ReactNode; 38 38 + ref?: React.Ref<HTMLButtonElement>; 39 39 + } & React.ComponentPropsWithoutRef<"button">) { 40 40 + const Comp = asChild ? Slot : "button"; 41 41 + 42 42 + return ( 43 43 + <Comp 44 44 + ref={ref} 45 45 + className={clsx( 46 46 + //focus:outline-none focus:ring-1 focus:ring-offset-1 focus:ring-gray-500 dark:focus:ring-gray-300 47 47 + "inline-flex items-center justify-center rounded-full transition-colors disabled:opacity-50 disabled:cursor-not-allowed", 48 48 + variantClasses[variant], 49 49 + sizeClasses[size], 50 50 + className 51 51 + )} 52 52 + {...props} 53 53 + > 54 54 + {children} 55 55 + </Comp> 56 56 + ); 57 57 + } 58 58 + 59 59 + Button.displayName = "Button";

+26 -23

src/providers/UnifiedAuthProvider.tsx

··· 1 1 - // src/providers/UnifiedAuthProvider.tsx 2 2 - // Import both Agent and the (soon to be deprecated) AtpAgent 3 1 import { Agent, AtpAgent, type AtpSessionData } from "@atproto/api"; 4 2 import { 5 3 type OAuthSession, ··· 7 5 TokenRefreshError, 8 6 TokenRevokedError, 9 7 } from "@atproto/oauth-client-browser"; 8 8 + import { useAtom } from "jotai"; 10 9 import React, { 11 10 createContext, 12 11 use, ··· 15 14 useState, 16 15 } from "react"; 17 16 18 18 - import { oauthClient } from "../utils/oauthClient"; // Adjust path if needed 17 17 + import { quickAuthAtom } from "~/utils/atoms"; 18 18 + 19 19 + import { oauthClient } from "../utils/oauthClient"; 19 20 20 20 - // Define the unified status and authentication method 21 21 type AuthStatus = "loading" | "signedIn" | "signedOut"; 22 22 type AuthMethod = "password" | "oauth" | null; 23 23 24 24 interface AuthContextValue { 25 25 - agent: Agent | null; // The agent is typed as the base class `Agent` 25 25 + agent: Agent | null; 26 26 status: AuthStatus; 27 27 authMethod: AuthMethod; 28 28 loginWithPassword: ( ··· 41 41 }: { 42 42 children: React.ReactNode; 43 43 }) => { 44 44 - // The state is typed as the base class `Agent`, which accepts both `Agent` and `AtpAgent` instances. 45 44 const [agent, setAgent] = useState<Agent | null>(null); 46 45 const [status, setStatus] = useState<AuthStatus>("loading"); 47 46 const [authMethod, setAuthMethod] = useState<AuthMethod>(null); 48 47 const [oauthSession, setOauthSession] = useState<OAuthSession | null>(null); 48 48 + const [quickAuth, setQuickAuth] = useAtom(quickAuthAtom); 49 49 50 50 - // Unified Initialization Logic 51 50 const initialize = useCallback(async () => { 52 52 - // --- 1. Try OAuth initialization first --- 53 51 try { 54 52 const oauthResult = await oauthClient.init(); 55 53 if (oauthResult) { 56 54 // /*mass comment*/ console.log("OAuth session restored."); 57 57 - const apiAgent = new Agent(oauthResult.session); // Standard Agent 55 55 + const apiAgent = new Agent(oauthResult.session); 58 56 setAgent(apiAgent); 59 57 setOauthSession(oauthResult.session); 60 58 setAuthMethod("oauth"); 61 59 setStatus("signedIn"); 62 62 - return; // Success 60 60 + setQuickAuth(apiAgent?.did || null); 61 61 + return; 63 62 } 64 63 } catch (e) { 65 64 console.error("OAuth init failed, checking password session.", e); 65 65 + if (!quickAuth) { 66 66 + // quickAuth restoration. if last used method is oauth we immediately call for oauth redo 67 67 + // (and set a persistent atom somewhere to not retry again if it failed) 68 68 + } 66 69 } 67 70 68 68 - // --- 2. If no OAuth, try password-based session using AtpAgent --- 69 71 try { 70 72 const service = localStorage.getItem("service"); 71 73 const sessionString = localStorage.getItem("sess"); 72 74 73 75 if (service && sessionString) { 74 76 // /*mass comment*/ console.log("Resuming password-based session using AtpAgent..."); 75 75 - // Use the original, working AtpAgent logic 76 77 const apiAgent = new AtpAgent({ service }); 77 78 const session: AtpSessionData = JSON.parse(sessionString); 78 79 await apiAgent.resumeSession(session); 79 80 80 81 // /*mass comment*/ console.log("Password-based session resumed successfully."); 81 81 - setAgent(apiAgent); // This works because AtpAgent is a subclass of Agent 82 82 + setAgent(apiAgent); 82 83 setAuthMethod("password"); 83 84 setStatus("signedIn"); 84 84 - return; // Success 85 85 + setQuickAuth(apiAgent?.did || null); 86 86 + return; 85 87 } 86 88 } catch (e) { 87 89 console.error("Failed to resume password-based session.", e); ··· 89 91 localStorage.removeItem("service"); 90 92 } 91 93 92 92 - // --- 3. If neither worked, user is signed out --- 93 94 // /*mass comment*/ console.log("No active session found."); 94 95 setStatus("signedOut"); 95 96 setAgent(null); 96 97 setAuthMethod(null); 97 97 - }, []); 98 98 + // do we want to null it here? 99 99 + setQuickAuth(null); 100 100 + }, [quickAuth, setQuickAuth]); 98 101 99 102 useEffect(() => { 100 103 const handleOAuthSessionDeleted = ( ··· 105 108 setOauthSession(null); 106 109 setAuthMethod(null); 107 110 setStatus("signedOut"); 111 111 + setQuickAuth(null); 108 112 }; 109 113 110 114 oauthClient.addEventListener("deleted", handleOAuthSessionDeleted as EventListener); ··· 113 117 return () => { 114 118 oauthClient.removeEventListener("deleted", handleOAuthSessionDeleted as EventListener); 115 119 }; 116 116 - }, [initialize]); 120 120 + }, [initialize, setQuickAuth]); 117 121 118 118 - // --- Login Methods --- 119 122 const loginWithPassword = async ( 120 123 user: string, 121 124 password: string, ··· 125 128 setStatus("loading"); 126 129 try { 127 130 let sessionData: AtpSessionData | undefined; 128 128 - // Use the AtpAgent for its simple login and session persistence 129 131 const apiAgent = new AtpAgent({ 130 132 service, 131 133 persistSession: (_evt, sess) => { ··· 137 139 if (sessionData) { 138 140 localStorage.setItem("service", service); 139 141 localStorage.setItem("sess", JSON.stringify(sessionData)); 140 140 - setAgent(apiAgent); // Store the AtpAgent instance in our state 142 142 + setAgent(apiAgent); 141 143 setAuthMethod("password"); 142 144 setStatus("signedIn"); 145 145 + setQuickAuth(apiAgent?.did || null); 143 146 // /*mass comment*/ console.log("Successfully logged in with password."); 144 147 } else { 145 148 throw new Error("Session data not persisted after login."); ··· 147 150 } catch (e) { 148 151 console.error("Password login failed:", e); 149 152 setStatus("signedOut"); 153 153 + setQuickAuth(null); 150 154 throw e; 151 155 } 152 156 }; ··· 161 165 } 162 166 }, [status]); 163 167 164 164 - // --- Unified Logout --- 165 168 const logout = useCallback(async () => { 166 169 if (status !== "signedIn" || !agent) return; 167 170 setStatus("loading"); ··· 173 176 } else if (authMethod === "password") { 174 177 localStorage.removeItem("service"); 175 178 localStorage.removeItem("sess"); 176 176 - // AtpAgent has its own logout methods 177 179 await (agent as AtpAgent).com.atproto.server.deleteSession(); 178 180 // /*mass comment*/ console.log("Password-based session deleted."); 179 181 } ··· 184 186 setAuthMethod(null); 185 187 setOauthSession(null); 186 188 setStatus("signedOut"); 189 189 + setQuickAuth(null); 187 190 } 188 188 - }, [status, authMethod, agent, oauthSession]); 191 191 + }, [status, agent, authMethod, oauthSession, setQuickAuth]); 189 192 190 193 return ( 191 194 <AuthContext

+28 -26

src/routes/__root.tsx

··· 18 18 19 19 import { Composer } from "~/components/Composer"; 20 20 import { DefaultCatchBoundary } from "~/components/DefaultCatchBoundary"; 21 21 + import { Import } from "~/components/Import"; 21 22 import Login from "~/components/Login"; 22 23 import { NotFound } from "~/components/NotFound"; 23 24 import { FluentEmojiHighContrastGlowingStar } from "~/components/Star"; ··· 154 155 /> 155 156 156 157 <MaterialNavItem 158 158 + InactiveIcon={<IconMaterialSymbolsSearch className="w-6 h-6" />} 159 159 + ActiveIcon={<IconMaterialSymbolsSearch className="w-6 h-6" />} 160 160 + active={locationEnum === "search"} 161 161 + onClickCallbback={() => 162 162 + navigate({ 163 163 + to: "/search", 164 164 + //params: { did: agent.assertDid }, 165 165 + }) 166 166 + } 167 167 + text="Explore" 168 168 + /> 169 169 + <MaterialNavItem 157 170 InactiveIcon={ 158 171 <IconMaterialSymbolsNotificationsOutline className="w-6 h-6" /> 159 172 } ··· 180 193 }) 181 194 } 182 195 text="Feeds" 183 183 - /> 184 184 - <MaterialNavItem 185 185 - InactiveIcon={<IconMaterialSymbolsSearch className="w-6 h-6" />} 186 186 - ActiveIcon={<IconMaterialSymbolsSearch className="w-6 h-6" />} 187 187 - active={locationEnum === "search"} 188 188 - onClickCallbback={() => 189 189 - navigate({ 190 190 - to: "/search", 191 191 - //params: { did: agent.assertDid }, 192 192 - }) 193 193 - } 194 194 - text="Search" 195 196 /> 196 197 <MaterialNavItem 197 198 InactiveIcon={ ··· 389 390 390 391 <MaterialNavItem 391 392 small 393 393 + InactiveIcon={<IconMaterialSymbolsSearch className="w-6 h-6" />} 394 394 + ActiveIcon={<IconMaterialSymbolsSearch className="w-6 h-6" />} 395 395 + active={locationEnum === "search"} 396 396 + onClickCallbback={() => 397 397 + navigate({ 398 398 + to: "/search", 399 399 + //params: { did: agent.assertDid }, 400 400 + }) 401 401 + } 402 402 + text="Explore" 403 403 + /> 404 404 + <MaterialNavItem 405 405 + small 392 406 InactiveIcon={ 393 407 <IconMaterialSymbolsNotificationsOutline className="w-6 h-6" /> 394 408 } ··· 419 433 /> 420 434 <MaterialNavItem 421 435 small 422 422 - InactiveIcon={<IconMaterialSymbolsSearch className="w-6 h-6" />} 423 423 - ActiveIcon={<IconMaterialSymbolsSearch className="w-6 h-6" />} 424 424 - active={locationEnum === "search"} 425 425 - onClickCallbback={() => 426 426 - navigate({ 427 427 - to: "/search", 428 428 - //params: { did: agent.assertDid }, 429 429 - }) 430 430 - } 431 431 - text="Search" 432 432 - /> 433 433 - <MaterialNavItem 434 434 - small 435 436 InactiveIcon={ 436 437 <IconMaterialSymbolsAccountCircleOutline className="w-6 h-6" /> 437 438 } ··· 498 499 </main> 499 500 500 501 <aside className="hidden lg:flex h-screen w-[250px] sticky top-0 self-start flex-col"> 502 502 + <div className="px-4 pt-4"><Import /></div> 501 503 <Login /> 502 504 503 505 <div className="flex-1"></div> ··· 551 553 //params: { did: agent.assertDid }, 552 554 }) 553 555 } 554 554 - text="Search" 556 556 + text="Explore" 555 557 /> 556 558 {/* <Link 557 559 to="/search"

+40 -40

src/routes/index.tsx

··· 1 1 import { createFileRoute } from "@tanstack/react-router"; 2 2 import { useAtom } from "jotai"; 3 3 import * as React from "react"; 4 4 - import { useEffect, useLayoutEffect } from "react"; 4 4 + import { useLayoutEffect, useState } from "react"; 5 5 6 6 import { Header } from "~/components/Header"; 7 7 import { InfiniteCustomFeed } from "~/components/InfiniteCustomFeed"; 8 8 import { useAuth } from "~/providers/UnifiedAuthProvider"; 9 9 import { 10 10 - agentAtom, 11 11 - authedAtom, 12 10 feedScrollPositionsAtom, 13 11 isAtTopAtom, 12 12 + quickAuthAtom, 14 13 selectedFeedUriAtom, 15 15 - store, 16 14 } from "~/utils/atoms"; 17 15 //import { usePersistentStore } from "~/providers/PersistentStoreProvider"; 18 16 import { ··· 107 105 } = useAuth(); 108 106 const authed = !!agent?.did; 109 107 110 110 - useEffect(() => { 111 111 - if (agent?.did) { 112 112 - store.set(authedAtom, true); 113 113 - } else { 114 114 - store.set(authedAtom, false); 115 115 - } 116 116 - }, [status, agent, authed]); 117 117 - useEffect(() => { 118 118 - if (agent) { 119 119 - // eslint-disable-next-line @typescript-eslint/ban-ts-comment 120 120 - // @ts-ignore is it just me or is the type really weird here it should be Agent not AtpAgent 121 121 - store.set(agentAtom, agent); 122 122 - } else { 123 123 - store.set(agentAtom, null); 124 124 - } 125 125 - }, [status, agent, authed]); 108 108 + // i dont remember why this is even here 109 109 + // useEffect(() => { 110 110 + // if (agent?.did) { 111 111 + // store.set(authedAtom, true); 112 112 + // } else { 113 113 + // store.set(authedAtom, false); 114 114 + // } 115 115 + // }, [status, agent, authed]); 116 116 + // useEffect(() => { 117 117 + // if (agent) { 118 118 + // // eslint-disable-next-line @typescript-eslint/ban-ts-comment 119 119 + // // @ts-ignore is it just me or is the type really weird here it should be Agent not AtpAgent 120 120 + // store.set(agentAtom, agent); 121 121 + // } else { 122 122 + // store.set(agentAtom, null); 123 123 + // } 124 124 + // }, [status, agent, authed]); 126 125 127 126 //const { get, set } = usePersistentStore(); 128 127 // const [feed, setFeed] = React.useState<any[]>([]); ··· 162 161 163 162 // const savedFeeds = savedFeedsPref?.items || []; 164 163 165 165 - const identityresultmaybe = useQueryIdentity(agent?.did); 164 164 + const [quickAuth, setQuickAuth] = useAtom(quickAuthAtom); 165 165 + const isAuthRestoring = quickAuth ? status === "loading" : false; 166 166 + 167 167 + const identityresultmaybe = useQueryIdentity(!isAuthRestoring ? agent?.did : undefined); 166 168 const identity = identityresultmaybe?.data; 167 169 168 170 const prefsresultmaybe = useQueryPreferences({ 169 169 - agent: agent ?? undefined, 170 170 - pdsUrl: identity?.pds, 171 171 + agent: !isAuthRestoring ? (agent ?? undefined) : undefined, 172 172 + pdsUrl: !isAuthRestoring ? (identity?.pds) : undefined, 171 173 }); 172 174 const prefs = prefsresultmaybe?.data; 173 175 ··· 178 180 return savedFeedsPref?.items || []; 179 181 }, [prefs]); 180 182 181 181 - const [persistentSelectedFeed, setPersistentSelectedFeed] = 182 182 - useAtom(selectedFeedUriAtom); // React.useState<string | null>(null); 183 183 - const [unauthedSelectedFeed, setUnauthedSelectedFeed] = React.useState( 184 184 - persistentSelectedFeed 185 185 - ); // React.useState<string | null>(null); 183 183 + const [persistentSelectedFeed, setPersistentSelectedFeed] = useAtom(selectedFeedUriAtom); 184 184 + const [unauthedSelectedFeed, setUnauthedSelectedFeed] = useState(persistentSelectedFeed); 186 185 const selectedFeed = agent?.did 187 186 ? persistentSelectedFeed 188 187 : unauthedSelectedFeed; ··· 306 305 }, [scrollPositions]); 307 306 308 307 useLayoutEffect(() => { 308 308 + if (isAuthRestoring) return; 309 309 const savedPosition = scrollPositions[selectedFeed ?? "null"] ?? 0; 310 310 311 311 window.scrollTo({ top: savedPosition, behavior: "instant" }); 312 312 // eslint-disable-next-line react-hooks/exhaustive-deps 313 313 - }, [selectedFeed]); 313 313 + }, [selectedFeed, isAuthRestoring]); 314 314 315 315 useLayoutEffect(() => { 316 316 - if (!selectedFeed) return; 316 316 + if (!selectedFeed || isAuthRestoring) return; 317 317 318 318 const handleScroll = () => { 319 319 scrollPositionsRef.current = { ··· 328 328 329 329 setScrollPositions(scrollPositionsRef.current); 330 330 }; 331 331 - }, [selectedFeed, setScrollPositions]); 331 331 + }, [isAuthRestoring, selectedFeed, setScrollPositions]); 332 332 333 333 - const feedGengetrecordquery = useQueryArbitrary(selectedFeed ?? undefined); 334 334 - const feedServiceDid = (feedGengetrecordquery?.data?.value as any)?.did; 333 333 + const feedGengetrecordquery = useQueryArbitrary(!isAuthRestoring ? selectedFeed ?? undefined : undefined); 334 334 + const feedServiceDid = !isAuthRestoring ? (feedGengetrecordquery?.data?.value as any)?.did as string | undefined : undefined; 335 335 336 336 // const { 337 337 // data: feedData, ··· 347 347 348 348 // const feed = feedData?.feed || []; 349 349 350 350 - const isReadyForAuthedFeed = 351 351 - authed && agent && identity?.pds && feedServiceDid; 352 352 - const isReadyForUnauthedFeed = !authed && selectedFeed; 350 350 + const isReadyForAuthedFeed = !isAuthRestoring && authed && agent && identity?.pds && feedServiceDid; 351 351 + const isReadyForUnauthedFeed = !isAuthRestoring && !authed && selectedFeed; 353 352 354 353 355 354 const [isAtTop] = useAtom(isAtTopAtom); ··· 358 357 <div 359 358 className={`relative flex flex-col divide-y divide-gray-200 dark:divide-gray-800 ${hidden && "hidden"}`} 360 359 > 361 361 - {savedFeeds.length > 0 ? ( 360 360 + {!isAuthRestoring && savedFeeds.length > 0 ? ( 362 361 <div className={`flex items-center px-4 py-2 h-[52px] sticky top-0 bg-[var(--header-bg-light)] dark:bg-[var(--header-bg-dark)] ${!isAtTop && "shadow-sm"} sm:shadow-none sm:bg-white sm:dark:bg-gray-950 z-10 border-0 sm:border-b border-gray-200 dark:border-gray-700 overflow-x-auto overflow-y-hidden scroll-thin`}> 363 362 {savedFeeds.map((item: any, idx: number) => { 364 363 const label = item.value.split("/").pop() || item.value; ··· 410 409 /> 411 410 ))} */} 412 411 413 413 - {authed && (!identity?.pds || !feedServiceDid) && ( 412 412 + {isAuthRestoring || authed && (!identity?.pds || !feedServiceDid) && ( 414 413 <div className="p-4 text-center text-gray-500"> 415 414 Preparing your feed... 416 415 </div> 417 416 )} 418 417 419 419 - {isReadyForAuthedFeed || isReadyForUnauthedFeed ? ( 418 418 + {!isAuthRestoring && (isReadyForAuthedFeed || isReadyForUnauthedFeed) ? ( 420 419 <InfiniteCustomFeed 420 420 + key={selectedFeed!} 421 421 feedUri={selectedFeed!} 422 422 pdsUrl={identity?.pds} 423 423 feedServiceDid={feedServiceDid} 424 424 /> 425 425 ) : ( 426 426 <div className="p-4 text-center text-gray-500"> 427 427 - Select a feed to get started. 427 427 + Loading....... 428 428 </div> 429 429 )} 430 430 {/* {false && restoringScrollPosition && (

+177 -53

src/routes/profile.$did/index.tsx

··· 1 1 + import { RichText } from "@atproto/api"; 1 2 import { useQueryClient } from "@tanstack/react-query"; 2 2 - import { createFileRoute } from "@tanstack/react-router"; 3 3 + import { createFileRoute, useNavigate } from "@tanstack/react-router"; 3 4 import { useAtom } from "jotai"; 4 4 - import React from "react"; 5 5 + import React, { type ReactNode, useEffect, useState } from "react"; 5 6 6 7 import { Header } from "~/components/Header"; 7 7 - import { UniversalPostRendererATURILoader } from "~/components/UniversalPostRenderer"; 8 8 + import { Button } from "~/components/radix-m3-rd/Button"; 9 9 + import { 10 10 + renderTextWithFacets, 11 11 + UniversalPostRendererATURILoader, 12 12 + } from "~/components/UniversalPostRenderer"; 8 13 import { useAuth } from "~/providers/UnifiedAuthProvider"; 9 14 import { imgCDNAtom } from "~/utils/atoms"; 10 10 - import { toggleFollow, useGetFollowState } from "~/utils/followState"; 15 15 + import { 16 16 + toggleFollow, 17 17 + useGetFollowState, 18 18 + useGetOneToOneState, 19 19 + } from "~/utils/followState"; 11 20 import { 12 21 useInfiniteQueryAuthorFeed, 13 22 useQueryIdentity, ··· 21 30 function ProfileComponent() { 22 31 // booo bad this is not always the did it might be a handle, use identity.did instead 23 32 const { did } = Route.useParams(); 33 33 + const navigate = useNavigate(); 24 34 const queryClient = useQueryClient(); 25 25 - const { agent } = useAuth(); 26 35 const { 27 36 data: identity, 28 37 isLoading: isIdentityLoading, 29 38 error: identityError, 30 39 } = useQueryIdentity(did); 31 31 - 32 32 - const followRecords = useGetFollowState({ 33 33 - target: identity?.did || did, 34 34 - user: agent?.did, 35 35 - }); 36 40 37 41 const resolvedDid = did.startsWith("did:") ? did : identity?.did; 38 42 const resolvedHandle = did.startsWith("did:") ? identity?.handle : did; ··· 68 72 () => postsData?.pages.flatMap((page) => page.records) ?? [], 69 73 [postsData] 70 74 ); 71 71 - 72 72 - const [imgcdn] = useAtom(imgCDNAtom) 75 75 + 76 76 + const [imgcdn] = useAtom(imgCDNAtom); 73 77 74 78 function getAvatarUrl(p: typeof profile) { 75 79 const link = p?.avatar?.ref?.["$link"]; ··· 166 170 also delay the backfill to be on demand because it would be pretty intense 167 171 also save it persistently 168 172 */} 169 169 - {identity?.did !== agent?.did ? ( 170 170 - <> 171 171 - {!(followRecords?.length && followRecords?.length > 0) ? ( 172 172 - <button 173 173 - onClick={() => 174 174 - toggleFollow({ 175 175 - agent: agent || undefined, 176 176 - targetDid: identity?.did, 177 177 - followRecords: followRecords, 178 178 - queryClient: queryClient, 179 179 - }) 180 180 - } 181 181 - className="rounded-full dark:bg-gray-600 bg-gray-300 px-3 py-2 text-[14px]" 182 182 - > 183 183 - Follow 184 184 - </button> 185 185 - ) : ( 186 186 - <button 187 187 - onClick={() => 188 188 - toggleFollow({ 189 189 - agent: agent || undefined, 190 190 - targetDid: identity?.did, 191 191 - followRecords: followRecords, 192 192 - queryClient: queryClient, 193 193 - }) 194 194 - } 195 195 - className="rounded-full dark:bg-gray-600 bg-gray-300 px-3 py-2 text-[14px]" 196 196 - > 197 197 - Unfollow 198 198 - </button> 199 199 - )} 200 200 - </> 201 201 - ) : ( 202 202 - <button className="rounded-full dark:bg-gray-600 bg-gray-300 px-3 py-2 text-[14px]"> 203 203 - Edit Profile 204 204 - </button> 205 205 - )} 206 206 - <button className="rounded-full dark:bg-gray-600 bg-gray-300 px-3 py-2 text-[14px]"> 173 173 + <FollowButton targetdidorhandle={did} /> 174 174 + <Button className="rounded-full" variant={"secondary"}> 207 175 ... {/* todo: icon */} 208 208 - </button> 176 176 + </Button> 209 177 </div> 210 178 211 179 {/* Info Card */} 212 180 <div className="mt-16 pb-2 px-4 text-gray-900 dark:text-gray-100"> 213 181 <div className="font-bold text-2xl">{displayName}</div> 214 214 - <div className="text-gray-500 dark:text-gray-400 text-base mb-3"> 182 182 + <div className="text-gray-500 dark:text-gray-400 text-base mb-3 flex flex-row gap-1"> 183 183 + <Mutual targetdidorhandle={did} /> 215 184 {handle} 216 185 </div> 217 186 {description && ( 218 187 <div className="text-base leading-relaxed text-gray-800 dark:text-gray-300 mb-5 whitespace-pre-wrap break-words text-[15px]"> 219 219 - {description} 188 188 + {/* {description} */} 189 189 + <RichTextRenderer key={did} description={description} /> 220 190 </div> 221 191 )} 222 192 </div> ··· 259 229 </> 260 230 ); 261 231 } 232 232 + 233 233 + export function FollowButton({ 234 234 + targetdidorhandle, 235 235 + }: { 236 236 + targetdidorhandle: string; 237 237 + }) { 238 238 + const { agent } = useAuth(); 239 239 + const { data: identity } = useQueryIdentity(targetdidorhandle); 240 240 + const queryClient = useQueryClient(); 241 241 + 242 242 + const followRecords = useGetFollowState({ 243 243 + target: identity?.did ?? targetdidorhandle, 244 244 + user: agent?.did, 245 245 + }); 246 246 + 247 247 + return ( 248 248 + <> 249 249 + {identity?.did !== agent?.did ? ( 250 250 + <> 251 251 + {!(followRecords?.length && followRecords?.length > 0) ? ( 252 252 + <Button 253 253 + onClick={(e) => { 254 254 + e.stopPropagation(); 255 255 + toggleFollow({ 256 256 + agent: agent || undefined, 257 257 + targetDid: identity?.did, 258 258 + followRecords: followRecords, 259 259 + queryClient: queryClient, 260 260 + }); 261 261 + }} 262 262 + > 263 263 + Follow 264 264 + </Button> 265 265 + ) : ( 266 266 + <Button 267 267 + onClick={(e) => { 268 268 + e.stopPropagation(); 269 269 + toggleFollow({ 270 270 + agent: agent || undefined, 271 271 + targetDid: identity?.did, 272 272 + followRecords: followRecords, 273 273 + queryClient: queryClient, 274 274 + }); 275 275 + }} 276 276 + > 277 277 + Unfollow 278 278 + </Button> 279 279 + )} 280 280 + </> 281 281 + ) : ( 282 282 + <Button variant={"secondary"}>Edit Profile</Button> 283 283 + )} 284 284 + </> 285 285 + ); 286 286 + } 287 287 + 288 288 + export function Mutual({ targetdidorhandle }: { targetdidorhandle: string }) { 289 289 + const { agent } = useAuth(); 290 290 + const { data: identity } = useQueryIdentity(targetdidorhandle); 291 291 + 292 292 + const theyFollowYouRes = useGetOneToOneState( 293 293 + agent?.did 294 294 + ? { 295 295 + target: agent?.did, 296 296 + user: identity?.did ?? targetdidorhandle, 297 297 + collection: "app.bsky.graph.follow", 298 298 + path: ".subject", 299 299 + } 300 300 + : undefined 301 301 + ); 302 302 + 303 303 + const youFollowThemRes = useGetFollowState({ 304 304 + target: identity?.did ?? targetdidorhandle, 305 305 + user: agent?.did, 306 306 + }); 307 307 + 308 308 + const theyFollowYou: boolean = 309 309 + !!theyFollowYouRes?.length && theyFollowYouRes.length > 0; 310 310 + const youFollowThem: boolean = 311 311 + !!youFollowThemRes?.length && youFollowThemRes.length > 0; 312 312 + 313 313 + return ( 314 314 + <> 315 315 + {/* if not self */} 316 316 + {identity?.did !== agent?.did ? ( 317 317 + <> 318 318 + {theyFollowYou ? ( 319 319 + <> 320 320 + {youFollowThem ? ( 321 321 + <div className=" text-sm px-1.5 py-0.5 text-gray-500 bg-gray-200 dark:text-gray-400 dark:bg-gray-800 rounded-lg flex flex-row items-center justify-center"> 322 322 + mutuals 323 323 + </div> 324 324 + ) : ( 325 325 + <div className=" text-sm px-1.5 py-0.5 text-gray-500 bg-gray-200 dark:text-gray-400 dark:bg-gray-800 rounded-lg flex flex-row items-center justify-center"> 326 326 + follows you 327 327 + </div> 328 328 + )} 329 329 + </> 330 330 + ) : ( 331 331 + <></> 332 332 + )} 333 333 + </> 334 334 + ) : ( 335 335 + // lmao can someone be mutuals with themselves ?? 336 336 + <></> 337 337 + )} 338 338 + </> 339 339 + ); 340 340 + } 341 341 + 342 342 + export function RichTextRenderer({ description }: { description: string }) { 343 343 + const [richDescription, setRichDescription] = useState<string | ReactNode[]>( 344 344 + description 345 345 + ); 346 346 + const { agent } = useAuth(); 347 347 + const navigate = useNavigate(); 348 348 + 349 349 + useEffect(() => { 350 350 + let mounted = true; 351 351 + 352 352 + // setRichDescription(description); 353 353 + 354 354 + async function processRichText() { 355 355 + try { 356 356 + if (!agent?.did) return; 357 357 + const rt = new RichText({ text: description }); 358 358 + await rt.detectFacets(agent); 359 359 + 360 360 + if (!mounted) return; 361 361 + 362 362 + if (rt.facets) { 363 363 + setRichDescription( 364 364 + renderTextWithFacets({ text: rt.text, facets: rt.facets, navigate }) 365 365 + ); 366 366 + } else { 367 367 + setRichDescription(rt.text); 368 368 + } 369 369 + } catch (error) { 370 370 + console.error("Failed to detect facets:", error); 371 371 + if (mounted) { 372 372 + setRichDescription(description); 373 373 + } 374 374 + } 375 375 + } 376 376 + 377 377 + processRichText(); 378 378 + 379 379 + return () => { 380 380 + mounted = false; 381 381 + }; 382 382 + }, [description, agent, navigate]); 383 383 + 384 384 + return <>{richDescription}</>; 385 385 + }

+1 -1

src/routes/profile.$did/post.$rkey.image.$i.tsx

··· 85 85 e.stopPropagation(); 86 86 e.nativeEvent.stopImmediatePropagation(); 87 87 }} 88 88 - className="lightbox-sidebar hidden lg:flex overscroll-none disablegutter border-l dark:border-gray-800 was7 border-gray-300 fixed z-50 top-0 right-0 flex-col max-w-[350px] min-w-[350px] max-h-screen overflow-y-scroll dark:bg-gray-950 bg-white" 88 88 + className="lightbox-sidebar hidden lg:flex overscroll-none disablegutter disablescroll border-l dark:border-gray-800 was7 border-gray-300 fixed z-50 top-0 right-0 flex-col max-w-[350px] min-w-[350px] max-h-screen overflow-y-scroll dark:bg-gray-950 bg-white" 89 89 > 90 90 <ProfilePostComponent 91 91 key={`/profile/${did}/post/${rkey}`}

+50 -1

src/routes/search.tsx

··· 1 1 import { createFileRoute } from "@tanstack/react-router"; 2 2 3 3 + import { Header } from "~/components/Header"; 4 4 + import { Import } from "~/components/Import"; 5 5 + 3 6 export const Route = createFileRoute("/search")({ 4 7 component: Search, 5 8 }); 6 9 7 10 export function Search() { 8 8 - return <div className="p-6">Search page (coming soon)</div>; 11 11 + return ( 12 12 + <> 13 13 + <Header 14 14 + title="Explore" 15 15 + backButtonCallback={() => { 16 16 + if (window.history.length > 1) { 17 17 + window.history.back(); 18 18 + } else { 19 19 + window.location.assign("/"); 20 20 + } 21 21 + }} 22 22 + /> 23 23 + <div className=" flex flex-col items-center mt-4 mx-4 gap-4"> 24 24 + <Import /> 25 25 + <div className="flex flex-col"> 26 26 + <p className="text-gray-600 dark:text-gray-400"> 27 27 + Sorry we dont have search. But instead, you can load some of these 28 28 + types of content into Red Dwarf: 29 29 + </p> 30 30 + <ul className="list-disc list-inside mt-2 text-gray-600 dark:text-gray-400"> 31 31 + <li> 32 32 + Bluesky URLs from supported clients (like{" "} 33 33 + <code className="text-sm">bsky.app</code> or{" "} 34 34 + <code className="text-sm">deer.social</code>). 35 35 + </li> 36 36 + <li> 37 37 + AT-URIs (e.g.,{" "} 38 38 + <code className="text-sm">at://did:example/collection/item</code> 39 39 + ). 40 40 + </li> 41 41 + <li> 42 42 + Plain handles (like{" "} 43 43 + <code className="text-sm">@username.bsky.social</code>). 44 44 + </li> 45 45 + <li> 46 46 + Direct DIDs (Decentralized Identifiers, starting with{" "} 47 47 + <code className="text-sm">did:</code>). 48 48 + </li> 49 49 + </ul> 50 50 + <p className="mt-2 text-gray-600 dark:text-gray-400"> 51 51 + Simply paste one of these into the import field above and press 52 52 + Enter to load the content. 53 53 + </p> 54 54 + </div> 55 55 + </div> 56 56 + </> 57 57 + ); 9 58 }

+11 -2

src/styles/app.css

··· 52 52 } 53 53 } 54 54 55 55 + .gutter{ 56 56 + scrollbar-gutter: stable both-edges; 57 57 + } 58 58 + 55 59 @media (width >= 64rem /* 1024px */) { 56 60 html:not(:has(.disablegutter)), 57 61 body:not(:has(.disablegutter)) { 58 62 scrollbar-gutter: stable both-edges !important; 59 63 } 60 60 - html:has(.disablegutter), 61 61 - body:has(.disablegutter) { 64 64 + html:has(.disablescroll), 65 65 + body:has(.disablescroll) { 62 66 scrollbar-width: none; 63 67 overflow-y: hidden; 64 68 } ··· 222 226 /* placeholder trick */ 223 227 .m3input-field.m3input-label.m3input-border input::placeholder { 224 228 color: transparent; 229 229 + } 230 230 + 231 231 + /* radix i love you but like cmon man */ 232 232 + body[data-scroll-locked]{ 233 233 + margin-left: var(--removed-body-scroll-bar-size) !important; 225 234 }

+7 -3

src/utils/atoms.ts

··· 1 1 - import type Agent from "@atproto/api"; 2 1 import { atom, createStore, useAtomValue } from "jotai"; 3 2 import { atomWithStorage } from "jotai/utils"; 4 3 import { useEffect } from "react"; 5 4 6 5 export const store = createStore(); 6 6 + 7 7 + export const quickAuthAtom = atomWithStorage<string | null>( 8 8 + "quickAuth", 9 9 + null 10 10 + ); 7 11 8 12 export const selectedFeedUriAtom = atomWithStorage<string | null>( 9 13 "selectedFeedUri", ··· 52 56 | { kind: "quote"; subject: string }; 53 57 export const composerAtom = atom<ComposerState>({ kind: "closed" }); 54 58 55 55 - export const agentAtom = atom<Agent | null>(null); 56 56 - export const authedAtom = atom<boolean>(false); 59 59 + //export const agentAtom = atom<Agent | null>(null); 60 60 + //export const authedAtom = atom<boolean>(false); 57 61 58 62 export function useAtomCssVar(atom: typeof hueAtom, cssVar: string) { 59 63 const value = useAtomValue(atom);

+33

src/utils/followState.ts

··· 128 128 }; 129 129 }); 130 130 } 131 131 + 132 132 + 133 133 + 134 134 + export function useGetOneToOneState(params?: { 135 135 + target: string; 136 136 + user: string; 137 137 + collection: string; 138 138 + path: string; 139 139 + }): string[] | undefined { 140 140 + const { data: arbitrarydata } = useQueryConstellation( 141 141 + params && params.user 142 142 + ? { 143 143 + method: "/links", 144 144 + target: params.target, 145 145 + // @ts-expect-error overloading sucks so much 146 146 + collection: params.collection, 147 147 + path: params.path, 148 148 + dids: [params.user], 149 149 + } 150 150 + : { method: "undefined", target: "whatever" } 151 151 + // overloading sucks so much 152 152 + ) as { data: linksRecordsResponse | undefined }; 153 153 + if (!params || !params.user) return undefined; 154 154 + const data = arbitrarydata?.linking_records.slice(0, 50) ?? []; 155 155 + 156 156 + if (data.length > 0) { 157 157 + return data.map((linksRecord) => { 158 158 + return `at://${linksRecord.did}/${linksRecord.collection}/${linksRecord.rkey}`; 159 159 + }); 160 160 + } 161 161 + 162 162 + return undefined; 163 163 + }

+2 -2

src/utils/useQuery.ts

··· 615 615 }) { 616 616 const { queryKey, queryFn } = constructInfiniteFeedSkeletonQuery(options); 617 617 618 618 - return useInfiniteQuery({ 618 618 + return {...useInfiniteQuery({ 619 619 queryKey, 620 620 queryFn, 621 621 initialPageParam: undefined as never, ··· 623 623 staleTime: Infinity, 624 624 refetchOnWindowFocus: false, 625 625 enabled: !!options.feedUri && (options.isAuthed ? !!options.agent && !!options.pdsUrl && !!options.feedServiceDid : true), 626 626 - }); 626 626 + }), queryKey: queryKey}; 627 627 } 628 628 629 629

+1 -1

vite.config.ts

··· 10 10 11 11 import { generateMetadataPlugin } from "./oauthdev.mts"; 12 12 13 13 - const PROD_URL = "https://reddwarf.whey.party" 13 13 + const PROD_URL = "https://reddwarf.app" 14 14 const DEV_URL = "https://local3768forumtest.whey.party" 15 15 16 16 function shp(url: string): string {