coracle-social · ticruz38 · Nov 4, 2024 · Nov 4, 2024 · Nov 4, 2024 · Nov 5, 2024
diff --git 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

diff --git 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/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.

diff --git 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"
   }
-}
+}
diff --git 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/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
@@ -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
@@ -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
@@ -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/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"
@@ -27,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())
@@ -69,17 +67,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/Feed.svelte b/src/app/shared/Feed.svelte
@@ -18,14 +18,12 @@
   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
   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"]]
@@ -102,8 +100,6 @@
       <Note
         filters={loader.getFilters() || [{ids: []}]}
         depth={$shouldHideReplies ? 0 : 2}
-        {contextAddress}
-        {showGroup}
         {anchor}
         {note} />
     </div>

diff --git 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/FeedFormSaveAsList.svelte b/src/app/shared/FeedFormSaveAsList.svelte
@@ -1,18 +1,12 @@
 <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"
   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 +30,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/FeedFormSectionContext.svelte b/src/app/shared/FeedFormSectionContext.svelte
diff --git a/src/app/shared/GroupAbout.svelte b/src/app/shared/GroupAbout.svelte
diff --git a/src/app/shared/GroupActions.svelte b/src/app/shared/GroupActions.svelte