-
-
{sessionItem.client.slice(0, 8)}
-
-
- Created {formatDate(sessionItem.created_at)}
-
-
- Last active: {formatDate(sessionItem.last_activity)}
-
+
+
+
+ Session {sessionItem.client.slice(0, 8)}
+
+ {#if sessionItem.deactivated_at}
+ Deactivated
+ {/if}
+
+
+
+
+ {#if menuClient === sessionItem.client}
+
+
+ -
+
+
+
+
+ {/if}
+
+
+
+
+ Created {formatDate(sessionItem.created_at)}
+
+
+ Active {formatDate(sessionItem.last_activity)}
-
{/each}
diff --git a/src/app/components/ProfileDelete.svelte b/src/app/components/ProfileDelete.svelte
index 870bef08..282fb0d5 100644
--- a/src/app/components/ProfileDelete.svelte
+++ b/src/app/components/ProfileDelete.svelte
@@ -23,9 +23,8 @@
import Modal from "@lib/components/Modal.svelte"
import ModalBody from "@lib/components/ModalBody.svelte"
import {INDEXER_RELAYS, PLATFORM_NAME, userSpaceUrls} from "@app/core/state"
- import {kv, db} from "@app/core/storage"
import {pushToast} from "@app/util/toast"
- import {Push} from "@app/util/notifications"
+ import {logout} from "@app/util/logout"
let progress: number | undefined = $state(undefined)
let confirmText = $state("")
@@ -88,13 +87,7 @@
await sleep(2000)
// Goodbye forever!
- await Push.disable()
- await kv.clear()
- await db.clear()
-
- localStorage.clear()
-
- window.location.href = "/"
+ await logout()
}
const confirm = async () => {
diff --git a/src/app/components/SignUpEmail.svelte b/src/app/components/SignUpEmail.svelte
index 7f53072c..8fd919f9 100644
--- a/src/app/components/SignUpEmail.svelte
+++ b/src/app/components/SignUpEmail.svelte
@@ -18,7 +18,7 @@
import ModalSubtitle from "@lib/components/ModalSubtitle.svelte"
import ModalFooter from "@lib/components/ModalFooter.svelte"
import SignUpEmailConfirm from "@app/components/SignUpEmailConfirm.svelte"
- import {pushToast} from "@app/util/toast"
+ import {pushToast, popToast} from "@app/util/toast"
import {pushModal} from "@app/util/modal"
type Props = {
@@ -40,6 +40,11 @@
loading = true
try {
+ const toastId = pushToast({
+ timeout: 60_000,
+ message: "Creating your account, please wait...",
+ })
+
const secret = getKey
("signup.secret")!
const {clientOptions, ...registerRes} = await Client.register(2, 3, secret)
@@ -74,6 +79,7 @@
setKey("signup.email", email)
setKey("signup.clientOptions", clientOptions)
+ popToast(toastId)
pushModal(SignUpEmailConfirm, {next})
} catch (e) {
console.error(e)
diff --git a/src/app/core/commands.ts b/src/app/core/commands.ts
index 2ea604a8..5e749d9b 100644
--- a/src/app/core/commands.ts
+++ b/src/app/core/commands.ts
@@ -1,6 +1,8 @@
import {nwc} from "@getalby/sdk"
import * as nip19 from "nostr-tools/nip19"
import {get, derived} from "svelte/store"
+import {Client} from "@pomade/core"
+import type {SessionItem} from "@pomade/core"
import {
first,
sha256,
@@ -71,6 +73,7 @@ import {
waitForThunkError,
getPubkeyRelays,
userBlossomServerList,
+ isPomadeSession,
getThunkError,
} from "@welshman/app"
import {compressFile} from "@lib/html"
@@ -699,3 +702,58 @@ export const updateProfile = async ({
await publishThunk({event, relays}).complete
}
+
+// Pomade
+
+export type PomadeSessionWithPeers = SessionItem & {peers: string[]}
+
+export const loadOtherPomadeSessions = async () => {
+ const $session = get(session)
+
+ if (isPomadeSession($session)) {
+ const client = new Client($session.clientOptions)
+ const result = await client.listSessions()
+ const pubkey = await client.getPubkey()
+
+ if (result.ok) {
+ // Group sessions by client pubkey and collect peers
+ const sessionMap = new Map()
+
+ for (const message of result.messages) {
+ if (!message.res?.items) continue
+
+ for (const item of message.res.items) {
+ if (item.client === pubkey) {
+ continue
+ }
+
+ const existing = sessionMap.get(item.client)
+
+ if (existing) {
+ existing.peers.push(message.url)
+ } else {
+ sessionMap.set(item.client, {...item, peers: [message.url]})
+ }
+ }
+ }
+
+ return Array.from(sessionMap.values())
+ }
+ }
+
+ return []
+}
+
+export const deleteOldPomadeSessions = async () => {
+ const $session = get(session)
+
+ if (isPomadeSession($session)) {
+ const client = new Client($session.clientOptions)
+
+ for (const item of await loadOtherPomadeSessions()) {
+ if (item.deactivated_at) {
+ await client.deleteSession(item.client, item.peers)
+ }
+ }
+ }
+}
diff --git a/src/app/util/logout.ts b/src/app/util/logout.ts
new file mode 100644
index 00000000..b3b25fe6
--- /dev/null
+++ b/src/app/util/logout.ts
@@ -0,0 +1,25 @@
+import {get} from "svelte/store"
+import {Client} from "@pomade/core"
+import {getPubkey} from "@welshman/util"
+import {session, isPomadeSession} from "@welshman/app"
+import {kv, db} from "@app/core/storage"
+import {Push} from "@app/util/notifications"
+
+export const logout = async () => {
+ const $session = get(session)
+
+ if ($session && isPomadeSession($session)) {
+ await new Client($session.clientOptions).deactivateSession(
+ getPubkey($session.clientOptions.secret),
+ $session.clientOptions.peers,
+ )
+ }
+
+ await Push.disable()
+ await kv.clear()
+ await db.clear()
+
+ localStorage.clear()
+
+ window.location.href = "/"
+}