From 77cfe07ff723200ffa4e262a04780f123a680edf Mon Sep 17 00:00:00 2001
From: Attila Gazso <230163+agazso@users.noreply.github.com>
Date: Wed, 29 Nov 2023 11:54:26 +0100
Subject: [PATCH] feat: default babbles (#500)

---
 src/lib/adapters/waku/index.ts | 6 ++++++
 src/routes/+page.svelte        | 9 ++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/lib/adapters/waku/index.ts b/src/lib/adapters/waku/index.ts
index 3b907194..b8bdec61 100644
--- a/src/lib/adapters/waku/index.ts
+++ b/src/lib/adapters/waku/index.ts
@@ -483,6 +483,12 @@ export default class WakuAdapter implements Adapter {
 		})
 		this.subscriptions.push(subscribeInstalledObjectStore)
 
+		// subscribe to default Babbles
+		const defaultBabblesId = '0fbc5ad135290633aab3f37e5e0529fefa3c77cd9122b9a9e814bc8622e44d3f'
+		if (!get(chats).chats.has(defaultBabblesId)) {
+			await this.startBabbles(wallet, defaultBabblesId, 'Babbles')
+		}
+
 		// deferred updates
 		fetchBalances(address)
 		this.updateContactProfiles()
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index bfbea352..2b13e8ef 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -152,7 +152,9 @@
 				</svelte:fragment>
 				<ul class="chats" aria-label="Chat List">
 					{#each orderedChats as chat}
-						{@const userMessages = chat.messages.filter((message) => message.type === 'user')}
+						{@const userMessages = chat.messages.filter(
+							(message) => message.type === 'user' || message.type === 'babble',
+						)}
 						{@const lastMessage =
 							userMessages.length > 0 ? userMessages[userMessages.length - 1] : undefined}
 						{@const myMessage = lastMessage && lastMessage.senderPublicKey === publicKey}
@@ -182,7 +184,7 @@
 														</span>
 														<Events />
 													{:else if isBabbles(chat)}
-														<span class="truncate"> Babbles </span>
+														<span class="truncate">{chat?.name}</span>
 														<Babbles />
 													{:else}
 														<span class="truncate">
@@ -204,7 +206,8 @@
 											<p class={`message text-serif ${myMessage ? 'my-message' : ''}`}>
 												{#if chat.joined}
 													{senderName}
-													{@html lastMessage && lastMessage.type === 'user'
+													{@html lastMessage &&
+													(lastMessage.type === 'user' || lastMessage.type === 'babble')
 														? replaceAddressesWithNames(lastMessage.text?.substring(0, 150), chat)
 														: 'No messages yet'}
 												{:else if isGroupChat(chat)}