@@ -1,5 +1,5 @@
11 import { useCallback, useEffect, useRef, useState } from "react";
2-import { AtSign, Hash, Menu, MoreHorizontal, PhoneOff, ScreenShare, Settings as SettingsIcon, Trash2, Video } from "lucide-react";
2+import { AtSign, Hash, Menu, MoreHorizontal, PhoneOff, Pin, ScreenShare, Settings as SettingsIcon, Trash2, Video, X } from "lucide-react";
33 import { cn } from "cn";
44 import { Button, Centered, IconButton, Menu as MenuPrimitive, MenuItem } from "@/ui";
55 import { api } from "../lib/api";
@@ -97,8 +97,21 @@ export default function Chat({ user, onLogout }: { user: User; onLogout: () => v
9797 const [unread, setUnread] = useState<Record<number, number>>({});
9898 const [collapsed, setCollapsed] = useState<Set<number>>(loadCollapsed);
9999 const [previewState, setPreviewState] = useState<Record<number, boolean>>(loadPreviewState);
100- const [editing, setEditing] = useState<{ id: number; body: string } | null>(null);
101- const [active, setActive] = useState<Message | null>(null);
100+ // The message being edited, and whether the pinned sidebar started it.
101+ // Only that view shows the editor, so a message on screen twice never opens
102+ // two textareas at once.
103+ const [editing, setEditing] = useState<{ id: number; body: string; pane: boolean } | null>(null);
104+ // The message whose actions are open, the element they are anchored to (the
105+ // same message can be on screen twice), and the view they were opened from.
106+ const [active, setActive] = useState<{
107+ message: Message;
108+ anchor: HTMLElement;
109+ pane: boolean;
110+ } | null>(null);
111+ // Pinned messages of the channel on screen, and whether the pane showing
112+ // them is open. Both only ever describe the selected channel.
113+ const [pins, setPins] = useState<Message[]>([]);
114+ const [showPins, setShowPins] = useState(false);
102115 const [voiceRooms, setVoiceRooms] = useState<Record<string, VoiceOccupant[]>>({});
103116 const [view, setView] = useState<"channel" | "settings">("channel");
104117 const [openShare, setOpenShare] = useState<string | null>(null);
@@ -165,6 +178,15 @@ export default function Chat({ user, onLogout }: { user: User; onLogout: () => v
165178 }));
166179 } else if (ev.type === "ring_end" && ev.channelId) {
167180 setRinging((r) => (r === ev.channelId ? null : r));
181+ } else if ((ev.type === "pin" || ev.type === "unpin") && ev.message) {
182+ const pinned = ev.message;
183+ if (pinned.channelId !== selectedId.current) return;
184+ // Pins read oldest first, like the channel they came from.
185+ setPins((p) =>
186+ ev.type === "pin"
187+ ? [...p.filter((m) => m.id !== pinned.id), pinned].sort((a, b) => a.id - b.id)
188+ : p.filter((m) => m.id !== pinned.id),
189+ );
168190 } else if (ev.message) {
169191 if (ev.type === "message") {
170192 // A sent message ends that person's typing.
@@ -189,10 +211,13 @@ export default function Chat({ user, onLogout }: { user: User; onLogout: () => v
189211 }
190212 if (ev.message.channelId === selectedId.current) {
191213 if (ev.type === "message") setMessages((prev) => [...prev, ev.message!]);
192- else if (ev.type === "message_edit")
214+ else if (ev.type === "message_edit") {
193215 setMessages((prev) => prev.map((m) => (m.id === ev.message!.id ? ev.message! : m)));
194- else if (ev.type === "message_delete")
216+ setPins((prev) => prev.map((m) => (m.id === ev.message!.id ? ev.message! : m)));
217+ } else if (ev.type === "message_delete") {
195218 setMessages((prev) => prev.filter((m) => m.id !== ev.message!.id));
219+ setPins((prev) => prev.filter((m) => m.id !== ev.message!.id));
220+ }
196221 }
197222 }
198223 },
@@ -361,6 +386,22 @@ export default function Chat({ user, onLogout }: { user: User; onLogout: () => v
361386 .catch(() => {});
362387 }, [selected]);
363388
389+ // Pins are per channel and only matter for the one on screen: the header
390+ // button and the pane both read this list. Asking for them here keeps the
391+ // pane instant when it opens, and keeps the button honest about whether the
392+ // channel has any.
393+ useEffect(() => {
394+ setPins([]);
395+ setShowPins(false);
396+ if (selected?.type !== "text" && selected?.type !== "dm") return;
397+ const id = selected.id;
398+ api<Message[]>(`/channels/${id}/pins`)
399+ .then((p) => {
400+ if (selectedId.current === id) setPins(p);
401+ })
402+ .catch(() => {});
403+ }, [selected]);
404+
364405 // loadOlder appends the page above the first loaded message. It only runs
365406 // when the reader asks for it, so a slow channel costs nothing to scroll.
366407 async function loadOlder() {
@@ -444,14 +485,27 @@ export default function Chat({ user, onLogout }: { user: User; onLogout: () => v
444485 }).catch(() => {});
445486 }
446487
447- function startEdit(m: Message) {
448- setEditing({ id: m.id, body: m.body });
488+ // The actions overlay pins and unpins with the same click. The server pushes
489+ // the change back to every client, this one included.
490+ function pinMessage(m: Message, pinned: boolean) {
491+ api(`/messages/${m.id}/pin`, { method: pinned ? "DELETE" : "POST" }).catch((e: Error) =>
492+ toast(e.message),
493+ );
494+ }
495+
496+ function togglePin(m: Message) {
497+ setActive(null);
498+ pinMessage(m, pins.some((p) => p.id === m.id));
499+ }
500+
501+ function startEdit(m: Message, pane: boolean) {
502+ setEditing({ id: m.id, body: m.body, pane });
449503 setActive(null);
450504 }
451505
452506 function startEditLast() {
453507 const last = [...messages].reverse().find((m) => m.username === user.username);
454- if (last) setEditing({ id: last.id, body: last.body });
508+ if (last) startEdit(last, false);
455509 }
456510
457511 async function saveEdit() {
@@ -483,6 +537,12 @@ export default function Chat({ user, onLogout }: { user: User; onLogout: () => v
483537 setPreviewState((prev) => ({ ...prev, ...Object.fromEntries(cards) }));
484538 }
485539
540+ // openActions toggles the popover for the message acted on, remembering the
541+ // row it came from so the popover lands next to it.
542+ function openActions(m: Message, anchor: HTMLElement, pane: boolean) {
543+ setActive((a) => (a?.message.id === m.id ? null : { message: m, anchor, pane }));
544+ }
545+
486546 function deleteMessage(m: Message) {
487547 setActive(null);
488548 api(`/messages/${m.id}`, { method: "DELETE" }).catch(() => {});
@@ -609,32 +669,43 @@ export default function Chat({ user, onLogout }: { user: User; onLogout: () => v
609669 <Hash size={16} className="text-faint" />
610670 ))}
611671 <span className="truncate text-sm font-medium">{selected?.name}</span>
612- {selected?.type === "dm" && (
613- <IconButton
614- label={inCall ? "leave call" : ringing === selected.id ? "answer call" : "start video call"}
615- variant={inCall ? "danger" : ringing === selected.id ? "primary" : "ghost"}
616- size="sm"
617- onClick={() => (inCall ? voice.leave() : startCall(selected))}
618- >
619- {inCall ? <PhoneOff /> : <Video />}
620- </IconButton>
621- )}
622- {selected?.type === "text" && !selected.permanent && (
623- <MenuPrimitive
624- className="ml-auto"
625- trigger={
626- <IconButton label="channel actions" size="sm">
627- <MoreHorizontal />
628- </IconButton>
629- }
630- >
631- {(close) => (
632- <MenuItem danger onClick={() => (close(), deleteChannel(selected))}>
633- <Trash2 size={14} /> delete channel
634- </MenuItem>
635- )}
636- </MenuPrimitive>
637- )}
672+ <div className="ml-auto flex items-center gap-1">
673+ {pins.length > 0 && (
674+ <IconButton
675+ label={showPins ? "hide pinned messages" : "show pinned messages"}
676+ variant={showPins ? "secondary" : "ghost"}
677+ size="sm"
678+ onClick={() => setShowPins((v) => !v)}
679+ >
680+ <Pin />
681+ </IconButton>
682+ )}
683+ {selected?.type === "dm" && (
684+ <IconButton
685+ label={inCall ? "leave call" : ringing === selected.id ? "answer call" : "start video call"}
686+ variant={inCall ? "danger" : ringing === selected.id ? "primary" : "ghost"}
687+ size="sm"
688+ onClick={() => (inCall ? voice.leave() : startCall(selected))}
689+ >
690+ {inCall ? <PhoneOff /> : <Video />}
691+ </IconButton>
692+ )}
693+ {selected?.type === "text" && !selected.permanent && (
694+ <MenuPrimitive
695+ trigger={
696+ <IconButton label="channel actions" size="sm">
697+ <MoreHorizontal />
698+ </IconButton>
699+ }
700+ >
701+ {(close) => (
702+ <MenuItem danger onClick={() => (close(), deleteChannel(selected))}>
703+ <Trash2 size={14} /> delete channel
704+ </MenuItem>
705+ )}
706+ </MenuPrimitive>
707+ )}
708+ </div>
638709 </>
639710 )}
640711 {!connected && <span className="ml-auto pr-1 text-xs text-faint">reconnecting…</span>}
@@ -647,53 +718,93 @@ export default function Chat({ user, onLogout }: { user: User; onLogout: () => v
647718 ) : showingShare && share ? (
648719 <ScreenShareView track={share.track} />
649720 ) : chat && selected ? (
650- <>
651- {inCall && <CallView voice={voice} className="flex-[3]" />}
652- <div className={cn("flex min-h-0 flex-1 flex-col", inCall && "flex-[1] border-t border-line")}>
653- <MessageList
654- key={selected.id}
655- messages={messages}
656- hasMore={hasMore}
657- loadingOlder={loadingOlder}
658- username={user.username}
659- collapsed={collapsed}
660- previewCollapsed={previewCollapsed}
661- hidePreviews={settings.hidePreviews}
662- onTogglePreview={togglePreview}
663- onRemovePreview={removePreview}
664- editing={editing}
665- activeId={active?.id ?? null}
666- onSelect={(m) => setActive((a) => (a?.id === m.id ? null : m))}
667- onLoadOlder={loadOlder}
668- onToggleImages={toggleImages}
669- onEditBody={(body) => setEditing((e) => (e ? { ...e, body } : e))}
670- onCancelEdit={() => setEditing(null)}
671- onSaveEdit={saveEdit}
672- />
673- <div className="h-5 shrink-0 truncate px-3 text-xs text-faint md:px-4" aria-live="polite">
674- {settings.typingIndicator &&
675- typingLabel(Object.keys(typing[selected.id] ?? {}).sort())}
676- </div>
677- {active && !editing && (
678- <MessageActions
679- message={active}
680- own={active.username === user.username}
681- onReact={(r) => react(active, r)}
682- onEdit={() => startEdit(active)}
683- onDelete={() => deleteMessage(active)}
684- onRemovePreview={() => removePreview(active)}
685- onClose={() => setActive(null)}
721+ <div className="relative flex min-h-0 flex-1">
722+ <div className="flex min-w-0 flex-1 flex-col">
723+ {inCall && <CallView voice={voice} className="flex-[3]" />}
724+ <div className={cn("flex min-h-0 flex-1 flex-col", inCall && "flex-[1] border-t border-line")}>
725+ <MessageList
726+ key={selected.id}
727+ messages={messages}
728+ hasMore={hasMore}
729+ loadingOlder={loadingOlder}
730+ username={user.username}
731+ collapsed={collapsed}
732+ previewCollapsed={previewCollapsed}
733+ hidePreviews={settings.hidePreviews}
734+ onTogglePreview={togglePreview}
735+ onRemovePreview={removePreview}
736+ editing={editing?.pane ? null : editing}
737+ activeId={active?.message.id ?? null}
738+ onSelect={(m, anchor) => openActions(m, anchor, false)}
739+ onLoadOlder={loadOlder}
740+ onToggleImages={toggleImages}
741+ onEditBody={(body) => setEditing((e) => (e ? { ...e, body } : e))}
742+ onCancelEdit={() => setEditing(null)}
743+ onSaveEdit={saveEdit}
744+ />
745+ <div className="h-5 shrink-0 truncate px-3 text-xs text-faint md:px-4" aria-live="polite">
746+ {settings.typingIndicator &&
747+ typingLabel(Object.keys(typing[selected.id] ?? {}).sort())}
748+ </div>
749+ {active && !editing && (
750+ <MessageActions
751+ message={active.message}
752+ anchor={active.anchor}
753+ own={active.message.username === user.username}
754+ pinned={pins.some((p) => p.id === active.message.id)}
755+ onReact={(r) => react(active.message, r)}
756+ onPin={() => togglePin(active.message)}
757+ onEdit={() => startEdit(active.message, active.pane)}
758+ onDelete={() => deleteMessage(active.message)}
759+ onRemovePreview={() => removePreview(active.message)}
760+ onClose={() => setActive(null)}
761+ />
762+ )}
763+ <Composer
764+ channel={selected}
765+ users={users}
766+ onEditLast={startEditLast}
767+ onTyping={sendTyping}
768+ onCollapse={collapseAll}
686769 />
687- )}
688- <Composer
689- channel={selected}
690- users={users}
691- onEditLast={startEditLast}
692- onTyping={sendTyping}
693- onCollapse={collapseAll}
694- />
770+ </div>
695771 </div>
696- </>
772+ {showPins && pins.length > 0 && (
773+ <aside className="flex w-72 shrink-0 flex-col border-l border-line bg-surface max-md:absolute max-md:inset-y-0 max-md:right-0 max-md:z-30 max-md:w-full max-md:shadow-xl">
774+ <div className="flex h-12 shrink-0 items-center gap-1.5 border-b border-line px-2 md:px-3">
775+ <Pin size={16} className="text-faint" />
776+ <span className="truncate text-sm font-medium">pinned</span>
777+ <IconButton
778+ label="close pinned messages"
779+ size="sm"
780+ className="ml-auto"
781+ onClick={() => setShowPins(false)}
782+ >
783+ <X />
784+ </IconButton>
785+ </div>
786+ <MessageList
787+ messages={pins}
788+ hasMore={false}
789+ loadingOlder={false}
790+ username={user.username}
791+ collapsed={collapsed}
792+ previewCollapsed={previewCollapsed}
793+ hidePreviews={settings.hidePreviews}
794+ editing={editing?.pane ? editing : null}
795+ activeId={active?.message.id ?? null}
796+ onSelect={(m, anchor) => openActions(m, anchor, true)}
797+ onLoadOlder={() => {}}
798+ onToggleImages={toggleImages}
799+ onTogglePreview={togglePreview}
800+ onRemovePreview={removePreview}
801+ onEditBody={(body) => setEditing((e) => (e ? { ...e, body } : e))}
802+ onCancelEdit={() => setEditing(null)}
803+ onSaveEdit={saveEdit}
804+ />
805+ </aside>
806+ )}
807+ </div>
697808 ) : (
698809 <Centered>select a channel</Centered>
699810 )}