From 03e9e6de0c64670f37d8bce76bb415759186b950 Mon Sep 17 00:00:00 2001 From: Jon Staab Date: Tue, 15 Oct 2024 10:43:13 -0700 Subject: [PATCH 1/5] Fix notifications spacing --- src/app/views/NotificationMention.svelte | 2 +- src/app/views/NotificationReactions.svelte | 2 +- src/app/views/NotificationReplies.svelte | 2 +- src/app/views/NotificationSectionGroups.svelte | 16 +++++++++------- src/app/views/Notifications.svelte | 4 ++-- 5 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/app/views/NotificationMention.svelte b/src/app/views/NotificationMention.svelte index af1101b08..c07e958ec 100644 --- a/src/app/views/NotificationMention.svelte +++ b/src/app/views/NotificationMention.svelte @@ -16,7 +16,7 @@ const event = deriveEvent(root) -
+
{formatTimestamp(timestamp)} diff --git a/src/app/views/NotificationReactions.svelte b/src/app/views/NotificationReactions.svelte index 0d0181e4b..515c8977e 100644 --- a/src/app/views/NotificationReactions.svelte +++ b/src/app/views/NotificationReactions.svelte @@ -32,7 +32,7 @@ {#if $event?.pubkey === $pubkey} -
+
diff --git a/src/app/views/NotificationReplies.svelte b/src/app/views/NotificationReplies.svelte index e1dda925a..1e8c2de1c 100644 --- a/src/app/views/NotificationReplies.svelte +++ b/src/app/views/NotificationReplies.svelte @@ -14,7 +14,7 @@ const event = deriveEvent(root) -
+
{formatTimestamp(timestamp)} diff --git a/src/app/views/NotificationSectionGroups.svelte b/src/app/views/NotificationSectionGroups.svelte index 2a666e690..893664918 100644 --- a/src/app/views/NotificationSectionGroups.svelte +++ b/src/app/views/NotificationSectionGroups.svelte @@ -45,13 +45,15 @@ {#each $groupNotifications.slice(0, limit) as notification, i (notification.id)} - {#if isGroupAlert(notification)} - - {:else if isGroupRequest(notification)} - - {:else} - - {/if} +
+ {#if isGroupAlert(notification)} + + {:else if isGroupRequest(notification)} + + {:else} + + {/if} +
{:else}

No notifications found - check back later!

{/each} diff --git a/src/app/views/Notifications.svelte b/src/app/views/Notifications.svelte index c4eae08c7..8b18f0544 100644 --- a/src/app/views/Notifications.svelte +++ b/src/app/views/Notifications.svelte @@ -78,7 +78,7 @@ {/if} - +
{#if activeTab === allTabs[0]} {:else if activeTab === allTabs[1]} @@ -86,4 +86,4 @@ {:else if activeTab === allTabs[2]} {/if} - +
From 744d9153f443eff94eb50ce66f2e7551422db7c3 Mon Sep 17 00:00:00 2001 From: Jon Staab Date: Tue, 15 Oct 2024 11:05:32 -0700 Subject: [PATCH 2/5] Fix message fetching --- src/engine/requests.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/engine/requests.ts b/src/engine/requests.ts index 0214bdcaf..375ee4745 100644 --- a/src/engine/requests.ts +++ b/src/engine/requests.ts @@ -417,8 +417,8 @@ export const listenForMessages = (pubkeys: string[]) => { forcePlatform: false, relays: ctx.app.router.Messages(pubkeys).getUrls(), filters: [ - {kinds: [DEPRECATED_DIRECT_MESSAGE], authors: allPubkeys}, - {kinds: [DEPRECATED_DIRECT_MESSAGE, WRAP], "#p": [pubkey.get()]}, + {kinds: [DEPRECATED_DIRECT_MESSAGE], authors: allPubkeys, "#p": allPubkeys}, + {kinds: [WRAP], "#p": [pubkey.get()]}, ], }) } From a8b8d48ed6594e6ca4d64ca57e970beddf13eb0e Mon Sep 17 00:00:00 2001 From: Jon Staab Date: Tue, 15 Oct 2024 11:07:00 -0700 Subject: [PATCH 3/5] Bump welshman app --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6bc692614..889dc310b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,7 +15,7 @@ "@fortawesome/fontawesome-free": "^6.6.0", "@getalby/bitcoin-connect": "^3.6.2", "@scure/base": "^1.1.7", - "@welshman/app": "~0.0.15", + "@welshman/app": "~0.0.16", "@welshman/content": "~0.0.12", "@welshman/dvm": "~0.0.10", "@welshman/feeds": "~0.0.20", @@ -4217,9 +4217,9 @@ } }, "node_modules/@welshman/app": { - "version": "0.0.15", - "resolved": "https://registry.npmjs.org/@welshman/app/-/app-0.0.15.tgz", - "integrity": "sha512-rIKJSuWB7uqc1jGtEPEJk/lSFQQVB3qmKESuS55CicBguULljyr0inatSujJo6X3QpN4kLtDLph7gC6HEAWadg==", + "version": "0.0.16", + "resolved": "https://registry.npmjs.org/@welshman/app/-/app-0.0.16.tgz", + "integrity": "sha512-XR60o3iQlMMMvnf8UuSCz5tpMVfR6Ifq/5GGXVlmNF5ngHi0D6NKWoa4r86iJ3Tac3dtl36ZUdzyJksJi618rg==", "dependencies": { "@welshman/dvm": "~0.0.10", "@welshman/feeds": "~0.0.20", diff --git a/package.json b/package.json index 13cea0837..00df01a89 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,7 @@ "@fortawesome/fontawesome-free": "^6.6.0", "@getalby/bitcoin-connect": "^3.6.2", "@scure/base": "^1.1.7", - "@welshman/app": "~0.0.15", + "@welshman/app": "~0.0.16", "@welshman/content": "~0.0.12", "@welshman/dvm": "~0.0.10", "@welshman/feeds": "~0.0.20", From bc4224e9f698807cc253d45b829c6300e43b59ad Mon Sep 17 00:00:00 2001 From: Jon Staab Date: Tue, 15 Oct 2024 11:23:38 -0700 Subject: [PATCH 4/5] Load user inbox relays --- src/app/state.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/app/state.ts b/src/app/state.ts index ed01fd6e8..9ac974b6d 100644 --- a/src/app/state.ts +++ b/src/app/state.ts @@ -13,6 +13,7 @@ import { loadFollows, loadMutes, getFollows, + loadInboxRelaySelections, } from "@welshman/app" import {appDataKeys} from "src/util/nostr" import {router} from "src/app/util/router" @@ -99,6 +100,7 @@ export const loadUserData = async (hints: string[] = []) => { // Load crucial user data await Promise.all([ + loadInboxRelaySelections($pubkey, {relays}), loadProfile($pubkey, {relays}), loadFollows($pubkey, {relays}), loadMutes($pubkey, {relays}), From 1b0e57fe0eaa1525f8ca91ba643e97010b92a0cb Mon Sep 17 00:00:00 2001 From: Jon Staab Date: Tue, 15 Oct 2024 11:24:25 -0700 Subject: [PATCH 5/5] Update changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 29ef59628..06f518e73 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +# 0.4.14 + +- [x] Fix some bugs related to message discovery + # 0.4.13 - [x] Add support for nip05 urls