+183 -9

actions/publishToPublication.ts

··· 50 50 ColorToRGBA, 51 51 } from "components/ThemeManager/colorToLexicons"; 52 52 import { parseColor } from "@react-stately/color"; 53 53 + import { Notification, pingIdentityToUpdateNotification } from "src/notifications"; 54 54 + import { v7 } from "uuid"; 53 55 54 56 export async function publishToPublication({ 55 57 root_entity, ··· 213 215 } 214 216 } 215 217 218 218 + // Create notifications for mentions (only on first publish) 219 219 + if (!existingDocUri) { 220 220 + await createMentionNotifications(result.uri, record, credentialSession.did!); 221 221 + } 222 222 + 216 223 return { rkey, record: JSON.parse(JSON.stringify(record)) }; 217 224 } 218 225 ··· 345 352 Y.applyUpdate(doc, update); 346 353 let nodes = doc.getXmlElement("prosemirror").toArray(); 347 354 let stringValue = YJSFragmentToString(nodes[0]); 348 348 - let facets = YJSFragmentToFacets(nodes[0]); 355 355 + let { facets } = YJSFragmentToFacets(nodes[0]); 349 356 return [stringValue, facets] as const; 350 357 }; 351 358 if (b.type === "card") { ··· 606 613 607 614 function YJSFragmentToFacets( 608 615 node: Y.XmlElement | Y.XmlText | Y.XmlHook, 609 609 - ): PubLeafletRichtextFacet.Main[] { 616 616 + byteOffset: number = 0, 617 617 + ): { facets: PubLeafletRichtextFacet.Main[]; byteLength: number } { 610 618 if (node.constructor === Y.XmlElement) { 611 611 - return node 612 612 - .toArray() 613 613 - .map((f) => YJSFragmentToFacets(f)) 614 614 - .flat(); 619 619 + // Handle inline mention nodes 620 620 + if (node.nodeName === "didMention") { 621 621 + const text = node.getAttribute("text") || ""; 622 622 + const unicodestring = new UnicodeString(text); 623 623 + const facet: PubLeafletRichtextFacet.Main = { 624 624 + index: { 625 625 + byteStart: byteOffset, 626 626 + byteEnd: byteOffset + unicodestring.length, 627 627 + }, 628 628 + features: [ 629 629 + { 630 630 + $type: "pub.leaflet.richtext.facet#didMention", 631 631 + did: node.getAttribute("did"), 632 632 + }, 633 633 + ], 634 634 + }; 635 635 + return { facets: [facet], byteLength: unicodestring.length }; 636 636 + } 637 637 + 638 638 + if (node.nodeName === "atMention") { 639 639 + const text = node.getAttribute("text") || ""; 640 640 + const unicodestring = new UnicodeString(text); 641 641 + const facet: PubLeafletRichtextFacet.Main = { 642 642 + index: { 643 643 + byteStart: byteOffset, 644 644 + byteEnd: byteOffset + unicodestring.length, 645 645 + }, 646 646 + features: [ 647 647 + { 648 648 + $type: "pub.leaflet.richtext.facet#atMention", 649 649 + atURI: node.getAttribute("atURI"), 650 650 + }, 651 651 + ], 652 652 + }; 653 653 + return { facets: [facet], byteLength: unicodestring.length }; 654 654 + } 655 655 + 656 656 + if (node.nodeName === "hard_break") { 657 657 + const unicodestring = new UnicodeString("\n"); 658 658 + return { facets: [], byteLength: unicodestring.length }; 659 659 + } 660 660 + 661 661 + // For other elements (like paragraph), process children 662 662 + let allFacets: PubLeafletRichtextFacet.Main[] = []; 663 663 + let currentOffset = byteOffset; 664 664 + for (const child of node.toArray()) { 665 665 + const result = YJSFragmentToFacets(child, currentOffset); 666 666 + allFacets.push(...result.facets); 667 667 + currentOffset += result.byteLength; 668 668 + } 669 669 + return { facets: allFacets, byteLength: currentOffset - byteOffset }; 615 670 } 671 671 + 616 672 if (node.constructor === Y.XmlText) { 617 673 let facets: PubLeafletRichtextFacet.Main[] = []; 618 674 let delta = node.toDelta() as Delta[]; 619 619 - let byteStart = 0; 675 675 + let byteStart = byteOffset; 676 676 + let totalLength = 0; 620 677 for (let d of delta) { 621 678 let unicodestring = new UnicodeString(d.insert); 622 679 let facet: PubLeafletRichtextFacet.Main = { ··· 649 706 }); 650 707 if (facet.features.length > 0) facets.push(facet); 651 708 byteStart += unicodestring.length; 709 709 + totalLength += unicodestring.length; 652 710 } 653 653 - return facets; 711 711 + return { facets, byteLength: totalLength }; 654 712 } 655 655 - return []; 713 713 + return { facets: [], byteLength: 0 }; 656 714 } 657 715 658 716 type ExcludeString<T> = T extends string ··· 728 786 729 787 return undefined; 730 788 } 789 789 + 790 790 + /** 791 791 + * Extract mentions from a published document and create notifications 792 792 + */ 793 793 + async function createMentionNotifications( 794 794 + documentUri: string, 795 795 + record: PubLeafletDocument.Record, 796 796 + authorDid: string, 797 797 + ) { 798 798 + const mentionedDids = new Set<string>(); 799 799 + const mentionedPublications = new Map<string, string>(); // Map of DID -> publication URI 800 800 + const mentionedDocuments = new Map<string, string>(); // Map of DID -> document URI 801 801 + 802 802 + // Extract mentions from all text blocks in all pages 803 803 + for (const page of record.pages) { 804 804 + if (page.$type === "pub.leaflet.pages.linearDocument") { 805 805 + const linearPage = page as PubLeafletPagesLinearDocument.Main; 806 806 + for (const blockWrapper of linearPage.blocks) { 807 807 + const block = blockWrapper.block; 808 808 + if (block.$type === "pub.leaflet.blocks.text") { 809 809 + const textBlock = block as PubLeafletBlocksText.Main; 810 810 + if (textBlock.facets) { 811 811 + for (const facet of textBlock.facets) { 812 812 + for (const feature of facet.features) { 813 813 + // Check for DID mentions 814 814 + if (PubLeafletRichtextFacet.isDidMention(feature)) { 815 815 + if (feature.did !== authorDid) { 816 816 + mentionedDids.add(feature.did); 817 817 + } 818 818 + } 819 819 + // Check for AT URI mentions (publications and documents) 820 820 + if (PubLeafletRichtextFacet.isAtMention(feature)) { 821 821 + const uri = new AtUri(feature.atURI); 822 822 + 823 823 + if (uri.collection === "pub.leaflet.publication") { 824 824 + // Get the publication owner's DID 825 825 + const { data: publication } = await supabaseServerClient 826 826 + .from("publications") 827 827 + .select("identity_did") 828 828 + .eq("uri", feature.atURI) 829 829 + .single(); 830 830 + 831 831 + if (publication && publication.identity_did !== authorDid) { 832 832 + mentionedPublications.set(publication.identity_did, feature.atURI); 833 833 + } 834 834 + } else if (uri.collection === "pub.leaflet.document") { 835 835 + // Get the document owner's DID 836 836 + const { data: document } = await supabaseServerClient 837 837 + .from("documents") 838 838 + .select("uri, data") 839 839 + .eq("uri", feature.atURI) 840 840 + .single(); 841 841 + 842 842 + if (document) { 843 843 + const docRecord = document.data as PubLeafletDocument.Record; 844 844 + if (docRecord.author !== authorDid) { 845 845 + mentionedDocuments.set(docRecord.author, feature.atURI); 846 846 + } 847 847 + } 848 848 + } 849 849 + } 850 850 + } 851 851 + } 852 852 + } 853 853 + } 854 854 + } 855 855 + } 856 856 + } 857 857 + 858 858 + // Create notifications for DID mentions 859 859 + for (const did of mentionedDids) { 860 860 + const notification: Notification = { 861 861 + id: v7(), 862 862 + recipient: did, 863 863 + data: { 864 864 + type: "mention", 865 865 + document_uri: documentUri, 866 866 + mention_type: "did", 867 867 + }, 868 868 + }; 869 869 + await supabaseServerClient.from("notifications").insert(notification); 870 870 + await pingIdentityToUpdateNotification(did); 871 871 + } 872 872 + 873 873 + // Create notifications for publication mentions 874 874 + for (const [recipientDid, publicationUri] of mentionedPublications) { 875 875 + const notification: Notification = { 876 876 + id: v7(), 877 877 + recipient: recipientDid, 878 878 + data: { 879 879 + type: "mention", 880 880 + document_uri: documentUri, 881 881 + mention_type: "publication", 882 882 + mentioned_uri: publicationUri, 883 883 + }, 884 884 + }; 885 885 + await supabaseServerClient.from("notifications").insert(notification); 886 886 + await pingIdentityToUpdateNotification(recipientDid); 887 887 + } 888 888 + 889 889 + // Create notifications for document mentions 890 890 + for (const [recipientDid, mentionedDocUri] of mentionedDocuments) { 891 891 + const notification: Notification = { 892 892 + id: v7(), 893 893 + recipient: recipientDid, 894 894 + data: { 895 895 + type: "mention", 896 896 + document_uri: documentUri, 897 897 + mention_type: "document", 898 898 + mentioned_uri: mentionedDocUri, 899 899 + }, 900 900 + }; 901 901 + await supabaseServerClient.from("notifications").insert(notification); 902 902 + await pingIdentityToUpdateNotification(recipientDid); 903 903 + } 904 904 + }

+6 -4

app/(home-pages)/home/HomeLayout.tsx

··· 289 289 !!leaflet.leaflets_to_documents?.find((l) => l.document); 290 290 let drafts = !!leaflet.leaflets_in_publications?.length && !published; 291 291 let docs = !leaflet.leaflets_in_publications?.length && !archived; 292 292 - // If no filters are active, show all 292 292 + 293 293 + // If no filters are active, show everything that is not archived 293 294 if ( 294 295 !filter.drafts && 295 296 !filter.published && ··· 298 299 ) 299 300 return archived === false || archived === null || archived == undefined; 300 301 302 302 + //if a filter is on, return itemsd of that filter that are also NOT archived 301 303 return ( 302 302 - (filter.drafts && drafts) || 303 303 - (filter.published && published) || 304 304 - (filter.docs && docs) || 304 304 + (filter.drafts && drafts && !archived) || 305 305 + (filter.published && published && !archived) || 306 306 + (filter.docs && docs && !archived) || 305 307 (filter.archived && archived) 306 308 ); 307 309 },

+1 -1

app/(home-pages)/home/LeafletList/LeafletOptions.tsx

··· 108 108 await archivePost(tokenId); 109 109 toaster({ 110 110 content: ( 111 111 - <div className="font-bold flex gap-2"> 111 111 + <div className="font-bold flex gap-2 items-center"> 112 112 Archived {itemType}! 113 113 <ButtonTertiary 114 114 className="underline text-accent-2!"

+98

app/(home-pages)/notifications/CommentMentionNotification.tsx

··· 1 1 + import { 2 2 + AppBskyActorProfile, 3 3 + PubLeafletComment, 4 4 + PubLeafletDocument, 5 5 + PubLeafletPublication, 6 6 + } from "lexicons/api"; 7 7 + import { HydratedCommentMentionNotification } from "src/notifications"; 8 8 + import { blobRefToSrc } from "src/utils/blobRefToSrc"; 9 9 + import { MentionTiny } from "components/Icons/MentionTiny"; 10 10 + import { 11 11 + CommentInNotification, 12 12 + ContentLayout, 13 13 + Notification, 14 14 + } from "./Notification"; 15 15 + import { AtUri } from "@atproto/api"; 16 16 + 17 17 + export const CommentMentionNotification = ( 18 18 + props: HydratedCommentMentionNotification, 19 19 + ) => { 20 20 + const docRecord = props.commentData.documents 21 21 + ?.data as PubLeafletDocument.Record; 22 22 + const commentRecord = props.commentData.record as PubLeafletComment.Record; 23 23 + const profileRecord = props.commentData.bsky_profiles 24 24 + ?.record as AppBskyActorProfile.Record; 25 25 + const pubRecord = props.commentData.documents?.documents_in_publications[0] 26 26 + ?.publications?.record as PubLeafletPublication.Record | undefined; 27 27 + const docUri = new AtUri(props.commentData.documents?.uri!); 28 28 + const rkey = docUri.rkey; 29 29 + const did = docUri.host; 30 30 + 31 31 + const href = pubRecord 32 32 + ? `https://${pubRecord.base_path}/${rkey}?interactionDrawer=comments` 33 33 + : `/p/${did}/${rkey}?interactionDrawer=comments`; 34 34 + 35 35 + const commenter = props.commenterHandle 36 36 + ? `@${props.commenterHandle}` 37 37 + : "Someone"; 38 38 + 39 39 + let actionText: React.ReactNode; 40 40 + let mentionedDocRecord = props.mentionedDocument 41 41 + ?.data as PubLeafletDocument.Record; 42 42 + 43 43 + if (props.mention_type === "did") { 44 44 + actionText = <>{commenter} mentioned you in a comment</>; 45 45 + } else if ( 46 46 + props.mention_type === "publication" && 47 47 + props.mentionedPublication 48 48 + ) { 49 49 + const mentionedPubRecord = props.mentionedPublication 50 50 + .record as PubLeafletPublication.Record; 51 51 + actionText = ( 52 52 + <> 53 53 + {commenter} mentioned your publication{" "} 54 54 + <span className="italic">{mentionedPubRecord.name}</span> in a comment 55 55 + </> 56 56 + ); 57 57 + } else if (props.mention_type === "document" && props.mentionedDocument) { 58 58 + actionText = ( 59 59 + <> 60 60 + {commenter} mentioned your post{" "} 61 61 + <span className="italic">{mentionedDocRecord.title}</span> in a comment 62 62 + </> 63 63 + ); 64 64 + } else { 65 65 + actionText = <>{commenter} mentioned you in a comment</>; 66 66 + } 67 67 + 68 68 + return ( 69 69 + <Notification 70 70 + timestamp={props.created_at} 71 71 + href={href} 72 72 + icon={<MentionTiny />} 73 73 + actionText={actionText} 74 74 + content={ 75 75 + <ContentLayout postTitle={docRecord?.title} pubRecord={pubRecord}> 76 76 + <CommentInNotification 77 77 + className="" 78 78 + avatar={ 79 79 + profileRecord?.avatar?.ref && 80 80 + blobRefToSrc( 81 81 + profileRecord?.avatar?.ref, 82 82 + props.commentData.bsky_profiles?.did || "", 83 83 + ) 84 84 + } 85 85 + displayName={ 86 86 + profileRecord?.displayName || 87 87 + props.commentData.bsky_profiles?.handle || 88 88 + "Someone" 89 89 + } 90 90 + index={[]} 91 91 + plaintext={commentRecord.plaintext} 92 92 + facets={commentRecord.facets} 93 93 + /> 94 94 + </ContentLayout> 95 95 + } 96 96 + /> 97 97 + ); 98 98 + };

+44 -24

app/(home-pages)/notifications/MentionNotification.tsx

··· 1 1 - import { QuoteTiny } from "components/Icons/QuoteTiny"; 1 1 + import { MentionTiny } from "components/Icons/MentionTiny"; 2 2 import { ContentLayout, Notification } from "./Notification"; 3 3 - import { HydratedQuoteNotification } from "src/notifications"; 3 3 + import { HydratedMentionNotification } from "src/notifications"; 4 4 import { PubLeafletDocument, PubLeafletPublication } from "lexicons/api"; 5 5 - import { AtUri } from "@atproto/api"; 6 6 - import { Avatar } from "components/Avatar"; 5 5 + import { Agent, AtUri } from "@atproto/api"; 7 6 8 8 - export const QuoteNotification = (props: HydratedQuoteNotification) => { 9 9 - const postView = props.bskyPost.post_view as any; 10 10 - const author = postView.author; 11 11 - const displayName = author.displayName || author.handle || "Someone"; 7 7 + export const MentionNotification = (props: HydratedMentionNotification) => { 12 8 const docRecord = props.document.data as PubLeafletDocument.Record; 13 13 - const pubRecord = props.document.documents_in_publications[0]?.publications 9 9 + const pubRecord = props.document.documents_in_publications?.[0]?.publications 14 10 ?.record as PubLeafletPublication.Record | undefined; 15 11 const docUri = new AtUri(props.document.uri); 16 12 const rkey = docUri.rkey; 17 13 const did = docUri.host; 18 18 - const postText = postView.record?.text || ""; 19 14 20 15 const href = pubRecord 21 16 ? `https://${pubRecord.base_path}/${rkey}` 22 17 : `/p/${did}/${rkey}`; 23 18 19 19 + let actionText: React.ReactNode; 20 20 + let mentionedItemName: string | undefined; 21 21 + let mentionedDocRecord = props.mentionedDocument 22 22 + ?.data as PubLeafletDocument.Record; 23 23 + 24 24 + const mentioner = props.documentCreatorHandle 25 25 + ? `@${props.documentCreatorHandle}` 26 26 + : "Someone"; 27 27 + 28 28 + if (props.mention_type === "did") { 29 29 + actionText = <>{mentioner} mentioned you</>; 30 30 + } else if ( 31 31 + props.mention_type === "publication" && 32 32 + props.mentionedPublication 33 33 + ) { 34 34 + const mentionedPubRecord = props.mentionedPublication 35 35 + .record as PubLeafletPublication.Record; 36 36 + mentionedItemName = mentionedPubRecord.name; 37 37 + actionText = ( 38 38 + <> 39 39 + {mentioner} mentioned your publication{" "} 40 40 + <span className="italic">{mentionedItemName}</span> 41 41 + </> 42 42 + ); 43 43 + } else if (props.mention_type === "document" && props.mentionedDocument) { 44 44 + mentionedItemName = mentionedDocRecord.title; 45 45 + actionText = ( 46 46 + <> 47 47 + {mentioner} mentioned your post{" "} 48 48 + <span className="italic">{mentionedItemName}</span> 49 49 + </> 50 50 + ); 51 51 + } else { 52 52 + actionText = <>{mentioner} mentioned you</>; 53 53 + } 54 54 + 24 55 return ( 25 56 <Notification 26 57 timestamp={props.created_at} 27 58 href={href} 28 28 - icon={<QuoteTiny />} 29 29 - actionText={<>{displayName} quoted your post</>} 59 59 + icon={<MentionTiny />} 60 60 + actionText={actionText} 30 61 content={ 31 62 <ContentLayout postTitle={docRecord.title} pubRecord={pubRecord}> 32 32 - <div className="flex gap-2 text-sm w-full"> 33 33 - <Avatar 34 34 - src={author.avatar} 35 35 - displayName={displayName} 36 36 - /> 37 37 - <pre 38 38 - style={{ wordBreak: "break-word" }} 39 39 - className="whitespace-pre-wrap text-secondary line-clamp-3 sm:line-clamp-6" 40 40 - > 41 41 - {postText} 42 42 - </pre> 43 43 - </div> 63 63 + {docRecord.description && docRecord.description} 44 64 </ContentLayout> 45 65 } 46 66 />

+3 -3

app/(home-pages)/notifications/Notification.tsx

··· 69 69 <div 70 70 className={`border border-border-light rounded-md px-2 py-[6px] w-full ${cardBorderHidden ? "transparent" : "bg-bg-page"}`} 71 71 > 72 72 - <div className="text-tertiary text-sm italic font-bold pb-1"> 72 72 + <div className="text-tertiary text-sm italic font-bold "> 73 73 {props.postTitle} 74 74 </div> 75 75 - {props.children} 75 75 + {props.children && <div className="mb-2 text-sm">{props.children}</div>} 76 76 {props.pubRecord && ( 77 77 <> 78 78 - <hr className="mt-3 mb-1 border-border-light" /> 78 78 + <hr className="mt-1 mb-1 border-border-light" /> 79 79 <a 80 80 href={`https://${props.pubRecord.base_path}`} 81 81 className="relative text-xs text-tertiary flex gap-[6px] items-center font-bold hover:no-underline!"

+9 -1

app/(home-pages)/notifications/NotificationList.tsx

··· 7 7 import { ReplyNotification } from "./ReplyNotification"; 8 8 import { useIdentityData } from "components/IdentityProvider"; 9 9 import { FollowNotification } from "./FollowNotification"; 10 10 - import { QuoteNotification } from "./MentionNotification"; 10 10 + import { QuoteNotification } from "./QuoteNotification"; 11 11 + import { MentionNotification } from "./MentionNotification"; 12 12 + import { CommentMentionNotification } from "./CommentMentionNotification"; 11 13 12 14 export function NotificationList({ 13 15 notifications, ··· 45 47 } 46 48 if (n.type === "quote") { 47 49 return <QuoteNotification key={n.id} {...n} />; 50 50 + } 51 51 + if (n.type === "mention") { 52 52 + return <MentionNotification key={n.id} {...n} />; 53 53 + } 54 54 + if (n.type === "comment_mention") { 55 55 + return <CommentMentionNotification key={n.id} {...n} />; 48 56 } 49 57 })} 50 58 </div>

+48

app/(home-pages)/notifications/QuoteNotification.tsx

··· 1 1 + import { QuoteTiny } from "components/Icons/QuoteTiny"; 2 2 + import { ContentLayout, Notification } from "./Notification"; 3 3 + import { HydratedQuoteNotification } from "src/notifications"; 4 4 + import { PubLeafletDocument, PubLeafletPublication } from "lexicons/api"; 5 5 + import { AtUri } from "@atproto/api"; 6 6 + import { Avatar } from "components/Avatar"; 7 7 + 8 8 + export const QuoteNotification = (props: HydratedQuoteNotification) => { 9 9 + const postView = props.bskyPost.post_view as any; 10 10 + const author = postView.author; 11 11 + const displayName = author.displayName || author.handle || "Someone"; 12 12 + const docRecord = props.document.data as PubLeafletDocument.Record; 13 13 + const pubRecord = props.document.documents_in_publications[0]?.publications 14 14 + ?.record as PubLeafletPublication.Record | undefined; 15 15 + const docUri = new AtUri(props.document.uri); 16 16 + const rkey = docUri.rkey; 17 17 + const did = docUri.host; 18 18 + const postText = postView.record?.text || ""; 19 19 + 20 20 + const href = pubRecord 21 21 + ? `https://${pubRecord.base_path}/${rkey}` 22 22 + : `/p/${did}/${rkey}`; 23 23 + 24 24 + return ( 25 25 + <Notification 26 26 + timestamp={props.created_at} 27 27 + href={href} 28 28 + icon={<QuoteTiny />} 29 29 + actionText={<>{displayName} quoted your post</>} 30 30 + content={ 31 31 + <ContentLayout postTitle={docRecord.title} pubRecord={pubRecord}> 32 32 + <div className="flex gap-2 text-sm w-full"> 33 33 + <Avatar 34 34 + src={author.avatar} 35 35 + displayName={displayName} 36 36 + /> 37 37 + <pre 38 38 + style={{ wordBreak: "break-word" }} 39 39 + className="whitespace-pre-wrap text-secondary line-clamp-3 sm:line-clamp-6" 40 40 + > 41 41 + {postText} 42 42 + </pre> 43 43 + </div> 44 44 + </ContentLayout> 45 45 + } 46 46 + /> 47 47 + ); 48 48 + };

-1

app/[leaflet_id]/actions/PublishButton.tsx

··· 114 114 let { identity } = useIdentityData(); 115 115 let { permission_token } = useReplicache(); 116 116 let query = useSearchParams(); 117 117 - console.log(query.get("publish")); 118 117 let [open, setOpen] = useState(query.get("publish") !== null); 119 118 120 119 let isMobile = useIsMobile();

+105 -286

app/[leaflet_id]/publish/BskyPostEditorProsemirror.tsx

··· 1 1 "use client"; 2 2 - import { Agent, AppBskyRichtextFacet, UnicodeString } from "@atproto/api"; 3 3 - import { 4 4 - useState, 5 5 - useCallback, 6 6 - useRef, 7 7 - useLayoutEffect, 8 8 - useEffect, 9 9 - } from "react"; 10 10 - import { createPortal } from "react-dom"; 11 11 - import { useDebouncedEffect } from "src/hooks/useDebouncedEffect"; 12 12 - import * as Popover from "@radix-ui/react-popover"; 13 13 - import { EditorState, TextSelection, Plugin } from "prosemirror-state"; 2 2 + import { AppBskyRichtextFacet, UnicodeString } from "@atproto/api"; 3 3 + import { useState, useCallback, useRef, useLayoutEffect } from "react"; 4 4 + import { EditorState } from "prosemirror-state"; 14 5 import { EditorView } from "prosemirror-view"; 15 6 import { Schema, MarkSpec, Mark } from "prosemirror-model"; 16 7 import { baseKeymap } from "prosemirror-commands"; ··· 19 10 import { inputRules, InputRule } from "prosemirror-inputrules"; 20 11 import { autolink } from "components/Blocks/TextBlock/autolink-plugin"; 21 12 import { IOSBS } from "app/lish/[did]/[publication]/[rkey]/Interactions/Comments/CommentBox"; 13 13 + import { schema } from "components/Blocks/TextBlock/schema"; 14 14 + import { Mention, MentionAutocomplete } from "components/Mention"; 22 15 23 16 // Schema with only links, mentions, and hashtags marks 24 17 const bskyPostSchema = new Schema({ ··· 134 127 return tr; 135 128 }); 136 129 } 137 137 - 138 130 export function BlueskyPostEditorProsemirror(props: { 139 139 - editorStateRef: React.MutableRefObject<EditorState | null>; 131 131 + editorStateRef: React.RefObject<EditorState | null>; 140 132 initialContent?: string; 141 133 onCharCountChange?: (count: number) => void; 142 134 }) { 143 135 const mountRef = useRef<HTMLDivElement | null>(null); 144 136 const viewRef = useRef<EditorView | null>(null); 145 137 const [editorState, setEditorState] = useState<EditorState | null>(null); 146 146 - const [mentionState, setMentionState] = useState<{ 147 147 - active: boolean; 148 148 - range: { from: number; to: number } | null; 149 149 - selectedMention: { handle: string; did: string } | null; 150 150 - }>({ active: false, range: null, selectedMention: null }); 138 138 + const [mentionOpen, setMentionOpen] = useState(false); 139 139 + const [mentionCoords, setMentionCoords] = useState<{ 140 140 + top: number; 141 141 + left: number; 142 142 + } | null>(null); 143 143 + const [mentionInsertPos, setMentionInsertPos] = useState<number | null>(null); 144 144 + 145 145 + const openMentionAutocomplete = useCallback(() => { 146 146 + if (!viewRef.current) return; 147 147 + const view = viewRef.current; 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 + }); 155 155 + setMentionOpen(true); 156 156 + }, []); 151 157 152 158 const handleMentionSelect = useCallback( 153 153 - ( 154 154 - mention: { handle: string; did: string }, 155 155 - range: { from: number; to: number }, 156 156 - ) => { 157 157 - if (!viewRef.current) return; 159 159 + (mention: Mention) => { 160 160 + if (mention.type !== "did") return; 161 161 + if (!viewRef.current || mentionInsertPos === null) return; 158 162 const view = viewRef.current; 159 159 - const { from, to } = range; 163 163 + const from = mentionInsertPos - 1; 164 164 + const to = mentionInsertPos; 160 165 const tr = view.state.tr; 161 166 162 162 - // Delete the query text (keep the @) 163 163 - tr.delete(from + 1, to); 167 167 + // Delete the @ symbol 168 168 + tr.delete(from, to); 164 169 165 165 - // Insert the mention text after the @ 166 166 - const mentionText = mention.handle; 167 167 - tr.insertText(mentionText, from + 1); 170 170 + // Insert @handle 171 171 + const mentionText = "@" + mention.handle; 172 172 + tr.insertText(mentionText, from); 168 173 169 169 - // Apply mention mark to @ and handle 174 174 + // Apply mention mark 170 175 tr.addMark( 171 176 from, 172 172 - from + 1 + mentionText.length, 177 177 + from + mentionText.length, 173 178 bskyPostSchema.marks.mention.create({ did: mention.did }), 174 179 ); 175 180 176 181 // Add a space after the mention 177 177 - tr.insertText(" ", from + 1 + mentionText.length); 182 182 + tr.insertText(" ", from + mentionText.length); 178 183 179 184 view.dispatch(tr); 180 185 view.focus(); 181 186 }, 182 182 - [], 187 187 + [mentionInsertPos], 183 188 ); 184 189 185 185 - const mentionStateRef = useRef(mentionState); 186 186 - mentionStateRef.current = mentionState; 190 190 + const handleMentionOpenChange = useCallback((open: boolean) => { 191 191 + setMentionOpen(open); 192 192 + if (!open) { 193 193 + setMentionCoords(null); 194 194 + setMentionInsertPos(null); 195 195 + } 196 196 + }, []); 187 197 188 198 useLayoutEffect(() => { 189 199 if (!mountRef.current) return; 190 200 201 201 + // Input rule to trigger mention autocomplete when @ is typed 202 202 + const mentionInputRule = new InputRule( 203 203 + /(?:^|\s)@$/, 204 204 + (state, match, start, end) => { 205 205 + setTimeout(() => openMentionAutocomplete(), 0); 206 206 + return null; 207 207 + }, 208 208 + ); 209 209 + 191 210 const initialState = EditorState.create({ 192 211 schema: bskyPostSchema, 193 212 doc: props.initialContent ··· 200 219 }) 201 220 : undefined, 202 221 plugins: [ 203 203 - inputRules({ rules: [createHashtagInputRule()] }), 222 222 + inputRules({ rules: [createHashtagInputRule(), mentionInputRule] }), 204 223 keymap({ 205 224 "Mod-z": undo, 206 225 "Mod-y": redo, 207 226 "Shift-Mod-z": redo, 208 208 - Enter: (state, dispatch) => { 209 209 - // Check if mention autocomplete is active 210 210 - const currentMentionState = mentionStateRef.current; 211 211 - if ( 212 212 - currentMentionState.active && 213 213 - currentMentionState.selectedMention && 214 214 - currentMentionState.range 215 215 - ) { 216 216 - handleMentionSelect( 217 217 - currentMentionState.selectedMention, 218 218 - currentMentionState.range, 219 219 - ); 220 220 - return true; 221 221 - } 222 222 - // Otherwise let the default Enter behavior happen (new paragraph) 223 223 - return false; 224 224 - }, 225 227 }), 226 228 keymap(baseKeymap), 227 229 autolink({ ··· 258 260 view.destroy(); 259 261 viewRef.current = null; 260 262 }; 261 261 - }, [handleMentionSelect]); 263 263 + }, [openMentionAutocomplete]); 262 264 263 265 return ( 264 266 <div className="relative w-full h-full group"> 265 265 - {editorState && ( 266 266 - <MentionAutocomplete 267 267 - editorState={editorState} 268 268 - view={viewRef} 269 269 - onSelect={handleMentionSelect} 270 270 - onMentionStateChange={(active, range, selectedMention) => { 271 271 - setMentionState({ active, range, selectedMention }); 272 272 - }} 273 273 - /> 274 274 - )} 267 267 + <MentionAutocomplete 268 268 + open={mentionOpen} 269 269 + onOpenChange={handleMentionOpenChange} 270 270 + view={viewRef} 271 271 + onSelect={handleMentionSelect} 272 272 + coords={mentionCoords} 273 273 + /> 275 274 {editorState?.doc.textContent.length === 0 && ( 276 275 <div className="italic text-tertiary absolute top-0 left-0 pointer-events-none"> 277 276 Write a post to share your writing! ··· 290 289 ); 291 290 } 292 291 293 293 - function MentionAutocomplete(props: { 294 294 - editorState: EditorState; 295 295 - view: React.RefObject<EditorView | null>; 296 296 - onSelect: ( 297 297 - mention: { handle: string; did: string }, 298 298 - range: { from: number; to: number }, 299 299 - ) => void; 300 300 - onMentionStateChange: ( 301 301 - active: boolean, 302 302 - range: { from: number; to: number } | null, 303 303 - selectedMention: { handle: string; did: string } | null, 304 304 - ) => void; 305 305 - }) { 306 306 - const [mentionQuery, setMentionQuery] = useState<string | null>(null); 307 307 - const [mentionRange, setMentionRange] = useState<{ 308 308 - from: number; 309 309 - to: number; 310 310 - } | null>(null); 311 311 - const [mentionCoords, setMentionCoords] = useState<{ 312 312 - top: number; 313 313 - left: number; 314 314 - } | null>(null); 315 315 - 316 316 - const { suggestionIndex, setSuggestionIndex, suggestions } = 317 317 - useMentionSuggestions(mentionQuery); 318 318 - 319 319 - // Check for mention pattern whenever editor state changes 320 320 - useEffect(() => { 321 321 - const { $from } = props.editorState.selection; 322 322 - const textBefore = $from.parent.textBetween( 323 323 - Math.max(0, $from.parentOffset - 50), 324 324 - $from.parentOffset, 325 325 - null, 326 326 - "\ufffc", 327 327 - ); 328 328 - 329 329 - // Look for @ followed by word characters before cursor 330 330 - const match = textBefore.match(/@([\w.]*)$/); 331 331 - 332 332 - if (match && props.view.current) { 333 333 - const queryBefore = match[1]; 334 334 - const from = $from.pos - queryBefore.length - 1; 335 335 - 336 336 - // Get text after cursor to find the rest of the handle 337 337 - const textAfter = $from.parent.textBetween( 338 338 - $from.parentOffset, 339 339 - Math.min($from.parent.content.size, $from.parentOffset + 50), 340 340 - null, 341 341 - "\ufffc", 342 342 - ); 343 343 - 344 344 - // Match word characters after cursor until space or end 345 345 - const afterMatch = textAfter.match(/^([\w.]*)/); 346 346 - const queryAfter = afterMatch ? afterMatch[1] : ""; 347 347 - 348 348 - // Combine the full handle 349 349 - const query = queryBefore + queryAfter; 350 350 - const to = $from.pos + queryAfter.length; 351 351 - 352 352 - setMentionQuery(query); 353 353 - setMentionRange({ from, to }); 354 354 - 355 355 - // Get coordinates for the autocomplete popup 356 356 - const coords = props.view.current.coordsAtPos(from); 357 357 - setMentionCoords({ 358 358 - top: coords.bottom + window.scrollY, 359 359 - left: coords.left + window.scrollX, 360 360 - }); 361 361 - setSuggestionIndex(0); 362 362 - } else { 363 363 - setMentionQuery(null); 364 364 - setMentionRange(null); 365 365 - setMentionCoords(null); 366 366 - } 367 367 - }, [props.editorState, props.view, setSuggestionIndex]); 368 368 - 369 369 - // Update parent's mention state 370 370 - useEffect(() => { 371 371 - const active = mentionQuery !== null && suggestions.length > 0; 372 372 - const selectedMention = 373 373 - active && suggestions[suggestionIndex] 374 374 - ? suggestions[suggestionIndex] 375 375 - : null; 376 376 - props.onMentionStateChange(active, mentionRange, selectedMention); 377 377 - }, [mentionQuery, suggestions, suggestionIndex, mentionRange]); 378 378 - 379 379 - // Handle keyboard navigation for arrow keys only 380 380 - useEffect(() => { 381 381 - if (!mentionQuery || !props.view.current) return; 382 382 - 383 383 - const handleKeyDown = (e: KeyboardEvent) => { 384 384 - if (suggestions.length === 0) return; 385 385 - 386 386 - if (e.key === "ArrowUp") { 387 387 - e.preventDefault(); 388 388 - if (suggestionIndex > 0) { 389 389 - setSuggestionIndex((i) => i - 1); 390 390 - } 391 391 - } else if (e.key === "ArrowDown") { 392 392 - e.preventDefault(); 393 393 - if (suggestionIndex < suggestions.length - 1) { 394 394 - setSuggestionIndex((i) => i + 1); 395 395 - } 396 396 - } 397 397 - }; 398 398 - 399 399 - const dom = props.view.current.dom; 400 400 - dom.addEventListener("keydown", handleKeyDown); 401 401 - 402 402 - return () => { 403 403 - dom.removeEventListener("keydown", handleKeyDown); 404 404 - }; 405 405 - }, [ 406 406 - mentionQuery, 407 407 - suggestions, 408 408 - suggestionIndex, 409 409 - props.view, 410 410 - setSuggestionIndex, 411 411 - ]); 412 412 - 413 413 - if (!mentionCoords || suggestions.length === 0) return null; 414 414 - 415 415 - // The styles in this component should match the Menu styles in components/Layout.tsx 416 416 - return ( 417 417 - <Popover.Root open> 418 418 - {createPortal( 419 419 - <Popover.Anchor 420 420 - style={{ 421 421 - top: mentionCoords.top, 422 422 - left: mentionCoords.left, 423 423 - position: "absolute", 424 424 - }} 425 425 - />, 426 426 - document.body, 427 427 - )} 428 428 - <Popover.Portal> 429 429 - <Popover.Content 430 430 - side="bottom" 431 431 - align="start" 432 432 - sideOffset={4} 433 433 - collisionPadding={20} 434 434 - onOpenAutoFocus={(e) => e.preventDefault()} 435 435 - className={`dropdownMenu z-20 bg-bg-page flex flex-col py-1 gap-0.5 border border-border rounded-md shadow-md`} 436 436 - > 437 437 - <ul className="list-none p-0 text-sm"> 438 438 - {suggestions.map((result, index) => { 439 439 - return ( 440 440 - <div 441 441 - className={` 442 442 - MenuItem 443 443 - font-bold z-10 py-1 px-3 444 444 - text-left text-secondary 445 445 - flex gap-2 446 446 - ${index === suggestionIndex ? "bg-border-light data-[highlighted]:text-secondary" : ""} 447 447 - hover:bg-border-light hover:text-secondary 448 448 - outline-none 449 449 - `} 450 450 - key={result.did} 451 451 - onClick={() => { 452 452 - if (mentionRange) { 453 453 - props.onSelect(result, mentionRange); 454 454 - setMentionQuery(null); 455 455 - setMentionRange(null); 456 456 - setMentionCoords(null); 457 457 - } 458 458 - }} 459 459 - onMouseDown={(e) => e.preventDefault()} 460 460 - > 461 461 - @{result.handle} 462 462 - </div> 463 463 - ); 464 464 - })} 465 465 - </ul> 466 466 - </Popover.Content> 467 467 - </Popover.Portal> 468 468 - </Popover.Root> 469 469 - ); 470 470 - } 471 471 - 472 472 - function useMentionSuggestions(query: string | null) { 473 473 - const [suggestionIndex, setSuggestionIndex] = useState(0); 474 474 - const [suggestions, setSuggestions] = useState< 475 475 - { handle: string; did: string }[] 476 476 - >([]); 477 477 - 478 478 - useDebouncedEffect( 479 479 - async () => { 480 480 - if (!query) { 481 481 - setSuggestions([]); 482 482 - return; 483 483 - } 484 484 - 485 485 - const agent = new Agent("https://public.api.bsky.app"); 486 486 - const result = await agent.searchActorsTypeahead({ 487 487 - q: query, 488 488 - limit: 8, 489 489 - }); 490 490 - setSuggestions( 491 491 - result.data.actors.map((actor) => ({ 492 492 - handle: actor.handle, 493 493 - did: actor.did, 494 494 - })), 495 495 - ); 496 496 - }, 497 497 - 300, 498 498 - [query], 499 499 - ); 500 500 - 501 501 - useEffect(() => { 502 502 - if (suggestionIndex > suggestions.length - 1) { 503 503 - setSuggestionIndex(Math.max(0, suggestions.length - 1)); 504 504 - } 505 505 - }, [suggestionIndex, suggestions.length]); 506 506 - 507 507 - return { 508 508 - suggestions, 509 509 - suggestionIndex, 510 510 - setSuggestionIndex, 511 511 - }; 512 512 - } 513 513 - 514 292 /** 515 293 * Converts a ProseMirror editor state to Bluesky post facets. 516 294 * Extracts mentions, links, and hashtags from the editor state and returns them ··· 595 373 596 374 return features; 597 375 } 376 376 + 377 377 + export const addMentionToEditor = ( 378 378 + mention: Mention, 379 379 + range: { from: number; to: number }, 380 380 + view: EditorView, 381 381 + ) => { 382 382 + console.log("view", view); 383 383 + if (!view) return; 384 384 + const { from, to } = range; 385 385 + const tr = view.state.tr; 386 386 + 387 387 + if (mention.type == "did") { 388 388 + // Delete the @ and any query text 389 389 + tr.delete(from, to); 390 390 + // Insert didMention inline node 391 391 + const mentionText = "@" + mention.handle; 392 392 + const didMentionNode = schema.nodes.didMention.create({ 393 393 + did: mention.did, 394 394 + text: mentionText, 395 395 + }); 396 396 + tr.insert(from, didMentionNode); 397 397 + } 398 398 + if (mention.type === "publication" || mention.type === "post") { 399 399 + // Delete the @ and any query text 400 400 + tr.delete(from, to); 401 401 + let name = mention.type == "post" ? mention.title : mention.name; 402 402 + // Insert atMention inline node 403 403 + const atMentionNode = schema.nodes.atMention.create({ 404 404 + atURI: mention.uri, 405 405 + text: name, 406 406 + }); 407 407 + tr.insert(from, atMentionNode); 408 408 + } 409 409 + console.log("yo", mention); 410 410 + 411 411 + // Add a space after the mention 412 412 + tr.insertText(" ", from + 1); 413 413 + 414 414 + view.dispatch(tr); 415 415 + view.focus(); 416 416 + };

+1 -1

app/api/link_previews/route.ts

··· 22 22 let result = await get_link_metadata(url); 23 23 return Response.json(result); 24 24 } else { 25 25 - let result = await get_link_image_preview(url); 25 25 + let result = await get_link_image_preview(body.url); 26 26 return Response.json(result); 27 27 } 28 28 }

+145

app/api/pub_icon/route.ts

··· 1 1 + import { AtUri } from "@atproto/syntax"; 2 2 + import { IdResolver } from "@atproto/identity"; 3 3 + import { NextRequest, NextResponse } from "next/server"; 4 4 + import { PubLeafletPublication } from "lexicons/api"; 5 5 + import { supabaseServerClient } from "supabase/serverClient"; 6 6 + import sharp from "sharp"; 7 7 + 8 8 + const idResolver = new IdResolver(); 9 9 + 10 10 + export const runtime = "nodejs"; 11 11 + 12 12 + export async function GET(req: NextRequest) { 13 13 + const searchParams = req.nextUrl.searchParams; 14 14 + const bgColor = searchParams.get("bg") || "#0000E1"; 15 15 + const fgColor = searchParams.get("fg") || "#FFFFFF"; 16 16 + 17 17 + try { 18 18 + const at_uri = searchParams.get("at_uri"); 19 19 + 20 20 + if (!at_uri) { 21 21 + return new NextResponse(null, { status: 400 }); 22 22 + } 23 23 + 24 24 + // Parse the AT URI 25 25 + let uri: AtUri; 26 26 + try { 27 27 + uri = new AtUri(at_uri); 28 28 + } catch (e) { 29 29 + return new NextResponse(null, { status: 400 }); 30 30 + } 31 31 + 32 32 + let publicationRecord: PubLeafletPublication.Record | null = null; 33 33 + let publicationUri: string; 34 34 + 35 35 + // Check if it's a document or publication 36 36 + if (uri.collection === "pub.leaflet.document") { 37 37 + // Query the documents_in_publications table to get the publication 38 38 + const { data: docInPub } = await supabaseServerClient 39 39 + .from("documents_in_publications") 40 40 + .select("publication, publications(record)") 41 41 + .eq("document", at_uri) 42 42 + .single(); 43 43 + 44 44 + if (!docInPub || !docInPub.publications) { 45 45 + return new NextResponse(null, { status: 404 }); 46 46 + } 47 47 + 48 48 + publicationUri = docInPub.publication; 49 49 + publicationRecord = docInPub.publications 50 50 + .record as PubLeafletPublication.Record; 51 51 + } else if (uri.collection === "pub.leaflet.publication") { 52 52 + // Query the publications table directly 53 53 + const { data: publication } = await supabaseServerClient 54 54 + .from("publications") 55 55 + .select("record, uri") 56 56 + .eq("uri", at_uri) 57 57 + .single(); 58 58 + 59 59 + if (!publication || !publication.record) { 60 60 + return new NextResponse(null, { status: 404 }); 61 61 + } 62 62 + 63 63 + publicationUri = publication.uri; 64 64 + publicationRecord = publication.record as PubLeafletPublication.Record; 65 65 + } else { 66 66 + // Not a supported collection 67 67 + return new NextResponse(null, { status: 404 }); 68 68 + } 69 69 + 70 70 + // Check if the publication has an icon 71 71 + if (!publicationRecord?.icon) { 72 72 + // Generate a placeholder with the first letter of the publication name 73 73 + const firstLetter = (publicationRecord?.name || "?") 74 74 + .slice(0, 1) 75 75 + .toUpperCase(); 76 76 + 77 77 + // Create a simple SVG placeholder with theme colors 78 78 + const svg = `<svg width="96" height="96" xmlns="http://www.w3.org/2000/svg"> 79 79 + <rect width="96" height="96" rx="48" ry="48" fill="${bgColor}"/> 80 80 + <text x="50%" y="50%" font-size="64" font-weight="bold" font-family="Arial, Helvetica, sans-serif" fill="${fgColor}" text-anchor="middle" dominant-baseline="central">${firstLetter}</text> 81 81 + </svg>`; 82 82 + 83 83 + return new NextResponse(svg, { 84 84 + headers: { 85 85 + "Content-Type": "image/svg+xml", 86 86 + "Cache-Control": 87 87 + "public, max-age=3600, s-maxage=3600, stale-while-revalidate=2592000", 88 88 + "CDN-Cache-Control": "s-maxage=3600, stale-while-revalidate=2592000", 89 89 + }, 90 90 + }); 91 91 + } 92 92 + 93 93 + // Parse the publication URI to get the DID 94 94 + const pubUri = new AtUri(publicationUri); 95 95 + 96 96 + // Get the CID from the icon blob 97 97 + const cid = (publicationRecord.icon.ref as unknown as { $link: string })[ 98 98 + "$link" 99 99 + ]; 100 100 + 101 101 + // Fetch the blob from the PDS 102 102 + const identity = await idResolver.did.resolve(pubUri.host); 103 103 + const service = identity?.service?.find((f) => f.id === "#atproto_pds"); 104 104 + if (!service) return new NextResponse(null, { status: 404 }); 105 105 + 106 106 + const blobResponse = await fetch( 107 107 + `${service.serviceEndpoint}/xrpc/com.atproto.sync.getBlob?did=${pubUri.host}&cid=${cid}`, 108 108 + { 109 109 + headers: { 110 110 + "Accept-Encoding": "gzip, deflate, br, zstd", 111 111 + }, 112 112 + }, 113 113 + ); 114 114 + 115 115 + if (!blobResponse.ok) { 116 116 + return new NextResponse(null, { status: 404 }); 117 117 + } 118 118 + 119 119 + // Get the image buffer 120 120 + const imageBuffer = await blobResponse.arrayBuffer(); 121 121 + 122 122 + // Resize to 96x96 using Sharp 123 123 + const resizedImage = await sharp(Buffer.from(imageBuffer)) 124 124 + .resize(96, 96, { 125 125 + fit: "cover", 126 126 + position: "center", 127 127 + }) 128 128 + .webp({ quality: 90 }) 129 129 + .toBuffer(); 130 130 + 131 131 + // Return with caching headers 132 132 + return new NextResponse(resizedImage, { 133 133 + headers: { 134 134 + "Content-Type": "image/webp", 135 135 + // Cache for 1 hour, but serve stale for much longer while revalidating 136 136 + "Cache-Control": 137 137 + "public, max-age=3600, s-maxage=3600, stale-while-revalidate=2592000", 138 138 + "CDN-Cache-Control": "s-maxage=3600, stale-while-revalidate=2592000", 139 139 + }, 140 140 + }); 141 141 + } catch (error) { 142 142 + console.error("Error fetching publication icon:", error); 143 143 + return new NextResponse(null, { status: 500 }); 144 144 + } 145 145 + }

+4

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

··· 11 11 } from "./domain_routes"; 12 12 import { get_leaflet_data } from "./get_leaflet_data"; 13 13 import { get_publication_data } from "./get_publication_data"; 14 14 + import { search_publication_names } from "./search_publication_names"; 15 15 + import { search_publication_documents } from "./search_publication_documents"; 14 16 15 17 let supabase = createClient<Database>( 16 18 process.env.NEXT_PUBLIC_SUPABASE_API_URL as string, ··· 35 37 get_leaflet_subdomain_status, 36 38 get_leaflet_data, 37 39 get_publication_data, 40 40 + search_publication_names, 41 41 + search_publication_documents, 38 42 ]; 39 43 export async function POST( 40 44 req: Request,

+41

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

··· 1 1 + import { z } from "zod"; 2 2 + import { makeRoute } from "../lib"; 3 3 + import type { Env } from "./route"; 4 4 + 5 5 + export type SearchPublicationDocumentsReturnType = Awaited< 6 6 + ReturnType<(typeof search_publication_documents)["handler"]> 7 7 + >; 8 8 + 9 9 + export const search_publication_documents = makeRoute({ 10 10 + route: "search_publication_documents", 11 11 + input: z.object({ 12 12 + publication_uri: z.string(), 13 13 + query: z.string(), 14 14 + limit: z.number().optional().default(10), 15 15 + }), 16 16 + handler: async ( 17 17 + { publication_uri, query, limit }, 18 18 + { supabase }: Pick<Env, "supabase">, 19 19 + ) => { 20 20 + // Get documents in the publication, filtering by title using JSON operator 21 21 + const { data: documents, error } = await supabase 22 22 + .from("documents_in_publications") 23 23 + .select("document, documents!inner(uri, data)") 24 24 + .eq("publication", publication_uri) 25 25 + .ilike("documents.data->>title", `%${query}%`) 26 26 + .limit(limit); 27 27 + 28 28 + if (error) { 29 29 + throw new Error( 30 30 + `Failed to search publication documents: ${error.message}`, 31 31 + ); 32 32 + } 33 33 + 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 + })); 38 38 + 39 39 + return { result: { documents: result } }; 40 40 + }, 41 41 + });

+37

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 + 5 5 + export type SearchPublicationNamesReturnType = Awaited< 6 6 + ReturnType<(typeof search_publication_names)["handler"]> 7 7 + >; 8 8 + 9 9 + export const search_publication_names = makeRoute({ 10 10 + route: "search_publication_names", 11 11 + input: z.object({ 12 12 + query: z.string(), 13 13 + limit: z.number().optional().default(10), 14 14 + }), 15 15 + handler: async ( 16 16 + { query, limit }, 17 17 + { supabase }: Pick<Env, "supabase">, 18 18 + ) => { 19 19 + // Search publications by name in record (case-insensitive partial match) 20 20 + const { data: publications, error } = await supabase 21 21 + .from("publications") 22 22 + .select("uri, record") 23 23 + .ilike("record->>name", `%${query}%`) 24 24 + .limit(limit); 25 25 + 26 26 + if (error) { 27 27 + throw new Error(`Failed to search publications: ${error.message}`); 28 28 + } 29 29 + 30 30 + const result = publications.map((p) => ({ 31 31 + uri: p.uri, 32 32 + name: (p.record as { name?: string })?.name || "Untitled", 33 33 + })); 34 34 + 35 35 + return { result: { publications: result } }; 36 36 + }, 37 37 + });

+13

app/globals.css

··· 211 211 212 212 /* END GLOBAL STYLING */ 213 213 } 214 214 + 215 215 + img { 216 216 + font-size: 0; 217 217 + } 218 218 + 214 219 button:hover { 215 220 cursor: pointer; 216 221 } ··· 289 294 .selected .selection-highlight { 290 295 background-color: Highlight; 291 296 @apply py-[1.5px]; 297 297 + } 298 298 + 299 299 + /* Underline mention nodes when selected in ProseMirror */ 300 300 + .ProseMirror .atMention.ProseMirror-selectednode, 301 301 + .ProseMirror .didMention.ProseMirror-selectednode { 302 302 + text-decoration: underline; 292 303 } 293 304 294 305 .ProseMirror:focus-within .selection-highlight { ··· 414 425 outline: none !important; 415 426 cursor: pointer; 416 427 background-color: transparent; 428 428 + display: flex; 429 429 + gap: 0.5rem; 417 430 418 431 :hover { 419 432 text-decoration: none !important;

+30

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

··· 1 1 import { UnicodeString } from "@atproto/api"; 2 2 import { PubLeafletRichtextFacet } from "lexicons/api"; 3 3 + import { didToBlueskyUrl } from "src/utils/mentionUtils"; 4 4 + import { AtMentionLink } from "components/AtMentionLink"; 3 5 4 6 type Facet = PubLeafletRichtextFacet.Main; 5 7 export function BaseTextBlock(props: { ··· 21 23 let isCode = segment.facet?.find(PubLeafletRichtextFacet.isCode); 22 24 let isStrikethrough = segment.facet?.find( 23 25 PubLeafletRichtextFacet.isStrikethrough, 26 26 + ); 27 27 + let isDidMention = segment.facet?.find( 28 28 + PubLeafletRichtextFacet.isDidMention, 29 29 + ); 30 30 + let isAtMention = segment.facet?.find( 31 31 + PubLeafletRichtextFacet.isAtMention, 24 32 ); 25 33 let isUnderline = segment.facet?.find(PubLeafletRichtextFacet.isUnderline); 26 34 let isItalic = segment.facet?.find(PubLeafletRichtextFacet.isItalic); ··· 47 55 <code key={counter} className={className} id={id?.id}> 48 56 {renderedText} 49 57 </code>, 58 58 + ); 59 59 + } else if (isDidMention) { 60 60 + children.push( 61 61 + <a 62 62 + key={counter} 63 63 + href={didToBlueskyUrl(isDidMention.did)} 64 64 + className={`text-accent-contrast hover:underline cursor-pointer ${className}`} 65 65 + target="_blank" 66 66 + rel="noopener noreferrer" 67 67 + > 68 68 + {renderedText} 69 69 + </a>, 70 70 + ); 71 71 + } else if (isAtMention) { 72 72 + children.push( 73 73 + <AtMentionLink 74 74 + key={counter} 75 75 + atURI={isAtMention.atURI} 76 76 + className={className} 77 77 + > 78 78 + {renderedText} 79 79 + </AtMentionLink>, 50 80 ); 51 81 } else if (link) { 52 82 children.push(

+6 -4

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

··· 22 22 import { useDrawerOpen } from "./Interactions/InteractionDrawer"; 23 23 import { PollData } from "./fetchPollData"; 24 24 import { SharedPageProps } from "./PostPages"; 25 25 + import { useIsMobile } from "src/hooks/isMobile"; 25 26 26 27 export function CanvasPage({ 27 28 blocks, ··· 206 207 quotesCount: number | undefined; 207 208 commentsCount: number | undefined; 208 209 }) => { 210 210 + let isMobile = useIsMobile(); 209 211 return ( 210 210 - <div className="flex flex-row gap-3 items-center absolute top-6 right-3 sm:top-4 sm:right-4 bg-bg-page border-border-light rounded-md px-2 py-1 h-fit z-20"> 212 212 + <div className="flex flex-row gap-3 items-center absolute top-3 right-3 sm:top-4 sm:right-4 bg-bg-page border-border-light rounded-md px-2 py-1 h-fit z-20"> 211 213 <Interactions 212 214 quotesCount={props.quotesCount || 0} 213 215 commentsCount={props.commentsCount || 0} ··· 219 221 <> 220 222 <Separator classname="h-5" /> 221 223 <Popover 222 222 - side="left" 223 223 - align="start" 224 224 - className="flex flex-col gap-2 p-0! max-w-sm w-[1000px]" 224 224 + side="bottom" 225 225 + align="end" 226 226 + className={`flex flex-col gap-2 p-0! text-primary ${isMobile ? "w-full" : "max-w-sm w-[1000px] t"}`} 225 227 trigger={<InfoSmall />} 226 228 > 227 229 <PostHeader

+223 -11

app/lish/[did]/[publication]/[rkey]/Interactions/Comments/CommentBox.tsx

··· 8 8 import { EditorState, TextSelection } from "prosemirror-state"; 9 9 import { EditorView } from "prosemirror-view"; 10 10 import { history, redo, undo } from "prosemirror-history"; 11 11 + import { InputRule, inputRules } from "prosemirror-inputrules"; 11 12 import { 12 13 MutableRefObject, 13 14 RefObject, 15 15 + useCallback, 14 16 useEffect, 15 17 useLayoutEffect, 16 18 useRef, ··· 36 38 import { CloseTiny } from "components/Icons/CloseTiny"; 37 39 import { CloseFillTiny } from "components/Icons/CloseFillTiny"; 38 40 import { betterIsUrl } from "src/utils/isURL"; 41 41 + import { Mention, MentionAutocomplete } from "components/Mention"; 42 42 + import { didToBlueskyUrl, atUriToUrl } from "src/utils/mentionUtils"; 43 43 + 44 44 + const addMentionToEditor = ( 45 45 + mention: Mention, 46 46 + range: { from: number; to: number }, 47 47 + view: EditorView, 48 48 + ) => { 49 49 + if (!view) return; 50 50 + const { from, to } = range; 51 51 + const tr = view.state.tr; 52 52 + 53 53 + if (mention.type === "did") { 54 54 + // Delete the @ and any query text 55 55 + tr.delete(from, to); 56 56 + // Insert didMention inline node 57 57 + const mentionText = "@" + mention.handle; 58 58 + const didMentionNode = multiBlockSchema.nodes.didMention.create({ 59 59 + did: mention.did, 60 60 + text: mentionText, 61 61 + }); 62 62 + tr.insert(from, didMentionNode); 63 63 + // Add a space after the mention 64 64 + tr.insertText(" ", from + 1); 65 65 + } 66 66 + if (mention.type === "publication" || mention.type === "post") { 67 67 + // Delete the @ and any query text 68 68 + tr.delete(from, to); 69 69 + let name = mention.type === "post" ? mention.title : mention.name; 70 70 + // Insert atMention inline node 71 71 + const atMentionNode = multiBlockSchema.nodes.atMention.create({ 72 72 + atURI: mention.uri, 73 73 + text: name, 74 74 + }); 75 75 + tr.insert(from, atMentionNode); 76 76 + // Add a space after the mention 77 77 + tr.insertText(" ", from + 1); 78 78 + } 79 79 + 80 80 + view.dispatch(tr); 81 81 + view.focus(); 82 82 + }; 39 83 40 84 export function CommentBox(props: { 41 85 doc_uri: string; ··· 50 94 commentBox: { quote }, 51 95 } = useInteractionState(props.doc_uri); 52 96 let [loading, setLoading] = useState(false); 97 97 + let view = useRef<null | EditorView>(null); 98 98 + 99 99 + // Mention autocomplete state 100 100 + const [mentionOpen, setMentionOpen] = useState(false); 101 101 + const [mentionCoords, setMentionCoords] = useState<{ 102 102 + top: number; 103 103 + left: number; 104 104 + } | null>(null); 105 105 + // Use a ref for insert position to avoid stale closure issues 106 106 + const mentionInsertPosRef = useRef<number | null>(null); 107 107 + 108 108 + // Use a ref for the callback so input rules can access it 109 109 + const openMentionAutocompleteRef = useRef<() => void>(() => {}); 110 110 + openMentionAutocompleteRef.current = () => { 111 111 + if (!view.current) return; 53 112 54 54 - const handleSubmit = async () => { 113 113 + const pos = view.current.state.selection.from; 114 114 + mentionInsertPosRef.current = pos; 115 115 + 116 116 + // Get coordinates for the popup relative to the positioned parent 117 117 + const coords = view.current.coordsAtPos(pos - 1); 118 118 + 119 119 + // Find the relative positioned parent container 120 120 + const editorEl = view.current.dom; 121 121 + const container = editorEl.closest(".relative") as HTMLElement | null; 122 122 + 123 123 + if (container) { 124 124 + const containerRect = container.getBoundingClientRect(); 125 125 + setMentionCoords({ 126 126 + top: coords.bottom - containerRect.top, 127 127 + left: coords.left - containerRect.left, 128 128 + }); 129 129 + } else { 130 130 + setMentionCoords({ 131 131 + top: coords.bottom, 132 132 + left: coords.left, 133 133 + }); 134 134 + } 135 135 + setMentionOpen(true); 136 136 + }; 137 137 + 138 138 + const handleMentionSelect = useCallback((mention: Mention) => { 139 139 + if (!view.current || mentionInsertPosRef.current === null) return; 140 140 + 141 141 + const from = mentionInsertPosRef.current - 1; 142 142 + const to = mentionInsertPosRef.current; 143 143 + 144 144 + addMentionToEditor(mention, { from, to }, view.current); 145 145 + view.current.focus(); 146 146 + }, []); 147 147 + 148 148 + const handleMentionOpenChange = useCallback((open: boolean) => { 149 149 + setMentionOpen(open); 150 150 + if (!open) { 151 151 + setMentionCoords(null); 152 152 + mentionInsertPosRef.current = null; 153 153 + } 154 154 + }, []); 155 155 + 156 156 + // Use a ref for handleSubmit so keyboard shortcuts can access it 157 157 + const handleSubmitRef = useRef<() => Promise<void>>(async () => {}); 158 158 + handleSubmitRef.current = async () => { 55 159 if (loading || !view.current) return; 56 160 57 161 setLoading(true); ··· 114 218 "Mod-y": redo, 115 219 "Shift-Mod-z": redo, 116 220 "Ctrl-Enter": () => { 117 117 - handleSubmit(); 221 221 + handleSubmitRef.current(); 118 222 return true; 119 223 }, 120 224 "Meta-Enter": () => { 121 121 - handleSubmit(); 225 225 + handleSubmitRef.current(); 122 226 return true; 123 227 }, 124 228 }), ··· 128 232 shouldAutoLink: () => true, 129 233 defaultProtocol: "https", 130 234 }), 235 235 + // Input rules for @ mentions 236 236 + inputRules({ 237 237 + rules: [ 238 238 + // @ at start of line or after space 239 239 + new InputRule(/(?:^|\s)@$/, (state, match, start, end) => { 240 240 + setTimeout(() => openMentionAutocompleteRef.current(), 0); 241 241 + return null; 242 242 + }), 243 243 + ], 244 244 + }), 131 245 history(), 132 246 ], 133 247 }), 134 248 ); 135 135 - let view = useRef<null | EditorView>(null); 136 249 useLayoutEffect(() => { 137 250 if (!mountRef.current) return; 138 251 view.current = new EditorView( ··· 187 300 handleClickOn: (view, _pos, node, _nodePos, _event, direct) => { 188 301 if (!direct) return; 189 302 if (node.nodeSize - 2 <= _pos) return; 303 303 + 304 304 + const nodeAt1 = node.nodeAt(_pos - 1); 305 305 + const nodeAt2 = node.nodeAt(Math.max(_pos - 2, 0)); 306 306 + 307 307 + // Check for link marks 190 308 let mark = 191 191 - node 192 192 - .nodeAt(_pos - 1) 193 193 - ?.marks.find((f) => f.type === multiBlockSchema.marks.link) || 194 194 - node 195 195 - .nodeAt(Math.max(_pos - 2, 0)) 196 196 - ?.marks.find((f) => f.type === multiBlockSchema.marks.link); 309 309 + nodeAt1?.marks.find( 310 310 + (f) => f.type === multiBlockSchema.marks.link, 311 311 + ) || 312 312 + nodeAt2?.marks.find((f) => f.type === multiBlockSchema.marks.link); 197 313 if (mark) { 198 314 window.open(mark.attrs.href, "_blank"); 315 315 + return; 316 316 + } 317 317 + 318 318 + // Check for didMention inline nodes 319 319 + if (nodeAt1?.type === multiBlockSchema.nodes.didMention) { 320 320 + window.open( 321 321 + didToBlueskyUrl(nodeAt1.attrs.did), 322 322 + "_blank", 323 323 + "noopener,noreferrer", 324 324 + ); 325 325 + return; 326 326 + } 327 327 + if (nodeAt2?.type === multiBlockSchema.nodes.didMention) { 328 328 + window.open( 329 329 + didToBlueskyUrl(nodeAt2.attrs.did), 330 330 + "_blank", 331 331 + "noopener,noreferrer", 332 332 + ); 333 333 + return; 334 334 + } 335 335 + 336 336 + // Check for atMention inline nodes (publications/documents) 337 337 + if (nodeAt1?.type === multiBlockSchema.nodes.atMention) { 338 338 + window.open( 339 339 + atUriToUrl(nodeAt1.attrs.atURI), 340 340 + "_blank", 341 341 + "noopener,noreferrer", 342 342 + ); 343 343 + return; 344 344 + } 345 345 + if (nodeAt2?.type === multiBlockSchema.nodes.atMention) { 346 346 + window.open( 347 347 + atUriToUrl(nodeAt2.attrs.atURI), 348 348 + "_blank", 349 349 + "noopener,noreferrer", 350 350 + ); 351 351 + return; 199 352 } 200 353 }, 201 354 dispatchTransaction(tr) { ··· 236 389 <div className="w-full relative group"> 237 390 <pre 238 391 ref={mountRef} 392 392 + onFocus={() => { 393 393 + // Close mention dropdown when editor gains focus (reset stale state) 394 394 + handleMentionOpenChange(false); 395 395 + }} 396 396 + onBlur={(e) => { 397 397 + // Close mention dropdown when editor loses focus 398 398 + // But not if focus moved to the mention autocomplete 399 399 + const relatedTarget = e.relatedTarget as HTMLElement | null; 400 400 + if (!relatedTarget?.closest(".dropdownMenu")) { 401 401 + handleMentionOpenChange(false); 402 402 + } 403 403 + }} 239 404 className={`border whitespace-pre-wrap input-with-border min-h-32 h-fit px-2! py-[6px]!`} 240 405 /> 241 406 <IOSBS view={view} /> 407 407 + <MentionAutocomplete 408 408 + open={mentionOpen} 409 409 + onOpenChange={handleMentionOpenChange} 410 410 + view={view} 411 411 + onSelect={handleMentionSelect} 412 412 + coords={mentionCoords} 413 413 + /> 242 414 </div> 243 415 <div className="flex justify-between pt-1"> 244 416 <div className="flex gap-1"> ··· 261 433 view={view} 262 434 /> 263 435 </div> 264 264 - <ButtonPrimary compact onClick={handleSubmit}> 436 436 + <ButtonPrimary compact onClick={() => handleSubmitRef.current()}> 265 437 {loading ? <DotLoader /> : <ShareSmall />} 266 438 </ButtonPrimary> 267 439 </div> ··· 328 500 facets.push(facet); 329 501 } 330 502 } 503 503 + 504 504 + fullText += text; 505 505 + byteOffset += unicodeString.length; 506 506 + } else if (node.type.name === "didMention") { 507 507 + // Handle DID mention nodes 508 508 + const text = node.attrs.text || ""; 509 509 + const unicodeString = new UnicodeString(text); 510 510 + 511 511 + facets.push({ 512 512 + index: { 513 513 + byteStart: byteOffset, 514 514 + byteEnd: byteOffset + unicodeString.length, 515 515 + }, 516 516 + features: [ 517 517 + { 518 518 + $type: "pub.leaflet.richtext.facet#didMention", 519 519 + did: node.attrs.did, 520 520 + }, 521 521 + ], 522 522 + }); 523 523 + 524 524 + fullText += text; 525 525 + byteOffset += unicodeString.length; 526 526 + } else if (node.type.name === "atMention") { 527 527 + // Handle AT-URI mention nodes (publications and documents) 528 528 + const text = node.attrs.text || ""; 529 529 + const unicodeString = new UnicodeString(text); 530 530 + 531 531 + facets.push({ 532 532 + index: { 533 533 + byteStart: byteOffset, 534 534 + byteEnd: byteOffset + unicodeString.length, 535 535 + }, 536 536 + features: [ 537 537 + { 538 538 + $type: "pub.leaflet.richtext.facet#atMention", 539 539 + atURI: node.attrs.atURI, 540 540 + }, 541 541 + ], 542 542 + }); 331 543 332 544 fullText += text; 333 545 byteOffset += unicodeString.length;

+98 -1

app/lish/[did]/[publication]/[rkey]/Interactions/Comments/commentAction.ts

··· 10 10 import { Json } from "supabase/database.types"; 11 11 import { 12 12 Notification, 13 13 + NotificationData, 13 14 pingIdentityToUpdateNotification, 14 15 } from "src/notifications"; 15 16 import { v7 } from "uuid"; ··· 84 85 parent_uri: args.comment.replyTo, 85 86 }, 86 87 }); 88 88 + } 89 89 + 90 90 + // Create mention notifications from comment facets 91 91 + const mentionNotifications = createCommentMentionNotifications( 92 92 + args.comment.facets, 93 93 + uri.toString(), 94 94 + credentialSession.did!, 95 95 + ); 96 96 + notifications.push(...mentionNotifications); 97 97 + 98 98 + // Insert all notifications and ping recipients 99 99 + if (notifications.length > 0) { 87 100 // SOMEDAY: move this out the action with inngest or workflows 88 101 await supabaseServerClient.from("notifications").insert(notifications); 89 89 - await pingIdentityToUpdateNotification(recipient); 102 102 + 103 103 + // Ping all unique recipients 104 104 + const uniqueRecipients = [...new Set(notifications.map((n) => n.recipient))]; 105 105 + await Promise.all( 106 106 + uniqueRecipients.map((r) => pingIdentityToUpdateNotification(r)), 107 107 + ); 90 108 } 91 109 92 110 return { ··· 95 113 uri: uri.toString(), 96 114 }; 97 115 } 116 116 + 117 117 + /** 118 118 + * Creates mention notifications from comment facets 119 119 + * Handles didMention (people) and atMention (publications/documents) 120 120 + */ 121 121 + function createCommentMentionNotifications( 122 122 + facets: PubLeafletRichtextFacet.Main[], 123 123 + commentUri: string, 124 124 + commenterDid: string, 125 125 + ): Notification[] { 126 126 + const notifications: Notification[] = []; 127 127 + const notifiedRecipients = new Set<string>(); // Avoid duplicate notifications 128 128 + 129 129 + for (const facet of facets) { 130 130 + for (const feature of facet.features) { 131 131 + if (PubLeafletRichtextFacet.isDidMention(feature)) { 132 132 + // DID mention - notify the mentioned person directly 133 133 + const recipientDid = feature.did; 134 134 + 135 135 + // Don't notify yourself 136 136 + if (recipientDid === commenterDid) continue; 137 137 + // Avoid duplicate notifications to the same person 138 138 + if (notifiedRecipients.has(recipientDid)) continue; 139 139 + notifiedRecipients.add(recipientDid); 140 140 + 141 141 + notifications.push({ 142 142 + id: v7(), 143 143 + recipient: recipientDid, 144 144 + data: { 145 145 + type: "comment_mention", 146 146 + comment_uri: commentUri, 147 147 + mention_type: "did", 148 148 + }, 149 149 + }); 150 150 + } else if (PubLeafletRichtextFacet.isAtMention(feature)) { 151 151 + // AT-URI mention - notify the owner of the publication/document 152 152 + try { 153 153 + const mentionedUri = new AtUri(feature.atURI); 154 154 + const recipientDid = mentionedUri.host; 155 155 + 156 156 + // Don't notify yourself 157 157 + if (recipientDid === commenterDid) continue; 158 158 + // Avoid duplicate notifications to the same person for the same mentioned item 159 159 + const dedupeKey = `${recipientDid}:${feature.atURI}`; 160 160 + if (notifiedRecipients.has(dedupeKey)) continue; 161 161 + notifiedRecipients.add(dedupeKey); 162 162 + 163 163 + if (mentionedUri.collection === "pub.leaflet.publication") { 164 164 + notifications.push({ 165 165 + id: v7(), 166 166 + recipient: recipientDid, 167 167 + data: { 168 168 + type: "comment_mention", 169 169 + comment_uri: commentUri, 170 170 + mention_type: "publication", 171 171 + mentioned_uri: feature.atURI, 172 172 + }, 173 173 + }); 174 174 + } else if (mentionedUri.collection === "pub.leaflet.document") { 175 175 + notifications.push({ 176 176 + id: v7(), 177 177 + recipient: recipientDid, 178 178 + data: { 179 179 + type: "comment_mention", 180 180 + comment_uri: commentUri, 181 181 + mention_type: "document", 182 182 + mentioned_uri: feature.atURI, 183 183 + }, 184 184 + }); 185 185 + } 186 186 + } catch (error) { 187 187 + console.error("Failed to parse AT-URI for mention:", feature.atURI, error); 188 188 + } 189 189 + } 190 190 + } 191 191 + } 192 192 + 193 193 + return notifications; 194 194 + }

+10 -7

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

··· 293 293 } 294 294 case PubLeafletBlocksImage.isMain(b.block): { 295 295 return ( 296 296 - <div className={`relative flex ${alignment}`} {...blockProps}> 296 296 + <div 297 297 + className={`imageBlock relative flex ${alignment}`} 298 298 + {...blockProps} 299 299 + > 297 300 <img 298 301 alt={b.block.alt} 299 302 height={b.block.aspectRatio?.height} ··· 321 324 return ( 322 325 // all this margin stuff is a highly unfortunate hack so that the border-l on blockquote is the height of just the text rather than the height of the block, which includes padding. 323 326 <blockquote 324 324 - className={` blockquote py-0! mb-2! ${className} ${PubLeafletBlocksBlockquote.isMain(previousBlock?.block) ? "-mt-2! pt-3!" : "mt-1!"}`} 327 327 + className={`blockquoteBlock py-0! mb-2! ${className} ${PubLeafletBlocksBlockquote.isMain(previousBlock?.block) ? "-mt-2! pt-3!" : "mt-1!"}`} 325 328 {...blockProps} 326 329 > 327 330 <TextBlock ··· 336 339 } 337 340 case PubLeafletBlocksText.isMain(b.block): 338 341 return ( 339 339 - <p className={` ${className}`} {...blockProps}> 342 342 + <p className={`textBlock ${className}`} {...blockProps}> 340 343 <TextBlock 341 344 facets={b.block.facets} 342 345 plaintext={b.block.plaintext} ··· 349 352 case PubLeafletBlocksHeader.isMain(b.block): { 350 353 if (b.block.level === 1) 351 354 return ( 352 352 - <h2 className={`${className}`} {...blockProps}> 355 355 + <h2 className={`h1Block ${className}`} {...blockProps}> 353 356 <TextBlock 354 357 {...b.block} 355 358 index={index} ··· 360 363 ); 361 364 if (b.block.level === 2) 362 365 return ( 363 363 - <h3 className={`${className}`} {...blockProps}> 366 366 + <h3 className={`h2Block ${className}`} {...blockProps}> 364 367 <TextBlock 365 368 {...b.block} 366 369 index={index} ··· 371 374 ); 372 375 if (b.block.level === 3) 373 376 return ( 374 374 - <h4 className={`${className}`} {...blockProps}> 377 377 + <h4 className={`h3Block ${className}`} {...blockProps}> 375 378 <TextBlock 376 379 {...b.block} 377 380 index={index} ··· 383 386 // if (b.block.level === 4) return <h4>{b.block.plaintext}</h4>; 384 387 // if (b.block.level === 5) return <h5>{b.block.plaintext}</h5>; 385 388 return ( 386 386 - <h6 className={`${className}`} {...blockProps}> 389 389 + <h6 className={`h6Block ${className}`} {...blockProps}> 387 390 <TextBlock 388 391 {...b.block} 389 392 index={index}

+2 -2

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

··· 66 66 </a> 67 67 )} 68 68 </div> 69 69 - <h2 className="">{record.title}</h2> 69 69 + <h2 className="leading-tight">{record.title}</h2> 70 70 {record.description ? ( 71 71 - <p className="italic text-secondary">{record.description}</p> 71 71 + <p className="italic text-secondary pt-1">{record.description}</p> 72 72 ) : null} 73 73 <div className="text-sm text-tertiary pt-3 flex gap-1 flex-wrap"> 74 74 {profile ? (

+91

app/lish/uri/[uri]/route.ts

··· 1 1 + import { NextRequest, NextResponse } from "next/server"; 2 2 + import { AtUri } from "@atproto/api"; 3 3 + import { supabaseServerClient } from "supabase/serverClient"; 4 4 + import { PubLeafletPublication } from "lexicons/api"; 5 5 + 6 6 + /** 7 7 + * Redirect route for AT URIs (publications and documents) 8 8 + * Redirects to the actual hosted domains from publication records 9 9 + */ 10 10 + export async function GET( 11 11 + request: NextRequest, 12 12 + { params }: { params: Promise<{ uri: string }> } 13 13 + ) { 14 14 + try { 15 15 + const { uri: uriParam } = await params; 16 16 + const atUriString = decodeURIComponent(uriParam); 17 17 + const uri = new AtUri(atUriString); 18 18 + 19 19 + if (uri.collection === "pub.leaflet.publication") { 20 20 + // Get the publication record to retrieve base_path 21 21 + const { data: publication } = await supabaseServerClient 22 22 + .from("publications") 23 23 + .select("record") 24 24 + .eq("uri", atUriString) 25 25 + .single(); 26 26 + 27 27 + if (!publication?.record) { 28 28 + return new NextResponse("Publication not found", { status: 404 }); 29 29 + } 30 30 + 31 31 + const record = publication.record as PubLeafletPublication.Record; 32 32 + const basePath = record.base_path; 33 33 + 34 34 + if (!basePath) { 35 35 + return new NextResponse("Publication has no base_path", { status: 404 }); 36 36 + } 37 37 + 38 38 + // Redirect to the publication's hosted domain (temporary redirect since base_path can change) 39 39 + return NextResponse.redirect(basePath, 307); 40 40 + } else if (uri.collection === "pub.leaflet.document") { 41 41 + // Document link - need to find the publication it belongs to 42 42 + const { data: docInPub } = await supabaseServerClient 43 43 + .from("documents_in_publications") 44 44 + .select("publication, publications!inner(record)") 45 45 + .eq("document", atUriString) 46 46 + .single(); 47 47 + 48 48 + if (docInPub?.publication && docInPub.publications) { 49 49 + // Document is in a publication - redirect to domain/rkey 50 50 + const record = docInPub.publications.record as PubLeafletPublication.Record; 51 51 + const basePath = record.base_path; 52 52 + 53 53 + if (!basePath) { 54 54 + return new NextResponse("Publication has no base_path", { status: 404 }); 55 55 + } 56 56 + 57 57 + // Ensure basePath ends without trailing slash 58 58 + const cleanBasePath = basePath.endsWith("/") 59 59 + ? basePath.slice(0, -1) 60 60 + : basePath; 61 61 + 62 62 + // Redirect to the document on the publication's domain (temporary redirect since base_path can change) 63 63 + return NextResponse.redirect(`${cleanBasePath}/${uri.rkey}`, 307); 64 64 + } 65 65 + 66 66 + // If not in a publication, check if it's a standalone document 67 67 + const { data: doc } = await supabaseServerClient 68 68 + .from("documents") 69 69 + .select("uri") 70 70 + .eq("uri", atUriString) 71 71 + .single(); 72 72 + 73 73 + if (doc) { 74 74 + // Standalone document - redirect to /p/did/rkey (temporary redirect) 75 75 + return NextResponse.redirect( 76 76 + new URL(`/p/${uri.host}/${uri.rkey}`, request.url), 77 77 + 307 78 78 + ); 79 79 + } 80 80 + 81 81 + // Document not found 82 82 + return new NextResponse("Document not found", { status: 404 }); 83 83 + } 84 84 + 85 85 + // Unsupported collection type 86 86 + return new NextResponse("Unsupported URI type", { status: 400 }); 87 87 + } catch (error) { 88 88 + console.error("Error resolving AT URI:", error); 89 89 + return new NextResponse("Invalid URI", { status: 400 }); 90 90 + } 91 91 + }

+5 -3

components/ActionBar/Publications.tsx

··· 23 23 currentPubUri: string | undefined; 24 24 }) => { 25 25 let { identity } = useIdentityData(); 26 26 - let looseleaves = identity?.permission_token_on_homepage.find( 27 27 - (f) => f.permission_tokens.leaflets_to_documents, 26 26 + let hasLooseleafs = !!identity?.permission_token_on_homepage.find( 27 27 + (f) => 28 28 + f.permission_tokens.leaflets_to_documents && 29 29 + f.permission_tokens.leaflets_to_documents[0]?.document, 28 30 ); 29 31 30 32 // don't show pub list button if not logged in or no pub list ··· 34 36 35 37 return ( 36 38 <div className="pubListWrapper w-full flex flex-col gap-1 sm:bg-transparent sm:border-0"> 37 37 - {looseleaves && ( 39 39 + {hasLooseleafs && ( 38 40 <> 39 41 <SpeedyLink 40 42 href={`/looseleafs`}

+46

components/AtMentionLink.tsx

··· 1 1 + import { AtUri } from "@atproto/api"; 2 2 + import { atUriToUrl } from "src/utils/mentionUtils"; 3 3 + 4 4 + /** 5 5 + * Component for rendering at-uri mentions (publications and documents) as clickable links. 6 6 + * NOTE: This component's styling and behavior should match the ProseMirror schema rendering 7 7 + * in components/Blocks/TextBlock/schema.ts (atMention mark). If you update one, update the other. 8 8 + */ 9 9 + export function AtMentionLink({ 10 10 + atURI, 11 11 + children, 12 12 + className = "", 13 13 + }: { 14 14 + atURI: string; 15 15 + children: React.ReactNode; 16 16 + className?: string; 17 17 + }) { 18 18 + const aturi = new AtUri(atURI); 19 19 + const isPublication = aturi.collection === "pub.leaflet.publication"; 20 20 + const isDocument = aturi.collection === "pub.leaflet.document"; 21 21 + 22 22 + // Show publication icon if available 23 23 + const icon = 24 24 + isPublication || isDocument ? ( 25 25 + <img 26 26 + src={`/api/pub_icon?at_uri=${encodeURIComponent(atURI)}`} 27 27 + className="inline-block w-5 h-5 rounded-full mr-1 align-text-top" 28 28 + alt="" 29 29 + width="20" 30 30 + height="20" 31 31 + loading="lazy" 32 32 + /> 33 33 + ) : null; 34 34 + 35 35 + return ( 36 36 + <a 37 37 + href={atUriToUrl(atURI)} 38 38 + target="_blank" 39 39 + rel="noopener noreferrer" 40 40 + className={`text-accent-contrast hover:underline cursor-pointer ${isPublication ? "font-bold" : ""} ${isDocument ? "italic" : ""} ${className}`} 41 41 + > 42 42 + {icon} 43 43 + {children} 44 44 + </a> 45 45 + ); 46 46 + }

+4 -2

components/Blocks/BlockCommandBar.tsx

··· 37 37 const clearCommandSearchText = () => { 38 38 if (!props.entityID) return; 39 39 const entityID = props.entityID; 40 40 - 40 40 + 41 41 const existingState = useEditorStates.getState().editorStates[entityID]; 42 42 if (!existingState) return; 43 43 ··· 69 69 setHighlighted(commandResults[0].name); 70 70 } 71 71 }, [commandResults, setHighlighted, highlighted]); 72 72 + 72 73 useEffect(() => { 73 74 let listener = async (e: KeyboardEvent) => { 74 75 let reverseDir = ref.current?.dataset.side === "top"; ··· 118 119 return; 119 120 } 120 121 }; 122 122 + 121 123 window.addEventListener("keydown", listener); 122 124 123 125 return () => window.removeEventListener("keydown", listener); ··· 200 202 201 203 return ( 202 204 <button 203 203 - className={`commandResult text-left flex gap-2 mx-1 pr-2 py-0.5 rounded-md text-secondary ${isHighlighted && "bg-border-light"}`} 205 205 + className={`commandResult menuItem text-secondary font-normal! py-0.5! mx-1 pl-0! ${isHighlighted && "bg-[var(--accent-light)]!"}`} 204 206 onMouseOver={() => { 205 207 props.setHighlighted(props.name); 206 208 }}

+34

components/Blocks/TextBlock/RenderYJSFragment.tsx

··· 3 3 import { CSSProperties, Fragment } from "react"; 4 4 import { theme } from "tailwind.config"; 5 5 import * as base64 from "base64-js"; 6 6 + import { didToBlueskyUrl } from "src/utils/mentionUtils"; 7 7 + import { AtMentionLink } from "components/AtMentionLink"; 6 8 7 9 type BlockElements = "h1" | "h2" | "h3" | null | "blockquote" | "p"; 8 10 export function RenderYJSFragment({ ··· 64 66 return <br key={index} />; 65 67 } 66 68 69 69 + // Handle didMention inline nodes 70 70 + if (node.constructor === XmlElement && node.nodeName === "didMention") { 71 71 + const did = node.getAttribute("did") || ""; 72 72 + const text = node.getAttribute("text") || ""; 73 73 + return ( 74 74 + <a 75 75 + href={didToBlueskyUrl(did)} 76 76 + target="_blank" 77 77 + rel="noopener noreferrer" 78 78 + key={index} 79 79 + className="text-accent-contrast hover:underline cursor-pointer" 80 80 + > 81 81 + {text} 82 82 + </a> 83 83 + ); 84 84 + } 85 85 + 86 86 + // Handle atMention inline nodes 87 87 + if (node.constructor === XmlElement && node.nodeName === "atMention") { 88 88 + const atURI = node.getAttribute("atURI") || ""; 89 89 + const text = node.getAttribute("text") || ""; 90 90 + return ( 91 91 + <AtMentionLink key={index} atURI={atURI}> 92 92 + {text} 93 93 + </AtMentionLink> 94 94 + ); 95 95 + } 96 96 + 67 97 return null; 68 98 }) 69 99 )} ··· 151 181 // Handle hard_break nodes specially 152 182 if (node.nodeName === "hard_break") { 153 183 return "\n"; 184 184 + } 185 185 + // Handle inline mention nodes 186 186 + if (node.nodeName === "didMention" || node.nodeName === "atMention") { 187 187 + return node.getAttribute("text") || ""; 154 188 } 155 189 return node 156 190 .toArray()

+109 -14

components/Blocks/TextBlock/index.tsx

··· 1 1 - import { useRef, useEffect, useState } from "react"; 1 1 + import { useRef, useEffect, useState, useCallback } from "react"; 2 2 import { elementId } from "src/utils/elementId"; 3 3 import { useReplicache, useEntity } from "src/replicache"; 4 4 import { isVisible } from "src/utils/isVisible"; 5 5 import { EditorState, TextSelection } from "prosemirror-state"; 6 6 + import { EditorView } from "prosemirror-view"; 6 7 import { RenderYJSFragment } from "./RenderYJSFragment"; 7 8 import { useHasPageLoaded } from "components/InitialPageLoadProvider"; 8 9 import { BlockProps } from "../Block"; ··· 23 24 import { useLeafletPublicationData } from "components/PageSWRDataProvider"; 24 25 import { DotLoader } from "components/utils/DotLoader"; 25 26 import { useMountProsemirror } from "./mountProsemirror"; 27 27 + import { schema } from "./schema"; 28 28 + 29 29 + import { Mention, MentionAutocomplete } from "components/Mention"; 30 30 + import { addMentionToEditor } from "app/[leaflet_id]/publish/BskyPostEditorProsemirror"; 26 31 27 32 const HeadingStyle = { 28 33 1: "text-xl font-bold", ··· 183 188 let editorState = useEditorStates( 184 189 (s) => s.editorStates[props.entityID], 185 190 )?.editor; 191 191 + const { 192 192 + viewRef, 193 193 + mentionOpen, 194 194 + mentionCoords, 195 195 + openMentionAutocomplete, 196 196 + handleMentionSelect, 197 197 + handleMentionOpenChange, 198 198 + } = useMentionState(props.entityID); 186 199 187 200 let { mountRef, actionTimeout } = useMountProsemirror({ 188 201 props, 202 202 + openMentionAutocomplete, 189 203 }); 190 204 191 205 return ( ··· 199 213 ? "blockquote pt-3" 200 214 : "blockquote" 201 215 : "" 202 202 - } 203 203 - 204 204 - `} 216 216 + }`} 205 217 > 206 218 <pre 207 219 data-entityid={props.entityID} ··· 224 236 } 225 237 }} 226 238 onFocus={() => { 239 239 + handleMentionOpenChange(false); 227 240 setTimeout(() => { 228 241 useUIState.getState().setSelectedBlock(props); 229 242 useUIState.setState(() => ({ ··· 249 262 ${props.className}`} 250 263 ref={mountRef} 251 264 /> 265 265 + {focused && ( 266 266 + <MentionAutocomplete 267 267 + open={mentionOpen} 268 268 + onOpenChange={handleMentionOpenChange} 269 269 + view={viewRef} 270 270 + onSelect={handleMentionSelect} 271 271 + coords={mentionCoords} 272 272 + /> 273 273 + )} 252 274 {editorState?.doc.textContent.length === 0 && 253 275 props.previousBlock === null && 254 276 props.nextBlock === null ? ( ··· 439 461 ); 440 462 }; 441 463 442 442 - const useMentionState = () => { 443 443 - const [editorState, setEditorState] = useState<EditorState | null>(null); 444 444 - const [mentionState, setMentionState] = useState<{ 445 445 - active: boolean; 446 446 - range: { from: number; to: number } | null; 447 447 - selectedMention: { handle: string; did: string } | null; 448 448 - }>({ active: false, range: null, selectedMention: null }); 449 449 - const mentionStateRef = useRef(mentionState); 450 450 - mentionStateRef.current = mentionState; 451 451 - return { mentionStateRef }; 464 464 + const useMentionState = (entityID: string) => { 465 465 + let view = useEditorStates((s) => s.editorStates[entityID])?.view; 466 466 + let viewRef = useRef(view || null); 467 467 + viewRef.current = view || null; 468 468 + 469 469 + const [mentionOpen, setMentionOpen] = useState(false); 470 470 + const [mentionCoords, setMentionCoords] = useState<{ 471 471 + top: number; 472 472 + left: number; 473 473 + } | null>(null); 474 474 + const [mentionInsertPos, setMentionInsertPos] = useState<number | null>(null); 475 475 + 476 476 + // Close autocomplete when this block is no longer focused 477 477 + const isFocused = useUIState((s) => s.focusedEntity?.entityID === entityID); 478 478 + useEffect(() => { 479 479 + if (!isFocused) { 480 480 + setMentionOpen(false); 481 481 + setMentionCoords(null); 482 482 + setMentionInsertPos(null); 483 483 + } 484 484 + }, [isFocused]); 485 485 + 486 486 + const openMentionAutocomplete = useCallback(() => { 487 487 + const view = useEditorStates.getState().editorStates[entityID]?.view; 488 488 + if (!view) return; 489 489 + 490 490 + // Get the position right after the @ we just inserted 491 491 + const pos = view.state.selection.from; 492 492 + setMentionInsertPos(pos); 493 493 + 494 494 + // Get coordinates for the popup relative to the positioned parent 495 495 + const coords = view.coordsAtPos(pos - 1); // Position of the @ 496 496 + 497 497 + // Find the relative positioned parent container 498 498 + const editorEl = view.dom; 499 499 + const container = editorEl.closest('.relative') as HTMLElement | null; 500 500 + 501 501 + if (container) { 502 502 + const containerRect = container.getBoundingClientRect(); 503 503 + setMentionCoords({ 504 504 + top: coords.bottom - containerRect.top, 505 505 + left: coords.left - containerRect.left, 506 506 + }); 507 507 + } else { 508 508 + setMentionCoords({ 509 509 + top: coords.bottom, 510 510 + left: coords.left, 511 511 + }); 512 512 + } 513 513 + setMentionOpen(true); 514 514 + }, [entityID]); 515 515 + 516 516 + const handleMentionSelect = useCallback( 517 517 + (mention: Mention) => { 518 518 + const view = useEditorStates.getState().editorStates[entityID]?.view; 519 519 + if (!view || mentionInsertPos === null) return; 520 520 + 521 521 + // The @ is at mentionInsertPos - 1, we need to replace it with the mention 522 522 + const from = mentionInsertPos - 1; 523 523 + const to = mentionInsertPos; 524 524 + 525 525 + addMentionToEditor(mention, { from, to }, view); 526 526 + view.focus(); 527 527 + }, 528 528 + [entityID, mentionInsertPos], 529 529 + ); 530 530 + 531 531 + const handleMentionOpenChange = useCallback((open: boolean) => { 532 532 + setMentionOpen(open); 533 533 + if (!open) { 534 534 + setMentionCoords(null); 535 535 + setMentionInsertPos(null); 536 536 + } 537 537 + }, []); 538 538 + 539 539 + return { 540 540 + viewRef, 541 541 + mentionOpen, 542 542 + mentionCoords, 543 543 + openMentionAutocomplete, 544 544 + handleMentionSelect, 545 545 + handleMentionOpenChange, 546 546 + }; 452 547 };

+20

components/Blocks/TextBlock/inputRules.ts

··· 15 15 export const inputrules = ( 16 16 propsRef: MutableRefObject<BlockProps & { entity_set: { set: string } }>, 17 17 repRef: MutableRefObject<Replicache<ReplicacheMutators> | null>, 18 18 + openMentionAutocomplete?: () => void, 18 19 ) => 19 20 inputRules({ 20 21 //Strikethrough ··· 189 190 data: { type: "number", value: headingLevel }, 190 191 }); 191 192 return tr; 193 193 + }), 194 194 + 195 195 + // Mention - @ at start of line, after space, or after hard break 196 196 + new InputRule(/(?:^|\s)@$/, (state, match, start, end) => { 197 197 + if (!openMentionAutocomplete) return null; 198 198 + // Schedule opening the autocomplete after the transaction is applied 199 199 + setTimeout(() => openMentionAutocomplete(), 0); 200 200 + return null; // Let the @ be inserted normally 201 201 + }), 202 202 + // Mention - @ immediately after a hard break (hard breaks are nodes, not text) 203 203 + new InputRule(/@$/, (state, match, start, end) => { 204 204 + if (!openMentionAutocomplete) return null; 205 205 + // Check if the character before @ is a hard break node 206 206 + const $pos = state.doc.resolve(start); 207 207 + const nodeBefore = $pos.nodeBefore; 208 208 + if (nodeBefore && nodeBefore.type.name === "hard_break") { 209 209 + setTimeout(() => openMentionAutocomplete(), 0); 210 210 + } 211 211 + return null; // Let the @ be inserted normally 192 212 }), 193 213 ], 194 214 });

+4 -7

components/Blocks/TextBlock/keymap.ts

··· 24 24 import { getBlocksWithType } from "src/hooks/queries/useBlocks"; 25 25 import { isTextBlock } from "src/utils/isTextBlock"; 26 26 import { UndoManager } from "src/undoManager"; 27 27 - 28 27 type PropsRef = RefObject< 29 28 BlockProps & { 30 29 entity_set: { set: string }; ··· 35 34 propsRef: PropsRef, 36 35 repRef: RefObject<Replicache<ReplicacheMutators> | null>, 37 36 um: UndoManager, 38 38 - multiLine?: boolean, 37 37 + openMentionAutocomplete: () => void, 39 38 ) => 40 39 ({ 41 40 "Meta-b": toggleMark(schema.marks.strong), ··· 138 137 ), 139 138 "Shift-Backspace": backspace(propsRef, repRef), 140 139 Enter: (state, dispatch, view) => { 141 141 - if (multiLine && state.doc.content.size - state.selection.anchor > 1) 142 142 - return false; 143 143 - return um.withUndoGroup(() => 144 144 - enter(propsRef, repRef)(state, dispatch, view), 145 145 - ); 140 140 + return um.withUndoGroup(() => { 141 141 + return enter(propsRef, repRef)(state, dispatch, view); 142 142 + }); 146 143 }, 147 144 "Shift-Enter": (state, dispatch, view) => { 148 145 // Insert a hard break

+48 -12

components/Blocks/TextBlock/mountProsemirror.ts

··· 23 23 import { useHandlePaste } from "./useHandlePaste"; 24 24 import { BlockProps } from "../Block"; 25 25 import { useEntitySetContext } from "components/EntitySetProvider"; 26 26 + import { didToBlueskyUrl, atUriToUrl } from "src/utils/mentionUtils"; 26 27 27 27 - export function useMountProsemirror({ props }: { props: BlockProps }) { 28 28 + export function useMountProsemirror({ 29 29 + props, 30 30 + openMentionAutocomplete, 31 31 + }: { 32 32 + props: BlockProps; 33 33 + openMentionAutocomplete: () => void; 34 34 + }) { 28 35 let { entityID, parent } = props; 29 36 let rep = useReplicache(); 30 37 let mountRef = useRef<HTMLPreElement | null>(null); ··· 44 51 useLayoutEffect(() => { 45 52 if (!mountRef.current) return; 46 53 47 47 - const km = TextBlockKeymap(propsRef, repRef, rep.undoManager); 54 54 + const km = TextBlockKeymap( 55 55 + propsRef, 56 56 + repRef, 57 57 + rep.undoManager, 58 58 + openMentionAutocomplete, 59 59 + ); 48 60 const editor = EditorState.create({ 49 61 schema: schema, 50 62 plugins: [ 51 63 ySyncPlugin(value), 52 64 keymap(km), 53 53 - inputrules(propsRef, repRef), 65 65 + inputrules(propsRef, repRef, openMentionAutocomplete), 54 66 keymap(baseKeymap), 55 67 highlightSelectionPlugin, 56 68 autolink({ ··· 69 81 handleClickOn: (_view, _pos, node, _nodePos, _event, direct) => { 70 82 if (!direct) return; 71 83 if (node.nodeSize - 2 <= _pos) return; 72 72 - let mark = 73 73 - node 74 74 - .nodeAt(_pos - 1) 75 75 - ?.marks.find((f) => f.type === schema.marks.link) || 76 76 - node 77 77 - .nodeAt(Math.max(_pos - 2, 0)) 78 78 - ?.marks.find((f) => f.type === schema.marks.link); 79 79 - if (mark) { 80 80 - window.open(mark.attrs.href, "_blank"); 84 84 + 85 85 + // Check for marks at the clicked position 86 86 + const nodeAt1 = node.nodeAt(_pos - 1); 87 87 + const nodeAt2 = node.nodeAt(Math.max(_pos - 2, 0)); 88 88 + 89 89 + // Check for link marks 90 90 + let linkMark = nodeAt1?.marks.find((f) => f.type === schema.marks.link) || 91 91 + nodeAt2?.marks.find((f) => f.type === schema.marks.link); 92 92 + if (linkMark) { 93 93 + window.open(linkMark.attrs.href, "_blank"); 94 94 + return; 95 95 + } 96 96 + 97 97 + // Check for didMention inline nodes 98 98 + if (nodeAt1?.type === schema.nodes.didMention) { 99 99 + window.open(didToBlueskyUrl(nodeAt1.attrs.did), "_blank", "noopener,noreferrer"); 100 100 + return; 101 101 + } 102 102 + if (nodeAt2?.type === schema.nodes.didMention) { 103 103 + window.open(didToBlueskyUrl(nodeAt2.attrs.did), "_blank", "noopener,noreferrer"); 104 104 + return; 105 105 + } 106 106 + 107 107 + // Check for atMention inline nodes 108 108 + if (nodeAt1?.type === schema.nodes.atMention) { 109 109 + const url = atUriToUrl(nodeAt1.attrs.atURI); 110 110 + window.open(url, "_blank", "noopener,noreferrer"); 111 111 + return; 112 112 + } 113 113 + if (nodeAt2?.type === schema.nodes.atMention) { 114 114 + const url = atUriToUrl(nodeAt2.attrs.atURI); 115 115 + window.open(url, "_blank", "noopener,noreferrer"); 116 116 + return; 81 117 } 82 118 }, 83 119 dispatchTransaction,

+100 -1

components/Blocks/TextBlock/schema.ts

··· 1 1 - import { Schema, Node, MarkSpec } from "prosemirror-model"; 1 1 + import { AtUri } from "@atproto/api"; 2 2 + import { Schema, Node, MarkSpec, NodeSpec } from "prosemirror-model"; 2 3 import { marks } from "prosemirror-schema-basic"; 3 4 import { theme } from "tailwind.config"; 4 5 ··· 122 123 parseDOM: [{ tag: "br" }], 123 124 toDOM: () => ["br"] as const, 124 125 }, 126 126 + atMention: { 127 127 + attrs: { 128 128 + atURI: {}, 129 129 + text: { default: "" }, 130 130 + }, 131 131 + group: "inline", 132 132 + inline: true, 133 133 + atom: true, 134 134 + selectable: true, 135 135 + draggable: true, 136 136 + parseDOM: [ 137 137 + { 138 138 + tag: "span.atMention", 139 139 + getAttrs(dom: HTMLElement) { 140 140 + return { 141 141 + atURI: dom.getAttribute("data-at-uri"), 142 142 + text: dom.textContent || "", 143 143 + }; 144 144 + }, 145 145 + }, 146 146 + ], 147 147 + toDOM(node) { 148 148 + // NOTE: This rendering should match the AtMentionLink component in 149 149 + // components/AtMentionLink.tsx. If you update one, update the other. 150 150 + let className = "atMention text-accent-contrast"; 151 151 + let aturi = new AtUri(node.attrs.atURI); 152 152 + if (aturi.collection === "pub.leaflet.publication") 153 153 + className += " font-bold"; 154 154 + if (aturi.collection === "pub.leaflet.document") className += " italic"; 155 155 + 156 156 + // For publications and documents, show icon 157 157 + if ( 158 158 + aturi.collection === "pub.leaflet.publication" || 159 159 + aturi.collection === "pub.leaflet.document" 160 160 + ) { 161 161 + return [ 162 162 + "span", 163 163 + { 164 164 + class: className, 165 165 + "data-at-uri": node.attrs.atURI, 166 166 + }, 167 167 + [ 168 168 + "img", 169 169 + { 170 170 + src: `/api/pub_icon?at_uri=${encodeURIComponent(node.attrs.atURI)}`, 171 171 + class: "inline-block w-5 h-5 rounded-full mr-1 align-text-top", 172 172 + alt: "", 173 173 + width: "16", 174 174 + height: "16", 175 175 + loading: "lazy", 176 176 + }, 177 177 + ], 178 178 + node.attrs.text, 179 179 + ]; 180 180 + } 181 181 + 182 182 + return [ 183 183 + "span", 184 184 + { 185 185 + class: className, 186 186 + "data-at-uri": node.attrs.atURI, 187 187 + }, 188 188 + node.attrs.text, 189 189 + ]; 190 190 + }, 191 191 + } as NodeSpec, 192 192 + didMention: { 193 193 + attrs: { 194 194 + did: {}, 195 195 + text: { default: "" }, 196 196 + }, 197 197 + group: "inline", 198 198 + inline: true, 199 199 + atom: true, 200 200 + selectable: true, 201 201 + draggable: true, 202 202 + parseDOM: [ 203 203 + { 204 204 + tag: "span.didMention", 205 205 + getAttrs(dom: HTMLElement) { 206 206 + return { 207 207 + did: dom.getAttribute("data-did"), 208 208 + text: dom.textContent || "", 209 209 + }; 210 210 + }, 211 211 + }, 212 212 + ], 213 213 + toDOM(node) { 214 214 + return [ 215 215 + "span", 216 216 + { 217 217 + class: "didMention text-accent-contrast", 218 218 + "data-did": node.attrs.did, 219 219 + }, 220 220 + node.attrs.text, 221 221 + ]; 222 222 + }, 223 223 + } as NodeSpec, 125 224 }, 126 225 }; 127 226 export const schema = new Schema(baseSchema);

+21

components/Icons/GoBackTiny.tsx

··· 1 1 + import { Props } from "./Props"; 2 2 + 3 3 + export const GoBackTiny = (props: Props) => { 4 4 + return ( 5 5 + <svg 6 6 + width="16" 7 7 + height="16" 8 8 + viewBox="0 0 16 16" 9 9 + fill="none" 10 10 + xmlns="http://www.w3.org/2000/svg" 11 11 + > 12 12 + <path 13 13 + d="M7.40426 3L2.19592 8M2.19592 8L7.40426 13M2.19592 8H13.8041" 14 14 + stroke="currentColor" 15 15 + strokeWidth="2" 16 16 + strokeLinecap="round" 17 17 + strokeLinejoin="round" 18 18 + /> 19 19 + </svg> 20 20 + ); 21 21 + };

+540

components/Mention.tsx

··· 1 1 + "use client"; 2 2 + import { Agent } from "@atproto/api"; 3 3 + import { useState, useEffect, Fragment, useRef, useCallback } from "react"; 4 4 + import { useDebouncedEffect } from "src/hooks/useDebouncedEffect"; 5 5 + import * as Popover from "@radix-ui/react-popover"; 6 6 + import { EditorView } from "prosemirror-view"; 7 7 + import { callRPC } from "app/api/rpc/client"; 8 8 + import { ArrowRightTiny } from "components/Icons/ArrowRightTiny"; 9 9 + import { GoBackSmall } from "components/Icons/GoBackSmall"; 10 10 + import { SearchTiny } from "components/Icons/SearchTiny"; 11 11 + import { CloseTiny } from "./Icons/CloseTiny"; 12 12 + import { GoToArrow } from "./Icons/GoToArrow"; 13 13 + import { GoBackTiny } from "./Icons/GoBackTiny"; 14 14 + 15 15 + export function MentionAutocomplete(props: { 16 16 + open: boolean; 17 17 + onOpenChange: (open: boolean) => void; 18 18 + view: React.RefObject<EditorView | null>; 19 19 + onSelect: (mention: Mention) => void; 20 20 + coords: { top: number; left: number } | null; 21 21 + }) { 22 22 + const [searchQuery, setSearchQuery] = useState(""); 23 23 + const [noResults, setNoResults] = useState(false); 24 24 + const inputRef = useRef<HTMLInputElement>(null); 25 25 + const contentRef = useRef<HTMLDivElement>(null); 26 26 + 27 27 + const { suggestionIndex, setSuggestionIndex, suggestions, scope, setScope } = 28 28 + useMentionSuggestions(searchQuery); 29 29 + 30 30 + // Clear search when scope changes 31 31 + const handleScopeChange = useCallback( 32 32 + (newScope: MentionScope) => { 33 33 + setSearchQuery(""); 34 34 + setSuggestionIndex(0); 35 35 + setScope(newScope); 36 36 + }, 37 37 + [setScope, setSuggestionIndex], 38 38 + ); 39 39 + 40 40 + // Focus input when opened 41 41 + useEffect(() => { 42 42 + if (props.open && inputRef.current) { 43 43 + // Small delay to ensure the popover is mounted 44 44 + setTimeout(() => inputRef.current?.focus(), 0); 45 45 + } 46 46 + }, [props.open]); 47 47 + 48 48 + // Reset state when closed 49 49 + useEffect(() => { 50 50 + if (!props.open) { 51 51 + setSearchQuery(""); 52 52 + setScope({ type: "default" }); 53 53 + setSuggestionIndex(0); 54 54 + setNoResults(false); 55 55 + } 56 56 + }, [props.open, setScope, setSuggestionIndex]); 57 57 + 58 58 + // Handle timeout for showing "No results found" 59 59 + useEffect(() => { 60 60 + if (searchQuery && suggestions.length === 0) { 61 61 + setNoResults(false); 62 62 + const timer = setTimeout(() => { 63 63 + setNoResults(true); 64 64 + }, 2000); 65 65 + return () => clearTimeout(timer); 66 66 + } else { 67 67 + setNoResults(false); 68 68 + } 69 69 + }, [searchQuery, suggestions.length]); 70 70 + 71 71 + // Handle keyboard navigation 72 72 + const handleKeyDown = (e: React.KeyboardEvent) => { 73 73 + if (e.key === "Escape") { 74 74 + e.preventDefault(); 75 75 + props.onOpenChange(false); 76 76 + props.view.current?.focus(); 77 77 + return; 78 78 + } 79 79 + 80 80 + if (e.key === "Backspace" && searchQuery === "") { 81 81 + // Backspace at the start of input closes autocomplete and refocuses editor 82 82 + e.preventDefault(); 83 83 + props.onOpenChange(false); 84 84 + props.view.current?.focus(); 85 85 + return; 86 86 + } 87 87 + 88 88 + // Reverse arrow key direction when popover is rendered above 89 89 + const isReversed = contentRef.current?.dataset.side === "top"; 90 90 + const upKey = isReversed ? "ArrowDown" : "ArrowUp"; 91 91 + const downKey = isReversed ? "ArrowUp" : "ArrowDown"; 92 92 + 93 93 + if (e.key === upKey) { 94 94 + e.preventDefault(); 95 95 + if (suggestionIndex > 0) { 96 96 + setSuggestionIndex((i) => i - 1); 97 97 + } 98 98 + } else if (e.key === downKey) { 99 99 + e.preventDefault(); 100 100 + if (suggestionIndex < suggestions.length - 1) { 101 101 + setSuggestionIndex((i) => i + 1); 102 102 + } 103 103 + } else if (e.key === "Tab") { 104 104 + const selectedSuggestion = suggestions[suggestionIndex]; 105 105 + if (selectedSuggestion?.type === "publication") { 106 106 + e.preventDefault(); 107 107 + handleScopeChange({ 108 108 + type: "publication", 109 109 + uri: selectedSuggestion.uri, 110 110 + name: selectedSuggestion.name, 111 111 + }); 112 112 + } 113 113 + } else if (e.key === "Enter") { 114 114 + e.preventDefault(); 115 115 + const selectedSuggestion = suggestions[suggestionIndex]; 116 116 + if (selectedSuggestion) { 117 117 + props.onSelect(selectedSuggestion); 118 118 + props.onOpenChange(false); 119 119 + } 120 120 + } else if ( 121 121 + e.key === " " && 122 122 + searchQuery === "" && 123 123 + scope.type === "default" 124 124 + ) { 125 125 + // Space immediately after opening closes the autocomplete 126 126 + e.preventDefault(); 127 127 + props.onOpenChange(false); 128 128 + // Insert a space after the @ in the editor 129 129 + if (props.view.current) { 130 130 + const view = props.view.current; 131 131 + const tr = view.state.tr.insertText(" "); 132 132 + view.dispatch(tr); 133 133 + view.focus(); 134 134 + } 135 135 + } 136 136 + }; 137 137 + 138 138 + if (!props.open || !props.coords) return null; 139 139 + 140 140 + const getHeader = (type: Mention["type"], scope?: MentionScope) => { 141 141 + switch (type) { 142 142 + case "did": 143 143 + return "People"; 144 144 + case "publication": 145 145 + return "Publications"; 146 146 + case "post": 147 147 + if (scope) { 148 148 + return ( 149 149 + <ScopeHeader 150 150 + scope={scope} 151 151 + handleScopeChange={() => { 152 152 + handleScopeChange({ type: "default" }); 153 153 + }} 154 154 + /> 155 155 + ); 156 156 + } else return "Posts"; 157 157 + } 158 158 + }; 159 159 + 160 160 + const sortedSuggestions = [...suggestions].sort((a, b) => { 161 161 + const order: Mention["type"][] = ["did", "publication", "post"]; 162 162 + return order.indexOf(a.type) - order.indexOf(b.type); 163 163 + }); 164 164 + 165 165 + return ( 166 166 + <Popover.Root open> 167 167 + <Popover.Anchor 168 168 + style={{ 169 169 + top: props.coords.top - 24, 170 170 + left: props.coords.left, 171 171 + height: 24, 172 172 + position: "absolute", 173 173 + }} 174 174 + /> 175 175 + <Popover.Portal> 176 176 + <Popover.Content 177 177 + ref={contentRef} 178 178 + align="start" 179 179 + sideOffset={4} 180 180 + collisionPadding={32} 181 181 + onOpenAutoFocus={(e) => e.preventDefault()} 182 182 + className={`dropdownMenu group/mention-menu z-20 bg-bg-page 183 183 + flex data-[side=top]:flex-col-reverse flex-col 184 184 + p-1 gap-1 text-primary 185 185 + border border-border rounded-md shadow-md 186 186 + sm:max-w-xs w-[1000px] max-w-(--radix-popover-content-available-width) 187 187 + max-h-(--radix-popover-content-available-height) 188 188 + overflow-hidden`} 189 189 + > 190 190 + {/* Dropdown Header - sticky */} 191 191 + <div className="flex flex-col items-center gap-2 px-2 py-1 border-b group-data-[side=top]/mention-menu:border-b-0 group-data-[side=top]/mention-menu:border-t border-border-light bg-bg-page sticky top-0 group-data-[side=top]/mention-menu:sticky group-data-[side=top]/mention-menu:bottom-0 group-data-[side=top]/mention-menu:top-auto z-10 shrink-0"> 192 192 + <div className="flex items-center gap-1 flex-1 min-w-0 text-primary"> 193 193 + <div className="text-tertiary"> 194 194 + <SearchTiny className="w-4 h-4 shrink-0" /> 195 195 + </div> 196 196 + <input 197 197 + ref={inputRef} 198 198 + size={100} 199 199 + type="text" 200 200 + value={searchQuery} 201 201 + onChange={(e) => { 202 202 + setSearchQuery(e.target.value); 203 203 + setSuggestionIndex(0); 204 204 + }} 205 205 + onKeyDown={handleKeyDown} 206 206 + autoFocus 207 207 + placeholder={ 208 208 + scope.type === "publication" 209 209 + ? "Search posts..." 210 210 + : "Search people & publications..." 211 211 + } 212 212 + className="flex-1 w-full min-w-0 bg-transparent border-none outline-none text-sm placeholder:text-tertiary" 213 213 + /> 214 214 + </div> 215 215 + </div> 216 216 + <div className="overflow-y-auto flex-1 min-h-0"> 217 217 + {sortedSuggestions.length === 0 && noResults && ( 218 218 + <div className="text-sm text-tertiary italic px-3 py-1 text-center"> 219 219 + No results found 220 220 + </div> 221 221 + )} 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); 228 228 + 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> 288 288 + </div> 289 289 + </Popover.Content> 290 290 + </Popover.Portal> 291 291 + </Popover.Root> 292 292 + ); 293 293 + } 294 294 + 295 295 + const Result = (props: { 296 296 + result: React.ReactNode; 297 297 + subtext?: React.ReactNode; 298 298 + icon?: React.ReactNode; 299 299 + onClick: () => void; 300 300 + onMouseDown: (e: React.MouseEvent) => void; 301 301 + selected?: boolean; 302 302 + }) => { 303 303 + return ( 304 304 + <button 305 305 + className={` 306 306 + menuItem w-full flex-row! gap-2! 307 307 + text-secondary leading-snug text-sm 308 308 + ${props.subtext ? "py-1!" : "py-2!"} 309 309 + ${props.selected ? "bg-[var(--accent-light)]!" : ""}`} 310 310 + onClick={() => { 311 311 + props.onClick(); 312 312 + }} 313 313 + onMouseDown={(e) => props.onMouseDown(e)} 314 314 + > 315 315 + {props.icon} 316 316 + <div className="flex flex-col min-w-0 flex-1"> 317 317 + <div 318 318 + className={`flex gap-2 items-center w-full truncate justify-between`} 319 319 + > 320 320 + {props.result} 321 321 + </div> 322 322 + {props.subtext && ( 323 323 + <div className="text-tertiary italic text-xs font-normal min-w-0 truncate pb-[1px]"> 324 324 + {props.subtext} 325 325 + </div> 326 326 + )} 327 327 + </div> 328 328 + </button> 329 329 + ); 330 330 + }; 331 331 + 332 332 + const ScopeButton = (props: { 333 333 + onClick: () => void; 334 334 + children: React.ReactNode; 335 335 + }) => { 336 336 + return ( 337 337 + <span 338 338 + className="flex flex-row items-center h-full shrink-0 text-xs font-normal text-tertiary hover:text-accent-contrast cursor-pointer" 339 339 + onClick={(e) => { 340 340 + e.preventDefault(); 341 341 + e.stopPropagation(); 342 342 + props.onClick(); 343 343 + }} 344 344 + onMouseDown={(e) => { 345 345 + e.preventDefault(); 346 346 + e.stopPropagation(); 347 347 + }} 348 348 + > 349 349 + {props.children} <ArrowRightTiny className="scale-80" /> 350 350 + </span> 351 351 + ); 352 352 + }; 353 353 + 354 354 + const DidResult = (props: { 355 355 + displayName?: string; 356 356 + handle: string; 357 357 + avatar?: string; 358 358 + onClick: () => void; 359 359 + onMouseDown: (e: React.MouseEvent) => void; 360 360 + selected?: boolean; 361 361 + }) => { 362 362 + return ( 363 363 + <Result 364 364 + icon={ 365 365 + props.avatar ? ( 366 366 + <img 367 367 + src={props.avatar} 368 368 + alt="" 369 369 + className="w-5 h-5 rounded-full shrink-0" 370 370 + /> 371 371 + ) : ( 372 372 + <div className="w-5 h-5 rounded-full bg-border shrink-0" /> 373 373 + ) 374 374 + } 375 375 + result={props.displayName ? props.displayName : props.handle} 376 376 + subtext={props.displayName && `@${props.handle}`} 377 377 + onClick={props.onClick} 378 378 + onMouseDown={props.onMouseDown} 379 379 + selected={props.selected} 380 380 + /> 381 381 + ); 382 382 + }; 383 383 + 384 384 + const PublicationResult = (props: { 385 385 + pubName: string; 386 386 + uri: string; 387 387 + onClick: () => void; 388 388 + onMouseDown: (e: React.MouseEvent) => void; 389 389 + selected?: boolean; 390 390 + onPostsClick: () => void; 391 391 + }) => { 392 392 + return ( 393 393 + <Result 394 394 + icon={ 395 395 + <img 396 396 + src={`/api/pub_icon?at_uri=${encodeURIComponent(props.uri)}`} 397 397 + alt="" 398 398 + className="w-5 h-5 rounded-full shrink-0" 399 399 + /> 400 400 + } 401 401 + result={ 402 402 + <> 403 403 + <div className="truncate w-full grow min-w-0">{props.pubName}</div> 404 404 + <ScopeButton onClick={props.onPostsClick}>Posts</ScopeButton> 405 405 + </> 406 406 + } 407 407 + onClick={props.onClick} 408 408 + onMouseDown={props.onMouseDown} 409 409 + selected={props.selected} 410 410 + /> 411 411 + ); 412 412 + }; 413 413 + 414 414 + const PostResult = (props: { 415 415 + title: string; 416 416 + onClick: () => void; 417 417 + onMouseDown: (e: React.MouseEvent) => void; 418 418 + selected?: boolean; 419 419 + }) => { 420 420 + return ( 421 421 + <Result 422 422 + result={<div className="truncate w-full">{props.title}</div>} 423 423 + onClick={props.onClick} 424 424 + onMouseDown={props.onMouseDown} 425 425 + selected={props.selected} 426 426 + /> 427 427 + ); 428 428 + }; 429 429 + 430 430 + const ScopeHeader = (props: { 431 431 + scope: MentionScope; 432 432 + handleScopeChange: () => void; 433 433 + }) => { 434 434 + if (props.scope.type === "default") return; 435 435 + if (props.scope.type === "publication") 436 436 + return ( 437 437 + <button 438 438 + className="w-full flex flex-row gap-2 pt-1 rounded text-tertiary hover:text-accent-contrast shrink-0 text-xs" 439 439 + onClick={() => props.handleScopeChange()} 440 440 + onMouseDown={(e) => e.preventDefault()} 441 441 + > 442 442 + <GoBackTiny className="shrink-0 " /> 443 443 + 444 444 + <div className="grow w-full truncate text-left"> 445 445 + Posts from {props.scope.name} 446 446 + </div> 447 447 + </button> 448 448 + ); 449 449 + }; 450 450 + 451 451 + export type Mention = 452 452 + | { 453 453 + type: "did"; 454 454 + handle: string; 455 455 + did: string; 456 456 + displayName?: string; 457 457 + avatar?: string; 458 458 + } 459 459 + | { type: "publication"; uri: string; name: string } 460 460 + | { type: "post"; uri: string; title: string }; 461 461 + 462 462 + export type MentionScope = 463 463 + | { type: "default" } 464 464 + | { type: "publication"; uri: string; name: string }; 465 465 + function useMentionSuggestions(query: string | null) { 466 466 + const [suggestionIndex, setSuggestionIndex] = useState(0); 467 467 + const [suggestions, setSuggestions] = useState<Array<Mention>>([]); 468 468 + const [scope, setScope] = useState<MentionScope>({ type: "default" }); 469 469 + 470 470 + // Clear suggestions immediately when scope changes 471 471 + const setScopeAndClear = useCallback((newScope: MentionScope) => { 472 472 + setSuggestions([]); 473 473 + setScope(newScope); 474 474 + }, []); 475 475 + 476 476 + useDebouncedEffect( 477 477 + async () => { 478 478 + if (!query && scope.type === "default") { 479 479 + setSuggestions([]); 480 480 + return; 481 481 + } 482 482 + 483 483 + if (scope.type === "publication") { 484 484 + // Search within the publication's documents 485 485 + const documents = await callRPC(`search_publication_documents`, { 486 486 + publication_uri: scope.uri, 487 487 + query: query || "", 488 488 + limit: 10, 489 489 + }); 490 490 + setSuggestions( 491 491 + documents.result.documents.map((d) => ({ 492 492 + type: "post" as const, 493 493 + uri: d.uri, 494 494 + title: d.title, 495 495 + })), 496 496 + ); 497 497 + } else { 498 498 + // Default scope: search people and publications 499 499 + const agent = new Agent("https://public.api.bsky.app"); 500 500 + const [result, publications] = await Promise.all([ 501 501 + agent.searchActorsTypeahead({ 502 502 + q: query || "", 503 503 + limit: 8, 504 504 + }), 505 505 + callRPC(`search_publication_names`, { query: query || "", limit: 8 }), 506 506 + ]); 507 507 + setSuggestions([ 508 508 + ...result.data.actors.map((actor) => ({ 509 509 + type: "did" as const, 510 510 + handle: actor.handle, 511 511 + did: actor.did, 512 512 + displayName: actor.displayName, 513 513 + avatar: actor.avatar, 514 514 + })), 515 515 + ...publications.result.publications.map((p) => ({ 516 516 + type: "publication" as const, 517 517 + uri: p.uri, 518 518 + name: p.name, 519 519 + })), 520 520 + ]); 521 521 + } 522 522 + }, 523 523 + 300, 524 524 + [query, scope], 525 525 + ); 526 526 + 527 527 + useEffect(() => { 528 528 + if (suggestionIndex > suggestions.length - 1) { 529 529 + setSuggestionIndex(Math.max(0, suggestions.length - 1)); 530 530 + } 531 531 + }, [suggestionIndex, suggestions.length]); 532 532 + 533 533 + return { 534 534 + suggestions, 535 535 + suggestionIndex, 536 536 + setSuggestionIndex, 537 537 + scope, 538 538 + setScope: setScopeAndClear, 539 539 + }; 540 540 + }

+24

lexicons/api/lexicons.ts

··· 1872 1872 type: 'union', 1873 1873 refs: [ 1874 1874 'lex:pub.leaflet.richtext.facet#link', 1875 1875 + 'lex:pub.leaflet.richtext.facet#didMention', 1876 1876 + 'lex:pub.leaflet.richtext.facet#atMention', 1875 1877 'lex:pub.leaflet.richtext.facet#code', 1876 1878 'lex:pub.leaflet.richtext.facet#highlight', 1877 1879 'lex:pub.leaflet.richtext.facet#underline', ··· 1908 1910 properties: { 1909 1911 uri: { 1910 1912 type: 'string', 1913 1913 + }, 1914 1914 + }, 1915 1915 + }, 1916 1916 + didMention: { 1917 1917 + type: 'object', 1918 1918 + description: 'Facet feature for mentioning a did.', 1919 1919 + required: ['did'], 1920 1920 + properties: { 1921 1921 + did: { 1922 1922 + type: 'string', 1923 1923 + format: 'did', 1924 1924 + }, 1925 1925 + }, 1926 1926 + }, 1927 1927 + atMention: { 1928 1928 + type: 'object', 1929 1929 + description: 'Facet feature for mentioning an AT URI.', 1930 1930 + required: ['atURI'], 1931 1931 + properties: { 1932 1932 + atURI: { 1933 1933 + type: 'string', 1934 1934 + format: 'uri', 1911 1935 }, 1912 1936 }, 1913 1937 },

+34

lexicons/api/types/pub/leaflet/richtext/facet.ts

··· 20 20 index: ByteSlice 21 21 features: ( 22 22 | $Typed<Link> 23 23 + | $Typed<DidMention> 24 24 + | $Typed<AtMention> 23 25 | $Typed<Code> 24 26 | $Typed<Highlight> 25 27 | $Typed<Underline> ··· 72 74 73 75 export function validateLink<V>(v: V) { 74 76 return validate<Link & V>(v, id, hashLink) 77 77 + } 78 78 + 79 79 + /** Facet feature for mentioning a did. */ 80 80 + export interface DidMention { 81 81 + $type?: 'pub.leaflet.richtext.facet#didMention' 82 82 + did: string 83 83 + } 84 84 + 85 85 + const hashDidMention = 'didMention' 86 86 + 87 87 + export function isDidMention<V>(v: V) { 88 88 + return is$typed(v, id, hashDidMention) 89 89 + } 90 90 + 91 91 + export function validateDidMention<V>(v: V) { 92 92 + return validate<DidMention & V>(v, id, hashDidMention) 93 93 + } 94 94 + 95 95 + /** Facet feature for mentioning an AT URI. */ 96 96 + export interface AtMention { 97 97 + $type?: 'pub.leaflet.richtext.facet#atMention' 98 98 + atURI: string 99 99 + } 100 100 + 101 101 + const hashAtMention = 'atMention' 102 102 + 103 103 + export function isAtMention<V>(v: V) { 104 104 + return is$typed(v, id, hashAtMention) 105 105 + } 106 106 + 107 107 + export function validateAtMention<V>(v: V) { 108 108 + return validate<AtMention & V>(v, id, hashAtMention) 75 109 } 76 110 77 111 /** Facet feature for inline code. */

+28

lexicons/pub/leaflet/richtext/facet.json

··· 20 20 "type": "union", 21 21 "refs": [ 22 22 "#link", 23 23 + "#didMention", 24 24 + "#atMention", 23 25 "#code", 24 26 "#highlight", 25 27 "#underline", ··· 59 61 "properties": { 60 62 "uri": { 61 63 "type": "string" 64 64 + } 65 65 + } 66 66 + }, 67 67 + "didMention": { 68 68 + "type": "object", 69 69 + "description": "Facet feature for mentioning a did.", 70 70 + "required": [ 71 71 + "did" 72 72 + ], 73 73 + "properties": { 74 74 + "did": { 75 75 + "type": "string", 76 76 + "format": "did" 77 77 + } 78 78 + } 79 79 + }, 80 80 + "atMention": { 81 81 + "type": "object", 82 82 + "description": "Facet feature for mentioning an AT URI.", 83 83 + "required": [ 84 84 + "atURI" 85 85 + ], 86 86 + "properties": { 87 87 + "atURI": { 88 88 + "type": "string", 89 89 + "format": "uri" 62 90 } 63 91 } 64 92 },

+12

lexicons/src/facet.ts

··· 9 9 uri: { type: "string" }, 10 10 }, 11 11 }, 12 12 + didMention: { 13 13 + type: "object", 14 14 + description: "Facet feature for mentioning a did.", 15 15 + required: ["did"], 16 16 + properties: { did: { type: "string", format: "did" } }, 17 17 + }, 18 18 + atMention: { 19 19 + type: "object", 20 20 + description: "Facet feature for mentioning an AT URI.", 21 21 + required: ["atURI"], 22 22 + properties: { atURI: { type: "string", format: "uri" } }, 23 23 + }, 12 24 code: { 13 25 type: "object", 14 26 description: "Facet feature for inline code.",

+18 -9

package-lock.json

··· 48 48 "inngest": "^3.40.1", 49 49 "ioredis": "^5.6.1", 50 50 "katex": "^0.16.22", 51 51 + "l": "^0.6.0", 51 52 "linkifyjs": "^4.2.0", 52 53 "luxon": "^3.7.2", 53 54 "multiformats": "^13.3.2", ··· 59 60 "prosemirror-model": "^1.21.0", 60 61 "prosemirror-schema-basic": "^1.2.2", 61 62 "prosemirror-state": "^1.4.3", 62 62 - "react": "19.2.0", 63 63 + "react": "19.2.1", 63 64 "react-aria-components": "^1.8.0", 64 65 "react-day-picker": "^9.3.0", 65 65 - "react-dom": "19.2.0", 66 66 + "react-dom": "19.2.1", 66 67 "react-use-measure": "^2.1.1", 67 68 "redlock": "^5.0.0-beta.2", 68 69 "rehype-parse": "^9.0.0", ··· 13369 13370 "json-buffer": "3.0.1" 13370 13371 } 13371 13372 }, 13373 13373 + "node_modules/l": { 13374 13374 + "version": "0.6.0", 13375 13375 + "resolved": "https://registry.npmjs.org/l/-/l-0.6.0.tgz", 13376 13376 + "integrity": "sha512-rB5disIyfKRBQ1xcedByHCcAmPWy2NPnjWo5u4mVVIPtathROHyfHjkloqSBT49mLnSRnupkpoIUOFCL7irCVQ==", 13377 13377 + "license": "MIT" 13378 13378 + }, 13372 13379 "node_modules/language-subtag-registry": { 13373 13380 "version": "0.3.23", 13374 13381 "resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.23.tgz", ··· 16331 16338 } 16332 16339 }, 16333 16340 "node_modules/react": { 16334 16334 - "version": "19.2.0", 16335 16335 - "resolved": "https://registry.npmjs.org/react/-/react-19.2.0.tgz", 16336 16336 - "integrity": "sha512-tmbWg6W31tQLeB5cdIBOicJDJRR2KzXsV7uSK9iNfLWQ5bIZfxuPEHp7M8wiHyHnn0DD1i7w3Zmin0FtkrwoCQ==", 16341 16341 + "version": "19.2.1", 16342 16342 + "resolved": "https://registry.npmjs.org/react/-/react-19.2.1.tgz", 16343 16343 + "integrity": "sha512-DGrYcCWK7tvYMnWh79yrPHt+vdx9tY+1gPZa7nJQtO/p8bLTDaHp4dzwEhQB7pZ4Xe3ok4XKuEPrVuc+wlpkmw==", 16344 16344 + "license": "MIT", 16337 16345 "engines": { 16338 16346 "node": ">=0.10.0" 16339 16347 } ··· 16452 16460 } 16453 16461 }, 16454 16462 "node_modules/react-dom": { 16455 16455 - "version": "19.2.0", 16456 16456 - "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.0.tgz", 16457 16457 - "integrity": "sha512-UlbRu4cAiGaIewkPyiRGJk0imDN2T3JjieT6spoL2UeSf5od4n5LB/mQ4ejmxhCFT1tYe8IvaFulzynWovsEFQ==", 16463 16463 + "version": "19.2.1", 16464 16464 + "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.1.tgz", 16465 16465 + "integrity": "sha512-ibrK8llX2a4eOskq1mXKu/TGZj9qzomO+sNfO98M6d9zIPOEhlBkMkBUBLd1vgS0gQsLDBzA+8jJBVXDnfHmJg==", 16466 16466 + "license": "MIT", 16458 16467 "dependencies": { 16459 16468 "scheduler": "^0.27.0" 16460 16469 }, 16461 16470 "peerDependencies": { 16462 16462 - "react": "^19.2.0" 16471 16471 + "react": "^19.2.1" 16463 16472 } 16464 16473 }, 16465 16474 "node_modules/react-is": {

+3 -2

package.json

··· 58 58 "inngest": "^3.40.1", 59 59 "ioredis": "^5.6.1", 60 60 "katex": "^0.16.22", 61 61 + "l": "^0.6.0", 61 62 "linkifyjs": "^4.2.0", 62 63 "luxon": "^3.7.2", 63 64 "multiformats": "^13.3.2", ··· 69 70 "prosemirror-model": "^1.21.0", 70 71 "prosemirror-schema-basic": "^1.2.2", 71 72 "prosemirror-state": "^1.4.3", 72 72 - "react": "19.2.0", 73 73 + "react": "19.2.1", 73 74 "react-aria-components": "^1.8.0", 74 75 "react-day-picker": "^9.3.0", 75 75 - "react-dom": "19.2.0", 76 76 + "react-dom": "19.2.1", 76 77 "react-use-measure": "^2.1.1", 77 78 "redlock": "^5.0.0-beta.2", 78 79 "rehype-parse": "^9.0.0",

+254 -37

src/notifications.ts

··· 2 2 3 3 import { supabaseServerClient } from "supabase/serverClient"; 4 4 import { Tables, TablesInsert } from "supabase/database.types"; 5 5 + import { AtUri } from "@atproto/syntax"; 6 6 + import { idResolver } from "app/(home-pages)/reader/idResolver"; 5 7 6 8 type NotificationRow = Tables<"notifications">; 7 9 ··· 12 14 export type NotificationData = 13 15 | { type: "comment"; comment_uri: string; parent_uri?: string } 14 16 | { type: "subscribe"; subscription_uri: string } 15 15 - | { type: "quote"; bsky_post_uri: string; document_uri: string }; 17 17 + | { type: "quote"; bsky_post_uri: string; document_uri: string } 18 18 + | { type: "mention"; document_uri: string; mention_type: "did" } 19 19 + | { type: "mention"; document_uri: string; mention_type: "publication"; mentioned_uri: string } 20 20 + | { type: "mention"; document_uri: string; mention_type: "document"; mentioned_uri: string } 21 21 + | { type: "comment_mention"; comment_uri: string; mention_type: "did" } 22 22 + | { type: "comment_mention"; comment_uri: string; mention_type: "publication"; mentioned_uri: string } 23 23 + | { type: "comment_mention"; comment_uri: string; mention_type: "document"; mentioned_uri: string }; 16 24 17 25 export type HydratedNotification = 18 26 | HydratedCommentNotification 19 27 | HydratedSubscribeNotification 20 20 - | HydratedQuoteNotification; 28 28 + | HydratedQuoteNotification 29 29 + | HydratedMentionNotification 30 30 + | HydratedCommentMentionNotification; 21 31 export async function hydrateNotifications( 22 32 notifications: NotificationRow[], 23 33 ): Promise<Array<HydratedNotification>> { 24 34 // Call all hydrators in parallel 25 25 - const [commentNotifications, subscribeNotifications, quoteNotifications] = await Promise.all([ 35 35 + const [commentNotifications, subscribeNotifications, quoteNotifications, mentionNotifications, commentMentionNotifications] = await Promise.all([ 26 36 hydrateCommentNotifications(notifications), 27 37 hydrateSubscribeNotifications(notifications), 28 38 hydrateQuoteNotifications(notifications), 39 39 + hydrateMentionNotifications(notifications), 40 40 + hydrateCommentMentionNotifications(notifications), 29 41 ]); 30 42 31 43 // Combine all hydrated notifications 32 32 - const allHydrated = [...commentNotifications, ...subscribeNotifications, ...quoteNotifications]; 44 44 + const allHydrated = [...commentNotifications, ...subscribeNotifications, ...quoteNotifications, ...mentionNotifications, ...commentMentionNotifications]; 33 45 34 46 // Sort by created_at to maintain order 35 47 allHydrated.sort( ··· 73 85 ) 74 86 .in("uri", commentUris); 75 87 76 76 - return commentNotifications.map((notification) => ({ 77 77 - id: notification.id, 78 78 - recipient: notification.recipient, 79 79 - created_at: notification.created_at, 80 80 - type: "comment" as const, 81 81 - comment_uri: notification.data.comment_uri, 82 82 - parentData: notification.data.parent_uri 83 83 - ? comments?.find((c) => c.uri === notification.data.parent_uri)! 84 84 - : undefined, 85 85 - commentData: comments?.find( 86 86 - (c) => c.uri === notification.data.comment_uri, 87 87 - )!, 88 88 - })); 88 88 + return commentNotifications 89 89 + .map((notification) => { 90 90 + const commentData = comments?.find((c) => c.uri === notification.data.comment_uri); 91 91 + if (!commentData) return null; 92 92 + return { 93 93 + id: notification.id, 94 94 + recipient: notification.recipient, 95 95 + created_at: notification.created_at, 96 96 + type: "comment" as const, 97 97 + comment_uri: notification.data.comment_uri, 98 98 + parentData: notification.data.parent_uri 99 99 + ? comments?.find((c) => c.uri === notification.data.parent_uri) 100 100 + : undefined, 101 101 + commentData, 102 102 + }; 103 103 + }) 104 104 + .filter((n) => n !== null); 89 105 } 90 106 91 107 export type HydratedSubscribeNotification = Awaited< ··· 113 129 .select("*, identities(bsky_profiles(*)), publications(*)") 114 130 .in("uri", subscriptionUris); 115 131 116 116 - return subscribeNotifications.map((notification) => ({ 117 117 - id: notification.id, 118 118 - recipient: notification.recipient, 119 119 - created_at: notification.created_at, 120 120 - type: "subscribe" as const, 121 121 - subscription_uri: notification.data.subscription_uri, 122 122 - subscriptionData: subscriptions?.find( 123 123 - (s) => s.uri === notification.data.subscription_uri, 124 124 - )!, 125 125 - })); 132 132 + return subscribeNotifications 133 133 + .map((notification) => { 134 134 + const subscriptionData = subscriptions?.find((s) => s.uri === notification.data.subscription_uri); 135 135 + if (!subscriptionData) return null; 136 136 + return { 137 137 + id: notification.id, 138 138 + recipient: notification.recipient, 139 139 + created_at: notification.created_at, 140 140 + type: "subscribe" as const, 141 141 + subscription_uri: notification.data.subscription_uri, 142 142 + subscriptionData, 143 143 + }; 144 144 + }) 145 145 + .filter((n) => n !== null); 126 146 } 127 147 128 148 export type HydratedQuoteNotification = Awaited< ··· 153 173 .select("*, documents_in_publications(publications(*))") 154 174 .in("uri", documentUris); 155 175 156 156 - return quoteNotifications.map((notification) => ({ 157 157 - id: notification.id, 158 158 - recipient: notification.recipient, 159 159 - created_at: notification.created_at, 160 160 - type: "quote" as const, 161 161 - bsky_post_uri: notification.data.bsky_post_uri, 162 162 - document_uri: notification.data.document_uri, 163 163 - bskyPost: bskyPosts?.find((p) => p.uri === notification.data.bsky_post_uri)!, 164 164 - document: documents?.find((d) => d.uri === notification.data.document_uri)!, 165 165 - })); 176 176 + return quoteNotifications 177 177 + .map((notification) => { 178 178 + const bskyPost = bskyPosts?.find((p) => p.uri === notification.data.bsky_post_uri); 179 179 + const document = documents?.find((d) => d.uri === notification.data.document_uri); 180 180 + if (!bskyPost || !document) return null; 181 181 + return { 182 182 + id: notification.id, 183 183 + recipient: notification.recipient, 184 184 + created_at: notification.created_at, 185 185 + type: "quote" as const, 186 186 + bsky_post_uri: notification.data.bsky_post_uri, 187 187 + document_uri: notification.data.document_uri, 188 188 + bskyPost, 189 189 + document, 190 190 + }; 191 191 + }) 192 192 + .filter((n) => n !== null); 193 193 + } 194 194 + 195 195 + export type HydratedMentionNotification = Awaited< 196 196 + ReturnType<typeof hydrateMentionNotifications> 197 197 + >[0]; 198 198 + 199 199 + async function hydrateMentionNotifications(notifications: NotificationRow[]) { 200 200 + const mentionNotifications = notifications.filter( 201 201 + (n): n is NotificationRow & { data: ExtractNotificationType<"mention"> } => 202 202 + (n.data as NotificationData)?.type === "mention", 203 203 + ); 204 204 + 205 205 + if (mentionNotifications.length === 0) { 206 206 + return []; 207 207 + } 208 208 + 209 209 + // Fetch document data from the database 210 210 + const documentUris = mentionNotifications.map((n) => n.data.document_uri); 211 211 + const { data: documents } = await supabaseServerClient 212 212 + .from("documents") 213 213 + .select("*, documents_in_publications(publications(*))") 214 214 + .in("uri", documentUris); 215 215 + 216 216 + // Extract unique DIDs from document URIs to resolve handles 217 217 + const documentCreatorDids = [...new Set(documentUris.map((uri) => new AtUri(uri).host))]; 218 218 + 219 219 + // Resolve DIDs to handles in parallel 220 220 + const didToHandleMap = new Map<string, string | null>(); 221 221 + await Promise.all( 222 222 + documentCreatorDids.map(async (did) => { 223 223 + try { 224 224 + const resolved = await idResolver.did.resolve(did); 225 225 + const handle = resolved?.alsoKnownAs?.[0] 226 226 + ? resolved.alsoKnownAs[0].slice(5) // Remove "at://" prefix 227 227 + : null; 228 228 + didToHandleMap.set(did, handle); 229 229 + } catch (error) { 230 230 + console.error(`Failed to resolve DID ${did}:`, error); 231 231 + didToHandleMap.set(did, null); 232 232 + } 233 233 + }), 234 234 + ); 235 235 + 236 236 + // Fetch mentioned publications and documents 237 237 + const mentionedPublicationUris = mentionNotifications 238 238 + .filter((n) => n.data.mention_type === "publication") 239 239 + .map((n) => (n.data as Extract<ExtractNotificationType<"mention">, { mention_type: "publication" }>).mentioned_uri); 240 240 + 241 241 + const mentionedDocumentUris = mentionNotifications 242 242 + .filter((n) => n.data.mention_type === "document") 243 243 + .map((n) => (n.data as Extract<ExtractNotificationType<"mention">, { mention_type: "document" }>).mentioned_uri); 244 244 + 245 245 + const [{ data: mentionedPublications }, { data: mentionedDocuments }] = await Promise.all([ 246 246 + mentionedPublicationUris.length > 0 247 247 + ? supabaseServerClient 248 248 + .from("publications") 249 249 + .select("*") 250 250 + .in("uri", mentionedPublicationUris) 251 251 + : Promise.resolve({ data: [] }), 252 252 + mentionedDocumentUris.length > 0 253 253 + ? supabaseServerClient 254 254 + .from("documents") 255 255 + .select("*, documents_in_publications(publications(*))") 256 256 + .in("uri", mentionedDocumentUris) 257 257 + : Promise.resolve({ data: [] }), 258 258 + ]); 259 259 + 260 260 + return mentionNotifications 261 261 + .map((notification) => { 262 262 + const document = documents?.find((d) => d.uri === notification.data.document_uri); 263 263 + if (!document) return null; 264 264 + 265 265 + const mentionedUri = notification.data.mention_type !== "did" 266 266 + ? (notification.data as Extract<ExtractNotificationType<"mention">, { mentioned_uri: string }>).mentioned_uri 267 267 + : undefined; 268 268 + 269 269 + const documentCreatorDid = new AtUri(notification.data.document_uri).host; 270 270 + const documentCreatorHandle = didToHandleMap.get(documentCreatorDid) ?? null; 271 271 + 272 272 + return { 273 273 + id: notification.id, 274 274 + recipient: notification.recipient, 275 275 + created_at: notification.created_at, 276 276 + type: "mention" as const, 277 277 + document_uri: notification.data.document_uri, 278 278 + mention_type: notification.data.mention_type, 279 279 + mentioned_uri: mentionedUri, 280 280 + document, 281 281 + documentCreatorHandle, 282 282 + mentionedPublication: mentionedUri ? mentionedPublications?.find((p) => p.uri === mentionedUri) : undefined, 283 283 + mentionedDocument: mentionedUri ? mentionedDocuments?.find((d) => d.uri === mentionedUri) : undefined, 284 284 + }; 285 285 + }) 286 286 + .filter((n) => n !== null); 287 287 + } 288 288 + 289 289 + export type HydratedCommentMentionNotification = Awaited< 290 290 + ReturnType<typeof hydrateCommentMentionNotifications> 291 291 + >[0]; 292 292 + 293 293 + async function hydrateCommentMentionNotifications(notifications: NotificationRow[]) { 294 294 + const commentMentionNotifications = notifications.filter( 295 295 + (n): n is NotificationRow & { data: ExtractNotificationType<"comment_mention"> } => 296 296 + (n.data as NotificationData)?.type === "comment_mention", 297 297 + ); 298 298 + 299 299 + if (commentMentionNotifications.length === 0) { 300 300 + return []; 301 301 + } 302 302 + 303 303 + // Fetch comment data from the database 304 304 + const commentUris = commentMentionNotifications.map((n) => n.data.comment_uri); 305 305 + const { data: comments } = await supabaseServerClient 306 306 + .from("comments_on_documents") 307 307 + .select( 308 308 + "*, bsky_profiles(*), documents(*, documents_in_publications(publications(*)))", 309 309 + ) 310 310 + .in("uri", commentUris); 311 311 + 312 312 + // Extract unique DIDs from comment URIs to resolve handles 313 313 + const commenterDids = [...new Set(commentUris.map((uri) => new AtUri(uri).host))]; 314 314 + 315 315 + // Resolve DIDs to handles in parallel 316 316 + const didToHandleMap = new Map<string, string | null>(); 317 317 + await Promise.all( 318 318 + commenterDids.map(async (did) => { 319 319 + try { 320 320 + const resolved = await idResolver.did.resolve(did); 321 321 + const handle = resolved?.alsoKnownAs?.[0] 322 322 + ? resolved.alsoKnownAs[0].slice(5) // Remove "at://" prefix 323 323 + : null; 324 324 + didToHandleMap.set(did, handle); 325 325 + } catch (error) { 326 326 + console.error(`Failed to resolve DID ${did}:`, error); 327 327 + didToHandleMap.set(did, null); 328 328 + } 329 329 + }), 330 330 + ); 331 331 + 332 332 + // Fetch mentioned publications and documents 333 333 + const mentionedPublicationUris = commentMentionNotifications 334 334 + .filter((n) => n.data.mention_type === "publication") 335 335 + .map((n) => (n.data as Extract<ExtractNotificationType<"comment_mention">, { mention_type: "publication" }>).mentioned_uri); 336 336 + 337 337 + const mentionedDocumentUris = commentMentionNotifications 338 338 + .filter((n) => n.data.mention_type === "document") 339 339 + .map((n) => (n.data as Extract<ExtractNotificationType<"comment_mention">, { mention_type: "document" }>).mentioned_uri); 340 340 + 341 341 + const [{ data: mentionedPublications }, { data: mentionedDocuments }] = await Promise.all([ 342 342 + mentionedPublicationUris.length > 0 343 343 + ? supabaseServerClient 344 344 + .from("publications") 345 345 + .select("*") 346 346 + .in("uri", mentionedPublicationUris) 347 347 + : Promise.resolve({ data: [] }), 348 348 + mentionedDocumentUris.length > 0 349 349 + ? supabaseServerClient 350 350 + .from("documents") 351 351 + .select("*, documents_in_publications(publications(*))") 352 352 + .in("uri", mentionedDocumentUris) 353 353 + : Promise.resolve({ data: [] }), 354 354 + ]); 355 355 + 356 356 + return commentMentionNotifications 357 357 + .map((notification) => { 358 358 + const commentData = comments?.find((c) => c.uri === notification.data.comment_uri); 359 359 + if (!commentData) return null; 360 360 + 361 361 + const mentionedUri = notification.data.mention_type !== "did" 362 362 + ? (notification.data as Extract<ExtractNotificationType<"comment_mention">, { mentioned_uri: string }>).mentioned_uri 363 363 + : undefined; 364 364 + 365 365 + const commenterDid = new AtUri(notification.data.comment_uri).host; 366 366 + const commenterHandle = didToHandleMap.get(commenterDid) ?? null; 367 367 + 368 368 + return { 369 369 + id: notification.id, 370 370 + recipient: notification.recipient, 371 371 + created_at: notification.created_at, 372 372 + type: "comment_mention" as const, 373 373 + comment_uri: notification.data.comment_uri, 374 374 + mention_type: notification.data.mention_type, 375 375 + mentioned_uri: mentionedUri, 376 376 + commentData, 377 377 + commenterHandle, 378 378 + mentionedPublication: mentionedUri ? mentionedPublications?.find((p) => p.uri === mentionedUri) : undefined, 379 379 + mentionedDocument: mentionedUri ? mentionedDocuments?.find((d) => d.uri === mentionedUri) : undefined, 380 380 + }; 381 381 + }) 382 382 + .filter((n) => n !== null); 166 383 } 167 384 168 385 export async function pingIdentityToUpdateNotification(did: string) {

+6 -1

src/utils/getMicroLinkOgImage.ts

··· 17 17 hostname = "leaflet.pub"; 18 18 } 19 19 let full_path = `${protocol}://${hostname}${path}`; 20 20 - return getWebpageImage(full_path, options); 20 20 + return getWebpageImage(full_path, { 21 21 + ...options, 22 22 + setJavaScriptEnabled: false, 23 23 + }); 21 24 } 22 25 23 26 export async function getWebpageImage( 24 27 url: string, 25 28 options?: { 29 29 + setJavaScriptEnabled?: boolean; 26 30 width?: number; 27 31 height?: number; 28 32 deviceScaleFactor?: number; ··· 39 43 }, 40 44 body: JSON.stringify({ 41 45 url, 46 46 + setJavaScriptEnabled: options?.setJavaScriptEnabled, 42 47 scrollPage: true, 43 48 addStyleTag: [ 44 49 {

+59

src/utils/mentionUtils.ts

··· 1 1 + import { AtUri } from "@atproto/api"; 2 2 + 3 3 + /** 4 4 + * Converts a DID to a Bluesky profile URL 5 5 + */ 6 6 + export function didToBlueskyUrl(did: string): string { 7 7 + return `https://bsky.app/profile/${did}`; 8 8 + } 9 9 + 10 10 + /** 11 11 + * Converts an AT URI (publication or document) to the appropriate URL 12 12 + */ 13 13 + export function atUriToUrl(atUri: string): string { 14 14 + try { 15 15 + const uri = new AtUri(atUri); 16 16 + 17 17 + if (uri.collection === "pub.leaflet.publication") { 18 18 + // Publication URL: /lish/{did}/{rkey} 19 19 + return `/lish/${uri.host}/${uri.rkey}`; 20 20 + } else if (uri.collection === "pub.leaflet.document") { 21 21 + // Document URL - we need to resolve this via the API 22 22 + // For now, create a redirect route that will handle it 23 23 + return `/lish/uri/${encodeURIComponent(atUri)}`; 24 24 + } 25 25 + 26 26 + return "#"; 27 27 + } catch (e) { 28 28 + console.error("Failed to parse AT URI:", atUri, e); 29 29 + return "#"; 30 30 + } 31 31 + } 32 32 + 33 33 + /** 34 34 + * Opens a mention link in the appropriate way 35 35 + * - DID mentions open in a new tab (external Bluesky) 36 36 + * - Publication/document mentions navigate in the same tab 37 37 + */ 38 38 + export function handleMentionClick( 39 39 + e: MouseEvent | React.MouseEvent, 40 40 + type: "did" | "at-uri", 41 41 + value: string 42 42 + ) { 43 43 + e.preventDefault(); 44 44 + e.stopPropagation(); 45 45 + 46 46 + if (type === "did") { 47 47 + // Open Bluesky profile in new tab 48 48 + window.open(didToBlueskyUrl(value), "_blank", "noopener,noreferrer"); 49 49 + } else { 50 50 + // Navigate to publication/document in same tab 51 51 + const url = atUriToUrl(value); 52 52 + if (url.startsWith("/lish/uri/")) { 53 53 + // Redirect route - navigate to it 54 54 + window.location.href = url; 55 55 + } else { 56 56 + window.location.href = url; 57 57 + } 58 58 + } 59 59 + }

+7

supabase/migrations/20251204130000_add_tags_to_drafts.sql

··· 1 1 + -- Add tags column to leaflets_in_publications for publication drafts 2 2 + ALTER TABLE "public"."leaflets_in_publications" 3 3 + ADD COLUMN "tags" text[] DEFAULT ARRAY[]::text[]; 4 4 + 5 5 + -- Add tags column to leaflets_to_documents for standalone document drafts 6 6 + ALTER TABLE "public"."leaflets_to_documents" 7 7 + ADD COLUMN "tags" text[] DEFAULT ARRAY[]::text[];

+38

supabase/migrations/20251204140000_update_pull_data_with_tags.sql

··· 1 1 + set check_function_bodies = off; 2 2 + 3 3 + CREATE OR REPLACE FUNCTION public.pull_data(token_id uuid, client_group_id text) 4 4 + RETURNS pull_result 5 5 + LANGUAGE plpgsql 6 6 + AS $function$DECLARE 7 7 + result pull_result; 8 8 + BEGIN 9 9 + -- Get client group data as JSON array 10 10 + SELECT json_agg(row_to_json(rc)) 11 11 + FROM replicache_clients rc 12 12 + WHERE rc.client_group = client_group_id 13 13 + INTO result.client_groups; 14 14 + 15 15 + -- Get facts as JSON array 16 16 + SELECT json_agg(row_to_json(f)) 17 17 + FROM permission_tokens pt, 18 18 + get_facts(pt.root_entity) f 19 19 + WHERE pt.id = token_id 20 20 + INTO result.facts; 21 21 + 22 22 + -- Get publication data - try leaflets_in_publications first, then leaflets_to_documents 23 23 + SELECT json_agg(row_to_json(lip)) 24 24 + FROM leaflets_in_publications lip 25 25 + WHERE lip.leaflet = token_id 26 26 + INTO result.publications; 27 27 + 28 28 + -- If no publication data found, try leaflets_to_documents (for standalone documents) 29 29 + IF result.publications IS NULL THEN 30 30 + SELECT json_agg(row_to_json(ltd)) 31 31 + FROM leaflets_to_documents ltd 32 32 + WHERE ltd.leaflet = token_id 33 33 + INTO result.publications; 34 34 + END IF; 35 35 + 36 36 + RETURN result; 37 37 + END;$function$ 38 38 + ;