3 files changed, 4 insertions, 6 deletions
diff --git a/src/routes/(app)/[username]/generate/+page.svelte b/src/routes/(app)/[username]/generate/+page.svelte
index 32a38592..3548ccd4 100644
--- a/src/routes/(app)/[username]/generate/+page.svelte
+++ b/src/routes/(app)/[username]/generate/+page.svelte
@@ -1,9 +1,6 @@
 <script>
 	import { fail, post, wait } from '$lib/utils';
-	import { Buffer } from 'buffer';
 	import { onMount } from 'svelte';
-	import { bech32m } from 'bech32';
-	import { generateMnemonic, mnemonicToEntropy, mnemonicToSeedSync } from 'bip39';
 	import { goto, invalidate } from '$app/navigation';
 	import { Pin } from '$comp';
 	import { loginRedirect, pin, password, passwordPrompt } from '$lib/store';
diff --git a/src/routes/(app)/[username]/messages/+page.server.js b/src/routes/(app)/[username]/messages/+page.server.js
index 8347c184..ec5c5eee 100644
--- a/src/routes/(app)/[username]/messages/+page.server.js
+++ b/src/routes/(app)/[username]/messages/+page.server.js
@@ -8,8 +8,9 @@ export async function load({ params, parent, url }) {
 
 	try {
 		messages = await get(`/${user.pubkey}/${since}/messages`);
+
 		messages = messages
-			.filter((m) => m.recipient.id === subject.id || m.author.id === subject.id)
+			.filter((m) => m.recipient?.id === subject.id || m.author?.id === subject.id)
 			.sort((a, b) => a.created_at - b.created_at);
 
 		if (user.id === subject.id) messages = messages.filter((m) => m.recipient.id === m.author.id);
diff --git a/src/routes/(app)/[username]/messages/+page.svelte b/src/routes/(app)/[username]/messages/+page.svelte
index 7a10d605..cfa7f741 100644
--- a/src/routes/(app)/[username]/messages/+page.svelte
+++ b/src/routes/(app)/[username]/messages/+page.svelte
@@ -10,7 +10,7 @@
 	import { sign, send, encrypt, decrypt } from '$lib/nostr';
 	import { event as e, password } from '$lib/store';
 	import { tick, onMount } from 'svelte';
-	import { calculateId } from 'nostr';
+	import { getEventHash } from 'nostr-tools';
 
 	export let data;
 
@@ -77,8 +77,8 @@
 		tick().then(() => pane && (pane.scrollTop = pane.scrollHeight));
 
 		try {
-			event.id = await calculateId(event);
 			event.content = await encrypt({ message: event.message, recipient: subject.pubkey, user });
+			event.id = getEventHash(event);
 			await sign({ event, user });
 			await send(event);