xonecas.io
8058
Ir

irvc / commit cb110e7

feat: invite user component

Small fix, update the know user roster on disconnect/connect user events

xonecas2026-10-11 cb110e77f16c0c7999a5b1ab379115a108f50bac parent 8b200cc

6 files changed

auth.go+14−0
@@ -279,6 +279,20 @@ func (s *Server) handleInviteInfo(c *gin.Context) {
279279 c.JSON(http.StatusOK, gin.H{"valid": true})
280280 }
281281
282+func (s *Server) handleCreateInvite(c *gin.Context) {
283+ user := c.MustGet("user").(User)
284+ token := randToken()
285+ expires := time.Now().Add(inviteTTL).Unix()
286+ if _, err := s.db.Exec(
287+ `INSERT INTO invites (token, created_by, expires_at) VALUES (?, ?, ?)`,
288+ token, user.ID, expires,
289+ ); err != nil {
290+ c.JSON(http.StatusInternalServerError, gin.H{"error": "db"})
291+ return
292+ }
293+ c.JSON(http.StatusOK, gin.H{"token": token, "expiresAt": expires})
294+}
295+
282296 type rateLimiter struct {
283297 mu sync.Mutex
284298 hits map[string][]time.Time
main.go+2−1
@@ -49,7 +49,7 @@ func runServer(cfg *Config, db *sql.DB) {
4949 if cfg.SessionSecret == "" {
5050 log.Fatal("IRVC_SESSION_SECRET is required")
5151 }
52- s := &Server{cfg: cfg, db: db, hub: newHub()}
52+ s := &Server{cfg: cfg, db: db, hub: newHub(db)}
5353
5454 r := gin.Default()
5555 loginLimiter := newRateLimiter(10, time.Minute)
@@ -68,6 +68,7 @@ func runServer(cfg *Config, db *sql.DB) {
6868 authed.GET("/channels/:id/messages", s.handleMessages)
6969 authed.POST("/channels/:id/messages", s.handleSendMessage)
7070 authed.POST("/channels/:id/voice", s.handleVoiceToken)
71+ authed.POST("/invites", s.handleCreateInvite)
7172 authed.GET("/ws", s.handleWS)
7273
7374 serveFrontend(r)
web/src/components/Sidebar.tsx+32−2
@@ -1,9 +1,15 @@
1-import type { ReactNode } from "react";
2-import { Hash, Mic, MicOff, PhoneOff, Volume2 } from "lucide-react";
1+import { useState, type ReactNode } from "react";
2+import { Hash, Mic, MicOff, PhoneOff, UserPlus, Volume2 } from "lucide-react";
33 import { Button } from "@/components/ui/button";
4+import { api } from "../lib/api";
45 import type { Channel } from "../lib/types";
56 import type { Voice } from "../lib/voice";
67
8+interface Invite {
9+ token: string;
10+ expiresAt: number;
11+}
12+
713 export default function Sidebar({
814 channels,
915 selected,
@@ -15,6 +21,19 @@ export default function Sidebar({
1521 onSelect: (c: Channel) => void;
1622 voice: Voice;
1723 }) {
24+ const [label, setLabel] = useState("create invite");
25+
26+ async function invite() {
27+ try {
28+ const { token } = await api<Invite>("/invites", { method: "POST" });
29+ await navigator.clipboard.writeText(`${window.location.origin}/join?token=${token}`);
30+ setLabel("copied!");
31+ } catch {
32+ setLabel("failed");
33+ }
34+ setTimeout(() => setLabel("create invite"), 1500);
35+ }
36+
1837 return (
1938 <aside className="flex w-56 shrink-0 flex-col border-r border-sepia/15">
2039 <div className="px-4 py-3 text-sm font-semibold text-gold">irvc</div>
@@ -41,6 +60,17 @@ export default function Sidebar({
4160 ))}
4261 </div>
4362 </nav>
63+ <div className="p-2">
64+ <Button
65+ variant="ghost"
66+ size="sm"
67+ className="w-full justify-start gap-2 font-normal text-sepia/50"
68+ onClick={invite}
69+ >
70+ <UserPlus size={14} />
71+ {label}
72+ </Button>
73+ </div>
4474 </aside>
4575 );
4676 }
web/src/lib/types.ts+1−0
@@ -29,4 +29,5 @@ export interface WSEvent {
2929 type: "message" | "presence";
3030 message?: Message;
3131 users?: string[];
32+ roster?: UserSummary[];
3233 }
web/src/views/Chat.tsx+1−0
@@ -44,6 +44,7 @@ export default function Chat({ user, onLogout }: { user: User; onLogout: () => v
4444 const ev = JSON.parse(e.data as string) as WSEvent;
4545 if (ev.type === "presence") {
4646 setOnline(new Set(ev.users ?? []));
47+ if (ev.roster) setUsers(ev.roster);
4748 } else if (ev.message && ev.message.channelId === selectedId.current) {
4849 setMessages((prev) => [...prev, ev.message!]);
4950 }
ws.go+26−6
@@ -1,6 +1,7 @@
11 package main
22
33 import (
4+ "database/sql"
45 "encoding/json"
56 "net"
67 "net/http"
@@ -13,9 +14,10 @@ import (
1314 )
1415
1516 type event struct {
16- Type string `json:"type"`
17- Message *Message `json:"message,omitempty"`
18- Users []string `json:"users,omitempty"`
17+ Type string `json:"type"`
18+ Message *Message `json:"message,omitempty"`
19+ Users []string `json:"users,omitempty"`
20+ Roster []userSummary `json:"roster,omitempty"`
1921 }
2022
2123 type client struct {
@@ -29,10 +31,11 @@ type client struct {
2931 type hub struct {
3032 mu sync.Mutex
3133 clients map[int64]map[*client]bool
34+ db *sql.DB
3235 }
3336
34-func newHub() *hub {
35- return &hub{clients: map[int64]map[*client]bool{}}
37+func newHub(db *sql.DB) *hub {
38+ return &hub{clients: map[int64]map[*client]bool{}, db: db}
3639 }
3740
3841 func (h *hub) register(c *client) {
@@ -92,8 +95,25 @@ func (h *hub) broadcast(ev event) {
9295 }
9396 }
9497
98+func (h *hub) roster() []userSummary {
99+ rows, err := h.db.Query(`SELECT id, username FROM users ORDER BY username`)
100+ if err != nil {
101+ return nil
102+ }
103+ defer rows.Close()
104+ users := []userSummary{}
105+ for rows.Next() {
106+ var u userSummary
107+ if err := rows.Scan(&u.ID, &u.Username); err != nil {
108+ return users
109+ }
110+ users = append(users, u)
111+ }
112+ return users
113+}
114+
95115 func (h *hub) broadcastPresence() {
96- h.broadcast(event{Type: "presence", Users: h.users()})
116+ h.broadcast(event{Type: "presence", Users: h.users(), Roster: h.roster()})
97117 }
98118
99119 var upgrader = websocket.Upgrader{