From 1fd221b1995f706c8fbf3e770429da0f74193e18 Mon Sep 17 00:00:00 2001
From: Ticruz <thib.duchene@gmail.com>
Date: Mon, 4 Nov 2024 14:47:41 +0100
Subject: [PATCH 01/13] delete all group related functions

---
 src/app/shared/EventInfo.svelte           |  12 -
 src/app/shared/GroupAbout.svelte          |  17 -
 src/app/shared/GroupActions.svelte        |  15 -
 src/app/shared/GroupActionsClosed.svelte  | 133 ------
 src/app/shared/GroupActionsOpen.svelte    |  77 ----
 src/app/shared/GroupAdmin.svelte          |  17 -
 src/app/shared/GroupAlert.svelte          |  50 ---
 src/app/shared/GroupCalendar.svelte       |   8 -
 src/app/shared/GroupDetailsForm.svelte    | 178 --------
 src/app/shared/GroupLink.svelte           |  19 -
 src/app/shared/GroupListItem.svelte       |  65 ---
 src/app/shared/GroupMarket.svelte         |  24 --
 src/app/shared/GroupMember.svelte         |  34 --
 src/app/shared/GroupMembers.svelte        |  24 --
 src/app/shared/GroupName.svelte           |  12 -
 src/app/shared/GroupNotes.svelte          |  89 ----
 src/app/shared/GroupRequest.svelte        |  86 ----
 src/app/shared/GroupRestrictAccess.svelte |  21 -
 src/app/shared/GroupSummary.svelte        |  37 --
 src/app/shared/NoteActions.svelte         |  25 +-
 src/app/shared/NoteCreateInline.svelte    |  49 +--
 src/app/shared/NoteOptions.svelte         |  43 +-
 src/app/shared/NoteReply.svelte           |   9 +-
 src/app/views/Bech32Entity.svelte         |   5 +-
 src/app/views/EventEdit.svelte            |   4 +-
 src/app/views/GroupCreate.svelte          | 110 -----
 src/app/views/GroupDelete.svelte          |  36 --
 src/app/views/GroupDetail.svelte          | 130 ------
 src/app/views/GroupEdit.svelte            |  44 --
 src/app/views/GroupInfo.svelte            |  59 ---
 src/app/views/GroupInviteAdmin.svelte     |  57 ---
 src/app/views/GroupList.svelte            |   7 +-
 src/app/views/GroupRotate.svelte          | 122 ------
 src/app/views/Home.svelte                 |   8 +-
 src/app/views/InviteAccept.svelte         |  51 +--
 src/app/views/InviteCreate.svelte         |  86 +---
 src/app/views/NoteCreate.svelte           |  73 ++--
 src/app/views/UserKeys.svelte             |  76 +---
 src/domain/group.ts                       |  41 --
 src/domain/index.ts                       |   1 -
 src/engine/commands.ts                    | 473 +++-------------------
 src/engine/model.ts                       |  50 +--
 src/engine/projections.ts                 | 161 +-------
 src/engine/requests.ts                    |  18 -
 src/engine/state.ts                       | 414 +++++--------------
 src/util/store.ts                         |  28 --
 46 files changed, 249 insertions(+), 2849 deletions(-)
 delete mode 100644 src/app/shared/GroupAbout.svelte
 delete mode 100644 src/app/shared/GroupActions.svelte
 delete mode 100644 src/app/shared/GroupActionsClosed.svelte
 delete mode 100644 src/app/shared/GroupActionsOpen.svelte
 delete mode 100644 src/app/shared/GroupAdmin.svelte
 delete mode 100644 src/app/shared/GroupAlert.svelte
 delete mode 100644 src/app/shared/GroupCalendar.svelte
 delete mode 100644 src/app/shared/GroupDetailsForm.svelte
 delete mode 100644 src/app/shared/GroupLink.svelte
 delete mode 100644 src/app/shared/GroupListItem.svelte
 delete mode 100644 src/app/shared/GroupMarket.svelte
 delete mode 100644 src/app/shared/GroupMember.svelte
 delete mode 100644 src/app/shared/GroupMembers.svelte
 delete mode 100644 src/app/shared/GroupName.svelte
 delete mode 100644 src/app/shared/GroupNotes.svelte
 delete mode 100644 src/app/shared/GroupRequest.svelte
 delete mode 100644 src/app/shared/GroupRestrictAccess.svelte
 delete mode 100644 src/app/shared/GroupSummary.svelte
 delete mode 100644 src/app/views/GroupCreate.svelte
 delete mode 100644 src/app/views/GroupDelete.svelte
 delete mode 100644 src/app/views/GroupDetail.svelte
 delete mode 100644 src/app/views/GroupEdit.svelte
 delete mode 100644 src/app/views/GroupInfo.svelte
 delete mode 100644 src/app/views/GroupInviteAdmin.svelte
 delete mode 100644 src/app/views/GroupRotate.svelte
 delete mode 100644 src/domain/group.ts

diff --git a/src/app/shared/EventInfo.svelte b/src/app/shared/EventInfo.svelte
index a9b752a70..912488c3d 100644
--- a/src/app/shared/EventInfo.svelte
+++ b/src/app/shared/EventInfo.svelte
@@ -7,7 +7,6 @@
   import {secondsToDate, formatTimestamp, formatTimestampAsDate, getLocale} from "src/util/misc"
   import Anchor from "src/partials/Anchor.svelte"
   import Chip from "src/partials/Chip.svelte"
-  import GroupLink from "src/app/shared/GroupLink.svelte"
   import PersonLink from "src/app/shared/PersonLink.svelte"
   import EventActions from "src/app/shared/EventActions.svelte"
   import NoteContentKind1 from "src/app/shared/NoteContentKind1.svelte"
@@ -69,17 +68,6 @@
       Created by
       <PersonLink pubkey={event.pubkey} />
     </span>
-    {#if groupAddrs.length > 0}
-      <span>•</span>
-      <span>
-        Posted in
-        {#if groupAddrs.length === 1}
-          <GroupLink address={groupAddrs[0]} />
-        {:else}
-          {groupAddrs.length} groups
-        {/if}
-      </span>
-    {/if}
   </div>
   <div class="h-px bg-neutral-600" />
   <div class="flex items-center gap-2 text-sm text-neutral-200">
diff --git a/src/app/shared/GroupAbout.svelte b/src/app/shared/GroupAbout.svelte
deleted file mode 100644
index 63b9fdecf..000000000
--- a/src/app/shared/GroupAbout.svelte
+++ /dev/null
@@ -1,17 +0,0 @@
-<script lang="ts">
-  import NoteContentKind1 from "src/app/shared/NoteContentKind1.svelte"
-  import {deriveGroupMeta} from "src/engine"
-
-  export let address
-  export let truncate = true
-
-  const meta = deriveGroupMeta(address)
-</script>
-
-{#key $meta?.about}
-  <NoteContentKind1
-    note={{content: $meta?.about || ""}}
-    minLength={200}
-    maxLength={500}
-    showEntire={!truncate} />
-{/key}
diff --git a/src/app/shared/GroupActions.svelte b/src/app/shared/GroupActions.svelte
deleted file mode 100644
index 56e935c34..000000000
--- a/src/app/shared/GroupActions.svelte
+++ /dev/null
@@ -1,15 +0,0 @@
-<script lang="ts">
-  import GroupActionsOpen from "src/app/shared/GroupActionsOpen.svelte"
-  import GroupActionsClosed from "src/app/shared/GroupActionsClosed.svelte"
-
-  export let address
-  export let claim = null
-</script>
-
-{#if address.startsWith("34550:")}
-  <GroupActionsOpen {address} />
-{/if}
-
-{#if address.startsWith("35834:")}
-  <GroupActionsClosed {address} {claim} />
-{/if}
diff --git a/src/app/shared/GroupActionsClosed.svelte b/src/app/shared/GroupActionsClosed.svelte
deleted file mode 100644
index 0a7fad328..000000000
--- a/src/app/shared/GroupActionsClosed.svelte
+++ /dev/null
@@ -1,133 +0,0 @@
-<script lang="ts">
-  import {signer} from "@welshman/app"
-  import Modal from "src/partials/Modal.svelte"
-  import Content from "src/partials/Content.svelte"
-  import Field from "src/partials/Field.svelte"
-  import Input from "src/partials/Input.svelte"
-  import Anchor from "src/partials/Anchor.svelte"
-  import Popover from "src/partials/Popover.svelte"
-  import OverflowMenu from "src/partials/OverflowMenu.svelte"
-  import {router} from "src/app/util/router"
-  import {
-    GroupAccess,
-    deriveAdminKeyForGroup,
-    publishGroupExitRequest,
-    publishGroupEntryRequest,
-    deriveGroupStatus,
-    resetGroupAccess,
-  } from "src/engine"
-
-  export let address
-  export let claim = ""
-
-  const adminKey = deriveAdminKeyForGroup(address)
-  const status = deriveGroupStatus(address)
-
-  let actions = []
-
-  $: {
-    actions = []
-
-    actions.push({
-      onClick: () => router.at("invite/create").qp({initialGroupAddress: address}).open(),
-      label: "Share",
-      icon: "share-nodes",
-    })
-
-    if ($adminKey) {
-      actions.push({
-        onClick: () => router.at("groups").of(address).at("edit").open(),
-        label: "Edit",
-        icon: "edit",
-      })
-
-      actions.push({
-        onClick: () => router.at("groups").of(address).at("delete").open(),
-        label: "Delete",
-        icon: "trash",
-      })
-
-      actions.push({
-        onClick: () => router.at("groups").of(address).at("rotate").open(),
-        label: "Membership",
-        icon: "rotate",
-      })
-    }
-
-    actions.push({
-      onClick: () => router.at("groups").of(address).at("info").open(),
-      label: "Details",
-      icon: "info",
-    })
-  }
-
-  let showClaim
-
-  const startJoin = () => {
-    showClaim = true
-  }
-
-  const cancelJoin = () => {
-    showClaim = false
-  }
-
-  const confirmJoin = () => {
-    publishGroupEntryRequest(address, claim)
-    claim = ""
-    showClaim = false
-  }
-
-  const clear = () => resetGroupAccess(address)
-
-  const leave = () => publishGroupExitRequest(address)
-</script>
-
-<button type="button" class="flex items-center gap-3" on:click|stopPropagation>
-  {#if $signer}
-    {#if !$status.access}
-      <Popover triggerType="mouseenter">
-        <div slot="trigger" class="w-6 text-center">
-          <i class="fa fa-right-to-bracket cursor-pointer" on:click={startJoin} />
-        </div>
-        <div slot="tooltip">Join</div>
-      </Popover>
-    {:else if $status.access === GroupAccess.Requested}
-      <Popover triggerType="mouseenter">
-        <div slot="trigger" class="w-6 text-center">
-          <i class="fa fa-hourglass cursor-pointer" />
-        </div>
-        <div slot="tooltip">Access Pending</div>
-      </Popover>
-    {:else if $status.access === GroupAccess.Granted}
-      <Popover triggerType="mouseenter">
-        <div slot="trigger" class="w-6 text-center">
-          <i class="fa fa-right-from-bracket cursor-pointer" on:click={leave} />
-        </div>
-        <div slot="tooltip">Leave</div>
-      </Popover>
-    {:else if $status.access === GroupAccess.Revoked}
-      <Popover triggerType="mouseenter">
-        <div slot="trigger" class="w-6 text-center">
-          <i class="fa fa-times cursor-pointer" on:click={clear} />
-        </div>
-        <div slot="tooltip">Access Revoked</div>
-      </Popover>
-    {/if}
-  {/if}
-  <OverflowMenu {actions} />
-</button>
-
-{#if showClaim}
-  <Modal onEscape={cancelJoin}>
-    <Content size="lg">
-      <p>If you have an invite code, you can enter it below.</p>
-      <Field label="Invite code">
-        <Input bind:value={claim} />
-      </Field>
-      <div class="flex justify-center gap-2">
-        <Anchor button on:click={cancelJoin}>Cancel</Anchor>
-        <Anchor button accent on:click={confirmJoin}>Request access</Anchor>
-      </div>
-    </Content>
-  </Modal>
-{/if}
diff --git a/src/app/shared/GroupActionsOpen.svelte b/src/app/shared/GroupActionsOpen.svelte
deleted file mode 100644
index d193e83bc..000000000
--- a/src/app/shared/GroupActionsOpen.svelte
+++ /dev/null
@@ -1,77 +0,0 @@
-<script lang="ts">
-  import {remove} from "@welshman/lib"
-  import {session, pubkey} from "@welshman/app"
-  import Popover from "src/partials/Popover.svelte"
-  import OverflowMenu from "src/partials/OverflowMenu.svelte"
-  import {router} from "src/app/util/router"
-  import {
-    publishCommunitiesList,
-    deriveGroup,
-    deriveGroupStatus,
-    deriveAdminKeyForGroup,
-    getUserCommunities,
-  } from "src/engine"
-
-  export let address
-
-  const group = deriveGroup(address)
-  const adminKey = deriveAdminKeyForGroup(address)
-  const status = deriveGroupStatus(address)
-
-  let actions = []
-
-  $: {
-    actions = []
-
-    actions.push({
-      onClick: () => router.at("invite/create").qp({initialGroupAddress: address}).open(),
-      label: "Share",
-      icon: "share-nodes",
-    })
-
-    if ($group.pubkey === $pubkey || $adminKey) {
-      actions.push({
-        onClick: () => router.at("groups").of(address).at("edit").open(),
-        label: "Edit",
-        icon: "edit",
-      })
-
-      actions.push({
-        onClick: () => router.at("groups").of(address).at("delete").open(),
-        label: "Delete",
-        icon: "trash",
-      })
-    }
-
-    actions.push({
-      onClick: () => router.at("groups").of(address).at("info").open(),
-      label: "Details",
-      icon: "info",
-    })
-  }
-
-  const join = () => publishCommunitiesList(getUserCommunities(session.get()).concat(address))
-
-  const leave = () => publishCommunitiesList(remove(address, getUserCommunities(session.get())))
-</script>
-
-<button type="button" class="flex items-center gap-3" on:click|stopPropagation>
-  {#if $session}
-    {#if $status.joined}
-      <Popover triggerType="mouseenter">
-        <div slot="trigger" class="w-6 text-center">
-          <i class="fa fa-right-from-bracket cursor-pointer" on:click={leave} />
-        </div>
-        <div slot="tooltip">Leave</div>
-      </Popover>
-    {:else}
-      <Popover triggerType="mouseenter">
-        <div slot="trigger" class="w-6 text-center">
-          <i class="fa fa-right-to-bracket cursor-pointer" on:click={join} />
-        </div>
-        <div slot="tooltip">Join</div>
-      </Popover>
-    {/if}
-  {/if}
-  <OverflowMenu {actions} />
-</button>
diff --git a/src/app/shared/GroupAdmin.svelte b/src/app/shared/GroupAdmin.svelte
deleted file mode 100644
index 51018d817..000000000
--- a/src/app/shared/GroupAdmin.svelte
+++ /dev/null
@@ -1,17 +0,0 @@
-<script lang="ts">
-  import {whereEq} from "ramda"
-  import GroupRequest from "src/app/shared/GroupRequest.svelte"
-  import {groupRequests} from "src/engine"
-
-  export let address
-
-  const requests = groupRequests.derived(requests =>
-    requests.filter(whereEq({group: address, resolved: false})),
-  )
-</script>
-
-{#each $requests as request (request.id)}
-  <GroupRequest {address} {request} />
-{:else}
-  <p class="text-center py-12">No action items found.</p>
-{/each}
diff --git a/src/app/shared/GroupAlert.svelte b/src/app/shared/GroupAlert.svelte
deleted file mode 100644
index 6b4494c0c..000000000
--- a/src/app/shared/GroupAlert.svelte
+++ /dev/null
@@ -1,50 +0,0 @@
-<script lang="ts">
-  import {formatTimestamp} from "src/util/misc"
-  import Card from "src/partials/Card.svelte"
-  import Chip from "src/partials/Chip.svelte"
-  import Anchor from "src/partials/Anchor.svelte"
-  import FlexColumn from "src/partials/FlexColumn.svelte"
-  import GroupCircle from "src/app/shared/GroupCircle.svelte"
-  import GroupName from "src/app/shared/GroupName.svelte"
-  import {router} from "src/app/util/router"
-
-  export let address
-  export let alert
-</script>
-
-<Card interactive>
-  <FlexColumn>
-    <div class="flex justify-between">
-      <p class="text-2xl">
-        {#if alert.type === "exit"}
-          Access revoked
-        {:else if alert.type === "invite"}
-          Group invitation
-        {/if}
-      </p>
-      <span class="text-sm">
-        {formatTimestamp(alert.created_at)}
-      </span>
-    </div>
-    <p>
-      The admin of
-      <Anchor modal href={router.at("groups").of(address).at("notes").toString()}>
-        <Chip class="relative top-px mx-1">
-          <GroupCircle {address} class="h-4 w-4" />
-          <GroupName {address} />
-        </Chip>
-      </Anchor>
-      has
-      {#if alert.type === "exit"}
-        removed you from the group.
-      {:else if alert.type === "invite"}
-        given you access to the group.
-      {/if}
-    </p>
-    {#if alert.content}
-      <p class="border-l-2 border-solid border-neutral-600 pl-2">
-        "{alert.content}"
-      </p>
-    {/if}
-  </FlexColumn>
-</Card>
diff --git a/src/app/shared/GroupCalendar.svelte b/src/app/shared/GroupCalendar.svelte
deleted file mode 100644
index a87b5ada2..000000000
--- a/src/app/shared/GroupCalendar.svelte
+++ /dev/null
@@ -1,8 +0,0 @@
-<script lang="ts">
-  import {EVENT_TIME} from "@welshman/util"
-  import Calendar from "src/app/shared/Calendar.svelte"
-
-  export let address
-</script>
-
-<Calendar group={address} filter={{kinds: [EVENT_TIME], "#a": [address]}} />
diff --git a/src/app/shared/GroupDetailsForm.svelte b/src/app/shared/GroupDetailsForm.svelte
deleted file mode 100644
index 13de3c758..000000000
--- a/src/app/shared/GroupDetailsForm.svelte
+++ /dev/null
@@ -1,178 +0,0 @@
-<script lang="ts">
-  import {join, uniqBy} from "ramda"
-  import {ucFirst} from "hurdak"
-  import {ctx} from "@welshman/lib"
-  import {Address, GROUP, COMMUNITY, normalizeRelayUrl, displayRelayUrl} from "@welshman/util"
-  import {relaySearch} from "@welshman/app"
-  import {toSpliced} from "src/util/misc"
-  import {fly} from "src/util/transition"
-  import {formCtrl} from "src/partials/utils"
-  import {showInfo, showWarning} from "src/partials/Toast.svelte"
-  import Field from "src/partials/Field.svelte"
-  import FieldInline from "src/partials/FieldInline.svelte"
-  import Toggle from "src/partials/Toggle.svelte"
-  import SearchSelect from "src/partials/SearchSelect.svelte"
-  import ListItem from "src/partials/ListItem.svelte"
-  import ImageInput from "src/partials/ImageInput.svelte"
-  import Textarea from "src/partials/Textarea.svelte"
-  import Input from "src/partials/Input.svelte"
-  import Anchor from "src/partials/Anchor.svelte"
-  import FlexColumn from "src/partials/FlexColumn.svelte"
-  import Heading from "src/partials/Heading.svelte"
-  import PersonSelect from "src/app/shared/PersonSelect.svelte"
-  import type {GroupMeta} from "src/domain"
-  import {env, feedSearch} from "src/engine"
-
-  export let onSubmit
-  export let values: GroupMeta & {members: string[]}
-  export let mode = "create"
-  export let showMembers = false
-  export let buttonText = "Save"
-
-  const toggleAdvanced = () => {
-    showAdvanced = !showAdvanced
-  }
-
-  const addFeed = address => {
-    if (address) {
-      const relayHint = ctx.app.router.FromPubkeys([Address.from(address).pubkey]).getUrl()
-      const feedTag = ["feed", address, relayHint, "Custom Feed"]
-
-      values.feeds = uniqBy(join(":"), values.feeds.concat([feedTag]))
-      feedsInput.clear()
-    }
-  }
-
-  const removeFeed = i => {
-    values.feeds = toSpliced(values.feeds, i, 1)
-  }
-
-  const searchRelays = term => $relaySearch.searchValues(term).map(url => ["relay", url])
-
-  const urlToTag = url => ["relay", normalizeRelayUrl(url)]
-
-  const ctrl = formCtrl({
-    submit: async () => {
-      if (values.relays.length < 1) {
-        showWarning("At least one relay is required.")
-      } else {
-        await onSubmit(values)
-
-        showInfo("Your group has been saved!")
-      }
-    },
-  })
-
-  let feedsInput
-  let showAdvanced = false
-</script>
-
-<form on:submit|preventDefault={$ctrl.submit} in:fly={{y: 20}}>
-  <FlexColumn>
-    <div class="mb-4 flex flex-col items-center justify-center">
-      <Heading>{ucFirst(mode)} Group</Heading>
-      <p>
-        {#if values.kind === COMMUNITY}
-          An open forum where anyone can participate.
-        {:else}
-          A private place where members can talk.
-        {/if}
-      </p>
-    </div>
-    <div class="flex w-full flex-col gap-8">
-      <Field label="Name">
-        <Input bind:value={values.name}>
-          <i slot="before" class="fa fa-clipboard" />
-        </Input>
-        <div slot="info">The name of the group</div>
-      </Field>
-      <Field label="Picture">
-        <ImageInput
-          bind:value={values.image}
-          icon="image-portrait"
-          maxWidth={480}
-          maxHeight={480} />
-        <div slot="info">A picture for the group</div>
-      </Field>
-      <Field label="Banner">
-        <ImageInput bind:value={values.banner} icon="image" maxWidth={4000} maxHeight={4000} />
-        <div slot="info">A banner image for the group</div>
-      </Field>
-      <Field label="About">
-        <Textarea bind:value={values.about} />
-        <div slot="info">The group's decription</div>
-      </Field>
-      {#if values.kind === GROUP}
-        <FieldInline label="List Publicly">
-          <Toggle bind:value={values.listing_is_public} />
-          <div slot="info">
-            If enabled, this will generate a public listing for the group. The member list and group
-            messages will not be published.
-          </div>
-        </FieldInline>
-      {/if}
-      {#if env.PLATFORM_RELAYS.length === 0}
-        <Field label="Relays">
-          <SearchSelect
-            multiple
-            search={searchRelays}
-            bind:value={values.relays}
-            termToItem={urlToTag}>
-            <i slot="before" class="fa fa-clipboard" />
-            <span slot="item" let:item>
-              {displayRelayUrl(item[1])}
-            </span>
-          </SearchSelect>
-          <div slot="info">
-            Which relays members should publish notes to. For additional privacy, select relays you
-            host yourself.
-          </div>
-        </Field>
-      {/if}
-      {#if showMembers}
-        <Field label="Member List">
-          <PersonSelect multiple bind:value={values.members} />
-          <div slot="info">All members will receive a fresh invitation with a new key.</div>
-        </Field>
-      {/if}
-      {#if showAdvanced}
-        <Anchor on:click={toggleAdvanced} class="flex items-center gap-2">
-          <i class="fa fa-caret-down" />
-          <span>Hide Advanced Settings</span>
-        </Anchor>
-        <Field label="Custom Feeds">
-          {#each values.feeds as [_, address, hint, label], i (address)}
-            <ListItem on:remove={() => removeFeed(i)}>
-              <span slot="label">{$feedSearch.displayValue(address)}</span>
-              <span slot="data">
-                <Input bind:value={label} />
-              </span>
-            </ListItem>
-          {/each}
-          <SearchSelect
-            onChange={addFeed}
-            search={$feedSearch.searchValues}
-            bind:this={feedsInput}
-            displayItem={$feedSearch.displayValue}>
-            <i slot="before" class="fa fa-rss" />
-            <span slot="item" let:item>
-              {$feedSearch.displayValue(item)}
-            </span>
-          </SearchSelect>
-          <div slot="info">
-            Add custom feeds to your group using special-purpose DVMs that are configured to respond
-            to
-            <Anchor href="https://www.data-vending-machines.org/kinds/5300/" external
-              >kind 5300</Anchor> events.
-          </div>
-        </Field>
-      {:else}
-        <Anchor on:click={toggleAdvanced} class="flex items-center gap-2">
-          <i class="fa fa-caret-right" />
-          <span>Show Advanced Settings</span>
-        </Anchor>
-      {/if}
-      <Anchor button loading={$ctrl.loading} tag="button" type="submit">{buttonText}</Anchor>
-    </div>
-  </FlexColumn>
-</form>
diff --git a/src/app/shared/GroupLink.svelte b/src/app/shared/GroupLink.svelte
deleted file mode 100644
index 1e0f757d6..000000000
--- a/src/app/shared/GroupLink.svelte
+++ /dev/null
@@ -1,19 +0,0 @@
-<script lang="ts">
-  import Anchor from "src/partials/Anchor.svelte"
-  import {router} from "src/app/util/router"
-  import {displayGroupMeta} from "src/domain"
-  import {deriveGroupMeta, loadGroups} from "src/engine"
-
-  export let address
-
-  const meta = deriveGroupMeta(address)
-  const path = router.at("groups").of(address).at("notes").toString()
-
-  loadGroups([address])
-</script>
-
-<span class={$$props.class}>
-  <Anchor modal underline href={path}>
-    {displayGroupMeta($meta)}
-  </Anchor>
-</span>
diff --git a/src/app/shared/GroupListItem.svelte b/src/app/shared/GroupListItem.svelte
deleted file mode 100644
index aa18f249c..000000000
--- a/src/app/shared/GroupListItem.svelte
+++ /dev/null
@@ -1,65 +0,0 @@
-<script>
-  import {ellipsize} from "hurdak"
-  import {derived} from "svelte/store"
-  import {remove, intersection} from "@welshman/lib"
-  import {isGroupAddress, isCommunityAddress} from "@welshman/util"
-  import {pubkey} from "@welshman/app"
-  import Chip from "src/partials/Chip.svelte"
-  import Card from "src/partials/Card.svelte"
-  import GroupCircle from "src/app/shared/GroupCircle.svelte"
-  import PersonCircles from "src/app/shared/PersonCircles.svelte"
-  import {router} from "src/app/util/router"
-  import {displayGroupMeta} from "src/domain"
-  import {deriveGroupMeta, userFollows, communityListsByAddress} from "src/engine"
-
-  export let address
-  export let modal = false
-
-  const meta = deriveGroupMeta(address)
-  const members = derived(communityListsByAddress, $m => {
-    const allMembers = $m.get(address)?.map(l => l.event.pubkey) || []
-    const otherMembers = remove($pubkey, allMembers)
-    const followMembers = intersection(otherMembers, Array.from($userFollows))
-
-    return followMembers
-  })
-
-  const enter = () => {
-    const route = router.at("groups").of(address).at("notes")
-
-    if (modal) {
-      route.open()
-    } else {
-      route.push()
-    }
-  }
-</script>
-
-<Card interactive on:click={enter} class="flex gap-4">
-  <GroupCircle class="h-14 w-14" {address} />
-  <div class="flex min-w-0 flex-grow flex-col justify-start gap-1">
-    <div class="flex justify-between gap-2">
-      <h2 class="text-xl font-bold">
-        {displayGroupMeta($meta)}
-      </h2>
-      <slot name="actions">
-        {#if isCommunityAddress(address)}
-          <Chip class="text-sm text-neutral-200"><i class="fa fa-unlock" /> Open</Chip>
-        {/if}
-        {#if isGroupAddress(address)}
-          <Chip class="text-sm text-neutral-200"><i class="fa fa-lock" /> Closed</Chip>
-        {/if}
-      </slot>
-    </div>
-    {#if $meta?.about}
-      <p class="overflow-hidden text-ellipsis text-start text-neutral-100">
-        {ellipsize($meta.about, 300)}
-      </p>
-    {/if}
-    {#if $members.length > 0}
-      <div class="pt-1">
-        <PersonCircles class="h-6 w-6" pubkeys={$members.slice(0, 20)} />
-      </div>
-    {/if}
-  </div>
-</Card>
diff --git a/src/app/shared/GroupMarket.svelte b/src/app/shared/GroupMarket.svelte
deleted file mode 100644
index 5e453bcc5..000000000
--- a/src/app/shared/GroupMarket.svelte
+++ /dev/null
@@ -1,24 +0,0 @@
-<script lang="ts">
-  import {isGroupAddress} from "@welshman/util"
-  import {feedFromFilter} from "@welshman/feeds"
-  import Card from "src/partials/Card.svelte"
-  import Anchor from "src/partials/Anchor.svelte"
-  import Feed from "src/app/shared/Feed.svelte"
-  import {router} from "src/app/util/router"
-  import {makeFeed} from "src/domain"
-
-  export let address
-
-  const createListing = () => router.at("notes/create").qp({type: "listing", group: address}).open()
-
-  const feed = makeFeed({
-    definition: feedFromFilter({kinds: [30402], "#a": [address]}),
-  })
-</script>
-
-<Card class="flex justify-between">
-  Have something you'd like to sell on nostr?
-  <Anchor button accent on:click={createListing}>Create a listing</Anchor>
-</Card>
-
-<Feed {feed} skipNetwork={isGroupAddress(address)} />
diff --git a/src/app/shared/GroupMember.svelte b/src/app/shared/GroupMember.svelte
deleted file mode 100644
index f29591fbc..000000000
--- a/src/app/shared/GroupMember.svelte
+++ /dev/null
@@ -1,34 +0,0 @@
-<script lang="ts">
-  import {isGroupAddress} from "@welshman/util"
-  import {session} from "@welshman/app"
-  import Card from "src/partials/Card.svelte"
-  import Anchor from "src/partials/Anchor.svelte"
-  import PersonSummary from "src/app/shared/PersonSummary.svelte"
-  import {deriveAdminKeyForGroup} from "src/engine"
-  import {router} from "src/app/util/router"
-
-  export let address
-  export let pubkey
-
-  const adminKey = deriveAdminKeyForGroup(address)
-
-  const remove = () =>
-    router
-      .at("groups")
-      .of(address)
-      .at("rotate")
-      .qp({removeMembers: [pubkey]})
-      .open()
-
-  const openPerson = pubkey => router.at("people").of(pubkey).open()
-</script>
-
-<Card interactive on:click={() => openPerson(pubkey)}>
-  <PersonSummary inert {pubkey}>
-    <button type="button" slot="actions" on:click|stopPropagation>
-      {#if $adminKey && pubkey !== $session.pubkey && isGroupAddress(address)}
-        <Anchor on:click={remove} button accent>Remove</Anchor>
-      {/if}
-    </button>
-  </PersonSummary>
-</Card>
diff --git a/src/app/shared/GroupMembers.svelte b/src/app/shared/GroupMembers.svelte
deleted file mode 100644
index 6bf67ea35..000000000
--- a/src/app/shared/GroupMembers.svelte
+++ /dev/null
@@ -1,24 +0,0 @@
-<script lang="ts">
-  import {COMMUNITIES} from "@welshman/util"
-  import FlexColumn from "src/partials/FlexColumn.svelte"
-  import GroupMember from "src/app/shared/GroupMember.svelte"
-  import {load, deriveGroup, communityListsByAddress} from "src/engine"
-
-  export let address
-
-  const group = deriveGroup(address)
-  const filters = [{kinds: [COMMUNITIES], "#a": [address]}]
-
-  $: members =
-    $group.members || $communityListsByAddress.get(address)?.map(l => l.event.pubkey) || []
-
-  load({filters, skipCache: true})
-</script>
-
-<FlexColumn>
-  {#each members as pubkey (pubkey)}
-    <GroupMember {address} {pubkey} />
-  {:else}
-    <p class="text-center py-12">No members found.</p>
-  {/each}
-</FlexColumn>
diff --git a/src/app/shared/GroupName.svelte b/src/app/shared/GroupName.svelte
deleted file mode 100644
index 9664ec6ef..000000000
--- a/src/app/shared/GroupName.svelte
+++ /dev/null
@@ -1,12 +0,0 @@
-<script lang="ts">
-  import {displayGroupMeta} from "src/domain"
-  import {deriveGroupMeta} from "src/engine"
-
-  export let address
-
-  const meta = deriveGroupMeta(address)
-
-  $: display = displayGroupMeta($meta)
-</script>
-
-<span class={$$props.class} class:text-neutral-400={display === "[no name]"}>{display}</span>
diff --git a/src/app/shared/GroupNotes.svelte b/src/app/shared/GroupNotes.svelte
deleted file mode 100644
index dafe3a951..000000000
--- a/src/app/shared/GroupNotes.svelte
+++ /dev/null
@@ -1,89 +0,0 @@
-<script lang="ts">
-  import {ucFirst} from "hurdak"
-  import {ctx, nth, remove} from "@welshman/lib"
-  import {isGroupAddress, getAddress, getIdFilters, Address} from "@welshman/util"
-  import {feedFromFilter, makeRelayFeed, makeIntersectionFeed} from "@welshman/feeds"
-  import {signer, repository} from "@welshman/app"
-  import {noteKinds} from "src/util/nostr"
-  import FlexColumn from "src/partials/FlexColumn.svelte"
-  import Tabs from "src/partials/Tabs.svelte"
-  import Feed from "src/app/shared/Feed.svelte"
-  import NoteCreateInline from "src/app/shared/NoteCreateInline.svelte"
-  import {makeFeed, readFeed} from "src/domain"
-  import {deriveGroupMeta, load} from "src/engine"
-
-  export let address
-
-  const meta = deriveGroupMeta(address)
-  const mainFeed = makeIntersectionFeed(
-    makeRelayFeed(...($meta.relays?.map(nth(1)) || [])),
-    feedFromFilter({kinds: remove(30402, noteKinds), "#a": [address]}),
-  )
-
-  const setActiveTab = tab => {
-    activeTab = tab
-    feed = feeds.find(f => f.name === activeTab).feed
-  }
-
-  let activeTab = "feed"
-  let tabs = ["feed"]
-  let feeds = [{name: "feed", feed: makeFeed({definition: mainFeed})}]
-  let feed = makeFeed({definition: mainFeed})
-
-  for (const feed of $meta?.feeds || []) {
-    const [address, relay = "", name = ""] = feed.slice(1)
-
-    if (!Address.isAddress(address)) {
-      continue
-    }
-
-    const event = repository.getEvent(address)
-
-    if (event) {
-      feeds = feeds.concat({name, feed: readFeed(event)})
-      tabs = tabs.concat(name)
-    } else {
-      const relays = ctx.app.router
-        .merge([
-          ctx.app.router.fromRelays([relay]),
-          ctx.app.router.FromPubkeys([Address.from(address).pubkey]),
-        ])
-        .getUrls()
-
-      load({
-        relays,
-        filters: getIdFilters([address]),
-        onEvent: e => {
-          if (feeds.find(f => getAddress(e) === address)) {
-            return
-          }
-
-          feeds = feeds.concat({name, feed: readFeed(e)})
-          tabs = tabs.concat(name)
-        },
-      })
-    }
-  }
-</script>
-
-<FlexColumn large>
-  {#if $signer}
-    <NoteCreateInline group={address} />
-  {/if}
-  {#if tabs.length > 1}
-    <Tabs {tabs} {activeTab} {setActiveTab}>
-      <div slot="tab" let:tab class="flex gap-2">
-        <div>{ucFirst(tab)}</div>
-      </div>
-    </Tabs>
-  {/if}
-  {#key feed}
-    <Feed
-      {feed}
-      eager
-      shouldListen
-      includeReposts
-      contextAddress={address}
-      skipNetwork={isGroupAddress(address)} />
-  {/key}
-</FlexColumn>
diff --git a/src/app/shared/GroupRequest.svelte b/src/app/shared/GroupRequest.svelte
deleted file mode 100644
index 0749681c1..000000000
--- a/src/app/shared/GroupRequest.svelte
+++ /dev/null
@@ -1,86 +0,0 @@
-<script lang="ts">
-  import {Tags} from "@welshman/util"
-  import Card from "src/partials/Card.svelte"
-  import Chip from "src/partials/Chip.svelte"
-  import Anchor from "src/partials/Anchor.svelte"
-  import FlexColumn from "src/partials/FlexColumn.svelte"
-  import GroupCircle from "src/app/shared/GroupCircle.svelte"
-  import GroupName from "src/app/shared/GroupName.svelte"
-  import PersonBadgeSmall from "src/app/shared/PersonBadgeSmall.svelte"
-  import {groupRequests} from "src/engine"
-  import {router} from "src/app/util/router"
-
-  export let address
-  export let request
-  export let showGroup = false
-
-  const claim = Tags.fromEvent(request).get("claim")?.value()
-  const dismiss = () => groupRequests.key(request.id).merge({resolved: true})
-
-  const resolve = () => {
-    if (request.kind === 25) {
-      router
-        .at("groups")
-        .of(address)
-        .at("rotate")
-        .qp({addMembers: [request.pubkey]})
-        .open()
-    }
-
-    if (request.kind === 26) {
-      router
-        .at("groups")
-        .of(address)
-        .at("rotate")
-        .qp({removeMembers: [request.pubkey]})
-        .open()
-    }
-  }
-</script>
-
-<Card interactive>
-  <FlexColumn>
-    <div class="flex items-center justify-between">
-      <p class="text-xl">
-        {#if request.kind === 25}
-          Request to join
-        {:else if request.kind === 26}
-          Key rotation request
-        {/if}
-      </p>
-      <div class="hidden gap-2 sm:flex">
-        <Anchor on:click={dismiss} button>Dismiss</Anchor>
-        <Anchor on:click={resolve} button accent>Resolve</Anchor>
-      </div>
-    </div>
-    <p class="border-l-2 border-solid border-neutral-600 pl-2">
-      "{request.content}"
-    </p>
-    <p>
-      Resolving this request will
-      {#if request.kind === 25}
-        add <Chip class="relative top-px mx-1"><PersonBadgeSmall pubkey={request.pubkey} /></Chip> to
-      {:else if request.kind === 26}
-        remove <Chip class="relative top-px mx-1"
-          ><PersonBadgeSmall pubkey={request.pubkey} /></Chip> from
-      {/if}
-      {#if showGroup}
-        <Anchor modal href={router.at("groups").of(address).at("notes").toString()}>
-          <Chip class="relative top-px mx-1">
-            <GroupCircle {address} class="h-4 w-4" />
-            <GroupName {address} />
-          </Chip>
-        </Anchor>
-      {:else}
-        the group.
-      {/if}
-    </p>
-    {#if claim}
-      <p>Claim: "{claim}"</p>
-    {/if}
-    <div class="flex gap-2 sm:hidden">
-      <Anchor on:click={dismiss} button>Dismiss</Anchor>
-      <Anchor on:click={resolve} button accent>Resolve</Anchor>
-    </div>
-  </FlexColumn>
-</Card>
diff --git a/src/app/shared/GroupRestrictAccess.svelte b/src/app/shared/GroupRestrictAccess.svelte
deleted file mode 100644
index b65cbe432..000000000
--- a/src/app/shared/GroupRestrictAccess.svelte
+++ /dev/null
@@ -1,21 +0,0 @@
-<script lang="ts">
-  import Anchor from "src/partials/Anchor.svelte"
-  import {session} from "@welshman/app"
-  import {publishGroupEntryRequest, GroupAccess, deriveGroupStatus} from "src/engine"
-
-  export let address
-
-  const status = deriveGroupStatus(address)
-</script>
-
-<p class="m-auto max-w-sm py-12 text-center">
-  {#if $status.access === GroupAccess.Requested}
-    Your access request is awaiting approval.
-  {:else}
-    You don't have access to this group.
-  {/if}
-  {#if $session && !$status.access}
-    Click <Anchor underline on:click={() => publishGroupEntryRequest(address)}>here</Anchor> to request
-    entry.
-  {/if}
-</p>
diff --git a/src/app/shared/GroupSummary.svelte b/src/app/shared/GroupSummary.svelte
deleted file mode 100644
index 37544eda2..000000000
--- a/src/app/shared/GroupSummary.svelte
+++ /dev/null
@@ -1,37 +0,0 @@
-<script lang="ts">
-  import {isCommunityAddress} from "@welshman/util"
-  import Chip from "src/partials/Chip.svelte"
-  import GroupCircle from "src/app/shared/GroupCircle.svelte"
-  import GroupAbout from "src/app/shared/GroupAbout.svelte"
-  import GroupName from "src/app/shared/GroupName.svelte"
-  import {deriveGroupMeta} from "src/engine"
-
-  export let address
-  export let hideAbout = false
-
-  const meta = deriveGroupMeta(address)
-</script>
-
-<div class="flex gap-4 text-neutral-100">
-  <GroupCircle {address} class="h-8 w-8" />
-  <div class="flex min-w-0 flex-grow flex-col gap-4">
-    <div class="flex items-center justify-between gap-4">
-      <div class="flex items-center">
-        <GroupName class="text-2xl" {address} />
-        <Chip class="scale-75 border-neutral-200 text-neutral-200">
-          {#if isCommunityAddress(address)}
-            <i class="fa fa-unlock" />
-            Open
-          {:else}
-            <i class="fa fa-lock" />
-            Closed
-          {/if}
-        </Chip>
-      </div>
-      <slot name="actions" class="hidden xs:block" />
-    </div>
-    {#if !hideAbout && $meta?.about}
-      <GroupAbout {address} />
-    {/if}
-  </div>
-</div>
diff --git a/src/app/shared/NoteActions.svelte b/src/app/shared/NoteActions.svelte
index c1ecd4e9a..71c5a6fed 100644
--- a/src/app/shared/NoteActions.svelte
+++ b/src/app/shared/NoteActions.svelte
@@ -55,9 +55,8 @@
     env,
     publish,
     deriveHandlersForKind,
-    userIsGroupMember,
     groupMeta,
-    publishToZeroOrMoreGroups,
+    signAndPublish,
     deleteEvent,
     getSetting,
     loadPubkeys,
@@ -128,11 +127,9 @@
 
     const tags = [...tagReactionTo(note), ...getClientTags()]
     const template = createEvent(7, {content, tags})
-    const {events} = await publishToZeroOrMoreGroups(addresses, template)
+    const {event} = await signAndPublish(template)
 
-    for (const event of events) {
-      addToContext(event)
-    }
+    addToContext(event)
   }
 
   const deleteReaction = e => {
@@ -140,7 +137,7 @@
     removeFromContext(e)
   }
 
-  const crossPost = async (addresses = []) => {
+  const crossPost = async () => {
     const content = JSON.stringify(note as SignedEvent)
     const tags = [...tagEvent(note), tagPubkey(note.pubkey), ...getClientTags()]
 
@@ -151,7 +148,7 @@
       template = createEvent(16, {content, tags: [...tags, ["k", String(note.kind)]]})
     }
 
-    publishToZeroOrMoreGroups(addresses, template)
+    signAndPublish(template)
 
     showInfo("Note has been cross-posted!")
 
@@ -200,16 +197,11 @@
     window.open(templateTag[1].replace("<bech32>", entity))
   }
 
-  const groupOptions = derived([groupMeta, userIsGroupMember], ([$gm, $isMember]) =>
-    $gm.filter(g => $isMember(getAddress(g.event), true)),
-  )
-
   let view
   let actions = []
   let handlersShown = false
 
-  $: disableActions =
-    !$signer || (muted && !showHidden) || (note.wrap && address && !$userIsGroupMember(address))
+  $: disableActions = !$signer || (muted && !showHidden) || (note.wrap && address)
   $: like = likes.find(e => e.pubkey === $sessionWithMeta?.pubkey)
   $: $likesCount = likes.length
   $: zap = zaps.find(e => e.request.pubkey === $sessionWithMeta?.pubkey)
@@ -458,11 +450,6 @@
             </div>
           </Card>
         {/if}
-        {#each $groupOptions as g (getAddress(g.event))}
-          <Card invertColors interactive on:click={() => crossPost([getAddress(g.event)])}>
-            <GroupSummary address={getAddress(g.event)} />
-          </Card>
-        {/each}
       </div>
     {/if}
   </Modal>
diff --git a/src/app/shared/NoteCreateInline.svelte b/src/app/shared/NoteCreateInline.svelte
index de27beac8..839dde2a9 100644
--- a/src/app/shared/NoteCreateInline.svelte
+++ b/src/app/shared/NoteCreateInline.svelte
@@ -1,34 +1,21 @@
 <script lang="ts">
-  import {join, identity} from "ramda"
-  import {writable} from "svelte/store"
-  import {ctx} from "@welshman/lib"
-  import {Tags, createEvent} from "@welshman/util"
   import {pubkey, tagReplyTo} from "@welshman/app"
-  import {showWarning, showPublishInfo} from "src/partials/Toast.svelte"
-  import Anchor from "src/partials/Anchor.svelte"
-  import Popover from "src/partials/Popover.svelte"
+  import {ctx} from "@welshman/lib"
+  import {createEvent} from "@welshman/util"
+  import {join} from "ramda"
   import Compose from "src/app/shared/Compose.svelte"
-  import ImageInput from "src/partials/ImageInput.svelte"
-  import AltColor from "src/partials/AltColor.svelte"
+  import NoteImages from "src/app/shared/NoteImages.svelte"
+  import NoteOptions from "src/app/shared/NoteOptions.svelte"
   import NsecWarning from "src/app/shared/NsecWarning.svelte"
   import PersonCircle from "src/app/shared/PersonCircle.svelte"
-  import NoteOptions from "src/app/shared/NoteOptions.svelte"
-  import NoteImages from "src/app/shared/NoteImages.svelte"
-  import GroupLink from "src/app/shared/GroupLink.svelte"
-  import {env, publish, getClientTags, tagsFromContent, publishToZeroOrMoreGroups} from "src/engine"
+  import {getClientTags, publish, signAndPublish, tagsFromContent} from "src/engine"
+  import AltColor from "src/partials/AltColor.svelte"
+  import Anchor from "src/partials/Anchor.svelte"
+  import ImageInput from "src/partials/ImageInput.svelte"
+  import {showPublishInfo, showWarning} from "src/partials/Toast.svelte"
+  import {writable} from "svelte/store"
 
   export let parent = null
-  export let group = null
-
-  if (parent && group) {
-    throw new Error("Either parent or group is allowed, not both")
-  }
-
-  const defaultGroups = env.FORCE_GROUP
-    ? [env.FORCE_GROUP]
-    : parent
-      ? Tags.fromEvent(parent).context().values().valueOf()
-      : [group].filter(identity)
 
   const defaultOpts = {anonymous: false, warning: ""}
 
@@ -78,9 +65,9 @@
     }
 
     const template = createEvent(1, {content, tags})
-    const {pubs} = await publishToZeroOrMoreGroups(defaultGroups, template, opts)
+    const {pub} = await signAndPublish(template, opts)
 
-    showPublishInfo(pubs[0])
+    showPublishInfo(pub)
     opts = {...defaultOpts}
     compose.clear()
     saving = false
@@ -101,14 +88,6 @@
           <ImageInput multi hostLimit={3} on:change={e => images.addImage(e.detail)}>
             <i slot="button" class="fa fa-paperclip cursor-pointer" />
           </ImageInput>
-          {#if group}
-            <Popover triggerType="mouseenter">
-              <i slot="trigger" class="fa fa-circle-nodes cursor-pointer" />
-              <div slot="tooltip">
-                Posting to <GroupLink address={group} />
-              </div>
-            </Popover>
-          {/if}
         </div>
         <Anchor button accent disabled={saving} on:click={() => onSubmit()}>Send</Anchor>
       </div>
@@ -116,7 +95,7 @@
   </AltColor>
 </form>
 
-<NoteOptions on:change={setOpts} bind:this={options} initialValues={opts} hideFields={["groups"]} />
+<NoteOptions on:change={setOpts} bind:this={options} initialValues={opts} />
 
 {#if $nsecWarning}
   <NsecWarning onAbort={() => nsecWarning.set(null)} onBypass={bypassNsecWarning} />
diff --git a/src/app/shared/NoteOptions.svelte b/src/app/shared/NoteOptions.svelte
index 4f29a7813..0da7c33b8 100644
--- a/src/app/shared/NoteOptions.svelte
+++ b/src/app/shared/NoteOptions.svelte
@@ -1,23 +1,17 @@
 <script lang="ts">
-  import {without} from "ramda"
-  import {createEventDispatcher} from "svelte"
   import Anchor from "src/partials/Anchor.svelte"
-  import Card from "src/partials/Card.svelte"
+  import Field from "src/partials/Field.svelte"
   import FieldInline from "src/partials/FieldInline.svelte"
-  import Toggle from "src/partials/Toggle.svelte"
   import FlexColumn from "src/partials/FlexColumn.svelte"
-  import Modal from "src/partials/Modal.svelte"
-  import Input from "src/partials/Input.svelte"
-  import Field from "src/partials/Field.svelte"
   import Heading from "src/partials/Heading.svelte"
-  import GroupSummary from "src/app/shared/GroupSummary.svelte"
-  import {deriveGroupOptions} from "src/engine"
+  import Input from "src/partials/Input.svelte"
+  import Modal from "src/partials/Modal.svelte"
+  import Toggle from "src/partials/Toggle.svelte"
+  import {createEventDispatcher} from "svelte"
 
-  export let hideFields = []
   export let initialValues: {
     warning: string
     anonymous: boolean
-    groups?: string[]
   }
 
   let values = {groups: [], ...initialValues}
@@ -25,21 +19,11 @@
 
   const dispatch = createEventDispatcher()
 
-  const groupOptions = deriveGroupOptions(initialValues.groups)
-
   export const setView = name => {
     view = name
     values = {groups: [], ...initialValues}
   }
 
-  const setGroup = address => {
-    if (values.groups.includes(address)) {
-      values.groups = without([address], values.groups)
-    } else {
-      values.groups = values.groups.concat(address)
-    }
-  }
-
   const onSubmit = () => {
     initialValues = values
     dispatch("change", values)
@@ -59,23 +43,6 @@
             bind:value={values.warning}
             placeholder="Why might people want to skip this post?" />
         </Field>
-        {#if !hideFields.includes("groups") && $groupOptions.length > 0}
-          <Field icon="fa-circle-nodes" label="Groups">
-            <div class="flex flex-col gap-2">
-              {#each $groupOptions as g (g.address)}
-                <Card invertColors interactive on:click={() => setGroup(g.address)}>
-                  <GroupSummary hideAbout address={g.address}>
-                    <div slot="actions">
-                      {#if values.groups.includes(g.address)}
-                        <i class="fa fa-circle-check text-accent" />
-                      {/if}
-                    </div>
-                  </GroupSummary>
-                </Card>
-              {/each}
-            </div>
-          </Field>
-        {/if}
         <FieldInline icon="fa-user-secret" label="Post anonymously">
           <Toggle bind:value={values.anonymous} />
           <p slot="info">Enable this to create an anonymous note.</p>
diff --git a/src/app/shared/NoteReply.svelte b/src/app/shared/NoteReply.svelte
index d20cf17e1..8fe8db3e4 100644
--- a/src/app/shared/NoteReply.svelte
+++ b/src/app/shared/NoteReply.svelte
@@ -14,7 +14,7 @@
   import NsecWarning from "src/app/shared/NsecWarning.svelte"
   import NoteOptions from "src/app/shared/NoteOptions.svelte"
   import NoteImages from "src/app/shared/NoteImages.svelte"
-  import {env, publish, publishToZeroOrMoreGroups, tagsFromContent, getClientTags} from "src/engine"
+  import {env, publish, signAndPublish, tagsFromContent, getClientTags} from "src/engine"
   import {drafts} from "src/app/state"
 
   export let parent
@@ -109,14 +109,13 @@
     loading = true
 
     const template = createEvent(1, {content, tags})
-    const addresses = contextAddress ? [contextAddress] : parentTags.context().values().valueOf()
-    const {pubs, events} = await publishToZeroOrMoreGroups(addresses, template, opts)
+    const {pub, event} = await signAndPublish(template, opts)
 
     loading = false
 
     // Only track one event/pub to avoid apprent duplicates
-    addToContext(events[0])
-    showPublishInfo(pubs[0])
+    addToContext(event)
+    showPublishInfo(pub)
     clearDraft()
     reset()
   }
diff --git a/src/app/views/Bech32Entity.svelte b/src/app/views/Bech32Entity.svelte
index 4939f72b0..796471e2d 100644
--- a/src/app/views/Bech32Entity.svelte
+++ b/src/app/views/Bech32Entity.svelte
@@ -5,7 +5,6 @@
   import Spinner from "src/partials/Spinner.svelte"
   import NoteDetail from "src/app/views/NoteDetail.svelte"
   import PersonDetail from "src/app/views/PersonDetail.svelte"
-  import GroupDetail from "src/app/views/GroupDetail.svelte"
   import EventDetail from "src/app/views/EventDetail.svelte"
 
   export let entity, type, data, relays
@@ -17,9 +16,7 @@
   <NoteDetail id={data} {relays} />
 {:else if type === "naddr"}
   {@const address = new Address(data.kind, data.pubkey, data.identifier).toString()}
-  {#if [35834, 34550].includes(data.kind)}
-    <GroupDetail {address} relays={data.relays} activeTab="notes" />
-  {:else if data.kind === 31923}
+  {#if data.kind === 31923}
     <EventDetail {address} relays={data.relays} />
   {:else}
     <NoteDetail {address} relays={data.relays} />
diff --git a/src/app/views/EventEdit.svelte b/src/app/views/EventEdit.svelte
index 308942a3b..b808761cc 100644
--- a/src/app/views/EventEdit.svelte
+++ b/src/app/views/EventEdit.svelte
@@ -14,7 +14,7 @@
   import NoteImages from "src/app/shared/NoteImages.svelte"
   import Compose from "src/app/shared/Compose.svelte"
   import {router} from "src/app/util/router"
-  import {deriveEvent, publishToZeroOrMoreGroups} from "src/engine"
+  import {deriveEvent, signAndPublish} from "src/engine"
 
   export let address
 
@@ -36,7 +36,7 @@
       created_at: inc($event.created_at),
     })
 
-    publishToZeroOrMoreGroups(values.groups, template)
+    signAndPublish(template)
     router.pop()
   }
 
diff --git a/src/app/views/GroupCreate.svelte b/src/app/views/GroupCreate.svelte
deleted file mode 100644
index b6036a406..000000000
--- a/src/app/views/GroupCreate.svelte
+++ /dev/null
@@ -1,110 +0,0 @@
-<script lang="ts">
-  import {nth} from "@welshman/lib"
-  import {COMMUNITY, GROUP} from "@welshman/util"
-  import {session, pubkey} from "@welshman/app"
-  import Card from "src/partials/Card.svelte"
-  import Heading from "src/partials/Heading.svelte"
-  import FlexColumn from "src/partials/FlexColumn.svelte"
-  import GroupDetailsForm from "src/app/shared/GroupDetailsForm.svelte"
-  import type {GroupMeta} from "src/domain"
-  import {
-    env,
-    initGroup,
-    publishGroupMeta,
-    publishGroupInvites,
-    publishAdminKeyShares,
-    publishCommunityMeta,
-    publishCommunitiesList,
-    publishGroupMembers,
-    getUserCommunities,
-  } from "src/engine"
-  import {router} from "src/app/util/router"
-
-  const initialValues = {
-    kind: null,
-    name: "",
-    about: "",
-    image: "",
-    banner: "",
-    feeds: [],
-    relays: env.PLATFORM_RELAYS.map(url => ["relay", url]),
-    listing_is_public: false,
-    members: [$pubkey],
-    moderators: [],
-    identifier: "",
-  }
-
-  const setKind = kind => {
-    initialValues.kind = kind
-  }
-
-  const onSubmit = async ({
-    kind,
-    members,
-    listing_is_public,
-    ...meta
-  }: GroupMeta & {members: string[]}) => {
-    const {identifier, address} = initGroup(kind, meta.relays.map(nth(1)))
-
-    await publishAdminKeyShares(address, [$pubkey])
-
-    if (kind === COMMUNITY) {
-      await publishCommunityMeta(address, identifier, meta)
-      await publishCommunitiesList(getUserCommunities(session.get()).concat(address))
-    } else {
-      await publishGroupMeta(address, identifier, meta, listing_is_public)
-      await publishGroupMembers(address, "set", members)
-      await publishGroupInvites(address, members)
-    }
-
-    router.at("groups").of(address).at("notes").replace()
-  }
-</script>
-
-{#if !initialValues.kind}
-  <div class="mb-4 flex flex-col items-center justify-center">
-    <Heading>Create Group</Heading>
-    <p>What type of group would you like to create?</p>
-  </div>
-  <Card interactive on:click={() => setKind(COMMUNITY)}>
-    <FlexColumn>
-      <div class="flex items-center justify-between">
-        <p class="flex items-center gap-4 text-xl">
-          <i class="fa fa-unlock text-neutral-600" />
-          <strong>Open</strong>
-        </p>
-        <i class="fa fa-arrow-right" />
-      </div>
-      <p>
-        Anyone can participate in an open group. All content is public, although some clients will
-        allow you to assign moderators and selectively show only certain content.
-      </p>
-    </FlexColumn>
-  </Card>
-  <Card interactive on:click={() => setKind(GROUP)}>
-    <FlexColumn>
-      <div class="flex items-center justify-between">
-        <p class="flex items-center gap-4 text-xl">
-          <i class="fa fa-lock text-neutral-600" />
-          <strong>Closed</strong>
-        </p>
-        <i class="fa fa-arrow-right" />
-      </div>
-      <p>
-        Messages posted to a closed group are encrypted so that only other members can see them.
-        Only people you approve can join a closed group.
-      </p>
-    </FlexColumn>
-  </Card>
-{:else}
-  <div class="relative">
-    <i
-      class="fa fa-2x fa-arrow-left absolute top-12 cursor-pointer"
-      on:click={() => setKind(null)} />
-    <GroupDetailsForm
-      {onSubmit}
-      values={initialValues}
-      showMembers={initialValues.kind === GROUP}
-      buttonText={initialValues.kind === GROUP ? "Create closed group" : "Create open group"} />
-  </div>
-{/if}
diff --git a/src/app/views/GroupDelete.svelte b/src/app/views/GroupDelete.svelte
deleted file mode 100644
index d3fe0f43e..000000000
--- a/src/app/views/GroupDelete.svelte
+++ /dev/null
@@ -1,36 +0,0 @@
-<script lang="ts">
-  import {showInfo} from "src/partials/Toast.svelte"
-  import Anchor from "src/partials/Anchor.svelte"
-  import Subheading from "src/partials/Subheading.svelte"
-  import {displayGroupMeta} from "src/domain"
-  import {deriveGroupMeta, deleteGroupMeta, deriveAdminKeyForGroup} from "src/engine"
-  import {router} from "src/app/util/router"
-
-  export let address
-
-  const meta = deriveGroupMeta(address)
-  const adminKey = deriveAdminKeyForGroup(address)
-
-  const abort = () => router.pop()
-
-  const confirm = () => {
-    deleteGroupMeta(address)
-    showInfo("Group deleted!")
-    router.pop()
-  }
-
-  if (!$adminKey) {
-    router.pop()
-  }
-</script>
-
-<Subheading>Delete Group</Subheading>
-<p>Are you sure you want to delete {displayGroupMeta($meta)}?</p>
-<p>
-  This will only hide this group from supporting clients. Messages sent to the group may not be
-  deleted from relays.
-</p>
-<div class="flex gap-2">
-  <Anchor button on:click={abort}>Abort</Anchor>
-  <Anchor button accent on:click={confirm}>Confirm</Anchor>
-</div>
diff --git a/src/app/views/GroupDetail.svelte b/src/app/views/GroupDetail.svelte
deleted file mode 100644
index 0d392f8c6..000000000
--- a/src/app/views/GroupDetail.svelte
+++ /dev/null
@@ -1,130 +0,0 @@
-<script lang="ts">
-  import {whereEq} from "ramda"
-  import {ucFirst} from "hurdak"
-  import {get} from "svelte/store"
-  import {themeBackgroundGradient} from "src/partials/state"
-  import Tabs from "src/partials/Tabs.svelte"
-  import Anchor from "src/partials/Anchor.svelte"
-  import GroupCircle from "src/app/shared/GroupCircle.svelte"
-  import GroupActions from "src/app/shared/GroupActions.svelte"
-  import GroupAbout from "src/app/shared/GroupAbout.svelte"
-  import GroupNotes from "src/app/shared/GroupNotes.svelte"
-  import GroupCalendar from "src/app/shared/GroupCalendar.svelte"
-  import GroupMarket from "src/app/shared/GroupMarket.svelte"
-  import GroupMembers from "src/app/shared/GroupMembers.svelte"
-  import GroupAdmin from "src/app/shared/GroupAdmin.svelte"
-  import GroupRestrictAccess from "src/app/shared/GroupRestrictAccess.svelte"
-  import {displayGroupMeta} from "src/domain"
-  import {
-    env,
-    GroupAccess,
-    groupRequests,
-    deriveGroup,
-    deriveGroupMeta,
-    deriveAdminKeyForGroup,
-    deriveSharedKeyForGroup,
-    userIsGroupMember,
-    deriveGroupStatus,
-    loadGroups,
-  } from "src/engine"
-  import {router} from "src/app/util/router"
-
-  export let address
-  export let relays = null
-  export let activeTab = "notes"
-  export let claim = ""
-
-  const group = deriveGroup(address)
-  const meta = deriveGroupMeta(address)
-  const status = deriveGroupStatus(address)
-  const sharedKey = deriveSharedKeyForGroup(address)
-  const adminKey = deriveAdminKeyForGroup(address)
-  const requests = groupRequests.derived(requests =>
-    requests.filter(whereEq({group: address, resolved: false})),
-  )
-
-  const setActiveTab = tab =>
-    router
-      .at("groups")
-      .of(address)
-      .at(tab)
-      .push({key: router.getKey(get(router.current))})
-
-  loadGroups([address], relays || [])
-
-  let tabs
-
-  $: key = $group && $userIsGroupMember(address)
-
-  $: {
-    tabs = ["notes"]
-
-    if (!env.FORCE_GROUP) {
-      tabs.push("calendar")
-      tabs.push("market")
-    }
-
-    if ($sharedKey || address.startsWith("34550")) {
-      tabs.push("members")
-    } else if (activeTab === "members") {
-      activeTab = "notes"
-    }
-
-    if ($adminKey && address.startsWith("35834")) {
-      tabs.push("admin")
-    } else if (activeTab === "admin") {
-      activeTab = "notes"
-    }
-  }
-
-  $: ({rgb, rgba} = $themeBackgroundGradient)
-
-  document.title = $meta?.name || "Group Detail"
-</script>
-
-<div
-  class="absolute left-0 top-0 h-64 w-full"
-  style={`z-index: -1;
-         background-size: cover;
-         background-image: linear-gradient(to bottom, ${rgba}, ${rgb}), url('${$meta?.banner}')`} />
-
-<div class="flex gap-4 text-neutral-100">
-  <GroupCircle {address} class="mt-1 h-10 w-10 sm:h-32 sm:w-32" />
-  <div class="flex min-w-0 flex-grow flex-col gap-4">
-    <div class="flex items-center justify-between gap-4">
-      <Anchor on:click={() => setActiveTab("notes")} class="text-2xl"
-        >{displayGroupMeta($meta)}</Anchor>
-      <GroupActions {address} {claim} />
-    </div>
-    <GroupAbout {address} />
-  </div>
-</div>
-
-{#if tabs.length > 1}
-  <Tabs {tabs} {activeTab} {setActiveTab}>
-    <div slot="tab" let:tab class="flex gap-2">
-      <div>{ucFirst(tab)}</div>
-      {#if tab === "admin" && $requests.length > 0}
-        <div class="h-6 rounded-full bg-neutral-700 px-2">
-          {$requests.length}
-        </div>
-      {/if}
-    </div>
-  </Tabs>
-{/if}
-
-{#key key}
-  {#if address.startsWith("35834") && $status.access !== GroupAccess.Granted}
-    <GroupRestrictAccess {address} />
-  {:else if activeTab === "notes"}
-    <GroupNotes {address} />
-  {:else if activeTab === "calendar"}
-    <GroupCalendar {address} />
-  {:else if activeTab === "market"}
-    <GroupMarket {address} />
-  {:else if activeTab === "members"}
-    <GroupMembers {address} />
-  {:else if activeTab === "admin"}
-    <GroupAdmin {address} />
-  {/if}
-{/key}
diff --git a/src/app/views/GroupEdit.svelte b/src/app/views/GroupEdit.svelte
deleted file mode 100644
index d2a589579..000000000
--- a/src/app/views/GroupEdit.svelte
+++ /dev/null
@@ -1,44 +0,0 @@
-<script lang="ts">
-  import {prop} from "ramda"
-  import {COMMUNITY} from "@welshman/util"
-  import {showInfo} from "src/partials/Toast.svelte"
-  import GroupDetailsForm from "src/app/shared/GroupDetailsForm.svelte"
-  import type {GroupMeta} from "src/domain"
-  import {
-    deriveGroup,
-    deleteGroupMeta,
-    publishGroupMeta,
-    publishCommunityMeta,
-    deriveGroupMeta,
-  } from "src/engine"
-  import {router} from "src/app/util/router"
-
-  export let address
-
-  const group = deriveGroup(address)
-  const meta = deriveGroupMeta(address)
-  const initialValues = {...$meta, members: $group?.members || []}
-
-  const onSubmit = async ({
-    kind,
-    identifier,
-    listing_is_public,
-    ...meta
-  }: GroupMeta & {members: string[]}) => {
-    // If we're switching group listing visibility, delete the old listing
-    if (listing_is_public && !initialValues.listing_is_public) {
-      await prop("result", await deleteGroupMeta(address))
-    }
-
-    if (kind === COMMUNITY) {
-      await publishCommunityMeta(address, identifier, meta)
-    } else {
-      await publishGroupMeta(address, identifier, meta, listing_is_public)
-    }
-
-    showInfo("Your group has been updated!")
-    router.pop()
-  }
-</script>
-
-<GroupDetailsForm {onSubmit} mode="edit" values={initialValues} />
diff --git a/src/app/views/GroupInfo.svelte b/src/app/views/GroupInfo.svelte
deleted file mode 100644
index 09e821824..000000000
--- a/src/app/views/GroupInfo.svelte
+++ /dev/null
@@ -1,59 +0,0 @@
-<script lang="ts">
-  import {nth} from "@welshman/lib"
-  import {toNostrURI, Address} from "@welshman/util"
-  import {nsecEncode} from "src/util/nostr"
-  import Anchor from "src/partials/Anchor.svelte"
-  import Popover from "src/partials/Popover.svelte"
-  import FlexColumn from "src/partials/FlexColumn.svelte"
-  import CopyValue from "src/partials/CopyValue.svelte"
-  import RelayCard from "src/app/shared/RelayCard.svelte"
-  import {deriveGroupMeta, deriveAdminKeyForGroup} from "src/engine"
-  import {router} from "src/app/util/router"
-
-  export let address
-
-  const meta = deriveGroupMeta(address)
-  const adminKey = deriveAdminKeyForGroup(address)
-  const naddr = Address.from(address, $meta?.relays.map(nth(1)) || []).toNaddr()
-
-  const shareAdminKey = () => {
-    popover?.hide()
-    router.at("groups").of(address).at("invite-admin").open()
-  }
-
-  let popover
-</script>
-
-<h1 class="staatliches text-2xl">Details</h1>
-<CopyValue label="Group ID" value={address} />
-<CopyValue label="Link" value={toNostrURI(naddr)} />
-{#if $adminKey}
-  <CopyValue isPassword label="Admin key" value={$adminKey.privkey} encode={nsecEncode}>
-    <div slot="label" class="flex gap-2">
-      <span>Admin Key</span>
-      <Popover bind:instance={popover}>
-        <i slot="trigger" class="fa fa-info-circle cursor-pointer" />
-        <div slot="tooltip">
-          <FlexColumn>
-            <p>This is your group administration password. Keep it secret!</p>
-            <p>
-              Click
-              <Anchor modal underline on:click={shareAdminKey}>here</Anchor>
-              to share this key with another user. This will give them
-              <b>complete</b> control over this group.
-            </p>
-          </FlexColumn>
-        </div>
-      </Popover>
-    </div>
-  </CopyValue>
-{/if}
-{#if $meta?.relays.length > 0}
-  <h1 class="staatliches text-2xl">Relays</h1>
-  <p>This group uses the following relays:</p>
-  <div class="flex flex-col gap-2">
-    {#each $meta.relays as tag}
-      <RelayCard url={tag[1]} />
-    {/each}
-  </div>
-{/if}
diff --git a/src/app/views/GroupInviteAdmin.svelte b/src/app/views/GroupInviteAdmin.svelte
deleted file mode 100644
index b6254273b..000000000
--- a/src/app/views/GroupInviteAdmin.svelte
+++ /dev/null
@@ -1,57 +0,0 @@
-<script lang="ts">
-  import {showInfo} from "src/partials/Toast.svelte"
-  import Anchor from "src/partials/Anchor.svelte"
-  import Modal from "src/partials/Modal.svelte"
-  import Subheading from "src/partials/Subheading.svelte"
-  import GroupName from "src/app/shared/GroupName.svelte"
-  import PersonBadgeSmall from "src/app/shared/PersonBadgeSmall.svelte"
-  import PersonSelect from "src/app/shared/PersonSelect.svelte"
-  import {publishAdminKeyShares} from "src/engine"
-  import {router} from "src/app/util/router"
-
-  export let address
-
-  const submit = () => {
-    modal = "confirm"
-  }
-
-  const abort = () => {
-    modal = null
-  }
-
-  const confirm = () => {
-    publishAdminKeyShares(address, pubkeys)
-    showInfo("Key shares sent!")
-    router.clearModals()
-  }
-
-  let modal = null
-  let pubkeys = []
-</script>
-
-<Subheading>Invite Group Admin</Subheading>
-<p>
-  Keys are shared over nostr using encrypted messages. Be aware that this can reduce your group's
-  privacy, for example if any receipient's key is compromised.
-</p>
-<PersonSelect multiple bind:value={pubkeys} />
-<Anchor button accent disabled={pubkeys.length === 0} on:click={submit}>Share Admin Key</Anchor>
-
-{#if modal === "confirm"}
-  <Modal>
-    <Subheading>Confirm key share</Subheading>
-    <p>
-      Are you sure you want to share the <b>admin key</b> for <GroupName {address} /> with the following
-      people?
-    </p>
-    <ul>
-      {#each pubkeys as pubkey}
-        <PersonBadgeSmall {pubkey} />
-      {/each}
-    </ul>
-    <div class="flex gap-2">
-      <Anchor button on:click={abort}>Abort</Anchor>
-      <Anchor button accent on:click={confirm}>Confirm</Anchor>
-    </div>
-  </Modal>
-{/if}
diff --git a/src/app/views/GroupList.svelte b/src/app/views/GroupList.svelte
index 09987745d..40bbcd3b3 100644
--- a/src/app/views/GroupList.svelte
+++ b/src/app/views/GroupList.svelte
@@ -1,16 +1,13 @@
 <script lang="ts">
-  import {appName} from "src/partials/state"
   import Anchor from "src/partials/Anchor.svelte"
-  import Media from "src/partials/Media.svelte"
-  import Modal from "src/partials/Modal.svelte"
 </script>
 
 <div class="flex gap-3">
   <p class="text-2xl font-bold">Groups are going away!</p>
 </div>
 <p>
-  You can still access your groups at <strong>groups.coracle.social</strong>,
-  or you can try our new relay-based groups client at <strong>flotilla.social</strong>.
+  You can still access your groups at <strong>groups.coracle.social</strong>, or you can try our new
+  relay-based groups client at <strong>flotilla.social</strong>.
 </p>
 <div class="flex justify-end gap-2">
   <Anchor external button href="https://groups.coracle.social">Continue to Groups</Anchor>
diff --git a/src/app/views/GroupRotate.svelte b/src/app/views/GroupRotate.svelte
deleted file mode 100644
index 06dceac1b..000000000
--- a/src/app/views/GroupRotate.svelte
+++ /dev/null
@@ -1,122 +0,0 @@
-<script lang="ts">
-  import {ctx, without} from "@welshman/lib"
-  import {difference} from "hurdak"
-  import {showInfo} from "src/partials/Toast.svelte"
-  import Field from "src/partials/Field.svelte"
-  import FieldInline from "src/partials/FieldInline.svelte"
-  import Toggle from "src/partials/Toggle.svelte"
-  import Anchor from "src/partials/Anchor.svelte"
-  import Content from "src/partials/Content.svelte"
-  import Heading from "src/partials/Heading.svelte"
-  import PersonSelect from "src/app/shared/PersonSelect.svelte"
-  import type {GroupRequest} from "src/engine"
-  import {
-    groups,
-    groupRequests,
-    initSharedKey,
-    deriveGroupMeta,
-    deriveSharedKeyForGroup,
-    publishGroupInvites,
-    publishGroupEvictions,
-    publishGroupMembers,
-    publishGroupMeta,
-  } from "src/engine"
-  import {router} from "src/app/util/router"
-
-  export let address
-  export let addMembers = []
-  export let removeMembers = []
-
-  const group = groups.key(address)
-  const meta = deriveGroupMeta(address)
-  const sharedKey = deriveSharedKeyForGroup(address)
-  const initialMembers = new Set(
-    without(removeMembers, [...($group?.members || []), ...addMembers]),
-  )
-
-  const onSubmit = () => {
-    if (!soft || !$sharedKey) {
-      initSharedKey(address, ctx.app.router.WithinContext(address).getUrls())
-    }
-
-    const allMembers = new Set(members)
-    const addedMembers = difference(allMembers, initialMembers)
-    const removedMembers = difference(initialMembers, allMembers)
-
-    // Clear any requests
-    groupRequests.update($requests => {
-      return $requests.map((r: GroupRequest) => {
-        if (r.group !== address) {
-          return r
-        }
-
-        if (r.kind === 25 && allMembers.has(r.pubkey)) {
-          return {...r, resolved: true}
-        }
-
-        if (r.kind === 26 && !allMembers.has(r.pubkey)) {
-          return {...r, resolved: true}
-        }
-
-        return r
-      })
-    })
-
-    // Add members
-
-    // Notify existing members of new shared key if needed, send full member list if we're rotating
-    if (soft) {
-      if (addedMembers.size > 0) {
-        publishGroupMembers(address, "add", Array.from(addedMembers))
-      }
-
-      if (removedMembers.size > 0) {
-        publishGroupMembers(address, "remove", Array.from(removedMembers))
-      }
-    } else {
-      publishGroupMembers(address, "set", Array.from(allMembers))
-    }
-
-    // Regardless of soft/hard rotate, notify the people who were removed
-    if (removedMembers.size > 0) {
-      publishGroupEvictions(address, Array.from(removedMembers))
-    }
-
-    // Re-publish group info
-    if (!soft && !$meta.listing_is_public) {
-      publishGroupMeta(address, $meta.identifier, $meta, false)
-    }
-
-    // Re-send invites. This could be optimized further, but it's useful to re-send to different relays.
-    // It also handles edge cases, like if someone requested exit, then entry, soft rotate wouldn't let them
-    // know they still have access.
-    publishGroupInvites(address, allMembers)
-
-    showInfo("Invites have been sent!")
-    router.pop()
-  }
-
-  let soft = true
-  let members = Array.from(initialMembers)
-</script>
-
-<form on:submit|preventDefault={onSubmit}>
-  <Content size="lg">
-    <Heading class="text-center">Update Members</Heading>
-    <p class="text-center">
-      Rotate keys periodically to change group membership and increase security.
-    </p>
-    <Field label="Member List">
-      <PersonSelect multiple bind:value={members} />
-      <div slot="info">All members will receive a fresh invitation with a new key.</div>
-    </Field>
-    <FieldInline label="Soft Rotate">
-      <Toggle bind:value={soft} />
-      <div slot="info">
-        Share the current key with all new members instead of creating a new one. This allows new
-        members to see recent messages, and does not revoke access for removed members.
-      </div>
-    </FieldInline>
-    <Anchor button tag="button" type="submit">Save</Anchor>
-  </Content>
-</form>
diff --git a/src/app/views/Home.svelte b/src/app/views/Home.svelte
index 5dc0fdcaa..af7b3e44d 100644
--- a/src/app/views/Home.svelte
+++ b/src/app/views/Home.svelte
@@ -1,11 +1,5 @@
 <script lang="ts">
   import Feeds from "src/app/views/Feeds.svelte"
-  import GroupDetail from "src/app/views/GroupDetail.svelte"
-  import {env} from "src/engine"
 </script>
 
-{#if env.FORCE_GROUP}
-  <GroupDetail {...$$props} address={env.FORCE_GROUP} activeTab="notes" />
-{:else}
-  <Feeds {...$$props} />
-{/if}
+<Feeds {...$$props} />
diff --git a/src/app/views/InviteAccept.svelte b/src/app/views/InviteAccept.svelte
index ec0d9c856..7bd181409 100644
--- a/src/app/views/InviteAccept.svelte
+++ b/src/app/views/InviteAccept.svelte
@@ -1,41 +1,23 @@
 <script lang="ts">
-  import {zipObj, pluck} from "ramda"
-  import {normalizeRelayUrl} from "@welshman/util"
   import {session} from "@welshman/app"
-  import {updateIn} from "src/util/misc"
-  import Card from "src/partials/Card.svelte"
-  import Heading from "src/partials/Heading.svelte"
-  import Anchor from "src/partials/Anchor.svelte"
-  import Subheading from "src/partials/Subheading.svelte"
-  import FlexColumn from "src/partials/FlexColumn.svelte"
+  import {normalizeRelayUrl} from "@welshman/util"
+  import {zipObj} from "ramda"
   import PersonList from "src/app/shared/PersonList.svelte"
-  import GroupListItem from "src/app/shared/GroupListItem.svelte"
-  import GroupActions from "src/app/shared/GroupActions.svelte"
   import RelayCard from "src/app/shared/RelayCard.svelte"
   import Onboarding from "src/app/views/Onboarding.svelte"
-  import {loadGroups, groupHints} from "src/engine"
+  import Anchor from "src/partials/Anchor.svelte"
+  import Card from "src/partials/Card.svelte"
+  import FlexColumn from "src/partials/FlexColumn.svelte"
+  import Heading from "src/partials/Heading.svelte"
+  import Subheading from "src/partials/Subheading.svelte"
+  import {updateIn} from "src/util/misc"
 
   export let people = []
   export let relays = []
-  export let groups = []
 
   const parsedRelays = relays
     .map(s => zipObj(["url", "claim"], s.split("|")))
     .map(updateIn("url", normalizeRelayUrl))
-
-  const parsedGroups = groups.map(s => zipObj(["address", "relay", "claim"], s.split("|"))) as {
-    address: string
-    relay: string
-    claim: string
-  }[]
-
-  loadGroups(pluck("address", parsedGroups) as string[], pluck("relay", parsedGroups) as string[])
-
-  for (const {address, relay} of parsedGroups) {
-    if (relay) {
-      groupHints.update($gh => ({...$gh, [address]: [...($gh[address] || []), relay]}))
-    }
-  }
 </script>
 
 {#if $session}
@@ -68,22 +50,7 @@
       </FlexColumn>
     </Card>
   {/if}
-  {#if parsedGroups.length > 0}
-    <Card>
-      <FlexColumn>
-        <Subheading>Groups</Subheading>
-        <p>Here is a selection of groups you might be interested in.</p>
-        {#each parsedGroups as group (group.address)}
-          <GroupListItem modal address={group.address}>
-            <div slot="actions">
-              <GroupActions address={group.address} claim={group.claim} />
-            </div>
-          </GroupListItem>
-        {/each}
-      </FlexColumn>
-    </Card>
-  {/if}
   <Anchor button accent href="/">Done</Anchor>
 {:else}
-  <Onboarding invite={{people, relays, groups, parsedRelays, parsedGroups}} />
+  <Onboarding invite={{people, relays, parsedRelays}} />
 {/if}
diff --git a/src/app/views/InviteCreate.svelte b/src/app/views/InviteCreate.svelte
index 2ac7c8e1f..d73f2d07b 100644
--- a/src/app/views/InviteCreate.svelte
+++ b/src/app/views/InviteCreate.svelte
@@ -1,22 +1,19 @@
 <script lang="ts">
-  import {ctx, without, identity} from "@welshman/lib"
-  import {getAddress, displayRelayUrl} from "@welshman/util"
   import {relaySearch} from "@welshman/app"
-  import {onMount} from "svelte"
-  import {pickVals, toSpliced} from "src/util/misc"
+  import {ctx, identity, without} from "@welshman/lib"
+  import {displayRelayUrl} from "@welshman/util"
+  import PersonSelect from "src/app/shared/PersonSelect.svelte"
+  import {router} from "src/app/util/router"
+  import Anchor from "src/partials/Anchor.svelte"
   import Card from "src/partials/Card.svelte"
-  import Input from "src/partials/Input.svelte"
+  import FlexColumn from "src/partials/FlexColumn.svelte"
   import Heading from "src/partials/Heading.svelte"
-  import Anchor from "src/partials/Anchor.svelte"
-  import Subheading from "src/partials/Subheading.svelte"
-  import SearchSelect from "src/partials/SearchSelect.svelte"
+  import Input from "src/partials/Input.svelte"
   import ListItem from "src/partials/ListItem.svelte"
-  import FlexColumn from "src/partials/FlexColumn.svelte"
-  import GroupName from "src/app/shared/GroupName.svelte"
-  import GroupCircle from "src/app/shared/GroupCircle.svelte"
-  import PersonSelect from "src/app/shared/PersonSelect.svelte"
-  import {router} from "src/app/util/router"
-  import {groupMetaSearch, displayGroupByAddress} from "src/engine"
+  import SearchSelect from "src/partials/SearchSelect.svelte"
+  import Subheading from "src/partials/Subheading.svelte"
+  import {pickVals, toSpliced} from "src/util/misc"
+  import {onMount} from "svelte"
 
   export let initialPubkey = null
   export let initialGroupAddress = null
@@ -52,24 +49,6 @@
     relays = toSpliced(relays, i, 1)
   }
 
-  const addGroup = address => {
-    if (address) {
-      groupInput.clear()
-      groups = [
-        ...groups,
-        {
-          address: address,
-          relay: ctx.app.router.WithinContext(address).getUrl(),
-          claim: "",
-        },
-      ]
-    }
-  }
-
-  const removeGroup = i => {
-    groups = toSpliced(groups, i, 1)
-  }
-
   let relayInput, groupInput
   let sections = []
   let pubkeys = []
@@ -170,40 +149,6 @@
         </SearchSelect>
       </FlexColumn>
     </Card>
-  {:else if section === "groups"}
-    <Card>
-      <FlexColumn>
-        <div class="flex justify-between">
-          <Subheading>Groups</Subheading>
-          <i class="fa fa-times cursor-pointer" on:click={() => hideSection("groups")} />
-        </div>
-        <p>
-          Invite people to groups. If you're inviting someone to a closed group, make sure the
-          invite code you use is valid.
-        </p>
-        {#each groups as group, i (group.address + i)}
-          <ListItem on:remove={() => removeGroup(i)}>
-            <span slot="label">{displayGroupByAddress(group.address)}</span>
-            <span slot="data">
-              <Input bind:value={group.claim} placeholder="Invite code (optional)" />
-            </span>
-          </ListItem>
-        {/each}
-        <SearchSelect
-          value={null}
-          bind:this={groupInput}
-          search={$groupMetaSearch.searchOptions}
-          displayItem={$groupMetaSearch.displayOption}
-          getKey={groupMeta => getAddress(groupMeta.event)}
-          onChange={groupMeta => groupMeta && addGroup(getAddress(groupMeta.event))}>
-          <i slot="before" class="fa fa-search" />
-          <div slot="item" let:item class="flex items-center gap-4 text-neutral-100">
-            <GroupCircle address={getAddress(item.event)} class="h-5 w-5" />
-            <GroupName address={getAddress(item.event)} />
-          </div>
-        </SearchSelect>
-      </FlexColumn>
-    </Card>
   {/if}
 {/each}
 <div class="flex justify-end gap-4">
@@ -213,14 +158,7 @@
   <Anchor disabled={sections.includes("relays")} on:click={() => showSection("relays")}>
     <i class="fa fa-plus" /> Add relays
   </Anchor>
-  <Anchor disabled={sections.includes("groups")} on:click={() => showSection("groups")}>
-    <i class="fa fa-plus" /> Add groups
-  </Anchor>
 </div>
-<Anchor
-  button
-  accent
-  disabled={[...pubkeys, ...relays, ...groups].length === 0}
-  on:click={onSubmit}>
+<Anchor button accent disabled={[...pubkeys, ...relays].length === 0} on:click={onSubmit}>
   Create Invite Link
 </Anchor>
diff --git a/src/app/views/NoteCreate.svelte b/src/app/views/NoteCreate.svelte
index c78d537e5..75a221176 100644
--- a/src/app/views/NoteCreate.svelte
+++ b/src/app/views/NoteCreate.svelte
@@ -1,58 +1,52 @@
 <script lang="ts">
-  import {onMount} from "svelte"
-  import {nip19} from "nostr-tools"
-  import {v4 as uuid} from "uuid"
-  import {join, whereEq, identity} from "ramda"
-  import {throttle, commaFormat, toTitle, switcherFn} from "hurdak"
-  import {writable} from "svelte/store"
+  import {session, tagPubkey} from "@welshman/app"
   import {ctx, now} from "@welshman/lib"
   import {createEvent} from "@welshman/util"
-  import {session, tagPubkey} from "@welshman/app"
-  import {currencyOptions} from "src/util/i18n"
-  import {dateToSeconds} from "src/util/misc"
-  import {showWarning, showPublishInfo} from "src/partials/Toast.svelte"
+  import {commaFormat, switcherFn, throttle, toTitle} from "hurdak"
+  import {nip19} from "nostr-tools"
+  import {join, whereEq} from "ramda"
+  import Compose from "src/app/shared/Compose.svelte"
+  import NoteContent from "src/app/shared/NoteContent.svelte"
+  import NoteImages from "src/app/shared/NoteImages.svelte"
+  import NoteOptions from "src/app/shared/NoteOptions.svelte"
+  import NsecWarning from "src/app/shared/NsecWarning.svelte"
+  import {router} from "src/app/util/router"
+  import {getClientTags, signAndPublish, tagsFromContent} from "src/engine"
   import Anchor from "src/partials/Anchor.svelte"
-  import ImageInput from "src/partials/ImageInput.svelte"
+  import Chip from "src/partials/Chip.svelte"
+  import Content from "src/partials/Content.svelte"
   import CurrencyInput from "src/partials/CurrencyInput.svelte"
   import CurrencySymbol from "src/partials/CurrencySymbol.svelte"
   import DateTimeInput from "src/partials/DateTimeInput.svelte"
   import Field from "src/partials/Field.svelte"
-  import Input from "src/partials/Input.svelte"
-  import Content from "src/partials/Content.svelte"
   import FlexColumn from "src/partials/FlexColumn.svelte"
-  import Popover from "src/partials/Popover.svelte"
+  import ImageInput from "src/partials/ImageInput.svelte"
+  import Input from "src/partials/Input.svelte"
   import Menu from "src/partials/Menu.svelte"
   import MenuItem from "src/partials/MenuItem.svelte"
-  import Chip from "src/partials/Chip.svelte"
-  import Compose from "src/app/shared/Compose.svelte"
-  import NsecWarning from "src/app/shared/NsecWarning.svelte"
-  import NoteContent from "src/app/shared/NoteContent.svelte"
-  import NoteOptions from "src/app/shared/NoteOptions.svelte"
-  import NoteImages from "src/app/shared/NoteImages.svelte"
-  import {publish} from "src/engine"
-  import {router} from "src/app/util/router"
-  import {env, getClientTags, tagsFromContent, publishToZeroOrMoreGroups} from "src/engine"
+  import Popover from "src/partials/Popover.svelte"
+  import {showPublishInfo, showWarning} from "src/partials/Toast.svelte"
+  import {currencyOptions} from "src/util/i18n"
+  import {dateToSeconds} from "src/util/misc"
+  import {onMount} from "svelte"
+  import {writable} from "svelte/store"
+  import {v4 as uuid} from "uuid"
 
   export let type = "note"
   export let quote = null
   export let pubkey = null
-  export let group = null
   export let initialValues = {}
 
-  const defaultGroups = env.FORCE_GROUP ? [env.FORCE_GROUP] : [group].filter(identity)
-
   let images, compose
   let charCount = 0
   let wordCount = 0
   let showPreview = false
-  let options
   let opts = {
     title: "",
     warning: "",
     summary: "",
     price: "",
     currency: currencyOptions.find(whereEq({code: "SAT"})),
-    groups: defaultGroups,
     anonymous: false,
     location: null,
     start: null,
@@ -118,11 +112,6 @@
 
     if (quote) {
       tags.push(tagPubkey(quote.pubkey))
-
-      // Re-broadcast the note we're quoting
-      if (!opts.groups.length) {
-        publish({event: quote, relays: ctx.app.router.WriteRelays().getUrls()})
-      }
     }
 
     const template = switcherFn(type, {
@@ -154,9 +143,9 @@
         }),
     })
 
-    const {pubs} = await publishToZeroOrMoreGroups(opts.groups, template, opts)
+    const {pub} = await signAndPublish(template, opts)
 
-    showPublishInfo(pubs[0])
+    showPublishInfo(pub)
     router.clearModals()
   }
 
@@ -286,23 +275,11 @@
         <Anchor button tag="button" type="submit" class="flex-grow">Send</Anchor>
         <ImageInput multi hostLimit={3} on:change={e => images?.addImage(e.detail)} />
       </div>
-      {#if !env.FORCE_GROUP}
-        <button
-          type="button"
-          class="flex cursor-pointer items-center justify-end gap-4 text-sm"
-          on:click={() => options.setView("settings")}>
-          <span class:text-accent={opts.groups.length > 0}>
-            <i class="fa fa-circle-nodes" />
-            {opts.groups.length}
-          </span>
-          <span><i class="fa fa-warning" /> {opts.warning || 0}</span>
-        </button>
-      {/if}
     </FlexColumn>
   </Content>
 </form>
 
-<NoteOptions on:change={setOpts} bind:this={options} initialValues={opts} />
+<NoteOptions on:change={setOpts} initialValues={opts} />
 
 {#if $nsecWarning}
   <NsecWarning onAbort={() => nsecWarning.set(null)} onBypass={bypassNsecWarning} />
diff --git a/src/app/views/UserKeys.svelte b/src/app/views/UserKeys.svelte
index 068ca0e47..f73716202 100644
--- a/src/app/views/UserKeys.svelte
+++ b/src/app/views/UserKeys.svelte
@@ -1,25 +1,21 @@
 <script lang="ts">
-  import {uniqBy, uniq, sortBy, prop} from "ramda"
-  import {createMap} from "hurdak"
-  import {nip19} from "nostr-tools"
+  import {relaySearch, session} from "@welshman/app"
   import {ctx} from "@welshman/lib"
-  import {getAddress, WRAP, GROUP} from "@welshman/util"
+  import {getPubkey, Nip01Signer, Nip59} from "@welshman/signer"
   import type {SignedEvent} from "@welshman/util"
-  import {Nip59, Nip01Signer, getPubkey} from "@welshman/signer"
-  import {session, relaySearch} from "@welshman/app"
-  import {toHex, nsecEncode, isKeyValid} from "src/util/nostr"
-  import {showInfo, showWarning} from "src/partials/Toast.svelte"
-  import CopyValue from "src/partials/CopyValue.svelte"
+  import {WRAP} from "@welshman/util"
+  import {nip19} from "nostr-tools"
+  import {subscribe} from "src/engine"
   import Anchor from "src/partials/Anchor.svelte"
+  import CopyValue from "src/partials/CopyValue.svelte"
   import Field from "src/partials/Field.svelte"
-  import SearchSelect from "src/partials/SearchSelect.svelte"
-  import Input from "src/partials/Input.svelte"
-  import Modal from "src/partials/Modal.svelte"
   import FlexColumn from "src/partials/FlexColumn.svelte"
   import Heading from "src/partials/Heading.svelte"
-  import GroupCircle from "src/app/shared/GroupCircle.svelte"
-  import GroupName from "src/app/shared/GroupName.svelte"
-  import {groupSharedKeys, userIsGroupMember, groupAdminKeys, subscribe} from "src/engine"
+  import Input from "src/partials/Input.svelte"
+  import Modal from "src/partials/Modal.svelte"
+  import SearchSelect from "src/partials/SearchSelect.svelte"
+  import {showInfo, showWarning} from "src/partials/Toast.svelte"
+  import {isKeyValid, nsecEncode, toHex} from "src/util/nostr"
 
   const nip07 = "https://github.com/nostr-protocol/nips/blob/master/07.md"
   const keypairUrl = "https://www.cloudflare.com/learning/ssl/how-does-public-key-encryption-work/"
@@ -57,10 +53,7 @@
     const sub = subscribe({
       closeOnEose: true,
       relays: ctx.app.router.User().getUrls().concat(relays),
-      filters: [
-        {kinds: [GROUP], authors: [pubkey], limit: 1},
-        {kinds: [WRAP], "#p": [pubkey], limit: 500},
-      ],
+      filters: [{kinds: [WRAP], "#p": [pubkey], limit: 500}],
       onEvent: async event => {
         if (event.kind === WRAP) {
           event = await helper.unwrap(event as SignedEvent)
@@ -72,13 +65,6 @@
 
         found = event
         sub.close()
-        groupAdminKeys.key(pubkey).set({
-          group: getAddress(event),
-          pubkey,
-          privkey,
-          created_at: event.created_at,
-          hints: ctx.app.router.Event(event).getUrls(),
-        })
       },
       onComplete: () => {
         importing = false
@@ -93,20 +79,6 @@
     })
   }
 
-  $: adminKeys = createMap("group", $groupAdminKeys)
-  $: sharedKeys = createMap(
-    "group",
-    uniqBy(
-      prop("group"),
-      sortBy(
-        k => -k.created_at,
-        $groupSharedKeys.filter(k => $userIsGroupMember(k.group)),
-      ),
-    ),
-  )
-
-  $: addresses = uniq([...Object.keys(adminKeys), ...Object.keys(sharedKeys)])
-
   document.title = "Keys"
 </script>
 
@@ -157,30 +129,6 @@
         <i class="fa fa-upload" /> Import Key
       </Anchor>
     </div>
-    <p>
-      These keys are used for accessing or managing closed groups. Save these to make sure you don't
-      lose access to your groups.
-    </p>
-    {#each addresses as address (address)}
-      {@const sharedKey = sharedKeys[address]}
-      {@const adminKey = adminKeys[address]}
-      <div class="flex flex-col gap-4">
-        <div class="flex items-center gap-2">
-          <GroupCircle class="h-4 w-4" {address} />
-          <GroupName class="font-bold" {address} />
-        </div>
-        <div class="ml-6 flex flex-col gap-4">
-          {#if sharedKey}
-            <CopyValue isPassword label="Access key" value={sharedKey.privkey} />
-          {/if}
-          {#if adminKey}
-            <CopyValue isPassword label="Admin key" value={adminKey.privkey} />
-          {/if}
-        </div>
-      </div>
-    {:else}
-      <p class="text-center py-20">No keys found.</p>
-    {/each}
   </FlexColumn>
 </FlexColumn>
 
diff --git a/src/domain/group.ts b/src/domain/group.ts
deleted file mode 100644
index be1aff5b3..000000000
--- a/src/domain/group.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import {fromPairs, nthEq} from "@welshman/lib"
-import type {TrustedEvent} from "@welshman/util"
-import {isSignedEvent} from "@welshman/util"
-
-export type GroupMeta = {
-  kind: number
-  feeds: string[][]
-  relays: string[][]
-  moderators: string[][]
-  identifier: string
-  name: string
-  about: string
-  banner: string
-  image: string
-  listing_is_public: boolean
-  event?: TrustedEvent
-}
-
-export type PublishedGroupMeta = Omit<GroupMeta, "event"> & {
-  event: TrustedEvent
-}
-
-export const readGroupMeta = (event: TrustedEvent) => {
-  const meta = fromPairs(event.tags)
-
-  return {
-    event,
-    kind: event.kind,
-    feeds: event.tags.filter(nthEq(0, "feed")),
-    relays: event.tags.filter(nthEq(0, "relay")),
-    moderators: event.tags.filter(nthEq(0, "p")),
-    identifier: meta.d,
-    name: meta.name || "",
-    banner: meta.banner || "",
-    about: meta.about || meta.description || "",
-    image: meta.image || meta.picture || "",
-    listing_is_public: isSignedEvent(event),
-  } as PublishedGroupMeta
-}
-
-export const displayGroupMeta = (meta: GroupMeta) => meta?.name || meta?.identifier || "[no name]"
diff --git a/src/domain/index.ts b/src/domain/index.ts
index 77b293184..3cd8739d2 100644
--- a/src/domain/index.ts
+++ b/src/domain/index.ts
@@ -1,6 +1,5 @@
 export * from "./collection"
 export * from "./feed"
-export * from "./group"
 export * from "./handler"
 export * from "./kind"
 export * from "./list"
diff --git a/src/engine/commands.ts b/src/engine/commands.ts
index 2b51e45d8..a7fa0bc77 100644
--- a/src/engine/commands.ts
+++ b/src/engine/commands.ts
@@ -1,97 +1,83 @@
-import crypto from "crypto"
-import {get} from "svelte/store"
+import type {Session} from "@welshman/app"
 import {
-  ctx,
+  follow as baseFollow,
+  unfollow as baseUnfollow,
+  ensurePlaintext,
+  getRelayUrls,
+  inboxRelaySelectionsByPubkey,
+  nip46Perms,
+  pubkey,
+  repository,
+  session,
+  sessions,
+  signer,
+  tagPubkey,
+  userInboxRelaySelections,
+  userRelaySelections,
+} from "@welshman/app"
+import {
+  append,
   cached,
-  indexBy,
-  nthNe,
+  ctx,
   equals,
-  splitAt,
   first,
+  groupBy,
+  indexBy,
   last,
-  append,
+  now,
   nthEq,
-  groupBy,
+  nthNe,
   remove,
-  now,
+  splitAt,
 } from "@welshman/lib"
-import type {TrustedEvent, Profile} from "@welshman/util"
+import type {Nip46Handler} from "@welshman/signer"
+import {Nip01Signer, Nip46Broker, Nip59, makeSecret} from "@welshman/signer"
+import type {Profile, TrustedEvent} from "@welshman/util"
 import {
-  getAddress,
-  Tags,
-  createEvent,
   Address,
-  isSignedEvent,
-  normalizeRelayUrl,
-  GROUP,
-  COMMUNITY,
+  DIRECT_MESSAGE,
   FEEDS,
   FOLLOWS,
-  RELAYS,
-  PROFILE,
   INBOX_RELAYS,
-  DIRECT_MESSAGE,
-  SEEN_CONVERSATION,
   LOCAL_RELAY_URL,
-  makeList,
-  editProfile,
+  PROFILE,
+  RELAYS,
+  SEEN_CONVERSATION,
+  Tags,
+  addToListPublicly,
+  createEvent,
   createProfile,
+  editProfile,
+  getAddress,
   isPublishedProfile,
+  isSignedEvent,
+  makeList,
+  normalizeRelayUrl,
   removeFromList,
-  addToListPublicly,
 } from "@welshman/util"
-import type {Nip46Handler} from "@welshman/signer"
-import {Nip59, Nip01Signer, getPubkey, makeSecret, Nip46Broker} from "@welshman/signer"
-import {
-  updateSession,
-  repository,
-  pubkey,
-  nip46Perms,
-  signer,
-  sessions,
-  session,
-  getRelayUrls,
-  displayProfileByPubkey,
-  inboxRelaySelectionsByPubkey,
-  addNoFallbacks,
-  ensurePlaintext,
-  tagPubkey,
-  userRelaySelections,
-  userInboxRelaySelections,
-  follow as baseFollow,
-  unfollow as baseUnfollow,
-} from "@welshman/app"
-import type {Session} from "@welshman/app"
-import {Fetch, randomId, seconds, sleep, tryFunc} from "hurdak"
-import {assoc, flatten, identity, omit, partition, prop, reject, uniq, without} from "ramda"
-import {stripExifData, blobToFile} from "src/util/html"
-import {joinPath, parseJson} from "src/util/misc"
-import {appDataKeys} from "src/util/nostr"
-import {GroupAccess} from "src/engine/model"
-import {sortEventsDesc} from "src/engine/utils"
+import crypto from "crypto"
+import {Fetch, seconds, sleep, tryFunc} from "hurdak"
+import {assoc, flatten, identity, omit, prop, reject, uniq, without} from "ramda"
 import {
+  addClientTags,
+  anonymous,
   channels,
-  getChannelSeenKey,
   createAndPublish,
-  deriveAdminKeyForGroup,
-  userIsGroupMember,
-  deriveSharedKeyForGroup,
-  env,
-  addClientTags,
+  getChannelIdFromEvent,
+  getChannelSeenKey,
   getClientTags,
-  groupAdminKeys,
-  groupSharedKeys,
-  groups,
+  hasNip44,
   publish,
   sign,
-  hasNip44,
-  withIndexers,
-  anonymous,
-  mentionGroup,
-  userSeenStatusEvents,
-  getChannelIdFromEvent,
   userFeedFavorites,
+  userSeenStatusEvents,
+  withIndexers,
 } from "src/engine/state"
+import {sortEventsDesc} from "src/engine/utils"
+import {blobToFile, stripExifData} from "src/util/html"
+import {joinPath, parseJson} from "src/util/misc"
+import {appDataKeys} from "src/util/nostr"
+import {get} from "svelte/store"
 
 // Helpers
 
@@ -215,360 +201,17 @@ export const uploadFiles = async (urls, files, compressorOpts = {}) => {
   return eventsToMeta(nip94Events)
 }
 
-// Groups
-
 // Key state management
 
-export const initSharedKey = (address: string, relays: string[]) => {
-  const privkey = makeSecret()
-  const pubkey = getPubkey(privkey)
-  const key = {
-    group: address,
-    pubkey: pubkey,
-    privkey: privkey,
-    created_at: now(),
-    hints: relays,
-  }
-
-  groupSharedKeys.key(pubkey).set(key)
-
-  return key
-}
-
-export const initGroup = (kind, relays) => {
-  const identifier = randomId()
-  const privkey = makeSecret()
-  const pubkey = getPubkey(privkey)
-  const address = `${kind}:${pubkey}:${identifier}`
-  const sharedKey = kind === 35834 ? initSharedKey(address, relays) : null
-  const adminKey = {
-    group: address,
-    pubkey: pubkey,
-    privkey: privkey,
-    created_at: now(),
-    hints: relays,
-  }
-
-  groupAdminKeys.key(pubkey).set(adminKey)
-
-  groups.key(address).set({id: identifier, pubkey, address})
-
-  return {identifier, address, adminKey, sharedKey}
-}
-
-const addGroupATags = (template, addresses) => ({
-  ...template,
-  tags: [...template.tags, ...addresses.map(mentionGroup)],
-})
-
-// Utils for publishing group-related messages
-// Relay selections for groups should ignore platform relays, since groups provide their own
-// relays, and can straddle public/private contexts.
-
-export const publishToGroupAdmin = async (address, template) => {
-  const relays = ctx.app.router.WithinContext(address).getUrls()
-  const pubkeys = [Address.from(address).pubkey, session.get().pubkey]
-  const expireTag = [["expiration", String(now() + seconds(30, "day"))]]
-  const helper = Nip59.fromSigner(signer.get())
-
-  for (const pubkey of pubkeys) {
-    const rumor = await helper.wrap(pubkey, template, expireTag)
-
-    await publish({event: rumor.wrap, relays, forcePlatform: false})
-  }
-}
-
-export const publishAsGroupAdminPublicly = async (address, template, relays = []) => {
-  const _relays = ctx.app.router
-    .merge([ctx.app.router.fromRelays(relays), ctx.app.router.WithinContext(address)])
-    .getUrls()
-  const adminKey = deriveAdminKeyForGroup(address).get()
-  const event = await sign(template, {sk: adminKey.privkey})
-
-  return publish({event, relays: _relays, forcePlatform: false})
-}
-
-export const publishAsGroupAdminPrivately = async (address, template, relays = []) => {
-  const _relays = ctx.app.router
-    .merge([ctx.app.router.fromRelays(relays), ctx.app.router.WithinContext(address)])
-    .getUrls()
-  const adminKey = deriveAdminKeyForGroup(address).get()
-  const sharedKey = deriveSharedKeyForGroup(address).get()
-  const adminSigner = new Nip01Signer(adminKey.privkey)
-  const sharedSigner = new Nip01Signer(sharedKey.privkey)
-  const helper = Nip59.fromSigner(adminSigner).withWrapper(sharedSigner)
-  const rumor = await helper.wrap(sharedKey.pubkey, template)
-
-  return publish({event: rumor.wrap, relays: _relays, forcePlatform: false})
-}
-
-export const publishToGroupsPublicly = async (addresses, template, {anonymous = false} = {}) => {
-  for (const address of addresses) {
-    if (!address.startsWith("34550:")) {
-      throw new Error(`Attempted to publish publicly to an invalid address: ${address}`)
-    }
-  }
-
-  const event = await sign(addGroupATags(template, addresses), {anonymous})
+export const signAndPublish = async (template, {anonymous = false} = {}) => {
+  const event = await sign(template, {anonymous})
   const relays = ctx.app.router.PublishEvent(event).getUrls()
 
-  return publish({event, relays, forcePlatform: false})
-}
-
-export const publishToGroupsPrivately = async (addresses, template, {anonymous = false} = {}) => {
-  const $userIsGroupMember = userIsGroupMember.get()
-
-  const events = []
-  const pubs = []
-  for (const address of addresses) {
-    const relays = ctx.app.router.WithinContext(address).getUrls()
-    const thisTemplate = addGroupATags(template, [address])
-    const sharedKey = deriveSharedKeyForGroup(address).get()
-
-    if (!address.startsWith("35834:")) {
-      throw new Error(`Attempted to publish privately to an invalid address: ${address}`)
-    }
-
-    if (!$userIsGroupMember(address)) {
-      throw new Error("Attempted to publish privately to a group the user is not a member of")
-    }
-
-    const userSigner = anonymous ? signer.get() : Nip01Signer.ephemeral()
-    const wrapSigner = new Nip01Signer(sharedKey.privkey)
-    const helper = Nip59.fromSigner(userSigner).withWrapper(wrapSigner)
-    const rumor = await helper.wrap(sharedKey.pubkey, thisTemplate)
-
-    events.push(rumor)
-    pubs.push(await publish({event: rumor.wrap, relays, forcePlatform: false}))
-  }
-
-  return {events, pubs}
-}
-
-export const publishToZeroOrMoreGroups = async (addresses, template, {anonymous = false} = {}) => {
-  const pubs = []
-  const events = []
-
-  if (addresses.length === 0) {
-    const event = await sign(template, {anonymous})
-    const relays = ctx.app.router.PublishEvent(event).getUrls()
-
-    events.push(event)
-    pubs.push(await publish({event, relays}))
-  } else {
-    const [wrap, nowrap] = partition((address: string) => address.startsWith("35834:"), addresses)
-
-    if (wrap.length > 0) {
-      const result = await publishToGroupsPrivately(wrap, template, {anonymous})
-
-      for (const event of result.events) {
-        events.push(event)
-      }
-
-      for (const pub of result.pubs) {
-        pubs.push(pub)
-      }
-    }
-
-    if (nowrap.length > 0) {
-      const pub = await publishToGroupsPublicly(nowrap, template, {anonymous})
-
-      events.push(pub.request.event)
-      pubs.push(pub)
-    }
-  }
-
-  return {events, pubs}
-}
-
-// Admin functions
-
-export const publishKeyShares = async (address, pubkeys, template) => {
-  const adminKey = deriveAdminKeyForGroup(address).get()
-
-  const pubs = []
+  const pub = await publish({event, relays})
 
-  for (const pubkey of pubkeys) {
-    const relays = ctx.app.router
-      .merge([
-        ctx.app.router.ForPubkeys([pubkey]),
-        ctx.app.router.WithinContext(address),
-        ctx.app.router.fromRelays(env.PLATFORM_RELAYS),
-      ])
-      .policy(addNoFallbacks)
-      .getUrls()
-
-    const adminSigner = new Nip01Signer(adminKey.privkey)
-    const helper = Nip59.fromSigner(adminSigner)
-    const rumor = await helper.wrap(pubkey, template)
-
-    pubs.push(await publish({event: rumor.wrap, relays, forcePlatform: false}))
-  }
-
-  return pubs
-}
-
-export const publishAdminKeyShares = async (address, pubkeys) => {
-  const relays = ctx.app.router.WithinContext(address).getUrls()
-  const {privkey} = deriveAdminKeyForGroup(address).get()
-  const template = createEvent(24, {
-    tags: [
-      mentionGroup(address),
-      ["role", "admin"],
-      ["privkey", privkey],
-      ...getClientTags(),
-      ...relays.map(url => ["relay", url]),
-    ],
-  })
-
-  return publishKeyShares(address, pubkeys, template)
-}
-
-export const publishGroupInvites = async (address, pubkeys, gracePeriod = 0) => {
-  const relays = ctx.app.router.WithinContext(address).getUrls()
-  const adminKey = deriveAdminKeyForGroup(address).get()
-  const {privkey} = deriveSharedKeyForGroup(address).get()
-  const template = createEvent(24, {
-    tags: [
-      mentionGroup(address),
-      ["role", "member"],
-      ["privkey", privkey],
-      ["grace_period", String(gracePeriod)],
-      ...getClientTags(),
-      ...relays.map(url => ["relay", url]),
-    ],
-  })
-
-  return publishKeyShares(address, [...pubkeys, adminKey.pubkey], template)
-}
-
-export const publishGroupEvictions = async (address, pubkeys) =>
-  publishKeyShares(
-    address,
-    pubkeys,
-    createEvent(24, {
-      tags: [mentionGroup(address), ...getClientTags()],
-    }),
-  )
-
-export const publishGroupMembers = async (address, op, pubkeys) => {
-  const template = createEvent(27, {
-    tags: [["op", op], mentionGroup(address), ...getClientTags(), ...pubkeys.map(tagPubkey)],
-  })
-
-  return publishAsGroupAdminPrivately(address, template)
-}
-
-export const publishCommunityMeta = (address, identifier, meta) => {
-  const template = createEvent(COMMUNITY, {
-    tags: [
-      ["d", identifier],
-      ["name", meta.name],
-      ["about", meta.about],
-      ["description", meta.about],
-      ["banner", meta.banner],
-      ["picture", meta.image],
-      ["image", meta.image],
-      ...meta.feeds,
-      ...meta.relays,
-      ...meta.moderators,
-      ...getClientTags(),
-    ],
-  })
-
-  return publishAsGroupAdminPublicly(address, template, meta.relays)
-}
-
-export const publishGroupMeta = (address, identifier, meta, listPublicly) => {
-  const template = createEvent(GROUP, {
-    tags: [
-      ["d", identifier],
-      ["name", meta.name],
-      ["about", meta.about],
-      ["description", meta.about],
-      ["banner", meta.banner],
-      ["picture", meta.image],
-      ["image", meta.image],
-      ...meta.feeds,
-      ...meta.relays,
-      ...meta.moderators,
-      ...getClientTags(),
-    ],
-  })
-
-  return listPublicly
-    ? publishAsGroupAdminPublicly(address, template, meta.relays)
-    : publishAsGroupAdminPrivately(address, template, meta.relays)
+  return {event, pub}
 }
 
-export const deleteGroupMeta = address =>
-  publishAsGroupAdminPublicly(address, createEvent(5, {tags: [mentionGroup(address)]}))
-
-// Member functions
-
-export const modifyGroupStatus = (session, address, timestamp, updates) => {
-  if (!session.groups) {
-    session.groups = {}
-  }
-
-  const newGroupStatus = updateRecord(session.groups[address], timestamp, updates)
-
-  if (!equals(session.groups[address], newGroupStatus)) {
-    session.groups[address] = newGroupStatus
-  }
-
-  return session
-}
-
-export const setGroupStatus = (pubkey, address, timestamp, updates) =>
-  updateSession(pubkey, s => modifyGroupStatus(s, address, timestamp, updates))
-
-export const resetGroupAccess = address =>
-  setGroupStatus(pubkey.get(), address, now(), {access: GroupAccess.None})
-
-export const publishGroupEntryRequest = (address, claim = null) => {
-  if (deriveAdminKeyForGroup(address).get()) {
-    publishGroupInvites(address, [session.get().pubkey])
-  } else {
-    setGroupStatus(pubkey.get(), address, now(), {access: GroupAccess.Requested})
-
-    const tags = [...getClientTags(), mentionGroup(address)]
-
-    if (claim) {
-      tags.push(["claim", claim])
-    }
-
-    publishToGroupAdmin(
-      address,
-      createEvent(25, {
-        content: `${displayProfileByPubkey(pubkey.get())} would like to join the group`,
-        tags,
-      }),
-    )
-  }
-}
-
-export const publishGroupExitRequest = address => {
-  setGroupStatus(pubkey.get(), address, now(), {access: GroupAccess.None})
-
-  if (!deriveAdminKeyForGroup(address).get()) {
-    publishToGroupAdmin(
-      address,
-      createEvent(26, {
-        content: `${displayProfileByPubkey(pubkey.get())} is leaving the group`,
-        tags: [...getClientTags(), mentionGroup(address)],
-      }),
-    )
-  }
-}
-
-export const publishCommunitiesList = addresses =>
-  createAndPublish({
-    kind: 10004,
-    tags: [...addresses.map(mentionGroup), ...getClientTags()],
-    relays: ctx.app.router.WriteRelays().getUrls(),
-  })
-
 // Deletes
 
 export const publishDeletion = ({kind, address = null, id = null}) => {
diff --git a/src/engine/model.ts b/src/engine/model.ts
index 6dcb7ebbf..06da2da1b 100644
--- a/src/engine/model.ts
+++ b/src/engine/model.ts
@@ -1,46 +1,6 @@
+import type {Session} from "@welshman/app"
 import type {Publish} from "@welshman/net"
 import type {TrustedEvent, Zapper as WelshmanZapper} from "@welshman/util"
-import type {Session} from "@welshman/app"
-import {isTrustedEvent} from "@welshman/util"
-
-export enum GroupAccess {
-  None = null,
-  Requested = "requested",
-  Granted = "granted",
-  Revoked = "revoked",
-}
-
-export type Group = {
-  id: string
-  pubkey: string
-  address: string
-  members?: string[]
-  recent_member_updates?: TrustedEvent[]
-}
-
-export type GroupKey = {
-  group: string
-  pubkey: string
-  privkey: string
-  created_at: number
-  hints?: string[]
-}
-
-export type GroupRequest = TrustedEvent & {
-  group: string
-  resolved: boolean
-}
-
-export const isGroupRequest = (e: any): e is GroupRequest =>
-  typeof e.group === "string" && typeof e.resolved === "boolean" && isTrustedEvent(e)
-
-export type GroupAlert = TrustedEvent & {
-  group: string
-  type: "exit" | "invite"
-}
-
-export const isGroupAlert = (e: any): e is GroupAlert =>
-  typeof e.group === "string" && typeof e.type === "string" && isTrustedEvent(e)
 
 export type DisplayEvent = TrustedEvent & {
   replies?: DisplayEvent[]
@@ -80,15 +40,7 @@ export type Channel = {
   messages: TrustedEvent[]
 }
 
-export type GroupStatus = {
-  joined: boolean
-  joined_updated_at: number
-  access: GroupAccess
-  access_updated_at: number
-}
-
 export type SessionWithMeta = Session & {
-  groups?: Record<string, GroupStatus>
   onboarding_tasks_completed?: string[]
 }
 
diff --git a/src/engine/projections.ts b/src/engine/projections.ts
index 4ce18bef1..8ee94dc04 100644
--- a/src/engine/projections.ts
+++ b/src/engine/projections.ts
@@ -1,175 +1,24 @@
-import {mergeRight, prop, sortBy, uniq, whereEq, without} from "ramda"
-import {switcherFn} from "hurdak"
-import {ctx} from "@welshman/lib"
+import {ensurePlaintext, repository} from "@welshman/app"
 import type {TrustedEvent} from "@welshman/util"
 import {
-  Tags,
-  getIdFilters,
-  MUTES,
   APP_DATA,
+  FOLLOWS,
+  MUTES,
+  SEEN_CONTEXT,
   SEEN_CONVERSATION,
   SEEN_GENERAL,
-  SEEN_CONTEXT,
-  FOLLOWS,
-  COMMUNITIES,
-  WRAP,
 } from "@welshman/util"
-import {getPubkey} from "@welshman/signer"
-import {repository, putSession, getSession, ensurePlaintext} from "@welshman/app"
-import {GroupAccess, type SessionWithMeta} from "src/engine/model"
-import {
-  deriveAdminKeyForGroup,
-  getGroupStatus,
-  groupAdminKeys,
-  groupAlerts,
-  groupRequests,
-  groupSharedKeys,
-  groups,
-  load,
-  projections,
-} from "src/engine/state"
-import {modifyGroupStatus, setGroupStatus} from "src/engine/commands"
+import {projections} from "src/engine/state"
 
 // Synchronize repository with projections. All events should be published to the
 // repository, and when accepted, be propagated to projections. This avoids processing
 // the same event multiple times, since repository deduplicates
-
 repository.on("update", ({added}: {added: TrustedEvent[]}) => {
   for (const event of added) {
     projections.push(event)
   }
 })
 
-// Key sharing
-
-projections.addHandler(24, (e: TrustedEvent) => {
-  const tags = Tags.fromEvent(e)
-  const privkey = tags.get("privkey")?.value()
-  const address = tags.get("a")?.value()
-  const recipient = Tags.fromEvent(e.wrap).get("p")?.value()
-  const relays = tags.values("relay").valueOf()
-
-  if (!address) {
-    return
-  }
-
-  const status = getGroupStatus(getSession(recipient), address)
-
-  if (privkey) {
-    const pubkey = getPubkey(privkey)
-    const role = tags.get("role")?.value()
-    const keys = role === "admin" ? groupAdminKeys : groupSharedKeys
-
-    keys.key(pubkey).update($key => ({
-      pubkey,
-      privkey,
-      group: address,
-      created_at: e.created_at,
-      hints: relays,
-      ...$key,
-    }))
-
-    // Notify the user if this isn't just a key rotation
-    if (status?.access !== GroupAccess.Granted) {
-      groupAlerts.key(e.id).set({...e, group: address, type: "invite"})
-    }
-
-    // Load the group's metadata and posts
-    load({
-      delay: 5000,
-      skipCache: true,
-      relays: ctx.app.router.fromRelays(relays).getUrls(),
-      filters: [
-        ...getIdFilters([address]),
-        {kinds: [WRAP], "#p": [pubkey]},
-        {kinds: [WRAP], authors: [pubkey]},
-      ],
-    })
-  } else if ([GroupAccess.Granted, GroupAccess.Requested].includes(status?.access)) {
-    groupAlerts.key(e.id).set({...e, group: address, type: "exit"})
-  }
-
-  if (getSession(recipient)) {
-    setGroupStatus(recipient, address, e.created_at, {
-      access: privkey ? GroupAccess.Granted : GroupAccess.Revoked,
-    })
-  }
-})
-
-projections.addHandler(27, (e: TrustedEvent) => {
-  const address = Tags.fromEvent(e).groups().values().first()
-
-  if (!address) {
-    return
-  }
-
-  let {members = [], recent_member_updates = []} = groups.key(address).get() || {}
-
-  // Only replay updates if we have something new
-  if (!recent_member_updates.find(whereEq({id: e.id}))) {
-    recent_member_updates = sortBy(prop("created_at"), recent_member_updates.concat(e)).slice(-100)
-
-    for (const event of recent_member_updates) {
-      const tags = Tags.fromEvent(event)
-      const op = tags.get("op")?.value()
-      const pubkeys = tags.values("p").valueOf()
-
-      members = switcherFn(op, {
-        add: () => uniq(pubkeys.concat(members)),
-        remove: () => without(pubkeys, members),
-        set: () => pubkeys,
-        default: () => members,
-      })
-    }
-
-    groups.key(address).merge({members, recent_member_updates})
-  }
-})
-
-// Membership
-
-projections.addHandler(COMMUNITIES, (e: TrustedEvent) => {
-  let session = getSession(e.pubkey) as SessionWithMeta
-
-  if (!session) {
-    return
-  }
-
-  const addresses = Tags.fromEvent(e).communities().values().valueOf()
-
-  for (const address of uniq(Object.keys(session.groups || {}).concat(addresses))) {
-    session = modifyGroupStatus(session, address, e.created_at, {
-      joined: addresses.includes(address),
-    })
-  }
-
-  putSession(session)
-})
-
-const handleGroupRequest = access => (e: TrustedEvent) => {
-  const address = Tags.fromEvent(e).get("a")?.value()
-  const adminKey = deriveAdminKeyForGroup(address)
-
-  // Don't bother the admin with old requests
-  if (adminKey.get() && e.created_at) {
-    groupRequests.key(e.id).update(
-      mergeRight({
-        ...e,
-        group: address,
-        resolved: false,
-      }),
-    )
-  }
-
-  if (getSession(e.pubkey)) {
-    setGroupStatus(e.pubkey, address, e.created_at, {access})
-  }
-}
-
-projections.addHandler(25, handleGroupRequest(GroupAccess.Requested))
-
-projections.addHandler(26, handleGroupRequest(GroupAccess.None))
-
 // Decrypt encrypted events eagerly
 
 projections.addHandler(SEEN_GENERAL, ensurePlaintext)
diff --git a/src/engine/requests.ts b/src/engine/requests.ts
index 45a472589..3955d8412 100644
--- a/src/engine/requests.ts
+++ b/src/engine/requests.ts
@@ -151,24 +151,6 @@ export const getStaleAddrs = (addrs: string[]) => {
   return Array.from(stale)
 }
 
-export const loadGroups = async (rawAddrs: string[], explicitRelays: string[] = []) => {
-  const addrs = getStaleAddrs(rawAddrs)
-  const authors = addrs.map(a => Address.from(a).pubkey)
-  const identifiers = addrs.map(a => Address.from(a).identifier)
-
-  if (addrs.length > 0) {
-    const filters = [{kinds: [34550, 35834], authors, "#d": identifiers}]
-    const relays = ctx.app.router
-      .merge([
-        ctx.app.router.product(addrs, explicitRelays),
-        ctx.app.router.WithinMultipleContexts(addrs),
-      ])
-      .getUrls()
-
-    return load({relays, filters, skipCache: true, forcePlatform: false})
-  }
-}
-
 export const loadGroupMessages = async (addrs: string[]) => {
   for (const address of addrs) {
     const keys = [...groupAdminKeys.get(), ...groupSharedKeys.get()]
diff --git a/src/engine/state.ts b/src/engine/state.ts
index eb47272ff..e7eea901e 100644
--- a/src/engine/state.ts
+++ b/src/engine/state.ts
@@ -1,157 +1,126 @@
-import Fuse from "fuse.js"
-import crypto from "crypto"
-import {get, derived, writable} from "svelte/store"
-import {doPipe, batch, seconds, sleep} from "hurdak"
-import {defaultTo, equals, assoc, sortBy, omit, partition, prop, whereEq, without} from "ramda"
+import type {PartialSubscribeRequest} from "@welshman/app"
+import {
+  subscribe as baseSubscribe,
+  db,
+  displayProfileByPubkey,
+  ensurePlaintext,
+  followsByPubkey,
+  freshness,
+  getDefaultAppContext,
+  getDefaultNetContext,
+  getNetwork,
+  getPlaintext,
+  getSession,
+  getSigner,
+  getUserWotScore,
+  handles,
+  initStorage,
+  loadRelay,
+  makeRouter,
+  maxWot,
+  mutesByPubkey,
+  plaintext,
+  pubkey,
+  relay,
+  relays,
+  repository,
+  session,
+  sessions,
+  setPlaintext,
+  signer,
+  storageAdapters,
+  tagPubkey,
+  tracker,
+  zappers,
+} from "@welshman/app"
+import * as Content from "@welshman/content"
 import {
-  ctx,
-  setContext,
   Worker,
-  simpleCache,
-  identity,
-  last,
-  nth,
-  uniq,
-  uniqBy,
-  now,
-  intersection,
-  sort,
+  ctx,
   groupBy,
+  identity,
   indexBy,
+  now,
   pushToMapKey,
-  tryCatch,
+  setContext,
+  simpleCache,
+  sort,
   take,
+  tryCatch,
+  uniq,
+  uniqBy,
 } from "@welshman/lib"
+import type {PublishRequest} from "@welshman/net"
+import {Executor, Local, Multi, Plex, Relays, publish as basePublish} from "@welshman/net"
+import {Nip01Signer, Nip59} from "@welshman/signer"
+import {deriveEvents, deriveEventsMapped, throttled, withGetter} from "@welshman/store"
+import type {
+  EventTemplate,
+  Filter,
+  PublishedList,
+  SignedEvent,
+  StampedEvent,
+  TrustedEvent,
+} from "@welshman/util"
 import {
-  CLIENT_AUTH,
   APP_DATA,
+  CLIENT_AUTH,
   COMMUNITIES,
-  COMMUNITY,
+  DIRECT_MESSAGE,
   FEED,
   FEEDS,
   FOLLOWS,
-  GROUP,
   HANDLER_INFORMATION,
   HANDLER_RECOMMENDATION,
   LABEL,
+  LOCAL_RELAY_URL,
+  NAMED_BOOKMARKS,
   SEEN_CONTEXT,
   SEEN_CONVERSATION,
   SEEN_GENERAL,
-  DIRECT_MESSAGE,
-  NAMED_BOOKMARKS,
-  WRAP,
-  Address,
   Tags,
+  WRAP,
+  asDecryptedEvent,
   createEvent,
   getAddress,
-  getIdentifier,
+  getAddressTagValues,
+  getAncestorTagValues,
   getIdAndAddress,
-  getIdOrAddress,
   getIdFilters,
-  LOCAL_RELAY_URL,
-  isGroupAddress,
-  isCommunityAddress,
-  isHashedEvent,
-  getPubkeyTagValues,
+  getIdOrAddress,
+  getIdentifier,
   getListTags,
+  getPubkeyTagValues,
   getTagValues,
-  normalizeRelayUrl,
-  isContextAddress,
-  getContextTagValues,
-  getAddressTagValues,
-  getAncestorTagValues,
-  getAddressTags,
+  isHashedEvent,
   makeList,
+  normalizeRelayUrl,
   readList,
-  asDecryptedEvent,
 } from "@welshman/util"
-import type {
-  Filter,
-  TrustedEvent,
-  SignedEvent,
-  EventTemplate,
-  PublishedList,
-  StampedEvent,
-} from "@welshman/util"
-import {Nip59, Nip01Signer} from "@welshman/signer"
-import {Executor, Multi, Plex, Local, Relays, publish as basePublish} from "@welshman/net"
-import type {PartialSubscribeRequest} from "@welshman/app"
-import type {PublishRequest} from "@welshman/net"
-import * as Content from "@welshman/content"
-import {withGetter, deriveEvents, deriveEventsMapped, throttled} from "@welshman/store"
-import {
-  session,
-  getSession,
-  getSigner,
-  signer,
-  repository,
-  relay,
-  tracker,
-  pubkey,
-  handles,
-  displayProfileByPubkey,
-  mutesByPubkey,
-  followsByPubkey,
-  makeRouter,
-  subscribe as baseSubscribe,
-  storageAdapters,
-  freshness,
-  zappers,
-  relays,
-  initStorage,
-  db,
-  plaintext,
-  getPlaintext,
-  setPlaintext,
-  ensurePlaintext,
-  getDefaultNetContext,
-  getDefaultAppContext,
-  loadRelay,
-  tagPubkey,
-  getNetwork,
-  getUserWotScore,
-  sessions,
-  maxWot,
-  repositoryStore,
-} from "@welshman/app"
-import {parseJson, fromCsv, SearchHelper} from "src/util/misc"
-import {Collection as CollectionStore} from "src/util/store"
-import {isLike, repostKinds, noteKinds, reactionKinds, metaKinds, appDataKeys} from "src/util/nostr"
-import logger from "src/util/logger"
-import type {
-  GroupMeta,
-  PublishedFeed,
-  PublishedListFeed,
-  PublishedUserList,
-  PublishedGroupMeta,
-} from "src/domain"
+import crypto from "crypto"
+import Fuse from "fuse.js"
+import {batch, doPipe, seconds, sleep} from "hurdak"
+import {assoc, equals, omit, partition, prop, sortBy, without} from "ramda"
+import type {PublishedFeed, PublishedListFeed, PublishedUserList} from "src/domain"
 import {
-  displayFeed,
+  CollectionSearch,
   EDITABLE_LIST_KINDS,
   UserListSearch,
-  readFeed,
-  readUserList,
+  displayFeed,
+  getHandlerAddress,
+  mapListToFeed,
   readCollections,
-  CollectionSearch,
+  readFeed,
   readHandlers,
-  mapListToFeed,
-  getHandlerAddress,
-  readGroupMeta,
-  displayGroupMeta,
+  readUserList,
 } from "src/domain"
-import type {
-  Channel,
-  Group,
-  GroupAlert,
-  GroupKey,
-  GroupRequest,
-  GroupStatus,
-  PublishInfo,
-  SessionWithMeta,
-  AnonymousUserState,
-} from "src/engine/model"
-import {sortEventsAsc, unwrapRepost} from "src/engine/utils"
-import {GroupAccess, OnboardingTask} from "src/engine/model"
+import type {AnonymousUserState, Channel, PublishInfo, SessionWithMeta} from "src/engine/model"
+import {OnboardingTask} from "src/engine/model"
+import {sortEventsAsc} from "src/engine/utils"
+import logger from "src/util/logger"
+import {SearchHelper, fromCsv, parseJson} from "src/util/misc"
+import {appDataKeys, isLike, metaKinds, noteKinds, reactionKinds, repostKinds} from "src/util/nostr"
+import {derived, get, writable} from "svelte/store"
 
 export const env = {
   CLIENT_ID: import.meta.env.VITE_CLIENT_ID as string,
@@ -185,12 +154,6 @@ export const anonymous = withGetter(writable<AnonymousUserState>({follows: [], r
 export const groupHints = withGetter(writable<Record<string, string[]>>({}))
 export const publishes = withGetter(writable<Record<string, PublishInfo>>({}))
 
-export const groups = new CollectionStore<Group>("address")
-export const groupAdminKeys = new CollectionStore<GroupKey>("pubkey")
-export const groupSharedKeys = new CollectionStore<GroupKey>("pubkey")
-export const groupRequests = new CollectionStore<GroupRequest>("id")
-export const groupAlerts = new CollectionStore<GroupAlert>("id")
-
 export const projections = new Worker<TrustedEvent>({
   getKey: prop("kind"),
 })
@@ -218,8 +181,7 @@ export const ensureMessagePlaintext = async (e: TrustedEvent) => {
 }
 
 export const canUnwrap = (event: TrustedEvent) =>
-  event.kind === WRAP &&
-  (getSession(Tags.fromEvent(event).get("p")?.value()) || getRecipientKey(event))
+  event.kind === WRAP && getSession(Tags.fromEvent(event).get("p")?.value())
 
 export const ensureUnwrapped = async (event: TrustedEvent) => {
   if (event.kind !== WRAP) {
@@ -244,17 +206,6 @@ export const ensureUnwrapped = async (event: TrustedEvent) => {
     }
   }
 
-  // Decrypt by group key
-  const secret = getRecipientKey(event)
-
-  if (secret) {
-    try {
-      rumor = await Nip59.fromSecret(secret).unwrap(event as SignedEvent)
-    } catch (e) {
-      // pass
-    }
-  }
-
   if (rumor && isHashedEvent(rumor)) {
     tracker.copy(event.id, rumor.id)
     relay.send("EVENT", rumor)
@@ -370,18 +321,6 @@ export const communityListsByPubkey = withGetter(
   derived(communityLists, $ls => indexBy($l => $l.event.pubkey, $ls)),
 )
 
-export const communityListsByAddress = derived(communityLists, $communityLists => {
-  const m = new Map<string, PublishedList[]>()
-
-  for (const list of $communityLists) {
-    for (const a of getAddressTagValues(getListTags(list))) {
-      pushToMapKey(m, a, list)
-    }
-  }
-
-  return m
-})
-
 export const getCommunityList = (pk: string) =>
   communityListsByPubkey.get().get(pk) as PublishedList | undefined
 
@@ -394,157 +333,10 @@ export const getCommunities = (pk: string) =>
 export const deriveCommunities = (pk: string) =>
   derived(communityListsByPubkey, m => new Set(getAddressTagValues(getListTags(m.get(pk)))))
 
-// Groups
-
-export const groupMeta = deriveEventsMapped<PublishedGroupMeta>(repository, {
-  filters: [{kinds: [GROUP, COMMUNITY]}],
-  itemToEvent: prop("event"),
-  eventToItem: readGroupMeta,
-})
-
-export const groupMetaByAddress = withGetter(
-  derived(groupMeta, $metas => indexBy($meta => getAddress($meta.event), $metas)),
-)
-
-export const deriveGroupMeta = (address: string) =>
-  derived(groupMetaByAddress, $m => $m.get(address))
-
-export const displayGroupByAddress = a => displayGroupMeta(groupMetaByAddress.get().get(a))
-
-export class GroupSearch extends SearchHelper<GroupMeta & {score: number}, string> {
-  config = {
-    keys: [{name: "identifier", weight: 0.2}, "name", {name: "about", weight: 0.5}],
-    threshold: 0.3,
-    shouldSort: false,
-    includeScore: true,
-  }
-
-  getSearch = () => {
-    const fuse = new Fuse(this.options, this.config)
-    const sortFn = (r: any) => r.score - Math.pow(Math.max(0, r.item.score), 1 / 100)
-
-    return (term: string) =>
-      term
-        ? sortBy(sortFn, fuse.search(term)).map((r: any) => r.item)
-        : sortBy(meta => -meta.score, this.options)
-  }
-
-  getValue = (option: GroupMeta) => getAddress(option.event)
-
-  displayValue = displayGroupByAddress
-}
-
-export const groupMetaSearch = derived(
-  [groupMeta, communityListsByAddress, userFollows],
-  ([$groupMeta, $communityListsByAddress, $userFollows]) => {
-    const options = $groupMeta.map(meta => {
-      const lists = $communityListsByAddress.get(getAddress(meta.event)) || []
-      const members = lists.map(l => l.event.pubkey)
-      const followedMembers = intersection(members, Array.from($userFollows))
-
-      return {...meta, score: followedMembers.length}
-    })
-
-    return new GroupSearch(options)
-  },
-)
-
-// Legacy
-export const deriveGroup = address => {
-  const {pubkey, identifier: id} = Address.from(address)
-
-  return groups.key(address).derived(defaultTo({id, pubkey, address}))
-}
-
-export const getRecipientKey = wrap => {
-  const pubkey = Tags.fromEvent(wrap).values("p").first()
-  const sharedKey = groupSharedKeys.key(pubkey).get()
-
-  if (sharedKey) {
-    return sharedKey.privkey
-  }
-
-  const adminKey = groupAdminKeys.key(pubkey).get()
-
-  if (adminKey) {
-    return adminKey.privkey
-  }
-
-  return null
-}
-
-export const deriveSharedKeyForGroup = (address: string) =>
-  groupSharedKeys.derived($keys =>
-    last(sortBy(prop("created_at"), $keys.filter(whereEq({group: address})))),
-  )
-
-export const deriveAdminKeyForGroup = (address: string) => groupAdminKeys.key(address.split(":")[1])
-
-export const getGroupStatus = (sessionWithMeta: SessionWithMeta, address: string) =>
-  (sessionWithMeta?.groups?.[address] || {}) as GroupStatus
-
-export const deriveGroupStatus = address =>
-  derived(sessionWithMeta, $sessionWithMeta => getGroupStatus($sessionWithMeta, address))
-
-export const userIsGroupMember = withGetter(
-  derived(sessionWithMeta, $sessionWithMeta => (address, includeRequests = false) => {
-    const status = getGroupStatus($sessionWithMeta, address)
-
-    if (isCommunityAddress(address)) {
-      return status.joined
-    }
-
-    if (isGroupAddress(address)) {
-      if (includeRequests && status.access === GroupAccess.Requested) {
-        return true
-      }
-
-      return status.access === GroupAccess.Granted
-    }
-
-    return false
-  }),
-)
-
-export const deriveGroupOptions = (defaultGroups = []) =>
-  derived([sessionWithMeta, userIsGroupMember], ([$sessionWithMeta, $userIsGroupMember]) => {
-    const options = []
-
-    for (const address of Object.keys($sessionWithMeta?.groups || {})) {
-      const group = groups.key(address).get()
-
-      if (group && $userIsGroupMember(address)) {
-        options.push(group)
-      }
-    }
-
-    for (const address of defaultGroups) {
-      options.push({address})
-    }
-
-    return uniqBy(prop("address"), options)
-  })
-
-export const getUserCircles = (sessionWithMeta: SessionWithMeta) => {
-  const $userIsGroupMember = userIsGroupMember.get()
-
-  return Object.entries(sessionWithMeta?.groups || {})
-    .filter(([a, s]) => !repository.deletes.has(a) && $userIsGroupMember(a))
-    .map(([a, s]) => a)
-}
-
-export const getUserGroups = (sessionWithMeta: SessionWithMeta) =>
-  getUserCircles(sessionWithMeta).filter(isGroupAddress)
-
-export const getUserCommunities = (sessionWithMeta: SessionWithMeta) =>
-  getUserCircles(sessionWithMeta).filter(isCommunityAddress)
-
-// Events
-
 export const isEventMuted = withGetter(
   derived(
-    [userMutes, userFollows, userSettings, pubkey, userIsGroupMember],
-    ([$userMutes, $userFollows, $userSettings, $pubkey, $userIsGroupMember]) => {
+    [userMutes, userFollows, userSettings, pubkey],
+    ([$userMutes, $userFollows, $userSettings, $pubkey]) => {
       const words = $userSettings.muted_words
       const minWot = $userSettings.min_wot_score
       const regex =
@@ -566,11 +358,9 @@ export const isEventMuted = withGetter(
 
         if (strict || $userFollows.has(e.pubkey)) return false
 
-        const addresses = getAddressTagValues(e.tags || []).filter(isContextAddress)
-        const wotAdjustment = addresses.some(a => $userIsGroupMember(a)) ? 1 : 0
         const wotScore = getUserWotScore(e.pubkey)
 
-        return wotScore < minWot - wotAdjustment
+        return wotScore < minWot
       }
     },
   ),
@@ -747,26 +537,6 @@ export const channelHasNewMessages = (channel: Channel) =>
 
 export const hasNewMessages = derived(channels, $channels => $channels.some(channelHasNewMessages))
 
-// Relay selection
-
-export const getGroupRelayUrls = address => {
-  const meta = groupMetaByAddress.get().get(address)
-
-  if (meta?.relays) {
-    return meta.relays.map(nth(1))
-  }
-
-  const latestKey = last(
-    sortBy(prop("created_at"), get(groupSharedKeys).filter(whereEq({group: address}))),
-  )
-
-  if (latestKey?.hints) {
-    return latestKey.hints
-  }
-
-  return get(groupHints)[address] || []
-}
-
 export const forceRelays = (relays: string[], forceRelays: string[]) =>
   forceRelays.length > 0 ? forceRelays : relays
 
diff --git a/src/util/store.ts b/src/util/store.ts
index 5f13e616f..36bb9a324 100644
--- a/src/util/store.ts
+++ b/src/util/store.ts
@@ -223,34 +223,6 @@ export class Key<T extends R> implements IReadable<T> {
   }
 }
 
-export class DerivedKey<T extends R> implements IReadable<T> {
-  readonly pk: string
-  readonly key: string
-  base: IReadable<M<T>>
-  store: IReadable<T>
-
-  constructor(base: IReadable<M<T>>, pk: string, key: string) {
-    if (!(base.get() instanceof Map)) {
-      throw new Error("`key` can only be used on map collections")
-    }
-
-    this.pk = pk
-    this.key = key
-    this.base = base
-    this.store = base.derived<T>(m => m.get(key) as T)
-  }
-
-  get = () => this.base.get().get(this.key) as T
-
-  subscribe = (f: Subscriber<T>) => this.store.subscribe(f)
-
-  derived = <U>(f: (v: T) => U) => this.store.derived<U>(f)
-
-  throttle = (t: number) => this.store.throttle(t)
-
-  exists = () => this.base.get().has(this.key)
-}
-
 export class Collection<T extends R> implements IReadable<T[]> {
   readonly pk: string
   readonly mapStore: Writable<M<T>>

From 344b07d5efbb14240422f8cd6c0fabfb3799eb2e Mon Sep 17 00:00:00 2001
From: Ticruz <thib.duchene@gmail.com>
Date: Mon, 4 Nov 2024 15:34:55 +0100
Subject: [PATCH 02/13] remove groupsummary too

---
 src/app/shared/NoteActions.svelte          |  1 -
 src/app/shared/NoteContent.svelte          |  6 ---
 src/app/shared/NoteContentKind34550.svelte |  8 ----
 src/app/shared/NoteContentKind35834.svelte |  8 ----
 src/app/shared/NoteMeta.svelte             | 50 ++++------------------
 5 files changed, 9 insertions(+), 64 deletions(-)
 delete mode 100644 src/app/shared/NoteContentKind34550.svelte
 delete mode 100644 src/app/shared/NoteContentKind35834.svelte

diff --git a/src/app/shared/NoteActions.svelte b/src/app/shared/NoteActions.svelte
index 71c5a6fed..3b7161f8b 100644
--- a/src/app/shared/NoteActions.svelte
+++ b/src/app/shared/NoteActions.svelte
@@ -49,7 +49,6 @@
   import PersonBadge from "src/app/shared/PersonBadge.svelte"
   import HandlerCard from "src/app/shared/HandlerCard.svelte"
   import RelayCard from "src/app/shared/RelayCard.svelte"
-  import GroupSummary from "src/app/shared/GroupSummary.svelte"
   import {router} from "src/app/util/router"
   import {
     env,
diff --git a/src/app/shared/NoteContent.svelte b/src/app/shared/NoteContent.svelte
index 3ddabdd63..eea2a77e6 100644
--- a/src/app/shared/NoteContent.svelte
+++ b/src/app/shared/NoteContent.svelte
@@ -20,8 +20,6 @@
   import NoteContentKind31890 from "src/app/shared/NoteContentKind31890.svelte"
   import NoteContentKind31923 from "src/app/shared/NoteContentKind31923.svelte"
   import NoteContentKind32123 from "src/app/shared/NoteContentKind32123.svelte"
-  import NoteContentKind34550 from "src/app/shared/NoteContentKind34550.svelte"
-  import NoteContentKind35834 from "src/app/shared/NoteContentKind35834.svelte"
   import NoteContentKindList from "src/app/shared/NoteContentKindList.svelte"
   import {getSetting, env} from "src/engine"
   import {CUSTOM_LIST_KINDS} from "src/domain"
@@ -84,10 +82,6 @@
     <NoteContentKind31923 {note} />
   {:else if note.kind === 32123}
     <NoteContentKind32123 {note} />
-  {:else if note.kind === 34550}
-    <NoteContentKind34550 {note} />
-  {:else if note.kind === 35834}
-    <NoteContentKind35834 {note} />
   {:else if CUSTOM_LIST_KINDS.includes(note.kind)}
     <NoteContentKindList {note} />
   {:else}
diff --git a/src/app/shared/NoteContentKind34550.svelte b/src/app/shared/NoteContentKind34550.svelte
deleted file mode 100644
index bb92a2d14..000000000
--- a/src/app/shared/NoteContentKind34550.svelte
+++ /dev/null
@@ -1,8 +0,0 @@
-<script lang="ts">
-  import {getAddress} from "@welshman/util"
-  import GroupSummary from "src/app/shared/GroupSummary.svelte"
-
-  export let note
-</script>
-
-<GroupSummary address={getAddress(note)} />
diff --git a/src/app/shared/NoteContentKind35834.svelte b/src/app/shared/NoteContentKind35834.svelte
deleted file mode 100644
index bb92a2d14..000000000
--- a/src/app/shared/NoteContentKind35834.svelte
+++ /dev/null
@@ -1,8 +0,0 @@
-<script lang="ts">
-  import {getAddress} from "@welshman/util"
-  import GroupSummary from "src/app/shared/GroupSummary.svelte"
-
-  export let note
-</script>
-
-<GroupSummary address={getAddress(note)} />
diff --git a/src/app/shared/NoteMeta.svelte b/src/app/shared/NoteMeta.svelte
index 69b7d44df..9a1179e4a 100644
--- a/src/app/shared/NoteMeta.svelte
+++ b/src/app/shared/NoteMeta.svelte
@@ -1,52 +1,20 @@
 <script lang="ts">
   import {uniq, pluck} from "ramda"
-  import {Tags} from "@welshman/util"
   import PersonLink from "src/app/shared/PersonLink.svelte"
-  import GroupLink from "src/app/shared/GroupLink.svelte"
   import type {DisplayEvent} from "src/engine"
 
   export let note: DisplayEvent
-  export let showGroup
 
   const reposts = note.reposts || []
   const repostPubkeys = uniq(pluck("pubkey", reposts))
-  const fromAddresses = Tags.fromEvent(note).context().values().valueOf()
-  const toAddresses = Tags.fromEvents(reposts).context().values().valueOf()
 </script>
 
-{#if repostPubkeys.length > 0}
-  <p class="flex items-center gap-1 pb-2 text-sm text-neutral-300">
-    <i class="fa fa-rotate" />
-    {#if showGroup}
-      Cross-posted
-    {:else}
-      Reposted
-    {/if}
-    {#if showGroup}
-      {#if fromAddresses.length === 1}
-        from <GroupLink address={fromAddresses[0]} />
-      {:else if fromAddresses.length > 1}
-        from {fromAddresses.length} groups
-      {/if}
-      {#if toAddresses.length === 1}
-        to <GroupLink address={toAddresses[0]} />
-      {:else if toAddresses.length > 1}
-        to {toAddresses.length} groups
-      {/if}
-    {/if}
-    by
-    {#if repostPubkeys.length === 1}
-      <PersonLink pubkey={repostPubkeys[0]} />
-    {:else}
-      {repostPubkeys.length} people
-    {/if}
-  </p>
-{:else if fromAddresses.length > 0 && showGroup}
-  <p class="pb-2 text-neutral-300">
-    {#if fromAddresses.length === 1}
-      Posted in <GroupLink address={fromAddresses[0]} />
-    {:else if fromAddresses.length > 1}
-      Posted in {fromAddresses.length} groups
-    {/if}
-  </p>
-{/if}
+<p class="flex items-center gap-1 pb-2 text-sm text-neutral-300">
+  <i class="fa fa-rotate" />
+  Reposted by
+  {#if repostPubkeys.length === 1}
+    <PersonLink pubkey={repostPubkeys[0]} />
+  {:else}
+    {repostPubkeys.length} people
+  {/if}
+</p>

From 807505924ec4bd533fa4326f6a5424823f520b32 Mon Sep 17 00:00:00 2001
From: Ticruz <thib.duchene@gmail.com>
Date: Mon, 4 Nov 2024 16:09:19 +0100
Subject: [PATCH 03/13] removing all groups leftovers

---
 src/app/shared/FeedFormFilters.svelte        | 14 ++-------
 src/app/shared/FeedFormSectionContext.svelte | 28 -----------------
 src/app/shared/NoteActions.svelte            |  3 +-
 src/app/state.ts                             |  4 ---
 src/app/views/Calendar.svelte                |  6 +---
 src/app/views/Feeds.svelte                   |  6 +---
 src/app/views/Notifications.svelte           |  3 --
 src/engine/requests.ts                       | 33 --------------------
 src/engine/state.ts                          |  5 ---
 9 files changed, 6 insertions(+), 96 deletions(-)
 delete mode 100644 src/app/shared/FeedFormSectionContext.svelte

diff --git a/src/app/shared/FeedFormFilters.svelte b/src/app/shared/FeedFormFilters.svelte
index 310873cca..a7cb36db5 100644
--- a/src/app/shared/FeedFormFilters.svelte
+++ b/src/app/shared/FeedFormFilters.svelte
@@ -27,14 +27,13 @@
   import FeedFormSectionPeople from "src/app/shared/FeedFormSectionPeople.svelte"
   import FeedFormSectionRelays from "src/app/shared/FeedFormSectionRelays.svelte"
   import FeedFormSectionTopics from "src/app/shared/FeedFormSectionTopics.svelte"
-  import FeedFormSectionContext from "src/app/shared/FeedFormSectionContext.svelte"
   import FeedFormSectionMentions from "src/app/shared/FeedFormSectionMentions.svelte"
   import FeedFormSectionKinds from "src/app/shared/FeedFormSectionKinds.svelte"
   import FeedFormSectionCreatedAt from "src/app/shared/FeedFormSectionCreatedAt.svelte"
   import FeedFormSectionList from "src/app/shared/FeedFormSectionList.svelte"
   import FeedFormSectionDVM from "src/app/shared/FeedFormSectionDVM.svelte"
   import FeedFormSaveAsList from "src/app/shared/FeedFormSaveAsList.svelte"
-  import {isTopicFeed, isPeopleFeed, isMentionFeed, isContextFeed} from "src/domain"
+  import {isTopicFeed, isPeopleFeed, isMentionFeed} from "src/domain"
 
   export let feed
   export let onChange
@@ -58,7 +57,6 @@
   $: subFeeds = getFeedArgs(feed)
   $: hasTopics = subFeeds.some(isTopicFeed)
   $: hasMentions = subFeeds.some(isMentionFeed)
-  $: hasContext = subFeeds.some(isContextFeed)
   $: hasPeople = subFeeds.some(isPeopleFeed)
   $: hasRelays = subFeeds.some(isRelayFeed)
   $: hasKinds = subFeeds.some(isKindFeed)
@@ -75,8 +73,7 @@
       isAuthorFeed(subFeed) ||
       isRelayFeed(subFeed) ||
       isTopicFeed(subFeed) ||
-      isMentionFeed(subFeed) ||
-      isContextFeed(subFeed)}
+      isMentionFeed(subFeed)}
     {#if canSave || !isGlobalFeed(subFeed)}
       <Card class="relative">
         <FlexColumn>
@@ -89,8 +86,6 @@
               <FeedFormSectionTopics feed={subFeed} onChange={change} />
             {:else if isMentionFeed(subFeed)}
               <FeedFormSectionMentions feed={subFeed} onChange={change} />
-            {:else if isContextFeed(subFeed)}
-              <FeedFormSectionContext feed={subFeed} onChange={change} />
             {:else if isKindFeed(subFeed)}
               <FeedFormSectionKinds feed={subFeed} onChange={change} />
             {:else if isCreatedAtFeed(subFeed)}
@@ -120,7 +115,7 @@
   {/each}
 {/key}
 
-{#if !hasTopics || !hasMentions || !hasContext || !hasPeople || !hasRelays || !hasKinds || !hasCreatedAt || !hasDVM || !hasList}
+{#if !hasTopics || !hasMentions || !hasPeople || !hasRelays || !hasKinds || !hasCreatedAt || !hasDVM || !hasList}
   <div class="relative">
     {#if menuIsOpen}
       <Popover2 hideOnClick onClose={closeMenu} position="top">
@@ -131,9 +126,6 @@
           {#if !hasMentions}
             <MenuItem on:click={() => addFeed(makeTagFeed("#p"))}>Mentions</MenuItem>
           {/if}
-          {#if !hasContext}
-            <MenuItem on:click={() => addFeed(makeTagFeed("#a"))}>Groups</MenuItem>
-          {/if}
           {#if !hasPeople}
             <MenuItem on:click={() => addFeed(makeAuthorFeed())}>Authors</MenuItem>
           {/if}
diff --git a/src/app/shared/FeedFormSectionContext.svelte b/src/app/shared/FeedFormSectionContext.svelte
deleted file mode 100644
index 5a0424c10..000000000
--- a/src/app/shared/FeedFormSectionContext.svelte
+++ /dev/null
@@ -1,28 +0,0 @@
-<script lang="ts">
-  import {FeedType} from "@welshman/feeds"
-  import Anchor from "src/partials/Anchor.svelte"
-  import SearchSelect from "src/partials/SearchSelect.svelte"
-  import GroupName from "src/app/shared/GroupName.svelte"
-  import {groupMetaSearch} from "src/engine"
-  import {router} from "src/app/util/router"
-
-  export let feed
-  export let onChange
-</script>
-
-<span class="staatliches text-lg">Which groups would you like to see?</span>
-<SearchSelect
-  multiple
-  value={feed.slice(2)}
-  search={$groupMetaSearch.searchValues}
-  onChange={addresses => onChange([FeedType.Tag, "#a", ...addresses])}>
-  <span slot="item" let:item let:context>
-    {#if context === "value"}
-      <Anchor modal href={router.at("groups").of(item).toString()}>
-        {$groupMetaSearch.displayValue(item)}
-      </Anchor>
-    {:else}
-      <GroupName address={item} />
-    {/if}
-  </span>
-</SearchSelect>
diff --git a/src/app/shared/NoteActions.svelte b/src/app/shared/NoteActions.svelte
index 3b7161f8b..66c912d4b 100644
--- a/src/app/shared/NoteActions.svelte
+++ b/src/app/shared/NoteActions.svelte
@@ -54,7 +54,6 @@
     env,
     publish,
     deriveHandlersForKind,
-    groupMeta,
     signAndPublish,
     deleteEvent,
     getSetting,
@@ -222,7 +221,7 @@
     if ($signer) {
       actions.push({label: "Quote", icon: "quote-left", onClick: quote})
 
-      if (isSignedEvent(note) && !env.FORCE_GROUP && ($groupOptions.length > 0 || address)) {
+      if (isSignedEvent(note)) {
         actions.push({label: "Cross-post", icon: "shuffle", onClick: () => setView("cross-post")})
       }
 
diff --git a/src/app/state.ts b/src/app/state.ts
index 52f4bc962..44a0de590 100644
--- a/src/app/state.ts
+++ b/src/app/state.ts
@@ -20,7 +20,6 @@ import {
   load,
   loadPubkeys,
   loadSeen,
-  loadGroups,
   loadDeletes,
   loadHandlers,
   loadMessages,
@@ -51,9 +50,6 @@ export const slowConnections = writable([])
 
 export const loadAppData = () => {
   // If we have a group, load that
-  if (env.FORCE_GROUP) {
-    loadGroups([env.FORCE_GROUP])
-  }
 }
 
 export const loadUserData = async (hints: string[] = []) => {
diff --git a/src/app/views/Calendar.svelte b/src/app/views/Calendar.svelte
index 2d1caeae5..5cdc12a90 100644
--- a/src/app/views/Calendar.svelte
+++ b/src/app/views/Calendar.svelte
@@ -2,15 +2,11 @@
   import {identity} from "ramda"
   import {pubkey} from "@welshman/app"
   import Calendar from "src/app/shared/Calendar.svelte"
-  import {env, loadCircleMessages, userFollows} from "src/engine"
+  import {env, userFollows} from "src/engine"
 
   const filter = env.FORCE_GROUP
     ? {kinds: [31923], "#a": [env.FORCE_GROUP]}
     : {kinds: [31923], authors: [$pubkey, ...$userFollows].filter(identity)}
-
-  if (env.FORCE_GROUP) {
-    loadCircleMessages([env.FORCE_GROUP])
-  }
 </script>
 
 <Calendar {filter} />
diff --git a/src/app/views/Feeds.svelte b/src/app/views/Feeds.svelte
index d73d48c57..081431c67 100644
--- a/src/app/views/Feeds.svelte
+++ b/src/app/views/Feeds.svelte
@@ -5,7 +5,7 @@
   import Feed from "src/app/shared/Feed.svelte"
   import {router} from "src/app/util/router"
   import {makeFeed} from "src/domain"
-  import {env, loadCircleMessages} from "src/engine"
+  import {env} from "src/engine"
 
   export let feed = null
 
@@ -19,10 +19,6 @@
     feed = makeFeed({definition: makeScopeFeed(Scope.Follows)})
   }
 
-  if (env.FORCE_GROUP) {
-    loadCircleMessages([env.FORCE_GROUP])
-  }
-
   document.title = "Feeds"
 </script>
 
diff --git a/src/app/views/Notifications.svelte b/src/app/views/Notifications.svelte
index a6fecc20a..63c6e6799 100644
--- a/src/app/views/Notifications.svelte
+++ b/src/app/views/Notifications.svelte
@@ -8,9 +8,7 @@
   import {router} from "src/app/util/router"
   import {
     sessionWithMeta,
-    userSettings,
     loadNotifications,
-    loadCircleMessages,
     unreadMainNotifications,
     unreadReactionNotifications,
   } from "src/engine"
@@ -33,7 +31,6 @@
 
   onMount(() => {
     loadNotifications()
-    loadCircleMessages()
 
     const scroller = createScroller(loadMore, {element})
 
diff --git a/src/engine/requests.ts b/src/engine/requests.ts
index 3955d8412..0854dbfc6 100644
--- a/src/engine/requests.ts
+++ b/src/engine/requests.ts
@@ -62,12 +62,9 @@ import {partition, uniq, without} from "ramda"
 import {CUSTOM_LIST_KINDS} from "src/domain"
 import {
   env,
-  getUserCircles,
   load,
   subscribePersistent,
   sessionWithMeta,
-  groupAdminKeys,
-  groupSharedKeys,
   type MySubscribeRequest,
 } from "src/engine/state"
 
@@ -151,36 +148,6 @@ export const getStaleAddrs = (addrs: string[]) => {
   return Array.from(stale)
 }
 
-export const loadGroupMessages = async (addrs: string[]) => {
-  for (const address of addrs) {
-    const keys = [...groupAdminKeys.get(), ...groupSharedKeys.get()]
-    const pubkeys = keys.filter(k => k.group === address).map(k => k.pubkey)
-
-    await pullConservatively({
-      relays: ctx.app.router.WithinContext(address).getUrls(),
-      filters: [{kinds: [WRAP], "#p": pubkeys}],
-    })
-  }
-}
-
-export const loadCommunityMessages = async (addrs: string[]) => {
-  await pullConservatively({
-    relays: ctx.app.router.WithinMultipleContexts(addrs).getUrls(),
-    filters: [{kinds: [...noteKinds, ...repostKinds], "#a": addrs}],
-  })
-}
-
-export const loadCircleMessages = async (addrs?: string[]) => {
-  if (!addrs) {
-    addrs = getUserCircles(sessionWithMeta.get())
-  }
-
-  const [groups, communities] = partition(isGroupAddress, addrs)
-
-  loadGroupMessages(groups)
-  loadCommunityMessages(communities)
-}
-
 export const loadEvent = async (idOrAddress: string, request: Partial<MySubscribeRequest> = {}) =>
   first(
     await load({
diff --git a/src/engine/state.ts b/src/engine/state.ts
index e7eea901e..823b09bfa 100644
--- a/src/engine/state.ts
+++ b/src/engine/state.ts
@@ -1149,11 +1149,6 @@ if (!db) {
     }),
     plaintext: storageAdapters.fromObjectStore(plaintext, {throttle: 1000}),
     repository: storageAdapters.fromRepository(repository, {throttle: 300, migrate: migrateEvents}),
-    groups: {keyPath: "address", store: groups},
-    groupAlerts: {keyPath: "id", store: groupAlerts},
-    groupRequests: {keyPath: "id", store: groupRequests},
-    groupSharedKeys: {keyPath: "pubkey", store: groupSharedKeys},
-    groupAdminKeys: {keyPath: "pubkey", store: groupAdminKeys},
   }).then(() => Promise.all(initialRelays.map(loadRelay)))
 }
 

From 1275a57139b3428602b4bd970a65d79240c2ff90 Mon Sep 17 00:00:00 2001
From: Ticruz <thib.duchene@gmail.com>
Date: Tue, 5 Nov 2024 13:42:29 +0100
Subject: [PATCH 04/13] 0 repost noshow

---
 src/app/shared/NoteMeta.svelte | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/app/shared/NoteMeta.svelte b/src/app/shared/NoteMeta.svelte
index 9a1179e4a..0fc145f4c 100644
--- a/src/app/shared/NoteMeta.svelte
+++ b/src/app/shared/NoteMeta.svelte
@@ -9,12 +9,14 @@
   const repostPubkeys = uniq(pluck("pubkey", reposts))
 </script>
 
-<p class="flex items-center gap-1 pb-2 text-sm text-neutral-300">
-  <i class="fa fa-rotate" />
-  Reposted by
-  {#if repostPubkeys.length === 1}
-    <PersonLink pubkey={repostPubkeys[0]} />
-  {:else}
-    {repostPubkeys.length} people
-  {/if}
-</p>
+{#if repostPubkeys.length > 0}
+  <p class="flex items-center gap-1 pb-2 text-sm text-neutral-300">
+    <i class="fa fa-rotate" />
+    Reposted by
+    {#if repostPubkeys.length === 1}
+      <PersonLink pubkey={repostPubkeys[0]} />
+    {:else}
+      {repostPubkeys.length} people
+    {/if}
+  </p>
+{/if}

From c04b3c94ffcfdc1d1460c765490e73955a13184a Mon Sep 17 00:00:00 2001
From: Ticruz <thib.duchene@gmail.com>
Date: Tue, 5 Nov 2024 13:43:17 +0100
Subject: [PATCH 05/13] remove cross-post

---
 src/app/shared/NoteActions.svelte | 47 ++-----------------------------
 1 file changed, 2 insertions(+), 45 deletions(-)

diff --git a/src/app/shared/NoteActions.svelte b/src/app/shared/NoteActions.svelte
index 66c912d4b..ca0e7264d 100644
--- a/src/app/shared/NoteActions.svelte
+++ b/src/app/shared/NoteActions.svelte
@@ -68,14 +68,11 @@
   export let replyCtrl
   export let showHidden
   export let addToContext
-  export let contextAddress
   export let removeFromContext
   export let replies, likes, zaps
   export let zapper
 
   const signedEvent = asSignedEvent(note as any)
-  const address = contextAddress || first(getContextTagValues(note.tags))
-  const addresses = [address].filter(identity)
   const nevent = nip19.neventEncode({
     id: note.id,
     kind: note.kind,
@@ -112,7 +109,7 @@
 
   const createLabel = () => router.at("notes").of(note.id).at("label").open()
 
-  const quote = () => router.at("notes/create").cx({quote: note, group: address}).open()
+  const quote = () => router.at("notes/create").cx({quote: note}).open()
 
   const report = () => router.at("notes").of(note.id).at("report").open()
 
@@ -135,24 +132,6 @@
     removeFromContext(e)
   }
 
-  const crossPost = async () => {
-    const content = JSON.stringify(note as SignedEvent)
-    const tags = [...tagEvent(note), tagPubkey(note.pubkey), ...getClientTags()]
-
-    let template
-    if (note.kind === 1) {
-      template = createEvent(6, {content, tags})
-    } else {
-      template = createEvent(16, {content, tags: [...tags, ["k", String(note.kind)]]})
-    }
-
-    signAndPublish(template)
-
-    showInfo("Note has been cross-posted!")
-
-    setView(null)
-  }
-
   const startZap = () => {
     const zapTags = note.tags.filter(nthEq(0, "zap"))
     const defaultSplit = tagZapSplit(note.pubkey)
@@ -199,7 +178,7 @@
   let actions = []
   let handlersShown = false
 
-  $: disableActions = !$signer || (muted && !showHidden) || (note.wrap && address)
+  $: disableActions = !$signer || (muted && !showHidden)
   $: like = likes.find(e => e.pubkey === $sessionWithMeta?.pubkey)
   $: $likesCount = likes.length
   $: zap = zaps.find(e => e.request.pubkey === $sessionWithMeta?.pubkey)
@@ -221,10 +200,6 @@
     if ($signer) {
       actions.push({label: "Quote", icon: "quote-left", onClick: quote})
 
-      if (isSignedEvent(note)) {
-        actions.push({label: "Cross-post", icon: "shuffle", onClick: () => setView("cross-post")})
-      }
-
       actions.push({label: "Tag", icon: "tag", onClick: createLabel})
 
       if (muted) {
@@ -431,24 +406,6 @@
       <CopyValue label="Link" value={toNostrURI(nevent)} />
       <CopyValue label="Event ID" encode={nip19.noteEncode} value={note.id} />
       <CopyValue label="Event JSON" value={JSON.stringify(signedEvent)} />
-    {:else if view === "cross-post"}
-      <div class="mb-4 flex items-center justify-center">
-        <Heading>Cross-post</Heading>
-      </div>
-      <div>Select where you'd like to post to:</div>
-      <div class="flex flex-col gap-2">
-        {#if address}
-          <Card invertColors interactive on:click={() => crossPost()}>
-            <div class="flex gap-4 text-neutral-100">
-              <i class="fa fa-earth-asia fa-2x" />
-              <div class="flex min-w-0 flex-grow flex-col gap-4">
-                <p class="text-2xl">Global</p>
-                <p>Post to your main feed.</p>
-              </div>
-            </div>
-          </Card>
-        {/if}
-      </div>
     {/if}
   </Modal>
 {/if}

From 718db8387c621cca0f8ed2327d08a93dfe740deb Mon Sep 17 00:00:00 2001
From: Ticruz <thib.duchene@gmail.com>
Date: Tue, 5 Nov 2024 13:46:15 +0100
Subject: [PATCH 06/13] remove groups in note options

---
 src/app/shared/NoteOptions.svelte | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/shared/NoteOptions.svelte b/src/app/shared/NoteOptions.svelte
index 0da7c33b8..fbf19e31b 100644
--- a/src/app/shared/NoteOptions.svelte
+++ b/src/app/shared/NoteOptions.svelte
@@ -14,14 +14,14 @@
     anonymous: boolean
   }
 
-  let values = {groups: [], ...initialValues}
+  let values = initialValues
   let view = null
 
   const dispatch = createEventDispatcher()
 
   export const setView = name => {
     view = name
-    values = {groups: [], ...initialValues}
+    values = initialValues
   }
 
   const onSubmit = () => {

From 9c0c802bb7c99f1fe7df5550966d1c749e083397 Mon Sep 17 00:00:00 2001
From: Ticruz <thib.duchene@gmail.com>
Date: Tue, 5 Nov 2024 14:17:43 +0100
Subject: [PATCH 07/13] pub return only in signAndPublish

---
 src/app/shared/NoteActions.svelte      |  6 +++---
 src/app/shared/NoteCreateInline.svelte |  2 +-
 src/app/shared/NoteReply.svelte        | 11 +++--------
 src/app/views/NoteCreate.svelte        |  2 +-
 src/engine/commands.ts                 |  4 +---
 5 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/src/app/shared/NoteActions.svelte b/src/app/shared/NoteActions.svelte
index ca0e7264d..d2fa2ea01 100644
--- a/src/app/shared/NoteActions.svelte
+++ b/src/app/shared/NoteActions.svelte
@@ -122,9 +122,9 @@
 
     const tags = [...tagReactionTo(note), ...getClientTags()]
     const template = createEvent(7, {content, tags})
-    const {event} = await signAndPublish(template)
+    const pub = await signAndPublish(template)
 
-    addToContext(event)
+    addToContext(pub.request.event)
   }
 
   const deleteReaction = e => {
@@ -211,7 +211,7 @@
       actions.push({label: "Report", icon: "triangle-exclamation", onClick: report})
     }
 
-    if (!env.FORCE_GROUP && env.PLATFORM_RELAYS.length === 0 && isSignedEvent(note)) {
+    if (env.PLATFORM_RELAYS.length === 0 && isSignedEvent(note)) {
       actions.push({label: "Broadcast", icon: "rss", onClick: broadcast})
     }
 
diff --git a/src/app/shared/NoteCreateInline.svelte b/src/app/shared/NoteCreateInline.svelte
index 839dde2a9..92186162e 100644
--- a/src/app/shared/NoteCreateInline.svelte
+++ b/src/app/shared/NoteCreateInline.svelte
@@ -65,7 +65,7 @@
     }
 
     const template = createEvent(1, {content, tags})
-    const {pub} = await signAndPublish(template, opts)
+    const pub = await signAndPublish(template, opts)
 
     showPublishInfo(pub)
     opts = {...defaultOpts}
diff --git a/src/app/shared/NoteReply.svelte b/src/app/shared/NoteReply.svelte
index 8fe8db3e4..cb9e67b03 100644
--- a/src/app/shared/NoteReply.svelte
+++ b/src/app/shared/NoteReply.svelte
@@ -19,7 +19,6 @@
 
   export let parent
   export let addToContext
-  export let contextAddress = false
   export let showBorder = false
   export let forceOpen = false
 
@@ -109,12 +108,12 @@
     loading = true
 
     const template = createEvent(1, {content, tags})
-    const {pub, event} = await signAndPublish(template, opts)
+    const pub = await signAndPublish(template, opts)
 
     loading = false
 
     // Only track one event/pub to avoid apprent duplicates
-    addToContext(event)
+    addToContext(pub.request.event)
     showPublishInfo(pub)
     clearDraft()
     reset()
@@ -194,11 +193,7 @@
 {/if}
 
 {#if !env.FORCE_GROUP}
-  <NoteOptions
-    bind:this={options}
-    on:change={setOpts}
-    initialValues={opts}
-    hideFields={["groups"]} />
+  <NoteOptions bind:this={options} on:change={setOpts} initialValues={opts} />
 {/if}
 
 {#if $nsecWarning}
diff --git a/src/app/views/NoteCreate.svelte b/src/app/views/NoteCreate.svelte
index 75a221176..6b0d175cd 100644
--- a/src/app/views/NoteCreate.svelte
+++ b/src/app/views/NoteCreate.svelte
@@ -143,7 +143,7 @@
         }),
     })
 
-    const {pub} = await signAndPublish(template, opts)
+    const pub = await signAndPublish(template, opts)
 
     showPublishInfo(pub)
     router.clearModals()
diff --git a/src/engine/commands.ts b/src/engine/commands.ts
index a7fa0bc77..a667ac7fe 100644
--- a/src/engine/commands.ts
+++ b/src/engine/commands.ts
@@ -207,9 +207,7 @@ export const signAndPublish = async (template, {anonymous = false} = {}) => {
   const event = await sign(template, {anonymous})
   const relays = ctx.app.router.PublishEvent(event).getUrls()
 
-  const pub = await publish({event, relays})
-
-  return {event, pub}
+  return await publish({event, relays})
 }
 
 // Deletes

From 76e1b97906b7f2c2a4fe46a61aca263ecf82fd6f Mon Sep 17 00:00:00 2001
From: Ticruz <thib.duchene@gmail.com>
Date: Tue, 5 Nov 2024 14:20:10 +0100
Subject: [PATCH 08/13] remove FORCE_GROUP env variable

---
 src/app/MenuDesktop.svelte        | 6 ++----
 src/app/MenuMobile.svelte         | 2 +-
 src/app/Nav.svelte                | 4 ----
 src/app/shared/Feed.svelte        | 3 ---
 src/app/shared/Note.svelte        | 6 +-----
 src/app/shared/NoteReply.svelte   | 8 ++------
 src/app/views/Calendar.svelte     | 6 ++----
 src/app/views/UserSettings.svelte | 2 +-
 src/engine/state.ts               | 5 +++--
 9 files changed, 12 insertions(+), 30 deletions(-)

diff --git a/src/app/MenuDesktop.svelte b/src/app/MenuDesktop.svelte
index 7f38fd05e..c2d1503ae 100644
--- a/src/app/MenuDesktop.svelte
+++ b/src/app/MenuDesktop.svelte
@@ -77,7 +77,7 @@
         : import.meta.env.VITE_APP_WORDMARK_LIGHT} />
   </Anchor>
   <MenuDesktopItem path="/notes" isActive={isFeedPage || isListPage}>Feeds</MenuDesktopItem>
-  {#if !env.FORCE_GROUP && env.PLATFORM_RELAYS.length === 0}
+  {#if env.PLATFORM_RELAYS.length === 0}
     <MenuDesktopItem path="/settings/relays" isActive={$page?.path.startsWith("/settings/relays")}>
       <div class="relative inline-block">
         Relays
@@ -109,9 +109,7 @@
       {/if}
     </div>
   </MenuDesktopItem>
-  <MenuDesktopItem modal path="/groups">
-    Groups
-  </MenuDesktopItem>
+  <MenuDesktopItem modal path="/groups">Groups</MenuDesktopItem>
   <FlexColumn small class="absolute bottom-0 w-72">
     <Anchor
       class="staatliches px-8 text-tinted-400 hover:text-tinted-100"
diff --git a/src/app/MenuMobile.svelte b/src/app/MenuMobile.svelte
index ad114a484..b83cc225d 100644
--- a/src/app/MenuMobile.svelte
+++ b/src/app/MenuMobile.svelte
@@ -68,7 +68,7 @@
       <MenuMobileItem stopPropagation on:click={openSettings}>
         <i class="fa fa-cog" /> Settings
       </MenuMobileItem>
-      {#if !env.FORCE_GROUP && env.PLATFORM_RELAYS.length === 0}
+      {#if env.PLATFORM_RELAYS.length === 0}
         <MenuMobileItem href="/settings/relays" on:click={closeMenu}>
           <i class="fa fa-server" />
           <div class="relative inline-block">
diff --git a/src/app/Nav.svelte b/src/app/Nav.svelte
index 02b5691ce..bb3f201eb 100644
--- a/src/app/Nav.svelte
+++ b/src/app/Nav.svelte
@@ -40,10 +40,6 @@
       params.pubkey = props.pubkey
     }
 
-    if (env.FORCE_GROUP) {
-      params.group = env.FORCE_GROUP
-    }
-
     router.at("notes/create").qp(params).open()
   }
 </script>
diff --git a/src/app/shared/Feed.svelte b/src/app/shared/Feed.svelte
index 63030804d..7a6ebb58c 100644
--- a/src/app/shared/Feed.svelte
+++ b/src/app/shared/Feed.svelte
@@ -18,7 +18,6 @@
   export let feed: Feed
   export let anchor = null
   export let eager = false
-  export let contextAddress = null
   export let skipNetwork = false
   export let forcePlatform = true
   export let shouldListen = false
@@ -102,8 +101,6 @@
       <Note
         filters={loader.getFilters() || [{ids: []}]}
         depth={$shouldHideReplies ? 0 : 2}
-        {contextAddress}
-        {showGroup}
         {anchor}
         {note} />
     </div>
diff --git a/src/app/shared/Note.svelte b/src/app/shared/Note.svelte
index beea5ac06..c18603fa1 100644
--- a/src/app/shared/Note.svelte
+++ b/src/app/shared/Note.svelte
@@ -52,9 +52,7 @@
   export let showParent = true
   export let showLoading = false
   export let showHidden = false
-  export let showGroup = false
   export let showMedia = getSetting("show_media")
-  export let contextAddress = null
 
   let ready = false
   let event = note
@@ -213,7 +211,7 @@
   {@const showReply = reply && !ancestors.replies.includes(anchor) && showParent}
   {@const showRoot = root && !ancestors.roots.includes(anchor) && root !== reply && showParent}
   <div>
-    <NoteMeta note={event} {showGroup} />
+    <NoteMeta note={event} />
     <div class="note relative">
       {#if !showParent && !topLevel}
         <AltColor let:isAlt>
@@ -290,7 +288,6 @@
                 zapper={$zapper}
                 bind:this={actions}
                 {removeFromContext}
-                {contextAddress}
                 {addToContext}
                 {replyCtrl}
                 {showHidden}
@@ -330,7 +327,6 @@
 
       <NoteReply
         {addToContext}
-        {contextAddress}
         parent={event}
         showBorder={visibleReplies.length > 0}
         bind:this={replyCtrl}
diff --git a/src/app/shared/NoteReply.svelte b/src/app/shared/NoteReply.svelte
index cb9e67b03..3a517aa87 100644
--- a/src/app/shared/NoteReply.svelte
+++ b/src/app/shared/NoteReply.svelte
@@ -170,9 +170,7 @@
               <ImageInput multi hostLimit={3} on:change={e => images.addImage(e.detail)}>
                 <i slot="button" class="fa fa-paperclip" />
               </ImageInput>
-              {#if !env.FORCE_GROUP}
-                <i class="fa fa-cog" on:click={() => options.setView("settings")} />
-              {/if}
+              <i class="fa fa-cog" on:click={() => options.setView("settings")} />
               <i class="fa fa-at" />
             </div>
           </div>
@@ -192,9 +190,7 @@
   </div>
 {/if}
 
-{#if !env.FORCE_GROUP}
-  <NoteOptions bind:this={options} on:change={setOpts} initialValues={opts} />
-{/if}
+<NoteOptions bind:this={options} on:change={setOpts} initialValues={opts} />
 
 {#if $nsecWarning}
   <NsecWarning onAbort={() => nsecWarning.set(null)} onBypass={bypassNsecWarning} />
diff --git a/src/app/views/Calendar.svelte b/src/app/views/Calendar.svelte
index 5cdc12a90..d231d4102 100644
--- a/src/app/views/Calendar.svelte
+++ b/src/app/views/Calendar.svelte
@@ -2,11 +2,9 @@
   import {identity} from "ramda"
   import {pubkey} from "@welshman/app"
   import Calendar from "src/app/shared/Calendar.svelte"
-  import {env, userFollows} from "src/engine"
+  import {userFollows} from "src/engine"
 
-  const filter = env.FORCE_GROUP
-    ? {kinds: [31923], "#a": [env.FORCE_GROUP]}
-    : {kinds: [31923], authors: [$pubkey, ...$userFollows].filter(identity)}
+  const filter = {kinds: [31923], authors: [$pubkey, ...$userFollows].filter(identity)}
 </script>
 
 <Calendar {filter} />
diff --git a/src/app/views/UserSettings.svelte b/src/app/views/UserSettings.svelte
index ad2f08b40..178fa6385 100644
--- a/src/app/views/UserSettings.svelte
+++ b/src/app/views/UserSettings.svelte
@@ -66,7 +66,7 @@
         faster, but will require more bandwidth and processing power.
       </p>
     </Field>
-    {#if !env.FORCE_GROUP && env.PLATFORM_RELAYS.length === 0}
+    {#if env.PLATFORM_RELAYS.length === 0}
       <FieldInline label="Authenticate with relays">
         <Toggle bind:value={values.auto_authenticate} />
         <p slot="info">
diff --git a/src/engine/state.ts b/src/engine/state.ts
index 823b09bfa..2f7d8a657 100644
--- a/src/engine/state.ts
+++ b/src/engine/state.ts
@@ -92,6 +92,7 @@ import {
   getListTags,
   getPubkeyTagValues,
   getTagValues,
+  isGroupAddress,
   isHashedEvent,
   makeList,
   normalizeRelayUrl,
@@ -133,7 +134,6 @@ export const env = {
   ENABLE_MARKET: JSON.parse(import.meta.env.VITE_ENABLE_MARKET) as boolean,
   ENABLE_ZAPS: JSON.parse(import.meta.env.VITE_ENABLE_ZAPS) as boolean,
   BLUR_CONTENT: JSON.parse(import.meta.env.VITE_BLUR_CONTENT) as boolean,
-  FORCE_GROUP: import.meta.env.VITE_FORCE_GROUP as string,
   IMGPROXY_URL: import.meta.env.VITE_IMGPROXY_URL as string,
   MULTIPLEXTR_URL: import.meta.env.VITE_MULTIPLEXTR_URL as string,
   NIP96_URLS: fromCsv(import.meta.env.VITE_NIP96_URLS) as string[],
@@ -1089,6 +1089,8 @@ const migrateEvents = (events: TrustedEvent[]) => {
   if (events.length < 50_000) {
     return events
   }
+  // filter out all event posted to encrypted group
+  events = events.filter(e => !e.wrap?.tags.some(t => isGroupAddress(t[1])))
 
   const scoreEvent = getScoreEvent()
 
@@ -1114,7 +1116,6 @@ if (!db) {
       signEvent: (event: StampedEvent) => {
         if (
           event.kind === CLIENT_AUTH &&
-          !env.FORCE_GROUP &&
           env.PLATFORM_RELAYS.length === 0 &&
           !getSetting("auto_authenticate")
         ) {

From db6946ca47faf1f51885a5492ebf343cf6392870 Mon Sep 17 00:00:00 2001
From: Ticruz <thib.duchene@gmail.com>
Date: Tue, 5 Nov 2024 14:55:05 +0100
Subject: [PATCH 09/13] remove all group command and utilities

---
 src/app/App.svelte                       |   5 +-
 src/app/shared/Feed.svelte               |   1 -
 src/app/shared/FeedFormSaveAsList.svelte |   4 +-
 src/app/shared/NoteContentQuote.svelte   |  29 +++----
 src/app/state.ts                         |   4 -
 src/app/util/feeds.ts                    |  16 +---
 src/app/util/router.ts                   |   1 -
 src/app/views/EventEdit.svelte           |   1 -
 src/app/views/Feeds.svelte               |   2 +-
 src/app/views/InviteCreate.svelte        |   2 +-
 src/app/views/NoteDetail.svelte          |   2 +-
 src/app/views/Onboarding.svelte          |   6 +-
 src/app/views/UserKeys.svelte            | 106 +----------------------
 src/engine/requests.ts                   |  34 +-------
 src/engine/state.ts                      |   8 --
 src/engine/utils/events.ts               |   8 --
 16 files changed, 23 insertions(+), 206 deletions(-)

diff --git a/src/app/App.svelte b/src/app/App.svelte
index dfe54038d..6a60b8be7 100644
--- a/src/app/App.svelte
+++ b/src/app/App.svelte
@@ -13,7 +13,7 @@
   import {ready} from "src/engine"
   import * as engine from "src/engine"
   import * as domain from "src/domain"
-  import {loadAppData, slowConnections, loadUserData} from "src/app/state"
+  import {slowConnections, loadUserData} from "src/app/state"
   import {themeVariables, appName} from "src/partials/state"
   import Toast from "src/partials/Toast.svelte"
   import Menu from "src/app/Menu.svelte"
@@ -195,7 +195,6 @@
     requireSigner: true,
     serializers: {
       pubkey: asPerson,
-      group: asNaddr("group"),
       type: asString("type"),
     },
   })
@@ -432,8 +431,6 @@
     // before loading app data
     await lib.sleep(350)
 
-    loadAppData()
-
     if ($session) {
       loadUserData()
     }
diff --git a/src/app/shared/Feed.svelte b/src/app/shared/Feed.svelte
index 7a6ebb58c..aa42175bf 100644
--- a/src/app/shared/Feed.svelte
+++ b/src/app/shared/Feed.svelte
@@ -24,7 +24,6 @@
   export let showControls = false
   export let hideSpinner = false
   export let includeReposts = false
-  export let showGroup = false
   export let onEvent = null
 
   const splits = [["zap", env.PLATFORM_PUBKEY, "", "1"]]
diff --git a/src/app/shared/FeedFormSaveAsList.svelte b/src/app/shared/FeedFormSaveAsList.svelte
index 4495fa9a4..23f030b25 100644
--- a/src/app/shared/FeedFormSaveAsList.svelte
+++ b/src/app/shared/FeedFormSaveAsList.svelte
@@ -12,7 +12,7 @@
   import Anchor from "src/partials/Anchor.svelte"
   import Popover2 from "src/partials/Popover2.svelte"
   import ListForm from "src/app/shared/ListForm.svelte"
-  import {makeUserList, isTopicFeed, isMentionFeed, isContextFeed} from "src/domain"
+  import {makeUserList, isTopicFeed, isMentionFeed} from "src/domain"
 
   export let feed
   export let onChange
@@ -36,8 +36,6 @@
       return makeUserList({kind: NAMED_PEOPLE, tags: feed.slice(1).map(tagPubkey)})
     } else if (isMentionFeed(feed)) {
       return makeUserList({kind: NAMED_PEOPLE, tags: feed.slice(2).map(tagPubkey)})
-    } else if (isContextFeed(feed)) {
-      return makeUserList({kind: NAMED_COMMUNITIES, tags: feed.slice(2).map(a => ["a", a])})
     } else if (isRelayFeed(feed)) {
       return makeUserList({kind: NAMED_RELAYS, tags: feed.slice(1).map(url => ["r", url])})
     } else if (isTopicFeed(feed)) {
diff --git a/src/app/shared/NoteContentQuote.svelte b/src/app/shared/NoteContentQuote.svelte
index 69cf610c4..d862f8e7b 100644
--- a/src/app/shared/NoteContentQuote.svelte
+++ b/src/app/shared/NoteContentQuote.svelte
@@ -35,9 +35,7 @@
       return
     }
 
-    if (isGroup) {
-      router.at("groups").of(address, {relays}).at("notes").open()
-    } else if (noteId) {
+    if (noteId) {
       router.at("notes").of(noteId, {relays}).open()
     }
   }
@@ -47,7 +45,6 @@
   }
 
   $: address = $quote ? getAddress($quote) : ""
-  $: isGroup = address.match(/^(34550|35834):/)
   $: profileDisplay = deriveProfileDisplay($quote?.pubkey)
   $: muted = $quote && $isEventMuted($quote, true)
 </script>
@@ -60,19 +57,17 @@
         <Anchor underline stopPropagation on:click={unmute}>Show</Anchor>
       </p>
     {:else if $quote}
-      {#if !isGroup}
-        <div class="mb-4 flex items-center gap-4">
-          <PersonCircle class="h-6 w-6" pubkey={$quote.pubkey} />
-          <Anchor
-            modal
-            stopPropagation
-            type="unstyled"
-            class="flex items-center gap-2"
-            href={router.at("people").of($quote.pubkey).toString()}>
-            <h2 class="text-lg">{$profileDisplay}</h2>
-          </Anchor>
-        </div>
-      {/if}
+      <div class="mb-4 flex items-center gap-4">
+        <PersonCircle class="h-6 w-6" pubkey={$quote.pubkey} />
+        <Anchor
+          modal
+          stopPropagation
+          type="unstyled"
+          class="flex items-center gap-2"
+          href={router.at("people").of($quote.pubkey).toString()}>
+          <h2 class="text-lg">{$profileDisplay}</h2>
+        </Anchor>
+      </div>
       <slot name="note-content" quote={$quote} {depth} />
     {:else}
       <div class="px-20">
diff --git a/src/app/state.ts b/src/app/state.ts
index 44a0de590..49a7fa577 100644
--- a/src/app/state.ts
+++ b/src/app/state.ts
@@ -48,10 +48,6 @@ export const slowConnections = writable([])
 
 // Synchronization from events to state
 
-export const loadAppData = () => {
-  // If we have a group, load that
-}
-
 export const loadUserData = async (hints: string[] = []) => {
   // Load relays, then load everything else so we have a better chance of finding it
   const $pubkey = pubkey.get()
diff --git a/src/app/util/feeds.ts b/src/app/util/feeds.ts
index d5c3eaa5c..e00706b72 100644
--- a/src/app/util/feeds.ts
+++ b/src/app/util/feeds.ts
@@ -9,22 +9,15 @@ import {
   getIdOrAddress,
   getIdAndAddress,
   getIdFilters,
-  isContextAddress,
   DIRECT_MESSAGE,
   REACTION,
   LIVE_CHAT_MESSAGE,
 } from "@welshman/util"
 import {Tracker} from "@welshman/net"
 import type {Feed, RequestItem} from "@welshman/feeds"
-import {
-  walkFeed,
-  FeedLoader as CoreFeedLoader,
-  isIntersectionFeed,
-  isRelayFeed,
-} from "@welshman/feeds"
+import {FeedLoader as CoreFeedLoader, isIntersectionFeed, isRelayFeed} from "@welshman/feeds"
 import {repository, tracker, getFilterSelections} from "@welshman/app"
 import {noteKinds, isLike, reactionKinds, repostKinds} from "src/util/nostr"
-import {isAddressFeed} from "src/domain"
 import type {DisplayEvent} from "src/engine"
 import {
   feedLoader as baseFeedLoader,
@@ -340,13 +333,6 @@ export const createFeed = (opts: FeedOpts) => {
   function discardEvents(events) {
     let strict = true
 
-    // Be more tolerant when looking at communities
-    walkFeed(opts.feed, feed => {
-      if (isAddressFeed(feed)) {
-        strict = strict && !(feed.slice(2) as string[]).some(isContextAddress)
-      }
-    })
-
     return events.filter(e => {
       if (repository.isDeleted(e)) return false
       if (e.kind === REACTION && !isLike(e)) return false
diff --git a/src/app/util/router.ts b/src/app/util/router.ts
index 1ff1ee7ff..d109c1180 100644
--- a/src/app/util/router.ts
+++ b/src/app/util/router.ts
@@ -102,7 +102,6 @@ router.extend("qrcode", encodeURIComponent)
 router.extend("media", encodeURIComponent)
 router.extend("relays", encodeURIComponent)
 router.extend("channels", getChannelId)
-router.extend("groups", encodeNaddr)
 router.extend("events", encodeNaddr)
 router.extend("lists", encodeNaddr)
 router.extend("listings", encodeNaddr)
diff --git a/src/app/views/EventEdit.svelte b/src/app/views/EventEdit.svelte
index b808761cc..44ff526ef 100644
--- a/src/app/views/EventEdit.svelte
+++ b/src/app/views/EventEdit.svelte
@@ -51,7 +51,6 @@
       loading = false
 
       values = {
-        groups: tags.context().values().valueOf(),
         title: tags.get("name")?.value() || tags.get("title")?.value() || "",
         location: tags.get("location")?.value() || "",
         start: secondsToDate(tags.get("start")?.value() || now()),
diff --git a/src/app/views/Feeds.svelte b/src/app/views/Feeds.svelte
index 081431c67..c58d6fc90 100644
--- a/src/app/views/Feeds.svelte
+++ b/src/app/views/Feeds.svelte
@@ -31,4 +31,4 @@
   </div>
 {/if}
 
-<Feed showGroup showControls={!isPlatformFeed} {feed} />
+<Feed showControls={!isPlatformFeed} {feed} />
diff --git a/src/app/views/InviteCreate.svelte b/src/app/views/InviteCreate.svelte
index d73f2d07b..455b22195 100644
--- a/src/app/views/InviteCreate.svelte
+++ b/src/app/views/InviteCreate.svelte
@@ -49,7 +49,7 @@
     relays = toSpliced(relays, i, 1)
   }
 
-  let relayInput, groupInput
+  let relayInput
   let sections = []
   let pubkeys = []
   let relays = []
diff --git a/src/app/views/NoteDetail.svelte b/src/app/views/NoteDetail.svelte
index ed4f81cb9..044935d57 100644
--- a/src/app/views/NoteDetail.svelte
+++ b/src/app/views/NoteDetail.svelte
@@ -16,7 +16,7 @@
 
 {#if $event}
   <div in:fly={{y: 20}}>
-    <Note showGroup showLoading anchor={getIdOrAddress($event)} note={$event} {depth} {relays} />
+    <Note showLoading anchor={getIdOrAddress($event)} note={$event} {depth} {relays} />
   </div>
 {:else}
   <Spinner />
diff --git a/src/app/views/Onboarding.svelte b/src/app/views/Onboarding.svelte
index a0bd5ff52..b00af183b 100644
--- a/src/app/views/Onboarding.svelte
+++ b/src/app/views/Onboarding.svelte
@@ -52,11 +52,7 @@
   }
 
   const signup = async () => {
-    if (invite?.groups) {
-      router.at("invite").qp({groups: invite.groups}).push()
-    } else {
-      router.at("notes").push()
-    }
+    router.at("notes").push()
 
     // Immediately request access to any relays with a claim
     for (const {url, claim} of invite?.parsedRelays || []) {
diff --git a/src/app/views/UserKeys.svelte b/src/app/views/UserKeys.svelte
index f73716202..5336cfbff 100644
--- a/src/app/views/UserKeys.svelte
+++ b/src/app/views/UserKeys.svelte
@@ -1,84 +1,14 @@
 <script lang="ts">
-  import {relaySearch, session} from "@welshman/app"
-  import {ctx} from "@welshman/lib"
-  import {getPubkey, Nip01Signer, Nip59} from "@welshman/signer"
-  import type {SignedEvent} from "@welshman/util"
-  import {WRAP} from "@welshman/util"
+  import {session} from "@welshman/app"
   import {nip19} from "nostr-tools"
-  import {subscribe} from "src/engine"
   import Anchor from "src/partials/Anchor.svelte"
   import CopyValue from "src/partials/CopyValue.svelte"
-  import Field from "src/partials/Field.svelte"
   import FlexColumn from "src/partials/FlexColumn.svelte"
-  import Heading from "src/partials/Heading.svelte"
-  import Input from "src/partials/Input.svelte"
-  import Modal from "src/partials/Modal.svelte"
-  import SearchSelect from "src/partials/SearchSelect.svelte"
-  import {showInfo, showWarning} from "src/partials/Toast.svelte"
-  import {isKeyValid, nsecEncode, toHex} from "src/util/nostr"
+  import {nsecEncode} from "src/util/nostr"
 
   const nip07 = "https://github.com/nostr-protocol/nips/blob/master/07.md"
   const keypairUrl = "https://www.cloudflare.com/learning/ssl/how-does-public-key-encryption-work/"
 
-  let nsec = null
-  let relays = []
-  let importing = false
-
-  const startImport = () => {
-    nsec = ""
-  }
-
-  const cancelImport = () => {
-    nsec = null
-  }
-
-  const finishImport = async () => {
-    importing = true
-
-    const privkey = nsec.startsWith("nsec") ? toHex(nsec) : nsec
-
-    if (!isKeyValid(privkey)) {
-      showWarning("Sorry, but that's an invalid private key.")
-      importing = false
-      return
-    }
-
-    const pubkey = getPubkey(privkey)
-
-    const helper = Nip59.fromSigner(new Nip01Signer(privkey))
-
-    let found
-
-    // Look for group definition events by this pubkey so we can associate the key with the group
-    const sub = subscribe({
-      closeOnEose: true,
-      relays: ctx.app.router.User().getUrls().concat(relays),
-      filters: [{kinds: [WRAP], "#p": [pubkey], limit: 500}],
-      onEvent: async event => {
-        if (event.kind === WRAP) {
-          event = await helper.unwrap(event as SignedEvent)
-        }
-
-        if (event?.kind !== 35834 || event?.pubkey !== pubkey) {
-          return
-        }
-
-        found = event
-        sub.close()
-      },
-      onComplete: () => {
-        importing = false
-
-        if (found) {
-          nsec = null
-          showInfo("Successfully imported admin key!")
-        } else {
-          showWarning("Sorry, we weren't able to find any events created with that key.")
-        }
-      },
-    })
-  }
-
   document.title = "Keys"
 </script>
 
@@ -119,36 +49,4 @@
       </div>
     {/if}
   </FlexColumn>
-  <FlexColumn>
-    <div class="flex justify-between">
-      <div class="flex items-center gap-2">
-        <i class="fa fa-server fa-lg" />
-        <h2 class="staatliches text-2xl">Group keys</h2>
-      </div>
-      <Anchor button on:click={startImport}>
-        <i class="fa fa-upload" /> Import Key
-      </Anchor>
-    </div>
-  </FlexColumn>
 </FlexColumn>
-
-{#if nsec !== null}
-  <Modal onEscape={cancelImport}>
-    <Heading class="text-center">Import group key</Heading>
-    <p>
-      Share group administration using a dedicated private key. These keys are still valuable, so
-      keep them safe!
-    </p>
-    <Field label="Private key">
-      <Input type="password" bind:value={nsec} placeholder="nsec..." />
-    </Field>
-    <Field label="Relays to search">
-      <SearchSelect
-        multiple
-        bind:value={relays}
-        search={$relaySearch.searchValues}
-        placeholder="wss://..." />
-    </Field>
-    <Anchor button accent loading={importing} on:click={finishImport}>Import key</Anchor>
-  </Modal>
-{/if}
diff --git a/src/engine/requests.ts b/src/engine/requests.ts
index 0854dbfc6..fce7fc05e 100644
--- a/src/engine/requests.ts
+++ b/src/engine/requests.ts
@@ -20,9 +20,7 @@ import {
 } from "@welshman/lib"
 import type {TrustedEvent} from "@welshman/util"
 import {
-  Address,
   getIdFilters,
-  isGroupAddress,
   createEvent,
   WRAP,
   EPOCH,
@@ -57,16 +55,10 @@ import {
   getNetwork,
 } from "@welshman/app"
 import type {AppSyncOpts} from "@welshman/app"
-import {noteKinds, reactionKinds, repostKinds} from "src/util/nostr"
+import {noteKinds, reactionKinds} from "src/util/nostr"
 import {partition, uniq, without} from "ramda"
 import {CUSTOM_LIST_KINDS} from "src/domain"
-import {
-  env,
-  load,
-  subscribePersistent,
-  sessionWithMeta,
-  type MySubscribeRequest,
-} from "src/engine/state"
+import {env, load, subscribePersistent, type MySubscribeRequest} from "src/engine/state"
 
 // Utils
 
@@ -126,28 +118,6 @@ export const loadAll = (feed, opts: LoadOpts = {}) => {
   return {promise, loading, stop}
 }
 
-// Groups
-
-export const attemptedAddrs = new Map()
-
-export const getStaleAddrs = (addrs: string[]) => {
-  const stale = new Set<string>()
-
-  for (const addr of addrs) {
-    const attempts = attemptedAddrs.get(addr) | 0
-
-    if (attempts > 0) {
-      continue
-    }
-
-    stale.add(addr)
-
-    attemptedAddrs.set(addr, attempts + 1)
-  }
-
-  return Array.from(stale)
-}
-
 export const loadEvent = async (idOrAddress: string, request: Partial<MySubscribeRequest> = {}) =>
   first(
     await load({
diff --git a/src/engine/state.ts b/src/engine/state.ts
index 2f7d8a657..60d29ef93 100644
--- a/src/engine/state.ts
+++ b/src/engine/state.ts
@@ -906,14 +906,6 @@ export const createAndPublish = async ({
   return publish({event, relays, verb, timeout, forcePlatform})
 }
 
-// Publish
-
-export const mentionGroup = (address: string, ...args: unknown[]) => [
-  "a",
-  address,
-  ctx.app.router.WithinContext(address).getUrl(),
-]
-
 export const tagsFromContent = (content: string) => {
   const tags = []
 
diff --git a/src/engine/utils/events.ts b/src/engine/utils/events.ts
index b5e7e57df..ff753cf4d 100644
--- a/src/engine/utils/events.ts
+++ b/src/engine/utils/events.ts
@@ -45,13 +45,5 @@ export const unwrapRepost = repost => {
     return null
   }
 
-  const originalGroup = Tags.fromEvent(event).context().values().first()
-  const repostGroup = Tags.fromEvent(repost).context().values().first()
-
-  // Only show cross-posts, not reposts from global to global
-  if (originalGroup === repostGroup) {
-    return null
-  }
-
   return event
 }

From 4fee030282374eeaaf887242b00a0c2a83d4db94 Mon Sep 17 00:00:00 2001
From: Ticruz <thib.duchene@gmail.com>
Date: Tue, 5 Nov 2024 15:27:00 +0100
Subject: [PATCH 10/13] remove unused variables and imports

---
 src/app/Nav.svelte                       |  2 +-
 src/app/shared/EventInfo.svelte          |  1 -
 src/app/shared/FeedFormSaveAsList.svelte |  8 +-------
 src/app/shared/GroupCircle.svelte        | 15 ---------------
 src/app/shared/NoteActions.svelte        | 10 ++--------
 src/app/shared/NoteContentQuote.svelte   |  3 +--
 src/app/shared/NoteReply.svelte          |  2 +-
 src/app/util/feeds.ts                    |  2 +-
 src/app/views/PersonDetail.svelte        | 24 ++++++++++++------------
 src/engine/utils/events.ts               |  2 +-
 10 files changed, 20 insertions(+), 49 deletions(-)
 delete mode 100644 src/app/shared/GroupCircle.svelte

diff --git a/src/app/Nav.svelte b/src/app/Nav.svelte
index bb3f201eb..568daeaff 100644
--- a/src/app/Nav.svelte
+++ b/src/app/Nav.svelte
@@ -8,7 +8,7 @@
   import PersonBadge from "src/app/shared/PersonBadge.svelte"
   import {menuIsOpen, searchTerm} from "src/app/state"
   import {router} from "src/app/util/router"
-  import {env, hasNewNotifications, hasNewMessages} from "src/engine"
+  import {hasNewNotifications, hasNewMessages} from "src/engine"
 
   let innerWidth = 0
   let searching = false
diff --git a/src/app/shared/EventInfo.svelte b/src/app/shared/EventInfo.svelte
index 912488c3d..4c6f16d8e 100644
--- a/src/app/shared/EventInfo.svelte
+++ b/src/app/shared/EventInfo.svelte
@@ -26,7 +26,6 @@
   const deleted = deriveIsDeletedByAddress(repository, event)
 
   $: tags = Tags.fromEvent(event)
-  $: groupAddrs = tags.context().values().valueOf()
   $: ({name, title, location} = fromPairs(event.tags))
   $: end = parseInt(tags.get("end")?.value())
   $: start = parseInt(tags.get("start")?.value())
diff --git a/src/app/shared/FeedFormSaveAsList.svelte b/src/app/shared/FeedFormSaveAsList.svelte
index 23f030b25..cdfd32e7e 100644
--- a/src/app/shared/FeedFormSaveAsList.svelte
+++ b/src/app/shared/FeedFormSaveAsList.svelte
@@ -1,11 +1,5 @@
 <script lang="ts">
-  import {
-    NAMED_PEOPLE,
-    NAMED_COMMUNITIES,
-    NAMED_RELAYS,
-    NAMED_TOPICS,
-    getAddress,
-  } from "@welshman/util"
+  import {NAMED_PEOPLE, NAMED_RELAYS, NAMED_TOPICS, getAddress} from "@welshman/util"
   import {tagPubkey} from "@welshman/app"
   import {isAuthorFeed, isRelayFeed, makeListFeed} from "@welshman/feeds"
   import Card from "src/partials/Card.svelte"
diff --git a/src/app/shared/GroupCircle.svelte b/src/app/shared/GroupCircle.svelte
deleted file mode 100644
index 78740d98f..000000000
--- a/src/app/shared/GroupCircle.svelte
+++ /dev/null
@@ -1,15 +0,0 @@
-<script lang="ts">
-  import ImageCircle from "src/partials/ImageCircle.svelte"
-  import PlaceholderCircle from "src/app/shared/PlaceholderCircle.svelte"
-  import {deriveGroupMeta} from "src/engine"
-
-  export let address
-
-  const meta = deriveGroupMeta(address)
-</script>
-
-{#if $meta?.image}
-  <ImageCircle src={$meta.image} class={$$props.class} />
-{:else}
-  <PlaceholderCircle pubkey={address} class={$$props.class} />
-{/if}
diff --git a/src/app/shared/NoteActions.svelte b/src/app/shared/NoteActions.svelte
index d2fa2ea01..94eb1b3fd 100644
--- a/src/app/shared/NoteActions.svelte
+++ b/src/app/shared/NoteActions.svelte
@@ -3,14 +3,12 @@
   import {nip19} from "nostr-tools"
   import {onMount} from "svelte"
   import {derived} from "svelte/store"
-  import {ctx, nth, nthEq, remove, last, sortBy, first} from "@welshman/lib"
+  import {ctx, nth, nthEq, remove, last, sortBy} from "@welshman/lib"
   import {
     repository,
     signer,
     trackerStore,
     tagReactionTo,
-    tagEvent,
-    tagPubkey,
     tagZapSplit,
     mute,
     unmute,
@@ -22,12 +20,10 @@
     asSignedEvent,
     isSignedEvent,
     createEvent,
-    getAddress,
-    getContextTagValues,
     getPubkeyTagValues,
   } from "@welshman/util"
   import {tweened} from "svelte/motion"
-  import {identity, sum, pluck} from "ramda"
+  import {sum, pluck} from "ramda"
   import {fly} from "src/util/transition"
   import {formatSats} from "src/util/misc"
   import {quantify, pluralize} from "hurdak"
@@ -41,8 +37,6 @@
   import Menu from "src/partials/Menu.svelte"
   import MenuItem from "src/partials/MenuItem.svelte"
   import FlexColumn from "src/partials/FlexColumn.svelte"
-  import Card from "src/partials/Card.svelte"
-  import Heading from "src/partials/Heading.svelte"
   import Modal from "src/partials/Modal.svelte"
   import OverflowMenu from "src/partials/OverflowMenu.svelte"
   import CopyValue from "src/partials/CopyValue.svelte"
diff --git a/src/app/shared/NoteContentQuote.svelte b/src/app/shared/NoteContentQuote.svelte
index d862f8e7b..5e44e6ae4 100644
--- a/src/app/shared/NoteContentQuote.svelte
+++ b/src/app/shared/NoteContentQuote.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import {ctx} from "@welshman/lib"
-  import {getAddress, Address} from "@welshman/util"
+  import {Address} from "@welshman/util"
   import {deriveProfileDisplay} from "@welshman/app"
   import Anchor from "src/partials/Anchor.svelte"
   import Card from "src/partials/Card.svelte"
@@ -44,7 +44,6 @@
     showHidden = true
   }
 
-  $: address = $quote ? getAddress($quote) : ""
   $: profileDisplay = deriveProfileDisplay($quote?.pubkey)
   $: muted = $quote && $isEventMuted($quote, true)
 </script>
diff --git a/src/app/shared/NoteReply.svelte b/src/app/shared/NoteReply.svelte
index 3a517aa87..716169c55 100644
--- a/src/app/shared/NoteReply.svelte
+++ b/src/app/shared/NoteReply.svelte
@@ -14,7 +14,7 @@
   import NsecWarning from "src/app/shared/NsecWarning.svelte"
   import NoteOptions from "src/app/shared/NoteOptions.svelte"
   import NoteImages from "src/app/shared/NoteImages.svelte"
-  import {env, publish, signAndPublish, tagsFromContent, getClientTags} from "src/engine"
+  import {publish, signAndPublish, tagsFromContent, getClientTags} from "src/engine"
   import {drafts} from "src/app/state"
 
   export let parent
diff --git a/src/app/util/feeds.ts b/src/app/util/feeds.ts
index e00706b72..860905fc2 100644
--- a/src/app/util/feeds.ts
+++ b/src/app/util/feeds.ts
@@ -331,7 +331,7 @@ export const createFeed = (opts: FeedOpts) => {
   }
 
   function discardEvents(events) {
-    let strict = true
+    const strict = true
 
     return events.filter(e => {
       if (repository.isDeleted(e)) return false
diff --git a/src/app/views/PersonDetail.svelte b/src/app/views/PersonDetail.svelte
index 542e055c7..89414c4b1 100644
--- a/src/app/views/PersonDetail.svelte
+++ b/src/app/views/PersonDetail.svelte
@@ -112,8 +112,10 @@
        background-image: linear-gradient(to bottom, ${rgba}, ${rgba}, ${rgb}), url('${banner}')`} />
 
 <div>
-  <AltColor background class="relative flex flex-col sm:flex-row gap-8 sm:gap-4 p-6 text-neutral-100">
-    <div class="flex flex-col gap-4 items-center">
+  <AltColor
+    background
+    class="relative flex flex-col gap-8 p-6 text-neutral-100 sm:flex-row sm:gap-4">
+    <div class="flex flex-col items-center gap-4">
       <PersonCircle {pubkey} class="mt-1 h-32 w-32" />
       {#if pubkey === $session?.pubkey}
         <Anchor
@@ -127,10 +129,8 @@
           low={$following}
           on:click={() => ($following ? unfollow(pubkey) : follow(tagPubkey(pubkey)))}
           >{$following ? "Unfollow" : "Follow"}</Anchor>
-        <Anchor
-          button
-          low
-          on:click={router.at("channels").of([$session.pubkey, pubkey]).push}>Message</Anchor>
+        <Anchor button low on:click={router.at("channels").of([$session.pubkey, pubkey]).push}
+          >Message</Anchor>
       {/if}
     </div>
     <div class="flex min-w-0 flex-grow flex-col gap-4">
@@ -169,10 +169,10 @@
           </div>
         </div>
       </div>
-      <div class="grid grid-cols-2 max-w-[80%] gap-3 sm:flex-row">
+      <div class="grid max-w-[80%] grid-cols-2 gap-3 sm:flex-row">
         {#if $handle}
           <div class="flex items-center gap-2">
-            <i class="fa fa-at text-accent w-4" />
+            <i class="fa fa-at w-4 text-accent" />
             <PersonHandle {pubkey} />
           </div>
         {/if}
@@ -185,9 +185,9 @@
         {#if $profile?.website}
           <Anchor
             external
-            class="flex items-center gap-2 col-span-2"
+            class="col-span-2 flex items-center gap-2"
             href={ensureProto($profile.website)}>
-            <i class="fa fa-link text-accent w-4" />
+            <i class="fa fa-link w-4 text-accent" />
             {stripProtocol($profile.website)}
           </Anchor>
         {/if}
@@ -217,9 +217,9 @@
 {#if $userMutes.has(pubkey)}
   <Content size="lg" class="text-center">You have muted this person.</Content>
 {:else if activeTab === "notes"}
-  <Feed showGroup forcePlatform={false} feed={notesFeed} />
+  <Feed forcePlatform={false} feed={notesFeed} />
 {:else if activeTab === "likes"}
-  <Feed showGroup forcePlatform={false} feed={likesFeed} />
+  <Feed forcePlatform={false} feed={likesFeed} />
 {:else if activeTab === "collections"}
   <PersonCollections {pubkey} />
 {:else if activeTab === "relays"}
diff --git a/src/engine/utils/events.ts b/src/engine/utils/events.ts
index ff753cf4d..ae8b72fc3 100644
--- a/src/engine/utils/events.ts
+++ b/src/engine/utils/events.ts
@@ -2,7 +2,7 @@ import {nip19} from "nostr-tools"
 import {tryFunc, switcherFn} from "hurdak"
 import {sortBy} from "@welshman/lib"
 import type {TrustedEvent} from "@welshman/util"
-import {fromNostrURI, Address, hasValidSignature, Tags} from "@welshman/util"
+import {fromNostrURI, Address, hasValidSignature} from "@welshman/util"
 import {parseJson} from "src/util/misc"
 
 export const sortEventsAsc = events => sortBy((e: TrustedEvent) => e.created_at, events)

From 6980ff16a21098d49604256f60690a2cc4ea394b Mon Sep 17 00:00:00 2001
From: Ticruz <thib.duchene@gmail.com>
Date: Tue, 5 Nov 2024 16:02:13 +0100
Subject: [PATCH 11/13] pre-commit format

---
 .husky/pre-commit | 5 +----
 package.json      | 4 ++--
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/.husky/pre-commit b/.husky/pre-commit
index 3c39d1f8f..2c9b45fc9 100755
--- a/.husky/pre-commit
+++ b/.husky/pre-commit
@@ -1,5 +1,2 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
-npm run check
+npm run format && npm run check
 
diff --git a/package.json b/package.json
index 9e6af3f3f..d13f31e05 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
     "check:fmt": "prettier --check $(git diff head --name-only --diff-filter d | grep -E '(js|ts|svelte)$' | xargs)",
     "check:errors": "run-s check:ts check:es",
     "check": "run-p check:errors check:fmt",
-    "format": "prettier --write $(git diff head --name-only --diff-filter d | grep -E '(js|ts|svelte)$' | xargs)",
+    "format": "git diff head --name-only --diff-filter d | grep -E '(js|ts|svelte)$' | xargs -r prettier --write",
     "watch": "find src -type f | entr -r"
   },
   "dependencies": {
@@ -99,4 +99,4 @@
     "vite-plugin-pwa": "^0.20.5",
     "vitest": "^2.1.3"
   }
-}
+}
\ No newline at end of file

From 43bcac230bb885d4a2d8b291bd59b9dbe2a0f78f Mon Sep 17 00:00:00 2001
From: Ticruz <thib.duchene@gmail.com>
Date: Tue, 5 Nov 2024 16:12:44 +0100
Subject: [PATCH 12/13] remove VITE_FORCE_GROUP

---
 .env | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.env b/.env
index 4e6071292..26bd9adb5 100644
--- a/.env
+++ b/.env
@@ -11,7 +11,6 @@ VITE_IMGPROXY_URL=https://imgproxy.coracle.social
 VITE_DUFFLEPUD_URL=https://dufflepud.onrender.com
 VITE_PLATFORM_ZAP_SPLIT=0
 VITE_PLATFORM_PUBKEY=8ec86ac9e10979998652068ee6b00223b8e3265aabb3fe28fb6b3b6e294adc96
-VITE_FORCE_GROUP=
 VITE_PLATFORM_RELAYS=
 VITE_ENABLE_ZAPS=true
 VITE_APP_NAME=Coracle

From e14184d695222fe58d70d9b9ffab9c2f284b1390 Mon Sep 17 00:00:00 2001
From: Ticruz <thib.duchene@gmail.com>
Date: Tue, 5 Nov 2024 16:13:34 +0100
Subject: [PATCH 13/13] remove VITE_FORCE_GROUP

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 4c100e789..04dfaacf8 100644
--- a/README.md
+++ b/README.md
@@ -98,7 +98,6 @@ Coracle is intended to be fully white-labeled by groups of various kinds. The fo
 - `VITE_DUFFLEPUD_URL` is a [Dufflepud](https://github.com/coracle-social/dufflepud) instance url, which helps Coracle with things like link previews and image uploads.
 - `VITE_PLATFORM_ZAP_SPLIT` is a decimal between 0 and 1 defining the default zap split percent.
 - `VITE_PLATFORM_PUBKEY` is the pubkey of the platform owner. This gets zapped when using the platform zap split.
-- `VITE_FORCE_GROUP` is an optional `kind:34550` or `kind:35834` address. If provided, the home page of Coracle will be the home page for the group, and most views will be filtered down to the group's scope. For user privacy, `VITE_PLATFORM_RELAYS` should also be set when using `VITE_FORCE_GROUP`.
 - `VITE_PLATFORM_RELAYS` is an optional comma-separated list of relay urls to use for feeds. If provided, most UI components related to relay selection will be hidden from the user.
 - `VITE_ENABLE_ZAPS` can be set to `false` to disable zaps.
 - `VITE_APP_NAME` is the app's name.