@@ -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{