From 9de628e9e8f1b6b62169b77fe505c5cc05edde1e Mon Sep 17 00:00:00 2001
From: hzrd149 <github@hzrd149.com>
Date: Wed, 21 Feb 2024 07:44:56 +0000
Subject: [PATCH] rename packs to drives fix bugs

---
 src/App.svelte                                | 21 ++++++---
 src/components/FileCard.svelte                |  6 ++-
 ...wPackModal.svelte => NewDriveModal.svelte} |  4 +-
 src/components/NewFolderModal.svelte          | 10 ++---
 src/components/SpeedDialMenu.svelte           | 27 ++++++------
 src/components/TopNav.svelte                  | 14 +-----
 src/components/UploadFileModal.svelte         | 34 +++++++-------
 src/helpers/drives.ts                         |  9 ++++
 src/helpers/packs.ts                          | 10 -----
 src/helpers/tree.ts                           |  6 +--
 src/pages/{Pack.svelte => Drive.svelte}       | 44 +++++++++----------
 src/pages/Home.svelte                         | 27 ++++--------
 src/services/{packs.ts => drives.ts}          |  8 ++--
 src/services/ndk.ts                           | 15 ++++++-
 14 files changed, 120 insertions(+), 115 deletions(-)
 rename src/components/{NewPackModal.svelte => NewDriveModal.svelte} (89%)
 create mode 100644 src/helpers/drives.ts
 delete mode 100644 src/helpers/packs.ts
 rename src/pages/{Pack.svelte => Drive.svelte} (86%)
 rename src/services/{packs.ts => drives.ts} (77%)

diff --git a/src/App.svelte b/src/App.svelte
index 54a4a4e..2c236c0 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -3,27 +3,38 @@
   import NotFound from "./pages/404.svelte";
   import Home from "./pages/Home.svelte";
   import TopNav from "./components/TopNav.svelte";
-  import { activeUser } from "./services/ndk";
+  import { activeUser, loginWithExtension } from "./services/ndk";
   import Servers from "./pages/Servers.svelte";
   import Files from "./pages/Files.svelte";
   import Misc from "./pages/Misc.svelte";
-  import Pack from "./pages/Pack.svelte";
+  import Drive from "./pages/Drive.svelte";
+  import { Button, Checkbox } from "flowbite-svelte";
+
+  let remember = localStorage.getItem("auto-login") === "true";
+
+  $: {
+    localStorage.setItem("auto-login", remember ? "true" : "false");
+  }
 
   const routes = {
     "/files": Files,
     "/servers": Servers,
     "/misc": Misc,
-    "/pack/:naddr": Pack,
+    "/drive/:naddr": Drive,
     "/": Home,
     "*": NotFound,
   };
 </script>
 
-<TopNav />
 <div class="flex w-full flex-1 flex-col gap-2 overflow-y-auto overflow-x-hidden bg-white dark:bg-gray-900">
   {#if $activeUser}
+    <TopNav />
     <Router {routes} />
   {:else}
-    <h1>Login first</h1>
+    <div class="flex h-full w-full flex-col items-center gap-4">
+      <h1 class="text-4xl" style="margin-bottom: 20vh; margin-top: 10vh;">🌸 Blossom Drive</h1>
+      <Button size="xl" on:click={loginWithExtension}>Login with nostr</Button>
+      <Checkbox bind:checked={remember}>Stay logged in</Checkbox>
+    </div>
   {/if}
 </div>
diff --git a/src/components/FileCard.svelte b/src/components/FileCard.svelte
index 1fe647a..c93bc25 100644
--- a/src/components/FileCard.svelte
+++ b/src/components/FileCard.svelte
@@ -15,6 +15,10 @@
     ? "border border-primary-200 dark:border-primary-700"
     : "border border-gray-200 dark:border-gray-700";
 
+  $: link = $servers[0]
+    ? new URL(file.hash + (file.mimeType ? "." + mime.getExtension(file.mimeType) : ""), $servers[0]).toString()
+    : undefined;
+
   function toggleSelect() {
     if (selected) dispatch("unselect", file.name);
     else dispatch("select", file.name);
@@ -28,7 +32,7 @@
 </script>
 
 <a
-  href={new URL(file.hash + (file.mimeType ? "." + mime.getExtension(file.mimeType) : ""), $servers[0]).toString()}
+  href={link}
   class={"relative flex aspect-square min-w-40 flex-col divide-gray-200 rounded-md border bg-white text-gray-700 hover:bg-gray-100 dark:divide-gray-700 dark:bg-gray-800 dark:text-gray-300 dark:hover:bg-gray-700" +
     borderClass}
   on:dragstart={dragStart}
diff --git a/src/components/NewPackModal.svelte b/src/components/NewDriveModal.svelte
similarity index 89%
rename from src/components/NewPackModal.svelte
rename to src/components/NewDriveModal.svelte
index 647bf44..a15bf8f 100644
--- a/src/components/NewPackModal.svelte
+++ b/src/components/NewDriveModal.svelte
@@ -25,9 +25,9 @@
   };
 </script>
 
-<Modal bind:open size="xs" class="w-full" title="New Pack" outsideclose>
+<Modal bind:open size="xs" class="w-full" title="New Drive" outsideclose>
   <form id="new-folder-form`" class="flex flex-col gap-2 py-0" on:submit={submit}>
-    <Input placeholder="Pack name" required bind:value={name} />
+    <Input placeholder="Drive name" required bind:value={name} />
     <Textarea name="about" rows={4} placeholder="A short description" bind:value={description} />
     <div class="flex justify-end gap-2">
       <Button color="alternative" on:click={() => (open = false)}>Cancel</Button>
diff --git a/src/components/NewFolderModal.svelte b/src/components/NewFolderModal.svelte
index 412396c..51dcac0 100644
--- a/src/components/NewFolderModal.svelte
+++ b/src/components/NewFolderModal.svelte
@@ -1,12 +1,12 @@
 <script lang="ts">
   import type { NDKEvent } from "@nostr-dev-kit/ndk";
   import { Button, Modal, Input } from "flowbite-svelte";
-  import { getFileTree, getFolder, parsePath, setPackFileTree } from "../helpers/tree";
+  import { getFileTree, getFolder, parsePath, setDriveFileTree } from "../helpers/tree";
   import { cloneEvent } from "../helpers/event";
-  import { handleEvent } from "../services/packs";
+  import { handleEvent } from "../services/drives";
   export let open = false;
 
-  export let pack: NDKEvent;
+  export let drive: NDKEvent;
   export let path: string;
 
   let name = "";
@@ -15,10 +15,10 @@
     e.preventDefault();
     loading = true;
 
-    const draft = cloneEvent(pack);
+    const draft = cloneEvent(drive);
     const tree = getFileTree(draft);
     getFolder(tree, parsePath(path).concat(name));
-    setPackFileTree(draft, tree);
+    setDriveFileTree(draft, tree);
     await draft.sign();
     handleEvent(draft);
     open = false;
diff --git a/src/components/SpeedDialMenu.svelte b/src/components/SpeedDialMenu.svelte
index 7260d3b..e5391bf 100644
--- a/src/components/SpeedDialMenu.svelte
+++ b/src/components/SpeedDialMenu.svelte
@@ -1,21 +1,20 @@
 <script lang="ts">
   import type { NDKEvent } from "@nostr-dev-kit/ndk";
   import { SpeedDial, SpeedDialButton } from "flowbite-svelte";
-  import { UploadSolid, FolderSolid, GiftBoxSolid, UserHeadsetOutline } from "flowbite-svelte-icons";
+  import { UploadSolid, FolderSolid, GiftBoxSolid } from "flowbite-svelte-icons";
   import UploadFileModal from "./UploadFileModal.svelte";
-  import NewPackModal from "./NewPackModal.svelte";
+  import NewDriveModal from "./NewDriveModal.svelte";
   import NewFolderModal from "./NewFolderModal.svelte";
 
-  export let pack: NDKEvent | undefined = undefined;
+  export let drive: NDKEvent | undefined = undefined;
   export let path: string | undefined = undefined;
 
   let uploadFileModal = false;
   let newFolderModal = false;
-  let newPackModal = false;
+  let newDriveModal = false;
 
-  const createdPack = (event: CustomEvent<NDKEvent>) => {
-    newPackModal = false;
-    location.hash = "#/pack/" + event.detail.encode;
+  const createdDrive = (event: CustomEvent<NDKEvent>) => {
+    location.hash = "#/drive/" + event.detail.encode;
   };
 </script>
 
@@ -23,24 +22,24 @@
   <SpeedDialButton name="Upload" on:click={() => (uploadFileModal = true)}>
     <UploadSolid class="h-6 w-6" />
   </SpeedDialButton>
-  {#if pack}
+  {#if drive}
     <SpeedDialButton name="Folder" on:click={() => (newFolderModal = true)}>
       <FolderSolid class="h-6 w-6" />
     </SpeedDialButton>
   {/if}
-  <SpeedDialButton name="Pack" on:click={() => (newPackModal = true)}>
+  <SpeedDialButton name="Drive" on:click={() => (newDriveModal = true)}>
     <GiftBoxSolid class="h-6 w-6" />
   </SpeedDialButton>
 </SpeedDial>
 
 {#if uploadFileModal}
-  <UploadFileModal bind:open={uploadFileModal} {pack} {path} />
+  <UploadFileModal bind:open={uploadFileModal} {drive} {path} />
 {/if}
 
-{#if newFolderModal && pack}
-  <NewFolderModal bind:open={newFolderModal} {pack} path={path || "/"} />
+{#if newFolderModal && drive}
+  <NewFolderModal bind:open={newFolderModal} {drive} path={path || "/"} />
 {/if}
 
-{#if newPackModal}
-  <NewPackModal bind:open={newPackModal} on:created={createdPack} />
+{#if newDriveModal}
+  <NewDriveModal bind:open={newDriveModal} on:created={createdDrive} />
 {/if}
diff --git a/src/components/TopNav.svelte b/src/components/TopNav.svelte
index 000f5da..63bf50c 100644
--- a/src/components/TopNav.svelte
+++ b/src/components/TopNav.svelte
@@ -1,17 +1,7 @@
 <script lang="ts">
   import { Button, DarkMode, Avatar } from "flowbite-svelte";
-  import { activeUser, ndk } from "../services/ndk";
-  import { NDKNip07Signer } from "@nostr-dev-kit/ndk";
+  import { activeUser, loginWithExtension } from "../services/ndk";
   import { CogSolid } from "flowbite-svelte-icons";
-
-  async function loginWithExt() {
-    const signer: NDKNip07Signer = (ndk.signer = new NDKNip07Signer());
-    await signer.blockUntilReady();
-    const user = await signer.user();
-    await user.fetchProfile();
-    await user.relayList();
-    $activeUser = user;
-  }
 </script>
 
 <div class="flex items-center gap-2 bg-gray-50 px-6 py-2 text-gray-700 dark:bg-gray-800 dark:text-gray-200">
@@ -26,6 +16,6 @@
   {#if $activeUser}
     <Avatar src={$activeUser.profile?.image} />
   {:else}
-    <Button on:click={loginWithExt}>Login</Button>
+    <Button on:click={loginWithExtension}>Login</Button>
   {/if}
 </div>
diff --git a/src/components/UploadFileModal.svelte b/src/components/UploadFileModal.svelte
index 04ab6db..5895b03 100644
--- a/src/components/UploadFileModal.svelte
+++ b/src/components/UploadFileModal.svelte
@@ -1,25 +1,25 @@
 <script lang="ts">
   import { Button, Input, Label, Modal, Select, Spinner } from "flowbite-svelte";
   import { BlossomClient } from "blossom-client";
-  import { handleEvent, packs } from "../services/packs";
+  import { handleEvent, drives } from "../services/drives";
   import { NDKEvent } from "@nostr-dev-kit/ndk";
-  import { getFileTree, parsePath, setFile, setPackFileTree } from "../helpers/tree";
+  import { getFileTree, parsePath, setFile, setDriveFileTree } from "../helpers/tree";
   import { servers } from "../services/servers";
   import type { Blob } from "../services/blobs";
-  import { ndk, signEventTemplate } from "../services/ndk";
+  import { signEventTemplate } from "../services/ndk";
   import { cloneEvent } from "../helpers/event";
-  import { getPackName } from "../helpers/packs";
+  import { getDriveName } from "../helpers/drives";
 
   export let open = false;
-  export let pack: NDKEvent | undefined = undefined;
+  export let drive: NDKEvent | undefined = undefined;
   export let path: string = "";
 
-  let packId = "";
+  let driveId = "";
   let file: File | undefined = undefined;
   let name = "";
 
-  let selectedPack: NDKEvent | undefined = undefined;
-  $: selectedPack = pack || $packs[packId];
+  let selectedDrive: NDKEvent | undefined = undefined;
+  $: selectedDrive = drive || $drives[driveId];
 
   function fileChange(e: Event) {
     if (e.target instanceof HTMLInputElement) {
@@ -32,7 +32,7 @@
   async function upload(e: SubmitEvent) {
     e.preventDefault();
     if (!file) return;
-    if (!selectedPack) return;
+    if (!selectedDrive) return;
 
     loading = "Signing Auth";
     const auth = await BlossomClient.getUploadAuth(file, signEventTemplate);
@@ -53,14 +53,14 @@
       return;
     }
 
-    const draft = cloneEvent(selectedPack);
+    const draft = cloneEvent(selectedDrive);
     const tree = getFileTree(draft);
 
     setFile(tree, [...parsePath(path), name], { hash: blob.sha256, size: blob.size, mimeType: blob.type });
 
-    setPackFileTree(draft, tree);
+    setDriveFileTree(draft, tree);
 
-    loading = "Adding to pack...";
+    loading = "Adding to drive...";
     await draft.sign();
     handleEvent(draft);
     await draft.publish();
@@ -79,12 +79,12 @@
   {:else}
     <form class="flex flex-col space-y-4" on:submit={upload}>
       <Input type="file" name="file" required on:change={fileChange} />
-      {#if !pack}
+      {#if !drive}
         <Label>
-          <span>Add to Pack</span>
-          <Select bind:value={packId} required>
-            {#each Object.entries($packs) as [d, pack]}
-              <option value={d}>{getPackName(pack)}</option>
+          <span>Add to Drive</span>
+          <Select bind:value={driveId} required>
+            {#each Object.entries($drives) as [d, drive]}
+              <option value={d}>{getDriveName(drive)}</option>
             {/each}
           </Select>
         </Label>
diff --git a/src/helpers/drives.ts b/src/helpers/drives.ts
new file mode 100644
index 0000000..9290070
--- /dev/null
+++ b/src/helpers/drives.ts
@@ -0,0 +1,9 @@
+import type { NDKEvent } from "@nostr-dev-kit/ndk";
+import { getTagValue } from "./event";
+
+export function getDriveName(drive: NDKEvent) {
+  return getTagValue(drive, "name");
+}
+export function getDriveSummary(drive: NDKEvent) {
+  return getTagValue(drive, "summary") || drive.content;
+}
diff --git a/src/helpers/packs.ts b/src/helpers/packs.ts
deleted file mode 100644
index f1589de..0000000
--- a/src/helpers/packs.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type { NDKEvent, NDKTag } from "@nostr-dev-kit/ndk";
-import { getTagValue } from "./event";
-import type { Blob } from "../services/blobs";
-
-export function getPackName(pack: NDKEvent) {
-  return getTagValue(pack, "name");
-}
-export function getPackSummary(pack: NDKEvent) {
-  return getTagValue(pack, "summary");
-}
diff --git a/src/helpers/tree.ts b/src/helpers/tree.ts
index 620ff9c..1bf5530 100644
--- a/src/helpers/tree.ts
+++ b/src/helpers/tree.ts
@@ -61,10 +61,10 @@ export function getFile(dir: TreeFolder, pathname: string) {
   const folder = getFolder(dir, parts, true);
   return folder[name] as TreeFile | undefined;
 }
-export function getFileTree(pack: NDKEvent) {
+export function getFileTree(drive: NDKEvent) {
   const tree: TreeFolder = {};
 
-  for (const tag of pack.tags) {
+  for (const tag of drive.tags) {
     if (tag[0] === "x") {
       const [_, hash, pathname, sizeStr, mimeType] = tag;
       const size = parseInt(sizeStr);
@@ -98,7 +98,7 @@ export function getTreeTags(entry: TreeFolder | TreeFile, path: string[] = []):
     .flat();
 }
 
-export function setPackFileTree(draft: NDKEvent, tree: TreeFolder) {
+export function setDriveFileTree(draft: NDKEvent, tree: TreeFolder) {
   draft.tags = draft.tags.filter((t) => t[0] !== "x" && t[0] !== "folder");
   draft.tags = draft.tags.concat(getTreeTags(tree));
 }
diff --git a/src/pages/Pack.svelte b/src/pages/Drive.svelte
similarity index 86%
rename from src/pages/Pack.svelte
rename to src/pages/Drive.svelte
index de0c4c6..7c73615 100644
--- a/src/pages/Pack.svelte
+++ b/src/pages/Drive.svelte
@@ -14,15 +14,15 @@
     parsePath,
     removeEntry,
     setFile,
-    setPackFileTree,
+    setDriveFileTree,
     type TreeFile,
   } from "../helpers/tree";
-  import { getPackName } from "../helpers/packs";
+  import { getDriveName } from "../helpers/drives";
   import FileCard from "../components/FileCard.svelte";
   import FolderCard from "../components/FolderCard.svelte";
   import PathBreadcrumbs from "../components/PathBreadcrumbs.svelte";
   import { cloneEvent } from "../helpers/event";
-  import { handleEvent, packs } from "../services/packs";
+  import { handleEvent, drives } from "../services/drives";
   import { TrashBinSolid } from "flowbite-svelte-icons";
   import DeleteModal from "../components/DeleteModal.svelte";
   import RenameModal from "../components/RenameModal.svelte";
@@ -34,8 +34,8 @@
 
   $: parsed = new URLSearchParams($querystring);
 
-  let pack: NDKEvent | null = null;
-  $: tree = pack ? getFileTree(pack) : {};
+  let drive: NDKEvent | null = null;
+  $: tree = drive ? getFileTree(drive) : {};
   $: subTree = getFolder(tree, parsePath(parsed.get("path")));
 
   let confirmDelete = false;
@@ -63,18 +63,18 @@
       const decoded = nip19.decode(naddr);
       if (decoded.type !== "naddr") throw new Error("Unknown Type");
 
-      pack = $packs[decoded.data.identifier];
+      drive = $drives[decoded.data.identifier];
     }
   }
 
   async function move(e: CustomEvent<{ src: string; dest: string }>) {
-    if (!pack) return;
+    if (!drive) return;
     const path = parsePath(parsed.get("path"));
     const newTree = cloneTree(tree);
     moveEntry(newTree, [...path, e.detail.src], [...path, e.detail.dest, e.detail.src]);
 
-    const draft = cloneEvent(pack);
-    setPackFileTree(draft, newTree);
+    const draft = cloneEvent(drive);
+    setDriveFileTree(draft, newTree);
 
     await draft.sign();
     await draft.publish();
@@ -82,13 +82,13 @@
   }
 
   async function deleteSelected() {
-    if (!pack) return;
+    if (!drive) return;
     const path = parsePath(parsed.get("path"));
     const newTree = cloneTree(tree);
     for (const name of selected) removeEntry(newTree, [...path, name]);
 
-    const draft = cloneEvent(pack);
-    setPackFileTree(draft, newTree);
+    const draft = cloneEvent(drive);
+    setDriveFileTree(draft, newTree);
 
     await draft.sign();
     await draft.publish();
@@ -97,7 +97,7 @@
 
   let renameModal = false;
   async function renameEntry(e: CustomEvent<string>) {
-    if (!pack) return;
+    if (!drive) return;
     const name = selected[0];
     if (!name) return;
     const newName = e.detail;
@@ -106,8 +106,8 @@
     const newTree = cloneTree(tree);
     moveEntry(newTree, [...path, name], [...path, newName]);
 
-    const draft = cloneEvent(pack);
-    setPackFileTree(draft, newTree);
+    const draft = cloneEvent(drive);
+    setDriveFileTree(draft, newTree);
 
     await draft.sign();
     await draft.publish();
@@ -122,7 +122,7 @@
     e.preventDefault();
   }
   async function uploadFiles(files: FileList, folder?: string) {
-    if (!pack) return;
+    if (!drive) return;
     const newTree = cloneTree(tree);
     const path = parsePath(parsed.get("path"));
 
@@ -152,20 +152,20 @@
       }
     }
 
-    const draft = cloneEvent(pack);
-    setPackFileTree(draft, newTree);
+    const draft = cloneEvent(drive);
+    setDriveFileTree(draft, newTree);
     await draft.sign();
     handleEvent(draft);
     await draft.publish();
   }
 </script>
 
-{#if !pack}
+{#if !drive}
   <Spinner />
 {:else}
   <main class="flex flex-grow flex-col gap-4 p-4">
     <div class="flex justify-between gap-2">
-      <PathBreadcrumbs root={getPackName(pack) ?? "Pack"} />
+      <PathBreadcrumbs root={getDriveName(drive) ?? "Drive"} />
       {#if selected.length > 0}
         <div class="flex items-center gap-2">
           <p>{selected.length} selected</p>
@@ -214,10 +214,8 @@
       {/each}
     </div>
   </main>
-  <!-- <code class="whitespace-pre">{JSON.stringify(tree, null, 2)}</code>
-  <code class="whitespace-pre">{JSON.stringify(pack.rawEvent(), null, 2)}</code> -->
 {/if}
-<SpeedDialMenu pack={pack ?? undefined} path={parsed.get("path") || "/"} />
+<SpeedDialMenu drive={drive ?? undefined} path={parsed.get("path") || "/"} />
 
 {#if confirmDelete}
   <DeleteModal bind:open={confirmDelete} on:yes={deleteSelected} />
diff --git a/src/pages/Home.svelte b/src/pages/Home.svelte
index 0329171..a4a4208 100644
--- a/src/pages/Home.svelte
+++ b/src/pages/Home.svelte
@@ -1,27 +1,18 @@
 <script lang="ts">
-  import { onDestroy } from "svelte";
   import SpeedDialMenu from "../components/SpeedDialMenu.svelte";
-  import { activeUser, ndk } from "../services/ndk";
-  import { getPackName } from "../helpers/packs";
+  import { activeUser } from "../services/ndk";
+  import { getDriveName, getDriveSummary } from "../helpers/drives";
   import SimpleCard from "../components/SimpleCard.svelte";
-
-  const packs = ndk.storeSubscribe({
-    kinds: [30563 as number],
-    authors: [$activeUser.pubkey],
-  });
-
-  onDestroy(() => {
-    packs.unsubscribe();
-  });
+  import { drives } from "../services/drives";
 </script>
 
 <main class="flex flex-col gap-4 p-4">
-  <h2 class="text-xl font-bold">Packs</h2>
+  <h2 class="text-xl font-bold">Drives</h2>
   <div class="flex w-full flex-wrap gap-4">
-    {#each $packs as pack}
-      <SimpleCard href={`#/pack/${pack.encode()}`}>
-        <span slot="title">{getPackName(pack)}</span>
-        <span slot="description">{pack.content}</span>
+    {#each Object.values($drives) as drive}
+      <SimpleCard href={`#/drive/${drive.encode()}`}>
+        <span slot="title">{getDriveName(drive)}</span>
+        <span slot="description">{getDriveSummary(drive)}</span>
       </SimpleCard>
     {/each}
   </div>
@@ -30,7 +21,7 @@
   <div class="flex w-full flex-wrap gap-4">
     <SimpleCard href="#/misc">
       <span slot="title">Miscellaneous</span>
-      <span slot="description">All your loose blobs that are not in packs</span>
+      <span slot="description">All your loose blobs that are not in drives</span>
     </SimpleCard>
     <SimpleCard href="#/files">
       <span slot="title">Published Files</span>
diff --git a/src/services/packs.ts b/src/services/drives.ts
similarity index 77%
rename from src/services/packs.ts
rename to src/services/drives.ts
index ae7943e..ab11a21 100644
--- a/src/services/packs.ts
+++ b/src/services/drives.ts
@@ -2,12 +2,14 @@ import type { NDKEvent, NDKSubscription } from "@nostr-dev-kit/ndk";
 import { activeUser, ndk } from "./ndk";
 import { writable } from "svelte/store";
 
+export const drives = writable<Record<string, NDKEvent>>({});
+
 let sub: NDKSubscription;
 activeUser.subscribe((user) => {
   if (sub) sub.stop();
   if (!user) return;
 
-  packs.set({});
+  drives.set({});
   sub = ndk.subscribe({ kinds: [30563 as number], authors: [user.pubkey] });
   sub.on("event", handleEvent);
   sub.start();
@@ -15,7 +17,5 @@ activeUser.subscribe((user) => {
 
 export function handleEvent(event: NDKEvent) {
   const d = event.tags.find((t) => t[0] === "d")?.[1];
-  if (d) packs.update((dir) => ({ ...dir, [d]: event }));
+  if (d) drives.update((dir) => ({ ...dir, [d]: event }));
 }
-
-export const packs = writable<Record<string, NDKEvent>>({});
diff --git a/src/services/ndk.ts b/src/services/ndk.ts
index 88ff42d..9ac0478 100644
--- a/src/services/ndk.ts
+++ b/src/services/ndk.ts
@@ -2,7 +2,7 @@ import NDKSvelte from "@nostr-dev-kit/ndk-svelte";
 import NDKCacheAdapterDexie from "@nostr-dev-kit/ndk-cache-dexie";
 import { writable } from "svelte/store";
 import type { EventTemplate, SignedEvent } from "blossom-client";
-import { NDKEvent } from "@nostr-dev-kit/ndk";
+import { NDKEvent, NDKNip07Signer } from "@nostr-dev-kit/ndk";
 
 const cacheAdapter = new NDKCacheAdapterDexie({ dbName: "ndk-cache" });
 
@@ -13,6 +13,15 @@ export const ndk = new NDKSvelte({
 
 export const activeUser = writable(ndk.activeUser);
 
+export async function loginWithExtension() {
+  const signer: NDKNip07Signer = (ndk.signer = new NDKNip07Signer());
+  await signer.blockUntilReady();
+  const user = await signer.user();
+  await user.fetchProfile();
+  await user.relayList();
+  activeUser.set(user);
+}
+
 export async function signEventTemplate(template: EventTemplate): Promise<SignedEvent> {
   const e = new NDKEvent(ndk);
   e.kind = template.kind;
@@ -29,3 +38,7 @@ if (import.meta.env.DEV) {
   //@ts-ignore
   window.ndk = ndk;
 }
+
+if (localStorage.getItem("auto-login") === "true") {
+  await loginWithExtension();
+}