feat: actually work properly on forks, refactor ui

+1

.gitignore

··· 14 14 .wxt 15 15 .wxt-runner 16 16 web-ext.config.ts 17 + web-ext-artifacts 17 18 18 19 # Editor directories and files 19 20 .vscode/*

+1 -1

package.json

··· 2 2 "name": "at-fronter", 3 3 "description": "view who was fronting when a record was made", 4 4 "private": true, 5 - "version": "0.0.0", 5 + "version": "0.0.1", 6 6 "type": "module", 7 7 "scripts": { 8 8 "dev": "wxt",

+18 -12

src/entrypoints/background.ts

··· 1 1 import { expect } from "@/lib/result"; 2 2 import { 3 3 type Fronter, 4 + fronterGetSocialAppHrefs, 4 5 fronterGetSocialAppHref, 5 6 getFronter, 6 7 getSpFronters, ··· 80 81 browser.tabs.sendMessage(sender.tab?.id!, { 81 82 type: "TIMELINE_FRONTER", 82 83 results: new Map( 83 - results.map((fronter) => [ 84 - fronterGetSocialAppHref(fronter, fronter.rkey), 85 - fronter, 86 - ]), 84 + results.flatMap((fronter) => 85 + fronterGetSocialAppHrefs(fronter, fronter.rkey).map((href) => [ 86 + href, 87 + fronter, 88 + ]), 89 + ), 87 90 ), 88 91 }); 89 92 }; ··· 126 129 (await Promise.allSettled(allPromises)) 127 130 .filter((result) => result.status === "fulfilled") 128 131 .flatMap((result) => result.value ?? []) 129 - .map((fronter) => [ 130 - fronterGetSocialAppHref(fronter, fronter.rkey), 131 - fronter, 132 - ]), 132 + .flatMap((fronter) => 133 + fronterGetSocialAppHrefs(fronter, fronter.rkey).map((href) => [ 134 + href, 135 + fronter, 136 + ]), 137 + ), 133 138 ); 134 139 browser.tabs.sendMessage(sender.tab?.id!, { 135 140 type: "TIMELINE_FRONTER", ··· 170 175 (await Promise.allSettled(promises)) 171 176 .filter((result) => result.status === "fulfilled") 172 177 .flatMap((result) => result.value ?? []) 173 - .map((fronter) => [ 174 - fronterGetSocialAppHref(fronter, fronter.rkey, fronter.depth), 175 - fronter, 176 - ]), 178 + .flatMap((fronter) => 179 + fronterGetSocialAppHrefs(fronter, fronter.rkey, fronter.depth).map( 180 + (href) => [href, fronter], 181 + ), 182 + ), 177 183 ); 178 184 browser.tabs.sendMessage(sender.tab?.id!, { 179 185 type: "THREAD_FRONTER",

+5 -1

src/entrypoints/content.ts

··· 2 2 import { 3 3 Fronter, 4 4 fronterGetSocialAppHref, 5 + fronterGetSocialAppHrefs, 5 6 parseSocialAppPostUrl, 6 7 } from "@/lib/utils"; 7 8 import { parseResourceUri, ResourceUri } from "@atcute/lexicons"; ··· 145 146 fronters.entries().flatMap(([uri, fronter]) => { 146 147 if (!fronter) return []; 147 148 const rkey = expect(parseResourceUri(uri)).rkey!; 148 - return [[fronterGetSocialAppHref(fronter, rkey), fronter]]; 149 + return fronterGetSocialAppHrefs(fronter, rkey).map((href) => [ 150 + href, 151 + fronter, 152 + ]); 149 153 }), 150 154 ); 151 155 applyFrontersToPage(updated);

+163 -99

src/entrypoints/popup/App.svelte

················································

+68 -3

src/entrypoints/popup/app.css

···

+15 -5

src/lib/utils.ts

··· 265 265 })); 266 266 }; 267 267 268 - export const fronterGetSocialAppHref = ( 268 + export const fronterGetSocialAppHrefs = ( 269 269 fronter: Fronter, 270 270 rkey: RecordKey, 271 271 depth?: number, 272 272 ) => { 273 - // console.log("fronterGetSocialAppHref", fronter, rkey, depth); 274 - return depth === 0 275 - ? `/profile/${fronter.handle ?? fronter.did}` 276 - : `/profile/${fronter.handle ?? fronter.did}/post/${rkey}`; 273 + return [ 274 + fronter.handle 275 + ? [fronterGetSocialAppHref(fronter.handle, rkey, depth)] 276 + : [], 277 + fronterGetSocialAppHref(fronter.did, rkey, depth), 278 + ].flat(); 279 + }; 280 + 281 + export const fronterGetSocialAppHref = ( 282 + repo: string, 283 + rkey: RecordKey, 284 + depth?: number, 285 + ) => { 286 + return depth === 0 ? `/profile/${repo}` : `/profile/${repo}/post/${rkey}`; 277 287 }; 278 288 279 289 export const parseSocialAppPostUrl = (url: string) => {

Configure Feed

Configure Feed