diff --git a/src/app/components/AlertAdd.svelte b/src/app/components/AlertAdd.svelte
index 96d4bd6..4717874 100644
--- a/src/app/components/AlertAdd.svelte
+++ b/src/app/components/AlertAdd.svelte
@@ -14,13 +14,7 @@
import ModalFooter from "@lib/components/ModalFooter.svelte"
import InfoBunker from "@app/components/InfoBunker.svelte"
import BunkerConnect, {BunkerConnectController} from "@app/components/BunkerConnect.svelte"
- import {
- GENERAL,
- alerts,
- getMembershipUrls,
- getMembershipRoomsByUrl,
- userMembership,
- } from "@app/state"
+ import {alerts, getMembershipUrls, getMembershipRoomsByUrl, userMembership} from "@app/state"
import {loadAlertStatuses} from "@app/requests"
import {publishAlert} from "@app/commands"
import {pushToast} from "@app/toast"
@@ -107,7 +101,7 @@
display.push("chat")
filters.push({
kinds: [MESSAGE],
- "#h": [GENERAL, ...getMembershipRoomsByUrl(relay, $userMembership)],
+ "#h": getMembershipRoomsByUrl(relay, $userMembership),
})
}
diff --git a/src/app/components/CalendarEventForm.svelte b/src/app/components/CalendarEventForm.svelte
index cdbf78c..cd0725f 100644
--- a/src/app/components/CalendarEventForm.svelte
+++ b/src/app/components/CalendarEventForm.svelte
@@ -13,7 +13,7 @@
import ModalFooter from "@lib/components/ModalFooter.svelte"
import DateTimeInput from "@lib/components/DateTimeInput.svelte"
import EditorContent from "@app/editor/EditorContent.svelte"
- import {PROTECTED, GENERAL, tagRoom} from "@app/state"
+ import {PROTECTED} from "@app/state"
import {makeEditor} from "@app/editor"
import {pushToast} from "@app/toast"
@@ -73,7 +73,6 @@
["end", end.toString()],
...daysBetween(start, end).map(D => ["D", D.toString()]),
...ed.storage.nostr.getEditorTags(),
- tagRoom(GENERAL, url),
PROTECTED,
],
})
diff --git a/src/app/components/ChannelName.svelte b/src/app/components/ChannelName.svelte
index 5199bb7..e6c23cb 100644
--- a/src/app/components/ChannelName.svelte
+++ b/src/app/components/ChannelName.svelte
@@ -1,11 +1,7 @@
-{#if room === GENERAL}
- general
-{:else}
- {$channelsById.get(makeChannelId(url, room))?.name || room}
-{/if}
+{$channelsById.get(makeChannelId(url, room))?.name || room}
diff --git a/src/app/components/EventReply.svelte b/src/app/components/EventReply.svelte
index 1320721..7765c47 100644
--- a/src/app/components/EventReply.svelte
+++ b/src/app/components/EventReply.svelte
@@ -8,7 +8,7 @@
import ModalFooter from "@lib/components/ModalFooter.svelte"
import EditorContent from "@app/editor/EditorContent.svelte"
import {publishComment} from "@app/commands"
- import {tagRoom, GENERAL, PROTECTED} from "@app/state"
+ import {PROTECTED} from "@app/state"
import {makeEditor} from "@app/editor"
import {pushToast} from "@app/toast"
@@ -23,7 +23,7 @@
const ed = await editor
const content = ed.getText({blockSeparator: "\n"}).trim()
- const tags = [...ed.storage.nostr.getEditorTags(), tagRoom(GENERAL, url), PROTECTED]
+ const tags = [...ed.storage.nostr.getEditorTags(), PROTECTED]
if (!content) {
return pushToast({
diff --git a/src/app/components/ThreadCreate.svelte b/src/app/components/ThreadCreate.svelte
index d0a16c6..ed49f17 100644
--- a/src/app/components/ThreadCreate.svelte
+++ b/src/app/components/ThreadCreate.svelte
@@ -10,7 +10,7 @@
import ModalFooter from "@lib/components/ModalFooter.svelte"
import EditorContent from "@app/editor/EditorContent.svelte"
import {pushToast} from "@app/toast"
- import {GENERAL, tagRoom, PROTECTED} from "@app/state"
+ import {PROTECTED} from "@app/state"
import {makeEditor} from "@app/editor"
const {url} = $props()
@@ -41,12 +41,7 @@
})
}
- const tags = [
- ...ed.storage.nostr.getEditorTags(),
- tagRoom(GENERAL, url),
- ["title", title],
- PROTECTED,
- ]
+ const tags = [...ed.storage.nostr.getEditorTags(), ["title", title], PROTECTED]
publishThunk({
relays: [url],
diff --git a/src/app/state.ts b/src/app/state.ts
index 7332fea..fbf7dc9 100644
--- a/src/app/state.ts
+++ b/src/app/state.ts
@@ -71,8 +71,6 @@ export const fromCsv = (s: string) => (s || "").split(",").filter(identity)
export const ROOM = "h"
-export const GENERAL = "_"
-
export const PROTECTED = ["-"]
export const ALERT = 32830
@@ -582,13 +580,8 @@ export const channelsByUrl = derived(channelsById, $channelsById => {
return $channelsByUrl
})
-export const displayChannel = (url: string, room: string) => {
- if (room === GENERAL) {
- return "general"
- }
-
- return channelsById.get().get(makeChannelId(url, room))?.name || room
-}
+export const displayChannel = (url: string, room: string) =>
+ channelsById.get().get(makeChannelId(url, room))?.name || room
export const roomComparator = (url: string) => (room: string) =>
displayChannel(url, room).toLowerCase()
@@ -633,17 +626,13 @@ export const userRoomsByUrl = withGetter(
addToMapKey($userRoomsByUrl, normalizeRelayUrl(url), room)
}
- for (const url of getRelayTagValues(tags)) {
- addToMapKey($userRoomsByUrl, normalizeRelayUrl(url), GENERAL)
- }
-
return $userRoomsByUrl
}),
)
export const deriveUserRooms = (url: string) =>
derived(userRoomsByUrl, $userRoomsByUrl =>
- sortBy(roomComparator(url), uniq(Array.from($userRoomsByUrl.get(url) || [GENERAL]))),
+ sortBy(roomComparator(url), uniq(Array.from($userRoomsByUrl.get(url) || []))),
)
export const deriveOtherRooms = (url: string) =>
diff --git a/src/routes/spaces/+layout.svelte b/src/routes/spaces/+layout.svelte
index 545bf88..fd03570 100644
--- a/src/routes/spaces/+layout.svelte
+++ b/src/routes/spaces/+layout.svelte
@@ -1,5 +1,5 @@