+49 -18

app/[leaflet_id]/publish/BskyPostEditorProsemirror.tsx

··· 148 148 const pos = view.state.selection.from; 149 149 setMentionInsertPos(pos); 150 150 const coords = view.coordsAtPos(pos - 1); 151 151 - setMentionCoords({ 152 152 - top: coords.bottom + window.scrollY, 153 153 - left: coords.left + window.scrollX, 154 154 - }); 151 151 + 152 152 + // Get coordinates relative to the positioned parent container 153 153 + const editorEl = view.dom; 154 154 + const container = editorEl.closest(".relative") as HTMLElement | null; 155 155 + 156 156 + if (container) { 157 157 + const containerRect = container.getBoundingClientRect(); 158 158 + setMentionCoords({ 159 159 + top: coords.bottom - containerRect.top, 160 160 + left: coords.left - containerRect.left, 161 161 + }); 162 162 + } else { 163 163 + setMentionCoords({ 164 164 + top: coords.bottom, 165 165 + left: coords.left, 166 166 + }); 167 167 + } 155 168 setMentionOpen(true); 156 169 }, []); 157 170 158 171 const handleMentionSelect = useCallback( 159 172 (mention: Mention) => { 160 160 - if (mention.type !== "did") return; 161 173 if (!viewRef.current || mentionInsertPos === null) return; 162 174 const view = viewRef.current; 163 175 const from = mentionInsertPos - 1; ··· 167 179 // Delete the @ symbol 168 180 tr.delete(from, to); 169 181 170 170 - // Insert @handle 171 171 - const mentionText = "@" + mention.handle; 172 172 - tr.insertText(mentionText, from); 173 173 - 174 174 - // Apply mention mark 175 175 - tr.addMark( 176 176 - from, 177 177 - from + mentionText.length, 178 178 - bskyPostSchema.marks.mention.create({ did: mention.did }), 179 179 - ); 180 180 - 181 181 - // Add a space after the mention 182 182 - tr.insertText(" ", from + mentionText.length); 182 182 + if (mention.type === "did") { 183 183 + // Insert @handle with mention mark 184 184 + const mentionText = "@" + mention.handle; 185 185 + tr.insertText(mentionText, from); 186 186 + tr.addMark( 187 187 + from, 188 188 + from + mentionText.length, 189 189 + bskyPostSchema.marks.mention.create({ did: mention.did }), 190 190 + ); 191 191 + tr.insertText(" ", from + mentionText.length); 192 192 + } else if (mention.type === "publication") { 193 193 + // Insert publication name as a link 194 194 + const linkText = mention.name; 195 195 + tr.insertText(linkText, from); 196 196 + tr.addMark( 197 197 + from, 198 198 + from + linkText.length, 199 199 + bskyPostSchema.marks.link.create({ href: mention.url }), 200 200 + ); 201 201 + tr.insertText(" ", from + linkText.length); 202 202 + } else if (mention.type === "post") { 203 203 + // Insert post title as a link 204 204 + const linkText = mention.title; 205 205 + tr.insertText(linkText, from); 206 206 + tr.addMark( 207 207 + from, 208 208 + from + linkText.length, 209 209 + bskyPostSchema.marks.link.create({ href: mention.url }), 210 210 + ); 211 211 + tr.insertText(" ", from + linkText.length); 212 212 + } 183 213 184 214 view.dispatch(tr); 185 215 view.focus(); ··· 270 300 view={viewRef} 271 301 onSelect={handleMentionSelect} 272 302 coords={mentionCoords} 303 303 + placeholder="Search people..." 273 304 /> 274 305 {editorState?.doc.textContent.length === 0 && ( 275 306 <div className="italic text-tertiary absolute top-0 left-0 pointer-events-none">

+16 -5

app/api/rpc/[command]/search_publication_documents.ts

··· 1 1 + import { AtUri } from "@atproto/api"; 1 2 import { z } from "zod"; 2 3 import { makeRoute } from "../lib"; 3 4 import type { Env } from "./route"; 5 5 + import { getPublicationURL } from "app/lish/createPub/getPublicationURL"; 4 6 5 7 export type SearchPublicationDocumentsReturnType = Awaited< 6 8 ReturnType<(typeof search_publication_documents)["handler"]> ··· 18 20 { supabase }: Pick<Env, "supabase">, 19 21 ) => { 20 22 // Get documents in the publication, filtering by title using JSON operator 23 23 + // Also join with publications to get the record for URL construction 21 24 const { data: documents, error } = await supabase 22 25 .from("documents_in_publications") 23 23 - .select("document, documents!inner(uri, data)") 26 26 + .select( 27 27 + "document, documents!inner(uri, data), publications!inner(uri, record)", 28 28 + ) 24 29 .eq("publication", publication_uri) 25 30 .ilike("documents.data->>title", `%${query}%`) 26 31 .limit(limit); ··· 31 36 ); 32 37 } 33 38 34 34 - const result = documents.map((d) => ({ 35 35 - uri: d.documents.uri, 36 36 - title: (d.documents.data as { title?: string })?.title || "Untitled", 37 37 - })); 39 39 + const result = documents.map((d) => { 40 40 + const docUri = new AtUri(d.documents.uri); 41 41 + const pubUrl = getPublicationURL(d.publications); 42 42 + 43 43 + return { 44 44 + uri: d.documents.uri, 45 45 + title: (d.documents.data as { title?: string })?.title || "Untitled", 46 46 + url: `${pubUrl}/${docUri.rkey}`, 47 47 + }; 48 48 + }); 38 49 39 50 return { result: { documents: result } }; 40 51 },

+10 -8

app/api/rpc/[command]/search_publication_names.ts

··· 1 1 import { z } from "zod"; 2 2 import { makeRoute } from "../lib"; 3 3 import type { Env } from "./route"; 4 4 + import { getPublicationURL } from "app/lish/createPub/getPublicationURL"; 4 5 5 6 export type SearchPublicationNamesReturnType = Awaited< 6 7 ReturnType<(typeof search_publication_names)["handler"]> ··· 12 13 query: z.string(), 13 14 limit: z.number().optional().default(10), 14 15 }), 15 15 - handler: async ( 16 16 - { query, limit }, 17 17 - { supabase }: Pick<Env, "supabase">, 18 18 - ) => { 16 16 + handler: async ({ query, limit }, { supabase }: Pick<Env, "supabase">) => { 19 17 // Search publications by name in record (case-insensitive partial match) 20 18 const { data: publications, error } = await supabase 21 19 .from("publications") ··· 27 25 throw new Error(`Failed to search publications: ${error.message}`); 28 26 } 29 27 30 30 - const result = publications.map((p) => ({ 31 31 - uri: p.uri, 32 32 - name: (p.record as { name?: string })?.name || "Untitled", 33 33 - })); 28 28 + const result = publications.map((p) => { 29 29 + const record = p.record as { name?: string }; 30 30 + return { 31 31 + uri: p.uri, 32 32 + name: record.name || "Untitled", 33 33 + url: getPublicationURL(p), 34 34 + }; 35 35 + }); 34 36 35 37 return { result: { publications: result } }; 36 38 },

+8

app/lish/[did]/[publication]/[rkey]/page.tsx

··· 25 25 26 26 return { 27 27 icons: { 28 28 + icon: { 29 29 + url: 30 30 + process.env.NODE_ENV === "development" 31 31 + ? `/lish/${did}/${params.publication}/icon` 32 32 + : "/icon", 33 33 + sizes: "32x32", 34 34 + type: "image/png", 35 35 + }, 28 36 other: { 29 37 rel: "alternate", 30 38 url: document.uri,

+7 -8

app/lish/[did]/[publication]/icon.ts app/lish/[did]/[publication]/icon/route.ts

··· 8 8 9 9 let idResolver = new IdResolver(); 10 10 11 11 - export const size = { 12 12 - width: 32, 13 13 - height: 32, 14 14 - }; 11 11 + export const dynamic = "force-dynamic"; 15 12 16 16 - export const contentType = "image/png"; 17 17 - export default async function Icon(props: { 18 18 - params: Promise<{ did: string; publication: string }>; 19 19 - }) { 13 13 + export async function GET( 14 14 + request: NextRequest, 15 15 + props: { params: Promise<{ did: string; publication: string }> } 16 16 + ) { 17 17 + console.log("are we getting here?"); 20 18 const params = await props.params; 21 19 try { 22 20 let did = decodeURIComponent(params.did); ··· 63 61 }, 64 62 }); 65 63 } catch (e) { 64 64 + console.log(e); 66 65 return redirect("/icon.png"); 67 66 } 68 67 }

+8

app/lish/[did]/[publication]/layout.tsx

··· 47 47 title: pubRecord?.name || "Untitled Publication", 48 48 description: pubRecord?.description || "", 49 49 icons: { 50 50 + icon: { 51 51 + url: 52 52 + process.env.NODE_ENV === "development" 53 53 + ? `/lish/${did}/${publication_name}/icon` 54 54 + : "/icon", 55 55 + sizes: "32x32", 56 56 + type: "image/png", 57 57 + }, 50 58 other: { 51 59 rel: "alternate", 52 60 url: publication.uri,

+71 -68

components/Mention.tsx

··· 18 18 view: React.RefObject<EditorView | null>; 19 19 onSelect: (mention: Mention) => void; 20 20 coords: { top: number; left: number } | null; 21 21 + placeholder?: string; 21 22 }) { 22 23 const [searchQuery, setSearchQuery] = useState(""); 23 24 const [noResults, setNoResults] = useState(false); ··· 207 208 placeholder={ 208 209 scope.type === "publication" 209 210 ? "Search posts..." 210 210 - : "Search people & publications..." 211 211 + : props.placeholder ?? "Search people & publications..." 211 212 } 212 213 className="flex-1 w-full min-w-0 bg-transparent border-none outline-none text-sm placeholder:text-tertiary" 213 214 /> ··· 219 220 No results found 220 221 </div> 221 222 )} 222 222 - <ul className="list-none p-0 text-sm flex flex-col group-data-[side=top]/mention-menu:flex-col-reverse"> 223 223 - {sortedSuggestions.map((result, index) => { 224 224 - const prevResult = sortedSuggestions[index - 1]; 225 225 - const showHeader = 226 226 - index === 0 || 227 227 - (prevResult && prevResult.type !== result.type); 223 223 + <ul className="list-none p-0 text-sm flex flex-col group-data-[side=top]/mention-menu:flex-col-reverse"> 224 224 + {sortedSuggestions.map((result, index) => { 225 225 + const prevResult = sortedSuggestions[index - 1]; 226 226 + const showHeader = 227 227 + index === 0 || 228 228 + (prevResult && prevResult.type !== result.type); 228 229 229 229 - return ( 230 230 - <Fragment 231 231 - key={result.type === "did" ? result.did : result.uri} 232 232 - > 233 233 - {showHeader && ( 234 234 - <> 235 235 - {index > 0 && ( 236 236 - <hr className="border-border-light mx-1 my-1" /> 237 237 - )} 238 238 - <div className="text-xs text-tertiary font-bold pt-1 px-2"> 239 239 - {getHeader(result.type, scope)} 240 240 - </div> 241 241 - </> 242 242 - )} 243 243 - {result.type === "did" ? ( 244 244 - <DidResult 245 245 - onClick={() => { 246 246 - props.onSelect(result); 247 247 - props.onOpenChange(false); 248 248 - }} 249 249 - onMouseDown={(e) => e.preventDefault()} 250 250 - displayName={result.displayName} 251 251 - handle={result.handle} 252 252 - avatar={result.avatar} 253 253 - selected={index === suggestionIndex} 254 254 - /> 255 255 - ) : result.type === "publication" ? ( 256 256 - <PublicationResult 257 257 - onClick={() => { 258 258 - props.onSelect(result); 259 259 - props.onOpenChange(false); 260 260 - }} 261 261 - onMouseDown={(e) => e.preventDefault()} 262 262 - pubName={result.name} 263 263 - uri={result.uri} 264 264 - selected={index === suggestionIndex} 265 265 - onPostsClick={() => { 266 266 - handleScopeChange({ 267 267 - type: "publication", 268 268 - uri: result.uri, 269 269 - name: result.name, 270 270 - }); 271 271 - }} 272 272 - /> 273 273 - ) : ( 274 274 - <PostResult 275 275 - onClick={() => { 276 276 - props.onSelect(result); 277 277 - props.onOpenChange(false); 278 278 - }} 279 279 - onMouseDown={(e) => e.preventDefault()} 280 280 - title={result.title} 281 281 - selected={index === suggestionIndex} 282 282 - /> 283 283 - )} 284 284 - </Fragment> 285 285 - ); 286 286 - })} 287 287 - </ul> 230 230 + return ( 231 231 + <Fragment 232 232 + key={result.type === "did" ? result.did : result.uri} 233 233 + > 234 234 + {showHeader && ( 235 235 + <> 236 236 + {index > 0 && ( 237 237 + <hr className="border-border-light mx-1 my-1" /> 238 238 + )} 239 239 + <div className="text-xs text-tertiary font-bold pt-1 px-2"> 240 240 + {getHeader(result.type, scope)} 241 241 + </div> 242 242 + </> 243 243 + )} 244 244 + {result.type === "did" ? ( 245 245 + <DidResult 246 246 + onClick={() => { 247 247 + props.onSelect(result); 248 248 + props.onOpenChange(false); 249 249 + }} 250 250 + onMouseDown={(e) => e.preventDefault()} 251 251 + displayName={result.displayName} 252 252 + handle={result.handle} 253 253 + avatar={result.avatar} 254 254 + selected={index === suggestionIndex} 255 255 + /> 256 256 + ) : result.type === "publication" ? ( 257 257 + <PublicationResult 258 258 + onClick={() => { 259 259 + props.onSelect(result); 260 260 + props.onOpenChange(false); 261 261 + }} 262 262 + onMouseDown={(e) => e.preventDefault()} 263 263 + pubName={result.name} 264 264 + uri={result.uri} 265 265 + selected={index === suggestionIndex} 266 266 + onPostsClick={() => { 267 267 + handleScopeChange({ 268 268 + type: "publication", 269 269 + uri: result.uri, 270 270 + name: result.name, 271 271 + }); 272 272 + }} 273 273 + /> 274 274 + ) : ( 275 275 + <PostResult 276 276 + onClick={() => { 277 277 + props.onSelect(result); 278 278 + props.onOpenChange(false); 279 279 + }} 280 280 + onMouseDown={(e) => e.preventDefault()} 281 281 + title={result.title} 282 282 + selected={index === suggestionIndex} 283 283 + /> 284 284 + )} 285 285 + </Fragment> 286 286 + ); 287 287 + })} 288 288 + </ul> 288 289 </div> 289 290 </Popover.Content> 290 291 </Popover.Portal> ··· 456 457 displayName?: string; 457 458 avatar?: string; 458 459 } 459 459 - | { type: "publication"; uri: string; name: string } 460 460 - | { type: "post"; uri: string; title: string }; 460 460 + | { type: "publication"; uri: string; name: string; url: string } 461 461 + | { type: "post"; uri: string; title: string; url: string }; 461 462 462 463 export type MentionScope = 463 464 | { type: "default" } ··· 492 493 type: "post" as const, 493 494 uri: d.uri, 494 495 title: d.title, 496 496 + url: d.url, 495 497 })), 496 498 ); 497 499 } else { ··· 516 518 type: "publication" as const, 517 519 uri: p.uri, 518 520 name: p.name, 521 521 + url: p.url, 519 522 })), 520 523 ]); 521 524 }

+3 -1

components/ThemeManager/PublicationThemeProvider.tsx

··· 84 84 <div 85 85 className="PubBackgroundWrapper w-full bg-bg-leaflet text-primary h-full flex flex-col bg-cover bg-center bg-no-repeat items-stretch" 86 86 style={{ 87 87 - backgroundImage: `url(${backgroundImage})`, 87 87 + backgroundImage: backgroundImage 88 88 + ? `url(${backgroundImage})` 89 89 + : undefined, 88 90 backgroundRepeat: backgroundImageRepeat ? "repeat" : "no-repeat", 89 91 backgroundSize: `${backgroundImageRepeat ? `${backgroundImageSize}px` : "cover"}`, 90 92 }}

+3 -1

src/hooks/useLocalizedDate.ts

··· 28 28 29 29 // On initial page load, use header timezone. After hydration, use system timezone 30 30 const effectiveTimezone = !hasPageLoaded 31 31 - ? timezone 31 31 + ? timezone || "UTC" 32 32 : Intl.DateTimeFormat().resolvedOptions().timeZone; 33 33 + 34 34 + console.log("tz", effectiveTimezone); 33 35 34 36 // Apply timezone if available 35 37 if (effectiveTimezone) {

+4 -3

src/hooks/usePreserveScroll.ts

··· 6 6 useEffect(() => { 7 7 if (!ref.current || !key) return; 8 8 9 9 - window.requestAnimationFrame(() => { 10 10 - ref.current?.scrollTo({ top: scrollPositions[key] || 0 }); 11 11 - }); 9 9 + if (scrollPositions[key] !== undefined) 10 10 + window.requestAnimationFrame(() => { 11 11 + ref.current?.scrollTo({ top: scrollPositions[key] || 0 }); 12 12 + }); 12 13 13 14 const listener = () => { 14 15 if (!ref.current?.scrollTop) return;