From 1eec6338e1146439b1dbc6207843fbc44dd13088 Mon Sep 17 00:00:00 2001
From: Owen Jacobson <owen@grimoire.ca>
Date: Wed, 30 Oct 2024 18:01:48 -0400
Subject: Don't leave field binding vars uninitialized.

This was causing problems for changing passwords: if the user didn't type anything in the "original password" field, the code path to sending that field to the server was just straight-up omitting the field from the message, rather than setting it to empty string, causing a 422 Unprocessable Entity.

On investigation we had latent bugs related to this in a bunch of spots.
---
 ui/lib/components/CreateChannelForm.svelte |  9 +++++----
 ui/lib/components/MessageInput.svelte      | 10 +++++-----
 2 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'ui/lib/components')

diff --git a/ui/lib/components/CreateChannelForm.svelte b/ui/lib/components/CreateChannelForm.svelte
index ddcf486..b716736 100644
--- a/ui/lib/components/CreateChannelForm.svelte
+++ b/ui/lib/components/CreateChannelForm.svelte
@@ -1,16 +1,17 @@
 <script>
     import { createChannel } from '$lib/apiServer';
 
-    let name = '';
-    let disabled = false;
+    let name = "";
+    let pending = false;
+    $: disabled = pending;
 
     async function handleSubmit(event) {
-        disabled = true;
+        pending = true;
         const response = await createChannel(name);
         if (200 <= response.status && response.status < 300) {
             name = '';
         }
-        disabled = false;
+        pending = false;
     }
 </script>
 
diff --git a/ui/lib/components/MessageInput.svelte b/ui/lib/components/MessageInput.svelte
index b2746e0..03ac7fa 100644
--- a/ui/lib/components/MessageInput.svelte
+++ b/ui/lib/components/MessageInput.svelte
@@ -5,16 +5,16 @@
     export let channel = null;
     let input;
     let value = '';
-    let sending = false;
+    let pending = false;
 
-    $: disabled = (channel === null);
+    $: disabled = pending || (channel === null);
 
     async function handleSubmit() {
         if (channel !== null) {
-            sending = true;
+            pending = true;
             // TODO try/catch:
             await postToChannel(channel, value);
-            sending = false;
+            pending = false;
             value = '';
             await tick();
             input.focus();
@@ -23,6 +23,6 @@
 </script>
 
 <form on:submit|preventDefault={handleSubmit} class="flex flex-row flex-nowrap">
-    <input bind:this={input} bind:value={value} disabled={sending || disabled} type="search" class="flex-auto h-6 input rounded-r-none" />
+    <input bind:this={input} bind:value={value} disabled={disabled} type="search" class="flex-auto h-6 input rounded-r-none" />
     <button color="primary variant-filled-secondary" type="submit" class="flex-none w-6 h-6 btn-icon variant-filled rounded-l-none">&raquo;</button>
 </form>
-- 
cgit v1.2.3


From a356546fc706b2ade758e7f42069e6d669330421 Mon Sep 17 00:00:00 2001
From: Owen Jacobson <owen@grimoire.ca>
Date: Wed, 30 Oct 2024 18:50:01 -0400
Subject: Coalesce adjacent messages by the same author into runs, to
 consolidate message display.

---
 ui/lib/components/ActiveChannel.svelte | 27 +++++++++++++++++++++++++--
 ui/lib/components/Message.svelte       | 21 +++++----------------
 ui/lib/components/MessageRun.svelte    | 20 ++++++++++++++++++++
 ui/lib/store/messages.js               |  3 ---
 4 files changed, 50 insertions(+), 21 deletions(-)
 create mode 100644 ui/lib/components/MessageRun.svelte

(limited to 'ui/lib/components')

diff --git a/ui/lib/components/ActiveChannel.svelte b/ui/lib/components/ActiveChannel.svelte
index ece9f55..1b23bc1 100644
--- a/ui/lib/components/ActiveChannel.svelte
+++ b/ui/lib/components/ActiveChannel.svelte
@@ -1,10 +1,33 @@
 <script>
     import { messages } from '$lib/store';
     import Message from './Message.svelte';
+    import MessageRun from './MessageRun.svelte';
 
     export let channel = null;
     $: messageList = channel !== null ? $messages.inChannel(channel) : [];
 
+    function *chunkBy(xs, fn) {
+        let chunk;
+        let key;
+        for (let x of xs) {
+            let newKey = fn(x);
+            if (key !== newKey) {
+                if (chunk !== undefined) {
+                    yield [key, chunk];
+                }
+
+                chunk = [x];
+                key = newKey;
+            } else {
+                chunk.push(x);
+            }
+        }
+        if (chunk !== undefined) {
+            yield [key, chunk];
+        }
+    }
+
+
     let container;
     // TODO: eventually, store scroll height/last unread in channel? scroll there?
 
@@ -14,9 +37,9 @@
 </script>
 
 <div class="container" bind:this={container}>
-    {#each messageList as message}
+    {#each chunkBy(messageList, msg => msg.sender) as [sender, messages]}
         <div use:scroll>
-            <Message {...message} />
+            <MessageRun {sender} {messages} />
         </div>
     {/each}
 </div>
diff --git a/ui/lib/components/Message.svelte b/ui/lib/components/Message.svelte
index d040433..ef8ea0b 100644
--- a/ui/lib/components/Message.svelte
+++ b/ui/lib/components/Message.svelte
@@ -1,33 +1,22 @@
 <script>
     import SvelteMarkdown from 'svelte-markdown';
-    import { currentUser, logins } from '$lib/store';
-    import { deleteMessage } from '$lib/apiServer';
 
-    export let at;  // XXX: Omitted for now.
-    export let sender;
+    export let at;
     export let body;
-
-    let timestamp = new Date(at).toTimeString();
-    let name;
-    $: name = $logins.get(sender);
 </script>
 
-<div class="card card-hover m-4 relative">
-    <span class="chip variant-soft sticky top-o left-0">
-        <!-- TODO: should this show up for only the first of a run? -->
-        @{name}:
-    </span>
+<div class="message relative">
     <span class="timestamp chip variant-soft absolute top-0 right-0">{at}</span>
-    <section class="p-4">
+    <section class="p-1">
         <SvelteMarkdown source={body} />
     </section>
 </div>
 
 <style>
-    .card .timestamp {
+    .message .timestamp {
         display: none;
     }
-    .card:hover .timestamp {
+    .message:hover .timestamp {
         display: flex;
     }
 </style>
diff --git a/ui/lib/components/MessageRun.svelte b/ui/lib/components/MessageRun.svelte
new file mode 100644
index 0000000..b998a8b
--- /dev/null
+++ b/ui/lib/components/MessageRun.svelte
@@ -0,0 +1,20 @@
+<script>
+	import { logins } from '$lib/store';
+	import Message from '$lib/components/Message.svelte';
+
+	export let sender;
+	export let messages;
+
+	let name;
+	$: name = $logins.get(sender);
+</script>
+
+<div class="card card-hover m-4 relative">
+	<span class="chip variant-soft sticky top-o left-0">
+		<!-- TODO: should this show up for only the first of a run? -->
+		@{name}:
+	</span>
+	{#each messages as { at, body }}
+		<Message {at} {body} />
+	{/each}
+</div>
diff --git a/ui/lib/store/messages.js b/ui/lib/store/messages.js
index 931b8fb..7d1fbe1 100644
--- a/ui/lib/store/messages.js
+++ b/ui/lib/store/messages.js
@@ -17,9 +17,6 @@ export class Messages {
 		for (let { channel, id, at, sender, body } of messages) {
 			this.inChannel(channel).push({ id, at, sender, body, });
 		}
-		for (let channel in this.channels) {
-			this.channels[channel].sort((a, b) => a.at - b.at);
-		}
 		return this;
 	}
 
-- 
cgit v1.2.3


From 35b8a914b867237c9c64f33838b1e1f85fc46fb8 Mon Sep 17 00:00:00 2001
From: Owen Jacobson <owen@grimoire.ca>
Date: Wed, 30 Oct 2024 18:55:32 -0400
Subject: Nicer margins

---
 ui/lib/components/Message.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ui/lib/components')

diff --git a/ui/lib/components/Message.svelte b/ui/lib/components/Message.svelte
index ef8ea0b..004a484 100644
--- a/ui/lib/components/Message.svelte
+++ b/ui/lib/components/Message.svelte
@@ -7,7 +7,7 @@
 
 <div class="message relative">
     <span class="timestamp chip variant-soft absolute top-0 right-0">{at}</span>
-    <section class="p-1">
+    <section class="mx-4 my-1">
         <SvelteMarkdown source={body} />
     </section>
 </div>
-- 
cgit v1.2.3