comparing dde8d558388ed545e375b2c344fdd08ad680e7af and main on pdsls.dev/pdsls

+2 -2

src/auth/session-manager.ts

···

       1
       1
       -
       import { Client, CredentialManager } from "@atcute/client";

     

       1
       1
       +
       import { Client, simpleFetchHandler } from "@atcute/client";

     

       2
       2
        
       import { Did } from "@atcute/lexicons";

     

       3
       3
        
       import {

     

       4
       4
        
         finalizeAuthorization,

     
···

       20
       20
        
       

     

       21
       21
        
       export const getAvatar = async (did: Did): Promise<string | undefined> => {

     

       22
       22
        
         const rpc = new Client({

     

       23
       23
       -
           handler: new CredentialManager({ service: "https://public.api.bsky.app" }),

     

       23
       23
       +
           handler: simpleFetchHandler({ service: "https://public.api.bsky.app" }),

     

       24
       24
        
         });

     

       25
       25
        
         const res = await rpc.get("app.bsky.actor.getProfile", { params: { actor: did } });

     

       26
       26
        
         if (res.ok) {

+2 -2

src/views/blob.tsx

···

       1
       1
       -
       import { Client, CredentialManager } from "@atcute/client";

     

       1
       1
       +
       import { Client, simpleFetchHandler } from "@atcute/client";

     

       2
       2
        
       import { createResource, createSignal, For, Show } from "solid-js";

     

       3
       3
        
       import { Button } from "../components/button";

     

       4
       4
        
       

     
···

       9
       9
        
         let rpc: Client;

     

       10
       10
        
       

     

       11
       11
        
         const fetchBlobs = async () => {

     

       12
       12
       -
           if (!rpc) rpc = new Client({ handler: new CredentialManager({ service: props.pds }) });

     

       12
       12
       +
           if (!rpc) rpc = new Client({ handler: simpleFetchHandler({ service: props.pds }) });

     

       13
       13
        
           const res = await rpc.get("com.atproto.sync.listBlobs", {

     

       14
       14
        
             params: {

     

       15
       15
        
               did: props.repo as `did:${string}:${string}`,

+2 -2

src/views/labels.tsx

···

       1
       1
        
       import { ComAtprotoLabelDefs } from "@atcute/atproto";

     

       2
       2
       -
       import { Client, CredentialManager } from "@atcute/client";

     

       2
       2
       +
       import { Client, simpleFetchHandler } from "@atcute/client";

     

       3
       3
        
       import { isAtprotoDid } from "@atcute/identity";

     

       4
       4
        
       import { Handle } from "@atcute/lexicons";

     

       5
       5
        
       import { A, useSearchParams } from "@solidjs/router";

     
···

       158
       158
        
             await resolvePDS(did);

     

       159
       159
        
             if (!labelerCache[did]) throw new Error("Repository is not a labeler");

     

       160
       160
        
             rpc = new Client({

     

       161
       161
       -
               handler: new CredentialManager({ service: labelerCache[did] }),

     

       161
       161
       +
               handler: simpleFetchHandler({ service: labelerCache[did] }),

     

       162
       162
        
             });

     

       163
       163
        
       

     

       164
       164
        
             setSearchParams({ did, uriPatterns });

+2 -2

src/views/pds.tsx

···

       1
       1
        
       import { ComAtprotoServerDescribeServer, ComAtprotoSyncListRepos } from "@atcute/atproto";

     

       2
       2
       -
       import { Client, CredentialManager } from "@atcute/client";

     

       2
       2
       +
       import { Client, simpleFetchHandler } from "@atcute/client";

     

       3
       3
        
       import { InferXRPCBodyOutput } from "@atcute/lexicons";

     

       4
       4
        
       import * as TID from "@atcute/tid";

     

       5
       5
        
       import { A, useLocation, useParams } from "@solidjs/router";

     
···

       23
       23
        
         setPDS(params.pds);

     

       24
       24
        
         const pds =

     

       25
       25
        
           params.pds!.startsWith("localhost") ? `http://${params.pds}` : `https://${params.pds}`;

     

       26
       26
       -
         const rpc = new Client({ handler: new CredentialManager({ service: pds }) });

     

       26
       26
       +
         const rpc = new Client({ handler: simpleFetchHandler({ service: pds }) });

     

       27
       27
        
       

     

       28
       28
        
         const getVersion = async () => {

     

       29
       29
        
           // @ts-expect-error: undocumented endpoint

+2 -2

src/views/repo.tsx

···

       1
       1
       -
       import { Client, CredentialManager } from "@atcute/client";

     

       1
       1
       +
       import { Client, simpleFetchHandler } from "@atcute/client";

     

       2
       2
        
       import { DidDocument } from "@atcute/identity";

     

       3
       3
        
       import { ActorIdentifier, Did, Handle, Nsid } from "@atcute/lexicons";

     

       4
       4
        
       import { A, useLocation, useNavigate, useParams } from "@solidjs/router";

     
···

       139
       139
        
             return {};

     

       140
       140
        
           }

     

       141
       141
        
       

     

       142
       142
       -
           rpc = new Client({ handler: new CredentialManager({ service: pds }) });

     

       142
       142
       +
           rpc = new Client({ handler: simpleFetchHandler({ service: pds }) });

     

       143
       143
        
           try {

     

       144
       144
        
             const res = await rpc.get("com.atproto.repo.describeRepo", {

     

       145
       145
        
               params: { repo: did as ActorIdentifier },

public/favicon.ico

This is a binary file and will not be displayed.

-2

index.html

···

       11
       11
        
           <meta property="description" content="Browse the public data on atproto" />

     

       12
       12
        
           <link rel="manifest" href="/manifest.json" />

     

       13
       13
        
           <title>PDSls</title>

     

       14
       14
       -
           <link rel="preconnect" href="https://rsms.me/" />

     

       15
       15
       -
           <link rel="stylesheet" href="https://rsms.me/inter/inter.css" />

     

       16
       14
        
           <link rel="preconnect" href="https://fonts.bunny.net" />

     

       17
       15
        
           <link href="https://fonts.bunny.net/css?family=roboto-mono:400" rel="stylesheet" />

     

       18
       16
        
           <link href="https://fonts.cdnfonts.com/css/pecita" rel="stylesheet" />

public/fonts/Figtree[wght].woff2

This is a binary file and will not be displayed.

+7 -1

src/styles/index.css

···

       6
       6
        
       

     

       7
       7
        
       @custom-variant dark (&:where(.dark, .dark *));

     

       8
       8
        
       

     

       9
       9
       +
       @font-face {

     

       10
       10
       +
         font-family: "Figtree";

     

       11
       11
       +
         src: url("/fonts/Figtree[wght].woff2") format("woff2");

     

       12
       12
       +
         font-display: swap;

     

       13
       13
       +
       }

     

       14
       14
       +
       

     

       9
       15
        
       @theme {

     

       10
       10
       -
         --font-sans: "Inter", sans-serif;

     

       16
       16
       +
         --font-sans: "Figtree", sans-serif;

     

       11
       17
        
         --font-mono: "Roboto Mono", monospace;

     

       12
       18
        
         --font-pecita: "Pecita", serif;

     

       13
       19

+5 -1

src/auth/account.tsx

···

       41
       41
        
         return (

     

       42
       42
        
           <MenuProvider>

     

       43
       43
        
             <DropdownMenu icon="lucide--ellipsis" buttonClass="rounded-md p-2">

     

       44
       44
       -
               <NavMenu href={`/at://${props.did}`} label="Go to repo" icon="lucide--user-round" />

     

       44
       44
       +
               <NavMenu

     

       45
       45
       +
                 href={`/at://${props.did}`}

     

       46
       46
       +
                 label={agent()?.sub === props.did ? "Go to repo (g)" : "Go to repo"}

     

       47
       47
       +
                 icon="lucide--user-round"

     

       48
       48
       +
               />

     

       45
       49
        
               <ActionMenu

     

       46
       50
        
                 icon="lucide--settings"

     

       47
       51
        
                 label="Edit permissions"

+1

src/components/create.tsx

···

       58
       58
        
         onMount(() => {

     

       59
       59
        
           const keyEvent = (ev: KeyboardEvent) => {

     

       60
       60
        
             if (ev.target instanceof HTMLInputElement || ev.target instanceof HTMLTextAreaElement) return;

     

       61
       61
       +
             if ((ev.target as HTMLElement).closest("[data-modal]")) return;

     

       61
       62
        
       

     

       62
       63
        
             const key = props.create ? "n" : "e";

     

       63
       64
        
             if (ev.key === key) {

+109

src/components/create/file-upload.tsx

···

       1
       1
       +
       import { Client } from "@atcute/client";

     

       2
       2
       +
       import { remove } from "@mary/exif-rm";

     

       3
       3
       +
       import { createSignal, onCleanup, Show } from "solid-js";

     

       4
       4
       +
       import { agent } from "../../auth/state";

     

       5
       5
       +
       import { Button } from "../button.jsx";

     

       6
       6
       +
       import { TextInput } from "../text-input.jsx";

     

       7
       7
       +
       import { editorInstance } from "./state";

     

       8
       8
       +
       

     

       9
       9
       +
       export const FileUpload = (props: {

     

       10
       10
       +
         file: File;

     

       11
       11
       +
         blobInput: HTMLInputElement;

     

       12
       12
       +
         onClose: () => void;

     

       13
       13
       +
       }) => {

     

       14
       14
       +
         const [uploading, setUploading] = createSignal(false);

     

       15
       15
       +
         const [error, setError] = createSignal("");

     

       16
       16
       +
       

     

       17
       17
       +
         onCleanup(() => (props.blobInput.value = ""));

     

       18
       18
       +
       

     

       19
       19
       +
         const formatFileSize = (bytes: number) => {

     

       20
       20
       +
           if (bytes === 0) return "0 Bytes";

     

       21
       21
       +
           const k = 1024;

     

       22
       22
       +
           const sizes = ["Bytes", "KB", "MB", "GB"];

     

       23
       23
       +
           const i = Math.floor(Math.log(bytes) / Math.log(k));

     

       24
       24
       +
           return Math.round((bytes / Math.pow(k, i)) * 100) / 100 + " " + sizes[i];

     

       25
       25
       +
         };

     

       26
       26
       +
       

     

       27
       27
       +
         const uploadBlob = async () => {

     

       28
       28
       +
           let blob: Blob;

     

       29
       29
       +
       

     

       30
       30
       +
           const mimetype = (document.getElementById("mimetype") as HTMLInputElement)?.value;

     

       31
       31
       +
           (document.getElementById("mimetype") as HTMLInputElement).value = "";

     

       32
       32
       +
           if (mimetype) blob = new Blob([props.file], { type: mimetype });

     

       33
       33
       +
           else blob = props.file;

     

       34
       34
       +
       

     

       35
       35
       +
           if ((document.getElementById("exif-rm") as HTMLInputElement).checked) {

     

       36
       36
       +
             const exifRemoved = remove(new Uint8Array(await blob.arrayBuffer()));

     

       37
       37
       +
             if (exifRemoved !== null) blob = new Blob([exifRemoved], { type: blob.type });

     

       38
       38
       +
           }

     

       39
       39
       +
       

     

       40
       40
       +
           const rpc = new Client({ handler: agent()! });

     

       41
       41
       +
           setUploading(true);

     

       42
       42
       +
           const res = await rpc.post("com.atproto.repo.uploadBlob", {

     

       43
       43
       +
             input: blob,

     

       44
       44
       +
           });

     

       45
       45
       +
           setUploading(false);

     

       46
       46
       +
           if (!res.ok) {

     

       47
       47
       +
             setError(res.data.error);

     

       48
       48
       +
             return;

     

       49
       49
       +
           }

     

       50
       50
       +
           editorInstance.view.dispatch({

     

       51
       51
       +
             changes: {

     

       52
       52
       +
               from: editorInstance.view.state.selection.main.head,

     

       53
       53
       +
               insert: JSON.stringify(res.data.blob, null, 2),

     

       54
       54
       +
             },

     

       55
       55
       +
           });

     

       56
       56
       +
           props.onClose();

     

       57
       57
       +
         };

     

       58
       58
       +
       

     

       59
       59
       +
         return (

     

       60
       60
       +
           <div class="dark:bg-dark-300 dark:shadow-dark-700 absolute top-70 left-[50%] w-[20rem] -translate-x-1/2 rounded-lg border-[0.5px] border-neutral-300 bg-neutral-50 p-4 shadow-md transition-opacity duration-200 dark:border-neutral-700 starting:opacity-0">

     

       61
       61
       +
             <h2 class="mb-2 font-semibold">Upload blob</h2>

     

       62
       62
       +
             <div class="flex flex-col gap-2 text-sm">

     

       63
       63
       +
               <div class="flex flex-col gap-1">

     

       64
       64
       +
                 <p class="flex gap-1">

     

       65
       65
       +
                   <span class="truncate">{props.file.name}</span>

     

       66
       66
       +
                   <span class="shrink-0 text-neutral-600 dark:text-neutral-400">

     

       67
       67
       +
                     ({formatFileSize(props.file.size)})

     

       68
       68
       +
                   </span>

     

       69
       69
       +
                 </p>

     

       70
       70
       +
               </div>

     

       71
       71
       +
               <div class="flex items-center gap-x-2">

     

       72
       72
       +
                 <label for="mimetype" class="shrink-0 select-none">

     

       73
       73
       +
                   MIME type

     

       74
       74
       +
                 </label>

     

       75
       75
       +
                 <TextInput id="mimetype" placeholder={props.file.type} />

     

       76
       76
       +
               </div>

     

       77
       77
       +
               <div class="flex items-center gap-1">

     

       78
       78
       +
                 <input id="exif-rm" type="checkbox" checked />

     

       79
       79
       +
                 <label for="exif-rm" class="select-none">

     

       80
       80
       +
                   Remove EXIF data

     

       81
       81
       +
                 </label>

     

       82
       82
       +
               </div>

     

       83
       83
       +
               <p class="text-xs text-neutral-600 dark:text-neutral-400">

     

       84
       84
       +
                 Metadata will be pasted after the cursor

     

       85
       85
       +
               </p>

     

       86
       86
       +
               <Show when={error()}>

     

       87
       87
       +
                 <span class="text-red-500 dark:text-red-400">Error: {error()}</span>

     

       88
       88
       +
               </Show>

     

       89
       89
       +
               <div class="flex justify-between gap-2">

     

       90
       90
       +
                 <Button onClick={props.onClose}>Cancel</Button>

     

       91
       91
       +
                 <Show when={uploading()}>

     

       92
       92
       +
                   <div class="flex items-center gap-1">

     

       93
       93
       +
                     <span class="iconify lucide--loader-circle animate-spin"></span>

     

       94
       94
       +
                     <span>Uploading</span>

     

       95
       95
       +
                   </div>

     

       96
       96
       +
                 </Show>

     

       97
       97
       +
                 <Show when={!uploading()}>

     

       98
       98
       +
                   <Button

     

       99
       99
       +
                     onClick={uploadBlob}

     

       100
       100
       +
                     class="dark:shadow-dark-700 flex items-center gap-1 rounded-lg bg-blue-500 px-2 py-1.5 text-xs text-white shadow-xs select-none hover:bg-blue-600 active:bg-blue-700 dark:bg-blue-600 dark:hover:bg-blue-500 dark:active:bg-blue-400"

     

       101
       101
       +
                   >

     

       102
       102
       +
                     Upload

     

       103
       103
       +
                   </Button>

     

       104
       104
       +
                 </Show>

     

       105
       105
       +
               </div>

     

       106
       106
       +
             </div>

     

       107
       107
       +
           </div>

     

       108
       108
       +
         );

     

       109
       109
       +
       };

+87

src/components/create/handle-input.tsx

···

       1
       1
       +
       import { Handle } from "@atcute/lexicons";

     

       2
       2
       +
       import { createSignal, Show } from "solid-js";

     

       3
       3
       +
       import { resolveHandle } from "../../utils/api";

     

       4
       4
       +
       import { Button } from "../button.jsx";

     

       5
       5
       +
       import { TextInput } from "../text-input.jsx";

     

       6
       6
       +
       import { editorInstance } from "./state";

     

       7
       7
       +
       

     

       8
       8
       +
       export const HandleInput = (props: { onClose: () => void }) => {

     

       9
       9
       +
         const [resolving, setResolving] = createSignal(false);

     

       10
       10
       +
         const [error, setError] = createSignal("");

     

       11
       11
       +
         let handleFormRef!: HTMLFormElement;

     

       12
       12
       +
       

     

       13
       13
       +
         const resolveDid = async (e: SubmitEvent) => {

     

       14
       14
       +
           e.preventDefault();

     

       15
       15
       +
           const formData = new FormData(handleFormRef);

     

       16
       16
       +
           const handleValue = formData.get("handle")?.toString().trim();

     

       17
       17
       +
       

     

       18
       18
       +
           if (!handleValue) {

     

       19
       19
       +
             setError("Please enter a handle");

     

       20
       20
       +
             return;

     

       21
       21
       +
           }

     

       22
       22
       +
       

     

       23
       23
       +
           setResolving(true);

     

       24
       24
       +
           setError("");

     

       25
       25
       +
           try {

     

       26
       26
       +
             const did = await resolveHandle(handleValue as Handle);

     

       27
       27
       +
             editorInstance.view.dispatch({

     

       28
       28
       +
               changes: {

     

       29
       29
       +
                 from: editorInstance.view.state.selection.main.head,

     

       30
       30
       +
                 insert: `"${did}"`,

     

       31
       31
       +
               },

     

       32
       32
       +
             });

     

       33
       33
       +
             props.onClose();

     

       34
       34
       +
             handleFormRef.reset();

     

       35
       35
       +
           } catch (err: any) {

     

       36
       36
       +
             setError(err.message || "Failed to resolve handle");

     

       37
       37
       +
           } finally {

     

       38
       38
       +
             setResolving(false);

     

       39
       39
       +
           }

     

       40
       40
       +
         };

     

       41
       41
       +
       

     

       42
       42
       +
         return (

     

       43
       43
       +
           <div class="dark:bg-dark-300 dark:shadow-dark-700 absolute top-70 left-[50%] w-[20rem] -translate-x-1/2 rounded-lg border-[0.5px] border-neutral-300 bg-neutral-50 p-4 shadow-md transition-opacity duration-200 dark:border-neutral-700 starting:opacity-0">

     

       44
       44
       +
             <h2 class="mb-2 font-semibold">Insert DID from handle</h2>

     

       45
       45
       +
             <form ref={handleFormRef} onSubmit={resolveDid} class="flex flex-col gap-2 text-sm">

     

       46
       46
       +
               <div class="flex flex-col gap-1">

     

       47
       47
       +
                 <label for="handle-input" class="select-none">

     

       48
       48
       +
                   Handle

     

       49
       49
       +
                 </label>

     

       50
       50
       +
                 <TextInput id="handle-input" name="handle" placeholder="user.bsky.social" />

     

       51
       51
       +
               </div>

     

       52
       52
       +
               <p class="text-xs text-neutral-600 dark:text-neutral-400">

     

       53
       53
       +
                 DID will be pasted after the cursor

     

       54
       54
       +
               </p>

     

       55
       55
       +
               <Show when={error()}>

     

       56
       56
       +
                 <span class="text-red-500 dark:text-red-400">Error: {error()}</span>

     

       57
       57
       +
               </Show>

     

       58
       58
       +
               <div class="flex justify-between gap-2">

     

       59
       59
       +
                 <Button

     

       60
       60
       +
                   type="button"

     

       61
       61
       +
                   onClick={() => {

     

       62
       62
       +
                     props.onClose();

     

       63
       63
       +
                     handleFormRef.reset();

     

       64
       64
       +
                     setError("");

     

       65
       65
       +
                   }}

     

       66
       66
       +
                 >

     

       67
       67
       +
                   Cancel

     

       68
       68
       +
                 </Button>

     

       69
       69
       +
                 <Show when={resolving()}>

     

       70
       70
       +
                   <div class="flex items-center gap-1">

     

       71
       71
       +
                     <span class="iconify lucide--loader-circle animate-spin"></span>

     

       72
       72
       +
                     <span>Resolving</span>

     

       73
       73
       +
                   </div>

     

       74
       74
       +
                 </Show>

     

       75
       75
       +
                 <Show when={!resolving()}>

     

       76
       76
       +
                   <Button

     

       77
       77
       +
                     type="submit"

     

       78
       78
       +
                     class="dark:shadow-dark-700 flex items-center gap-1 rounded-lg bg-blue-500 px-2 py-1.5 text-xs text-white shadow-xs select-none hover:bg-blue-600 active:bg-blue-700 dark:bg-blue-600 dark:hover:bg-blue-500 dark:active:bg-blue-400"

     

       79
       79
       +
                   >

     

       80
       80
       +
                     Insert

     

       81
       81
       +
                   </Button>

     

       82
       82
       +
                 </Show>

     

       83
       83
       +
               </div>

     

       84
       84
       +
             </form>

     

       85
       85
       +
           </div>

     

       86
       86
       +
         );

     

       87
       87
       +
       };

+12

src/components/create/menu-item.tsx

···

       1
       1
       +
       export const MenuItem = (props: { icon: string; label: string; onClick: () => void }) => {

     

       2
       2
       +
         return (

     

       3
       3
       +
           <button

     

       4
       4
       +
             type="button"

     

       5
       5
       +
             class="flex items-center gap-2 rounded-md p-2 text-left text-xs hover:bg-neutral-100 active:bg-neutral-200 dark:hover:bg-neutral-700 dark:active:bg-neutral-600"

     

       6
       6
       +
             onClick={props.onClick}

     

       7
       7
       +
           >

     

       8
       8
       +
             <span class={`iconify ${props.icon}`}></span>

     

       9
       9
       +
             <span>{props.label}</span>

     

       10
       10
       +
           </button>

     

       11
       11
       +
         );

     

       12
       12
       +
       };

+4

src/components/create/state.ts

···

       1
       1
       +
       import { createSignal } from "solid-js";

     

       2
       2
       +
       

     

       3
       3
       +
       export const editorInstance = { view: null as any };

     

       4
       4
       +
       export const [placeholder, setPlaceholder] = createSignal<any>();

+1 -1

src/components/editor.tsx

···

       7
       7
        
       import { basicLight } from "@fsegurai/codemirror-theme-basic-light";

     

       8
       8
        
       import { basicSetup, EditorView } from "codemirror";

     

       9
       9
        
       import { onCleanup, onMount } from "solid-js";

     

       10
       10
       -
       import { editorInstance } from "./create";

     

       10
       10
       +
       import { editorInstance } from "./create/state";

     

       11
       11
        
       

     

       12
       12
        
       const Editor = (props: { content: string }) => {

     

       13
       13
        
         let editorDiv!: HTMLDivElement;

+1 -1

src/layout.tsx

···

       5
       5
        
       import { AccountManager } from "./auth/account.jsx";

     

       6
       6
        
       import { hasUserScope } from "./auth/scope-utils";

     

       7
       7
        
       import { agent } from "./auth/state.js";

     

       8
       8
       -
       import { RecordEditor } from "./components/create.jsx";

     

       8
       8
       +
       import { RecordEditor } from "./components/create";

     

       9
       9
        
       import { DropdownMenu, MenuProvider, MenuSeparator, NavMenu } from "./components/dropdown.jsx";

     

       10
       10
        
       import { NavBar } from "./components/navbar.jsx";

     

       11
       11
        
       import { NotificationContainer } from "./components/notification.jsx";

Compare changes