From 4639734a244d07c2190274c42621dfbb620f94ce Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Thu, 5 Jan 2023 07:41:29 -0800
Subject: messages page

---
 .../(app)/[username]/(profile)/+layout.svelte      |  10 ++
 .../[username]/(profile)/messages/+page.server.js  |  16 ++++
 .../[username]/(profile)/messages/+page.svelte     | 106 +++++++++++++++++++++
 src/routes/(app)/[username]/message/+page.svelte   |  41 --------
 4 files changed, 132 insertions(+), 41 deletions(-)
 create mode 100644 src/routes/(app)/[username]/(profile)/messages/+page.server.js
 create mode 100644 src/routes/(app)/[username]/(profile)/messages/+page.svelte
 delete mode 100644 src/routes/(app)/[username]/message/+page.svelte

(limited to 'src/routes/(app)')

diff --git a/src/routes/(app)/[username]/(profile)/+layout.svelte b/src/routes/(app)/[username]/(profile)/+layout.svelte
index 2d259256..98842016 100644
--- a/src/routes/(app)/[username]/(profile)/+layout.svelte
+++ b/src/routes/(app)/[username]/(profile)/+layout.svelte
@@ -83,6 +83,16 @@
 					</div>
 				{/if}
 			{/if}
+			<div class="w-full flex">
+				<a href={`/${subject.pubkey}/messages`} class="mx-auto">
+					<button class="rounded-full border py-3 px-6 font-bold hover:opacity-80 flex w-60">
+						<div class="mx-auto flex">
+							<Icon icon="support" style="mr-1" />
+							<div>Message</div>
+						</div>
+					</button>
+				</a>
+			</div>
 			{#if !subject.anon}
 				<div class="w-full flex">
 					<a href={`/${subject.username}/receive`} class="mx-auto">
diff --git a/src/routes/(app)/[username]/(profile)/messages/+page.server.js b/src/routes/(app)/[username]/(profile)/messages/+page.server.js
new file mode 100644
index 00000000..2efddf77
--- /dev/null
+++ b/src/routes/(app)/[username]/(profile)/messages/+page.server.js
@@ -0,0 +1,16 @@
+import { get } from '$lib/utils';
+
+export async function load({ params, parent, url }) {
+	let { user, subject } = await parent();
+
+	let messages = [];
+
+	try {
+		messages = await get(`/nostr/${user.pubkey}/${subject.pubkey}/messages`);
+		console.log('MESSAGES', messages);
+	} catch (e) {
+		console.log(`failed to fetch nostr messages`, e);
+	}
+
+	return { messages };
+}
diff --git a/src/routes/(app)/[username]/(profile)/messages/+page.svelte b/src/routes/(app)/[username]/(profile)/messages/+page.svelte
new file mode 100644
index 00000000..3f8f5a72
--- /dev/null
+++ b/src/routes/(app)/[username]/(profile)/messages/+page.svelte
@@ -0,0 +1,106 @@
+<script>
+	import { t } from '$lib/translations';
+	import { format, parseISO } from 'date-fns';
+	import { scale } from 'svelte/transition';
+	import { enhance } from '$app/forms';
+	import { Icon } from '$comp';
+	import { back, failure } from '$lib/utils';
+	import { sign, send, encrypt, decrypt } from '$lib/nostr';
+
+	export let data;
+	export let form;
+
+	const scrollToBottom = (node) => {
+		const scroll = () =>
+			node.scroll({
+				top: node.scrollHeight,
+				behavior: 'smooth'
+			});
+		scroll();
+
+		return { update: scroll };
+	};
+
+	let { messages, subject, user } = data;
+
+	let sent, submitting, message;
+	let submit = async () => {
+		submitting = true;
+
+		let event = {
+			pubkey: user.pubkey,
+			created_at: Math.floor(Date.now() / 1000),
+			kind: 4,
+			tags: [['p', subject.pubkey]]
+		};
+
+		event.message = message;
+		messages.push(event);
+		messages = messages;
+
+		try {
+			event.content = await encrypt({ message, recipient: subject.pubkey, user });
+			await sign({ event, user });
+			await send(event);
+
+			sent = true;
+		} catch (e) {
+			failure('Failed to send message');
+			messages.pop();
+			messages = messages;
+		}
+
+		submitting = false;
+	};
+</script>
+
+<div class="container max-w-lg px-4 mx-auto mt-10 space-y-5">
+	<h1 class="px-3 md:px-0 text-center text-3xl md:text-4xl font-semibold">
+		{$t('transactions.sendMessage')}
+	</h1>
+
+	<div class="max-h-[calc(50vh)] overflow-y-scroll p-4" use:scrollToBottom={messages}>
+		{#each messages as event}
+			{@const ours = event.pubkey === user.pubkey}
+			{@const theirs = !ours}
+			<div class="rounded-2xl p-4 max-w-[300px] mb-1 text-md" class:ours class:theirs>
+				{#if event.message}
+					{event.message}
+				{:else}
+					{#await decrypt({ event, user })}
+						-
+					{:then message}
+						{(event.message = message) && ''}
+						{event.message}
+					{/await}
+				{/if}
+			</div>
+			<div class="text-sm text-gray-400 ml-2 mb-6">
+				{format(new Date(event.created_at * 1000), 'MMM d')},
+				{format(new Date(event.created_at * 1000), 'h:mm aa')}
+			</div>
+		{/each}
+	</div>
+
+	<form method="POST" class="space-y-5" on:submit|preventDefault={submit}>
+		<input type="hidden" name="requester_id" value={user.id} />
+		<input type="hidden" name="recipient" value={subject.username} />
+
+		<input
+			name="message"
+			placeholder={$t('transactions.sendMessage')}
+			class="w-full p-4 border rounded-xl"
+			bind:value={message}
+		/>
+	</form>
+</div>
+
+<style>
+	.ours {
+		@apply bg-gray-100 rounded-br-none ml-auto;
+	}
+
+	.theirs {
+		@apply bg-gray-200 rounded-bl-none;
+	}
+</style>
diff --git a/src/routes/(app)/[username]/message/+page.svelte b/src/routes/(app)/[username]/message/+page.svelte
deleted file mode 100644
index c8a57b79..00000000
--- a/src/routes/(app)/[username]/message/+page.svelte
+++ /dev/null
@@ -1,41 +0,0 @@
-<script>
-	import { t } from '$lib/translations';
-	import { enhance } from '$app/forms';
-	import { Icon } from '$comp';
-	import { back } from '$lib/utils';
-
-	export let data;
-	export let form;
-
-	let { subject, user } = data;
-</script>
-
-<button class="ml-5 md:ml-20 mt-10 hover:opacity-80" on:click={back}>
-	<Icon icon="arrow-left" style="w-10" />
-</button>
-
-<div class="container max-w-lg px-4 mx-auto mt-10 space-y-5">
-	<h1 class="px-3 md:px-0 text-center text-3xl md:text-4xl font-semibold">
-		{$t('transactions.sendMessage')}
-	</h1>
-
-	<form action="?/create" method="POST" use:enhance class="space-y-5">
-		<input type="hidden" name="requester_id" value={user.id} />
-		<input type="hidden" name="recipient" value={subject.username} />
-
-		<textarea
-			name="memo"
-			placeholder={$t('transactions.sendMessage')}
-			class="w-full p-4 border rounded-xl h-48"
-		/>
-
-		<div class="w-full flex">
-			<button
-				type="submit"
-				class="bg-black text-white border rounded-full px-6 py-2 font-bold mx-auto"
-			>
-				{$t('transactions.submit')}
-			</button>
-		</div>
-	</form>
-</div>
-- 
cgit v1.2.3