xonecas.io
8058
Ir

irvc / commit 7119599

fix: add interaction to close a DM

xonecas2026-10-15 71195999f994f8c5cd65c8e910870df3665a1ff8 parent 3b812d8

2 files changed

web/src/components/Sidebar.tsx+27−9
@@ -15,6 +15,7 @@ import {
1515 Sun,
1616 UserPlus,
1717 Volume2,
18+ X,
1819 } from "lucide-react";
1920 import { Button } from "@/components/ui/button";
2021 import { api } from "../lib/api";
@@ -37,6 +38,7 @@ export default function Sidebar({
3738 channels,
3839 selected,
3940 onSelect,
41+ onCloseDM,
4042 onSelectUser,
4143 voice,
4244 voiceRooms,
@@ -54,6 +56,7 @@ export default function Sidebar({
5456 channels: Channel[];
5557 selected: Channel | null;
5658 onSelect: (c: Channel) => void;
59+ onCloseDM: (c: Channel) => void;
5760 onSelectUser: (u: UserSummary) => void;
5861 voice: Voice;
5962 voiceRooms: Record<string, string[]>;
@@ -115,6 +118,7 @@ export default function Sidebar({
115118 channels={channels.filter((c) => c.type === "dm")}
116119 selected={selected}
117120 onSelect={onSelect}
121+ onClose={onCloseDM}
118122 icon={<AtSign size={14} />}
119123 />
120124 )}
@@ -171,27 +175,41 @@ function Group({
171175 channels,
172176 selected,
173177 onSelect,
178+ onClose,
174179 icon,
175180 }: {
176181 label: string;
177182 channels: Channel[];
178183 selected: Channel | null;
179184 onSelect: (c: Channel) => void;
185+ onClose?: (c: Channel) => void;
180186 icon: ReactNode;
181187 }) {
182188 return (
183189 <div>
184190 <div className="px-2 py-1 text-[10px] uppercase tracking-widest text-sepia/40">{label}</div>
185191 {channels.map((c) => (
186- <Button
187- key={c.id}
188- variant={selected?.id === c.id ? "secondary" : "ghost"}
189- onClick={() => onSelect(c)}
190- className="w-full justify-start gap-2 font-normal"
191- >
192- {icon}
193- {c.name}
194- </Button>
192+ <div key={c.id} className="group/dm relative">
193+ <Button
194+ variant={selected?.id === c.id ? "secondary" : "ghost"}
195+ onClick={() => onSelect(c)}
196+ className="w-full justify-start gap-2 pr-7 font-normal"
197+ >
198+ {icon}
199+ {c.name}
200+ </Button>
201+ {onClose && (
202+ <Button
203+ variant="ghost"
204+ size="icon-xs"
205+ onClick={() => onClose(c)}
206+ title="close dm"
207+ className="absolute top-1/2 right-1 -translate-y-1/2 opacity-0 group-hover/dm:opacity-100"
208+ >
209+ <X />
210+ </Button>
211+ )}
212+ </div>
195213 ))}
196214 </div>
197215 );
web/src/views/Chat.tsx+27−2
@@ -13,9 +13,19 @@ import SettingsPanel from "../components/SettingsPanel";
1313 import Sidebar from "../components/Sidebar";
1414
1515 const voiceMessage = (channelId: number) => JSON.stringify({ type: "voice", channelId });
16+const hiddenDmsKey = "irvc.hiddenDms";
17+
18+function loadHiddenDms(): number[] {
19+ try {
20+ return JSON.parse(localStorage.getItem(hiddenDmsKey) ?? "[]");
21+ } catch {
22+ return [];
23+ }
24+}
1625
1726 export default function Chat({ user, onLogout }: { user: User; onLogout: () => void }) {
1827 const [channels, setChannels] = useState<Channel[]>([]);
28+ const [hiddenDms, setHiddenDms] = useState<number[]>(loadHiddenDms);
1929 const [selected, setSelected] = useState<Channel | null>(null);
2030 const [users, setUsers] = useState<UserSummary[]>([]);
2131 const [online, setOnline] = useState<Set<string>>(new Set());
@@ -41,7 +51,9 @@ export default function Chat({ user, onLogout }: { user: User; onLogout: () => v
4151 if (ev.type === "message") {
4252 setChannels((cs) => {
4353 if (!cs.some((c) => c.id === ev.message!.channelId)) {
44- api<Channel[]>("/channels").then(setChannels).catch(() => {});
54+ api<Channel[]>("/channels")
55+ .then(setChannels)
56+ .catch(() => {});
4557 }
4658 return cs;
4759 });
@@ -74,6 +86,10 @@ export default function Chat({ user, onLogout }: { user: User; onLogout: () => v
7486 ];
7587 }, [settings.fontSize]);
7688
89+ useEffect(() => {
90+ localStorage.setItem(hiddenDmsKey, JSON.stringify(hiddenDms));
91+ }, [hiddenDms]);
92+
7793 useEffect(() => {
7894 selectedId.current = selected?.id ?? null;
7995 }, [selected]);
@@ -104,12 +120,20 @@ export default function Chat({ user, onLogout }: { user: User; onLogout: () => v
104120 try {
105121 const dm = await api<Channel>(`/dms/${u.id}`, { method: "POST" });
106122 setChannels((cs) => (cs.some((c) => c.id === dm.id) ? cs : [...cs, dm]));
123+ setHiddenDms((ids) => ids.filter((id) => id !== dm.id));
107124 selectChannel(dm);
108125 } catch {
109126 // ignore
110127 }
111128 }
112129
130+ function closeDM(dm: Channel) {
131+ setHiddenDms((ids) => (ids.includes(dm.id) ? ids : [...ids, dm.id]));
132+ if (selected?.id === dm.id) {
133+ setSelected(channels.find((c) => c.type === "text") ?? null);
134+ }
135+ }
136+
113137 function selectChannel(c: Channel) {
114138 setSelected(c);
115139 setOpenShare(null);
@@ -143,9 +167,10 @@ export default function Chat({ user, onLogout }: { user: User; onLogout: () => v
143167 )}
144168 {sidebarOpen && (
145169 <Sidebar
146- channels={channels}
170+ channels={channels.filter((c) => c.type !== "dm" || !hiddenDms.includes(c.id))}
147171 selected={selected}
148172 onSelect={selectChannel}
173+ onCloseDM={closeDM}
149174 onSelectUser={selectUser}
150175 voice={voice}
151176 voiceRooms={voiceRooms}