From b2dfd7eef4a3e892b3eeb6822f2e472b3be03267 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Thu, 22 Dec 2022 13:39:06 -0800
Subject: fix avatars

---
 src/routes/(app)/[username]/+layout.server.js      |  3 ++-
 src/routes/(app)/[username]/+page.server.js        |  1 -
 src/routes/(app)/[username]/+page.svelte           |  7 ++++++-
 src/routes/(app)/[username]/dashboard/+page.svelte | 12 ++++++++++++
 src/routes/(app)/feed/+page.svelte                 |  1 -
 5 files changed, 20 insertions(+), 4 deletions(-)

(limited to 'src/routes')

diff --git a/src/routes/(app)/[username]/+layout.server.js b/src/routes/(app)/[username]/+layout.server.js
index f5bf338e..7823f7de 100644
--- a/src/routes/(app)/[username]/+layout.server.js
+++ b/src/routes/(app)/[username]/+layout.server.js
@@ -5,7 +5,8 @@ export let load = async ({ params: { username } }) => {
 	try {
 		return { subject: await get(`/users/${username}`) };
 	} catch (e) {
-		if (username.length === 64) return { subject: { username, pubkey: username } };
+		if (username.length === 64)
+			return { subject: { username: username.substr(0, 6), pubkey: username, anon: true } };
 		throw error(500, 'Unable to retrieve user account data');
 	}
 };
diff --git a/src/routes/(app)/[username]/+page.server.js b/src/routes/(app)/[username]/+page.server.js
index 442b4eb5..e406253f 100644
--- a/src/routes/(app)/[username]/+page.server.js
+++ b/src/routes/(app)/[username]/+page.server.js
@@ -19,7 +19,6 @@ export async function load({ params, parent, url }) {
 
 	events.map((e) => {
 		e.seen = e.created_at;
-		e.user = subject;
 	});
 
 	return { events, src, text };
diff --git a/src/routes/(app)/[username]/+page.svelte b/src/routes/(app)/[username]/+page.svelte
index 22e40a9c..b4f609a9 100644
--- a/src/routes/(app)/[username]/+page.svelte
+++ b/src/routes/(app)/[username]/+page.svelte
@@ -126,7 +126,12 @@
 			{#if events.length}
 				<Feed {events} />
 			{:else}
-        <div class="text-center text-2xl mt-20">Nothing here yet. Post your first <a href="https://github.com/nostr-protocol/nostr#nostr---notes-and-other-stuff-transmitted-by-relays" class="underline">nostr</a> note!</div>
+				<div class="text-center text-2xl mt-20">
+					Nothing here yet. Post your first <a
+						href="https://github.com/nostr-protocol/nostr#nostr---notes-and-other-stuff-transmitted-by-relays"
+						class="underline">nostr</a
+					> note!
+				</div>
 			{/if}
 		</div>
 	</div>
diff --git a/src/routes/(app)/[username]/dashboard/+page.svelte b/src/routes/(app)/[username]/dashboard/+page.svelte
index 0b49a870..9c321472 100644
--- a/src/routes/(app)/[username]/dashboard/+page.svelte
+++ b/src/routes/(app)/[username]/dashboard/+page.svelte
@@ -6,6 +6,8 @@
 	import { rate, password, selectedRate } from '$lib/store';
 	import { goto } from '$app/navigation';
 	import { t } from '$lib/translations';
+	import { events } from '$lib/store';
+	import { Feed } from '$comp';
 
 	export let data;
 	$: ({ invoices, requests } = data);
@@ -55,6 +57,10 @@
 	$: btcPrice = f($selectedRate, user.currency);
 
 	$: accountBalanceBtc = user.account.balance / sats;
+
+	$: sorted = Object.values($events)
+		.filter((ev) => ev?.pubkey)
+		.sort((a, b) => b.seen - a.seen);
 </script>
 
 <div class="container px-4 max-w-md mx-auto mt-20 space-y-12 mb-8">
@@ -170,3 +176,9 @@
 		</div>
 	</div>
 </div>
+
+<div class="mb-20">
+	<div class="container w-full mx-auto text-lg px-4 md:max-w-2xl space-y-5">
+		<Feed events={sorted} />
+	</div>
+</div>
diff --git a/src/routes/(app)/feed/+page.svelte b/src/routes/(app)/feed/+page.svelte
index 2a92ff57..61f638e7 100644
--- a/src/routes/(app)/feed/+page.svelte
+++ b/src/routes/(app)/feed/+page.svelte
@@ -5,7 +5,6 @@
 	export let data;
 	let { user } = data;
 
-	$: length = $events?.q?.length;
 	$: sorted = Object.values($events)
 		.filter((ev) => ev?.pubkey)
 		.sort((a, b) => b.seen - a.seen);
-- 
cgit v1.2.3