+15

.claude/settings.local.json

··· 1 1 + { 2 2 + "permissions": { 3 3 + "allow": [ 4 4 + "mcp__acp__Edit", 5 5 + "mcp__acp__Write", 6 6 + "mcp__acp__Bash", 7 7 + "mcp__primitive__say_hello", 8 8 + "mcp__primitive__pending_delegations", 9 9 + "mcp__primitive__claim_delegation", 10 10 + "mcp__primitive__tasks_update", 11 11 + "mcp__primitive__contexts_update", 12 12 + "mcp__primitive__contexts_list" 13 13 + ] 14 14 + } 15 15 + }

-298

.claude/skills/lexicons.md

··· 1 1 - # Lexicon System 2 2 - 3 3 - ## Overview 4 4 - 5 5 - Lexicons define the schema for AT Protocol records. This project has two namespaces: 6 6 - - **`pub.leaflet.*`** - Leaflet-specific lexicons (documents, publications, blocks, etc.) 7 7 - - **`site.standard.*`** - Standard site lexicons for interoperability 8 8 - 9 9 - The lexicons are defined as TypeScript in `lexicons/src/`, built to JSON in `lexicons/pub/leaflet/` and `lexicons/site/standard/`, and TypeScript types are generated in `lexicons/api/`. 10 10 - 11 11 - ## Key Files 12 12 - 13 13 - - **`lexicons/src/*.ts`** - Source definitions for `pub.leaflet.*` lexicons 14 14 - - **`lexicons/site/standard/**/*.json`** - JSON definitions for `site.standard.*` lexicons (manually maintained) 15 15 - - **`lexicons/build.ts`** - Builds TypeScript sources to JSON 16 16 - - **`lexicons/api/`** - Generated TypeScript types and client 17 17 - - **`package.json`** - Contains `lexgen` script 18 18 - 19 19 - ## Running Lexicon Generation 20 20 - 21 21 - ```bash 22 22 - npm run lexgen 23 23 - ``` 24 24 - 25 25 - This runs: 26 26 - 1. `tsx ./lexicons/build.ts` - Builds `pub.leaflet.*` JSON from TypeScript 27 27 - 2. `lex gen-api` - Generates TypeScript types from all JSON lexicons 28 28 - 3. `tsx ./lexicons/fix-extensions.ts` - Fixes import extensions 29 29 - 30 30 - ## Adding a New pub.leaflet Lexicon 31 31 - 32 32 - ### 1. Create the Source Definition 33 33 - 34 34 - Create a file in `lexicons/src/` (e.g., `lexicons/src/myLexicon.ts`): 35 35 - 36 36 - ```typescript 37 37 - import { LexiconDoc } from "@atproto/lexicon"; 38 38 - 39 39 - export const PubLeafletMyLexicon: LexiconDoc = { 40 40 - lexicon: 1, 41 41 - id: "pub.leaflet.myLexicon", 42 42 - defs: { 43 43 - main: { 44 44 - type: "record", // or "object" for non-record types 45 45 - key: "tid", 46 46 - record: { 47 47 - type: "object", 48 48 - required: ["field1"], 49 49 - properties: { 50 50 - field1: { type: "string", maxLength: 1000 }, 51 51 - field2: { type: "integer", minimum: 0 }, 52 52 - optionalRef: { type: "ref", ref: "other.lexicon#def" }, 53 53 - }, 54 54 - }, 55 55 - }, 56 56 - // Additional defs for sub-objects 57 57 - subType: { 58 58 - type: "object", 59 59 - properties: { 60 60 - nested: { type: "string" }, 61 61 - }, 62 62 - }, 63 63 - }, 64 64 - }; 65 65 - ``` 66 66 - 67 67 - ### 2. Add to Build 68 68 - 69 69 - Update `lexicons/build.ts`: 70 70 - 71 71 - ```typescript 72 72 - import { PubLeafletMyLexicon } from "./src/myLexicon"; 73 73 - 74 74 - const lexicons = [ 75 75 - // ... existing lexicons 76 76 - PubLeafletMyLexicon, 77 77 - ]; 78 78 - ``` 79 79 - 80 80 - ### 3. Update lexgen Command (if needed) 81 81 - 82 82 - If your lexicon is at the top level of `pub/leaflet/` (not in a subdirectory), add it to the `lexgen` script in `package.json`: 83 83 - 84 84 - ```json 85 85 - "lexgen": "tsx ./lexicons/build.ts && lex gen-api ./lexicons/api ./lexicons/pub/leaflet/document.json ./lexicons/pub/leaflet/myLexicon.json ./lexicons/pub/leaflet/*/* ..." 86 86 - ``` 87 87 - 88 88 - Note: Files in subdirectories (`pub/leaflet/*/*`) are automatically included. 89 89 - 90 90 - ### 4. Add to authFullPermissions (for record types) 91 91 - 92 92 - If your lexicon is a record type that users should be able to create/update/delete, add it to the `authFullPermissions` permission set in `lexicons/src/authFullPermissions.ts`: 93 93 - 94 94 - ```typescript 95 95 - import { PubLeafletMyLexicon } from "./myLexicon"; 96 96 - 97 97 - // In the permissions collection array: 98 98 - collection: [ 99 99 - // ... existing lexicons 100 100 - PubLeafletMyLexicon.id, 101 101 - ], 102 102 - ``` 103 103 - 104 104 - ### 5. Regenerate Types 105 105 - 106 106 - ```bash 107 107 - npm run lexgen 108 108 - ``` 109 109 - 110 110 - ### 6. Use the Generated Types 111 111 - 112 112 - ```typescript 113 113 - import { PubLeafletMyLexicon } from "lexicons/api"; 114 114 - 115 115 - // Type for the record 116 116 - type MyRecord = PubLeafletMyLexicon.Record; 117 117 - 118 118 - // Validation 119 119 - const result = PubLeafletMyLexicon.validateRecord(data); 120 120 - if (result.success) { 121 121 - // result.value is typed 122 122 - } 123 123 - 124 124 - // Type guard 125 125 - if (PubLeafletMyLexicon.isRecord(data)) { 126 126 - // data is typed as Record 127 127 - } 128 128 - ``` 129 129 - 130 130 - ## Adding a New site.standard Lexicon 131 131 - 132 132 - ### 1. Create the JSON Definition 133 133 - 134 134 - Create a file in `lexicons/site/standard/` (e.g., `lexicons/site/standard/myType.json`): 135 135 - 136 136 - ```json 137 137 - { 138 138 - "lexicon": 1, 139 139 - "id": "site.standard.myType", 140 140 - "defs": { 141 141 - "main": { 142 142 - "type": "record", 143 143 - "key": "tid", 144 144 - "record": { 145 145 - "type": "object", 146 146 - "required": ["field1"], 147 147 - "properties": { 148 148 - "field1": { 149 149 - "type": "string", 150 150 - "maxLength": 1000 151 151 - } 152 152 - } 153 153 - } 154 154 - } 155 155 - } 156 156 - } 157 157 - ``` 158 158 - 159 159 - ### 2. Regenerate Types 160 160 - 161 161 - ```bash 162 162 - npm run lexgen 163 163 - ``` 164 164 - 165 165 - The `site/*/* site/*/*/*` globs in the lexgen command automatically pick up new files. 166 166 - 167 167 - ## Common Lexicon Patterns 168 168 - 169 169 - ### Referencing Other Lexicons 170 170 - 171 171 - ```typescript 172 172 - // Reference another lexicon's main def 173 173 - { type: "ref", ref: "pub.leaflet.publication" } 174 174 - 175 175 - // Reference a specific def within a lexicon 176 176 - { type: "ref", ref: "pub.leaflet.publication#theme" } 177 177 - 178 178 - // Reference within the same lexicon 179 179 - { type: "ref", ref: "#myDef" } 180 180 - ``` 181 181 - 182 182 - ### Union Types 183 183 - 184 184 - ```typescript 185 185 - { 186 186 - type: "union", 187 187 - refs: [ 188 188 - "pub.leaflet.pages.linearDocument", 189 189 - "pub.leaflet.pages.canvas", 190 190 - ], 191 191 - } 192 192 - 193 193 - // Open union (allows unknown types) 194 194 - { 195 195 - type: "union", 196 196 - closed: false, // default is true 197 197 - refs: ["pub.leaflet.content"], 198 198 - } 199 199 - ``` 200 200 - 201 201 - ### Blob Types (for images/files) 202 202 - 203 203 - ```typescript 204 204 - { 205 205 - type: "blob", 206 206 - accept: ["image/*"], // or specific types like ["image/png", "image/jpeg"] 207 207 - maxSize: 1000000, // bytes 208 208 - } 209 209 - ``` 210 210 - 211 211 - ### Color Types 212 212 - 213 213 - The project has color types defined: 214 214 - - `pub.leaflet.theme.color#rgb` / `#rgba` 215 215 - - `site.standard.theme.color#rgb` / `#rgba` 216 216 - 217 217 - ```typescript 218 218 - // In lexicons/src/theme.ts 219 219 - export const ColorUnion = { 220 220 - type: "union", 221 221 - refs: [ 222 222 - "pub.leaflet.theme.color#rgba", 223 223 - "pub.leaflet.theme.color#rgb", 224 224 - ], 225 225 - }; 226 226 - ``` 227 227 - 228 228 - ## Normalization Between Formats 229 229 - 230 230 - Use `lexicons/src/normalize.ts` to convert between `pub.leaflet` and `site.standard` formats: 231 231 - 232 232 - ```typescript 233 233 - import { 234 234 - normalizeDocument, 235 235 - normalizePublication, 236 236 - isLeafletDocument, 237 237 - isStandardDocument, 238 238 - getDocumentPages, 239 239 - } from "lexicons/src/normalize"; 240 240 - 241 241 - // Normalize a document from either format 242 242 - const normalized = normalizeDocument(record); 243 243 - if (normalized) { 244 244 - // normalized is always in site.standard.document format 245 245 - console.log(normalized.title, normalized.site); 246 246 - 247 247 - // Get pages if content is pub.leaflet.content 248 248 - const pages = getDocumentPages(normalized); 249 249 - } 250 250 - 251 251 - // Normalize a publication 252 252 - const pub = normalizePublication(record); 253 253 - if (pub) { 254 254 - console.log(pub.name, pub.url); 255 255 - } 256 256 - ``` 257 257 - 258 258 - ## Handling in Appview (Firehose Consumer) 259 259 - 260 260 - When processing records from the firehose in `appview/index.ts`: 261 261 - 262 262 - ```typescript 263 263 - import { ids } from "lexicons/api/lexicons"; 264 264 - import { PubLeafletMyLexicon } from "lexicons/api"; 265 265 - 266 266 - // In filterCollections: 267 267 - filterCollections: [ 268 268 - ids.PubLeafletMyLexicon, 269 269 - // ... 270 270 - ], 271 271 - 272 272 - // In handleEvent: 273 273 - if (evt.collection === ids.PubLeafletMyLexicon) { 274 274 - if (evt.event === "create" || evt.event === "update") { 275 275 - let record = PubLeafletMyLexicon.validateRecord(evt.record); 276 276 - if (!record.success) return; 277 277 - 278 278 - // Store in database 279 279 - await supabase.from("my_table").upsert({ 280 280 - uri: evt.uri.toString(), 281 281 - data: record.value as Json, 282 282 - }); 283 283 - } 284 284 - if (evt.event === "delete") { 285 285 - await supabase.from("my_table").delete().eq("uri", evt.uri.toString()); 286 286 - } 287 287 - } 288 288 - ``` 289 289 - 290 290 - ## Publishing Lexicons 291 291 - 292 292 - To publish lexicons to an AT Protocol PDS: 293 293 - 294 294 - ```bash 295 295 - npm run publish-lexicons 296 296 - ``` 297 297 - 298 298 - This runs `lexicons/publish.ts` which publishes lexicons to the configured PDS.

+21

actions/publishToPublication.ts

··· 78 78 cover_image, 79 79 entitiesToDelete, 80 80 publishedAt, 81 81 + postPreferences, 81 82 }: { 82 83 root_entity: string; 83 84 publication_uri?: string; ··· 88 89 cover_image?: string | null; 89 90 entitiesToDelete?: string[]; 90 91 publishedAt?: string; 92 92 + postPreferences?: { 93 93 + showComments?: boolean; 94 94 + showMentions?: boolean; 95 95 + showRecommends?: boolean; 96 96 + } | null; 91 97 }): Promise<PublishResult> { 92 98 let identity = await getIdentityData(); 93 99 if (!identity || !identity.atp_did) { ··· 175 181 }; 176 182 } 177 183 184 184 + // Resolve preferences: explicit param > draft DB value 185 185 + const preferences = postPreferences ?? draft?.preferences; 186 186 + 178 187 // Extract theme for standalone documents (not for publications) 179 188 let theme: PubLeafletPublication.Theme | undefined; 180 189 if (!publication_uri) { ··· 245 254 ...(coverImageBlob && { coverImage: coverImageBlob }), 246 255 // Include theme for standalone documents (not for publication documents) 247 256 ...(!publication_uri && theme && { theme }), 257 257 + ...(preferences && { 258 258 + preferences: { 259 259 + $type: "pub.leaflet.publication#preferences" as const, 260 260 + ...preferences, 261 261 + }, 262 262 + }), 248 263 content: { 249 264 $type: "pub.leaflet.content" as const, 250 265 pages: pagesArray, ··· 257 272 author: credentialSession.did!, 258 273 ...(publication_uri && { publication: publication_uri }), 259 274 ...(theme && { theme }), 275 275 + ...(preferences && { 276 276 + preferences: { 277 277 + $type: "pub.leaflet.publication#preferences" as const, 278 278 + ...preferences, 279 279 + }, 280 280 + }), 260 281 title: title || "Untitled", 261 282 description: description || "", 262 283 ...(tags !== undefined && { tags }),

+1 -3

app/(home-pages)/home/Actions/AccountSettings.tsx

··· 23 23 side={isMobile ? "top" : "right"} 24 24 align={isMobile ? "center" : "start"} 25 25 className={`max-w-xs w-[1000px] ${state === "theme" && "bg-white!"}`} 26 26 - trigger={ 27 27 - <ActionButton smallOnMobile icon=<AccountSmall /> label="Settings" /> 28 28 - } 26 26 + trigger={<ActionButton icon=<AccountSmall /> label="Settings" />} 29 27 > 30 28 {state === "general" ? ( 31 29 <GeneralSettings backToMenu={() => setState("menu")} />

+5 -1

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

··· 13 13 return ( 14 14 <> 15 15 <CreateNewLeafletButton /> 16 16 - {identity && <AccountSettings entityID={rootEntity} />} 16 16 + {identity ? ( 17 17 + <AccountSettings entityID={rootEntity} /> 18 18 + ) : ( 19 19 + <LoginActionButton /> 20 20 + )} 17 21 </> 18 22 ); 19 23 };

+1 -2

app/(home-pages)/home/Actions/CreateNewButton.tsx

··· 26 26 <ActionButton 27 27 id="new-leaflet-button" 28 28 primary 29 29 - icon=<AddTiny className="sm:m-1 shrink-0 sm:scale-100 scale-75" /> 29 29 + icon=<AddTiny className="m-1 shrink-0" /> 30 30 label="New" 31 31 - smallOnMobile 32 31 /> 33 32 } 34 33 >

+79 -55

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

··· 1 1 "use client"; 2 2 + 2 3 import { PubListEmptyIllo } from "components/ActionBar/Publications"; 3 3 - import { ButtonPrimary, ButtonSecondary } from "components/Buttons"; 4 4 + import { ButtonPrimary } from "components/Buttons"; 5 5 + import { AddSmall } from "components/Icons/AddSmall"; 6 6 + import { Link } from "react-aria-components"; 7 7 + import { DiscoverIllo } from "./DiscoverIllo"; 4 8 import { WelcomeToLeafletIllo } from "./WelcomeToLeafletIllo"; 9 9 + import { DiscoverSmall } from "components/Icons/DiscoverSmall"; 10 10 + import { PublishSmall } from "components/Icons/PublishSmall"; 5 11 import { createNewLeaflet } from "actions/createNewLeaflet"; 6 12 import { useIsMobile } from "src/hooks/isMobile"; 7 7 - import { SpeedyLink } from "components/SpeedyLink"; 8 13 9 14 export function HomeEmptyState() { 15 15 + let isMobile = useIsMobile(); 10 16 return ( 11 11 - <div className="flex flex-col gap-4 sm:flex-row"> 17 17 + <div className="flex flex-col gap-4 font-bold"> 18 18 + <div className="container p-2 flex gap-4"> 19 19 + <div className="w-[72px]"> 20 20 + <WelcomeToLeafletIllo /> 21 21 + </div> 22 22 + <div className="flex flex-col grow"> 23 23 + <h3 className="text-xl font-semibold pt-2">Leaflet</h3> 24 24 + {/*<h3>A platform for social publishing.</h3>*/} 25 25 + <div className="font-normal text-tertiary italic"> 26 26 + Write and share delightful documents! 27 27 + </div> 28 28 + <ButtonPrimary 29 29 + className="!text-lg my-3" 30 30 + onClick={async () => { 31 31 + let openNewLeaflet = (id: string) => { 32 32 + if (isMobile) { 33 33 + window.location.href = `/${id}?focusFirstBlock`; 34 34 + } else { 35 35 + window.open(`/${id}?focusFirstBlock`, "_blank"); 36 36 + } 37 37 + }; 38 38 + 39 39 + let id = await createNewLeaflet({ 40 40 + pageType: "doc", 41 41 + redirectUser: false, 42 42 + }); 43 43 + openNewLeaflet(id); 44 44 + }} 45 45 + > 46 46 + <AddSmall /> Write a Doc! 47 47 + </ButtonPrimary> 48 48 + </div> 49 49 + </div> 50 50 + <div className="flex gap-2 w-full items-center text-tertiary font-normal italic"> 51 51 + <hr className="border-border w-full" /> 52 52 + <div>or</div> 53 53 + <hr className="border-border w-full" /> 54 54 + </div> 55 55 + 12 56 <PublicationBanner /> 13 13 - <div className="flex sm:flex-col flex-row gap-2 sm:w-fit w-full items-center text-tertiary font-normal italic"> 14 14 - <hr className="border-border grow w-full sm:w-px h-px sm:h-full border-l" /> 15 15 - <div>or</div> 16 16 - <hr className="border-border grow w-full sm:w-px h-px sm:h-full border-l" /> 57 57 + <DiscoverBanner /> 58 58 + <div className="text-tertiary italic text-sm font-normal -mt-2"> 59 59 + Right now docs and publications are separate. Soon you'll be able to add 60 60 + docs to pubs! 17 61 </div> 18 18 - <DocBanner /> 19 62 </div> 20 63 ); 21 64 } 22 65 23 23 - let bannerStyles = 24 24 - "flex flex-row sm:flex-col py-4 px-4 sm:items-center items-start gap-4"; 25 25 - 26 26 - const PublicationBanner = () => { 66 66 + export const PublicationBanner = (props: { small?: boolean }) => { 27 67 return ( 28 28 - <div className={`accent-container sm:basis-2/3 ${bannerStyles}`}> 29 29 - <div className="my-auto flex flex-row sm:flex-col gap-4"> 68 68 + <div 69 69 + className={`accent-container flex sm:py-2 items-center ${props.small ? "items-start gap-2 p-2 text-sm font-normal" : "items-center p-4 gap-4"}`} 70 70 + > 71 71 + {props.small ? ( 72 72 + <PublishSmall className="shrink-0 text-accent-contrast" /> 73 73 + ) : ( 30 74 <div className="w-[64px] mx-auto"> 31 75 <PubListEmptyIllo /> 32 76 </div> 33 33 - <div className={`flex flex-col sm:text-center text-left w-full`}> 34 34 - <h3>Create a Publication!</h3> 35 35 - <div className="mb-2 text-tertiary"> 36 36 - You can decide to share or publish it later. 37 37 - </div> 38 38 - <SpeedyLink href="/lish/createPub" className="sm:mx-auto mx-0 "> 39 39 - <ButtonPrimary>Create a Publication</ButtonPrimary> 40 40 - </SpeedyLink> 41 41 - </div> 77 77 + )} 78 78 + <div className={`${props.small ? "pt-[2px]" : ""} grow`}> 79 79 + <Link href={"/lish/createPub"} className="font-bold"> 80 80 + Start a Publication 81 81 + </Link>{" "} 82 82 + and blog in the Atmosphere 42 83 </div> 43 84 </div> 44 85 ); 45 86 }; 46 87 47 47 - const DocBanner = () => { 48 48 - let isMobile = useIsMobile(); 49 49 - 88 88 + export const DiscoverBanner = (props: { small?: boolean }) => { 50 89 return ( 51 51 - <div className={`text-sm sm:basis-1/3 py-0! sm:py-4! ${bannerStyles}`}> 52 52 - <div className="w-[48px] mx-auto"> 53 53 - <WelcomeToLeafletIllo /> 54 54 - </div> 55 55 - 56 56 - <div className={`grow flex flex-col sm:text-center text-left w-full`}> 57 57 - <h4>Just write something</h4> 58 58 - <div className="mb-2 text-tertiary"> 59 59 - You can decide to share or publish it later. 90 90 + <div 91 91 + className={`accent-container flex sm:py-2 items-center ${props.small ? "items-start gap-2 p-2 text-sm font-normal" : "items-center p-4 gap-4"}`} 92 92 + > 93 93 + {props.small ? ( 94 94 + <DiscoverSmall className="shrink-0 text-accent-contrast" /> 95 95 + ) : ( 96 96 + <div className="w-[64px] mx-auto"> 97 97 + <DiscoverIllo /> 60 98 </div> 61 61 - <ButtonSecondary 62 62 - className="sm:mx-auto mx-0" 63 63 - onClick={async () => { 64 64 - let openNewLeaflet = (id: string) => { 65 65 - if (isMobile) { 66 66 - window.location.href = `/${id}?focusFirstBlock`; 67 67 - } else { 68 68 - window.open(`/${id}?focusFirstBlock`, "_blank"); 69 69 - } 70 70 - }; 71 71 - 72 72 - let id = await createNewLeaflet({ 73 73 - pageType: "doc", 74 74 - redirectUser: false, 75 75 - }); 76 76 - openNewLeaflet(id); 77 77 - }} 78 78 - > 79 79 - New Doc! 80 80 - </ButtonSecondary> 99 99 + )} 100 100 + <div className={`${props.small ? "pt-[2px]" : ""} grow`}> 101 101 + <Link href={"/discover"} className="font-bold"> 102 102 + Explore Publications 103 103 + </Link>{" "} 104 104 + on art, tech, games, music & more! 81 105 </div> 82 106 </div> 83 107 );

+2 -2

app/(home-pages)/home/HomeEmpty/WelcomeToLeafletIllo.tsx

··· 3 3 export const WelcomeToLeafletIllo = () => { 4 4 return ( 5 5 <svg 6 6 - width="48" 7 7 - height="44" 6 6 + width="73" 7 7 + height="68" 8 8 viewBox="0 0 73 68" 9 9 fill="none" 10 10 xmlns="http://www.w3.org/2000/svg"

+10 -3

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

··· 23 23 import { GetLeafletDataReturnType } from "app/api/rpc/[command]/get_leaflet_data"; 24 24 import { useState } from "react"; 25 25 import { useDebouncedEffect } from "src/hooks/useDebouncedEffect"; 26 26 - import { HomeEmptyState } from "./HomeEmpty/HomeEmpty"; 26 26 + import { 27 27 + DiscoverBanner, 28 28 + HomeEmptyState, 29 29 + PublicationBanner, 30 30 + } from "./HomeEmpty/HomeEmpty"; 27 31 28 32 export type Leaflet = { 29 33 added_at: string; ··· 99 103 ), 100 104 }, 101 105 }} 102 102 - pageTitle={"Home"} 103 106 /> 104 107 ); 105 108 }; ··· 167 170 showPreview 168 171 /> 169 172 <div className="spacer h-4 w-full bg-transparent shrink-0 " /> 173 173 + 174 174 + {leaflets.filter((l) => !!l.token.leaflets_in_publications).length === 175 175 + 0 && <PublicationBanner small />} 176 176 + <DiscoverBanner small /> 170 177 </> 171 178 ); 172 179 } ··· 197 204 className={` 198 205 leafletList 199 206 w-full 200 200 - ${display === "grid" ? "grid auto-rows-max md:grid-cols-4 sm:grid-cols-3 grid-cols-2 gap-y-4 gap-x-4 sm:gap-x-6 sm:gap-y-5 grow" : "flex flex-col gap-2"} `} 207 207 + ${display === "grid" ? "grid auto-rows-max md:grid-cols-4 sm:grid-cols-3 grid-cols-2 gap-y-4 gap-x-4 sm:gap-x-6 sm:gap-y-5 grow" : "flex flex-col gap-2 pt-2"} `} 201 208 > 202 209 {props.leaflets.map(({ token: leaflet, added_at, archived }, index) => ( 203 210 <ReplicacheProvider

-1

app/(home-pages)/looseleafs/LooseleafsLayout.tsx

··· 47 47 ), 48 48 }, 49 49 }} 50 50 - pageTitle="Looseleafs" 51 50 /> 52 51 ); 53 52 };

+2

app/(home-pages)/p/[didOrHandle]/ProfileHeader.tsx

··· 42 42 @{props.profile.handle} 43 43 </div> 44 44 ); 45 45 + console.log(props.profile); 46 46 + 45 47 return ( 46 48 <div 47 49 className={`profileHeader flex flex-col relative `}

+15 -12

app/(home-pages)/p/[didOrHandle]/getProfilePosts.ts

··· 26 26 `*, 27 27 comments_on_documents(count), 28 28 document_mentions_in_bsky(count), 29 29 + recommends_on_documents(count), 29 30 documents_in_publications(publications(*))`, 30 31 ) 31 32 .like("uri", `at://${did}/%`) ··· 39 40 ); 40 41 } 41 42 42 42 - let [{ data: rawDocs }, { data: rawPubs }, { data: profile }] = await Promise.all([ 43 43 - query, 44 44 - supabaseServerClient 45 45 - .from("publications") 46 46 - .select("*") 47 47 - .eq("identity_did", did), 48 48 - supabaseServerClient 49 49 - .from("bsky_profiles") 50 50 - .select("handle") 51 51 - .eq("did", did) 52 52 - .single(), 53 53 - ]); 43 43 + let [{ data: rawDocs }, { data: rawPubs }, { data: profile }] = 44 44 + await Promise.all([ 45 45 + query, 46 46 + supabaseServerClient 47 47 + .from("publications") 48 48 + .select("*") 49 49 + .eq("identity_did", did), 50 50 + supabaseServerClient 51 51 + .from("bsky_profiles") 52 52 + .select("handle") 53 53 + .eq("did", did) 54 54 + .single(), 55 55 + ]); 54 56 55 57 // Deduplicate records that may exist under both pub.leaflet and site.standard namespaces 56 58 const docs = deduplicateByUriOrdered(rawDocs || []); ··· 82 84 sort_date: doc.sort_date, 83 85 comments_on_documents: doc.comments_on_documents, 84 86 document_mentions_in_bsky: doc.document_mentions_in_bsky, 87 87 + recommends_on_documents: doc.recommends_on_documents, 85 88 }, 86 89 }; 87 90

-1

app/(home-pages)/p/[didOrHandle]/layout.tsx

··· 82 82 id="profile" 83 83 defaultTab="default" 84 84 currentPage="profile" 85 85 - profileDid={did} 86 85 actions={null} 87 86 tabs={{ 88 87 default: {

-9

app/(home-pages)/reader/GlobalContent.tsx

··· 1 1 - "use client"; 2 2 - 3 3 - export const GlobalContent = () => { 4 4 - return ( 5 5 - <div className="flex flex-col gap-2 container bg-[rgba(var(--bg-page),.7)] sm:p-4 p-3 justify-between text-center text-tertiary"> 6 6 - Nothing here yet… 7 7 - </div> 8 8 - ); 9 9 - };

-148

app/(home-pages)/reader/InboxContent.tsx

··· 1 1 - "use client"; 2 2 - import { ButtonPrimary } from "components/Buttons"; 3 3 - import { DiscoverSmall } from "components/Icons/DiscoverSmall"; 4 4 - import type { Cursor, Post } from "./getReaderFeed"; 5 5 - import useSWRInfinite from "swr/infinite"; 6 6 - import { getReaderFeed } from "./getReaderFeed"; 7 7 - import { useEffect, useRef, useState } from "react"; 8 8 - import Link from "next/link"; 9 9 - import { PostListing } from "components/PostListing"; 10 10 - import { SortSmall } from "components/Icons/SortSmall"; 11 11 - import { Input } from "components/Input"; 12 12 - import { useHasBackgroundImage } from "components/Pages/useHasBackgroundImage"; 13 13 - import { InteractionDrawer } from "app/lish/[did]/[publication]/[rkey]/Interactions/InteractionDrawer"; 14 14 - 15 15 - export const InboxContent = (props: { 16 16 - posts: Post[]; 17 17 - nextCursor: Cursor | null; 18 18 - }) => { 19 19 - const getKey = ( 20 20 - pageIndex: number, 21 21 - previousPageData: { 22 22 - posts: Post[]; 23 23 - nextCursor: Cursor | null; 24 24 - } | null, 25 25 - ) => { 26 26 - // Reached the end 27 27 - if (previousPageData && !previousPageData.nextCursor) return null; 28 28 - 29 29 - // First page, we don't have previousPageData 30 30 - if (pageIndex === 0) return ["reader-feed", null] as const; 31 31 - 32 32 - // Add the cursor to the key 33 33 - return ["reader-feed", previousPageData?.nextCursor] as const; 34 34 - }; 35 35 - 36 36 - const { data, size, setSize, isValidating } = useSWRInfinite( 37 37 - getKey, 38 38 - ([_, cursor]) => getReaderFeed(cursor), 39 39 - { 40 40 - fallbackData: [{ posts: props.posts, nextCursor: props.nextCursor }], 41 41 - revalidateFirstPage: false, 42 42 - }, 43 43 - ); 44 44 - 45 45 - const loadMoreRef = useRef<HTMLDivElement>(null); 46 46 - 47 47 - // Set up intersection observer to load more when trigger element is visible 48 48 - useEffect(() => { 49 49 - const observer = new IntersectionObserver( 50 50 - (entries) => { 51 51 - if (entries[0].isIntersecting && !isValidating) { 52 52 - const hasMore = data && data[data.length - 1]?.nextCursor; 53 53 - if (hasMore) { 54 54 - setSize(size + 1); 55 55 - } 56 56 - } 57 57 - }, 58 58 - { threshold: 0.1 }, 59 59 - ); 60 60 - 61 61 - if (loadMoreRef.current) { 62 62 - observer.observe(loadMoreRef.current); 63 63 - } 64 64 - 65 65 - return () => observer.disconnect(); 66 66 - }, [data, size, setSize, isValidating]); 67 67 - let [searchValue, setSearchValue] = useState(""); 68 68 - let [sort, setSort] = useState<"recent" | "popular">("popular"); 69 69 - 70 70 - const allPosts = data ? data.flatMap((page) => page.posts) : []; 71 71 - const postTitles = allPosts.map((p) => { 72 72 - p.documents.data?.title; 73 73 - }); 74 74 - const filteredPosts = allPosts 75 75 - .filter((p) => 76 76 - p.documents.data?.title.toLowerCase().includes(searchValue.toLowerCase()), 77 77 - ) 78 78 - .sort( 79 79 - (a, b) => 80 80 - new Date(b.documents.data?.publishedAt || 0).getTime() - 81 81 - new Date(a.documents.data?.publishedAt || 0).getTime(), 82 82 - ); 83 83 - 84 84 - if (allPosts.length === 0 && !isValidating) return <ReaderEmpty />; 85 85 - 86 86 - let hasBackgroundImage = useHasBackgroundImage(); 87 87 - 88 88 - return ( 89 89 - <div className="flex flex-row gap-6"> 90 90 - <div className="flex flex-col gap-6 relative"> 91 91 - <div className="flex justify-between gap-4 text-tertiary"> 92 92 - <Input 93 93 - className={`inboxSearchInput 94 94 - appearance-none! outline-hidden! 95 95 - w-full min-w-0 text-primary relative px-1 96 96 - border rounded-md border-border-light focus-within:border-border 97 97 - bg-transparent ${hasBackgroundImage ? "focus-within:bg-bg-page" : "focus-within:bg-bg-leaflet"} `} 98 98 - type="text" 99 99 - id="inbox-search" 100 100 - size={1} 101 101 - placeholder="search posts..." 102 102 - value={searchValue} 103 103 - onChange={(e) => { 104 104 - setSearchValue(e.currentTarget.value); 105 105 - }} 106 106 - /> 107 107 - <button 108 108 - className="flex gap-1" 109 109 - onClick={() => { 110 110 - setSort(sort === "popular" ? "recent" : "popular"); 111 111 - }} 112 112 - > 113 113 - {sort === "popular" ? "Popular" : "Recent"} 114 114 - <SortSmall /> 115 115 - </button> 116 116 - </div> 117 117 - {filteredPosts.map((p) => ( 118 118 - <PostListing {...p} key={p.documents.uri} /> 119 119 - ))} 120 120 - {/* Trigger element for loading more posts */} 121 121 - <div 122 122 - ref={loadMoreRef} 123 123 - className="absolute bottom-96 left-0 w-full h-px pointer-events-none" 124 124 - aria-hidden="true" 125 125 - /> 126 126 - {isValidating && ( 127 127 - <div className="text-center text-tertiary py-4"> 128 128 - Loading more posts... 129 129 - </div> 130 130 - )} 131 131 - </div> 132 132 - </div> 133 133 - ); 134 134 - }; 135 135 - 136 136 - export const ReaderEmpty = () => { 137 137 - return ( 138 138 - <div className="flex flex-col gap-2 container bg-[rgba(var(--bg-page),.7)] sm:p-4 p-3 justify-between text-center text-tertiary"> 139 139 - Nothing to read yet… <br /> 140 140 - Subscribe to publications and find their posts here! 141 141 - <Link href={"/discover"}> 142 142 - <ButtonPrimary className="mx-auto place-self-center"> 143 143 - <DiscoverSmall /> Discover Publications 144 144 - </ButtonPrimary> 145 145 - </Link> 146 146 - </div> 147 147 - ); 148 148 - };

-9

app/(home-pages)/reader/LocalContent.tsx

··· 1 1 - "use client"; 2 2 - 3 3 - export const LocalContent = () => { 4 4 - return ( 5 5 - <div className="flex flex-col gap-2 container bg-[rgba(var(--bg-page),.7)] sm:p-4 p-3 justify-between text-center text-tertiary"> 6 6 - Nothing here yet… 7 7 - </div> 8 8 - ); 9 9 - };

+100

app/(home-pages)/reader/ReaderContent.tsx

··· 1 1 + "use client"; 2 2 + import { ButtonPrimary } from "components/Buttons"; 3 3 + import { DiscoverSmall } from "components/Icons/DiscoverSmall"; 4 4 + import type { Cursor, Post } from "./getReaderFeed"; 5 5 + import useSWRInfinite from "swr/infinite"; 6 6 + import { getReaderFeed } from "./getReaderFeed"; 7 7 + import { useEffect, useRef } from "react"; 8 8 + import Link from "next/link"; 9 9 + import { PostListing } from "components/PostListing"; 10 10 + 11 11 + export const ReaderContent = (props: { 12 12 + posts: Post[]; 13 13 + nextCursor: Cursor | null; 14 14 + }) => { 15 15 + const getKey = ( 16 16 + pageIndex: number, 17 17 + previousPageData: { 18 18 + posts: Post[]; 19 19 + nextCursor: Cursor | null; 20 20 + } | null, 21 21 + ) => { 22 22 + // Reached the end 23 23 + if (previousPageData && !previousPageData.nextCursor) return null; 24 24 + 25 25 + // First page, we don't have previousPageData 26 26 + if (pageIndex === 0) return ["reader-feed", null] as const; 27 27 + 28 28 + // Add the cursor to the key 29 29 + return ["reader-feed", previousPageData?.nextCursor] as const; 30 30 + }; 31 31 + 32 32 + const { data, size, setSize, isValidating } = useSWRInfinite( 33 33 + getKey, 34 34 + ([_, cursor]) => getReaderFeed(cursor), 35 35 + { 36 36 + fallbackData: [{ posts: props.posts, nextCursor: props.nextCursor }], 37 37 + revalidateFirstPage: false, 38 38 + }, 39 39 + ); 40 40 + 41 41 + const loadMoreRef = useRef<HTMLDivElement>(null); 42 42 + 43 43 + // Set up intersection observer to load more when trigger element is visible 44 44 + useEffect(() => { 45 45 + const observer = new IntersectionObserver( 46 46 + (entries) => { 47 47 + if (entries[0].isIntersecting && !isValidating) { 48 48 + const hasMore = data && data[data.length - 1]?.nextCursor; 49 49 + if (hasMore) { 50 50 + setSize(size + 1); 51 51 + } 52 52 + } 53 53 + }, 54 54 + { threshold: 0.1 }, 55 55 + ); 56 56 + 57 57 + if (loadMoreRef.current) { 58 58 + observer.observe(loadMoreRef.current); 59 59 + } 60 60 + 61 61 + return () => observer.disconnect(); 62 62 + }, [data, size, setSize, isValidating]); 63 63 + 64 64 + const allPosts = data ? data.flatMap((page) => page.posts) : []; 65 65 + 66 66 + if (allPosts.length === 0 && !isValidating) return <ReaderEmpty />; 67 67 + 68 68 + return ( 69 69 + <div className="flex flex-col gap-3 relative"> 70 70 + {allPosts.map((p) => ( 71 71 + <PostListing {...p} key={p.documents.uri} /> 72 72 + ))} 73 73 + {/* Trigger element for loading more posts */} 74 74 + <div 75 75 + ref={loadMoreRef} 76 76 + className="absolute bottom-96 left-0 w-full h-px pointer-events-none" 77 77 + aria-hidden="true" 78 78 + /> 79 79 + {isValidating && ( 80 80 + <div className="text-center text-tertiary py-4"> 81 81 + Loading more posts... 82 82 + </div> 83 83 + )} 84 84 + </div> 85 85 + ); 86 86 + }; 87 87 + 88 88 + export const ReaderEmpty = () => { 89 89 + return ( 90 90 + <div className="flex flex-col gap-2 container bg-[rgba(var(--bg-page),.7)] sm:p-4 p-3 justify-between text-center text-tertiary"> 91 91 + Nothing to read yet… <br /> 92 92 + Subscribe to publications and find their posts here! 93 93 + <Link href={"/discover"}> 94 94 + <ButtonPrimary className="mx-auto place-self-center"> 95 95 + <DiscoverSmall /> Discover Publications 96 96 + </ButtonPrimary> 97 97 + </Link> 98 98 + </div> 99 99 + ); 100 100 + };

+3

app/(home-pages)/reader/getReaderFeed.ts

··· 32 32 `*, 33 33 comments_on_documents(count), 34 34 document_mentions_in_bsky(count), 35 35 + recommends_on_documents(count), 35 36 documents_in_publications!inner(publications!inner(*, publication_subscriptions!inner(*)))`, 36 37 ) 37 38 .eq( ··· 76 77 documents: { 77 78 comments_on_documents: post.comments_on_documents, 78 79 document_mentions_in_bsky: post.document_mentions_in_bsky, 80 80 + recommends_on_documents: post.recommends_on_documents, 79 81 data: normalizedData, 80 82 uri: post.uri, 81 83 sort_date: post.sort_date, ··· 112 114 sort_date: string; 113 115 comments_on_documents: { count: number }[] | undefined; 114 116 document_mentions_in_bsky: { count: number }[] | undefined; 117 117 + recommends_on_documents: { count: number }[] | undefined; 115 118 }; 116 119 };

+16 -13

app/(home-pages)/reader/page.tsx

··· 1 1 + import { getIdentityData } from "actions/getIdentityData"; 2 2 + 1 3 import { DashboardLayout } from "components/PageLayouts/DashboardLayout"; 2 2 - import { InboxContent } from "./InboxContent"; 3 3 - import { LocalContent } from "./LocalContent"; 4 4 - import { GlobalContent } from "./GlobalContent"; 4 4 + import { ReaderContent } from "./ReaderContent"; 5 5 + import { SubscriptionsContent } from "./SubscriptionsContent"; 5 6 import { getReaderFeed } from "./getReaderFeed"; 7 7 + import { getSubscriptions } from "./getSubscriptions"; 6 8 7 9 export default async function Reader(props: {}) { 8 10 let posts = await getReaderFeed(); 9 9 - 11 11 + let publications = await getSubscriptions(); 10 12 return ( 11 13 <DashboardLayout 12 14 id="reader" 13 15 currentPage="reader" 14 14 - defaultTab="Inbox" 16 16 + defaultTab="Read" 15 17 actions={null} 16 18 tabs={{ 17 17 - Inbox: { 19 19 + Read: { 18 20 controls: null, 19 21 content: ( 20 20 - <InboxContent nextCursor={posts.nextCursor} posts={posts.posts} /> 22 22 + <ReaderContent nextCursor={posts.nextCursor} posts={posts.posts} /> 21 23 ), 22 24 }, 23 23 - Friends: { 24 24 - controls: null, 25 25 - content: <LocalContent />, 26 26 - }, 27 27 - Global: { 25 25 + Subscriptions: { 28 26 controls: null, 29 29 - content: <GlobalContent />, 27 27 + content: ( 28 28 + <SubscriptionsContent 29 29 + publications={publications.subscriptions} 30 30 + nextCursor={publications.nextCursor} 31 31 + /> 32 32 + ), 30 33 }, 31 34 }} 32 35 />

+2

app/(home-pages)/tag/[tag]/getDocumentsByTag.ts

··· 21 21 `*, 22 22 comments_on_documents(count), 23 23 document_mentions_in_bsky(count), 24 24 + recommends_on_documents(count), 24 25 documents_in_publications(publications(*))`, 25 26 ) 26 27 .contains("data->tags", `["${tag}"]`) ··· 67 68 documents: { 68 69 comments_on_documents: doc.comments_on_documents, 69 70 document_mentions_in_bsky: doc.document_mentions_in_bsky, 71 71 + recommends_on_documents: doc.recommends_on_documents, 70 72 data: normalizedData, 71 73 uri: doc.uri, 72 74 sort_date: doc.sort_date,

+10 -12

app/[leaflet_id]/Footer.tsx

··· 1 1 "use client"; 2 2 import { useUIState } from "src/useUIState"; 3 3 - import { Footer } from "components/ActionBar/Footer"; 3 3 + import { Footer as ActionFooter } from "components/ActionBar/Footer"; 4 4 import { Media } from "components/Media"; 5 5 import { ThemePopover } from "components/ThemeManager/ThemeSetter"; 6 6 import { Toolbar } from "components/Toolbar"; ··· 14 14 import { useIdentityData } from "components/IdentityProvider"; 15 15 import { useEntity } from "src/replicache"; 16 16 import { block } from "sharp"; 17 17 + import { PostSettings } from "components/PostSettings"; 17 18 18 19 export function hasBlockToolbar(blockType: string | null | undefined) { 19 20 return ( ··· 35 36 .value; 36 37 37 38 return ( 38 38 - <Media 39 39 - mobile 40 40 - className="mobileLeafletFooter w-full z-10 touch-none -mt-[54px] " 41 41 - > 39 39 + <Media mobile className="mobileFooter w-full z-10 touch-none -mt-[54px] "> 42 40 {focusedBlock && 43 41 focusedBlock.entityType == "block" && 44 42 hasBlockToolbar(blockType) && ··· 56 54 /> 57 55 </div> 58 56 ) : entity_set.permissions.write ? ( 59 59 - <Footer> 57 57 + <ActionFooter> 60 58 {pub?.publications && 61 59 identity?.atp_did && 62 60 pub.publications.identity_did === identity.atp_did ? ( ··· 64 62 ) : ( 65 63 <HomeButton /> 66 64 )} 67 67 - <div className="mobileLeafletActions flex gap-2 shrink-0"> 68 68 - <PublishButton entityID={props.entityID} /> 69 69 - <ShareOptions /> 70 70 - <ThemePopover entityID={props.entityID} /> 71 71 - </div> 72 72 - </Footer> 65 65 + 66 66 + <PublishButton entityID={props.entityID} /> 67 67 + <ShareOptions /> 68 68 + <PostSettings /> 69 69 + <ThemePopover entityID={props.entityID} /> 70 70 + </ActionFooter> 73 71 ) : ( 74 72 <div className="pb-2 px-2 z-10 flex justify-end"> 75 73 <Watermark mobile />

+2

app/[leaflet_id]/Sidebar.tsx

··· 8 8 import { ShareOptions } from "app/[leaflet_id]/actions/ShareOptions"; 9 9 import { ThemePopover } from "components/ThemeManager/ThemeSetter"; 10 10 import { PublishButton } from "./actions/PublishButton"; 11 11 + import { PostSettings } from "components/PostSettings"; 11 12 import { Watermark } from "components/Watermark"; 12 13 import { BackToPubButton } from "./actions/BackToPubButton"; 13 14 import { useIdentityData } from "components/IdentityProvider"; ··· 30 31 <Sidebar> 31 32 <PublishButton entityID={rootEntity} /> 32 33 <ShareOptions /> 34 34 + <PostSettings /> 33 35 <ThemePopover entityID={rootEntity} /> 34 36 <HelpButton /> 35 37 <hr className="text-border" />

+10

app/[leaflet_id]/actions/PublishButton.tsx

··· 96 96 tx.get<string | null>("publication_cover_image"), 97 97 ); 98 98 99 99 + // Get post preferences from Replicache state 100 100 + let postPreferences = useSubscribe(rep, (tx) => 101 101 + tx.get<{ 102 102 + showComments?: boolean; 103 103 + showMentions?: boolean; 104 104 + showRecommends?: boolean; 105 105 + } | null>("post_preferences"), 106 106 + ); 107 107 + 99 108 // Get local published at from Replicache (session-only state, not persisted to DB) 100 109 let publishedAt = useLocalPublishedAt((s) => 101 110 pub?.doc ? s[pub?.doc] : undefined, ··· 118 127 tags: currentTags, 119 128 cover_image: coverImage, 120 129 publishedAt: publishedAt?.toISOString(), 130 130 + postPreferences, 121 131 }); 122 132 setIsLoading(false); 123 133 mutate();

+2

app/[leaflet_id]/publish/BskyPostEditorProsemirror.tsx

··· 410 410 range: { from: number; to: number }, 411 411 view: EditorView, 412 412 ) => { 413 413 + console.log("view", view); 413 414 if (!view) return; 414 415 const { from, to } = range; 415 416 const tr = view.state.tr; ··· 436 437 }); 437 438 tr.insert(from, atMentionNode); 438 439 } 440 440 + console.log("yo", mention); 439 441 440 442 // Add a space after the mention 441 443 tr.insertText(" ", from + 1);

+10

app/[leaflet_id]/publish/PublishPost.tsx

··· 91 91 tx.get<string | null>("publication_cover_image"), 92 92 ); 93 93 94 94 + // Get post preferences from Replicache state 95 95 + let postPreferences = useSubscribe(rep, (tx) => 96 96 + tx.get<{ 97 97 + showComments?: boolean; 98 98 + showMentions?: boolean; 99 99 + showRecommends?: boolean; 100 100 + } | null>("post_preferences"), 101 101 + ); 102 102 + 94 103 // Use Replicache tags only when we have a draft 95 104 const currentTags = props.hasDraft 96 105 ? Array.isArray(replicacheTags) ··· 124 133 cover_image: replicacheCoverImage, 125 134 entitiesToDelete: props.entitiesToDelete, 126 135 publishedAt: localPublishedAt?.toISOString() || new Date().toISOString(), 136 136 + postPreferences, 127 137 }); 128 138 129 139 if (!result.success) {

+2 -1

app/api/oauth/[route]/oauth-metadata.ts

··· 7 7 ? "http://localhost:3000" 8 8 : "https://leaflet.pub"; 9 9 10 10 - const scope = "atproto transition:generic transition:email"; 10 10 + const scope = 11 11 + "atproto transition:generic transition:email include:pub.leaflet.authFullPermissions include:site.standard.authFull include:app.bsky.authCreatePosts blob:*/*"; 11 12 const localconfig: OAuthClientMetadataInput = { 12 13 client_id: `http://localhost/?redirect_uri=${encodeURI(`http://127.0.0.1:3000/api/oauth/callback`)}&scope=${encodeURIComponent(scope)}`, 13 14 client_name: `Leaflet`,

+4 -2

app/api/oauth/[route]/route.ts

··· 42 42 const ac = new AbortController(); 43 43 44 44 const url = await client.authorize(handle || "https://bsky.social", { 45 45 - scope: "atproto transition:generic transition:email", 45 45 + scope: 46 46 + "atproto transition:email include:pub.leaflet.authFullPermissions include:site.standard.authFull include:app.bsky.authCreatePosts blob:*/*", 46 47 signal: ac.signal, 47 48 state: JSON.stringify(state), 48 49 }); ··· 105 106 }) 106 107 .select() 107 108 .single(); 108 108 - 109 109 + console.log({ token }); 109 110 if (token) await setAuthToken(token.id); 110 111 111 112 // Process successful authentication here ··· 114 115 console.log("User authenticated as:", session.did); 115 116 return handleAction(s.action, redirectPath); 116 117 } catch (e) { 118 118 + console.log(e); 117 119 redirect(redirectPath); 118 120 } 119 121 }

+4 -1

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

··· 40 40 documents_in_publications(documents( 41 41 *, 42 42 comments_on_documents(count), 43 43 - document_mentions_in_bsky(count) 43 43 + document_mentions_in_bsky(count), 44 44 + recommends_on_documents(count) 44 45 )), 45 46 publication_subscriptions(*, identities(bsky_profiles(*))), 46 47 publication_domains(*), ··· 87 88 data: dip.documents.data, 88 89 commentsCount: dip.documents.comments_on_documents[0]?.count || 0, 89 90 mentionsCount: dip.documents.document_mentions_in_bsky[0]?.count || 0, 91 91 + recommendsCount: 92 92 + dip.documents.recommends_on_documents?.[0]?.count || 0, 90 93 }; 91 94 }) 92 95 .filter((d): d is NonNullable<typeof d> => d !== null);

+40

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

··· 1 1 + import { z } from "zod"; 2 2 + import { makeRoute } from "../lib"; 3 3 + import type { Env } from "./route"; 4 4 + import { getIdentityData } from "actions/getIdentityData"; 5 5 + 6 6 + export type GetUserRecommendationsReturnType = Awaited< 7 7 + ReturnType<(typeof get_user_recommendations)["handler"]> 8 8 + >; 9 9 + 10 10 + export const get_user_recommendations = makeRoute({ 11 11 + route: "get_user_recommendations", 12 12 + input: z.object({ 13 13 + documentUris: z.array(z.string()), 14 14 + }), 15 15 + handler: async ({ documentUris }, { supabase }: Pick<Env, "supabase">) => { 16 16 + const identity = await getIdentityData(); 17 17 + const currentUserDid = identity?.atp_did; 18 18 + 19 19 + if (!currentUserDid || documentUris.length === 0) { 20 20 + return { 21 21 + result: {} as Record<string, boolean>, 22 22 + }; 23 23 + } 24 24 + 25 25 + const { data: recommendations } = await supabase 26 26 + .from("recommends_on_documents") 27 27 + .select("document") 28 28 + .eq("recommender_did", currentUserDid) 29 29 + .in("document", documentUris); 30 30 + 31 31 + const recommendedSet = new Set(recommendations?.map((r) => r.document)); 32 32 + 33 33 + const result: Record<string, boolean> = {}; 34 34 + for (const uri of documentUris) { 35 35 + result[uri] = recommendedSet.has(uri); 36 36 + } 37 37 + 38 38 + return { result }; 39 39 + }, 40 40 + });

+7

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

··· 9 9 import type { Attribute } from "src/replicache/attributes"; 10 10 import { makeRoute } from "../lib"; 11 11 import type { Env } from "./route"; 12 12 + import type { Json } from "supabase/database.types"; 12 13 13 14 // First define the sub-types for V0 and V1 requests 14 15 const pullRequestV0 = z.object({ ··· 75 76 title: string; 76 77 tags: string[]; 77 78 cover_image: string | null; 79 79 + preferences: Json | null; 78 80 }[]; 79 81 let pub_patch = publication_data?.[0] 80 82 ? [ ··· 97 99 op: "put", 98 100 key: "publication_cover_image", 99 101 value: publication_data[0].cover_image || null, 102 102 + }, 103 103 + { 104 104 + op: "put", 105 105 + key: "post_preferences", 106 106 + value: publication_data[0].preferences || null, 100 107 }, 101 108 ] 102 109 : [];

+2

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

··· 14 14 import { search_publication_names } from "./search_publication_names"; 15 15 import { search_publication_documents } from "./search_publication_documents"; 16 16 import { get_profile_data } from "./get_profile_data"; 17 17 + import { get_user_recommendations } from "./get_user_recommendations"; 17 18 18 19 let supabase = createClient<Database>( 19 20 process.env.NEXT_PUBLIC_SUPABASE_API_URL as string, ··· 41 42 search_publication_names, 42 43 search_publication_documents, 43 44 get_profile_data, 45 45 + get_user_recommendations, 44 46 ]; 45 47 export async function POST( 46 48 req: Request,

+3 -1

app/lish/Subscribe.tsx

··· 87 87 return ( 88 88 <Popover 89 89 trigger={ 90 90 - <div className="text-accent-contrast text-sm">Manage Subscription</div> 90 90 + <div className="text-accent-contrast text-sm w-fit"> 91 91 + Manage Subscription 92 92 + </div> 91 93 } 92 94 > 93 95 <div className="max-w-sm flex flex-col gap-1">

+6

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

··· 71 71 preferences={preferences} 72 72 commentsCount={getCommentCount(document.comments_on_documents, pageId)} 73 73 quotesCount={getQuoteCount(document.quotesAndMentions, pageId)} 74 74 + recommendsCount={document.recommendsCount} 74 75 /> 75 76 <CanvasContent 76 77 blocks={blocks} ··· 205 206 preferences: { 206 207 showComments?: boolean; 207 208 showMentions?: boolean; 209 209 + showRecommends?: boolean; 208 210 showPrevNext?: boolean; 209 211 }; 210 212 quotesCount: number | undefined; 211 213 commentsCount: number | undefined; 214 214 + recommendsCount: number; 212 215 }) => { 213 216 let isMobile = useIsMobile(); 214 217 return ( ··· 216 219 <Interactions 217 220 quotesCount={props.quotesCount || 0} 218 221 commentsCount={props.commentsCount || 0} 222 222 + recommendsCount={props.recommendsCount} 219 223 showComments={props.preferences.showComments !== false} 220 224 showMentions={props.preferences.showMentions !== false} 225 225 + showRecommends={props.preferences.showRecommends !== false} 221 226 pageId={props.pageId} 222 227 /> 223 228 {!props.isSubpage && ( ··· 233 238 data={props.data} 234 239 profile={props.profile} 235 240 preferences={props.preferences} 241 241 + isCanvas 236 242 /> 237 243 </Popover> 238 244 </>

+2 -1

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

··· 21 21 } from "src/utils/normalizeRecords"; 22 22 import { DocumentProvider } from "contexts/DocumentContext"; 23 23 import { LeafletContentProvider } from "contexts/LeafletContentContext"; 24 24 + import { mergePreferences } from "src/utils/mergePreferences"; 24 25 25 26 export async function DocumentPageRenderer({ 26 27 did, ··· 133 134 <LeafletLayout> 134 135 <PostPages 135 136 document_uri={document.uri} 136 136 - preferences={pubRecord?.preferences || {}} 137 137 + preferences={mergePreferences(record?.preferences, pubRecord?.preferences)} 137 138 pubRecord={pubRecord} 138 139 profile={JSON.parse(JSON.stringify(profile.data))} 139 140 document={document}

+83 -41

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

··· 18 18 import { ManageSubscription, SubscribeWithBluesky } from "app/lish/Subscribe"; 19 19 import { EditTiny } from "components/Icons/EditTiny"; 20 20 import { getPublicationURL } from "app/lish/createPub/getPublicationURL"; 21 21 + import { RecommendButton } from "components/RecommendButton"; 22 22 + import { ButtonSecondary } from "components/Buttons"; 23 23 + import { Separator } from "components/Layout"; 21 24 22 25 export type InteractionState = { 23 26 drawerOpen: undefined | boolean; ··· 105 108 export const Interactions = (props: { 106 109 quotesCount: number; 107 110 commentsCount: number; 111 111 + recommendsCount: number; 108 112 className?: string; 109 113 showComments: boolean; 110 114 showMentions: boolean; 115 115 + showRecommends: boolean; 111 116 pageId?: string; 112 117 }) => { 113 113 - const { uri: document_uri, quotesAndMentions, normalizedDocument } = useDocument(); 118 118 + const { 119 119 + uri: document_uri, 120 120 + quotesAndMentions, 121 121 + normalizedDocument, 122 122 + } = useDocument(); 114 123 let { identity } = useIdentityData(); 115 124 116 125 let { drawerOpen, drawer, pageId } = useInteractionState(document_uri); ··· 124 133 const tags = normalizedDocument.tags; 125 134 const tagCount = tags?.length || 0; 126 135 136 136 + let interactionsAvailable = 137 137 + props.showComments || props.showMentions || props.showRecommends; 138 138 + 127 139 return ( 128 128 - <div className={`flex gap-2 text-tertiary text-sm ${props.className}`}> 129 129 - {tagCount > 0 && <TagPopover tags={tags} tagCount={tagCount} />} 140 140 + <div 141 141 + className={`flex gap-[10px] text-tertiary text-sm item-center ${props.className}`} 142 142 + > 143 143 + {props.showRecommends === false ? null : ( 144 144 + <RecommendButton 145 145 + documentUri={document_uri} 146 146 + recommendsCount={props.recommendsCount} 147 147 + /> 148 148 + )} 130 149 150 150 + {/*MENTIONS BUTTON*/} 131 151 {props.quotesCount === 0 || props.showMentions === false ? null : ( 132 152 <button 133 133 - className="flex w-fit gap-2 items-center" 153 153 + className="flex w-fit gap-1 items-center" 134 154 onClick={() => { 135 155 if (!drawerOpen || drawer !== "quotes") 136 156 openInteractionDrawer("quotes", document_uri, props.pageId); ··· 143 163 <QuoteTiny aria-hidden /> {props.quotesCount} 144 164 </button> 145 165 )} 166 166 + {/*COMMENT BUTTON*/} 146 167 {props.showComments === false ? null : ( 147 168 <button 148 148 - className="flex gap-2 items-center w-fit" 169 169 + className="flex gap-1 items-center w-fit" 149 170 onClick={() => { 150 171 if (!drawerOpen || drawer !== "comments" || pageId !== props.pageId) 151 172 openInteractionDrawer("comments", document_uri, props.pageId); ··· 156 177 <CommentTiny aria-hidden /> {props.commentsCount} 157 178 </button> 158 179 )} 180 180 + 181 181 + {tagCount > 0 && ( 182 182 + <> 183 183 + {interactionsAvailable && <Separator classname="h-4!" />} 184 184 + <TagPopover tags={tags} tagCount={tagCount} /> 185 185 + </> 186 186 + )} 159 187 </div> 160 188 ); 161 189 }; ··· 163 191 export const ExpandedInteractions = (props: { 164 192 quotesCount: number; 165 193 commentsCount: number; 194 194 + recommendsCount: number; 166 195 className?: string; 167 196 showComments: boolean; 168 197 showMentions: boolean; 198 198 + showRecommends: boolean; 169 199 pageId?: string; 170 200 }) => { 171 171 - const { uri: document_uri, quotesAndMentions, normalizedDocument, publication, leafletId } = useDocument(); 201 201 + const { 202 202 + uri: document_uri, 203 203 + quotesAndMentions, 204 204 + normalizedDocument, 205 205 + publication, 206 206 + leafletId, 207 207 + } = useDocument(); 172 208 let { identity } = useIdentityData(); 173 209 174 210 let { drawerOpen, drawer, pageId } = useInteractionState(document_uri); ··· 182 218 const tags = normalizedDocument.tags; 183 219 const tagCount = tags?.length || 0; 184 220 185 185 - let noInteractions = !props.showComments && !props.showMentions; 221 221 + let noInteractions = 222 222 + !props.showComments && !props.showMentions && !props.showRecommends; 186 223 187 224 let subscribed = 188 225 identity?.atp_did && ··· 191 228 (s) => s.identity === identity.atp_did, 192 229 ); 193 230 194 194 - let isAuthor = 195 195 - identity && 196 196 - identity.atp_did === publication?.identity_did && 197 197 - leafletId; 198 198 - 199 231 return ( 200 232 <div 201 233 className={`text-tertiary px-3 sm:px-4 flex flex-col ${props.className}`} ··· 214 246 {noInteractions ? ( 215 247 <div /> 216 248 ) : ( 217 217 - <> 218 218 - <div className="flex gap-2"> 249 249 + <div className="flex flex-col gap-2 just"> 250 250 + <div className="flex gap-2 sm:flex-row flex-col"> 251 251 + {props.showRecommends === false ? null : ( 252 252 + <RecommendButton 253 253 + documentUri={document_uri} 254 254 + recommendsCount={props.recommendsCount} 255 255 + expanded 256 256 + /> 257 257 + )} 219 258 {props.quotesCount === 0 || !props.showMentions ? null : ( 220 220 - <button 221 221 - className="flex w-fit gap-2 items-center px-1 py-0.5 border border-border-light rounded-lg trasparent-outline selected-outline" 259 259 + <ButtonSecondary 222 260 onClick={() => { 223 261 if (!drawerOpen || drawer !== "quotes") 224 262 openInteractionDrawer( ··· 233 271 onTouchStart={handleQuotePrefetch} 234 272 aria-label="Post quotes" 235 273 > 236 236 - <QuoteTiny aria-hidden /> {props.quotesCount}{" "} 237 237 - <span 238 238 - aria-hidden 239 239 - >{`Mention${props.quotesCount === 1 ? "" : "s"}`}</span> 240 240 - </button> 274 274 + <QuoteTiny aria-hidden /> {props.quotesCount} 275 275 + <Separator classname="h-4! text-accent-contrast!" /> 276 276 + Mention{props.quotesCount > 1 ? "s" : ""} 277 277 + </ButtonSecondary> 241 278 )} 242 279 {!props.showComments ? null : ( 243 243 - <button 244 244 - className="flex gap-2 items-center w-fit px-1 py-0.5 border border-border-light rounded-lg trasparent-outline selected-outline" 280 280 + <ButtonSecondary 245 281 onClick={() => { 246 282 if ( 247 283 !drawerOpen || ··· 259 295 aria-label="Post comments" 260 296 > 261 297 <CommentTiny aria-hidden />{" "} 262 262 - {props.commentsCount > 0 ? ( 263 263 - <span aria-hidden> 264 264 - {`${props.commentsCount} Comment${props.commentsCount === 1 ? "" : "s"}`} 265 265 - </span> 266 266 - ) : ( 267 267 - "Comment" 298 298 + {props.commentsCount > 0 && ( 299 299 + <> 300 300 + {props.commentsCount} 301 301 + <Separator classname="h-4! text-accent-contrast!" /> 302 302 + </> 268 303 )} 269 269 - </button> 304 304 + Comment{props.commentsCount > 1 ? "s" : ""} 305 305 + </ButtonSecondary> 270 306 )} 271 307 </div> 272 272 - </> 308 308 + {subscribed && publication && ( 309 309 + <ManageSubscription 310 310 + base_url={getPublicationURL(publication)} 311 311 + pub_uri={publication.uri} 312 312 + subscribers={publication.publication_subscriptions} 313 313 + /> 314 314 + )} 315 315 + </div> 273 316 )} 274 317 275 318 <EditButton publication={publication} leafletId={leafletId} /> 276 276 - {subscribed && publication && ( 277 277 - <ManageSubscription 278 278 - base_url={getPublicationURL(publication)} 279 279 - pub_uri={publication.uri} 280 280 - subscribers={publication.publication_subscriptions} 281 281 - /> 282 282 - )} 283 319 </div> 284 320 </div> 285 321 ); ··· 313 349 </div> 314 350 ); 315 351 }; 316 316 - export function getQuoteCount(quotesAndMentions: { uri: string; link?: string }[], pageId?: string) { 352 352 + export function getQuoteCount( 353 353 + quotesAndMentions: { uri: string; link?: string }[], 354 354 + pageId?: string, 355 355 + ) { 317 356 return getQuoteCountFromArray(quotesAndMentions, pageId); 318 357 } 319 358 ··· 338 377 } 339 378 } 340 379 341 341 - export function getCommentCount(comments: CommentOnDocument[], pageId?: string) { 380 380 + export function getCommentCount( 381 381 + comments: CommentOnDocument[], 382 382 + pageId?: string, 383 383 + ) { 342 384 if (pageId) 343 385 return comments.filter( 344 386 (c) => (c.record as PubLeafletComment.Record)?.onPage === pageId, ··· 362 404 return ( 363 405 <a 364 406 href={`https://leaflet.pub/${props.leafletId}`} 365 365 - className="flex gap-2 items-center hover:!no-underline selected-outline px-2 py-0.5 bg-accent-1 text-accent-2 font-bold w-fit rounded-lg !border-accent-1 !outline-accent-1" 407 407 + className="flex gap-2 items-center hover:!no-underline selected-outline px-2 py-0.5 bg-accent-1 text-accent-2 font-bold w-fit rounded-md !border-accent-1 !outline-accent-1 h-fit" 366 408 > 367 409 <EditTiny /> Edit Post 368 410 </a>

+135

app/lish/[did]/[publication]/[rkey]/Interactions/recommendAction.ts

··· 1 1 + "use server"; 2 2 + 3 3 + import { AtpBaseClient, PubLeafletInteractionsRecommend } from "lexicons/api"; 4 4 + import { getIdentityData } from "actions/getIdentityData"; 5 5 + import { restoreOAuthSession, OAuthSessionError } from "src/atproto-oauth"; 6 6 + import { TID } from "@atproto/common"; 7 7 + import { AtUri, Un$Typed } from "@atproto/api"; 8 8 + import { supabaseServerClient } from "supabase/serverClient"; 9 9 + import { Json } from "supabase/database.types"; 10 10 + 11 11 + type RecommendResult = 12 12 + | { success: true; uri: string } 13 13 + | { 14 14 + success: false; 15 15 + error: OAuthSessionError | { type: string; message: string }; 16 16 + }; 17 17 + 18 18 + export async function recommendAction(args: { 19 19 + document: string; 20 20 + }): Promise<RecommendResult> { 21 21 + console.log("recommend action..."); 22 22 + let identity = await getIdentityData(); 23 23 + if (!identity || !identity.atp_did) { 24 24 + return { 25 25 + success: false, 26 26 + error: { 27 27 + type: "oauth_session_expired", 28 28 + message: "Not authenticated", 29 29 + did: "", 30 30 + }, 31 31 + }; 32 32 + } 33 33 + 34 34 + const sessionResult = await restoreOAuthSession(identity.atp_did); 35 35 + if (!sessionResult.ok) { 36 36 + return { success: false, error: sessionResult.error }; 37 37 + } 38 38 + let credentialSession = sessionResult.value; 39 39 + let agent = new AtpBaseClient( 40 40 + credentialSession.fetchHandler.bind(credentialSession), 41 41 + ); 42 42 + 43 43 + let record: Un$Typed<PubLeafletInteractionsRecommend.Record> = { 44 44 + subject: args.document, 45 45 + createdAt: new Date().toISOString(), 46 46 + }; 47 47 + 48 48 + let rkey = TID.nextStr(); 49 49 + let uri = AtUri.make( 50 50 + credentialSession.did!, 51 51 + "pub.leaflet.interactions.recommend", 52 52 + rkey, 53 53 + ); 54 54 + 55 55 + await agent.pub.leaflet.interactions.recommend.create( 56 56 + { rkey, repo: credentialSession.did! }, 57 57 + record, 58 58 + ); 59 59 + 60 60 + let res = await supabaseServerClient.from("recommends_on_documents").upsert({ 61 61 + uri: uri.toString(), 62 62 + document: args.document, 63 63 + recommender_did: credentialSession.did!, 64 64 + record: { 65 65 + $type: "pub.leaflet.interactions.recommend", 66 66 + ...record, 67 67 + } as unknown as Json, 68 68 + }); 69 69 + console.log(res); 70 70 + 71 71 + return { 72 72 + success: true, 73 73 + uri: uri.toString(), 74 74 + }; 75 75 + } 76 76 + 77 77 + export async function unrecommendAction(args: { 78 78 + document: string; 79 79 + }): Promise<RecommendResult> { 80 80 + let identity = await getIdentityData(); 81 81 + if (!identity || !identity.atp_did) { 82 82 + return { 83 83 + success: false, 84 84 + error: { 85 85 + type: "oauth_session_expired", 86 86 + message: "Not authenticated", 87 87 + did: "", 88 88 + }, 89 89 + }; 90 90 + } 91 91 + 92 92 + const sessionResult = await restoreOAuthSession(identity.atp_did); 93 93 + if (!sessionResult.ok) { 94 94 + return { success: false, error: sessionResult.error }; 95 95 + } 96 96 + let credentialSession = sessionResult.value; 97 97 + let agent = new AtpBaseClient( 98 98 + credentialSession.fetchHandler.bind(credentialSession), 99 99 + ); 100 100 + 101 101 + // Find the existing recommend record 102 102 + const { data: existingRecommend } = await supabaseServerClient 103 103 + .from("recommends_on_documents") 104 104 + .select("uri") 105 105 + .eq("document", args.document) 106 106 + .eq("recommender_did", credentialSession.did!) 107 107 + .single(); 108 108 + 109 109 + if (!existingRecommend) { 110 110 + return { 111 111 + success: false, 112 112 + error: { 113 113 + type: "not_found", 114 114 + message: "Recommend not found", 115 115 + }, 116 116 + }; 117 117 + } 118 118 + 119 119 + let uri = new AtUri(existingRecommend.uri); 120 120 + 121 121 + await agent.pub.leaflet.interactions.recommend.delete({ 122 122 + rkey: uri.rkey, 123 123 + repo: credentialSession.did!, 124 124 + }); 125 125 + 126 126 + await supabaseServerClient 127 127 + .from("recommends_on_documents") 128 128 + .delete() 129 129 + .eq("uri", existingRecommend.uri); 130 130 + 131 131 + return { 132 132 + success: true, 133 133 + uri: existingRecommend.uri, 134 134 + }; 135 135 + }

+5 -1

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

··· 87 87 pageId={pageId} 88 88 showComments={preferences.showComments !== false} 89 89 showMentions={preferences.showMentions !== false} 90 90 - commentsCount={getCommentCount(document.comments_on_documents, pageId) || 0} 90 90 + showRecommends={preferences.showRecommends !== false} 91 91 + commentsCount={ 92 92 + getCommentCount(document.comments_on_documents, pageId) || 0 93 93 + } 91 94 quotesCount={getQuoteCount(document.quotesAndMentions, pageId) || 0} 95 95 + recommendsCount={document.recommendsCount} 92 96 /> 93 97 {!hasPageBackground && <div className={`spacer h-8 w-full`} />} 94 98 </PageWrapper>

+20 -7

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

··· 18 18 export function PostHeader(props: { 19 19 data: PostPageData; 20 20 profile: ProfileViewDetailed; 21 21 - preferences: { showComments?: boolean; showMentions?: boolean }; 21 21 + preferences: { 22 22 + showComments?: boolean; 23 23 + showMentions?: boolean; 24 24 + showRecommends?: boolean; 25 25 + }; 26 26 + isCanvas?: boolean; 22 27 }) { 23 28 let { identity } = useIdentityData(); 24 29 let document = props.data; ··· 84 89 </> 85 90 ) : null} 86 91 </div> 87 87 - <Interactions 88 88 - showComments={props.preferences.showComments !== false} 89 89 - showMentions={props.preferences.showMentions !== false} 90 90 - quotesCount={getQuoteCount(document?.quotesAndMentions || []) || 0} 91 91 - commentsCount={getCommentCount(document?.comments_on_documents || []) || 0} 92 92 - /> 92 92 + {!props.isCanvas && ( 93 93 + <Interactions 94 94 + showComments={props.preferences.showComments !== false} 95 95 + showMentions={props.preferences.showMentions !== false} 96 96 + showRecommends={props.preferences.showRecommends !== false} 97 97 + quotesCount={ 98 98 + getQuoteCount(document?.quotesAndMentions || []) || 0 99 99 + } 100 100 + commentsCount={ 101 101 + getCommentCount(document?.comments_on_documents || []) || 0 102 102 + } 103 103 + recommendsCount={document?.recommendsCount || 0} 104 104 + /> 105 105 + )} 93 106 </> 94 107 } 95 108 />

+6 -4

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

··· 170 170 preferences: { 171 171 showComments?: boolean; 172 172 showMentions?: boolean; 173 173 + showRecommends?: boolean; 173 174 showPrevNext?: boolean; 174 175 }; 175 176 pubRecord?: NormalizedPublication | null; ··· 233 234 preferences: { 234 235 showComments?: boolean; 235 236 showMentions?: boolean; 237 237 + showRecommends?: boolean; 236 238 showPrevNext?: boolean; 237 239 }; 238 240 pollData: PollData[]; ··· 293 295 showPageBackground={pubRecord?.theme?.showPageBackground} 294 296 document_uri={document.uri} 295 297 comments={ 296 296 - pubRecord?.preferences?.showComments === false 298 298 + preferences.showComments === false 297 299 ? [] 298 300 : document.comments_on_documents 299 301 } 300 302 quotesAndMentions={ 301 301 - pubRecord?.preferences?.showMentions === false 303 303 + preferences.showMentions === false 302 304 ? [] 303 305 : quotesAndMentions 304 306 } ··· 385 387 pageId={page.id} 386 388 document_uri={document.uri} 387 389 comments={ 388 388 - pubRecord?.preferences?.showComments === false 390 390 + preferences.showComments === false 389 391 ? [] 390 392 : document.comments_on_documents 391 393 } 392 394 quotesAndMentions={ 393 393 - pubRecord?.preferences?.showMentions === false 395 395 + preferences.showMentions === false 394 396 ? [] 395 397 : quotesAndMentions 396 398 }

+1

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

··· 298 298 e.stopPropagation(); 299 299 300 300 props.toggleCollapsed(parentPostUri); 301 301 + console.log("reply clicked"); 301 302 }} 302 303 /> 303 304 </>

+31 -12

app/lish/[did]/[publication]/[rkey]/getPostPageData.ts

··· 22 22 publication_subscriptions(*)) 23 23 ), 24 24 document_mentions_in_bsky(*), 25 25 - leaflets_in_publications(*) 25 25 + leaflets_in_publications(*), 26 26 + recommends_on_documents(count) 26 27 `, 27 28 ) 28 29 .or(documentUriFilter(did, rkey)) ··· 33 34 if (!document) return null; 34 35 35 36 // Normalize the document record - this is the primary way consumers should access document data 36 36 - const normalizedDocument = normalizeDocumentRecord(document.data, document.uri); 37 37 + const normalizedDocument = normalizeDocumentRecord( 38 38 + document.data, 39 39 + document.uri, 40 40 + ); 37 41 if (!normalizedDocument) return null; 38 42 39 43 // Normalize the publication record - this is the primary way consumers should access publication data 40 44 const normalizedPublication = normalizePublicationRecord( 41 41 - document.documents_in_publications[0]?.publications?.record 45 45 + document.documents_in_publications[0]?.publications?.record, 42 46 ); 43 47 44 48 // Fetch constellation backlinks for mentions ··· 83 87 // Filter and sort documents by publishedAt 84 88 const sortedDocs = allDocs 85 89 .map((dip) => { 86 86 - const normalizedData = normalizeDocumentRecord(dip?.documents?.data, dip?.documents?.uri); 90 90 + const normalizedData = normalizeDocumentRecord( 91 91 + dip?.documents?.data, 92 92 + dip?.documents?.uri, 93 93 + ); 87 94 return { 88 95 uri: dip?.documents?.uri, 89 96 title: normalizedData?.title, ··· 98 105 ); 99 106 100 107 // Find current document index 101 101 - const currentIndex = sortedDocs.findIndex((doc) => doc.uri === document.uri); 108 108 + const currentIndex = sortedDocs.findIndex( 109 109 + (doc) => doc.uri === document.uri, 110 110 + ); 102 111 103 112 if (currentIndex !== -1) { 104 113 prevNext = { ··· 122 131 123 132 // Build explicit publication context for consumers 124 133 const rawPub = document.documents_in_publications[0]?.publications; 125 125 - const publication = rawPub ? { 126 126 - uri: rawPub.uri, 127 127 - name: rawPub.name, 128 128 - identity_did: rawPub.identity_did, 129 129 - record: rawPub.record as PubLeafletPublication.Record | SiteStandardPublication.Record | null, 130 130 - publication_subscriptions: rawPub.publication_subscriptions || [], 131 131 - } : null; 134 134 + const publication = rawPub 135 135 + ? { 136 136 + uri: rawPub.uri, 137 137 + name: rawPub.name, 138 138 + identity_did: rawPub.identity_did, 139 139 + record: rawPub.record as 140 140 + | PubLeafletPublication.Record 141 141 + | SiteStandardPublication.Record 142 142 + | null, 143 143 + publication_subscriptions: rawPub.publication_subscriptions || [], 144 144 + } 145 145 + : null; 146 146 + 147 147 + // Get recommends count from the aggregated query result 148 148 + const recommendsCount = document.recommends_on_documents?.[0]?.count ?? 0; 132 149 133 150 return { 134 151 ...document, ··· 143 160 comments: document.comments_on_documents, 144 161 mentions: document.document_mentions_in_bsky, 145 162 leafletId: document.leaflets_in_publications[0]?.leaflet || null, 163 163 + // Recommends data 164 164 + recommendsCount, 146 165 }; 147 166 } 148 167

-1

app/lish/[did]/[publication]/dashboard/Actions.tsx

··· 38 38 icon=<ShareSmall /> 39 39 label="Share" 40 40 onClick={() => {}} 41 41 - smallOnMobile 42 41 /> 43 42 } 44 43 >

+8 -2

app/lish/[did]/[publication]/dashboard/DraftList.tsx

··· 1 1 "use client"; 2 2 3 3 + import { NewDraftSecondaryButton } from "./NewDraftButton"; 3 4 import React from "react"; 4 5 import { 5 6 usePublicationData, ··· 21 22 if (!normalizedPubRecord) return null; 22 23 23 24 return ( 24 24 - <div className="flex flex-col"> 25 25 + <div className="flex flex-col gap-4"> 26 26 + <NewDraftSecondaryButton 27 27 + fullWidth 28 28 + publication={pub_data?.publication?.uri} 29 29 + /> 30 30 + 25 31 <LeafletList 26 32 searchValue={props.searchValue} 27 33 showPreview={false} ··· 54 60 ), 55 61 }} 56 62 /> 57 57 - <div className="spacer h-16 w-full bg-transparent shrink-0 " /> 63 63 + <div className="spacer h-12 w-full bg-transparent shrink-0 " /> 58 64 </div> 59 65 ); 60 66 }

+23 -3

app/lish/[did]/[publication]/dashboard/NewDraftButton.tsx

··· 16 16 let newLeaflet = await createPublicationDraft(props.publication); 17 17 router.push(`/${newLeaflet}`); 18 18 }} 19 19 - icon=<AddTiny className="sm:m-1 shrink-0 sm:scale-100 scale-75" /> 20 20 - smallOnMobile 21 21 - label="Draft" 19 19 + icon=<AddTiny className="m-1 shrink-0" /> 20 20 + label="New" 22 21 /> 23 22 ); 24 23 } 24 24 + 25 25 + export function NewDraftSecondaryButton(props: { 26 26 + publication: string; 27 27 + fullWidth?: boolean; 28 28 + }) { 29 29 + let router = useRouter(); 30 30 + 31 31 + return ( 32 32 + <ButtonSecondary 33 33 + fullWidth={props.fullWidth} 34 34 + id="new-leaflet-button" 35 35 + onClick={async () => { 36 36 + let newLeaflet = await createPublicationDraft(props.publication); 37 37 + router.push(`/${newLeaflet}`); 38 38 + }} 39 39 + > 40 40 + <AddTiny className="m-1 shrink-0" /> 41 41 + <span>New Draft</span> 42 42 + </ButtonSecondary> 43 43 + ); 44 44 + }

-1

app/lish/[did]/[publication]/dashboard/PublicationDashboard.tsx

··· 76 76 actions={<Actions publication={publication.uri} />} 77 77 currentPage="pub" 78 78 publication={publication.uri} 79 79 - pageTitle={record.name} 80 79 /> 81 80 ); 82 81 }

+3 -3

app/lish/[did]/[publication]/dashboard/PublicationSWRProvider.tsx

··· 12 12 13 13 // Derive all types from the RPC return type 14 14 export type PublicationData = GetPublicationDataReturnType["result"]; 15 15 - export type PublishedDocument = 16 16 - NonNullable<PublicationData>["documents"][number]; 15 15 + export type PublishedDocument = NonNullable<PublicationData>["documents"][number]; 17 16 export type PublicationDraft = NonNullable<PublicationData>["drafts"][number]; 18 17 19 18 const PublicationContext = createContext({ name: "", did: "" }); ··· 25 24 }) { 26 25 let key = `publication-data-${props.publication_did}-${props.publication_rkey}`; 27 26 useEffect(() => { 27 27 + console.log("UPDATING"); 28 28 mutate(key, props.publication_data); 29 29 }, [props.publication_data]); 30 30 return ( ··· 64 64 const { data } = usePublicationData(); 65 65 return useMemo( 66 66 () => normalizePublicationRecord(data?.publication?.record), 67 67 - [data?.publication?.record], 67 67 + [data?.publication?.record] 68 68 ); 69 69 } 70 70

+8 -8

app/lish/[did]/[publication]/dashboard/PublishedPostsLists.tsx

··· 60 60 61 61 function PublishedPostItem(props: { 62 62 doc: PublishedDocument; 63 63 - publication: NonNullable<NonNullable<ReturnType<typeof usePublicationData>["data"]>["publication"]>; 63 63 + publication: NonNullable< 64 64 + NonNullable<ReturnType<typeof usePublicationData>["data"]>["publication"] 65 65 + >; 64 66 pubRecord: ReturnType<typeof useNormalizedPublicationRecord>; 65 67 showPageBackground: boolean; 66 68 }) { ··· 94 96 <div className="flex justify-start align-top flex-row gap-1"> 95 97 {leaflet && leaflet.permission_tokens && ( 96 98 <> 97 97 - <SpeedyLink 98 98 - className="pt-[6px]" 99 99 - href={`/${leaflet.leaflet}`} 100 100 - > 99 99 + <SpeedyLink className="pt-[6px]" href={`/${leaflet.leaflet}`}> 101 100 <EditTiny /> 102 101 </SpeedyLink> 103 102 ··· 129 128 </div> 130 129 131 130 {doc.record.description ? ( 132 132 - <p className="italic text-secondary"> 133 133 - {doc.record.description} 134 134 - </p> 131 131 + <p className="italic text-secondary">{doc.record.description}</p> 135 132 ) : null} 136 133 <div className="text-sm text-tertiary flex gap-3 justify-between sm:justify-start items-center pt-3"> 137 134 {doc.record.publishedAt ? ( ··· 140 137 <InteractionPreview 141 138 quotesCount={doc.mentionsCount} 142 139 commentsCount={doc.commentsCount} 140 140 + recommendsCount={doc.recommendsCount} 141 141 + documentUri={doc.uri} 143 142 tags={doc.record.tags || []} 144 143 showComments={pubRecord?.preferences?.showComments !== false} 145 144 showMentions={pubRecord?.preferences?.showMentions !== false} 145 145 + showRecommends={pubRecord?.preferences?.showRecommends !== false} 146 146 postUrl={`${getPublicationURL(publication)}/${uri.rkey}`} 147 147 /> 148 148 </div>

+21 -1

app/lish/[did]/[publication]/dashboard/settings/PostOptions.tsx

··· 29 29 ? true 30 30 : record.preferences.showMentions, 31 31 ); 32 32 + let [showRecommends, setShowRecommends] = useState( 33 33 + record?.preferences?.showRecommends === undefined 34 34 + ? true 35 35 + : record.preferences.showRecommends, 36 36 + ); 32 37 let [showPrevNext, setShowPrevNext] = useState( 33 38 record?.preferences?.showPrevNext === undefined 34 39 ? true ··· 53 58 showComments: showComments, 54 59 showMentions: showMentions, 55 60 showPrevNext: showPrevNext, 61 61 + showRecommends: showRecommends, 56 62 }, 57 63 }); 58 64 toast({ type: "success", content: <strong>Posts Updated!</strong> }); ··· 99 105 <div className="flex flex-col justify-start"> 100 106 <div className="font-bold">Show Mentions</div> 101 107 <div className="text-tertiary text-sm leading-tight"> 102 102 - Display a list of posts on Bluesky that mention your post 108 108 + Display a list Bluesky mentions about your post 109 109 + </div> 110 110 + </div> 111 111 + </Toggle> 112 112 + 113 113 + <Toggle 114 114 + toggle={showRecommends} 115 115 + onToggle={() => { 116 116 + setShowRecommends(!showRecommends); 117 117 + }} 118 118 + > 119 119 + <div className="flex flex-col justify-start"> 120 120 + <div className="font-bold">Show Recommends</div> 121 121 + <div className="text-tertiary text-sm leading-tight"> 122 122 + Allow readers to recommend/like your post 103 123 </div> 104 124 </div> 105 125 </Toggle>

-1

app/lish/[did]/[publication]/dashboard/settings/PublicationSettings.tsx

··· 34 34 id="pub-settings-button" 35 35 icon=<SettingsSmall /> 36 36 label="Settings" 37 37 - smallOnMobile 38 37 /> 39 38 } 40 39 >

+14 -8

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

··· 38 38 documents_in_publications(documents( 39 39 *, 40 40 comments_on_documents(count), 41 41 - document_mentions_in_bsky(count) 41 41 + document_mentions_in_bsky(count), 42 42 + recommends_on_documents(count) 42 43 )) 43 44 `, 44 45 ) ··· 119 120 }) 120 121 .map((doc) => { 121 122 if (!doc.documents) return null; 122 122 - const doc_record = normalizeDocumentRecord(doc.documents.data); 123 123 + const doc_record = normalizeDocumentRecord( 124 124 + doc.documents.data, 125 125 + ); 123 126 if (!doc_record) return null; 124 127 let uri = new AtUri(doc.documents.uri); 125 128 let quotes = ··· 128 131 record?.preferences?.showComments === false 129 132 ? 0 130 133 : doc.documents.comments_on_documents[0].count || 0; 134 134 + let recommends = 135 135 + doc.documents.recommends_on_documents?.[0]?.count || 0; 131 136 let tags = doc_record.tags || []; 132 137 133 138 return ( ··· 143 148 </p> 144 149 </SpeedyLink> 145 150 146 146 - <div className="text-sm text-tertiary flex gap-1 flex-wrap pt-2 items-center"> 151 151 + <div className="justify-between w-full text-sm text-tertiary flex gap-1 flex-wrap pt-2 items-center"> 147 152 <p className="text-sm text-tertiary "> 148 153 {doc_record.publishedAt && ( 149 154 <LocalizedDate ··· 156 161 /> 157 162 )}{" "} 158 163 </p> 159 159 - {comments > 0 || quotes > 0 || tags.length > 0 ? ( 160 160 - <Separator classname="h-4! mx-1" /> 161 161 - ) : ( 162 162 - "" 163 163 - )} 164 164 + 164 165 <InteractionPreview 165 166 quotesCount={quotes} 166 167 commentsCount={comments} 168 168 + recommendsCount={recommends} 169 169 + documentUri={doc.documents.uri} 167 170 tags={tags} 168 171 postUrl={`${getPublicationURL(publication)}/${uri.rkey}`} 169 172 showComments={ ··· 171 174 } 172 175 showMentions={ 173 176 record?.preferences?.showMentions !== false 177 177 + } 178 178 + showRecommends={ 179 179 + record?.preferences?.showRecommends !== false 174 180 } 175 181 /> 176 182 </div>

+1

app/lish/createPub/CreatePubForm.tsx

··· 58 58 showComments: true, 59 59 showMentions: true, 60 60 showPrevNext: true, 61 61 + showRecommends: true, 61 62 }, 62 63 }); 63 64

+1 -2

app/lish/createPub/UpdatePubForm.tsx

··· 88 88 showComments: showComments, 89 89 showMentions: showMentions, 90 90 showPrevNext: showPrevNext, 91 91 + showRecommends: record?.preferences?.showRecommends ?? true, 91 92 }, 92 93 }); 93 94 toast({ type: "success", content: "Updated!" }); ··· 194 195 </p> 195 196 </div> 196 197 </Toggle> 197 197 - 198 198 - 199 198 </div> 200 199 </form> 201 200 );

+23 -9

app/lish/createPub/createPublication.ts

··· 5 5 PubLeafletPublication, 6 6 SiteStandardPublication, 7 7 } from "lexicons/api"; 8 8 - import { 9 9 - restoreOAuthSession, 10 10 - OAuthSessionError, 11 11 - } from "src/atproto-oauth"; 8 8 + import { restoreOAuthSession, OAuthSessionError } from "src/atproto-oauth"; 12 9 import { getIdentityData } from "actions/getIdentityData"; 13 10 import { supabaseServerClient } from "supabase/serverClient"; 14 11 import { Json } from "supabase/database.types"; ··· 76 73 77 74 // Build record based on publication type 78 75 let record: SiteStandardPublication.Record | PubLeafletPublication.Record; 79 79 - let iconBlob: Awaited<ReturnType<typeof agent.com.atproto.repo.uploadBlob>>["data"]["blob"] | undefined; 76 76 + let iconBlob: 77 77 + | Awaited< 78 78 + ReturnType<typeof agent.com.atproto.repo.uploadBlob> 79 79 + >["data"]["blob"] 80 80 + | undefined; 80 81 81 82 // Upload the icon if provided 82 83 if (iconFile && iconFile.size > 0) { ··· 97 98 ...(iconBlob && { icon: iconBlob }), 98 99 basicTheme: { 99 100 $type: "site.standard.theme.basic", 100 100 - background: { $type: "site.standard.theme.color#rgb", ...PubThemeDefaultsRGB.background }, 101 101 - foreground: { $type: "site.standard.theme.color#rgb", ...PubThemeDefaultsRGB.foreground }, 102 102 - accent: { $type: "site.standard.theme.color#rgb", ...PubThemeDefaultsRGB.accent }, 103 103 - accentForeground: { $type: "site.standard.theme.color#rgb", ...PubThemeDefaultsRGB.accentForeground }, 101 101 + background: { 102 102 + $type: "site.standard.theme.color#rgb", 103 103 + ...PubThemeDefaultsRGB.background, 104 104 + }, 105 105 + foreground: { 106 106 + $type: "site.standard.theme.color#rgb", 107 107 + ...PubThemeDefaultsRGB.foreground, 108 108 + }, 109 109 + accent: { 110 110 + $type: "site.standard.theme.color#rgb", 111 111 + ...PubThemeDefaultsRGB.accent, 112 112 + }, 113 113 + accentForeground: { 114 114 + $type: "site.standard.theme.color#rgb", 115 115 + ...PubThemeDefaultsRGB.accentForeground, 116 116 + }, 104 117 }, 105 118 preferences: { 106 119 showInDiscover: preferences.showInDiscover, 107 120 showComments: preferences.showComments, 108 121 showMentions: preferences.showMentions, 109 122 showPrevNext: preferences.showPrevNext, 123 123 + showRecommends: preferences.showRecommends, 110 124 }, 111 125 } satisfies SiteStandardPublication.Record; 112 126 } else {

+167 -98

app/lish/createPub/updatePublication.ts

··· 77 77 } 78 78 79 79 const aturi = new AtUri(existingPub.uri); 80 80 - const publicationType = getPublicationType(aturi.collection) as PublicationType; 80 80 + const publicationType = getPublicationType( 81 81 + aturi.collection, 82 82 + ) as PublicationType; 81 83 82 84 // Normalize existing record 83 85 const normalizedPub = normalizePublicationRecord(existingPub.record); ··· 128 130 } 129 131 130 132 /** Merges override with existing value, respecting explicit undefined */ 131 131 - function resolveField<T>(override: T | undefined, existing: T | undefined, hasOverride: boolean): T | undefined { 133 133 + function resolveField<T>( 134 134 + override: T | undefined, 135 135 + existing: T | undefined, 136 136 + hasOverride: boolean, 137 137 + ): T | undefined { 132 138 return hasOverride ? override : existing; 133 139 } 134 140 ··· 146 152 return { 147 153 $type: "pub.leaflet.publication", 148 154 name: overrides.name ?? normalizedPub?.name ?? "", 149 149 - description: resolveField(overrides.description, normalizedPub?.description, "description" in overrides), 150 150 - icon: resolveField(overrides.icon, normalizedPub?.icon, "icon" in overrides), 151 151 - theme: resolveField(overrides.theme, normalizedPub?.theme, "theme" in overrides), 155 155 + description: resolveField( 156 156 + overrides.description, 157 157 + normalizedPub?.description, 158 158 + "description" in overrides, 159 159 + ), 160 160 + icon: resolveField( 161 161 + overrides.icon, 162 162 + normalizedPub?.icon, 163 163 + "icon" in overrides, 164 164 + ), 165 165 + theme: resolveField( 166 166 + overrides.theme, 167 167 + normalizedPub?.theme, 168 168 + "theme" in overrides, 169 169 + ), 152 170 base_path: overrides.basePath ?? existingBasePath, 153 153 - preferences: preferences ? { 154 154 - $type: "pub.leaflet.publication#preferences", 155 155 - showInDiscover: preferences.showInDiscover, 156 156 - showComments: preferences.showComments, 157 157 - showMentions: preferences.showMentions, 158 158 - showPrevNext: preferences.showPrevNext, 159 159 - } : undefined, 171 171 + preferences: preferences 172 172 + ? { 173 173 + $type: "pub.leaflet.publication#preferences", 174 174 + showInDiscover: preferences.showInDiscover, 175 175 + showComments: preferences.showComments, 176 176 + showMentions: preferences.showMentions, 177 177 + showPrevNext: preferences.showPrevNext, 178 178 + showRecommends: preferences.showRecommends, 179 179 + } 180 180 + : undefined, 160 181 }; 161 182 } 162 183 ··· 175 196 return { 176 197 $type: "site.standard.publication", 177 198 name: overrides.name ?? normalizedPub?.name ?? "", 178 178 - description: resolveField(overrides.description, normalizedPub?.description, "description" in overrides), 179 179 - icon: resolveField(overrides.icon, normalizedPub?.icon, "icon" in overrides), 180 180 - theme: resolveField(overrides.theme, normalizedPub?.theme, "theme" in overrides), 181 181 - basicTheme: resolveField(overrides.basicTheme, normalizedPub?.basicTheme, "basicTheme" in overrides), 199 199 + description: resolveField( 200 200 + overrides.description, 201 201 + normalizedPub?.description, 202 202 + "description" in overrides, 203 203 + ), 204 204 + icon: resolveField( 205 205 + overrides.icon, 206 206 + normalizedPub?.icon, 207 207 + "icon" in overrides, 208 208 + ), 209 209 + theme: resolveField( 210 210 + overrides.theme, 211 211 + normalizedPub?.theme, 212 212 + "theme" in overrides, 213 213 + ), 214 214 + basicTheme: resolveField( 215 215 + overrides.basicTheme, 216 216 + normalizedPub?.basicTheme, 217 217 + "basicTheme" in overrides, 218 218 + ), 182 219 url: basePath ? `https://${basePath}` : normalizedPub?.url || "", 183 183 - preferences: preferences ? { 184 184 - showInDiscover: preferences.showInDiscover, 185 185 - showComments: preferences.showComments, 186 186 - showMentions: preferences.showMentions, 187 187 - showPrevNext: preferences.showPrevNext, 188 188 - } : undefined, 220 220 + preferences: preferences 221 221 + ? { 222 222 + showInDiscover: preferences.showInDiscover, 223 223 + showComments: preferences.showComments, 224 224 + showMentions: preferences.showMentions, 225 225 + showPrevNext: preferences.showPrevNext, 226 226 + showRecommends: preferences.showRecommends, 227 227 + } 228 228 + : undefined, 189 229 }; 190 230 } 191 231 ··· 217 257 iconFile?: File | null; 218 258 preferences?: Omit<PubLeafletPublication.Preferences, "$type">; 219 259 }): Promise<UpdatePublicationResult> { 220 220 - return withPublicationUpdate(uri, async ({ normalizedPub, existingBasePath, publicationType, agent }) => { 221 221 - // Upload icon if provided 222 222 - let iconBlob = normalizedPub?.icon; 223 223 - if (iconFile && iconFile.size > 0) { 224 224 - const buffer = await iconFile.arrayBuffer(); 225 225 - const uploadResult = await agent.com.atproto.repo.uploadBlob( 226 226 - new Uint8Array(buffer), 227 227 - { encoding: iconFile.type }, 228 228 - ); 229 229 - if (uploadResult.data.blob) { 230 230 - iconBlob = uploadResult.data.blob; 260 260 + return withPublicationUpdate( 261 261 + uri, 262 262 + async ({ normalizedPub, existingBasePath, publicationType, agent }) => { 263 263 + // Upload icon if provided 264 264 + let iconBlob = normalizedPub?.icon; 265 265 + if (iconFile && iconFile.size > 0) { 266 266 + const buffer = await iconFile.arrayBuffer(); 267 267 + const uploadResult = await agent.com.atproto.repo.uploadBlob( 268 268 + new Uint8Array(buffer), 269 269 + { encoding: iconFile.type }, 270 270 + ); 271 271 + if (uploadResult.data.blob) { 272 272 + iconBlob = uploadResult.data.blob; 273 273 + } 231 274 } 232 232 - } 233 275 234 234 - return buildRecord(normalizedPub, existingBasePath, publicationType, { 235 235 - name, 236 236 - description, 237 237 - icon: iconBlob, 238 238 - preferences, 239 239 - }); 240 240 - }); 276 276 + return buildRecord(normalizedPub, existingBasePath, publicationType, { 277 277 + name, 278 278 + description, 279 279 + icon: iconBlob, 280 280 + preferences, 281 281 + }); 282 282 + }, 283 283 + ); 241 284 } 242 285 243 286 export async function updatePublicationBasePath({ ··· 247 290 uri: string; 248 291 base_path: string; 249 292 }): Promise<UpdatePublicationResult> { 250 250 - return withPublicationUpdate(uri, async ({ normalizedPub, existingBasePath, publicationType }) => { 251 251 - return buildRecord(normalizedPub, existingBasePath, publicationType, { 252 252 - basePath: base_path, 253 253 - }); 254 254 - }); 293 293 + return withPublicationUpdate( 294 294 + uri, 295 295 + async ({ normalizedPub, existingBasePath, publicationType }) => { 296 296 + return buildRecord(normalizedPub, existingBasePath, publicationType, { 297 297 + basePath: base_path, 298 298 + }); 299 299 + }, 300 300 + ); 255 301 } 256 302 257 303 type Color = ··· 275 321 accentText: Color; 276 322 }; 277 323 }): Promise<UpdatePublicationResult> { 278 278 - return withPublicationUpdate(uri, async ({ normalizedPub, existingBasePath, publicationType, agent }) => { 279 279 - // Build theme object 280 280 - const themeData = { 281 281 - $type: "pub.leaflet.publication#theme" as const, 282 282 - backgroundImage: theme.backgroundImage 283 283 - ? { 284 284 - $type: "pub.leaflet.theme.backgroundImage", 285 285 - image: ( 286 286 - await agent.com.atproto.repo.uploadBlob( 287 287 - new Uint8Array(await theme.backgroundImage.arrayBuffer()), 288 288 - { encoding: theme.backgroundImage.type }, 289 289 - ) 290 290 - )?.data.blob, 291 291 - width: theme.backgroundRepeat || undefined, 292 292 - repeat: !!theme.backgroundRepeat, 293 293 - } 294 294 - : theme.backgroundImage === null 295 295 - ? undefined 296 296 - : normalizedPub?.theme?.backgroundImage, 297 297 - backgroundColor: theme.backgroundColor 298 298 - ? { 299 299 - ...theme.backgroundColor, 300 300 - } 301 301 - : undefined, 302 302 - pageWidth: theme.pageWidth, 303 303 - primary: { 304 304 - ...theme.primary, 305 305 - }, 306 306 - pageBackground: { 307 307 - ...theme.pageBackground, 308 308 - }, 309 309 - showPageBackground: theme.showPageBackground, 310 310 - accentBackground: { 311 311 - ...theme.accentBackground, 312 312 - }, 313 313 - accentText: { 314 314 - ...theme.accentText, 315 315 - }, 316 316 - }; 324 324 + return withPublicationUpdate( 325 325 + uri, 326 326 + async ({ normalizedPub, existingBasePath, publicationType, agent }) => { 327 327 + // Build theme object 328 328 + const themeData = { 329 329 + $type: "pub.leaflet.publication#theme" as const, 330 330 + backgroundImage: theme.backgroundImage 331 331 + ? { 332 332 + $type: "pub.leaflet.theme.backgroundImage", 333 333 + image: ( 334 334 + await agent.com.atproto.repo.uploadBlob( 335 335 + new Uint8Array(await theme.backgroundImage.arrayBuffer()), 336 336 + { encoding: theme.backgroundImage.type }, 337 337 + ) 338 338 + )?.data.blob, 339 339 + width: theme.backgroundRepeat || undefined, 340 340 + repeat: !!theme.backgroundRepeat, 341 341 + } 342 342 + : theme.backgroundImage === null 343 343 + ? undefined 344 344 + : normalizedPub?.theme?.backgroundImage, 345 345 + backgroundColor: theme.backgroundColor 346 346 + ? { 347 347 + ...theme.backgroundColor, 348 348 + } 349 349 + : undefined, 350 350 + pageWidth: theme.pageWidth, 351 351 + primary: { 352 352 + ...theme.primary, 353 353 + }, 354 354 + pageBackground: { 355 355 + ...theme.pageBackground, 356 356 + }, 357 357 + showPageBackground: theme.showPageBackground, 358 358 + accentBackground: { 359 359 + ...theme.accentBackground, 360 360 + }, 361 361 + accentText: { 362 362 + ...theme.accentText, 363 363 + }, 364 364 + }; 317 365 318 318 - // Derive basicTheme from the theme colors for site.standard.publication 319 319 - const basicTheme: NormalizedPublication["basicTheme"] = { 320 320 - $type: "site.standard.theme.basic", 321 321 - background: { $type: "site.standard.theme.color#rgb", r: theme.backgroundColor.r, g: theme.backgroundColor.g, b: theme.backgroundColor.b }, 322 322 - foreground: { $type: "site.standard.theme.color#rgb", r: theme.primary.r, g: theme.primary.g, b: theme.primary.b }, 323 323 - accent: { $type: "site.standard.theme.color#rgb", r: theme.accentBackground.r, g: theme.accentBackground.g, b: theme.accentBackground.b }, 324 324 - accentForeground: { $type: "site.standard.theme.color#rgb", r: theme.accentText.r, g: theme.accentText.g, b: theme.accentText.b }, 325 325 - }; 366 366 + // Derive basicTheme from the theme colors for site.standard.publication 367 367 + const basicTheme: NormalizedPublication["basicTheme"] = { 368 368 + $type: "site.standard.theme.basic", 369 369 + background: { 370 370 + $type: "site.standard.theme.color#rgb", 371 371 + r: theme.backgroundColor.r, 372 372 + g: theme.backgroundColor.g, 373 373 + b: theme.backgroundColor.b, 374 374 + }, 375 375 + foreground: { 376 376 + $type: "site.standard.theme.color#rgb", 377 377 + r: theme.primary.r, 378 378 + g: theme.primary.g, 379 379 + b: theme.primary.b, 380 380 + }, 381 381 + accent: { 382 382 + $type: "site.standard.theme.color#rgb", 383 383 + r: theme.accentBackground.r, 384 384 + g: theme.accentBackground.g, 385 385 + b: theme.accentBackground.b, 386 386 + }, 387 387 + accentForeground: { 388 388 + $type: "site.standard.theme.color#rgb", 389 389 + r: theme.accentText.r, 390 390 + g: theme.accentText.g, 391 391 + b: theme.accentText.b, 392 392 + }, 393 393 + }; 326 394 327 327 - return buildRecord(normalizedPub, existingBasePath, publicationType, { 328 328 - theme: themeData, 329 329 - basicTheme, 330 330 - }); 331 331 - }); 395 395 + return buildRecord(normalizedPub, existingBasePath, publicationType, { 396 396 + theme: themeData, 397 397 + basicTheme, 398 398 + }); 399 399 + }, 400 400 + ); 332 401 }

+8 -10

components/ActionBar/ActionButton.tsx

··· 19 19 className?: string; 20 20 subtext?: string; 21 21 labelOnMobile?: boolean; 22 22 - smallOnMobile?: boolean; 23 22 z?: boolean; 24 23 } 25 24 >((_props, ref) => { ··· 31 30 secondary, 32 31 nav, 33 32 labelOnMobile, 34 34 - smallOnMobile, 35 33 subtext, 36 34 className, 37 35 ...buttonProps ··· 57 55 className={` 58 56 actionButton relative font-bold 59 57 rounded-md border 60 60 - flex gap-2 items-center justify-start 61 61 - w-max sm:w-[1000px] sm:max-w-full p-1 62 62 - ${smallOnMobile && "sm:text-base text-sm py-0! sm:py-1! sm:h-fit h-6"} 58 58 + flex gap-2 items-start sm:justify-start justify-center 59 59 + p-1 sm:mx-0 60 60 + ${showLabelOnMobile && !secondary ? "w-full" : "sm:w-full w-max"} 63 61 ${ 64 62 primary 65 65 - ? "bg-accent-1 border-accent-1 text-accent-2 transparent-outline sm:hover:outline-accent-contrast focus:outline-accent-1 outline-offset-1 " 63 63 + ? "bg-accent-1 border-accent-1 text-accent-2 transparent-outline sm:hover:outline-accent-contrast focus:outline-accent-1 outline-offset-1 mx-1 first:ml-0" 66 64 : secondary 67 67 - ? " bg-bg-page border-accent-contrast text-accent-contrast transparent-outline focus:outline-accent-contrast sm:hover:outline-accent-contrast outline-offset-1" 65 65 + ? " bg-bg-page border-accent-contrast text-accent-contrast transparent-outline focus:outline-accent-contrast sm:hover:outline-accent-contrast outline-offset-1 mx-1 first:ml-0" 68 66 : nav 69 69 - ? "border-transparent text-secondary sm:hover:border-border justify-start! max-w-full" 67 67 + ? "border-transparent text-secondary sm:hover:border-border justify-start!" 70 68 : "border-transparent text-accent-contrast sm:hover:border-accent-contrast" 71 69 } 72 70 ${className} 73 71 `} 74 72 > 75 75 - <div className="shrink-0 flex flex-row gap-0.5">{icon}</div> 73 73 + <div className="shrink-0">{icon}</div> 76 74 <div 77 77 - className={`flex flex-col ${subtext && "leading-snug"} max-w-full min-w-0 mr-1 ${sidebar.open ? "block" : showLabelOnMobile ? "sm:hidden block" : "hidden"}`} 75 75 + className={`flex flex-col pr-1 ${subtext && "leading-snug"} max-w-full min-w-0 ${sidebar.open ? "block" : showLabelOnMobile ? "sm:hidden block" : "hidden"}`} 78 76 > 79 77 <div className="truncate text-left">{label}</div> 80 78 {subtext && (

-62

components/ActionBar/DesktopNavigation.tsx

··· 1 1 - import { useIdentityData } from "components/IdentityProvider"; 2 2 - import { 3 3 - navPages, 4 4 - HomeButton, 5 5 - ReaderButton, 6 6 - NotificationButton, 7 7 - WriterButton, 8 8 - } from "./NavigationButtons"; 9 9 - import { PublicationButtons } from "./Publications"; 10 10 - import { Sidebar } from "./Sidebar"; 11 11 - import { LoginActionButton, LoginButton } from "components/LoginButton"; 12 12 - 13 13 - export const DesktopNavigation = (props: { 14 14 - currentPage: navPages; 15 15 - publication?: string; 16 16 - }) => { 17 17 - let { identity } = useIdentityData(); 18 18 - let thisPublication = identity?.publications?.find( 19 19 - (pub) => pub.uri === props.publication, 20 20 - ); 21 21 - 22 22 - let currentlyWriter = 23 23 - props.currentPage === "home" || 24 24 - props.currentPage === "looseleafs" || 25 25 - props.currentPage === "pub"; 26 26 - return ( 27 27 - <div className="flex flex-col gap-3"> 28 28 - <Sidebar alwaysOpen> 29 29 - {identity?.atp_did ? ( 30 30 - <NotificationButton current={props.currentPage === "notifications"} /> 31 31 - ) : ( 32 32 - <LoginActionButton /> 33 33 - )} 34 34 - </Sidebar> 35 35 - 36 36 - <Sidebar alwaysOpen> 37 37 - <ReaderButton 38 38 - current={props.currentPage === "reader"} 39 39 - subs={ 40 40 - identity?.publication_subscriptions?.length !== 0 && 41 41 - identity?.publication_subscriptions?.length !== undefined 42 42 - } 43 43 - /> 44 44 - {currentlyWriter ? ( 45 45 - <> 46 46 - <HomeButton current={props.currentPage === "home"} /> 47 47 - <hr className="border-border-light border-dashed" /> 48 48 - <PublicationButtons 49 49 - currentPage={props.currentPage} 50 50 - currentPubUri={thisPublication?.uri} 51 51 - /> 52 52 - </> 53 53 - ) : ( 54 54 - <WriterButton 55 55 - currentPage={props.currentPage} 56 56 - currentPubUri={thisPublication?.uri} 57 57 - /> 58 58 - )} 59 59 - </Sidebar> 60 60 - </div> 61 61 - ); 62 62 - };

+1 -1

components/ActionBar/Footer.tsx

··· 8 8 actionFooter touch-none shrink-0 9 9 w-full z-10 10 10 px-2 pt-1 pwa-padding-bottom 11 11 - flex justify-between 11 11 + flex justify-start gap-1 12 12 h-[calc(38px+var(--safe-padding-bottom))] 13 13 bg-[rgba(var(--bg-page),0.5)] border-top border-bg-page`} 14 14 >

-61

components/ActionBar/MobileNavigation.tsx

··· 1 1 - import { useIdentityData } from "components/IdentityProvider"; 2 2 - import { Separator } from "components/Layout"; 3 3 - import { 4 4 - navPages, 5 5 - NotificationButton, 6 6 - ReaderButton, 7 7 - WriterButton, 8 8 - } from "./NavigationButtons"; 9 9 - import { PublicationNavigation } from "./PublicationNavigation"; 10 10 - import { LoginActionButton } from "components/LoginButton"; 11 11 - 12 12 - export const MobileNavigation = (props: { 13 13 - currentPage: navPages; 14 14 - currentPublicationUri?: string; 15 15 - currentProfileDid?: string; 16 16 - }) => { 17 17 - let { identity } = useIdentityData(); 18 18 - 19 19 - let compactOnMobile = 20 20 - props.currentPage === "home" || 21 21 - props.currentPage === "looseleafs" || 22 22 - props.currentPage === "pub"; 23 23 - 24 24 - return ( 25 25 - <div 26 26 - className={`mobileFooter w-full flex gap-4 px-1 text-secondary grow items-center justify-between`} 27 27 - > 28 28 - <div className="mobileNav flex gap-2 items-center justify-start min-w-0"> 29 29 - <ReaderButton 30 30 - compactOnMobile={compactOnMobile} 31 31 - current={props.currentPage === "reader"} 32 32 - subs={ 33 33 - identity?.publication_subscriptions?.length !== 0 && 34 34 - identity?.publication_subscriptions?.length !== undefined 35 35 - } 36 36 - /> 37 37 - <WriterButton 38 38 - compactOnMobile={compactOnMobile} 39 39 - currentPage={props.currentPage} 40 40 - currentPubUri={props.currentPublicationUri} 41 41 - /> 42 42 - 43 43 - {compactOnMobile && ( 44 44 - <> 45 45 - <PublicationNavigation 46 46 - currentPage={props.currentPage} 47 47 - currentPubUri={props.currentPublicationUri} 48 48 - /> 49 49 - </> 50 50 - )} 51 51 - </div> 52 52 - {identity?.atp_did ? ( 53 53 - <> 54 54 - <NotificationButton /> 55 55 - </> 56 56 - ) : ( 57 57 - <LoginActionButton /> 58 58 - )} 59 59 - </div> 60 60 - ); 61 61 - };

+179

components/ActionBar/Navigation.tsx

··· 1 1 + import { HomeSmall } from "components/Icons/HomeSmall"; 2 2 + import { ActionButton } from "./ActionButton"; 3 3 + import { Sidebar } from "./Sidebar"; 4 4 + import { useIdentityData } from "components/IdentityProvider"; 5 5 + import Link from "next/link"; 6 6 + import { DiscoverSmall } from "components/Icons/DiscoverSmall"; 7 7 + import { PublicationButtons } from "./Publications"; 8 8 + import { Popover } from "components/Popover"; 9 9 + import { MenuSmall } from "components/Icons/MenuSmall"; 10 10 + import { 11 11 + ReaderReadSmall, 12 12 + ReaderUnreadSmall, 13 13 + } from "components/Icons/ReaderSmall"; 14 14 + import { 15 15 + NotificationsReadSmall, 16 16 + NotificationsUnreadSmall, 17 17 + } from "components/Icons/NotificationSmall"; 18 18 + import { SpeedyLink } from "components/SpeedyLink"; 19 19 + import { Separator } from "components/Layout"; 20 20 + 21 21 + export type navPages = 22 22 + | "home" 23 23 + | "reader" 24 24 + | "pub" 25 25 + | "discover" 26 26 + | "notifications" 27 27 + | "looseleafs" 28 28 + | "tag" 29 29 + | "profile"; 30 30 + 31 31 + export const DesktopNavigation = (props: { 32 32 + currentPage: navPages; 33 33 + publication?: string; 34 34 + }) => { 35 35 + let { identity } = useIdentityData(); 36 36 + return ( 37 37 + <div className="flex flex-col gap-3"> 38 38 + <Sidebar alwaysOpen> 39 39 + <NavigationOptions 40 40 + currentPage={props.currentPage} 41 41 + publication={props.publication} 42 42 + /> 43 43 + </Sidebar> 44 44 + {identity?.atp_did && ( 45 45 + <Sidebar alwaysOpen> 46 46 + <NotificationButton current={props.currentPage === "notifications"} /> 47 47 + </Sidebar> 48 48 + )} 49 49 + </div> 50 50 + ); 51 51 + }; 52 52 + 53 53 + export const MobileNavigation = (props: { 54 54 + currentPage: navPages; 55 55 + publication?: string; 56 56 + }) => { 57 57 + let { identity } = useIdentityData(); 58 58 + 59 59 + return ( 60 60 + <div className="flex gap-1 "> 61 61 + <Popover 62 62 + onOpenAutoFocus={(e) => e.preventDefault()} 63 63 + asChild 64 64 + className="px-2! !max-w-[256px]" 65 65 + trigger={ 66 66 + <div className="shrink-0 p-1 text-accent-contrast h-full flex gap-2 font-bold items-center"> 67 67 + <MenuSmall /> 68 68 + </div> 69 69 + } 70 70 + > 71 71 + <NavigationOptions 72 72 + currentPage={props.currentPage} 73 73 + publication={props.publication} 74 74 + isMobile 75 75 + /> 76 76 + </Popover> 77 77 + {identity?.atp_did && ( 78 78 + <> 79 79 + <Separator /> 80 80 + <NotificationButton /> 81 81 + </> 82 82 + )} 83 83 + </div> 84 84 + ); 85 85 + }; 86 86 + 87 87 + const NavigationOptions = (props: { 88 88 + currentPage: navPages; 89 89 + publication?: string; 90 90 + isMobile?: boolean; 91 91 + }) => { 92 92 + let { identity } = useIdentityData(); 93 93 + let thisPublication = identity?.publications?.find( 94 94 + (pub) => pub.uri === props.publication, 95 95 + ); 96 96 + return ( 97 97 + <> 98 98 + <HomeButton current={props.currentPage === "home"} /> 99 99 + <ReaderButton 100 100 + current={props.currentPage === "reader"} 101 101 + subs={ 102 102 + identity?.publication_subscriptions?.length !== 0 && 103 103 + identity?.publication_subscriptions?.length !== undefined 104 104 + } 105 105 + /> 106 106 + <DiscoverButton current={props.currentPage === "discover"} /> 107 107 + 108 108 + <hr className="border-border-light my-1" /> 109 109 + <PublicationButtons 110 110 + currentPage={props.currentPage} 111 111 + currentPubUri={thisPublication?.uri} 112 112 + /> 113 113 + </> 114 114 + ); 115 115 + }; 116 116 + 117 117 + const HomeButton = (props: { current?: boolean }) => { 118 118 + return ( 119 119 + <SpeedyLink href={"/home"} className="hover:!no-underline"> 120 120 + <ActionButton 121 121 + nav 122 122 + icon={<HomeSmall />} 123 123 + label="Home" 124 124 + className={props.current ? "bg-bg-page! border-border-light!" : ""} 125 125 + /> 126 126 + </SpeedyLink> 127 127 + ); 128 128 + }; 129 129 + 130 130 + const ReaderButton = (props: { current?: boolean; subs: boolean }) => { 131 131 + if (!props.subs) return; 132 132 + return ( 133 133 + <SpeedyLink href={"/reader"} className="hover:no-underline!"> 134 134 + <ActionButton 135 135 + nav 136 136 + icon={<ReaderUnreadSmall />} 137 137 + label="Reader" 138 138 + className={props.current ? "bg-bg-page! border-border-light!" : ""} 139 139 + /> 140 140 + </SpeedyLink> 141 141 + ); 142 142 + }; 143 143 + 144 144 + const DiscoverButton = (props: { current?: boolean }) => { 145 145 + return ( 146 146 + <Link href={"/discover"} className="hover:no-underline!"> 147 147 + <ActionButton 148 148 + nav 149 149 + icon={<DiscoverSmall />} 150 150 + label="Discover" 151 151 + subtext="" 152 152 + className={props.current ? "bg-bg-page! border-border-light!" : ""} 153 153 + /> 154 154 + </Link> 155 155 + ); 156 156 + }; 157 157 + 158 158 + export function NotificationButton(props: { current?: boolean }) { 159 159 + let { identity } = useIdentityData(); 160 160 + let unreads = identity?.notifications[0]?.count; 161 161 + 162 162 + return ( 163 163 + <SpeedyLink href={"/notifications"} className="hover:no-underline!"> 164 164 + <ActionButton 165 165 + nav 166 166 + labelOnMobile={false} 167 167 + icon={ 168 168 + unreads ? ( 169 169 + <NotificationsUnreadSmall className="text-accent-contrast" /> 170 170 + ) : ( 171 171 + <NotificationsReadSmall /> 172 172 + ) 173 173 + } 174 174 + label="Notifications" 175 175 + className={`${props.current ? "bg-bg-page! border-border-light!" : ""} ${unreads ? "text-accent-contrast!" : ""}`} 176 176 + /> 177 177 + </SpeedyLink> 178 178 + ); 179 179 + }

-101

components/ActionBar/NavigationButtons.tsx

··· 1 1 - import { HomeSmall } from "components/Icons/HomeSmall"; 2 2 - import { ActionButton } from "./ActionButton"; 3 3 - import { useIdentityData } from "components/IdentityProvider"; 4 4 - import { PublicationButtons } from "./Publications"; 5 5 - import { ReaderUnreadSmall } from "components/Icons/ReaderSmall"; 6 6 - import { 7 7 - NotificationsReadSmall, 8 8 - NotificationsUnreadSmall, 9 9 - } from "components/Icons/NotificationSmall"; 10 10 - import { SpeedyLink } from "components/SpeedyLink"; 11 11 - import { Popover } from "components/Popover"; 12 12 - import { WriterSmall } from "components/Icons/WriterSmall"; 13 13 - export type navPages = 14 14 - | "home" 15 15 - | "reader" 16 16 - | "pub" 17 17 - | "notifications" 18 18 - | "looseleafs" 19 19 - | "tag" 20 20 - | "profile" 21 21 - | "discover"; 22 22 - 23 23 - export const HomeButton = (props: { 24 24 - current?: boolean; 25 25 - className?: string; 26 26 - }) => { 27 27 - return ( 28 28 - <SpeedyLink href={"/home"} className="hover:!no-underline"> 29 29 - <ActionButton 30 30 - nav 31 31 - icon={<HomeSmall />} 32 32 - label="Write" 33 33 - className={`${props.current ? "bg-bg-page! border-border-light!" : ""} w-full! ${props.className}`} 34 34 - /> 35 35 - </SpeedyLink> 36 36 - ); 37 37 - }; 38 38 - 39 39 - export const WriterButton = (props: { 40 40 - currentPage: navPages; 41 41 - currentPubUri?: string; 42 42 - compactOnMobile?: boolean; 43 43 - }) => { 44 44 - let current = 45 45 - props.currentPage === "home" || 46 46 - props.currentPage === "looseleafs" || 47 47 - props.currentPage === "pub"; 48 48 - 49 49 - return ( 50 50 - <SpeedyLink href={"/home"} className="hover:!no-underline"> 51 51 - <ActionButton 52 52 - nav 53 53 - labelOnMobile={!props.compactOnMobile} 54 54 - icon={<WriterSmall />} 55 55 - label="Write" 56 56 - className={`${current ? "bg-bg-page! border-border-light!" : ""}`} 57 57 - /> 58 58 - </SpeedyLink> 59 59 - ); 60 60 - }; 61 61 - 62 62 - export const ReaderButton = (props: { 63 63 - current?: boolean; 64 64 - subs: boolean; 65 65 - compactOnMobile?: boolean; 66 66 - }) => { 67 67 - return ( 68 68 - <SpeedyLink href={"/reader"} className="hover:no-underline!"> 69 69 - <ActionButton 70 70 - nav 71 71 - labelOnMobile={!props.compactOnMobile} 72 72 - icon={<ReaderUnreadSmall />} 73 73 - label="Read" 74 74 - className={props.current ? "bg-bg-page! border-border-light!" : ""} 75 75 - /> 76 76 - </SpeedyLink> 77 77 - ); 78 78 - }; 79 79 - 80 80 - export function NotificationButton(props: { current?: boolean }) { 81 81 - let { identity } = useIdentityData(); 82 82 - let unreads = identity?.notifications[0]?.count; 83 83 - 84 84 - return ( 85 85 - <SpeedyLink href={"/notifications"} className="hover:no-underline!"> 86 86 - <ActionButton 87 87 - nav 88 88 - labelOnMobile={false} 89 89 - icon={ 90 90 - unreads ? ( 91 91 - <NotificationsUnreadSmall className="text-accent-contrast" /> 92 92 - ) : ( 93 93 - <NotificationsReadSmall /> 94 94 - ) 95 95 - } 96 96 - label="Notifications" 97 97 - className={`${props.current ? "bg-bg-page! border-border-light!" : ""} ${unreads ? "text-accent-contrast!" : ""}`} 98 98 - /> 99 99 - </SpeedyLink> 100 100 - ); 101 101 - }

-148

components/ActionBar/PublicationNavigation.tsx

··· 1 1 - "use client"; 2 2 - import { useIdentityData } from "components/IdentityProvider"; 3 3 - import { getBasePublicationURL } from "app/lish/createPub/getPublicationURL"; 4 4 - import { 5 5 - normalizePublicationRecord, 6 6 - type NormalizedPublication, 7 7 - } from "src/utils/normalizeRecords"; 8 8 - import { SpeedyLink } from "components/SpeedyLink"; 9 9 - import { Popover } from "components/Popover"; 10 10 - import { ButtonPrimary } from "components/Buttons"; 11 11 - import { LooseLeafSmall } from "components/Icons/LooseleafSmall"; 12 12 - import { HomeButton, type navPages } from "./NavigationButtons"; 13 13 - import { HomeSmall } from "components/Icons/HomeSmall"; 14 14 - import { MoreOptionsVerticalTiny } from "components/Icons/MoreOptionsVerticalTiny"; 15 15 - import { PubIcon, PublicationButtons } from "./Publications"; 16 16 - import { HomeTiny } from "components/Icons/HomeTiny"; 17 17 - import { LooseleafTiny } from "components/Icons/LooseleafTiny"; 18 18 - import { Separator } from "components/Layout"; 19 19 - import { Menu, MenuItem } from "components/Menu"; 20 20 - import { AddTiny } from "components/Icons/AddTiny"; 21 21 - 22 22 - export const PublicationNavigation = (props: { 23 23 - currentPage: navPages; 24 24 - currentPubUri?: string; 25 25 - }) => { 26 26 - let { identity } = useIdentityData(); 27 27 - 28 28 - if (!identity) return; 29 29 - 30 30 - let hasLooseleafs = !!identity?.permission_token_on_homepage.find( 31 31 - (f) => 32 32 - f.permission_tokens.leaflets_to_documents && 33 33 - f.permission_tokens.leaflets_to_documents[0]?.document, 34 34 - ); 35 35 - 36 36 - let pubCount = identity?.publications.length ?? 0; 37 37 - let onlyOnePub = pubCount === 1 && hasLooseleafs; 38 38 - let onlyLooseleafs = pubCount === 0 && hasLooseleafs; 39 39 - let className = 40 40 - "font-bold text-secondary flex gap-2 items-center grow min-w-0 text-sm h-[34px] px-2 accent-container"; 41 41 - 42 42 - // if not publications or looseleafs 43 43 - if (!identity.publications && !hasLooseleafs) { 44 44 - return ( 45 45 - <SpeedyLink href="/lish/createPub"> 46 46 - <ButtonPrimary compact className="text-sm!"> 47 47 - Create a Publication! 48 48 - </ButtonPrimary> 49 49 - </SpeedyLink> 50 50 - ); 51 51 - } 52 52 - 53 53 - switch (props.currentPage) { 54 54 - case "looseleafs": 55 55 - case "pub": 56 56 - if (onlyLooseleafs || onlyOnePub) 57 57 - return ( 58 58 - <> 59 59 - <SpeedyLink href={`/home`} className={className}> 60 60 - <HomeTiny className="shrink-0" /> 61 61 - Home 62 62 - </SpeedyLink> 63 63 - </> 64 64 - ); 65 65 - break; 66 66 - case "home": { 67 67 - if (onlyLooseleafs || onlyOnePub) { 68 68 - let pub = identity.publications[0]; 69 69 - return ( 70 70 - <div className={className}> 71 71 - <Menu trigger={<MoreOptionsVerticalTiny className="shrink-0" />}> 72 72 - <SpeedyLink href="/createPub"> 73 73 - <MenuItem className="items-center! text-sm" onSelect={() => {}}> 74 74 - <AddTiny /> 75 75 - Create New Publication 76 76 - </MenuItem> 77 77 - </SpeedyLink> 78 78 - </Menu> 79 79 - <Separator classname="h-6!" /> 80 80 - {onlyLooseleafs ? ( 81 81 - <SpeedyLink 82 82 - href="/looseleafs" 83 83 - className="hover:no-underline! text-inherit flex gap-2 items-center pr-2 w-full min-w-0" 84 84 - > 85 85 - <LooseleafTiny className="shrink-0" /> Looseleafs 86 86 - </SpeedyLink> 87 87 - ) : ( 88 88 - <SpeedyLink 89 89 - href={`${getBasePublicationURL(pub)}/dashboard`} 90 90 - className="hover:no-underline! text-inherit flex gap-2 items-center pr-2 w0ull min-w-0" 91 91 - > 92 92 - <PubIcon 93 93 - small 94 94 - record={normalizePublicationRecord(pub.record)} 95 95 - uri={pub.uri} 96 96 - /> 97 97 - <div className="truncate min-w-0">{pub.name}</div> 98 98 - </SpeedyLink> 99 99 - )} 100 100 - </div> 101 101 - ); 102 102 - } 103 103 - break; 104 104 - } 105 105 - } 106 106 - 107 107 - return ( 108 108 - <Popover 109 109 - trigger={ 110 110 - <div className={className}> 111 111 - <PubIcons 112 112 - publications={identity.publications.map((pub) => ({ 113 113 - record: normalizePublicationRecord(pub.record), 114 114 - uri: pub.uri, 115 115 - }))} 116 116 - />{" "} 117 117 - Publications 118 118 - </div> 119 119 - } 120 120 - className="pt-1 px-2!" 121 121 - > 122 122 - <HomeButton current={props.currentPage === "home"} /> 123 123 - <hr className="my-1 border-border-light" /> 124 124 - <PublicationButtons 125 125 - currentPage={props.currentPage} 126 126 - currentPubUri={props.currentPubUri} 127 127 - /> 128 128 - </Popover> 129 129 - ); 130 130 - }; 131 131 - 132 132 - function PubIcons(props: { 133 133 - publications: { record: NormalizedPublication | null; uri: string }[]; 134 134 - }) { 135 135 - if (props.publications.length < 1) return null; 136 136 - return ( 137 137 - <div className="flex"> 138 138 - {props.publications.map((pub, index) => { 139 139 - if (index <= 2) 140 140 - return ( 141 141 - <div className="-ml-[6px] first:ml-0" key={pub.uri}> 142 142 - <PubIcon small record={pub.record} uri={pub.uri} /> 143 143 - </div> 144 144 - ); 145 145 - })} 146 146 - </div> 147 147 - ); 148 148 - }

+11 -18

components/ActionBar/Publications.tsx

··· 19 19 import { useIsMobile } from "src/hooks/isMobile"; 20 20 import { useState } from "react"; 21 21 import { LooseLeafSmall } from "components/Icons/LooseleafSmall"; 22 22 - import { type navPages } from "./NavigationButtons"; 22 22 + import { navPages } from "./Navigation"; 23 23 24 24 export const PublicationButtons = (props: { 25 25 currentPage: navPages; 26 26 currentPubUri: string | undefined; 27 27 - className?: string; 28 28 - optionClassName?: string; 29 27 }) => { 30 28 let { identity } = useIdentityData(); 31 29 let hasLooseleafs = !!identity?.permission_token_on_homepage.find( ··· 40 38 return <PubListEmpty />; 41 39 42 40 return ( 43 43 - <div 44 44 - className={`pubListWrapper w-full flex flex-col sm:bg-transparent sm:border-0 ${props.className}`} 45 45 - > 41 41 + <div className="pubListWrapper w-full flex flex-col gap-1 sm:bg-transparent sm:border-0"> 46 42 {hasLooseleafs && ( 47 43 <> 48 44 <SpeedyLink 49 45 href={`/looseleafs`} 50 50 - className={`flex gap-2 items-start text-secondary font-bold hover:no-underline! hover:text-accent-contrast w-full `} 46 46 + className="flex gap-2 items-start text-secondary font-bold hover:no-underline! hover:text-accent-contrast w-full" 51 47 > 52 48 {/*TODO How should i get if this is the current page or not? 53 49 theres not "pub" to check the uri for. Do i need to add it as an option to NavPages? thats kinda annoying*/} ··· 55 51 label="Looseleafs" 56 52 icon={<LooseLeafSmall />} 57 53 nav 58 58 - className={`w-full! ${ 54 54 + className={ 59 55 props.currentPage === "looseleafs" 60 56 ? "bg-bg-page! border-border!" 61 57 : "" 62 58 } 63 63 - ${props.optionClassName}`} 64 59 /> 65 60 </SpeedyLink> 61 61 + <hr className="border-border-light border-dashed mx-1" /> 66 62 </> 67 63 )} 68 64 ··· 90 86 })} 91 87 <Link 92 88 href={"/lish/createPub"} 93 93 - className={`pubListCreateNew group/new-pub text-tertiary hover:text-accent-contrast flex gap-2 items-center p-1 no-underline! ${props.optionClassName}`} 89 89 + className="pubListCreateNew text-accent-contrast text-sm place-self-end hover:text-accent-contrast" 94 90 > 95 95 - <div className="group-hover/new-pub:border-accent-contrast w-6 h-6 border-border-light border-2 border-dashed rounded-full" /> 96 96 - New Publication 91 91 + New 97 92 </Link> 98 93 </div> 99 94 ); ··· 104 99 name: string; 105 100 record: Json; 106 101 current?: boolean; 107 107 - className?: string; 108 102 }) => { 109 103 let record = normalizePublicationRecord(props.record); 110 104 if (!record) return; ··· 112 106 return ( 113 107 <SpeedyLink 114 108 href={`${getBasePublicationURL(props)}/dashboard`} 115 115 - className={`flex gap-2 items-start text-secondary font-bold hover:no-underline! hover:text-accent-contrast w-full `} 109 109 + className="flex gap-2 items-start text-secondary font-bold hover:no-underline! hover:text-accent-contrast w-full" 116 110 > 117 111 <ActionButton 118 112 label={record.name} 119 113 icon={<PubIcon record={record} uri={props.uri} />} 120 114 nav 121 121 - className={`w-full! ${props.current ? "bg-bg-page! border-border!" : ""} ${props.className}`} 115 115 + className={props.current ? "bg-bg-page! border-border!" : ""} 122 116 /> 123 117 </SpeedyLink> 124 118 ); ··· 204 198 export const PubIcon = (props: { 205 199 record: NormalizedPublication | null; 206 200 uri: string; 207 207 - tiny?: boolean; 208 201 small?: boolean; 209 202 large?: boolean; 210 203 className?: string; 211 204 }) => { 212 205 if (!props.record) return null; 213 206 214 214 - let iconSizeClassName = `${props.tiny ? "w-4 h-4" : props.small ? "w-5 h-5" : props.large ? "w-12 h-12" : "w-6 h-6"} rounded-full`; 207 207 + let iconSizeClassName = `${props.small ? "w-4 h-4" : props.large ? "w-12 h-12" : "w-6 h-6"} rounded-full`; 215 208 216 209 return props.record.icon ? ( 217 210 <div ··· 228 221 ) : ( 229 222 <div className={`${iconSizeClassName} bg-accent-1 relative`}> 230 223 <div 231 231 - className={`${props.tiny ? "text-xs" : props.large ? "text-2xl" : "text-sm"} font-bold absolute left-1/2 top-1/2 -translate-x-1/2 -translate-y-1/2 text-accent-2`} 224 224 + className={`${props.small ? "text-xs" : props.large ? "text-2xl" : "text-sm"} font-bold absolute left-1/2 top-1/2 -translate-x-1/2 -translate-y-1/2 text-accent-2`} 232 225 > 233 226 {props.record?.name.slice(0, 1).toUpperCase()} 234 227 </div>

+1

components/Blocks/BaseTextareaBlock.tsx

··· 83 83 let block = props.block.nextBlock; 84 84 85 85 let coord = getCoordinatesInTextarea(e.currentTarget, selection); 86 86 + console.log(coord); 86 87 if (block) { 87 88 focusBlock(block, { 88 89 left: coord.left + e.currentTarget.getBoundingClientRect().left,

+33 -5

components/Canvas.tsx

··· 19 19 import { Separator } from "./Layout"; 20 20 import { CommentTiny } from "./Icons/CommentTiny"; 21 21 import { QuoteTiny } from "./Icons/QuoteTiny"; 22 22 - import { PublicationMetadata } from "./Pages/PublicationMetadata"; 22 22 + import { AddTags, PublicationMetadata } from "./Pages/PublicationMetadata"; 23 23 import { useLeafletPublicationData } from "./PageSWRDataProvider"; 24 24 import { useHandleCanvasDrop } from "./Blocks/useHandleCanvasDrop"; 25 25 import { useBlockMouseHandlers } from "./Blocks/useBlockMouseHandlers"; 26 26 + import { RecommendTinyEmpty } from "./Icons/RecommendTiny"; 27 27 + import { useSubscribe } from "src/replicache/useSubscribe"; 28 28 + import { mergePreferences } from "src/utils/mergePreferences"; 26 29 27 30 export function Canvas(props: { 28 31 entityID: string; ··· 163 166 164 167 const CanvasMetadata = (props: { isSubpage: boolean | undefined }) => { 165 168 let { data: pub, normalizedPublication } = useLeafletPublicationData(); 169 169 + let { rep } = useReplicache(); 170 170 + let postPreferences = useSubscribe(rep, (tx) => 171 171 + tx.get<{ 172 172 + showComments?: boolean; 173 173 + showMentions?: boolean; 174 174 + showRecommends?: boolean; 175 175 + } | null>("post_preferences"), 176 176 + ); 166 177 if (!pub || !pub.publications) return null; 167 178 168 179 if (!normalizedPublication) return null; 169 169 - let showComments = normalizedPublication.preferences?.showComments !== false; 170 170 - let showMentions = normalizedPublication.preferences?.showMentions !== false; 180 180 + let merged = mergePreferences( 181 181 + postPreferences || undefined, 182 182 + normalizedPublication.preferences, 183 183 + ); 184 184 + let showComments = merged.showComments !== false; 185 185 + let showMentions = merged.showMentions !== false; 186 186 + let showRecommends = merged.showRecommends !== false; 171 187 172 188 return ( 173 189 <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"> 190 190 + {showRecommends && ( 191 191 + <div className="flex gap-1 text-tertiary items-center"> 192 192 + <RecommendTinyEmpty className="text-border" /> — 193 193 + </div> 194 194 + )} 174 195 {showComments && ( 175 196 <div className="flex gap-1 text-tertiary items-center"> 176 197 <CommentTiny className="text-border" /> — 177 198 </div> 178 199 )} 179 179 - {showComments && ( 200 200 + {showMentions && ( 180 201 <div className="flex gap-1 text-tertiary items-center"> 181 202 <QuoteTiny className="text-border" /> — 182 203 </div> 183 204 )} 184 205 206 206 + {showMentions !== false || 207 207 + showComments !== false || 208 208 + showRecommends === false ? ( 209 209 + <Separator classname="h-4!" /> 210 210 + ) : null} 211 211 + <AddTags /> 212 212 + 185 213 {!props.isSubpage && ( 186 214 <> 187 215 <Separator classname="h-5" /> ··· 191 219 className="flex flex-col gap-2 p-0! max-w-sm w-[1000px]" 192 220 trigger={<InfoSmall />} 193 221 > 194 194 - <PublicationMetadata /> 222 222 + <PublicationMetadata noInteractions /> 195 223 </Popover> 196 224 </> 197 225 )}

-21

components/Icons/HomeTiny.tsx

··· 1 1 - import { Props } from "./Props"; 2 2 - 3 3 - export const HomeTiny = (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 - {...props} 12 12 - > 13 13 - <path 14 14 - fillRule="evenodd" 15 15 - clipRule="evenodd" 16 16 - d="M3.5906 0.287577C3.39798 0.211458 3.18013 0.305893 3.10402 0.498504C3.0706 0.583064 3.07005 0.672489 3.09625 0.75265C3.09112 0.756892 3.08729 0.759504 3.08536 0.760636C3.01766 0.800372 2.93363 0.858436 2.8665 0.940226C2.79683 1.02511 2.71837 1.17222 2.75663 1.35689C2.7922 1.52854 2.91018 1.63661 3.00046 1.69802C3.09505 1.76237 3.2113 1.81163 3.33752 1.85239C3.39934 1.87236 3.45003 1.8919 3.49051 1.91036C3.48033 1.91756 3.46441 1.92788 3.43885 1.94314L3.42397 1.95192C3.38779 1.97318 3.32461 2.0103 3.27192 2.05173C3.20599 2.10358 3.10812 2.19751 3.06658 2.34833C3.0237 2.50404 3.05981 2.64893 3.11488 2.76333C3.2047 2.94994 3.4288 3.02841 3.61541 2.93858C3.75466 2.87155 3.83369 2.72977 3.82752 2.58459C3.87484 2.55627 3.94958 2.5103 4.01834 2.44579C4.12918 2.3418 4.23095 2.21532 4.28001 2.06267C4.33473 1.89238 4.3137 1.71934 4.2251 1.57134C4.14607 1.43931 4.0277 1.35059 3.92325 1.29025C3.85742 1.25222 3.78599 1.21914 3.71221 1.19005C3.76063 1.12961 3.80094 1.06476 3.83053 1.00004C3.86565 0.923217 3.90498 0.804913 3.88814 0.670895C3.86764 0.507679 3.76561 0.356744 3.5906 0.287577ZM3.14984 0.684673C3.14991 0.684654 3.14956 0.685711 3.14857 0.687897C3.14928 0.685784 3.14977 0.684691 3.14984 0.684673ZM3.41985 1.07611L3.4216 1.07742C3.42036 1.07656 3.41981 1.07612 3.41985 1.07611ZM11.0044 2.01981C10.8258 1.79122 10.5134 1.71555 10.25 1.83709L5.05737 4.23314V3.71118C5.05737 3.43504 4.83352 3.21118 4.55737 3.21118H2.49927C2.22313 3.21118 1.99927 3.43504 1.99927 3.71118V6.72759L0.587556 7.98327C0.329642 8.21268 0.306533 8.60773 0.535942 8.86564C0.711092 9.06256 0.982798 9.1226 1.21631 9.03789V12.7554C1.21631 12.9616 1.34294 13.1467 1.53518 13.2214L3.35104 13.9272C3.50487 13.9869 3.6783 13.967 3.81451 13.8738C3.82806 13.8645 3.84106 13.8546 3.8535 13.8442L5.42986 12.9319V14.2399C5.42986 14.4459 5.55627 14.6309 5.74826 14.7057L8.04946 15.6028C8.1866 15.6563 8.34034 15.6466 8.46969 15.5763L14.5223 12.2892C14.6834 12.2017 14.7837 12.0331 14.7837 11.8498V8.93436L15.2609 8.71207C15.4336 8.63163 15.5602 8.4768 15.6047 8.29156C15.6492 8.10632 15.6068 7.91088 15.4895 7.76075L11.0044 2.01981ZM5.42026 11.7821C5.39313 11.546 5.30858 11.2485 5.16635 10.9817C4.98526 10.6419 4.77171 10.4608 4.58539 10.4181C4.47274 10.3923 4.36021 10.4233 4.2466 10.5542C4.1247 10.6947 4.03217 10.9273 4.03217 11.1918V12.5854L5.42026 11.7821ZM4.05737 4.87826C4.05737 4.88442 4.05748 4.89055 4.05771 4.89665L2.99927 5.83811V4.21118H4.05737V4.87826ZM13.7837 9.40019L9.23842 11.5175C8.96198 11.6463 8.63296 11.5568 8.4599 11.3057L4.76308 5.94217L2.21631 8.20746V12.4133L3.03217 12.7304V11.1918C3.03217 10.7137 3.19458 10.2407 3.49138 9.89876C3.79647 9.54724 4.26639 9.31907 4.80875 9.44335C5.40674 9.58038 5.80959 10.0625 6.04881 10.5113C6.29331 10.97 6.42986 11.507 6.42986 11.938V13.8981L7.76685 14.4193V12.47C7.76685 12.1938 7.9907 11.97 8.26685 11.97C8.54299 11.97 8.76685 12.1938 8.76685 12.47V14.277L13.7837 11.5523V9.40019ZM9.18936 10.1614L5.81211 5.26154L10.3242 3.17952L14.0205 7.91089L9.18936 10.1614Z" 17 17 - fill="currentColor" 18 18 - /> 19 19 - </svg> 20 20 - ); 21 21 - };

-19

components/Icons/LooseleafTiny.tsx

··· 1 1 - import { Props } from "./Props"; 2 2 - 3 3 - export const LooseleafTiny = (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 - {...props} 12 12 - > 13 13 - <path 14 14 - d="M11.2738 3.16162L15.0267 3.56201C15.3663 3.5985 15.6139 3.90154 15.5824 4.2417C15.4811 5.33541 15.3687 6.86768 15.1898 8.27196C15.1 8.97649 14.9914 9.66447 14.8558 10.2641C14.7231 10.8509 14.5533 11.4049 14.3197 11.81C13.8598 12.6071 13.0155 13.1869 12.3167 13.5483C11.9571 13.7343 11.6082 13.8768 11.3206 13.9702C11.1775 14.0167 11.0401 14.0541 10.9193 14.0776C10.7541 14.1097 10.5913 14.1051 10.4251 14.0962C10.1231 14.0799 9.42901 14.0296 8.58334 13.8823C7.47126 13.6886 6.03035 13.3156 4.90268 12.5825C4.57534 12.3697 4.21248 12.0972 3.84506 11.8022C3.46225 12.2159 3.05921 12.5047 2.64194 12.6431C2.0308 12.8455 1.43066 12.7101 1.00424 12.2759C0.608272 11.8724 0.427321 11.2804 0.415374 10.6606C0.403254 10.0297 0.562907 9.31159 0.915374 8.57372C1.00241 8.39185 1.17191 8.26311 1.37045 8.22802C1.77258 8.15726 2.03737 8.51678 2.2933 8.76024C2.5295 8.98492 2.85946 9.29431 3.23373 9.63231C3.99203 10.3171 4.90157 11.0908 5.58432 11.5347C6.49837 12.1288 7.73879 12.4665 8.79721 12.6509C9.57737 12.7867 10.2253 12.8337 10.4925 12.8481C10.6571 12.857 10.7671 12.8352 10.9349 12.7807C11.155 12.7093 11.441 12.5939 11.7425 12.438C12.3673 12.1148 12.9557 11.6727 13.2367 11.186C13.3732 10.9493 13.511 10.5452 13.6371 9.98778C13.7602 9.44308 13.8622 8.79923 13.9496 8.11376C14.0946 6.97515 14.1935 5.76335 14.2826 4.73974L11.141 4.40381C10.7981 4.36676 10.5497 4.05925 10.5863 3.71631C10.623 3.37337 10.9309 3.12535 11.2738 3.16162ZM1.74155 9.95751C1.68375 10.2082 1.66055 10.4373 1.6644 10.6372C1.67254 11.0552 1.7951 11.2962 1.89682 11.3999C1.96817 11.4725 2.06103 11.5185 2.24838 11.4565C2.40601 11.4043 2.62567 11.2693 2.88803 10.9956C2.71779 10.8466 2.55167 10.7008 2.39584 10.56C2.1555 10.343 1.93347 10.1371 1.74155 9.95751ZM7.96322 6.41162C8.31566 6.24529 8.70512 6.24366 9.04233 6.44872C9.34367 6.63216 9.52187 6.93155 9.62338 7.20556C9.72836 7.48916 9.77666 7.81215 9.7767 8.1372C9.77667 8.6247 9.74792 9.11115 9.78354 9.59813C9.92459 9.40912 10.1034 9.15794 10.2708 8.95556C10.4074 8.79053 10.6272 8.54235 10.9017 8.42333C11.0496 8.37061 11.1951 8.34487 11.3519 8.38329C11.5136 8.42299 11.628 8.51182 11.6996 8.58642C11.8258 8.71812 11.8852 8.87607 11.9124 8.95458C11.9724 9.12791 12.0164 9.36363 12.0472 9.51122C12.0685 9.61332 12.0877 9.69219 12.1038 9.75145C12.2564 9.83216 12.3762 9.97288 12.4203 10.1538C12.5016 10.489 12.2964 10.827 11.9613 10.9087C11.7048 10.971 11.4618 10.9006 11.2826 10.7563C11.133 10.6358 11.0491 10.4826 11.0033 10.3823C10.9715 10.3127 10.9455 10.2369 10.9222 10.1616C10.8894 10.2062 10.8558 10.2528 10.8206 10.3003C10.6776 10.4935 10.5049 10.7208 10.3285 10.8921C10.2401 10.9778 10.1241 11.0763 9.98471 11.1479C9.84326 11.2205 9.62468 11.2914 9.37338 11.229C9.12739 11.1678 8.96103 11.0117 8.85873 10.8696C8.75978 10.7319 8.6993 10.5791 8.65951 10.4477C8.57995 10.1849 8.54518 9.87525 8.52865 9.5952C8.49614 9.04324 8.52667 8.38518 8.5267 8.1372C8.52667 7.95206 8.50644 7.75603 8.42709 7.58642C8.35866 7.63907 8.25391 7.74085 8.12045 7.92724C7.96238 8.14867 7.88446 8.42797 7.77572 8.67626C7.60415 9.06796 7.39016 9.49817 6.98471 9.69188C6.67331 9.84037 6.29944 9.70824 6.15072 9.39696C6.00888 9.09909 6.12486 8.74671 6.40756 8.58642C6.51366 8.47888 6.57211 8.31017 6.63119 8.17528C6.77553 7.84573 6.89305 7.49444 7.10385 7.1997C7.35704 6.84609 7.64105 6.56381 7.96322 6.41162ZM5.92026 2.61377C6.26261 2.65786 6.50438 2.97161 6.4603 3.31396C6.34872 4.18082 6.36724 5.06034 6.26889 5.92919C6.15284 6.95425 5.90409 8.0946 5.25912 9.16552C5.08097 9.46107 4.69635 9.55648 4.40073 9.37841C4.10557 9.20023 4.0101 8.81645 4.18783 8.52099C4.703 7.66575 4.92072 6.72471 5.0267 5.78857C5.1258 4.91308 5.10851 4.02764 5.22104 3.15381C5.26521 2.81184 5.57829 2.57015 5.92026 2.61377ZM8.44369 1.89307C9.32915 1.89314 10.0472 2.61111 10.0472 3.49658C10.0472 3.77125 9.97757 4.02935 9.8558 4.25537L10.2923 4.7417C10.5227 4.99871 10.5005 5.39412 10.2435 5.62451C9.98648 5.85467 9.59102 5.83358 9.36069 5.57666L8.87826 5.03857C8.74 5.07745 8.59436 5.10008 8.44369 5.10009C7.55837 5.09991 6.84025 4.38192 6.84018 3.49658C6.84018 2.61117 7.55833 1.89325 8.44369 1.89307ZM8.44369 3.14306C8.24868 3.14325 8.09018 3.30153 8.09018 3.49658C8.09025 3.69157 8.24873 3.84991 8.44369 3.8501C8.63875 3.85002 8.79713 3.69163 8.79721 3.49658C8.79721 3.30146 8.63879 3.14314 8.44369 3.14306Z" 15 15 - fill="currentColor" 16 16 - /> 17 17 - </svg> 18 18 - ); 19 19 - };

-1

components/Icons/MoreOptionsVerticalTiny.tsx

··· 8 8 viewBox="0 0 12 24" 9 9 fill="none" 10 10 xmlns="http://www.w3.org/2000/svg" 11 11 - {...props} 12 11 > 13 12 <path 14 13 d="M6 15.5C6.82843 15.5 7.5 16.1716 7.5 17C7.5 17.8284 6.82843 18.5 6 18.5C5.17157 18.5 4.5 17.8284 4.5 17C4.5 16.1716 5.17157 15.5 6 15.5ZM6 10.5C6.82843 10.5 7.5 11.1716 7.5 12C7.5 12.8284 6.82843 13.5 6 13.5C5.17157 13.5 4.5 12.8284 4.5 12C4.5 11.1716 5.17157 10.5 6 10.5ZM6 5.5C6.82843 5.5 7.5 6.17157 7.5 7C7.5 7.82843 6.82843 8.5 6 8.5C5.17157 8.5 4.5 7.82843 4.5 7C4.5 6.17157 5.17157 5.5 6 5.5Z"

+36 -1

components/Icons/NotificationSmall.tsx

··· 26 26 viewBox="0 0 24 24" 27 27 fill="none" 28 28 xmlns="http://www.w3.org/2000/svg" 29 29 + > 30 30 + <path 31 31 + d="M12.3779 0.890636C13.5297 0.868361 14.2312 1.35069 14.6104 1.8047C15.1942 2.50387 15.2636 3.34086 15.2129 3.95314C17.7074 4.96061 18.8531 7.45818 19.375 10.3975C19.5903 11.1929 20.0262 11.5635 20.585 11.9336C21.1502 12.3079 22.0847 12.7839 22.5879 13.7998C23.4577 15.556 22.8886 17.8555 20.9297 19.083C20.1439 19.5754 19.2029 20.1471 17.8496 20.5869C17.1962 20.7993 16.454 20.9768 15.5928 21.1055C15.2068 22.4811 13.9287 23.4821 12.4238 23.4824C10.9225 23.4824 9.64464 22.4867 9.25489 21.1162C8.37384 20.9871 7.61998 20.8046 6.95899 20.5869C5.62158 20.1464 4.69688 19.5723 3.91602 19.083C1.95717 17.8555 1.38802 15.556 2.25782 13.7998C2.76329 12.7794 3.60199 12.3493 4.18653 12.0068C4.7551 11.6737 5.1753 11.386 5.45606 10.7432C5.62517 9.31217 5.93987 8.01645 6.4668 6.92482C7.1312 5.54855 8.13407 4.49633 9.56251 3.92482C9.53157 3.34709 9.6391 2.63284 10.1133 1.98927C10.1972 1.87543 10.4043 1.594 10.7822 1.34669C11.1653 1.09611 11.6872 0.904101 12.3779 0.890636ZM14.1709 21.2608C13.6203 21.3007 13.0279 21.3242 12.3887 21.3242C11.7757 21.3242 11.2072 21.3024 10.6777 21.2656C11.0335 21.8421 11.6776 22.2324 12.4238 22.2324C13.1718 22.2321 13.816 21.8396 14.1709 21.2608ZM12.4004 2.38966C11.9872 2.39776 11.7419 2.50852 11.5996 2.60157C11.4528 2.6977 11.3746 2.801 11.3193 2.87599C11.088 3.19 11.031 3.56921 11.0664 3.92677C11.084 4.10311 11.1233 4.258 11.1631 4.37013C11.1875 4.43883 11.205 4.47361 11.21 4.48341C11.452 4.78119 11.4299 5.22068 11.1484 5.49415C10.8507 5.78325 10.3748 5.77716 10.0869 5.48048C10.0533 5.44582 10.0231 5.40711 9.99415 5.3672C9.0215 5.79157 8.31886 6.53162 7.81641 7.57228C7.21929 8.80941 6.91013 10.4656 6.82129 12.4746L6.81934 12.5137L6.81446 12.5518C6.73876 13.0607 6.67109 13.5103 6.53418 13.9121C6.38567 14.3476 6.16406 14.7061 5.82032 15.0899C5.54351 15.3988 5.06973 15.4268 4.76172 15.1514C4.45392 14.8758 4.42871 14.4019 4.70508 14.0928C4.93763 13.8332 5.04272 13.6453 5.11524 13.4326C5.14365 13.3492 5.16552 13.2588 5.18848 13.1553C5.10586 13.2062 5.02441 13.2544 4.94532 13.3008C4.28651 13.6868 3.87545 13.9129 3.60157 14.4658C3.08548 15.5082 3.38433 16.9793 4.71192 17.8115C5.4776 18.2913 6.27423 18.7818 7.42872 19.1621C8.58507 19.543 10.1358 19.8242 12.3887 19.8242C14.6416 19.8242 16.2108 19.5429 17.3857 19.1611C18.5582 18.7801 19.3721 18.2882 20.1328 17.8115C21.4611 16.9793 21.7595 15.5084 21.2432 14.4658C20.9668 13.9081 20.515 13.6867 19.7568 13.1846C19.7553 13.1835 19.7535 13.1827 19.752 13.1817C19.799 13.3591 19.8588 13.5202 19.9287 13.6514C20.021 13.8244 20.1034 13.8927 20.1533 13.917C20.5249 14.0981 20.6783 14.5465 20.4961 14.919C20.3135 15.2913 19.8639 15.4467 19.4922 15.2656C19.0607 15.0553 18.7821 14.6963 18.6035 14.3613C18.4238 14.0242 18.3154 13.6559 18.2471 13.3379C18.1778 13.0155 18.1437 12.7147 18.127 12.4971C18.1185 12.3873 18.1145 12.2956 18.1123 12.2305C18.1115 12.2065 18.1107 12.1856 18.1104 12.169C18.0569 11.6585 17.9885 11.1724 17.9082 10.7109C17.9002 10.6794 17.8913 10.6476 17.8838 10.6152L17.8906 10.6133C17.4166 7.97573 16.4732 6.17239 14.791 5.40821C14.5832 5.64607 14.2423 5.73912 13.9365 5.61036C13.5557 5.44988 13.3777 5.01056 13.5391 4.62892C13.5394 4.62821 13.5397 4.62699 13.54 4.62599C13.5425 4.61977 13.5479 4.6087 13.5537 4.59278C13.5658 4.55999 13.5837 4.50758 13.6035 4.44142C13.6438 4.30713 13.6903 4.12034 13.7139 3.91212C13.7631 3.47644 13.7038 3.06402 13.457 2.76857C13.3434 2.63264 13.0616 2.37678 12.4004 2.38966ZM10.1055 16.625C11.6872 16.8411 12.8931 16.8585 13.8174 16.7539C14.2287 16.7076 14.5997 17.0028 14.6465 17.4141C14.693 17.8256 14.3969 18.1976 13.9854 18.2442C12.9038 18.3665 11.5684 18.3389 9.90235 18.1113C9.49223 18.0551 9.20488 17.6768 9.26075 17.2666C9.3168 16.8563 9.6952 16.5691 10.1055 16.625ZM16.3887 16.3047C16.7403 16.086 17.203 16.1935 17.4219 16.5449C17.6406 16.8967 17.5324 17.3594 17.1807 17.5781C16.9689 17.7097 16.6577 17.8424 16.4033 17.9131C16.0045 18.0237 15.5914 17.7904 15.4805 17.3916C15.3696 16.9926 15.6031 16.5788 16.002 16.4678C16.1344 16.431 16.3112 16.3527 16.3887 16.3047Z" 32 32 + fill="currentColor" 33 33 + /> 34 34 + </svg> 35 35 + ); 36 36 + }; 37 37 + 38 38 + export const ReaderUnread = (props: Props) => { 39 39 + return ( 40 40 + <svg 41 41 + width="24" 42 42 + height="24" 43 43 + viewBox="0 0 24 24" 44 44 + fill="none" 45 45 + xmlns="http://www.w3.org/2000/svg" 29 46 {...props} 30 47 > 31 48 <path 32 32 - d="M12.379 1.43198C13.4689 1.41079 14.1368 1.86924 14.4992 2.30308C15.0424 2.95384 15.1168 3.72838 15.0753 4.3021C17.3983 5.25881 18.4631 7.59734 18.9484 10.3275C19.1445 11.0495 19.539 11.3859 20.0538 11.7269C20.5738 12.0711 21.4604 12.5232 21.9367 13.4847C22.7585 15.1448 22.219 17.3154 20.3732 18.472C19.6405 18.9311 18.7598 19.4667 17.4933 19.8783C16.8876 20.0751 16.2004 20.2389 15.4054 20.3587C15.0286 21.64 13.8299 22.5687 12.422 22.5687C11.0175 22.5684 9.8201 21.6443 9.44056 20.3675C8.62793 20.2471 7.93094 20.079 7.31849 19.8773C6.0667 19.465 5.20053 18.928 4.47279 18.472C2.62669 17.3153 2.08725 15.1449 2.90931 13.4847C3.38819 12.5179 4.18479 12.1099 4.72669 11.7923C5.25122 11.485 5.62837 11.2249 5.88294 10.6478C6.04112 9.31375 6.33609 8.10299 6.82923 7.0814C7.44748 5.8009 8.37993 4.81743 9.70521 4.27671C9.68221 3.73659 9.78903 3.07493 10.2296 2.4769C10.3087 2.36964 10.5055 2.10112 10.8654 1.86558C11.2304 1.62673 11.7262 1.44477 12.379 1.43198ZM13.963 20.515C13.4751 20.5481 12.9528 20.5667 12.3917 20.5667C11.8542 20.5667 11.3526 20.5494 10.8839 20.5189C11.2161 20.9991 11.7775 21.3185 12.422 21.3187C13.0684 21.3187 13.6311 20.9974 13.963 20.515ZM12.4035 2.93198C12.0278 2.93931 11.807 3.03915 11.6827 3.12046C11.5541 3.20485 11.4861 3.29613 11.4357 3.3646C11.2306 3.64338 11.1781 3.98084 11.2101 4.30503C11.233 4.53653 11.3069 4.74354 11.3361 4.8021C11.5745 5.09978 11.5517 5.53674 11.2716 5.80894C10.9739 6.09788 10.498 6.09183 10.2101 5.79526C10.1865 5.77095 10.1678 5.74218 10.1466 5.71519C9.27113 6.10725 8.63618 6.78165 8.17884 7.72886C7.627 8.87197 7.33861 10.4065 7.25599 12.2748C7.24499 12.7149 7.1279 13.2121 6.98646 13.6273C6.84551 14.0408 6.6358 14.3817 6.31166 14.7435C6.03482 15.0524 5.56101 15.0794 5.25306 14.8041C4.9451 14.5283 4.91961 14.0536 5.19642 13.7445C5.40901 13.5071 5.50261 13.3391 5.56751 13.1488C5.58207 13.1061 5.59391 13.0608 5.60658 13.013C5.56502 13.0379 5.52488 13.0636 5.48451 13.0873C4.86861 13.4481 4.50111 13.6519 4.25404 14.1507C3.78545 15.0972 4.05431 16.439 5.26966 17.2005C5.98211 17.6469 6.71946 18.1005 7.78822 18.4525C8.85905 18.8051 10.298 19.0667 12.3917 19.0667C14.4855 19.0667 15.9412 18.8051 17.0294 18.4515C18.1149 18.0987 18.8688 17.6438 19.5763 17.2005C20.7913 16.4391 21.0603 15.0971 20.5919 14.1507C20.3558 13.674 19.9814 13.4704 19.338 13.0501C19.3917 13.2186 19.4731 13.4853 19.6447 13.5697C20.0162 13.7509 20.17 14.2002 19.9874 14.5726C19.8047 14.9447 19.3551 15.0992 18.9835 14.9183C18.5687 14.716 18.3022 14.3715 18.1329 14.0541C17.9627 13.7344 17.8602 13.3869 17.796 13.0882C17.7309 12.7851 17.6995 12.5025 17.6837 12.2982C17.639 11.7172 17.5904 11.1217 17.4591 10.5531L17.465 10.5511C17.0282 8.11865 16.1654 6.46451 14.6427 5.75327C14.4333 5.97064 14.1064 6.05064 13.8126 5.9271C13.4133 5.75888 13.2861 5.33204 13.4152 4.94468C13.4307 4.90565 13.536 4.62297 13.5734 4.29331C13.6186 3.89372 13.5628 3.5267 13.3458 3.26694C13.2493 3.15138 13.0022 2.92054 12.4035 2.93198ZM10.2716 16.0873C11.742 16.2881 12.8605 16.3032 13.716 16.2064C14.1272 16.1602 14.4984 16.4563 14.5451 16.8675C14.5915 17.279 14.2954 17.651 13.8839 17.6976C12.8712 17.8122 11.6232 17.786 10.0685 17.5736C9.65818 17.5175 9.37096 17.1392 9.42689 16.7289C9.48296 16.3185 9.86121 16.0312 10.2716 16.0873ZM16.09 15.7962C16.4415 15.5778 16.9034 15.6852 17.1222 16.0365C17.3407 16.3881 17.2334 16.8509 16.882 17.0697C16.6801 17.1952 16.385 17.321 16.1437 17.388C15.7448 17.4987 15.3318 17.2644 15.2208 16.8656C15.1102 16.4666 15.3434 16.0537 15.7423 15.9427C15.8619 15.9095 16.0227 15.8381 16.09 15.7962Z" 49 49 + d="M2.40963 18.0472C2.40983 17.3641 2.99636 17.3642 2.99655 18.0472C2.99654 18.7307 3.28805 19.1528 3.38815 19.263C3.48823 19.3732 3.66105 19.7179 4.28463 19.7181C4.90847 19.7182 4.90847 20.3255 4.28463 20.3255C3.66107 20.3256 3.56221 20.5899 3.38815 20.7816C3.21412 20.9732 2.99855 21.2572 2.9985 21.9232C2.9985 22.5896 2.41159 22.6066 2.41159 21.9232C2.41151 21.2398 2.04325 20.8276 2.00143 20.7816C1.959 20.735 1.52689 20.3255 1.03854 20.3255C0.549966 20.3254 0.554718 19.7182 1.03854 19.7181C1.52186 19.7181 1.83806 19.3644 1.93014 19.263C2.02172 19.1622 2.40963 18.7307 2.40963 18.0472ZM18.3989 13.7962C18.3991 13.1543 18.8958 13.1543 18.896 13.7962C18.896 14.4386 19.1424 14.8352 19.227 14.9388C19.3117 15.0425 19.4577 15.3663 19.9848 15.3665C20.5125 15.3666 20.5125 15.9378 19.9848 15.9378C19.4575 15.9379 19.3742 16.1864 19.227 16.3665C19.0798 16.5466 18.897 16.8131 18.8969 17.4388C18.8969 18.0651 18.4008 18.0811 18.4008 17.4388C18.4007 16.7986 18.0911 16.4117 18.0542 16.3665C18.0188 16.3233 17.653 15.9381 17.2397 15.9378C16.8263 15.9378 16.8303 15.3665 17.2397 15.3665C17.6486 15.3663 17.916 15.0338 17.9936 14.9388C18.0711 14.844 18.3989 14.4386 18.3989 13.7962ZM5.68893 1.79134C6.32061 1.54967 6.8992 1.76772 7.31002 2.04427C7.71467 2.31686 8.06882 2.71494 8.35299 3.07649C8.63964 3.44125 8.90666 3.83827 9.10299 4.11653C9.3417 4.45493 9.26161 4.92361 8.9233 5.16243C8.58506 5.40111 8.1173 5.31974 7.87838 4.98177C7.65546 4.66583 7.42734 4.32673 7.17233 4.00227C6.91507 3.67506 6.67898 3.42822 6.47311 3.28938C6.3745 3.22296 6.30685 3.19837 6.27096 3.19075C6.24474 3.18528 6.23525 3.18881 6.22506 3.1927C6.18423 3.20859 5.9833 3.32114 5.7192 3.88899C5.59862 4.14843 5.29699 5.01402 4.93209 6.10677C4.85847 6.12987 4.80511 6.14661 4.79831 6.15462C4.79485 6.15884 4.79121 6.16214 4.78854 6.16536C4.4966 6.19308 4.21288 6.31734 3.99459 6.54427C3.75682 6.79162 3.64898 7.10768 3.64791 7.40462C3.64696 7.70171 3.75272 8.02065 3.99264 8.27083C4.04882 8.32937 4.1096 8.38044 4.1733 8.42513C3.95587 9.09776 3.75091 9.74532 3.5776 10.2884C3.85066 10.3144 4.12174 10.3779 4.38034 10.4691C5.16136 10.7446 5.92693 11.3005 6.54928 12.0501C6.71967 11.9646 6.90306 11.9158 7.08932 11.8929C7.52605 11.8392 7.97349 11.9251 8.39889 12.1146C8.52073 11.5922 8.77238 11.1032 9.17428 10.6868C10.661 9.14683 13.2111 9.62241 14.8227 11.1781C14.9553 11.306 15.0799 11.4413 15.1977 11.5814C15.3522 11.0931 15.5412 10.4983 15.7387 9.87044C16.2338 8.29641 16.7876 6.52428 17.0298 5.71028C17.333 4.69126 17.7647 3.91964 18.3823 3.49056C19.0569 3.02218 19.7993 3.06179 20.4389 3.34017C21.047 3.60494 21.6053 4.09649 22.0825 4.63802C22.5684 5.18942 23.0142 5.84393 23.3862 6.50032C23.59 6.86052 23.4639 7.31757 23.104 7.52181C22.7438 7.72592 22.2859 7.59954 22.0815 7.23958C21.7486 6.6521 21.3605 6.08653 20.9575 5.62923C20.546 5.16239 20.1597 4.85528 19.8403 4.71614C19.5524 4.5908 19.3833 4.62119 19.2368 4.72298C19.0332 4.86476 18.7324 5.24367 18.4663 6.13802C18.2201 6.9656 17.6633 8.74963 17.1694 10.3197C16.922 11.1061 16.6893 11.8418 16.519 12.3802C16.4339 12.6494 16.3652 12.87 16.3169 13.0228C16.2928 13.0988 16.274 13.1581 16.2612 13.1986C16.2548 13.2188 16.2489 13.235 16.2456 13.2454C16.2441 13.2501 16.2425 13.2536 16.2417 13.2562V13.2591L16.2407 13.2601C16.2268 13.3038 16.2077 13.3449 16.187 13.3841C16.5566 14.5982 16.4051 15.8801 15.5122 16.805C14.0254 18.345 11.4753 17.8696 9.86373 16.3138C9.18414 15.6576 8.69133 14.8276 8.45944 13.972C8.05454 13.5525 7.64913 13.397 7.38424 13.3831C7.59712 13.8598 7.7328 14.345 7.7778 14.8138C7.86052 15.6775 7.64387 16.5969 6.91061 17.1702C6.17739 17.7433 5.23363 17.7322 4.41549 17.4437C3.58744 17.1515 2.77404 16.5464 2.13327 15.7269C1.49254 14.9074 1.10184 13.972 1.01803 13.098C0.936885 12.25 1.1447 11.3498 1.84616 10.7747C2.09807 9.97534 2.5868 8.4405 3.06979 6.96224C3.59658 5.34994 4.14583 3.71844 4.3608 3.25618C4.68344 2.56265 5.10288 2.01575 5.68893 1.79134ZM13.7807 12.2572C12.4881 11.0094 10.9295 11.0284 10.2534 11.7288C9.57757 12.4294 9.61347 13.987 10.9057 15.2347C12.1981 16.4823 13.7567 16.464 14.4331 15.764C15.1092 15.0636 15.0731 13.505 13.7807 12.2572ZM3.88229 11.8841C3.3528 11.6973 2.99993 11.7759 2.80905 11.9251C2.61843 12.0746 2.45867 12.3971 2.51217 12.9554C2.5648 13.5041 2.82326 14.1742 3.31491 14.8031C3.8066 15.4319 4.39472 15.8452 4.91452 16.0286C5.44348 16.2152 5.79586 16.1376 5.98678 15.9886C6.17756 15.8394 6.33808 15.5159 6.28463 14.9574C6.23201 14.4087 5.97256 13.7385 5.48092 13.1097C4.98934 12.481 4.40201 12.0676 3.88229 11.8841ZM11.9194 14.7786C12.0925 14.5637 12.4074 14.5295 12.6225 14.7025C12.661 14.7334 12.7453 14.7848 12.8491 14.8284C12.8979 14.849 12.9439 14.8642 12.9819 14.8743C13.0173 14.8837 13.0359 14.8858 13.0395 14.8861C13.3156 14.8914 13.5361 15.1197 13.5307 15.3958C13.5253 15.6718 13.2969 15.8912 13.021 15.8861C12.823 15.8822 12.6163 15.8145 12.4614 15.7493C12.2997 15.6813 12.1271 15.5876 11.9956 15.4818C11.7806 15.3087 11.7465 14.9937 11.9194 14.7786ZM3.50924 12.1361L3.57955 12.1497L3.6733 12.1878C3.88055 12.2932 3.99317 12.533 3.92916 12.7659C3.90752 12.8445 3.8653 12.9118 3.81393 12.9681C3.81694 12.9884 3.81922 13.0124 3.82467 13.0384C3.87694 13.2878 4.02405 13.6447 4.28561 13.9671C4.45941 14.1814 4.42741 14.4972 4.21334 14.6712C3.99906 14.8451 3.68332 14.812 3.50924 14.598C3.14412 14.1481 2.92999 13.6431 2.84616 13.2425C2.80618 13.0513 2.78536 12.8362 2.82565 12.6468C2.84499 12.5561 2.89269 12.4054 3.02291 12.2845C3.16403 12.1538 3.34353 12.1108 3.50924 12.1361ZM11.0669 11.7454C11.2971 11.7138 11.5265 11.8478 11.6069 12.0755C11.6924 12.3193 11.576 12.5828 11.3471 12.6908C11.3428 12.696 11.3346 12.705 11.3256 12.721C11.2978 12.7706 11.2672 12.8577 11.2592 12.9779C11.244 13.2098 11.3168 13.5618 11.6518 13.9544C11.831 14.1644 11.806 14.4802 11.5962 14.6595C11.3862 14.8387 11.0704 14.8145 10.8911 14.6048C10.4014 14.0312 10.2273 13.4258 10.2612 12.9115C10.2779 12.6589 10.3462 12.4249 10.4546 12.2318C10.5444 12.0719 10.6842 11.9039 10.8803 11.807L10.9672 11.7699L11.0669 11.7454ZM5.92428 5.79427C5.92428 5.2357 6.35593 5.23572 6.35592 5.79427C6.35593 6.35264 6.57034 6.69727 6.64401 6.78743C6.71763 6.87749 6.84534 7.15945 7.30416 7.1595C7.76238 7.15988 7.76238 7.65527 7.30416 7.65559C6.84534 7.65559 6.77205 7.872 6.64401 8.02864C6.51604 8.18525 6.35794 8.41728 6.35788 8.96126C6.35788 9.50588 5.92623 9.51978 5.92623 8.96126C5.92613 8.40366 5.65582 8.067 5.62448 8.02864C5.59372 7.99102 5.27579 7.65582 4.91647 7.65559C4.557 7.65559 4.56049 7.1595 4.91647 7.1595C5.27178 7.15932 5.50406 6.87024 5.57174 6.78743C5.63909 6.70504 5.92426 6.3528 5.92428 5.79427Z" 50 50 + fill="currentColor" 51 51 + /> 52 52 + </svg> 53 53 + ); 54 54 + }; 55 55 + 56 56 + export const ReaderRead = (props: Props) => { 57 57 + return ( 58 58 + <svg 59 59 + width="24" 60 60 + height="24" 61 61 + viewBox="0 0 24 24" 62 62 + fill="none" 63 63 + xmlns="http://www.w3.org/2000/svg" 64 64 + {...props} 65 65 + > 66 66 + <path 67 67 + d="M5.3939 5.10098C6.94949 3.45228 9.5127 3.07248 11.1166 4.58535C11.8822 5.30769 12.2281 6.27357 12.2132 7.26504C12.4456 7.20657 12.6982 7.16362 12.9515 7.15469C13.2516 7.14413 13.6091 7.17916 13.9379 7.34707C14.6404 7.7064 15.0081 8.33088 15.142 8.9418C16.5998 8.30589 18.3571 8.43563 19.7631 9.42032C21.8907 10.9106 22.4521 13.8268 20.9711 15.9418C20.5099 16.6002 19.9071 17.0981 19.2328 17.4281C19.2725 17.8704 19.3144 18.3372 19.389 18.8285C19.4945 19.5226 19.6505 20.0808 19.8754 20.4223C20.103 20.7681 20.0071 21.2335 19.6615 21.4613C19.3156 21.6891 18.8503 21.5932 18.6224 21.2475C18.2076 20.6174 18.0171 19.7803 17.9066 19.0531C17.8466 18.658 17.8029 18.2404 17.7679 17.8647C16.6347 18.0087 15.441 17.7451 14.4291 17.0365C12.3744 15.5975 11.7805 12.8288 13.0756 10.7358L11.4466 9.68106C11.2965 9.90817 11.1261 10.1258 10.9349 10.3285C9.3795 11.9772 6.81619 12.3575 5.21226 10.8451C4.85829 10.5112 4.59328 10.1249 4.41246 9.70841C4.12505 9.84619 3.7775 10.0195 3.40464 10.2016C3.08808 10.3561 2.76192 10.5118 2.47203 10.6361C2.20246 10.7518 1.89418 10.872 1.63999 10.9145C1.23165 10.9825 0.845053 10.7066 0.776711 10.2982C0.7085 9.88981 0.984507 9.50334 1.39292 9.43497C1.44871 9.42563 1.60626 9.37614 1.8812 9.25821C2.1356 9.14908 2.43339 9.00579 2.74644 8.85294C3.20082 8.63107 3.71706 8.37021 4.11265 8.19278C4.12147 7.09833 4.57394 5.97021 5.3939 5.10098ZM18.9027 10.6488C17.7826 9.86431 16.3636 9.87558 15.3129 10.5473C16.188 11.0878 17.0483 11.6416 17.7211 12.0824C18.1169 12.3418 18.449 12.5624 18.682 12.7182C18.7984 12.796 18.8907 12.8585 18.9535 12.9008C18.9844 12.9216 19.0085 12.9377 19.0248 12.9486C19.0328 12.9541 19.0392 12.9585 19.0433 12.9613C19.0454 12.9627 19.0471 12.9645 19.0482 12.9652H19.0492V12.9662C19.2776 13.1212 19.3377 13.4321 19.183 13.6606C19.0279 13.8888 18.7161 13.9473 18.4877 13.7924L18.4867 13.7934C18.4857 13.7927 18.4847 13.7908 18.4828 13.7895C18.4789 13.7868 18.4729 13.7829 18.4652 13.7777C18.4493 13.767 18.4248 13.7507 18.3939 13.7299C18.3771 13.7186 18.3582 13.7059 18.3373 13.6918C18.3409 13.7007 18.3455 13.7094 18.349 13.7182C18.4391 13.9478 18.4846 14.151 18.514 14.3129C18.5488 14.5038 18.5528 14.5587 18.5697 14.6166C18.6475 14.8814 18.4955 15.1597 18.2308 15.2377C17.9663 15.3152 17.6888 15.1642 17.6107 14.8998C17.5741 14.7753 17.5483 14.5898 17.5306 14.4926C17.5076 14.366 17.4762 14.2309 17.4183 14.0834C17.3064 13.7986 17.0738 13.4138 16.516 12.9633L14.3353 11.5512C13.4914 12.949 13.8764 14.8184 15.2894 15.808C16.7626 16.8395 18.752 16.4941 19.7416 15.0815C20.731 13.6686 20.3757 11.6807 18.9027 10.6488ZM10.0873 5.67715C9.23327 4.87156 7.62151 4.92548 6.48472 6.13028C5.34805 7.33535 5.38756 8.94767 6.24156 9.75333C7.09567 10.5587 8.70742 10.5041 9.8441 9.29923C9.97166 9.16397 10.0826 9.02211 10.181 8.87833C8.43436 8.11224 8.03413 8.1053 7.73863 8.15372C7.49417 8.19384 7.43342 8.19931 7.34215 8.21719C7.27583 8.2302 7.20421 8.24884 7.00426 8.31387C6.74185 8.39904 6.45989 8.25486 6.37437 7.99258C6.28923 7.73019 6.43242 7.44723 6.69469 7.36172C6.90022 7.29488 7.02051 7.26011 7.14976 7.23477C7.25177 7.2148 7.38857 7.1961 7.5648 7.16739L7.50523 7.1293C7.27353 6.9792 7.20675 6.66966 7.3568 6.43789C7.50691 6.20642 7.81653 6.14058 8.0482 6.29043L10.6127 7.95059C10.8517 7.07384 10.6453 6.20394 10.0873 5.67715ZM13.0043 8.65372C12.9388 8.65604 12.868 8.66411 12.7933 8.67618L13.6478 9.14883C13.5794 8.94601 13.4513 8.7833 13.2552 8.68301C13.2369 8.67373 13.1626 8.64818 13.0043 8.65372Z" 33 68 fill="currentColor" 34 69 /> 35 70 </svg>

+3 -4

components/Icons/ReaderSmall.tsx

··· 3 3 export const ReaderUnreadSmall = (props: Props) => { 4 4 return ( 5 5 <svg 6 6 - width="24" 6 6 + width="25" 7 7 height="24" 8 8 - viewBox="0 0 24 24" 8 8 + viewBox="0 0 25 24" 9 9 fill="none" 10 10 xmlns="http://www.w3.org/2000/svg" 11 11 - {...props} 12 11 > 13 12 <path 14 14 - d="M2.73574 18.3601C2.73594 17.677 3.32247 17.677 3.32266 18.3601C3.32265 19.0436 3.61416 19.4657 3.71426 19.5759C3.81434 19.6861 3.98716 20.0308 4.61074 20.031C5.23458 20.031 5.23458 20.6384 4.61074 20.6384C3.98718 20.6385 3.88832 20.9028 3.71426 21.0945C3.54023 21.2861 3.32466 21.5701 3.32461 22.2361C3.32461 22.9025 2.7377 22.9195 2.7377 22.2361C2.73762 21.5527 2.36936 21.1405 2.32754 21.0945C2.28512 21.0478 1.853 20.6384 1.36465 20.6384C0.876077 20.6383 0.880828 20.0311 1.36465 20.031C1.84797 20.031 2.16417 19.6773 2.25625 19.5759C2.34783 19.4751 2.73574 19.0436 2.73574 18.3601ZM18.725 14.1091C18.7252 13.4672 19.2219 13.4672 19.2221 14.1091C19.2221 14.7515 19.4685 15.1481 19.5531 15.2517C19.6378 15.3554 19.7838 15.6792 20.3109 15.6794C20.8386 15.6795 20.8386 16.2507 20.3109 16.2507C19.7836 16.2508 19.7003 16.4993 19.5531 16.6794C19.406 16.8595 19.2231 17.126 19.223 17.7517C19.223 18.378 18.727 18.394 18.727 17.7517C18.7268 17.1115 18.4172 16.7246 18.3803 16.6794C18.3449 16.6361 17.9791 16.2509 17.5658 16.2507C17.1524 16.2507 17.1564 15.6794 17.5658 15.6794C17.9747 15.6792 18.2421 15.3467 18.3197 15.2517C18.3972 15.1569 18.725 14.7515 18.725 14.1091ZM6.01504 2.10422C6.64672 1.86255 7.22531 2.08061 7.63613 2.35715C8.04078 2.62974 8.39493 3.02782 8.6791 3.38937C8.96575 3.75413 9.23277 4.15115 9.4291 4.42941C9.66781 4.76781 9.58772 5.23649 9.24942 5.47531C8.91117 5.71399 8.44342 5.63262 8.20449 5.29465C7.98157 4.97871 7.75345 4.63961 7.49844 4.31516C7.24118 3.98794 7.00509 3.7411 6.79922 3.60227C6.70062 3.53584 6.63296 3.51125 6.59707 3.50363C6.57086 3.49816 6.56136 3.5017 6.55117 3.50559C6.51034 3.52147 6.30941 3.63402 6.04531 4.20187C5.92473 4.46131 5.6231 5.3269 5.2582 6.41965C5.18458 6.44275 5.13122 6.45949 5.12442 6.4675C5.12096 6.47173 5.11732 6.47502 5.11465 6.47824C4.82271 6.50596 4.53899 6.63022 4.3207 6.85715C4.08293 7.1045 3.97509 7.42056 3.97403 7.7175C3.97307 8.01459 4.07883 8.33353 4.31875 8.58371C4.37493 8.64225 4.43571 8.69333 4.49942 8.73801C4.28198 9.41064 4.07702 10.0582 3.90371 10.6013C4.17677 10.6273 4.44785 10.6908 4.70645 10.782C5.48747 11.0575 6.25304 11.6133 6.87539 12.363C7.04578 12.2775 7.22917 12.2287 7.41543 12.2058C7.85216 12.1521 8.2996 12.238 8.725 12.4275C8.84684 11.905 9.09849 11.4161 9.50039 10.9997C10.9871 9.45971 13.5373 9.9353 15.1488 11.4909C15.2814 11.6189 15.406 11.7542 15.5238 11.8943C15.6783 11.406 15.8673 10.8112 16.0648 10.1833C16.56 8.6093 17.1137 6.83716 17.3559 6.02316C17.6591 5.00414 18.0908 4.23252 18.7084 3.80344C19.383 3.33506 20.1254 3.37467 20.765 3.65305C21.3731 3.91782 21.9314 4.40937 22.4086 4.9509C22.8945 5.5023 23.3404 6.15682 23.7123 6.8132C23.9161 7.1734 23.7901 7.63045 23.4301 7.83469C23.0699 8.0388 22.612 7.91243 22.4076 7.55246C22.0747 6.96499 21.6866 6.39942 21.2836 5.94211C20.8721 5.47527 20.4858 5.16816 20.1664 5.02902C19.8785 4.90368 19.7094 4.93407 19.5629 5.03586C19.3593 5.17764 19.0585 5.55655 18.7924 6.4509C18.5462 7.27848 17.9894 9.06251 17.4955 10.6325C17.2481 11.419 17.0154 12.1546 16.8451 12.6931C16.76 12.9622 16.6914 13.1829 16.643 13.3357C16.6189 13.4117 16.6001 13.471 16.5873 13.5114C16.5809 13.5317 16.575 13.5479 16.5717 13.5583C16.5702 13.563 16.5686 13.5665 16.5678 13.5691V13.572L16.5668 13.573C16.5529 13.6167 16.5338 13.6578 16.5131 13.697C16.8827 14.9111 16.7312 16.1929 15.8383 17.1179C14.3515 18.6579 11.8014 18.1824 10.1898 16.6267C9.51025 15.9705 9.01744 15.1405 8.78555 14.2849C8.38066 13.8654 7.97524 13.7099 7.71035 13.696C7.92323 14.1726 8.05891 14.6578 8.10391 15.1267C8.18663 15.9904 7.96998 16.9098 7.23672 17.4831C6.5035 18.0562 5.55974 18.0451 4.7416 17.7566C3.91355 17.4644 3.10015 16.8593 2.45938 16.0398C1.81865 15.2203 1.42795 14.2849 1.34414 13.4109C1.263 12.5629 1.47081 11.6627 2.17227 11.0876C2.42418 10.2882 2.91291 8.75338 3.3959 7.27512C3.92269 5.66282 4.47194 4.03132 4.68692 3.56906C5.00955 2.87553 5.42899 2.32864 6.01504 2.10422ZM14.1068 12.57C12.8142 11.3223 11.2556 11.3413 10.5795 12.0417C9.90368 12.7423 9.93958 14.2999 11.2318 15.5476C12.5242 16.7952 14.0828 16.7769 14.7592 16.0769C15.4353 15.3765 15.3992 13.8179 14.1068 12.57ZM4.2084 12.197C3.67891 12.0102 3.32604 12.0888 3.13516 12.238C2.94454 12.3875 2.78478 12.71 2.83828 13.2683C2.89091 13.8169 3.14937 14.4871 3.64102 15.1159C4.13271 15.7448 4.72083 16.1581 5.24063 16.3415C5.76959 16.5281 6.12197 16.4505 6.31289 16.3015C6.50367 16.1522 6.66419 15.8287 6.61074 15.2702C6.55812 14.7216 6.29867 14.0514 5.80703 13.4226C5.31545 12.7939 4.72812 12.3805 4.2084 12.197ZM12.2455 15.0915C12.4186 14.8766 12.7336 14.8424 12.9486 15.0154C12.9871 15.0463 13.0714 15.0977 13.1752 15.1413C13.224 15.1618 13.27 15.1771 13.308 15.1872C13.3434 15.1966 13.362 15.1986 13.3656 15.1989C13.6417 15.2043 13.8622 15.4326 13.8568 15.7087C13.8514 15.9846 13.623 16.2041 13.3471 16.1989C13.1491 16.1951 12.9425 16.1273 12.7875 16.0622C12.6258 15.9942 12.4532 15.9004 12.3217 15.7946C12.1068 15.6215 12.0726 15.3066 12.2455 15.0915ZM3.83535 12.4489L3.90567 12.4626L3.99942 12.5007C4.20667 12.6061 4.31928 12.8459 4.25528 13.0788C4.23363 13.1573 4.19141 13.2246 4.14004 13.281C4.14305 13.3013 4.14533 13.3252 4.15078 13.3513C4.20305 13.6007 4.35016 13.9576 4.61172 14.28C4.78552 14.4943 4.75352 14.8101 4.53945 14.9841C4.32517 15.158 4.00943 15.1249 3.83535 14.9109C3.47023 14.4609 3.2561 13.956 3.17227 13.5554C3.13229 13.3642 3.11147 13.1491 3.15176 12.9597C3.1711 12.8689 3.2188 12.7183 3.34903 12.5974C3.49014 12.4666 3.66964 12.4237 3.83535 12.4489ZM11.393 12.0583C11.6232 12.0267 11.8527 12.1607 11.933 12.3884C12.0186 12.6322 11.9021 12.8956 11.6732 13.0036C11.6689 13.0089 11.6608 13.0179 11.6518 13.0339C11.6239 13.0835 11.5933 13.1706 11.5854 13.2907C11.5701 13.5227 11.6429 13.8747 11.9779 14.2673C12.1572 14.4773 12.1321 14.7931 11.9223 14.9724C11.7123 15.1516 11.3965 15.1274 11.2172 14.9177C10.7276 14.3441 10.5534 13.7387 10.5873 13.2243C10.604 12.9718 10.6723 12.7377 10.7807 12.5446C10.8705 12.3848 11.0103 12.2168 11.2064 12.1198L11.2934 12.0827L11.393 12.0583ZM6.25039 6.10715C6.25039 5.54858 6.68204 5.5486 6.68203 6.10715C6.68205 6.66552 6.89645 7.01015 6.97012 7.10031C7.04374 7.19038 7.17145 7.47233 7.63028 7.47238C8.08849 7.47276 8.08849 7.96815 7.63028 7.96848C7.17145 7.96848 7.09816 8.18488 6.97012 8.34152C6.84216 8.49813 6.68405 8.73016 6.68399 9.27414C6.68399 9.81876 6.25235 9.83266 6.25235 9.27414C6.25224 8.71654 5.98193 8.37988 5.95059 8.34152C5.91984 8.3039 5.6019 7.9687 5.24258 7.96848C4.88311 7.96848 4.8866 7.47238 5.24258 7.47238C5.59789 7.4722 5.83017 7.18312 5.89785 7.10031C5.9652 7.01792 6.25037 6.66568 6.25039 6.10715Z" 13 13 + d="M2.82968 18.0472C2.82987 17.3641 3.41641 17.3642 3.41659 18.0472C3.41658 18.7307 3.7081 19.1528 3.80819 19.263C3.90827 19.3732 4.08109 19.7179 4.70468 19.7181C5.32851 19.7182 5.32851 20.3255 4.70468 20.3255C4.08111 20.3256 3.98225 20.5899 3.80819 20.7816C3.63417 20.9732 3.41859 21.2572 3.41854 21.9232C3.41854 22.5896 2.83163 22.6066 2.83163 21.9232C2.83155 21.2398 2.4633 20.8276 2.42147 20.7816C2.37905 20.735 1.94693 20.3255 1.45858 20.3255C0.97001 20.3254 0.974762 19.7182 1.45858 19.7181C1.9419 19.7181 2.25811 19.3644 2.35018 19.263C2.44176 19.1622 2.82968 18.7307 2.82968 18.0472ZM18.8189 13.7962C18.8191 13.1543 19.3158 13.1543 19.316 13.7962C19.316 14.4386 19.5624 14.8352 19.6471 14.9388C19.7317 15.0425 19.8778 15.3663 20.4049 15.3665C20.9325 15.3666 20.9325 15.9378 20.4049 15.9378C19.8775 15.9379 19.7943 16.1864 19.6471 16.3665C19.4999 16.5466 19.3171 16.8131 19.317 17.4388C19.317 18.0651 18.8209 18.0811 18.8209 17.4388C18.8207 16.7986 18.5111 16.4117 18.4742 16.3665C18.4388 16.3233 18.073 15.9381 17.6598 15.9378C17.2464 15.9378 17.2504 15.3665 17.6598 15.3665C18.0686 15.3663 18.336 15.0338 18.4137 14.9388C18.4911 14.844 18.8189 14.4386 18.8189 13.7962ZM6.10897 1.79134C6.74065 1.54967 7.31924 1.76772 7.73007 2.04427C8.13472 2.31686 8.48886 2.71494 8.77304 3.07649C9.05968 3.44125 9.32671 3.83827 9.52304 4.11653C9.76174 4.45493 9.68165 4.92361 9.34335 5.16243C9.0051 5.40111 8.53735 5.31974 8.29843 4.98177C8.07551 4.66583 7.84739 4.32673 7.59237 4.00227C7.33511 3.67506 7.09903 3.42822 6.89315 3.28938C6.79455 3.22296 6.72689 3.19837 6.69101 3.19075C6.66479 3.18528 6.65529 3.18881 6.64511 3.1927C6.60428 3.20859 6.40334 3.32114 6.13925 3.88899C6.01867 4.14843 5.71704 5.01402 5.35214 6.10677C5.27851 6.12987 5.22515 6.14661 5.21835 6.15462C5.21489 6.15884 5.21125 6.16214 5.20858 6.16536C4.91664 6.19308 4.63293 6.31734 4.41464 6.54427C4.17686 6.79162 4.06902 7.10768 4.06796 7.40462C4.067 7.70171 4.17276 8.02065 4.41268 8.27083C4.46886 8.32937 4.52964 8.38044 4.59335 8.42513C4.37591 9.09776 4.17095 9.74532 3.99765 10.2884C4.2707 10.3144 4.54179 10.3779 4.80038 10.4691C5.5814 10.7446 6.34697 11.3005 6.96933 12.0501C7.13971 11.9646 7.3231 11.9158 7.50936 11.8929C7.9461 11.8392 8.39353 11.9251 8.81893 12.1146C8.94078 11.5922 9.19242 11.1032 9.59433 10.6868C11.081 9.14683 13.6312 9.62241 15.2428 11.1781C15.3753 11.306 15.4999 11.4413 15.6178 11.5814C15.7723 11.0931 15.9613 10.4983 16.1588 9.87044C16.6539 8.29641 17.2076 6.52428 17.4498 5.71028C17.7531 4.69126 18.1848 3.91964 18.8023 3.49056C19.4769 3.02218 20.2194 3.06179 20.859 3.34017C21.4671 3.60494 22.0253 4.09649 22.5025 4.63802C22.9884 5.18942 23.4343 5.84393 23.8062 6.50032C24.0101 6.86052 23.884 7.31757 23.524 7.52181C23.1638 7.72592 22.7059 7.59954 22.5016 7.23958C22.1686 6.6521 21.7805 6.08653 21.3775 5.62923C20.9661 5.16239 20.5798 4.85528 20.2603 4.71614C19.9724 4.5908 19.8033 4.62119 19.6568 4.72298C19.4532 4.86476 19.1524 5.24367 18.8863 6.13802C18.6401 6.9656 18.0833 8.74963 17.5894 10.3197C17.3421 11.1061 17.1093 11.8418 16.9391 12.3802C16.854 12.6494 16.7853 12.87 16.7369 13.0228C16.7128 13.0988 16.6941 13.1581 16.6812 13.1986C16.6748 13.2188 16.6689 13.235 16.6656 13.2454C16.6641 13.2501 16.6625 13.2536 16.6617 13.2562V13.2591L16.6607 13.2601C16.6469 13.3038 16.6277 13.3449 16.607 13.3841C16.9766 14.5982 16.8251 15.8801 15.9322 16.805C14.4454 18.345 11.8953 17.8696 10.2838 16.3138C9.60418 15.6576 9.11137 14.8276 8.87948 13.972C8.47459 13.5525 8.06917 13.397 7.80429 13.3831C8.01717 13.8598 8.15284 14.345 8.19784 14.8138C8.28056 15.6775 8.06391 16.5969 7.33065 17.1702C6.59744 17.7433 5.65367 17.7322 4.83554 17.4437C4.00748 17.1515 3.19408 16.5464 2.55331 15.7269C1.91258 14.9074 1.52188 13.972 1.43808 13.098C1.35693 12.25 1.56474 11.3498 2.2662 10.7747C2.51811 9.97534 3.00684 8.4405 3.48983 6.96224C4.01662 5.34994 4.56587 3.71844 4.78085 3.25618C5.10348 2.56265 5.52293 2.01575 6.10897 1.79134ZM14.2008 12.2572C12.9082 11.0094 11.3496 11.0284 10.6734 11.7288C9.99762 12.4294 10.0335 13.987 11.3258 15.2347C12.6181 16.4823 14.1767 16.464 14.8531 15.764C15.5292 15.0636 15.4931 13.505 14.2008 12.2572ZM4.30233 11.8841C3.77284 11.6973 3.41998 11.7759 3.22909 11.9251C3.03847 12.0746 2.87871 12.3971 2.93222 12.9554C2.98485 13.5041 3.24331 14.1742 3.73495 14.8031C4.22664 15.4319 4.81476 15.8452 5.33456 16.0286C5.86353 16.2152 6.2159 16.1376 6.40683 15.9886C6.59761 15.8394 6.75812 15.5159 6.70468 14.9574C6.65205 14.4087 6.3926 13.7385 5.90097 13.1097C5.40938 12.481 4.82205 12.0676 4.30233 11.8841ZM12.3394 14.7786C12.5125 14.5637 12.8275 14.5295 13.0426 14.7025C13.081 14.7334 13.1653 14.7848 13.2691 14.8284C13.318 14.849 13.3639 14.8642 13.4019 14.8743C13.4373 14.8837 13.456 14.8858 13.4596 14.8861C13.7357 14.8914 13.9561 15.1197 13.9508 15.3958C13.9454 15.6718 13.7169 15.8912 13.441 15.8861C13.243 15.8822 13.0364 15.8145 12.8814 15.7493C12.7197 15.6813 12.5471 15.5876 12.4156 15.4818C12.2007 15.3087 12.1665 14.9937 12.3394 14.7786ZM3.92929 12.1361L3.9996 12.1497L4.09335 12.1878C4.3006 12.2932 4.41321 12.533 4.34921 12.7659C4.32756 12.8445 4.28534 12.9118 4.23397 12.9681C4.23698 12.9884 4.23927 13.0124 4.24472 13.0384C4.29698 13.2878 4.4441 13.6447 4.70565 13.9671C4.87945 14.1814 4.84746 14.4972 4.63339 14.6712C4.41911 14.8451 4.10336 14.812 3.92929 14.598C3.56417 14.1481 3.35003 13.6431 3.2662 13.2425C3.22622 13.0513 3.2054 12.8362 3.24569 12.6468C3.26503 12.5561 3.31274 12.4054 3.44296 12.2845C3.58407 12.1538 3.76357 12.1108 3.92929 12.1361ZM11.4869 11.7454C11.7171 11.7138 11.9466 11.8478 12.0269 12.0755C12.1125 12.3193 11.996 12.5828 11.7672 12.6908C11.7629 12.696 11.7547 12.705 11.7457 12.721C11.7178 12.7706 11.6872 12.8577 11.6793 12.9779C11.6641 13.2098 11.7368 13.5618 12.0719 13.9544C12.2511 14.1644 12.226 14.4802 12.0162 14.6595C11.8063 14.8387 11.4905 14.8145 11.3111 14.6048C10.8215 14.0312 10.6473 13.4258 10.6812 12.9115C10.698 12.6589 10.7662 12.4249 10.8746 12.2318C10.9645 12.0719 11.1042 11.9039 11.3004 11.807L11.3873 11.7699L11.4869 11.7454ZM6.34433 5.79427C6.34433 5.2357 6.77597 5.23572 6.77597 5.79427C6.77598 6.35264 6.99039 6.69727 7.06405 6.78743C7.13767 6.87749 7.26539 7.15945 7.72421 7.1595C8.18243 7.15988 8.18243 7.65527 7.72421 7.65559C7.26539 7.65559 7.19209 7.872 7.06405 8.02864C6.93609 8.18525 6.77798 8.41728 6.77792 8.96126C6.77792 9.50588 6.34628 9.51978 6.34628 8.96126C6.34618 8.40366 6.07586 8.067 6.04452 8.02864C6.01377 7.99102 5.69583 7.65582 5.33651 7.65559C4.97705 7.65559 4.98054 7.1595 5.33651 7.1595C5.69183 7.15932 5.92411 6.87024 5.99179 6.78743C6.05914 6.70504 6.3443 6.3528 6.34433 5.79427Z" 15 14 fill="currentColor" 16 15 /> 17 16 </svg>

+37

components/Icons/RecommendTiny.tsx

··· 1 1 + import { Props } from "./Props"; 2 2 + 3 3 + export const RecommendTinyFilled = (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 + {...props} 12 12 + > 13 13 + <path 14 14 + d="M13.8218 8.85542C13.9838 8.63176 14.2964 8.58118 14.5201 8.74312C14.7433 8.90516 14.7932 9.21786 14.6314 9.44136C12.9671 11.7399 10.7811 13.1142 9.07472 14.0947C8.83547 14.2321 8.52981 14.1491 8.3921 13.9101C8.25463 13.6707 8.33728 13.365 8.57667 13.2275C10.2589 12.2608 12.2881 10.9736 13.8218 8.85542ZM9.09327 2.90525C10.0113 2.2003 11.4161 2.21431 12.2886 2.61521C13.0365 2.95905 13.6929 3.5946 14.0044 4.62106C14.2614 5.46809 14.2169 6.28576 14.0044 7.17867C13.4531 9.49467 10.1475 11.7776 8.22413 12.8828C8.15152 12.9245 8.05431 12.9453 7.97315 12.9453C7.89219 12.9453 7.80343 12.9243 7.73096 12.8828C5.80749 11.7776 2.50174 9.49385 1.95065 7.1777C1.7383 6.28491 1.69376 5.46798 1.95065 4.62106C2.26221 3.59471 2.91764 2.95906 3.66551 2.61521C4.53812 2.21415 5.94374 2.19992 6.86181 2.90525C7.4145 3.32999 7.72613 3.72603 7.97315 4.14939C8.22018 3.72604 8.5406 3.32998 9.09327 2.90525ZM4.55418 3.84079C4.44015 3.58958 4.14441 3.47805 3.89305 3.59177C2.93793 4.0246 2.4787 5.35564 2.85105 6.64059C2.9282 6.90532 3.20525 7.05713 3.47019 6.98043C3.73523 6.9035 3.88869 6.62638 3.81199 6.36129C3.52801 5.38087 3.94973 4.66317 4.30516 4.50192C4.55654 4.38789 4.6681 4.09224 4.55418 3.84079Z" 15 15 + fill="currentColor" 16 16 + /> 17 17 + </svg> 18 18 + ); 19 19 + }; 20 20 + 21 21 + export const RecommendTinyEmpty = (props: Props) => { 22 22 + return ( 23 23 + <svg 24 24 + width="16" 25 25 + height="16" 26 26 + viewBox="0 0 16 16" 27 27 + fill="none" 28 28 + xmlns="http://www.w3.org/2000/svg" 29 29 + {...props} 30 30 + > 31 31 + <path 32 32 + d="M13.8215 8.85505C13.9834 8.63149 14.2961 8.58084 14.5197 8.74275C14.7432 8.90468 14.7928 9.21739 14.631 9.44099C12.9668 11.7395 10.7808 13.1138 9.0744 14.0943C8.83501 14.2318 8.52937 14.1491 8.39178 13.9097C8.25431 13.6703 8.33696 13.3647 8.57635 13.2271C10.2586 12.2605 12.2878 10.9733 13.8215 8.85505ZM4.12127 2.44392C5.05035 2.20462 6.17272 2.3143 7.04412 3.04744C7.33889 3.29547 7.62399 3.64884 7.85369 3.96833C7.89451 4.02512 7.93345 4.08237 7.97186 4.13826C8.22436 3.76381 8.53885 3.3457 8.86248 3.06501C9.80388 2.24888 11.1891 2.16939 12.1564 2.56501C12.9693 2.89763 13.663 3.49593 14.0002 4.60701C14.267 5.48669 14.2598 6.26139 14.0461 7.15974C13.7527 8.39225 12.7396 9.53682 11.6691 10.4703C10.5802 11.4198 9.3429 12.2265 8.47772 12.7681C8.47247 12.7714 8.46646 12.7748 8.46111 12.7779C8.43136 12.795 8.369 12.8315 8.30096 12.8619C8.2405 12.8889 8.11991 12.937 7.97576 12.9371C7.82229 12.9372 7.7007 12.8832 7.63885 12.8521C7.6045 12.8349 7.57372 12.8176 7.55291 12.8052C7.52605 12.7893 7.52018 12.7855 7.50701 12.7779C7.50235 12.7752 7.49792 12.7719 7.49334 12.7691C6.59506 12.2129 5.35778 11.3987 4.27654 10.4439C3.21273 9.50447 2.21958 8.35999 1.92693 7.13044C1.71321 6.23218 1.70502 5.4352 1.97186 4.55525C2.31285 3.43128 3.22341 2.67532 4.12127 2.44392ZM6.40057 3.81306C5.82954 3.33259 5.06002 3.23404 4.37029 3.41169C3.79433 3.56026 3.16381 4.07131 2.92889 4.84529C2.72085 5.53135 2.72051 6.14631 2.89959 6.899C3.11654 7.81042 3.90364 8.77988 4.93865 9.69392C5.94258 10.5805 7.10507 11.3507 7.98358 11.8961C8.83657 11.3611 9.99989 10.5988 11.0119 9.71638C12.0571 8.8049 12.8571 7.83679 13.0734 6.9283C13.2523 6.17606 13.2512 5.58411 13.0431 4.89802C12.8044 4.11102 12.3496 3.72381 11.7775 3.48982C11.1013 3.21328 10.1298 3.29025 9.51776 3.82087C9.10331 4.18037 8.63998 4.9218 8.40545 5.3238C8.3158 5.4772 8.1515 5.57185 7.97381 5.57185C7.79617 5.57171 7.63172 5.47723 7.54217 5.3238C7.43363 5.13777 7.25216 4.84479 7.04119 4.55134C6.82572 4.25167 6.5988 3.97993 6.40057 3.81306Z" 33 33 + fill="currentColor" 34 34 + /> 35 35 + </svg> 36 36 + ); 37 37 + };

-19

components/Icons/ShareTiny.tsx

··· 1 1 - import { Props } from "./Props"; 2 2 - 3 3 - export const ShareTiny = (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 - {...props} 12 12 - > 13 13 - <path 14 14 - d="M14.294 2.09457C14.4677 2.02691 14.6645 2.06158 14.8048 2.18441C14.9451 2.30734 15.0054 2.4983 14.961 2.67953L12.8145 11.4481C12.7536 11.6967 12.5144 11.8588 12.2608 11.8241L7.56942 11.1766L5.33211 13.7664C5.20836 13.9096 5.01456 13.9711 4.83114 13.9246C4.6477 13.8781 4.50644 13.7316 4.4659 13.5467L3.68368 9.98324L1.212 8.00863C1.07265 7.89707 1.00353 7.71931 1.03035 7.54281C1.05731 7.36628 1.1765 7.21715 1.34285 7.15218L14.294 2.09457ZM4.70028 9.94417L5.12118 11.867L5.8409 10.2899L5.88094 10.2176C5.89632 10.1948 5.9137 10.1732 5.9327 10.1532L8.08407 7.8807L4.70028 9.94417ZM2.51375 7.76742L4.17391 9.09457L10.7677 5.07503C10.9816 4.9446 11.2595 4.99249 11.4171 5.18734C11.5746 5.38222 11.5631 5.66361 11.3907 5.84554L7.32723 10.1346L11.9493 10.7713L13.7598 3.37582L2.51375 7.76742Z" 15 15 - fill="currentColor" 16 16 - /> 17 17 - </svg> 18 18 - ); 19 19 - };

-19

components/Icons/TagSmall.tsx

··· 1 1 - import { Props } from "./Props"; 2 2 - 3 3 - export const TagSmall = (props: Props) => { 4 4 - return ( 5 5 - <svg 6 6 - width="24" 7 7 - height="24" 8 8 - viewBox="0 0 24 24" 9 9 - fill="none" 10 10 - xmlns="http://www.w3.org/2000/svg" 11 11 - {...props} 12 12 - > 13 13 - <path 14 14 - d="M6.72467 12.065C7.3108 11.6577 8.11602 11.8032 8.5235 12.3893C8.93088 12.9754 8.78635 13.7806 8.20026 14.1881C7.72319 14.5197 7.10087 14.4854 6.66608 14.1451C5.6484 14.4853 4.81236 15.2231 4.31256 16.1021C3.73575 17.1169 3.65902 18.2144 4.12213 19.0484C4.47731 19.6876 5.18264 20.0117 6.20514 20.0758C7.22138 20.1393 8.37845 19.9287 9.3399 19.6812C10.7978 19.3061 11.89 19.606 12.584 20.2672C12.9149 20.5824 13.1265 20.9561 13.2393 21.3121C13.3463 21.6497 13.3853 22.0412 13.2784 22.3863C13.1557 22.7818 12.7354 23.003 12.3399 22.8805C11.9689 22.7654 11.7507 22.3889 11.8262 22.0162L11.8419 21.9518C11.8386 21.9605 11.8509 21.8957 11.8096 21.7652C11.7675 21.6322 11.6837 21.4816 11.5489 21.3531C11.3113 21.127 10.7896 20.8563 9.71295 21.1334C8.70042 21.394 7.3632 21.6522 6.11139 21.5738C4.86592 21.4958 3.52842 21.0674 2.81158 19.7779C2.02826 18.368 2.24712 16.6994 3.00787 15.3609C3.68152 14.176 4.82017 13.1659 6.2403 12.7066C6.32636 12.4555 6.49002 12.2282 6.72467 12.065ZM19.9464 11.7271C20.2297 11.5306 20.6186 11.6012 20.8155 11.8844C21.0123 12.1677 20.9424 12.5565 20.6592 12.7535L13.0342 18.0504C12.5945 18.3558 12.0716 18.5201 11.5362 18.5201H6.94928C6.60423 18.5201 6.32351 18.2401 6.3233 17.8951C6.32356 17.5503 6.60351 17.2704 6.9483 17.2701L11.5362 17.2711C11.8166 17.2711 12.091 17.184 12.3214 17.024L19.9464 11.7271ZM14.669 1.39902C15.4624 0.847523 16.5528 1.04335 17.1046 1.83652L21.3663 7.9664C21.9179 8.75983 21.722 9.85015 20.9288 10.4019L12.252 16.4352C11.8686 16.7016 11.4113 16.8423 10.9444 16.8375L6.69147 16.7935C6.27743 16.7892 5.94511 16.4498 5.94928 16.0357C5.95367 15.6217 6.293 15.2893 6.70709 15.2935L10.96 15.3375C11.1156 15.339 11.2678 15.2915 11.3956 15.2027L20.0723 9.1705C20.1855 9.09164 20.2136 8.93615 20.1348 8.82285L15.8731 2.69296C15.7943 2.57985 15.6387 2.55191 15.5255 2.63046L6.88873 8.63437C6.74865 8.73176 6.64607 8.87505 6.59772 9.03867L5.64459 12.2682C5.52741 12.6654 5.11018 12.893 4.71295 12.776C4.31582 12.6587 4.08894 12.2415 4.20612 11.8443L5.15826 8.61386C5.30323 8.1228 5.6119 7.69523 6.03229 7.40292L14.669 1.39902ZM14.086 5.54355C14.1404 5.5563 14.1874 5.59162 14.2149 5.64023L15.0626 7.14706L16.5167 5.84726C16.5594 5.80926 16.6162 5.79077 16.6729 5.79745C16.7299 5.80432 16.782 5.83608 16.8145 5.88339L17.4844 6.85995C17.5169 6.90725 17.5277 6.96644 17.5137 7.02206C17.4996 7.07758 17.4621 7.12477 17.4112 7.15097L15.6739 8.03964L16.796 9.40097C16.8316 9.44425 16.8477 9.5017 16.8399 9.55722C16.832 9.61254 16.8009 9.66223 16.7549 9.69394L15.9327 10.2574C15.8866 10.289 15.8299 10.3001 15.7755 10.2877C15.7208 10.275 15.6731 10.2398 15.6456 10.191L14.7823 8.65976L13.8008 9.58456C13.7863 9.5982 13.7699 9.60998 13.752 9.61874L12.4571 10.2516L13.5762 11.6109C13.6119 11.6542 13.628 11.7116 13.6202 11.7672C13.6123 11.8225 13.5812 11.8722 13.5352 11.9039L12.713 12.4674C12.6669 12.499 12.6092 12.5101 12.5547 12.4977C12.5007 12.4851 12.4545 12.4501 12.4268 12.4019L11.5499 10.8697L10.1046 12.1646C10.0618 12.203 10.0044 12.2222 9.94733 12.2154C9.89045 12.2085 9.83922 12.1767 9.8067 12.1295L9.1358 11.1529C9.10345 11.1057 9.09259 11.0463 9.10651 10.9908C9.12065 10.9351 9.1588 10.8871 9.21002 10.8609L10.9376 9.97812L9.84381 8.63925C9.80844 8.59592 9.79291 8.53934 9.80084 8.48398C9.80882 8.42869 9.83975 8.37888 9.8858 8.34726L10.7081 7.78378C10.7543 7.75217 10.8117 7.74085 10.8663 7.75351C10.9208 7.76625 10.9677 7.80144 10.9952 7.85019L11.8419 9.35312L12.8985 8.3746C12.9131 8.36104 12.9293 8.34908 12.9473 8.34042L14.1612 7.75742L13.0645 6.43027C13.0288 6.38701 13.0128 6.33052 13.0206 6.27499C13.0284 6.21943 13.0593 6.16905 13.1055 6.1373L13.9278 5.57382C13.9739 5.54231 14.0316 5.53098 14.086 5.54355Z" 15 15 - fill="currentColor" 16 16 - /> 17 17 - </svg> 18 18 - ); 19 19 - };

-19

components/Icons/WriterSmall.tsx

··· 1 1 - import { Props } from "./Props"; 2 2 - 3 3 - export const WriterSmall = (props: Props) => { 4 4 - return ( 5 5 - <svg 6 6 - width="24" 7 7 - height="24" 8 8 - viewBox="0 0 24 24" 9 9 - fill="none" 10 10 - xmlns="http://www.w3.org/2000/svg" 11 11 - {...props} 12 12 - > 13 13 - <path 14 14 - d="M12.8808 22.0391C13.2948 22.0391 13.6304 22.3752 13.6308 22.7891C13.6306 23.203 13.2948 23.5389 12.8808 23.5391H4.92087C4.50702 23.5387 4.17194 23.203 4.17185 22.7891C4.17211 22.3751 4.5078 22.0391 4.92185 22.0391H12.8808ZM16.459 22.0391C16.8728 22.0392 17.2086 22.3752 17.209 22.7891C17.2088 23.2031 16.873 23.539 16.459 23.5391H14.7275C14.3134 23.5391 13.9777 23.2032 13.9775 22.7891C13.9778 22.3753 14.3128 22.0394 14.7265 22.0391H16.459ZM19.3564 22.0391C19.7705 22.0391 20.1071 22.3751 20.1074 22.7891C20.1073 23.2031 19.7714 23.5389 19.3574 23.5391H19.0635C18.6493 23.539 18.3135 23.2032 18.3135 22.7891C18.3137 22.3751 18.6495 22.0392 19.0635 22.0391H19.3564ZM10.1855 0.950222C10.3045 0.626539 10.6635 0.459613 10.9873 0.578152C11.3111 0.697051 11.4779 1.05701 11.3594 1.38089L9.4404 6.60842C11.2712 6.62023 12.534 6.984 13.6426 7.69924C13.9325 7.88633 14.016 8.2735 13.8291 8.5635C13.6419 8.85336 13.2548 8.93714 12.9648 8.75002C12.0834 8.18125 11.0469 7.85792 9.35154 7.85744C8.40737 7.85725 7.83011 8.29872 7.62888 8.71389C7.52952 8.91924 7.5134 9.12534 7.57224 9.31349C7.60658 9.42299 7.67297 9.54419 7.78611 9.66701C7.8081 9.64379 7.82999 9.6196 7.85251 9.59572C7.72688 9.31573 7.82074 8.97928 8.08787 8.81154C9.11751 8.16703 10.4737 8.28506 11.5732 8.68654C12.674 9.08861 13.7516 9.85814 14.2021 10.8174C14.371 11.1772 14.1513 11.6095 13.7685 11.6924C13.7617 11.7923 13.7544 11.8969 13.748 12.0049C14.1962 12.082 14.4968 12.046 14.6826 11.9756C14.8825 11.8997 14.9818 11.7762 15.0293 11.6182C15.1422 11.2404 14.9722 10.5056 14.2744 9.82814C14.0272 9.58772 14.0216 9.19189 14.2617 8.94435C14.5021 8.69712 14.8979 8.6915 15.1455 8.93166C15.3345 9.11519 15.5055 9.31499 15.6552 9.52443L17.8857 6.6133C18.0956 6.33963 18.4878 6.28747 18.7617 6.49709C19.0354 6.70683 19.0881 7.0991 18.8789 7.37307L16.249 10.8028C16.3391 11.2028 16.3391 11.6038 16.2275 11.9766C16.0692 12.5048 15.692 12.9296 15.125 13.1445C14.7132 13.3005 14.2295 13.3348 13.6894 13.2608C13.6825 13.4465 13.6757 13.6333 13.6699 13.8174C13.6519 14.3885 13.6397 14.9235 13.6318 15.3154C13.625 15.654 13.6211 15.8899 13.6201 15.9443C13.6201 16.2235 13.4305 16.4762 13.1601 16.5498C12.7201 16.6232 12.2788 16.6722 11.8427 16.7764C11.1206 16.949 10.2109 17.2517 9.40134 17.7647C7.89664 18.7182 6.97599 19.4365 6.3613 19.9883C5.74196 20.5443 5.43673 20.9247 5.09861 21.2852C4.91911 21.4765 4.6388 21.5354 4.39744 21.4326C4.1565 21.3297 4.00507 21.0869 4.01853 20.8252C4.17895 17.7398 4.63069 14.9266 5.55173 12.1611L5.59568 12.0596C5.61302 12.0278 5.63354 11.9972 5.65623 11.9688C6.10821 11.4021 6.46823 11.0234 6.88767 10.5947C6.89692 10.5853 6.90569 10.575 6.91501 10.5654C6.66279 10.3067 6.48116 10.0099 6.37986 9.68654C6.21786 9.1688 6.2782 8.63513 6.50388 8.16896C6.78976 7.5789 7.32765 7.10847 8.02146 6.84377L10.1855 0.950222ZM11.1445 9.86135C10.5565 9.64663 9.98214 9.56714 9.49802 9.62502C9.47457 9.6687 9.44776 9.71158 9.41306 9.75002C8.68746 10.5525 8.19322 11.0477 7.78122 11.4688C7.39591 11.8626 7.0838 12.1914 6.70212 12.6631C6.27084 13.9767 5.94845 15.307 5.71482 16.6826C6.1386 15.806 6.61502 14.9664 7.22654 14.0108C7.01626 13.3116 7.75399 11.8362 8.61033 11.6953C9.11052 11.6133 9.62805 11.94 9.67185 12.4834C9.72674 13.1687 9.35942 13.6875 8.95505 14.0547C8.71606 14.2717 8.41197 14.4145 8.124 14.4619C7.14963 15.9751 6.53411 17.1724 5.91208 18.7236C6.5649 18.1767 7.45483 17.5176 8.7324 16.708C9.70022 16.0948 10.7551 15.7512 11.5527 15.5606C11.8711 15.4845 12.1537 15.4336 12.3789 15.3975C12.3868 14.9958 12.401 14.4083 12.4209 13.7774C12.4553 12.684 12.512 11.4022 12.6025 10.7354C12.2417 10.3934 11.7319 10.076 11.1445 9.86135Z" 15 15 - fill="currentColor" 16 16 - /> 17 17 - </svg> 18 18 - ); 19 19 - };

+21 -15

components/InteractionsPreview.tsx

··· 7 7 import { Popover } from "./Popover"; 8 8 import { TagTiny } from "./Icons/TagTiny"; 9 9 import { SpeedyLink } from "./SpeedyLink"; 10 10 + import { RecommendButton } from "./RecommendButton"; 10 11 11 12 export const InteractionPreview = (props: { 12 13 quotesCount: number; 13 14 commentsCount: number; 15 15 + recommendsCount: number; 16 16 + documentUri: string; 14 17 tags?: string[]; 15 18 postUrl: string; 16 19 showComments: boolean; 17 20 showMentions: boolean; 21 21 + showRecommends: boolean; 18 22 19 23 share?: boolean; 20 24 }) => { 21 25 let smoker = useSmoker(); 22 26 let interactionsAvailable = 23 27 (props.quotesCount > 0 && props.showMentions) || 24 24 - (props.showComments !== false && props.commentsCount > 0); 28 28 + (props.showComments !== false && props.commentsCount > 0) || 29 29 + (props.showRecommends !== false && props.recommendsCount > 0); 25 30 26 31 const tagsCount = props.tags?.length || 0; 27 32 28 33 return ( 29 29 - <div 30 30 - className={`flex gap-2 text-tertiary text-sm items-center self-start`} 31 31 - > 32 32 - {tagsCount === 0 ? null : ( 33 33 - <> 34 34 - <TagPopover tags={props.tags!} /> 35 35 - {interactionsAvailable || props.share ? ( 36 36 - <Separator classname="h-4!" /> 37 37 - ) : null} 38 38 - </> 34 34 + <div className={`flex gap-2 text-tertiary text-sm items-center`}> 35 35 + {props.showRecommends === false ? null : ( 36 36 + <RecommendButton 37 37 + documentUri={props.documentUri} 38 38 + recommendsCount={props.recommendsCount} 39 39 + /> 39 40 )} 40 41 41 42 {!props.showMentions || props.quotesCount === 0 ? null : ( ··· 56 57 <CommentTiny /> {props.commentsCount} 57 58 </SpeedyLink> 58 59 )} 59 59 - {interactionsAvailable && props.share ? ( 60 60 - <Separator classname="h-4! !min-h-0" /> 61 61 - ) : null} 60 60 + {tagsCount === 0 ? null : ( 61 61 + <> 62 62 + {interactionsAvailable ? <Separator classname="h-4!" /> : null} 63 63 + <TagPopover tags={props.tags!} /> 64 64 + </> 65 65 + )} 62 66 {props.share && ( 63 67 <> 68 68 + <Separator classname="h-4!" /> 69 69 + 64 70 <button 65 71 id={`copy-post-link-${props.postUrl}`} 66 72 className="flex gap-1 items-center hover:text-accent-contrast relative" ··· 90 96 ); 91 97 }; 92 98 93 93 - export const TagPopover = (props: { tags: string[] }) => { 99 99 + const TagPopover = (props: { tags: string[] }) => { 94 100 return ( 95 101 <Popover 96 102 className="p-2! max-w-xs"

+2 -4

components/LoginButton.tsx

··· 5 5 import { ButtonPrimary } from "./Buttons"; 6 6 import { ActionButton } from "./ActionBar/ActionButton"; 7 7 import { AccountSmall } from "./Icons/AccountSmall"; 8 8 - import { useIsMobile } from "src/hooks/isMobile"; 9 8 10 9 export function LoginButton() { 11 10 let identityData = useIdentityData(); ··· 27 26 export function LoginActionButton() { 28 27 let identityData = useIdentityData(); 29 28 if (identityData.identity) return null; 30 30 - let isMobile = useIsMobile(); 31 29 return ( 32 30 <Popover 33 31 asChild 34 34 - side={isMobile ? "top" : "right"} 35 35 - align={isMobile ? "center" : "start"} 32 32 + align="start" 33 33 + side="right" 36 34 trigger={ 37 35 <ActionButton secondary icon={<AccountSmall />} label="Sign In" /> 38 36 }

+7 -2

components/OAuthError.tsx

··· 13 13 14 14 return ( 15 15 <div className={className}> 16 16 - <span>Your session has expired or is invalid. </span> 16 16 + <span> 17 17 + {error.type === "missing_scope" 18 18 + ? "Your session is missing required permissions. " 19 19 + : "Your session has expired or is invalid. "} 20 20 + </span> 17 21 <a href={signInUrl} className="underline font-bold whitespace-nowrap"> 18 22 Sign in again 19 23 </a> ··· 28 32 typeof error === "object" && 29 33 error !== null && 30 34 "type" in error && 31 31 - (error as OAuthSessionError).type === "oauth_session_expired" 35 35 + ((error as OAuthSessionError).type === "oauth_session_expired" || 36 36 + (error as OAuthSessionError).type === "missing_scope") 32 37 ); 33 38 }

+1 -1

components/PageHeader.tsx

··· 29 29 <div 30 30 className={` 31 31 headerWrapper 32 32 - sticky top-0 z-20 32 32 + sticky top-0 z-10 33 33 w-full bg-transparent 34 34 `} 35 35 >

+12 -32

components/PageLayouts/DashboardLayout.tsx

··· 4 4 import { Header } from "../PageHeader"; 5 5 import { Footer } from "components/ActionBar/Footer"; 6 6 import { Sidebar } from "components/ActionBar/Sidebar"; 7 7 - import { DesktopNavigation } from "components/ActionBar/DesktopNavigation"; 8 8 - 9 9 - import { MobileNavigation } from "components/ActionBar/MobileNavigation"; 10 7 import { 8 8 + DesktopNavigation, 9 9 + MobileNavigation, 11 10 navPages, 12 11 NotificationButton, 13 13 - } from "components/ActionBar/NavigationButtons"; 12 12 + } from "components/ActionBar/Navigation"; 14 13 import { create } from "zustand"; 15 14 import { Popover } from "components/Popover"; 16 15 import { Checkbox } from "components/Checkbox"; ··· 27 26 import { ExternalLinkTiny } from "components/Icons/ExternalLinkTiny"; 28 27 import { usePreserveScroll } from "src/hooks/usePreserveScroll"; 29 28 import { Tab } from "components/Tab"; 30 30 - import { PubIcon, PublicationButtons } from "components/ActionBar/Publications"; 31 29 32 30 export type DashboardState = { 33 31 display?: "grid" | "list"; ··· 140 138 defaultTab: keyof T; 141 139 currentPage: navPages; 142 140 publication?: string; 143 143 - profileDid?: string; 144 144 - actions?: React.ReactNode; 145 145 - pageTitle?: string; 141 141 + actions: React.ReactNode; 146 142 }) { 147 143 const searchParams = useSearchParams(); 148 144 const tabParam = searchParams.get("tab"); ··· 169 165 let [headerState, setHeaderState] = useState<"default" | "controls">( 170 166 "default", 171 167 ); 172 172 - 173 168 return ( 174 169 <DashboardIdContext.Provider value={props.id}> 175 170 <div ··· 189 184 ref={ref} 190 185 id="home-content" 191 186 > 192 192 - {props.pageTitle && ( 193 193 - <PageTitle pageTitle={props.pageTitle} actions={props.actions} /> 194 194 - )} 195 195 - 196 187 {Object.keys(props.tabs).length <= 1 && !controls ? null : ( 197 188 <> 198 189 <Header> ··· 249 240 <Footer> 250 241 <MobileNavigation 251 242 currentPage={props.currentPage} 252 252 - currentPublicationUri={props.publication} 253 253 - currentProfileDid={props.profileDid} 243 243 + publication={props.publication} 254 244 /> 245 245 + {props.actions && ( 246 246 + <> 247 247 + <Separator /> 248 248 + {props.actions} 249 249 + </> 250 250 + )} 255 251 </Footer> 256 252 </div> 257 253 </DashboardIdContext.Provider> 258 254 ); 259 255 } 260 260 - 261 261 - export const PageTitle = (props: { 262 262 - pageTitle: string; 263 263 - actions: React.ReactNode; 264 264 - }) => { 265 265 - return ( 266 266 - <MediaContents 267 267 - mobile={true} 268 268 - className="flex justify-between items-center px-1 mt-1 -mb-1 w-full " 269 269 - > 270 270 - <h4 className="grow truncate">{props.pageTitle}</h4> 271 271 - <div className="flex flex-row-reverse! gap-1">{props.actions}</div> 272 272 - {/* <div className="shrink-0 h-6">{props.controls}</div> */} 273 273 - </MediaContents> 274 274 - ); 275 275 - }; 276 256 277 257 export const HomeDashboardControls = (props: { 278 258 searchValue: string; ··· 467 447 className={`dashboardSearchInput 468 448 appearance-none! outline-hidden! 469 449 w-full min-w-0 text-primary relative pl-7 pr-1 -my-px 470 470 - border rounded-md border-border-light focus-within:border-border 450 450 + border rounded-md border-transparent focus-within:border-border 471 451 bg-transparent ${props.hasBackgroundImage ? "focus-within:bg-bg-page" : "focus-within:bg-bg-leaflet"} `} 472 452 type="text" 473 453 id="pubName"

+54 -25

components/Pages/PublicationMetadata.tsx

··· 20 20 import { useIdentityData } from "components/IdentityProvider"; 21 21 import { PostHeaderLayout } from "app/lish/[did]/[publication]/[rkey]/PostHeader/PostHeader"; 22 22 import { Backdater } from "./Backdater"; 23 23 + import { RecommendTinyEmpty } from "components/Icons/RecommendTiny"; 24 24 + import { mergePreferences } from "src/utils/mergePreferences"; 23 25 24 24 - export const PublicationMetadata = () => { 26 26 + export const PublicationMetadata = (props: { noInteractions?: boolean }) => { 25 27 let { rep } = useReplicache(); 26 26 - let { data: pub, normalizedDocument, normalizedPublication } = useLeafletPublicationData(); 28 28 + let { 29 29 + data: pub, 30 30 + normalizedDocument, 31 31 + normalizedPublication, 32 32 + } = useLeafletPublicationData(); 27 33 let { identity } = useIdentityData(); 28 34 let title = useSubscribe(rep, (tx) => tx.get<string>("publication_title")); 29 35 let description = useSubscribe(rep, (tx) => 30 36 tx.get<string>("publication_description"), 37 37 + ); 38 38 + let postPreferences = useSubscribe(rep, (tx) => 39 39 + tx.get<{ 40 40 + showComments?: boolean; 41 41 + showMentions?: boolean; 42 42 + showRecommends?: boolean; 43 43 + } | null>("post_preferences"), 44 44 + ); 45 45 + let merged = mergePreferences( 46 46 + postPreferences || undefined, 47 47 + normalizedPublication?.preferences, 31 48 ); 32 49 let publishedAt = normalizedDocument?.publishedAt; 33 50 ··· 114 131 ) : ( 115 132 <p>Draft</p> 116 133 )} 117 117 - <div className="flex gap-2 text-border items-center"> 118 118 - {tags && ( 119 119 - <> 120 120 - <AddTags /> 121 121 - {normalizedPublication?.preferences?.showMentions !== false || 122 122 - normalizedPublication?.preferences?.showComments !== false ? ( 123 123 - <Separator classname="h-4!" /> 124 124 - ) : null} 125 125 - </> 126 126 - )} 127 127 - {normalizedPublication?.preferences?.showMentions !== false && ( 128 128 - <div className="flex gap-1 items-center"> 129 129 - <QuoteTiny />— 130 130 - </div> 131 131 - )} 132 132 - {normalizedPublication?.preferences?.showComments !== false && ( 133 133 - <div className="flex gap-1 items-center"> 134 134 - <CommentTiny />— 135 135 - </div> 136 136 - )} 137 137 - </div> 134 134 + {!props.noInteractions && ( 135 135 + <div className="flex gap-2 text-border items-center"> 136 136 + {merged.showRecommends !== false && ( 137 137 + <div className="flex gap-1 items-center"> 138 138 + <RecommendTinyEmpty />— 139 139 + </div> 140 140 + )} 141 141 + 142 142 + {merged.showMentions !== false && ( 143 143 + <div className="flex gap-1 items-center"> 144 144 + <QuoteTiny />— 145 145 + </div> 146 146 + )} 147 147 + {merged.showComments !== false && ( 148 148 + <div className="flex gap-1 items-center"> 149 149 + <CommentTiny />— 150 150 + </div> 151 151 + )} 152 152 + {tags && ( 153 153 + <> 154 154 + {merged.showRecommends !== false || 155 155 + merged.showMentions !== false || 156 156 + merged.showComments !== false ? ( 157 157 + <Separator classname="h-4!" /> 158 158 + ) : null} 159 159 + <AddTags /> 160 160 + </> 161 161 + )} 162 162 + </div> 163 163 + )} 138 164 </> 139 165 } 140 166 /> ··· 238 264 ); 239 265 }; 240 266 241 241 - const AddTags = () => { 267 267 + export const AddTags = () => { 242 268 let { data: pub, normalizedDocument } = useLeafletPublicationData(); 243 269 let { rep } = useReplicache(); 244 270 ··· 251 277 let tags: string[] = []; 252 278 if (Array.isArray(replicacheTags)) { 253 279 tags = replicacheTags; 254 254 - } else if (normalizedDocument?.tags && Array.isArray(normalizedDocument.tags)) { 280 280 + } else if ( 281 281 + normalizedDocument?.tags && 282 282 + Array.isArray(normalizedDocument.tags) 283 283 + ) { 255 284 tags = normalizedDocument.tags as string[]; 256 285 } 257 286

-5

components/Pages/useHasBackgroundImage.ts

··· 1 1 - import { useHasBackgroundImageContext } from "components/ThemeManager/ThemeProvider"; 2 2 - 3 3 - export function useHasBackgroundImage(entityID?: string | null) { 4 4 - return useHasBackgroundImageContext(); 5 5 - }

+71 -161

components/PostListing.tsx

··· 1 1 "use client"; 2 2 import { AtUri } from "@atproto/api"; 3 3 import { PubIcon } from "components/ActionBar/Publications"; 4 4 + import { CommentTiny } from "components/Icons/CommentTiny"; 5 5 + import { QuoteTiny } from "components/Icons/QuoteTiny"; 6 6 + import { Separator } from "components/Layout"; 4 7 import { usePubTheme } from "components/ThemeManager/PublicationThemeProvider"; 5 8 import { BaseThemeProvider } from "components/ThemeManager/ThemeProvider"; 9 9 + import { useSmoker } from "components/Toast"; 6 10 import { blobRefToSrc } from "src/utils/blobRefToSrc"; 7 11 import type { 8 12 NormalizedDocument, ··· 11 15 import type { Post } from "app/(home-pages)/reader/getReaderFeed"; 12 16 13 17 import Link from "next/link"; 14 14 - import { InteractionPreview, TagPopover } from "./InteractionsPreview"; 18 18 + import { InteractionPreview } from "./InteractionsPreview"; 15 19 import { useLocalizedDate } from "src/hooks/useLocalizedDate"; 16 16 - import { useSmoker } from "./Toast"; 17 17 - import { Separator } from "./Layout"; 18 18 - import { SpeedyLink } from "./SpeedyLink"; 19 19 - import { CommentTiny } from "./Icons/CommentTiny"; 20 20 - import { QuoteTiny } from "./Icons/QuoteTiny"; 21 21 - import { ShareTiny } from "./Icons/ShareTiny"; 20 20 + import { mergePreferences } from "src/utils/mergePreferences"; 22 21 23 22 export const PostListing = (props: Post) => { 24 23 let pubRecord = props.publication?.pubRecord as ··· 38 37 let isStandalone = !pubRecord; 39 38 let theme = usePubTheme(pubRecord?.theme || postRecord?.theme, isStandalone); 40 39 let themeRecord = pubRecord?.theme || postRecord?.theme; 41 41 - let el = document?.getElementById(`post-listing-${postUri}`); 42 42 - 43 43 - let hasBackgroundImage = 44 44 - !!themeRecord?.backgroundImage?.image && 45 45 - el && 46 46 - Number(window.getComputedStyle(el).getPropertyValue("--bg-page-alpha")) < 47 47 - 0.7; 48 48 - 49 40 let backgroundImage = 50 41 themeRecord?.backgroundImage?.image?.ref && uri 51 42 ? blobRefToSrc(themeRecord.backgroundImage.image.ref, new AtUri(uri).host) ··· 58 49 ? pubRecord?.theme?.showPageBackground 59 50 : postRecord.theme?.showPageBackground ?? true; 60 51 52 52 + let mergedPrefs = mergePreferences(postRecord?.preferences, pubRecord?.preferences); 53 53 + 61 54 let quotes = props.documents.document_mentions_in_bsky?.[0]?.count || 0; 62 55 let comments = 63 63 - pubRecord?.preferences?.showComments === false 56 56 + mergedPrefs.showComments === false 64 57 ? 0 65 58 : props.documents.comments_on_documents?.[0]?.count || 0; 59 59 + let recommends = props.documents.recommends_on_documents?.[0]?.count || 0; 66 60 let tags = (postRecord?.tags as string[] | undefined) || []; 67 61 68 62 // For standalone posts, link directly to the document 69 69 - let postUrl = props.publication 63 63 + let postHref = props.publication 70 64 ? `${props.publication.href}/${postUri.rkey}` 71 65 : `/p/${postUri.host}/${postUri.rkey}`; 72 66 73 67 return ( 74 74 - <div className="postListing flex flex-col gap-1"> 75 75 - <div className="text-sm text-tertiary flex gap-1 items-center px-1 "> 76 76 - <div className="flex "> 77 77 - <div className="sm:w-4 w-4 sm:h-4 h-4 rounded-full bg-test border border-border-light first:ml-0 -ml-2" /> 78 78 - <div className="sm:w-4 w-4 sm:h-4 h-4 rounded-full bg-test border border-border-light first:ml-0 -ml-2" /> 79 79 - </div> 80 80 - others recommend 81 81 - </div> 82 82 - <BaseThemeProvider {...theme} local> 68 68 + <BaseThemeProvider {...theme} local> 69 69 + <div 70 70 + style={{ 71 71 + backgroundImage: backgroundImage 72 72 + ? `url(${backgroundImage})` 73 73 + : undefined, 74 74 + backgroundRepeat: backgroundImageRepeat ? "repeat" : "no-repeat", 75 75 + backgroundSize: `${backgroundImageRepeat ? `${backgroundImageSize}px` : "cover"}`, 76 76 + }} 77 77 + className={`no-underline! flex flex-row gap-2 w-full relative 78 78 + bg-bg-leaflet 79 79 + border border-border-light rounded-lg 80 80 + sm:p-2 p-2 selected-outline 81 81 + hover:outline-accent-contrast hover:border-accent-contrast 82 82 + `} 83 83 + > 84 84 + <Link className="h-full w-full absolute top-0 left-0" href={postHref} /> 83 85 <div 84 84 - id={`post-listing-${postUri}`} 85 85 - className={` 86 86 - relative 87 87 - flex flex-col overflow-hidden 88 88 - selected-outline border-border-light rounded-lg w-full hover:outline-accent-contrast 89 89 - hover:border-accent-contrast 90 90 - ${showPageBackground ? "bg-bg-page " : "bg-bg-leaflet"} `} 91 91 - style={ 92 92 - hasBackgroundImage 93 93 - ? { 94 94 - backgroundImage: backgroundImage 95 95 - ? `url(${backgroundImage})` 96 96 - : undefined, 97 97 - backgroundRepeat: backgroundImageRepeat 98 98 - ? "repeat" 99 99 - : "no-repeat", 100 100 - backgroundSize: backgroundImageRepeat 101 101 - ? `${backgroundImageSize}px` 102 102 - : "cover", 103 103 - } 104 104 - : {} 105 105 - } 86 86 + className={`${showPageBackground ? "bg-bg-page " : "bg-transparent"} rounded-md w-full px-[10px] pt-2 pb-2`} 87 87 + style={{ 88 88 + backgroundColor: showPageBackground 89 89 + ? "rgba(var(--bg-page), var(--bg-page-alpha))" 90 90 + : "transparent", 91 91 + }} 106 92 > 107 107 - <Link 108 108 - className="h-full w-full absolute top-0 left-0" 109 109 - href={postUrl} 110 110 - /> 111 111 - {postRecord.coverImage && ( 112 112 - <div className="postListingImage"> 113 113 - <img 114 114 - src={blobRefToSrc(postRecord.coverImage.ref, postUri.host)} 115 115 - alt={postRecord.title || ""} 116 116 - className="w-full h-auto aspect-video rounded" 117 117 - /> 118 118 - </div> 119 119 - )} 120 120 - <div className="postListingInfo px-3 py-2"> 121 121 - <h3 className="postListingTitle text-primary line-clamp-2 sm:text-lg text-base"> 122 122 - {postRecord.title} 123 123 - </h3> 93 93 + <h3 className="text-primary truncate">{postRecord.title}</h3> 124 94 125 125 - <p className="postListingDescription text-secondary line-clamp-3 sm:text-base text-sm"> 126 126 - {postRecord.description} 127 127 - </p> 128 128 - <div className="flex flex-col-reverse md:flex-row md gap-2 text-sm text-tertiary items-center justify-start pt-1.5 md:pt-3 w-full"> 129 129 - {props.publication && pubRecord && ( 130 130 - <PubInfo 131 131 - href={props.publication.href} 132 132 - pubRecord={pubRecord} 133 133 - uri={props.publication.uri} 134 134 - /> 135 135 - )} 136 136 - <div className="flex flex-row justify-between gap-2 text-xs items-center w-full"> 137 137 - <PostDate publishedAt={postRecord.publishedAt} /> 138 138 - {tags.length === 0 ? null : <TagPopover tags={tags!} />} 139 139 - </div> 95 95 + <p className="text-secondary italic line-clamp-3"> 96 96 + {postRecord.description} 97 97 + </p> 98 98 + <div className="flex flex-col-reverse md:flex-row md gap-2 text-sm text-tertiary items-center justify-start pt-1.5 md:pt-3 w-full"> 99 99 + {props.publication && pubRecord && ( 100 100 + <PubInfo 101 101 + href={props.publication.href} 102 102 + pubRecord={pubRecord} 103 103 + uri={props.publication.uri} 104 104 + /> 105 105 + )} 106 106 + <div className="flex flex-row justify-between gap-2 items-center w-full"> 107 107 + <PostInfo publishedAt={postRecord.publishedAt} /> 108 108 + <InteractionPreview 109 109 + postUrl={postHref} 110 110 + quotesCount={quotes} 111 111 + commentsCount={comments} 112 112 + recommendsCount={recommends} 113 113 + documentUri={props.documents.uri} 114 114 + tags={tags} 115 115 + showComments={mergedPrefs.showComments !== false} 116 116 + showMentions={mergedPrefs.showMentions !== false} 117 117 + showRecommends={mergedPrefs.showRecommends !== false} 118 118 + share 119 119 + /> 140 120 </div> 141 121 </div> 142 122 </div> 143 143 - </BaseThemeProvider> 144 144 - <div className="text-sm flex justify-between text-tertiary"> 145 145 - <Interactions 146 146 - postUrl={postUrl} 147 147 - quotesCount={quotes} 148 148 - commentsCount={comments} 149 149 - tags={tags} 150 150 - showComments={pubRecord?.preferences?.showComments !== false} 151 151 - showMentions={pubRecord?.preferences?.showMentions !== false} 152 152 - />{" "} 153 153 - <Share postUrl={postUrl} /> 154 123 </div> 155 155 - </div> 124 124 + </BaseThemeProvider> 156 125 ); 157 126 }; 158 127 ··· 163 132 }) => { 164 133 return ( 165 134 <div className="flex flex-col md:w-auto shrink-0 w-full"> 166 166 - <hr className="md:hidden block border-border-light mb-1" /> 135 135 + <hr className="md:hidden block border-border-light mb-2" /> 167 136 <Link 168 137 href={props.href} 169 169 - className="text-accent-contrast font-bold no-underline text-sm flex gap-[6px] items-center md:w-fit relative shrink-0" 138 138 + className="text-accent-contrast font-bold no-underline text-sm flex gap-1 items-center md:w-fit relative shrink-0" 170 139 > 171 171 - <PubIcon tiny record={props.pubRecord} uri={props.uri} /> 140 140 + <PubIcon small record={props.pubRecord} uri={props.uri} /> 172 141 {props.pubRecord.name} 173 142 </Link> 174 143 </div> 175 144 ); 176 145 }; 177 146 178 178 - const PostDate = (props: { publishedAt: string | undefined }) => { 147 147 + const PostInfo = (props: { publishedAt: string | undefined }) => { 179 148 let localizedDate = useLocalizedDate(props.publishedAt || "", { 180 149 year: "numeric", 181 150 month: "short", 182 151 day: "numeric", 183 152 }); 184 184 - if (props.publishedAt) { 185 185 - return <div className="shrink-0 sm:text-sm text-xs">{localizedDate}</div>; 186 186 - } else return null; 187 187 - }; 188 188 - 189 189 - const Interactions = (props: { 190 190 - quotesCount: number; 191 191 - commentsCount: number; 192 192 - tags?: string[]; 193 193 - postUrl: string; 194 194 - showComments: boolean; 195 195 - showMentions: boolean; 196 196 - }) => { 197 153 return ( 198 198 - <div 199 199 - className={`flex gap-2 text-tertiary text-sm items-center justify-between px-1`} 200 200 - > 201 201 - <div className="postListingsInteractions flex gap-3"> 202 202 - {!props.showMentions || props.quotesCount === 0 ? null : ( 203 203 - <SpeedyLink 204 204 - aria-label="Post quotes" 205 205 - href={`${props.postUrl}?interactionDrawer=quotes`} 206 206 - className="relative flex flex-row gap-1 text-sm items-center hover:text-accent-contrast hover:no-underline! text-tertiary" 207 207 - > 208 208 - <QuoteTiny /> {props.quotesCount} 209 209 - </SpeedyLink> 210 210 - )} 211 211 - {!props.showComments || props.commentsCount === 0 ? null : ( 212 212 - <SpeedyLink 213 213 - aria-label="Post comments" 214 214 - href={`${props.postUrl}?interactionDrawer=comments`} 215 215 - className="relative flex flex-row gap-1 text-sm items-center hover:text-accent-contrast hover:no-underline! text-tertiary" 216 216 - > 217 217 - <CommentTiny /> {props.commentsCount} 218 218 - </SpeedyLink> 219 219 - )} 220 220 - </div> 154 154 + <div className="flex gap-2 items-center shrink-0 self-start"> 155 155 + {props.publishedAt && ( 156 156 + <> 157 157 + <div className="shrink-0">{localizedDate}</div> 158 158 + </> 159 159 + )} 221 160 </div> 222 161 ); 223 162 }; 224 224 - 225 225 - const Share = (props: { postUrl: string }) => { 226 226 - let smoker = useSmoker(); 227 227 - return ( 228 228 - <button 229 229 - id={`copy-post-link-${props.postUrl}`} 230 230 - className="flex gap-1 items-center hover:text-accent-contrast relative font-bold" 231 231 - onClick={(e) => { 232 232 - e.stopPropagation(); 233 233 - e.preventDefault(); 234 234 - let mouseX = e.clientX; 235 235 - let mouseY = e.clientY; 236 236 - 237 237 - if (!props.postUrl) return; 238 238 - navigator.clipboard.writeText(`leaflet.pub${props.postUrl}`); 239 239 - 240 240 - smoker({ 241 241 - text: <strong>Copied Link!</strong>, 242 242 - position: { 243 243 - y: mouseY, 244 244 - x: mouseX, 245 245 - }, 246 246 - }); 247 247 - }} 248 248 - > 249 249 - Share <ShareTiny /> 250 250 - </button> 251 251 - ); 252 252 - };

+96

components/PostSettings.tsx

··· 1 1 + "use client"; 2 2 + 3 3 + import { ActionButton } from "components/ActionBar/ActionButton"; 4 4 + import { SettingsSmall } from "components/Icons/SettingsSmall"; 5 5 + import { Toggle } from "components/Toggle"; 6 6 + import { Popover } from "components/Popover"; 7 7 + import { useLeafletPublicationData } from "components/PageSWRDataProvider"; 8 8 + import { useReplicache } from "src/replicache"; 9 9 + import { useSubscribe } from "src/replicache/useSubscribe"; 10 10 + 11 11 + type PostPreferences = { 12 12 + showComments?: boolean; 13 13 + showMentions?: boolean; 14 14 + showRecommends?: boolean; 15 15 + }; 16 16 + 17 17 + export function PostSettings() { 18 18 + let { data: pub, normalizedPublication } = useLeafletPublicationData(); 19 19 + let { rep } = useReplicache(); 20 20 + 21 21 + let postPreferences = useSubscribe(rep, (tx) => 22 22 + tx.get<PostPreferences | null>("post_preferences"), 23 23 + ); 24 24 + 25 25 + if (!pub || !pub.publications) return null; 26 26 + 27 27 + let pubPrefs = normalizedPublication?.preferences; 28 28 + 29 29 + let showComments = 30 30 + postPreferences?.showComments ?? pubPrefs?.showComments ?? true; 31 31 + let showMentions = 32 32 + postPreferences?.showMentions ?? pubPrefs?.showMentions ?? true; 33 33 + let showRecommends = 34 34 + postPreferences?.showRecommends ?? pubPrefs?.showRecommends ?? true; 35 35 + 36 36 + const updatePreference = ( 37 37 + field: keyof PostPreferences, 38 38 + value: boolean, 39 39 + ) => { 40 40 + let current: PostPreferences = postPreferences || {}; 41 41 + rep?.mutate.updatePublicationDraft({ 42 42 + preferences: { ...current, [field]: value }, 43 43 + }); 44 44 + }; 45 45 + 46 46 + return ( 47 47 + <Popover 48 48 + asChild 49 49 + side="right" 50 50 + align="start" 51 51 + className="max-w-xs w-[1000px]" 52 52 + trigger={ 53 53 + <ActionButton 54 54 + icon={<SettingsSmall />} 55 55 + label="Settings" 56 56 + /> 57 57 + } 58 58 + > 59 59 + <div className="text-primary flex flex-col"> 60 60 + <div className="flex justify-between font-bold text-secondary bg-border-light -mx-3 -mt-2 px-3 py-2 mb-1"> 61 61 + This Post Settings 62 62 + </div> 63 63 + <div className="flex flex-col gap-2"> 64 64 + <Toggle 65 65 + toggle={showComments} 66 66 + onToggle={() => updatePreference("showComments", !showComments)} 67 67 + > 68 68 + <div className="font-bold">Show Comments</div> 69 69 + </Toggle> 70 70 + <Toggle 71 71 + toggle={showMentions} 72 72 + onToggle={() => updatePreference("showMentions", !showMentions)} 73 73 + > 74 74 + <div className="flex flex-col justify-start"> 75 75 + <div className="font-bold">Show Mentions</div> 76 76 + <div className="text-tertiary text-sm leading-tight"> 77 77 + Display a list Bluesky mentions about your post 78 78 + </div> 79 79 + </div> 80 80 + </Toggle> 81 81 + <Toggle 82 82 + toggle={showRecommends} 83 83 + onToggle={() => updatePreference("showRecommends", !showRecommends)} 84 84 + > 85 85 + <div className="flex flex-col justify-start"> 86 86 + <div className="font-bold">Show Recommends</div> 87 87 + <div className="text-tertiary text-sm leading-tight"> 88 88 + Allow readers to recommend/like your post 89 89 + </div> 90 90 + </div> 91 91 + </Toggle> 92 92 + </div> 93 93 + </div> 94 94 + </Popover> 95 95 + ); 96 96 + }

+173

components/RecommendButton.tsx

··· 1 1 + "use client"; 2 2 + 3 3 + import { useState } from "react"; 4 4 + import useSWR, { mutate } from "swr"; 5 5 + import { create, windowScheduler } from "@yornaath/batshit"; 6 6 + import { RecommendTinyEmpty, RecommendTinyFilled } from "./Icons/RecommendTiny"; 7 7 + import { 8 8 + recommendAction, 9 9 + unrecommendAction, 10 10 + } from "app/lish/[did]/[publication]/[rkey]/Interactions/recommendAction"; 11 11 + import { callRPC } from "app/api/rpc/client"; 12 12 + import { useSmoker, useToaster } from "./Toast"; 13 13 + import { OAuthErrorMessage, isOAuthSessionError } from "./OAuthError"; 14 14 + import { ButtonSecondary } from "./Buttons"; 15 15 + import { Separator } from "./Layout"; 16 16 + 17 17 + // Create a batcher for recommendation checks 18 18 + // Batches requests made within 10ms window 19 19 + const recommendationBatcher = create({ 20 20 + fetcher: async (documentUris: string[]) => { 21 21 + const response = await callRPC("get_user_recommendations", { 22 22 + documentUris, 23 23 + }); 24 24 + return response.result; 25 25 + }, 26 26 + resolver: (results, documentUri) => results[documentUri] ?? false, 27 27 + scheduler: windowScheduler(10), 28 28 + }); 29 29 + 30 30 + const getRecommendationKey = (documentUri: string) => 31 31 + `recommendation:${documentUri}`; 32 32 + 33 33 + function useUserRecommendation(documentUri: string) { 34 34 + const { data: hasRecommended, isLoading } = useSWR( 35 35 + getRecommendationKey(documentUri), 36 36 + () => recommendationBatcher.fetch(documentUri), 37 37 + ); 38 38 + 39 39 + return { 40 40 + hasRecommended: hasRecommended ?? false, 41 41 + isLoading, 42 42 + }; 43 43 + } 44 44 + 45 45 + function mutateRecommendation(documentUri: string, hasRecommended: boolean) { 46 46 + mutate(getRecommendationKey(documentUri), hasRecommended, { 47 47 + revalidate: false, 48 48 + }); 49 49 + } 50 50 + 51 51 + /** 52 52 + * RecommendButton that fetches the user's recommendation status asynchronously. 53 53 + * Uses SWR with batched requests for efficient fetching when many buttons are rendered. 54 54 + */ 55 55 + export function RecommendButton(props: { 56 56 + documentUri: string; 57 57 + recommendsCount: number; 58 58 + className?: string; 59 59 + expanded?: boolean; 60 60 + }) { 61 61 + const { hasRecommended, isLoading } = useUserRecommendation( 62 62 + props.documentUri, 63 63 + ); 64 64 + const [count, setCount] = useState(props.recommendsCount); 65 65 + const [isPending, setIsPending] = useState(false); 66 66 + const [optimisticRecommended, setOptimisticRecommended] = useState< 67 67 + boolean | null 68 68 + >(null); 69 69 + const toaster = useToaster(); 70 70 + const smoker = useSmoker(); 71 71 + 72 72 + // Use optimistic state if set, otherwise use fetched state 73 73 + const displayRecommended = 74 74 + optimisticRecommended !== null ? optimisticRecommended : hasRecommended; 75 75 + 76 76 + const handleClick = async (e: React.MouseEvent) => { 77 77 + if (isPending || isLoading) return; 78 78 + 79 79 + const currentlyRecommended = displayRecommended; 80 80 + setIsPending(true); 81 81 + setOptimisticRecommended(!currentlyRecommended); 82 82 + setCount((c) => (currentlyRecommended ? c - 1 : c + 1)); 83 83 + 84 84 + if (!currentlyRecommended) { 85 85 + smoker({ 86 86 + position: { 87 87 + x: e.clientX, 88 88 + y: e.clientY - 16, 89 89 + }, 90 90 + text: <div className="text-xs">Recc'd!</div>, 91 91 + }); 92 92 + } 93 93 + 94 94 + const result = currentlyRecommended 95 95 + ? await unrecommendAction({ document: props.documentUri }) 96 96 + : await recommendAction({ document: props.documentUri }); 97 97 + if (!result.success) { 98 98 + // Revert optimistic update 99 99 + setOptimisticRecommended(null); 100 100 + setCount((c) => (currentlyRecommended ? c + 1 : c - 1)); 101 101 + setIsPending(false); 102 102 + 103 103 + toaster({ 104 104 + content: isOAuthSessionError(result.error) ? ( 105 105 + <OAuthErrorMessage error={result.error} /> 106 106 + ) : ( 107 107 + "oh no! error!" 108 108 + ), 109 109 + type: "error", 110 110 + }); 111 111 + return; 112 112 + } 113 113 + 114 114 + // Update the SWR cache to match the new state 115 115 + mutateRecommendation(props.documentUri, !currentlyRecommended); 116 116 + setOptimisticRecommended(null); 117 117 + setIsPending(false); 118 118 + }; 119 119 + 120 120 + if (props.expanded) 121 121 + return ( 122 122 + <ButtonSecondary 123 123 + onClick={(e) => { 124 124 + e.preventDefault(); 125 125 + e.stopPropagation(); 126 126 + handleClick(e); 127 127 + }} 128 128 + > 129 129 + {displayRecommended ? ( 130 130 + <RecommendTinyFilled className="text-accent-contrast" /> 131 131 + ) : ( 132 132 + <RecommendTinyEmpty /> 133 133 + )} 134 134 + <div className="flex gap-2 items-center"> 135 135 + {count > 0 && ( 136 136 + <> 137 137 + <span 138 138 + className={`${displayRecommended && "text-accent-contrast"}`} 139 139 + > 140 140 + {count} 141 141 + </span> 142 142 + <Separator classname="h-4! text-accent-contrast!" /> 143 143 + </> 144 144 + )} 145 145 + {displayRecommended ? "Recommended!" : "Recommend"} 146 146 + </div> 147 147 + </ButtonSecondary> 148 148 + ); 149 149 + 150 150 + return ( 151 151 + <button 152 152 + onClick={(e) => { 153 153 + e.preventDefault(); 154 154 + e.stopPropagation(); 155 155 + handleClick(e); 156 156 + }} 157 157 + disabled={isPending || isLoading} 158 158 + className={`recommendButton relative flex gap-1 items-center hover:text-accent-contrast ${props.className || ""}`} 159 159 + aria-label={displayRecommended ? "Remove recommend" : "Recommend"} 160 160 + > 161 161 + {displayRecommended ? ( 162 162 + <RecommendTinyFilled className="text-accent-contrast" /> 163 163 + ) : ( 164 164 + <RecommendTinyEmpty /> 165 165 + )} 166 166 + {count > 0 && ( 167 167 + <span className={`${displayRecommended && "text-accent-contrast"}`}> 168 168 + {count} 169 169 + </span> 170 170 + )} 171 171 + </button> 172 172 + ); 173 173 + }

+1

components/Tags.tsx

··· 109 109 } 110 110 111 111 function selectTag(tag: string) { 112 112 + console.log("selected " + tag); 112 113 props.setSelectedTags([...props.selectedTags, tag]); 113 114 clearTagInput(); 114 115 }

+16 -25

components/ThemeManager/ThemeProvider.tsx

··· 8 8 export function useCardBorderHiddenContext() { 9 9 return useContext(CardBorderHiddenContext); 10 10 } 11 11 - 12 12 - // Context for hasBackgroundImage 13 13 - export const HasBackgroundImageContext = createContext<boolean>(false); 14 14 - 15 15 - export function useHasBackgroundImageContext() { 16 16 - return useContext(HasBackgroundImageContext); 17 17 - } 18 11 import { 19 12 colorToString, 20 13 useColorAttribute, ··· 86 79 87 80 return ( 88 81 <CardBorderHiddenContext.Provider value={!!cardBorderHiddenValue}> 89 89 - <HasBackgroundImageContext.Provider value={hasBackgroundImage}> 90 90 - <BaseThemeProvider 91 91 - local={props.local} 92 92 - bgLeaflet={bgLeaflet} 93 93 - bgPage={bgPage} 94 94 - primary={primary} 95 95 - highlight2={highlight2} 96 96 - highlight3={highlight3} 97 97 - highlight1={highlight1?.data.value} 98 98 - accent1={accent1} 99 99 - accent2={accent2} 100 100 - showPageBackground={showPageBackground} 101 101 - pageWidth={pageWidth?.data.value} 102 102 - hasBackgroundImage={hasBackgroundImage} 103 103 - > 104 104 - {props.children} 105 105 - </BaseThemeProvider> 106 106 - </HasBackgroundImageContext.Provider> 82 82 + <BaseThemeProvider 83 83 + local={props.local} 84 84 + bgLeaflet={bgLeaflet} 85 85 + bgPage={bgPage} 86 86 + primary={primary} 87 87 + highlight2={highlight2} 88 88 + highlight3={highlight3} 89 89 + highlight1={highlight1?.data.value} 90 90 + accent1={accent1} 91 91 + accent2={accent2} 92 92 + showPageBackground={showPageBackground} 93 93 + pageWidth={pageWidth?.data.value} 94 94 + hasBackgroundImage={hasBackgroundImage} 95 95 + > 96 96 + {props.children} 97 97 + </BaseThemeProvider> 107 98 </CardBorderHiddenContext.Provider> 108 99 ); 109 100 }

+1

contexts/DocumentContext.tsx

··· 21 21 | "comments" 22 22 | "mentions" 23 23 | "leafletId" 24 24 + | "recommendsCount" 24 25 >; 25 26 26 27 const DocumentContext = createContext<DocumentContextValue | null>(null);

+17

lexicons/api/lexicons.ts

··· 1469 1469 type: 'ref', 1470 1470 ref: 'lex:pub.leaflet.publication#theme', 1471 1471 }, 1472 1472 + preferences: { 1473 1473 + type: 'ref', 1474 1474 + ref: 'lex:pub.leaflet.publication#preferences', 1475 1475 + }, 1472 1476 tags: { 1473 1477 type: 'array', 1474 1478 items: { ··· 1868 1872 type: 'boolean', 1869 1873 default: true, 1870 1874 }, 1875 1875 + showRecommends: { 1876 1876 + type: 'boolean', 1877 1877 + default: true, 1878 1878 + }, 1871 1879 }, 1872 1880 }, 1873 1881 theme: { ··· 2194 2202 maxLength: 5000, 2195 2203 type: 'string', 2196 2204 }, 2205 2205 + preferences: { 2206 2206 + type: 'union', 2207 2207 + refs: ['lex:pub.leaflet.publication#preferences'], 2208 2208 + closed: false, 2209 2209 + }, 2197 2210 updatedAt: { 2198 2211 format: 'datetime', 2199 2212 type: 'string', ··· 2288 2301 }, 2289 2302 showPrevNext: { 2290 2303 default: false, 2304 2304 + type: 'boolean', 2305 2305 + }, 2306 2306 + showRecommends: { 2307 2307 + default: true, 2291 2308 type: 'boolean', 2292 2309 }, 2293 2310 },

+1

lexicons/api/types/pub/leaflet/document.ts

··· 23 23 publication?: string 24 24 author: string 25 25 theme?: PubLeafletPublication.Theme 26 26 + preferences?: PubLeafletPublication.Preferences 26 27 tags?: string[] 27 28 coverImage?: BlobRef 28 29 pages: (

+1

lexicons/api/types/pub/leaflet/publication.ts

··· 39 39 showComments: boolean 40 40 showMentions: boolean 41 41 showPrevNext: boolean 42 42 + showRecommends: boolean 42 43 } 43 44 44 45 const hashPreferences = 'preferences'

+1

lexicons/api/types/site/standard/document.ts

··· 28 28 textContent?: string 29 29 theme?: PubLeafletPublication.Theme 30 30 title: string 31 31 + preferences?: $Typed<PubLeafletPublication.Preferences> | { $type: string } 31 32 updatedAt?: string 32 33 [k: string]: unknown 33 34 }

+1

lexicons/api/types/site/standard/publication.ts

··· 40 40 showComments: boolean 41 41 showMentions: boolean 42 42 showPrevNext: boolean 43 43 + showRecommends: boolean 43 44 } 44 45 45 46 const hashPreferences = 'preferences'

+4

lexicons/pub/leaflet/document.json

··· 46 46 "type": "ref", 47 47 "ref": "pub.leaflet.publication#theme" 48 48 }, 49 49 + "preferences": { 50 50 + "type": "ref", 51 51 + "ref": "pub.leaflet.publication#preferences" 52 52 + }, 49 53 "tags": { 50 54 "type": "array", 51 55 "items": {

+4

lexicons/pub/leaflet/publication.json

··· 59 59 "showPrevNext": { 60 60 "type": "boolean", 61 61 "default": true 62 62 + }, 63 63 + "showRecommends": { 64 64 + "type": "boolean", 65 65 + "default": true 62 66 } 63 67 } 64 68 },

+5

lexicons/site/standard/document.json

··· 57 57 "maxLength": 5000, 58 58 "type": "string" 59 59 }, 60 60 + "preferences": { 61 61 + "type": "union", 62 62 + "refs": ["pub.leaflet.publication#preferences"], 63 63 + "closed": false 64 64 + }, 60 65 "updatedAt": { 61 66 "format": "datetime", 62 67 "type": "string"

+4

lexicons/site/standard/publication.json

··· 58 58 "showPrevNext": { 59 59 "default": false, 60 60 "type": "boolean" 61 61 + }, 62 62 + "showRecommends": { 63 63 + "default": true, 64 64 + "type": "boolean" 61 65 } 62 66 }, 63 67 "type": "object"

+4

lexicons/src/document.ts

··· 23 23 publication: { type: "string", format: "at-uri" }, 24 24 author: { type: "string", format: "at-identifier" }, 25 25 theme: { type: "ref", ref: "pub.leaflet.publication#theme" }, 26 26 + preferences: { 27 27 + type: "ref", 28 28 + ref: "pub.leaflet.publication#preferences", 29 29 + }, 26 30 tags: { type: "array", items: { type: "string", maxLength: 50 } }, 27 31 coverImage: { 28 32 type: "blob",

+28 -11

lexicons/src/normalize.ts

··· 28 28 export type NormalizedDocument = SiteStandardDocument.Record & { 29 29 // Keep the original theme for components that need leaflet-specific styling 30 30 theme?: PubLeafletPublication.Theme; 31 31 + preferences?: SiteStandardPublication.Preferences; 31 32 }; 32 33 33 34 // Normalized publication type - uses the generated site.standard.publication type ··· 50 51 * Checks if the record is a pub.leaflet.document 51 52 */ 52 53 export function isLeafletDocument( 53 53 - record: unknown 54 54 + record: unknown, 54 55 ): record is PubLeafletDocument.Record { 55 56 if (!record || typeof record !== "object") return false; 56 57 const r = record as Record<string, unknown>; ··· 65 66 * Checks if the record is a site.standard.document 66 67 */ 67 68 export function isStandardDocument( 68 68 - record: unknown 69 69 + record: unknown, 69 70 ): record is SiteStandardDocument.Record { 70 71 if (!record || typeof record !== "object") return false; 71 72 const r = record as Record<string, unknown>; ··· 76 77 * Checks if the record is a pub.leaflet.publication 77 78 */ 78 79 export function isLeafletPublication( 79 79 - record: unknown 80 80 + record: unknown, 80 81 ): record is PubLeafletPublication.Record { 81 82 if (!record || typeof record !== "object") return false; 82 83 const r = record as Record<string, unknown>; ··· 91 92 * Checks if the record is a site.standard.publication 92 93 */ 93 94 export function isStandardPublication( 94 94 - record: unknown 95 95 + record: unknown, 95 96 ): record is SiteStandardPublication.Record { 96 97 if (!record || typeof record !== "object") return false; 97 98 const r = record as Record<string, unknown>; ··· 106 107 | $Typed<PubLeafletThemeColor.Rgba> 107 108 | $Typed<PubLeafletThemeColor.Rgb> 108 109 | { $type: string } 109 109 - | undefined 110 110 + | undefined, 110 111 ): { r: number; g: number; b: number } | undefined { 111 112 if (!color || typeof color !== "object") return undefined; 112 113 const c = color as Record<string, unknown>; ··· 124 125 * Converts a pub.leaflet theme to a site.standard.theme.basic format 125 126 */ 126 127 export function leafletThemeToBasicTheme( 127 127 - theme: PubLeafletPublication.Theme | undefined 128 128 + theme: PubLeafletPublication.Theme | undefined, 128 129 ): SiteStandardThemeBasic.Main | undefined { 129 130 if (!theme) return undefined; 130 131 131 132 const background = extractRgb(theme.backgroundColor); 132 132 - const accent = extractRgb(theme.accentBackground) || extractRgb(theme.primary); 133 133 + const accent = 134 134 + extractRgb(theme.accentBackground) || extractRgb(theme.primary); 133 135 const accentForeground = extractRgb(theme.accentText); 134 136 135 137 // If we don't have the required colors, return undefined ··· 160 162 * @param uri - Optional document URI, used to extract the rkey for the path field when normalizing pub.leaflet records 161 163 * @returns A normalized document in site.standard format, or null if invalid/unrecognized 162 164 */ 163 163 - export function normalizeDocument(record: unknown, uri?: string): NormalizedDocument | null { 165 165 + export function normalizeDocument( 166 166 + record: unknown, 167 167 + uri?: string, 168 168 + ): NormalizedDocument | null { 164 169 if (!record || typeof record !== "object") return null; 165 170 166 171 // Pass through site.standard records directly (theme is already in correct format if present) 167 172 if (isStandardDocument(record)) { 173 173 + const preferences = record.preferences as 174 174 + | SiteStandardPublication.Preferences 175 175 + | undefined; 168 176 return { 169 177 ...record, 170 178 theme: record.theme, 179 179 + preferences, 171 180 } as NormalizedDocument; 172 181 } 173 182 ··· 194 203 } 195 204 : undefined; 196 205 206 206 + // Extract preferences if present (available after lexicon rebuild) 207 207 + const leafletPrefs = (record as Record<string, unknown>) 208 208 + .preferences as SiteStandardPublication.Preferences | undefined; 209 209 + 197 210 return { 198 211 $type: "site.standard.document", 199 212 title: record.title, ··· 206 219 bskyPostRef: record.postRef, 207 220 content, 208 221 theme: record.theme, 222 222 + preferences: leafletPrefs 223 223 + ? { ...leafletPrefs, $type: "site.standard.publication#preferences" as const } 224 224 + : undefined, 209 225 }; 210 226 } 211 227 ··· 219 235 * @returns A normalized publication in site.standard format, or null if invalid/unrecognized 220 236 */ 221 237 export function normalizePublication( 222 222 - record: unknown 238 238 + record: unknown, 223 239 ): NormalizedPublication | null { 224 240 if (!record || typeof record !== "object") return null; 225 241 ··· 268 284 showComments: record.preferences.showComments, 269 285 showMentions: record.preferences.showMentions, 270 286 showPrevNext: record.preferences.showPrevNext, 287 287 + showRecommends: record.preferences.showRecommends, 271 288 } 272 289 : undefined; 273 290 ··· 290 307 * Type guard to check if a normalized document has leaflet content 291 308 */ 292 309 export function hasLeafletContent( 293 293 - doc: NormalizedDocument 310 310 + doc: NormalizedDocument, 294 311 ): doc is NormalizedDocument & { 295 312 content: $Typed<PubLeafletContent.Main>; 296 313 } { ··· 304 321 * Gets the pages array from a normalized document, handling both formats 305 322 */ 306 323 export function getDocumentPages( 307 307 - doc: NormalizedDocument 324 324 + doc: NormalizedDocument, 308 325 ): PubLeafletContent.Main["pages"] | undefined { 309 326 if (!doc.content) return undefined; 310 327

+1

lexicons/src/publication.ts

··· 29 29 showComments: { type: "boolean", default: true }, 30 30 showMentions: { type: "boolean", default: true }, 31 31 showPrevNext: { type: "boolean", default: true }, 32 32 + showRecommends: { type: "boolean", default: true }, 32 33 }, 33 34 }, 34 35 theme: {

+22 -391

package-lock.json

··· 16 16 "@atproto/oauth-client-node": "^0.3.8", 17 17 "@atproto/sync": "^0.1.34", 18 18 "@atproto/syntax": "^0.3.3", 19 19 - "@atproto/tap": "^0.1.1", 20 19 "@atproto/xrpc": "^0.7.5", 21 20 "@atproto/xrpc-server": "^0.9.5", 22 21 "@hono/node-server": "^1.14.3", ··· 38 37 "@vercel/analytics": "^1.5.0", 39 38 "@vercel/functions": "^2.2.12", 40 39 "@vercel/sdk": "^1.11.4", 40 40 + "@yornaath/batshit": "^0.14.0", 41 41 "babel-plugin-react-compiler": "^19.1.0-rc.1", 42 42 "base64-js": "^1.5.1", 43 43 "colorjs.io": "^0.5.2", ··· 395 395 "integrity": "sha512-HoMUjhH9T8DDBNT+6xzkrd9ga/XiBI4xLr58LJACwK6G3HTOPeMz4nB4KJs33L2BelrIJa7P0VuNaVF3hMYfjg==", 396 396 "license": "(Apache-2.0 AND MIT)" 397 397 }, 398 398 - "node_modules/@atproto/lex": { 399 399 - "version": "0.0.9", 400 400 - "resolved": "https://registry.npmjs.org/@atproto/lex/-/lex-0.0.9.tgz", 401 401 - "integrity": "sha512-o6gauf1lz0iyzJR0rqSj4VHOrO+Nt8+/iPb0KPojw1ieXk13zOSTSxotAoDzO/dP6y8Ey5jxwuCQGuzab/4XnQ==", 402 402 - "license": "MIT", 403 403 - "dependencies": { 404 404 - "@atproto/lex-builder": "0.0.9", 405 405 - "@atproto/lex-client": "0.0.7", 406 406 - "@atproto/lex-data": "0.0.6", 407 407 - "@atproto/lex-installer": "0.0.9", 408 408 - "@atproto/lex-json": "0.0.6", 409 409 - "@atproto/lex-schema": "0.0.7", 410 410 - "tslib": "^2.8.1", 411 411 - "yargs": "^17.0.0" 412 412 - }, 413 413 - "bin": { 414 414 - "lex": "bin/lex", 415 415 - "ts-lex": "bin/lex" 416 416 - } 417 417 - }, 418 418 - "node_modules/@atproto/lex-builder": { 419 419 - "version": "0.0.9", 420 420 - "resolved": "https://registry.npmjs.org/@atproto/lex-builder/-/lex-builder-0.0.9.tgz", 421 421 - "integrity": "sha512-buOFk1JpuW3twI7To7f/67zQQ1NulLHf/oasH/kTOPUAd0dNyeAa13t9eRSVGbwi0BcZYxRxBm0QzPmdLKyuyw==", 422 422 - "license": "MIT", 423 423 - "dependencies": { 424 424 - "@atproto/lex-document": "0.0.8", 425 425 - "@atproto/lex-schema": "0.0.7", 426 426 - "prettier": "^3.2.5", 427 427 - "ts-morph": "^27.0.0", 428 428 - "tslib": "^2.8.1" 429 429 - } 430 430 - }, 431 431 - "node_modules/@atproto/lex-builder/node_modules/@ts-morph/common": { 432 432 - "version": "0.28.1", 433 433 - "resolved": "https://registry.npmjs.org/@ts-morph/common/-/common-0.28.1.tgz", 434 434 - "integrity": "sha512-W74iWf7ILp1ZKNYXY5qbddNaml7e9Sedv5lvU1V8lftlitkc9Pq1A+jlH23ltDgWYeZFFEqGCD1Ies9hqu3O+g==", 435 435 - "license": "MIT", 436 436 - "dependencies": { 437 437 - "minimatch": "^10.0.1", 438 438 - "path-browserify": "^1.0.1", 439 439 - "tinyglobby": "^0.2.14" 440 440 - } 441 441 - }, 442 442 - "node_modules/@atproto/lex-builder/node_modules/minimatch": { 443 443 - "version": "10.1.1", 444 444 - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.1.1.tgz", 445 445 - "integrity": "sha512-enIvLvRAFZYXJzkCYG5RKmPfrFArdLv+R+lbQ53BmIMLIry74bjKzX6iHAm8WYamJkhSSEabrWN5D97XnKObjQ==", 446 446 - "license": "BlueOak-1.0.0", 447 447 - "dependencies": { 448 448 - "@isaacs/brace-expansion": "^5.0.0" 449 449 - }, 450 450 - "engines": { 451 451 - "node": "20 || >=22" 452 452 - }, 453 453 - "funding": { 454 454 - "url": "https://github.com/sponsors/isaacs" 455 455 - } 456 456 - }, 457 457 - "node_modules/@atproto/lex-builder/node_modules/ts-morph": { 458 458 - "version": "27.0.2", 459 459 - "resolved": "https://registry.npmjs.org/ts-morph/-/ts-morph-27.0.2.tgz", 460 460 - "integrity": "sha512-fhUhgeljcrdZ+9DZND1De1029PrE+cMkIP7ooqkLRTrRLTqcki2AstsyJm0vRNbTbVCNJ0idGlbBrfqc7/nA8w==", 461 461 - "license": "MIT", 462 462 - "dependencies": { 463 463 - "@ts-morph/common": "~0.28.1", 464 464 - "code-block-writer": "^13.0.3" 465 465 - } 466 466 - }, 467 467 - "node_modules/@atproto/lex-cbor": { 468 468 - "version": "0.0.6", 469 469 - "resolved": "https://registry.npmjs.org/@atproto/lex-cbor/-/lex-cbor-0.0.6.tgz", 470 470 - "integrity": "sha512-lee2T00owDy3I1plRHuURT6f98NIpYZZr2wXa5pJZz5JzefZ+nv8gJ2V70C2f+jmSG+5S9NTIy4uJw94vaHf4A==", 471 471 - "license": "MIT", 472 472 - "dependencies": { 473 473 - "@atproto/lex-data": "0.0.6", 474 474 - "multiformats": "^9.9.0", 475 475 - "tslib": "^2.8.1" 476 476 - } 477 477 - }, 478 478 - "node_modules/@atproto/lex-cbor/node_modules/multiformats": { 479 479 - "version": "9.9.0", 480 480 - "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-9.9.0.tgz", 481 481 - "integrity": "sha512-HoMUjhH9T8DDBNT+6xzkrd9ga/XiBI4xLr58LJACwK6G3HTOPeMz4nB4KJs33L2BelrIJa7P0VuNaVF3hMYfjg==", 482 482 - "license": "(Apache-2.0 AND MIT)" 483 483 - }, 484 398 "node_modules/@atproto/lex-cli": { 485 399 "version": "0.9.5", 486 400 "resolved": "https://registry.npmjs.org/@atproto/lex-cli/-/lex-cli-0.9.5.tgz", ··· 514 428 "tslib": "^2.8.1" 515 429 } 516 430 }, 517 517 - "node_modules/@atproto/lex-client": { 518 518 - "version": "0.0.7", 519 519 - "resolved": "https://registry.npmjs.org/@atproto/lex-client/-/lex-client-0.0.7.tgz", 520 520 - "integrity": "sha512-ofUz3yXJ0nN/M9aqqF2ZUL/4D1wWT1P4popCfV3OEDsDrtWofMflYPFz1IWuyPa2e83paaEHRhaw3bZEhgXH1w==", 521 521 - "license": "MIT", 522 522 - "dependencies": { 523 523 - "@atproto/lex-data": "0.0.6", 524 524 - "@atproto/lex-json": "0.0.6", 525 525 - "@atproto/lex-schema": "0.0.7", 526 526 - "tslib": "^2.8.1" 527 527 - } 528 528 - }, 529 529 - "node_modules/@atproto/lex-data": { 530 530 - "version": "0.0.6", 531 531 - "resolved": "https://registry.npmjs.org/@atproto/lex-data/-/lex-data-0.0.6.tgz", 532 532 - "integrity": "sha512-MBNB4ghRJQzuXK1zlUPljpPbQcF1LZ5dzxy274KqPt4p3uPuRw0mHjgcCoWzRUNBQC685WMQR4IN9DHtsnG57A==", 533 533 - "license": "MIT", 534 534 - "dependencies": { 535 535 - "@atproto/syntax": "0.4.2", 536 536 - "multiformats": "^9.9.0", 537 537 - "tslib": "^2.8.1", 538 538 - "uint8arrays": "3.0.0", 539 539 - "unicode-segmenter": "^0.14.0" 540 540 - } 541 541 - }, 542 542 - "node_modules/@atproto/lex-data/node_modules/@atproto/syntax": { 543 543 - "version": "0.4.2", 544 544 - "resolved": "https://registry.npmjs.org/@atproto/syntax/-/syntax-0.4.2.tgz", 545 545 - "integrity": "sha512-X9XSRPinBy/0VQ677j8VXlBsYSsUXaiqxWVpGGxJYsAhugdQRb0jqaVKJFtm6RskeNkV6y9xclSUi9UYG/COrA==", 546 546 - "license": "MIT" 547 547 - }, 548 548 - "node_modules/@atproto/lex-data/node_modules/multiformats": { 549 549 - "version": "9.9.0", 550 550 - "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-9.9.0.tgz", 551 551 - "integrity": "sha512-HoMUjhH9T8DDBNT+6xzkrd9ga/XiBI4xLr58LJACwK6G3HTOPeMz4nB4KJs33L2BelrIJa7P0VuNaVF3hMYfjg==", 552 552 - "license": "(Apache-2.0 AND MIT)" 553 553 - }, 554 554 - "node_modules/@atproto/lex-document": { 555 555 - "version": "0.0.8", 556 556 - "resolved": "https://registry.npmjs.org/@atproto/lex-document/-/lex-document-0.0.8.tgz", 557 557 - "integrity": "sha512-p3l5h96Hx0vxUwbO/eas6x5h2vU0JVN1a/ktX4k3PlK9YLXfWMFsv+RdVwVZom8o0irHwlcyh1D/cY0PyUojDA==", 558 558 - "license": "MIT", 559 559 - "dependencies": { 560 560 - "@atproto/lex-schema": "0.0.7", 561 561 - "core-js": "^3", 562 562 - "tslib": "^2.8.1" 563 563 - } 564 564 - }, 565 565 - "node_modules/@atproto/lex-installer": { 566 566 - "version": "0.0.9", 567 567 - "resolved": "https://registry.npmjs.org/@atproto/lex-installer/-/lex-installer-0.0.9.tgz", 568 568 - "integrity": "sha512-zEeIeSaSCb3j+zNsqqMY7+X5FO6fxy/MafaCEj42KsXQHNcobuygZsnG/0fxMj/kMvhjrNUCp/w9PyOMwx4hQg==", 569 569 - "license": "MIT", 570 570 - "dependencies": { 571 571 - "@atproto/lex-builder": "0.0.9", 572 572 - "@atproto/lex-cbor": "0.0.6", 573 573 - "@atproto/lex-data": "0.0.6", 574 574 - "@atproto/lex-document": "0.0.8", 575 575 - "@atproto/lex-resolver": "0.0.8", 576 576 - "@atproto/lex-schema": "0.0.7", 577 577 - "@atproto/syntax": "0.4.2", 578 578 - "tslib": "^2.8.1" 579 579 - } 580 580 - }, 581 581 - "node_modules/@atproto/lex-installer/node_modules/@atproto/syntax": { 582 582 - "version": "0.4.2", 583 583 - "resolved": "https://registry.npmjs.org/@atproto/syntax/-/syntax-0.4.2.tgz", 584 584 - "integrity": "sha512-X9XSRPinBy/0VQ677j8VXlBsYSsUXaiqxWVpGGxJYsAhugdQRb0jqaVKJFtm6RskeNkV6y9xclSUi9UYG/COrA==", 585 585 - "license": "MIT" 586 586 - }, 587 587 - "node_modules/@atproto/lex-json": { 588 588 - "version": "0.0.6", 589 589 - "resolved": "https://registry.npmjs.org/@atproto/lex-json/-/lex-json-0.0.6.tgz", 590 590 - "integrity": "sha512-EILnN5cditPvf+PCNjXt7reMuzjugxAL1fpSzmzJbEMGMUwxOf5pPWxRsaA/M3Boip4NQZ+6DVrPOGUMlnqceg==", 591 591 - "license": "MIT", 592 592 - "dependencies": { 593 593 - "@atproto/lex-data": "0.0.6", 594 594 - "tslib": "^2.8.1" 595 595 - } 596 596 - }, 597 597 - "node_modules/@atproto/lex-resolver": { 598 598 - "version": "0.0.8", 599 599 - "resolved": "https://registry.npmjs.org/@atproto/lex-resolver/-/lex-resolver-0.0.8.tgz", 600 600 - "integrity": "sha512-4hXT560+k5BIttouuhXOr+UkhAuFvvkJaVdqYb8vx2Ez7eHPiZ+yWkUK6FKpyGsx2whHkJzgleEA6DNWtdDlWA==", 601 601 - "license": "MIT", 602 602 - "dependencies": { 603 603 - "@atproto-labs/did-resolver": "0.2.5", 604 604 - "@atproto/crypto": "0.4.5", 605 605 - "@atproto/lex-client": "0.0.7", 606 606 - "@atproto/lex-data": "0.0.6", 607 607 - "@atproto/lex-document": "0.0.8", 608 608 - "@atproto/lex-schema": "0.0.7", 609 609 - "@atproto/repo": "0.8.12", 610 610 - "@atproto/syntax": "0.4.2", 611 611 - "tslib": "^2.8.1" 612 612 - } 613 613 - }, 614 614 - "node_modules/@atproto/lex-resolver/node_modules/@atproto-labs/did-resolver": { 615 615 - "version": "0.2.5", 616 616 - "resolved": "https://registry.npmjs.org/@atproto-labs/did-resolver/-/did-resolver-0.2.5.tgz", 617 617 - "integrity": "sha512-he7EC6OMSifNs01a4RT9mta/yYitoKDzlK9ty2TFV5Uj/+HpB4vYMRdIDFrRW0Hcsehy90E2t/dw0t7361MEKQ==", 618 618 - "license": "MIT", 619 619 - "dependencies": { 620 620 - "@atproto-labs/fetch": "0.2.3", 621 621 - "@atproto-labs/pipe": "0.1.1", 622 622 - "@atproto-labs/simple-store": "0.3.0", 623 623 - "@atproto-labs/simple-store-memory": "0.1.4", 624 624 - "@atproto/did": "0.2.4", 625 625 - "zod": "^3.23.8" 626 626 - } 627 627 - }, 628 628 - "node_modules/@atproto/lex-resolver/node_modules/@atproto/did": { 629 629 - "version": "0.2.4", 630 630 - "resolved": "https://registry.npmjs.org/@atproto/did/-/did-0.2.4.tgz", 631 631 - "integrity": "sha512-nxNiCgXeo7pfjojq9fpfZxCO0X0xUipNVKW+AHNZwQKiUDt6zYL0VXEfm8HBUwQOCmKvj2pRRSM1Cur+tUWk3g==", 632 632 - "license": "MIT", 633 633 - "dependencies": { 634 634 - "zod": "^3.23.8" 635 635 - } 636 636 - }, 637 637 - "node_modules/@atproto/lex-resolver/node_modules/@atproto/syntax": { 638 638 - "version": "0.4.2", 639 639 - "resolved": "https://registry.npmjs.org/@atproto/syntax/-/syntax-0.4.2.tgz", 640 640 - "integrity": "sha512-X9XSRPinBy/0VQ677j8VXlBsYSsUXaiqxWVpGGxJYsAhugdQRb0jqaVKJFtm6RskeNkV6y9xclSUi9UYG/COrA==", 641 641 - "license": "MIT" 642 642 - }, 643 643 - "node_modules/@atproto/lex-schema": { 644 644 - "version": "0.0.7", 645 645 - "resolved": "https://registry.npmjs.org/@atproto/lex-schema/-/lex-schema-0.0.7.tgz", 646 646 - "integrity": "sha512-/7HkTUsnP1rlzmVE6nnY0kl/hydL/W8V29V8BhFwdAvdDKpYcdRgzzsMe38LAt+ZOjHknRCZDIKGsbQMSbJErw==", 647 647 - "license": "MIT", 648 648 - "dependencies": { 649 649 - "@atproto/lex-data": "0.0.6", 650 650 - "@atproto/syntax": "0.4.2", 651 651 - "tslib": "^2.8.1" 652 652 - } 653 653 - }, 654 654 - "node_modules/@atproto/lex-schema/node_modules/@atproto/syntax": { 655 655 - "version": "0.4.2", 656 656 - "resolved": "https://registry.npmjs.org/@atproto/syntax/-/syntax-0.4.2.tgz", 657 657 - "integrity": "sha512-X9XSRPinBy/0VQ677j8VXlBsYSsUXaiqxWVpGGxJYsAhugdQRb0jqaVKJFtm6RskeNkV6y9xclSUi9UYG/COrA==", 658 658 - "license": "MIT" 659 659 - }, 660 431 "node_modules/@atproto/lexicon": { 661 432 "version": "0.6.1", 662 433 "resolved": "https://registry.npmjs.org/@atproto/lexicon/-/lexicon-0.6.1.tgz", ··· 847 618 "integrity": "sha512-8CNmi5DipOLaVeSMPggMe7FCksVag0aO6XZy9WflbduTKM4dFZVCs4686UeMLfGRXX+X966XgwECHoLYrovMMg==", 848 619 "license": "MIT" 849 620 }, 850 850 - "node_modules/@atproto/tap": { 851 851 - "version": "0.1.1", 852 852 - "resolved": "https://registry.npmjs.org/@atproto/tap/-/tap-0.1.1.tgz", 853 853 - "integrity": "sha512-gW4NzLOxj74TzaDOVzzzt5kl2PdC0r75XkIpYpI5xobwCfsc/DmVtwpuSw1fW9gr4Vzk2Q90S9UE4ifAFl2gyA==", 854 854 - "license": "MIT", 855 855 - "dependencies": { 856 856 - "@atproto/common": "^0.5.6", 857 857 - "@atproto/lex": "^0.0.9", 858 858 - "@atproto/syntax": "^0.4.2", 859 859 - "@atproto/ws-client": "^0.0.4", 860 860 - "ws": "^8.12.0", 861 861 - "zod": "^3.23.8" 862 862 - }, 863 863 - "engines": { 864 864 - "node": ">=18.7.0" 865 865 - } 866 866 - }, 867 867 - "node_modules/@atproto/tap/node_modules/@atproto/common": { 868 868 - "version": "0.5.10", 869 869 - "resolved": "https://registry.npmjs.org/@atproto/common/-/common-0.5.10.tgz", 870 870 - "integrity": "sha512-A1+4W3JmjZIgmtJFLJBAaoVruZhRL0ANtyjZ91aJR4rjHcZuaQ+v4IFR1UcE6yyTATacLdBk6ADy8OtxXzq14g==", 871 871 - "license": "MIT", 872 872 - "dependencies": { 873 873 - "@atproto/common-web": "^0.4.15", 874 874 - "@atproto/lex-cbor": "^0.0.10", 875 875 - "@atproto/lex-data": "^0.0.10", 876 876 - "iso-datestring-validator": "^2.2.2", 877 877 - "multiformats": "^9.9.0", 878 878 - "pino": "^8.21.0" 879 879 - }, 880 880 - "engines": { 881 881 - "node": ">=18.7.0" 882 882 - } 883 883 - }, 884 884 - "node_modules/@atproto/tap/node_modules/@atproto/lex-cbor": { 885 885 - "version": "0.0.10", 886 886 - "resolved": "https://registry.npmjs.org/@atproto/lex-cbor/-/lex-cbor-0.0.10.tgz", 887 887 - "integrity": "sha512-5RtV90iIhRNCXXvvETd3KlraV8XGAAAgOmiszUb+l8GySDU/sGk7AlVvArFfXnj/S/GXJq8DP6IaUxCw/sPASA==", 888 888 - "license": "MIT", 889 889 - "dependencies": { 890 890 - "@atproto/lex-data": "^0.0.10", 891 891 - "tslib": "^2.8.1" 892 892 - } 893 893 - }, 894 894 - "node_modules/@atproto/tap/node_modules/@atproto/lex-data": { 895 895 - "version": "0.0.10", 896 896 - "resolved": "https://registry.npmjs.org/@atproto/lex-data/-/lex-data-0.0.10.tgz", 897 897 - "integrity": "sha512-FDbcy8VIUVzS9Mi1F8SMxbkL/jOUmRRpqbeM1xB4A0fMxeZJTxf6naAbFt4gYF3quu/+TPJGmio6/7cav05FqQ==", 898 898 - "license": "MIT", 899 899 - "dependencies": { 900 900 - "multiformats": "^9.9.0", 901 901 - "tslib": "^2.8.1", 902 902 - "uint8arrays": "3.0.0", 903 903 - "unicode-segmenter": "^0.14.0" 904 904 - } 905 905 - }, 906 906 - "node_modules/@atproto/tap/node_modules/@atproto/syntax": { 907 907 - "version": "0.4.3", 908 908 - "resolved": "https://registry.npmjs.org/@atproto/syntax/-/syntax-0.4.3.tgz", 909 909 - "integrity": "sha512-YoZUz40YAJr5nPwvCDWgodEOlt5IftZqPJvA0JDWjuZKD8yXddTwSzXSaKQAzGOpuM+/A3uXRtPzJJqlScc+iA==", 910 910 - "license": "MIT", 911 911 - "dependencies": { 912 912 - "tslib": "^2.8.1" 913 913 - } 914 914 - }, 915 915 - "node_modules/@atproto/tap/node_modules/multiformats": { 916 916 - "version": "9.9.0", 917 917 - "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-9.9.0.tgz", 918 918 - "integrity": "sha512-HoMUjhH9T8DDBNT+6xzkrd9ga/XiBI4xLr58LJACwK6G3HTOPeMz4nB4KJs33L2BelrIJa7P0VuNaVF3hMYfjg==", 919 919 - "license": "(Apache-2.0 AND MIT)" 920 920 - }, 921 921 - "node_modules/@atproto/ws-client": { 922 922 - "version": "0.0.4", 923 923 - "resolved": "https://registry.npmjs.org/@atproto/ws-client/-/ws-client-0.0.4.tgz", 924 924 - "integrity": "sha512-dox1XIymuC7/ZRhUqKezIGgooZS45C6vHCfu0PnWjfvsLCK2kAlnvX4IBkA/WpcoijDhQ9ejChnFbo/sLmgvAg==", 925 925 - "license": "MIT", 926 926 - "dependencies": { 927 927 - "@atproto/common": "^0.5.3", 928 928 - "ws": "^8.12.0" 929 929 - }, 930 930 - "engines": { 931 931 - "node": ">=18.7.0" 932 932 - } 933 933 - }, 934 934 - "node_modules/@atproto/ws-client/node_modules/@atproto/common": { 935 935 - "version": "0.5.10", 936 936 - "resolved": "https://registry.npmjs.org/@atproto/common/-/common-0.5.10.tgz", 937 937 - "integrity": "sha512-A1+4W3JmjZIgmtJFLJBAaoVruZhRL0ANtyjZ91aJR4rjHcZuaQ+v4IFR1UcE6yyTATacLdBk6ADy8OtxXzq14g==", 938 938 - "license": "MIT", 939 939 - "dependencies": { 940 940 - "@atproto/common-web": "^0.4.15", 941 941 - "@atproto/lex-cbor": "^0.0.10", 942 942 - "@atproto/lex-data": "^0.0.10", 943 943 - "iso-datestring-validator": "^2.2.2", 944 944 - "multiformats": "^9.9.0", 945 945 - "pino": "^8.21.0" 946 946 - }, 947 947 - "engines": { 948 948 - "node": ">=18.7.0" 949 949 - } 950 950 - }, 951 951 - "node_modules/@atproto/ws-client/node_modules/@atproto/lex-cbor": { 952 952 - "version": "0.0.10", 953 953 - "resolved": "https://registry.npmjs.org/@atproto/lex-cbor/-/lex-cbor-0.0.10.tgz", 954 954 - "integrity": "sha512-5RtV90iIhRNCXXvvETd3KlraV8XGAAAgOmiszUb+l8GySDU/sGk7AlVvArFfXnj/S/GXJq8DP6IaUxCw/sPASA==", 955 955 - "license": "MIT", 956 956 - "dependencies": { 957 957 - "@atproto/lex-data": "^0.0.10", 958 958 - "tslib": "^2.8.1" 959 959 - } 960 960 - }, 961 961 - "node_modules/@atproto/ws-client/node_modules/@atproto/lex-data": { 962 962 - "version": "0.0.10", 963 963 - "resolved": "https://registry.npmjs.org/@atproto/lex-data/-/lex-data-0.0.10.tgz", 964 964 - "integrity": "sha512-FDbcy8VIUVzS9Mi1F8SMxbkL/jOUmRRpqbeM1xB4A0fMxeZJTxf6naAbFt4gYF3quu/+TPJGmio6/7cav05FqQ==", 965 965 - "license": "MIT", 966 966 - "dependencies": { 967 967 - "multiformats": "^9.9.0", 968 968 - "tslib": "^2.8.1", 969 969 - "uint8arrays": "3.0.0", 970 970 - "unicode-segmenter": "^0.14.0" 971 971 - } 972 972 - }, 973 973 - "node_modules/@atproto/ws-client/node_modules/multiformats": { 974 974 - "version": "9.9.0", 975 975 - "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-9.9.0.tgz", 976 976 - "integrity": "sha512-HoMUjhH9T8DDBNT+6xzkrd9ga/XiBI4xLr58LJACwK6G3HTOPeMz4nB4KJs33L2BelrIJa7P0VuNaVF3hMYfjg==", 977 977 - "license": "(Apache-2.0 AND MIT)" 978 978 - }, 979 621 "node_modules/@atproto/xrpc": { 980 622 "version": "0.7.5", 981 623 "resolved": "https://registry.npmjs.org/@atproto/xrpc/-/xrpc-0.7.5.tgz", ··· 3051 2693 "integrity": "sha512-HoMUjhH9T8DDBNT+6xzkrd9ga/XiBI4xLr58LJACwK6G3HTOPeMz4nB4KJs33L2BelrIJa7P0VuNaVF3hMYfjg==", 3052 2694 "license": "(Apache-2.0 AND MIT)" 3053 2695 }, 3054 3054 - "node_modules/@isaacs/balanced-match": { 3055 3055 - "version": "4.0.1", 3056 3056 - "resolved": "https://registry.npmjs.org/@isaacs/balanced-match/-/balanced-match-4.0.1.tgz", 3057 3057 - "integrity": "sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ==", 3058 3058 - "license": "MIT", 3059 3059 - "engines": { 3060 3060 - "node": "20 || >=22" 3061 3061 - } 3062 3062 - }, 3063 3063 - "node_modules/@isaacs/brace-expansion": { 3064 3064 - "version": "5.0.0", 3065 3065 - "resolved": "https://registry.npmjs.org/@isaacs/brace-expansion/-/brace-expansion-5.0.0.tgz", 3066 3066 - "integrity": "sha512-ZT55BDLV0yv0RBm2czMiZ+SqCGO7AvmOM3G/w2xhVPH+te0aKgFjmBvGlL1dH+ql2tgGO3MVrbb3jCKyvpgnxA==", 3067 3067 - "license": "MIT", 3068 3068 - "dependencies": { 3069 3069 - "@isaacs/balanced-match": "^4.0.1" 3070 3070 - }, 3071 3071 - "engines": { 3072 3072 - "node": "20 || >=22" 3073 3073 - } 3074 3074 - }, 3075 2696 "node_modules/@isaacs/fs-minipass": { 3076 2697 "version": "4.0.1", 3077 2698 "resolved": "https://registry.npmjs.org/@isaacs/fs-minipass/-/fs-minipass-4.0.1.tgz", ··· 8661 8282 } 8662 8283 } 8663 8284 }, 8285 8285 + "node_modules/@yornaath/batshit": { 8286 8286 + "version": "0.14.0", 8287 8287 + "resolved": "https://registry.npmjs.org/@yornaath/batshit/-/batshit-0.14.0.tgz", 8288 8288 + "integrity": "sha512-0I+xMi5JoRs3+qVXXhk2AmsEl43MwrG+L+VW+nqw/qQqMFtgRPszLaxhJCfsBKnjfJ0gJzTI1Q9Q9+y903HyHQ==", 8289 8289 + "license": "MIT", 8290 8290 + "dependencies": { 8291 8291 + "@yornaath/batshit-devtools": "^1.7.1" 8292 8292 + } 8293 8293 + }, 8294 8294 + "node_modules/@yornaath/batshit-devtools": { 8295 8295 + "version": "1.7.1", 8296 8296 + "resolved": "https://registry.npmjs.org/@yornaath/batshit-devtools/-/batshit-devtools-1.7.1.tgz", 8297 8297 + "integrity": "sha512-AyttV1Njj5ug+XqEWY1smV45dTWMlWKtj1B8jcFYgBKUFyUlF/qEhD+iP1E5UaRYW6hQRYD9T2WNDwFTrOMWzQ==", 8298 8298 + "license": "MIT" 8299 8299 + }, 8664 8300 "node_modules/abort-controller": { 8665 8301 "version": "3.0.0", 8666 8302 "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz", ··· 9615 9251 "version": "13.0.3", 9616 9252 "resolved": "https://registry.npmjs.org/code-block-writer/-/code-block-writer-13.0.3.tgz", 9617 9253 "integrity": "sha512-Oofo0pq3IKnsFtuHqSF7TqBfr71aeyZDVJ0HpmqB7FBM2qEigL0iPONSCZSO9pE9dZTAxANe5XHG9Uy0YMv8cg==", 9254 9254 + "dev": true, 9618 9255 "license": "MIT" 9619 9256 }, 9620 9257 "node_modules/collapse-white-space": { ··· 9722 9359 "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", 9723 9360 "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==", 9724 9361 "license": "MIT" 9725 9725 - }, 9726 9726 - "node_modules/core-js": { 9727 9727 - "version": "3.47.0", 9728 9728 - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.47.0.tgz", 9729 9729 - "integrity": "sha512-c3Q2VVkGAUyupsjRnaNX6u8Dq2vAdzm9iuPj5FW0fRxzlxgq9Q39MDq10IvmQSpLgHQNyQzQmOo6bgGHmH3NNg==", 9730 9730 - "hasInstallScript": true, 9731 9731 - "license": "MIT", 9732 9732 - "funding": { 9733 9733 - "type": "opencollective", 9734 9734 - "url": "https://opencollective.com/core-js" 9735 9735 - } 9736 9362 }, 9737 9363 "node_modules/crelt": { 9738 9364 "version": "1.0.6", ··· 16126 15752 "version": "1.0.1", 16127 15753 "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz", 16128 15754 "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==", 15755 15755 + "dev": true, 16129 15756 "license": "MIT" 16130 15757 }, 16131 15758 "node_modules/path-exists": { ··· 16408 16035 "version": "3.2.5", 16409 16036 "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.5.tgz", 16410 16037 "integrity": "sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==", 16038 16038 + "dev": true, 16411 16039 "bin": { 16412 16040 "prettier": "bin/prettier.cjs" 16413 16041 }, ··· 18504 18132 "version": "0.2.15", 18505 18133 "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz", 18506 18134 "integrity": "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==", 18135 18135 + "dev": true, 18507 18136 "license": "MIT", 18508 18137 "dependencies": { 18509 18138 "fdir": "^6.5.0", ··· 18520 18149 "version": "6.5.0", 18521 18150 "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz", 18522 18151 "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==", 18152 18152 + "dev": true, 18523 18153 "license": "MIT", 18524 18154 "engines": { 18525 18155 "node": ">=12.0.0" ··· 18537 18167 "version": "4.0.3", 18538 18168 "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz", 18539 18169 "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", 18170 18170 + "dev": true, 18540 18171 "license": "MIT", 18541 18172 "engines": { 18542 18173 "node": ">=12"

+1 -1

package.json

··· 27 27 "@atproto/oauth-client-node": "^0.3.8", 28 28 "@atproto/sync": "^0.1.34", 29 29 "@atproto/syntax": "^0.3.3", 30 30 - "@atproto/tap": "^0.1.1", 31 30 "@atproto/xrpc": "^0.7.5", 32 31 "@atproto/xrpc-server": "^0.9.5", 33 32 "@hono/node-server": "^1.14.3", ··· 49 48 "@vercel/analytics": "^1.5.0", 50 49 "@vercel/functions": "^2.2.12", 51 50 "@vercel/sdk": "^1.11.4", 51 51 + "@yornaath/batshit": "^0.14.0", 52 52 "babel-plugin-react-compiler": "^19.1.0-rc.1", 53 53 "base64-js": "^1.5.1", 54 54 "colorjs.io": "^0.5.2",

+27 -9

src/atproto-oauth.ts

··· 93 93 }, 94 94 }; 95 95 96 96 - export type OAuthSessionError = { 97 97 - type: "oauth_session_expired"; 98 98 - message: string; 99 99 - did: string; 100 100 - }; 96 96 + export type OAuthSessionError = 97 97 + | { 98 98 + type: "oauth_session_expired"; 99 99 + message: string; 100 100 + did: string; 101 101 + } 102 102 + | { 103 103 + type: "missing_scope"; 104 104 + message: string; 105 105 + did: string; 106 106 + scope: string; 107 107 + }; 101 108 102 109 export async function restoreOAuthSession( 103 110 did: string ··· 107 114 const session = await oauthClient.restore(did); 108 115 return Ok(session); 109 116 } catch (error) { 117 117 + const message = 118 118 + error instanceof Error 119 119 + ? error.message 120 120 + : "OAuth session expired or invalid"; 121 121 + if (message.includes("Missing required scope")) { 122 122 + const scope = message.replace("Missing required scope: ", "").trim(); 123 123 + console.error(`OAuth missing scope for ${did}: ${scope}`); 124 124 + return Err({ 125 125 + type: "missing_scope", 126 126 + message, 127 127 + did, 128 128 + scope, 129 129 + }); 130 130 + } 110 131 return Err({ 111 132 type: "oauth_session_expired", 112 112 - message: 113 113 - error instanceof Error 114 114 - ? error.message 115 115 - : "OAuth session expired or invalid", 133 133 + message, 116 134 did, 117 135 }); 118 136 }

+14

src/replicache/mutations.ts

··· 659 659 tags?: string[]; 660 660 cover_image?: string | null; 661 661 localPublishedAt?: string | null; 662 662 + preferences?: { 663 663 + showComments?: boolean; 664 664 + showMentions?: boolean; 665 665 + showRecommends?: boolean; 666 666 + } | null; 662 667 }> = async (args, ctx) => { 663 668 await ctx.runOnServer(async (serverCtx) => { 669 669 + console.log("updating"); 664 670 const updates: { 665 671 description?: string; 666 672 title?: string; 667 673 tags?: string[]; 668 674 cover_image?: string | null; 675 675 + preferences?: { 676 676 + showComments?: boolean; 677 677 + showMentions?: boolean; 678 678 + showRecommends?: boolean; 679 679 + } | null; 669 680 } = {}; 670 681 if (args.description !== undefined) updates.description = args.description; 671 682 if (args.title !== undefined) updates.title = args.title; 672 683 if (args.tags !== undefined) updates.tags = args.tags; 673 684 if (args.cover_image !== undefined) updates.cover_image = args.cover_image; 685 685 + if (args.preferences !== undefined) updates.preferences = args.preferences; 674 686 675 687 if (Object.keys(updates).length > 0) { 676 688 // First try to update leaflets_in_publications (for publications) ··· 699 711 await tx.set("publication_cover_image", args.cover_image); 700 712 if (args.localPublishedAt !== undefined) 701 713 await tx.set("publication_local_published_at", args.localPublishedAt); 714 714 + if (args.preferences !== undefined) 715 715 + await tx.set("post_preferences", args.preferences); 702 716 }); 703 717 }; 704 718

-12

src/utils/getRecordFromDid.ts

··· 1 1 - import { callRPC } from "app/api/rpc/client"; 2 2 - import { ProfileViewDetailed } from "@atproto/api/dist/client/types/app/bsky/actor/defs"; 3 3 - import useSWR from "swr"; 4 4 - 5 5 - export function useProfileFromDid(did: string | undefined) { 6 6 - return useSWR(did ? ["profile-data", did] : null, async () => { 7 7 - const response = await callRPC("get_profile_data", { 8 8 - didOrHandle: did!, 9 9 - }); 10 10 - return response.result.profile as ProfileViewDetailed | undefined; 11 11 - }); 12 12 - }

+24

src/utils/mergePreferences.ts

··· 1 1 + type PreferencesInput = { 2 2 + showComments?: boolean; 3 3 + showMentions?: boolean; 4 4 + showRecommends?: boolean; 5 5 + showPrevNext?: boolean; 6 6 + } | null; 7 7 + 8 8 + export function mergePreferences( 9 9 + documentPrefs?: PreferencesInput, 10 10 + publicationPrefs?: PreferencesInput, 11 11 + ): { 12 12 + showComments?: boolean; 13 13 + showMentions?: boolean; 14 14 + showRecommends?: boolean; 15 15 + showPrevNext?: boolean; 16 16 + } { 17 17 + return { 18 18 + showComments: documentPrefs?.showComments ?? publicationPrefs?.showComments, 19 19 + showMentions: documentPrefs?.showMentions ?? publicationPrefs?.showMentions, 20 20 + showRecommends: 21 21 + documentPrefs?.showRecommends ?? publicationPrefs?.showRecommends, 22 22 + showPrevNext: publicationPrefs?.showPrevNext, 23 23 + }; 24 24 + }

+6

supabase/database.types.ts

··· 589 589 description: string 590 590 doc: string | null 591 591 leaflet: string 592 592 + preferences: Json | null 592 593 publication: string 593 594 tags: string[] | null 594 595 title: string ··· 599 600 description?: string 600 601 doc?: string | null 601 602 leaflet: string 603 603 + preferences?: Json | null 602 604 publication: string 603 605 tags?: string[] | null 604 606 title?: string ··· 609 611 description?: string 610 612 doc?: string | null 611 613 leaflet?: string 614 614 + preferences?: Json | null 612 615 publication?: string 613 616 tags?: string[] | null 614 617 title?: string ··· 645 648 description: string 646 649 document: string 647 650 leaflet: string 651 651 + preferences: Json | null 648 652 tags: string[] | null 649 653 title: string 650 654 } ··· 655 659 description?: string 656 660 document: string 657 661 leaflet: string 662 662 + preferences?: Json | null 658 663 tags?: string[] | null 659 664 title?: string 660 665 } ··· 665 670 description?: string 666 671 document?: string 667 672 leaflet?: string 673 673 + preferences?: Json | null 668 674 tags?: string[] | null 669 675 title?: string 670 676 }

+2

supabase/migrations/20260208000000_add_preferences_to_drafts.sql

··· 1 1 + ALTER TABLE leaflets_in_publications ADD COLUMN preferences jsonb; 2 2 + ALTER TABLE leaflets_to_documents ADD COLUMN preferences jsonb;