Fix a few bugs

src/app/MenuDesktop.svelte

@@ -1,5 +1,4 @@
 <script lang="ts">
-  import cx from "classnames"
   import {randomId} from "hurdak"
   import {toggleTheme} from "src/partials/state"
   import MenuItem from "src/partials/MenuItem.svelte"
@@ -14,9 +13,9 @@
   import {
     env,
     user,
+    pubkey,
     hasNewMessages,
     hasNewNotifications,
-    pubkey,
     sessions,
     displayPerson,
     displayPubkey,
@@ -52,7 +51,7 @@
   }
 </script>
 
-<div class={cx("fixed bottom-0 left-0 top-0 w-60 bg-cocoa transition-colors")}>
+<div class="fixed bottom-0 left-0 top-0 z-nav w-60 bg-cocoa transition-colors">
   <Anchor
     class="mb-4 flex h-16 items-center gap-1 px-6"
     external
@@ -154,7 +153,7 @@
       </MenuDesktopSecondary>
     {/if}
     <div class="cursor-pointer border-t border-solid border-mid px-7 pb-4 pt-3">
-      {#if $user}
+      {#if $pubkey}
         <Anchor class="flex items-center gap-2" on:click={() => setSubMenu("account")}>
           <PersonCircle class="h-10 w-10" pubkey={$pubkey} />
           <div class="flex min-w-0 flex-col">

src/app/shared/NoteActions.svelte

@@ -179,6 +179,7 @@
   $: {
     actions = []
 
+    if ($canSign) {
       actions.push({label: "Quote", icon: "quote-left", onClick: quote})
 
       if (!note.wrap && $env.ENABLE_GROUPS && ($groupOptions.length > 0 || address)) {
@@ -193,6 +194,7 @@
       } else {
         actions.push({label: "Mute", icon: "microphone-slash", onClick: muteNote})
       }
+    }
 
     if ($env.FORCE_RELAYS.length === 0 && !note.wrap) {
       actions.push({label: "Broadcast", icon: "rss", onClick: broadcast})

src/engine/groups/commands.ts

@@ -24,6 +24,7 @@ import {
   deriveMembershipLevel,
   deriveAdminKeyForGroup,
   deriveSharedKeyForGroup,
+  shouldPostPrivatelyToGroup,
 } from "./utils"
 
 // Key state management
@@ -197,22 +198,10 @@ export const publishToZeroOrMoreGroups = async (
     return [await Publisher.publish({relays, event})]
   }
 
-  const [wrap, nowrap] = partition(a => {
+  const [wrap, nowrap] = partition(
-    const access = deriveGroupAccess(a).get()
+    address => shouldPostPrivatelyToGroup(address, shouldWrap),
-    const membershipLevel = deriveMembershipLevel(a).get()
+    addresses,
-
+  )
-    if (membershipLevel === MembershipLevel.Private) {
-      if (access === GroupAccess.Closed) {
-        return true
-      }
-
-      if (access === GroupAccess.Hybrid) {
-        return shouldWrap
-      }
-    }
-
-    return false
-  }, addresses)
 
   const pubs = []
 

src/engine/groups/utils.ts

@@ -102,3 +102,20 @@ export const deriveMembershipLevel = address =>
 
     return MembershipLevel.None
   })
+
+export const shouldPostPrivatelyToGroup = (address, preference) => {
+  const access = deriveGroupAccess(address).get()
+  const membershipLevel = deriveMembershipLevel(address).get()
+
+  if (membershipLevel === MembershipLevel.Private) {
+    if (access === GroupAccess.Closed) {
+      return true
+    }
+
+    if (access === GroupAccess.Hybrid) {
+      return preference
+    }
+  }
+
+  return false
+}

src/engine/people/commands.ts

@@ -25,7 +25,7 @@ export const follow = (type: string, value: string) => {
 }
 
 export const unfollow = (value: string) =>
-  publishPetnames(reject((t: string[]) => t[1] === value, user.get().petnames || []))
+  publishPetnames(reject((t: string[]) => t[1] === value, user.get()?.petnames || []))
 
 export const publishMutes = ($mutes: string[][]) => {
   updateStore(people.key(stateKey.get()), now(), {mutes: $mutes})
@@ -37,9 +37,9 @@ export const publishMutes = ($mutes: string[][]) => {
 
 export const mute = (type: string, pubkey: string) =>
   publishMutes([
-    ...reject((t: string[]) => t[1] === pubkey, user.get().mutes || []),
+    ...reject((t: string[]) => t[1] === pubkey, user.get()?.mutes || []),
     [type, pubkey],
   ])
 
 export const unmute = (value: string) =>
-  publishMutes(reject((t: string[]) => t[1] === value, user.get().mutes || []))
+  publishMutes(reject((t: string[]) => t[1] === value, user.get()?.mutes || []))

src/engine/session/commands.ts

@@ -2,12 +2,14 @@ import {omit, assoc} from "ramda"
 import {generatePrivateKey, getPublicKey} from "nostr-tools"
 import {appDataKeys} from "src/util/nostr"
 import {createAndPublish} from "src/engine/network/utils"
+import {people} from "src/engine/people/state"
 import type {Session} from "./model"
 import {sessions, pubkey} from "./state"
 import {canSign, nip04, session} from "./derived"
 
 const addSession = (s: Session) => {
   sessions.update(assoc(s.pubkey, s))
+  people.key(s.pubkey).update($p => ({...$p, pubkey: s.pubkey}))
   pubkey.set(s.pubkey)
 }
 

src/partials/FlexColumn.svelte

@@ -4,10 +4,10 @@
   export let small = false
   export let large = false
 
-  const className = cx('flex flex-col m-auto', $$props.class, {
+  const className = cx("flex flex-col m-auto min-w-0 w-full", $$props.class, {
-    'gap-2': small,
+    "gap-2": small,
-    'gap-4': !small && !large,
+    "gap-4": !small && !large,
-    'gap-6': large,
+    "gap-6": large,
   })
 </script>