xonecas.io
8058
Ir

irvc / commit b666936

feat: pinned messages

xonecas2026-10-24 b666936b87f1145f055d4be34533af37021466b2 parent 3ef5554

8 files changed

channels.go+159−35
@@ -334,7 +334,7 @@ func (s *Server) handleMessages(c *gin.Context) {
334334 before = math.MaxInt64
335335 }
336336 rows, err := s.db.Query(
337- `SELECT m.id, m.channel_id, m.user_id, u.username, m.body, m.created_at, COALESCE(m.edited_at, 0), m.preview
337+ messageSelect+`
338338 FROM messages m JOIN users u ON u.id = m.user_id
339339 WHERE m.channel_id = ? AND m.id < ? ORDER BY m.id DESC LIMIT ?`,
340340 channelID, before, messagePage+1,
@@ -344,16 +344,10 @@ func (s *Server) handleMessages(c *gin.Context) {
344344 return
345345 }
346346 defer rows.Close()
347- messages := []Message{}
348- for rows.Next() {
349- var m Message
350- var preview sql.NullString
351- if err := rows.Scan(&m.ID, &m.ChannelID, &m.UserID, &m.Username, &m.Body, &m.CreatedAt, &m.EditedAt, &preview); err != nil {
352- c.JSON(http.StatusInternalServerError, gin.H{"error": "db"})
353- return
354- }
355- m.Preview = decodePreview(preview.String)
356- messages = append(messages, m)
347+ messages, err := scanMessages(rows)
348+ if err != nil {
349+ c.JSON(http.StatusInternalServerError, gin.H{"error": "db"})
350+ return
357351 }
358352 // The extra row only says whether another page exists.
359353 hasMore := len(messages) > messagePage
@@ -364,35 +358,165 @@ func (s *Server) handleMessages(c *gin.Context) {
364358 for i, j := 0, len(messages)-1; i < j; i, j = i+1, j-1 {
365359 messages[i], messages[j] = messages[j], messages[i]
366360 }
367- if len(messages) > 0 {
368- byID := make(map[int64]*Message, len(messages))
369- for i := range messages {
370- byID[messages[i].ID] = &messages[i]
361+ s.attachReactions(messages)
362+ c.JSON(http.StatusOK, gin.H{"messages": messages, "hasMore": hasMore})
363+}
364+
365+// handlePins lists a channel's pinned messages, oldest first, so the sidebar
366+// reads like the channel itself.
367+func (s *Server) handlePins(c *gin.Context) {
368+ channelID, err := strconv.ParseInt(c.Param("id"), 10, 64)
369+ if err != nil {
370+ c.JSON(http.StatusBadRequest, gin.H{"error": "bad channel"})
371+ return
372+ }
373+ user := c.MustGet("user").(User)
374+ if _, _, ok := s.checkTextOrDM(c, channelID, user.ID); !ok {
375+ return
376+ }
377+ rows, err := s.db.Query(
378+ messageSelect+`
379+ FROM messages m
380+ JOIN users u ON u.id = m.user_id
381+ JOIN pins p ON p.message_id = m.id
382+ WHERE m.channel_id = ? ORDER BY m.id`,
383+ channelID,
384+ )
385+ if err != nil {
386+ c.JSON(http.StatusInternalServerError, gin.H{"error": "db"})
387+ return
388+ }
389+ defer rows.Close()
390+ messages, err := scanMessages(rows)
391+ if err != nil {
392+ c.JSON(http.StatusInternalServerError, gin.H{"error": "db"})
393+ return
394+ }
395+ s.attachReactions(messages)
396+ c.JSON(http.StatusOK, messages)
397+}
398+
399+// handlePinMessage pins a message so it stays reachable from the channel's
400+// pinned sidebar even after it pages out of the history.
401+func (s *Server) handlePinMessage(c *gin.Context) {
402+ msgID, err := strconv.ParseInt(c.Param("id"), 10, 64)
403+ if err != nil {
404+ c.JSON(http.StatusBadRequest, gin.H{"error": "bad message"})
405+ return
406+ }
407+ var channelID int64
408+ if err := s.db.QueryRow(`SELECT channel_id FROM messages WHERE id = ?`, msgID).Scan(&channelID); err != nil {
409+ if err == sql.ErrNoRows {
410+ c.JSON(http.StatusNotFound, gin.H{"error": "message not found"})
411+ } else {
412+ c.JSON(http.StatusInternalServerError, gin.H{"error": "db"})
413+ }
414+ return
415+ }
416+ user := c.MustGet("user").(User)
417+ if _, _, ok := s.checkTextOrDM(c, channelID, user.ID); !ok {
418+ return
419+ }
420+ m, chType, chName, ok := s.loadMessage(msgID, channelID)
421+ if !ok {
422+ c.JSON(http.StatusInternalServerError, gin.H{"error": "db"})
423+ return
424+ }
425+ if _, err := s.db.Exec(
426+ `INSERT OR IGNORE INTO pins (message_id, channel_id, pinned_at) VALUES (?, ?, ?)`,
427+ msgID, channelID, time.Now().Unix(),
428+ ); err != nil {
429+ c.JSON(http.StatusInternalServerError, gin.H{"error": "db"})
430+ return
431+ }
432+ s.notifyChannel(chType, chName, event{Type: "pin", Message: &m})
433+ c.JSON(http.StatusOK, m)
434+}
435+
436+func (s *Server) handleUnpinMessage(c *gin.Context) {
437+ msgID, err := strconv.ParseInt(c.Param("id"), 10, 64)
438+ if err != nil {
439+ c.JSON(http.StatusBadRequest, gin.H{"error": "bad message"})
440+ return
441+ }
442+ var m Message
443+ if err := s.db.QueryRow(`SELECT channel_id FROM pins WHERE message_id = ?`, msgID).Scan(&m.ChannelID); err != nil {
444+ if err == sql.ErrNoRows {
445+ c.JSON(http.StatusNotFound, gin.H{"error": "message not pinned"})
446+ } else {
447+ c.JSON(http.StatusInternalServerError, gin.H{"error": "db"})
448+ }
449+ return
450+ }
451+ user := c.MustGet("user").(User)
452+ chType, chName, ok := s.checkTextOrDM(c, m.ChannelID, user.ID)
453+ if !ok {
454+ return
455+ }
456+ if _, err := s.db.Exec(`DELETE FROM pins WHERE message_id = ?`, msgID); err != nil {
457+ c.JSON(http.StatusInternalServerError, gin.H{"error": "db"})
458+ return
459+ }
460+ m.ID = msgID
461+ s.notifyChannel(chType, chName, event{Type: "unpin", Message: &m})
462+ c.Status(http.StatusNoContent)
463+}
464+
465+// messageSelect is the column list every message read shares, in the order
466+// scanMessages expects.
467+const messageSelect = `SELECT m.id, m.channel_id, m.user_id, u.username, m.body, m.created_at,
468+ COALESCE(m.edited_at, 0), m.preview`
469+
470+// scanMessages drains message rows, keeping the query's order.
471+func scanMessages(rows *sql.Rows) ([]Message, error) {
472+ messages := []Message{}
473+ for rows.Next() {
474+ var m Message
475+ var preview sql.NullString
476+ if err := rows.Scan(&m.ID, &m.ChannelID, &m.UserID, &m.Username, &m.Body, &m.CreatedAt, &m.EditedAt, &preview); err != nil {
477+ return nil, err
371478 }
372- rRows, err := s.db.Query(
373- `SELECT r.message_id, r.reaction, u.username
374- FROM reactions r JOIN users u ON u.id = r.user_id
375- WHERE r.message_id >= ? AND r.message_id <= ?
376- ORDER BY r.rowid`,
377- messages[0].ID, messages[len(messages)-1].ID,
378- )
379- if err == nil {
380- defer rRows.Close()
381- for rRows.Next() {
382- var mid int64
383- var react, uname string
384- if rRows.Scan(&mid, &react, &uname) == nil {
385- if m := byID[mid]; m != nil {
386- if m.Reactions == nil {
387- m.Reactions = map[string][]string{}
388- }
389- m.Reactions[react] = append(m.Reactions[react], uname)
390- }
479+ m.Preview = decodePreview(preview.String)
480+ messages = append(messages, m)
481+ }
482+ return messages, rows.Err()
483+}
484+
485+// attachReactions fills in reactions for a whole page with one query, rather
486+// than one per message.
487+func (s *Server) attachReactions(msgs []Message) {
488+ if len(msgs) == 0 {
489+ return
490+ }
491+ byID := make(map[int64]*Message, len(msgs))
492+ lo, hi := msgs[0].ID, msgs[0].ID
493+ for i := range msgs {
494+ byID[msgs[i].ID] = &msgs[i]
495+ lo, hi = min(lo, msgs[i].ID), max(hi, msgs[i].ID)
496+ }
497+ rows, err := s.db.Query(
498+ `SELECT r.message_id, r.reaction, u.username
499+ FROM reactions r JOIN users u ON u.id = r.user_id
500+ WHERE r.message_id >= ? AND r.message_id <= ?
501+ ORDER BY r.rowid`,
502+ lo, hi,
503+ )
504+ if err != nil {
505+ return
506+ }
507+ defer rows.Close()
508+ for rows.Next() {
509+ var mid int64
510+ var react, uname string
511+ if rows.Scan(&mid, &react, &uname) == nil {
512+ if m := byID[mid]; m != nil {
513+ if m.Reactions == nil {
514+ m.Reactions = map[string][]string{}
391515 }
516+ m.Reactions[react] = append(m.Reactions[react], uname)
392517 }
393518 }
394519 }
395- c.JSON(http.StatusOK, gin.H{"messages": messages, "hasMore": hasMore})
396520 }
397521
398522 func (s *Server) messageReactions(msgID int64) map[string][]string {
db.go+6−0
@@ -90,6 +90,11 @@ CREATE TABLE IF NOT EXISTS reactions (
9090 reaction TEXT NOT NULL,
9191 PRIMARY KEY (message_id, user_id, reaction)
9292 );
93+CREATE TABLE IF NOT EXISTS pins (
94+ message_id INTEGER PRIMARY KEY REFERENCES messages(id) ON DELETE CASCADE,
95+ channel_id INTEGER NOT NULL REFERENCES channels(id) ON DELETE CASCADE,
96+ pinned_at INTEGER NOT NULL
97+);
9398 CREATE TABLE IF NOT EXISTS read_state (
9499 user_id INTEGER NOT NULL REFERENCES users(id) ON DELETE CASCADE,
95100 channel_id INTEGER NOT NULL REFERENCES channels(id) ON DELETE CASCADE,
@@ -98,6 +103,7 @@ CREATE TABLE IF NOT EXISTS read_state (
98103 PRIMARY KEY (user_id, channel_id)
99104 );
100105 CREATE INDEX IF NOT EXISTS idx_messages_channel ON messages(channel_id, id);
106+CREATE INDEX IF NOT EXISTS idx_pins_channel ON pins(channel_id, message_id);
101107 CREATE UNIQUE INDEX IF NOT EXISTS idx_channels_dm ON channels(name) WHERE type = 'dm';
102108 CREATE UNIQUE INDEX IF NOT EXISTS idx_channels_name ON channels(type, name) WHERE type != 'dm';
103109 `
irvc.md+1−0
@@ -11,6 +11,7 @@ Small, private chat + voice for 4–6 people on one VPS. No data gathering, full
1111 **In:**
1212 - Server-side accounts, invite-only.
1313 - Text channels and 1-on-1 DMs with persisted history (IRC-like), GFM markdown, multiline compose, mentions, message editing and deletion.
14+- Message history paged on demand, and pinned messages per channel in a sidebar.
1415 - Text and voice channels created and deleted from the sidebar; the seeded channels are permanent.
1516 - Image and video attachments, stored on disk.
1617 - Voice channels, ephemeral (not recorded), with mute, deafen, per-peer volume, mic processing, a level-based noise gate, and a join/leave tone.
main.go+3−0
@@ -139,6 +139,9 @@ func runServer(cfg *Config, db *sql.DB) {
139139 authed.GET("/channels/:id/messages", s.handleMessages)
140140 authed.POST("/channels/:id/messages", s.handleSendMessage)
141141 authed.POST("/channels/:id/read", s.handleMarkRead)
142+ authed.GET("/channels/:id/pins", s.handlePins)
143+ authed.POST("/messages/:id/pin", s.handlePinMessage)
144+ authed.DELETE("/messages/:id/pin", s.handleUnpinMessage)
142145 authed.PATCH("/messages/:id", s.handleEditMessage)
143146 authed.DELETE("/messages/:id", s.handleDeleteMessage)
144147 authed.DELETE("/messages/:id/preview", s.handleDeletePreview)
web/src/components/MessageActions.tsx+19−7
@@ -1,6 +1,6 @@
11 import { useLayoutEffect, useRef, useState } from "react";
22 import { createPortal } from "react-dom";
3-import { EyeOff, Pencil, Trash2, X } from "lucide-react";
3+import { EyeOff, Pencil, Pin, PinOff, Trash2, X } from "lucide-react";
44 import { Button, IconButton } from "@/ui";
55 import type { Message, Reaction } from "../lib/types";
66 import { reactions } from "./MessageList";
@@ -8,20 +8,28 @@ import { reactions } from "./MessageList";
88 // MessageActions is the contextual popover for the selected message: tap the ⋯
99 // on any message (or the row) and the actions float beside it, reachable on
1010 // touch screens and by keyboard alike. It is portalled and positioned
11-// absolutely, so opening it never reflows the message list; its right edge is
12-// anchored to the message's ⋯ button.
11+// absolutely, so opening it never reflows the message list. Its right edge is
12+// anchored to the element that was acted on, given by the caller, so the same
13+// message shown twice (the channel and the pinned sidebar) still opens the
14+// popover where it was clicked.
1315 export default function MessageActions({
1416 message,
17+ anchor,
1518 own,
19+ pinned,
1620 onReact,
21+ onPin,
1722 onEdit,
1823 onDelete,
1924 onRemovePreview,
2025 onClose,
2126 }: {
2227 message: Message;
28+ anchor: HTMLElement;
2329 own: boolean;
30+ pinned: boolean;
2431 onReact: (reaction: Reaction) => void;
32+ onPin: () => void;
2533 onEdit: () => void;
2634 onDelete: () => void;
2735 onRemovePreview: () => void;
@@ -30,11 +38,11 @@ export default function MessageActions({
3038 const panel = useRef<HTMLDivElement>(null);
3139 const [pos, setPos] = useState<{ top: number; left: number } | null>(null);
3240
33- // Track the ⋯ button through list scrolling, resizes and relayouts.
41+ // Track the anchor element through list scrolling, resizes and relayouts.
3442 useLayoutEffect(() => {
35- const anchor = document.querySelector<HTMLElement>(`[data-actions-for="${message.id}"]`);
36- if (!anchor) return;
3743 const place = () => {
44+ // The row can vanish under us (someone else unpinned or deleted it).
45+ if (!anchor.isConnected) return;
3846 const r = anchor.getBoundingClientRect();
3947 const p = panel.current!.getBoundingClientRect();
4048 let top = r.bottom + 4;
@@ -52,7 +60,7 @@ export default function MessageActions({
5260 removeEventListener("resize", place);
5361 ro.disconnect();
5462 };
55- }, [message.id, own]);
63+ }, [anchor, own]);
5664
5765 return createPortal(
5866 <div
@@ -77,6 +85,10 @@ export default function MessageActions({
7785 <Icon />
7886 </IconButton>
7987 ))}
88+ <span className="mx-1 h-6 w-px bg-line" />
89+ <Button size="sm" variant="ghost" onClick={onPin}>
90+ {pinned ? <PinOff /> : <Pin />} {pinned ? "unpin" : "pin"}
91+ </Button>
8092 {own && (
8193 <>
8294 <span className="mx-1 h-6 w-px bg-line" />
web/src/components/MessageList.tsx+6−7
@@ -48,7 +48,7 @@ export default function MessageList({
4848 hidePreviews: boolean;
4949 editing: { id: number; body: string } | null;
5050 activeId: number | null;
51- onSelect: (msg: Message) => void;
51+ onSelect: (msg: Message, anchor: HTMLElement) => void;
5252 onLoadOlder: () => void;
5353 onToggleImages: (id: number) => void;
5454 onTogglePreview: (id: number) => void;
@@ -160,7 +160,7 @@ export default function MessageList({
160160 collapsed={collapsed.has(m.id)}
161161 previewCollapsed={previewCollapsed(m.id)}
162162 hidePreviews={hidePreviews}
163- onSelect={() => onSelect(m)}
163+ onSelect={(anchor) => onSelect(m, anchor)}
164164 onToggleImages={() => onToggleImages(m.id)}
165165 onTogglePreview={() => onTogglePreview(m.id)}
166166 onRemovePreview={m.username === username ? () => onRemovePreview(m) : undefined}
@@ -217,7 +217,7 @@ function Row({
217217 collapsed: boolean;
218218 previewCollapsed: boolean;
219219 hidePreviews: boolean;
220- onSelect: () => void;
220+ onSelect: (anchor: HTMLElement) => void;
221221 onToggleImages: () => void;
222222 onTogglePreview: () => void;
223223 onRemovePreview?: () => void;
@@ -239,7 +239,6 @@ function Row({
239239 <IconButton
240240 label="message actions"
241241 size="sm"
242- data-actions-for={m.id}
243242 className={cn(
244243 "size-6 text-faint",
245244 active && "bg-raised text-fg",
@@ -248,7 +247,7 @@ function Row({
248247 // revealed on keyboard focus. Tapping the row works too.
249248 hidden && "pointer-events-none opacity-0 focus:pointer-events-auto focus:opacity-100",
250249 )}
251- onClick={onSelect}
250+ onClick={(e) => onSelect(e.currentTarget)}
252251 >
253252 <MoreHorizontal size={14} />
254253 </IconButton>
@@ -275,7 +274,7 @@ function Row({
275274 onClick={(e) => {
276275 if (!window.getSelection()?.isCollapsed) return;
277276 if ((e.target as HTMLElement).closest("a,button,video")) return;
278- onSelect();
277+ onSelect(e.currentTarget);
279278 }}
280279 className={cn(
281280 "group relative flex gap-2 px-3 py-0.5 md:px-4",
@@ -344,7 +343,7 @@ function Row({
344343 key={key}
345344 type="button"
346345 title={who.join(", ")}
347- onClick={onSelect}
346+ onClick={(e) => onSelect(e.currentTarget)}
348347 className={cn("chip", who.includes(username) && "chip-active")}
349348 >
350349 <Icon className="size-3" />
web/src/lib/types.ts+2−0
@@ -69,6 +69,8 @@ export interface WSEvent {
6969 | "channel_delete"
7070 | "ring"
7171 | "ring_end"
72+ | "pin"
73+ | "unpin"
7274 | "typing";
7375 message?: Message;
7476 users?: string[];
web/src/views/Chat.tsx+190−79
@@ -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 )}