Add admin key sharing

src/app/MenuDesktop.svelte

@@ -20,6 +20,7 @@
     pubkey,
     sessions,
     displayPerson,
+    displayPubkey,
   } from "src/engine"
 
   const {page} = router
@@ -29,9 +30,12 @@
   }
 
   const setSubMenu = name => {
-    setTimeout(() => {
+    setTimeout(
+      () => {
         subMenu = name
-    }, subMenu ? 100 : 0)
+      },
+      subMenu ? 100 : 0,
+    )
   }
 
   const goToFeed = () => router.at("notes").push({key: randomId()})
@@ -58,7 +62,10 @@
   class={cx(
     "fixed bottom-0 left-0 top-0 w-60 border-r border-solid border-mid bg-cocoa transition-colors",
   )}>
-  <Anchor class="mb-4 flex items-center gap-1 h-16 px-6" external href="https://info.coracle.social">
+  <Anchor
+    class="mb-4 flex h-16 items-center gap-1 px-6"
+    external
+    href="https://info.coracle.social">
     <img alt="App Logo" src={import.meta.env.VITE_LOGO_URL || "/images/logo.png"} class="w-10" />
     <h1 class="staatliches text-3xl">Coracle</h1>
   </Anchor>
@@ -105,31 +112,33 @@
     </div>
     {#if subMenu === "settings"}
       <MenuDesktopSecondary onEscape={closeSubMenu}>
-        <MenuItem class="staatliches pl-8 py-4 flex gap-4 items-center" on:click={toggleTheme}>
+        <MenuItem class="staatliches flex items-center gap-4 py-4 pl-8" on:click={toggleTheme}>
           <i class="fa fa-palette" /> Toggle Theme
         </MenuItem>
-        <MenuItem class="staatliches pl-8 py-4 flex gap-4 items-center" href="/settings">
+        <MenuItem class="staatliches flex items-center gap-4 py-4 pl-8" href="/settings">
           <i class="fa fa-cog" /> App Settings
         </MenuItem>
-        <MenuItem class="staatliches pl-8 py-4 flex gap-4 items-center" href="/settings/content">
+        <MenuItem class="staatliches flex items-center gap-4 py-4 pl-8" href="/settings/content">
           <i class="fa fa-volume-xmark" /> Content Settings
         </MenuItem>
-        <MenuItem class="staatliches pl-8 py-4 flex gap-4 items-center" href="/settings/data">
+        <MenuItem class="staatliches flex items-center gap-4 py-4 pl-8" href="/settings/data">
           <i class="fa fa-database" /> Database
         </MenuItem>
       </MenuDesktopSecondary>
     {:else if subMenu === "account"}
       <MenuDesktopSecondary onEscape={closeSubMenu}>
-        <MenuItem class="staatliches pl-8 py-4 flex gap-4 items-center" href="/settings/keys">
+        <MenuItem class="staatliches flex items-center gap-4 py-4 pl-8" href="/settings/keys">
           <i class="fa fa-key" /> Keys
         </MenuItem>
-        <MenuItem class="staatliches pl-8 py-4 flex gap-4 items-center" href="/settings/profile">
+        <MenuItem class="staatliches flex items-center gap-4 py-4 pl-8" href="/settings/profile">
           <i class="fa fa-user-circle" /> Edit Profile
         </MenuItem>
-        <MenuItem class="staatliches pl-8 py-4 flex gap-4 items-center" on:click={() => setSubMenu("accounts")}>
+        <MenuItem
+          class="staatliches flex items-center gap-4 py-4 pl-8"
+          on:click={() => setSubMenu("accounts")}>
           <i class="fa fa-right-left" /> Switch Account
         </MenuItem>
-        <MenuItem class="staatliches pl-8 py-4 flex gap-4 items-center" href="/logout">
+        <MenuItem class="staatliches flex items-center gap-4 py-4 pl-8" href="/logout">
           <i class="fa fa-right-to-bracket" /> Log Out
         </MenuItem>
       </MenuDesktopSecondary>
@@ -146,18 +155,17 @@
           {/if}
         {/each}
         <MenuItem
-          class="staatliches pl-8 py-4 flex gap-4 items-center"
+          class="staatliches flex items-center gap-4 py-4 pl-8"
           on:click={() => router.at("login/advanced").open()}>
           Add Account
         </MenuItem>
       </MenuDesktopSecondary>
     {/if}
-    <div
-      class="cursor-pointer border-t border-solid border-mid px-7 pb-4 pt-3">
+    <div class="cursor-pointer border-t border-solid border-mid px-7 pb-4 pt-3">
       {#if $user}
         <Anchor class="flex items-center gap-2" href={router.at("people").of($pubkey).toString()}>
           <PersonCircle class="h-10 w-10" pubkey={$pubkey} />
-          <div class="flex flex-col min-w-0">
+          <div class="flex min-w-0 flex-col">
             <span>@{displayPerson($user)}</span>
             <PersonHandle class="text-sm" pubkey={$pubkey} />
           </div>

src/app/views/GroupCreate.svelte

@@ -2,7 +2,13 @@
   import {pluck} from "ramda"
   import type {Values} from "src/app/shared/GroupDetailsForm.svelte"
   import GroupDetailsForm from "src/app/shared/GroupDetailsForm.svelte"
-  import {publishGroupMeta, publishGroupInvites, initGroup, user} from "src/engine"
+  import {
+    publishGroupMeta,
+    publishGroupInvites,
+    initGroup,
+    publishAdminKeyShares,
+    user,
+  } from "src/engine"
   import {router} from "src/app/router"
 
   const initialValues = {
@@ -19,6 +25,7 @@
     const access = values.isPublic ? "hybrid" : "closed"
     const {id, address} = initGroup(members, values.relays)
 
+    await publishAdminKeyShares(address, [$user.pubkey], values.relays)
     await publishGroupInvites(address, members, values.relays)
     await publishGroupMeta(address, {...values, access, id})
 

src/app/views/RelayDetail.svelte

@@ -1,7 +1,6 @@
 <script lang="ts">
   import {batch} from "hurdak"
   import {getAvgRating, noteKinds} from "src/util/nostr"
-  import Content from "src/partials/Content.svelte"
   import Feed from "src/app/shared/Feed.svelte"
   import Tabs from "src/partials/Tabs.svelte"
   import Rating from "src/partials/Rating.svelte"

src/engine/groups/commands.ts

@@ -231,7 +231,7 @@ export const publishToZeroOrMoreGroups = async (
 
 // Admin functions
 
-export const publishKeyRotations = async (address, pubkeys, template) => {
+export const publishKeyShares = async (address, pubkeys, template) => {
   const adminKey = deriveAdminKeyForGroup(address).get()
 
   return await Promise.all(
@@ -250,21 +250,37 @@ export const publishKeyRotations = async (address, pubkeys, template) => {
   )
 }
 
-export const publishGroupInvites = async (address, pubkeys, relays, gracePeriod = 0) => {
+export const publishAdminKeyShares = async (address, pubkeys, relays) => {
+  const {privkey} = deriveAdminKeyForGroup(address).get()
   const template = createEvent(24, {
     tags: [
       ["a", address],
-      ["grace_period", String(gracePeriod)],
-      ["privkey", deriveSharedKeyForGroup(address).get().privkey],
+      ["role", "admin"],
+      ["privkey", privkey],
       ...relays.map(url => ["relay", url]),
     ],
   })
 
-  return publishKeyRotations(address, pubkeys, template)
+  return publishKeyShares(address, pubkeys, template)
+}
+
+export const publishGroupInvites = async (address, pubkeys, relays, gracePeriod = 0) => {
+  const {privkey} = deriveSharedKeyForGroup(address).get()
+  const template = createEvent(24, {
+    tags: [
+      ["a", address],
+      ["role", "member"],
+      ["privkey", privkey],
+      ["grace_period", String(gracePeriod)],
+      ...relays.map(url => ["relay", url]),
+    ],
+  })
+
+  return publishKeyShares(address, pubkeys, template)
 }
 
 export const publishGroupEvictions = async (address, pubkeys) =>
-  publishKeyRotations(address, pubkeys, createEvent(24, {tags: [["a", address]]}))
+  publishKeyShares(address, pubkeys, createEvent(24, {tags: [["a", address]]}))
 
 export const publishGroupMeta = async (address, meta) => {
   const template = createEvent(34550, {

src/engine/groups/projections.ts

@@ -11,7 +11,7 @@ import {sessions} from "src/engine/session/state"
 import {nip59} from "src/engine/session/derived"
 import {getExecutor, getIdFilters, load} from "src/engine/network/utils"
 import {GroupAccess, MemberAccess} from "./model"
-import {groups, groupSharedKeys, groupRequests, groupAlerts} from "./state"
+import {groups, groupSharedKeys, groupAdminKeys, groupRequests, groupAlerts} from "./state"
 import {deriveAdminKeyForGroup, getRecipientKey} from "./utils"
 import {modifyGroupStatus, setGroupStatus} from "./commands"
 
@@ -29,9 +29,11 @@ projections.addHandler(24, (e: Event) => {
 
   if (privkey) {
     const pubkey = getPublicKey(privkey)
+    const role = tags.getValue("role")
     const relays = tags.type("relay").values().all()
+    const keys = role === "admin" ? groupAdminKeys : groupSharedKeys
 
-    groupSharedKeys.key(pubkey).update($key => ({
+    keys.key(pubkey).update($key => ({
       pubkey,
       privkey,
       group: address,
@@ -47,6 +49,7 @@ projections.addHandler(24, (e: Event) => {
       filters: [
         ...getIdFilters([address]),
         {kinds: [1059], "#p": [pubkey]},
+        {kinds: [1059], authors: [pubkey]},
       ],
     })
   }
@@ -120,7 +123,7 @@ const handleGroupRequest = access => (e: Event) => {
         ...e,
         group: address,
         resolved: false,
-      })
+      }),
     )
   }
 
@@ -147,7 +150,7 @@ projections.addGlobalHandler((e: Event) => {
     getExecutor([LOCAL_RELAY_URL]).publish(e)
 
     sharedKey.update(
-      updateIn("members", (members?: string[]) => uniq([...(members || []), e.pubkey]))
+      updateIn("members", (members?: string[]) => uniq([...(members || []), e.pubkey])),
     )
   }
 })

src/engine/session/utils/nip44.ts

@@ -67,7 +67,7 @@ export class Nip44 {
 
     return switcher(method, {
       privkey: true,
-      extension: Boolean(window.nostr.nip44),
+      extension: Boolean((window.nostr as any).nip44),
       default: false,
     })
   }

src/partials/Tabs.svelte

@@ -1,5 +1,4 @@
 <script lang="ts">
-  import cx from 'classnames'
   import {toTitle} from "hurdak"
 
   export let tabs: string[]