@@ -2,6 +2,7 @@ package main
22
33 import (
44 "database/sql"
5+ "fmt"
56 "net/http"
67 "strconv"
78 "strings"
@@ -10,7 +11,37 @@ import (
1011 "github.com/gin-gonic/gin"
1112 )
1213
14+func dmName(u1, u2 int64) string {
15+ if u1 > u2 {
16+ u1, u2 = u2, u1
17+ }
18+ return fmt.Sprintf("u:%d:%d", u1, u2)
19+}
20+
21+func parseDM(name string) (int64, int64, bool) {
22+ var u1, u2 int64
23+ if _, err := fmt.Sscanf(name, "u:%d:%d", &u1, &u2); err != nil {
24+ return 0, 0, false
25+ }
26+ return u1, u2, true
27+}
28+
29+func (s *Server) notifyChannel(channelType, channelName string, ev event) {
30+ if channelType == "dm" {
31+ if u1, u2, ok := parseDM(channelName); ok {
32+ s.hub.sendTo(ev, u1, u2)
33+ }
34+ return
35+ }
36+ s.hub.broadcast(ev)
37+}
38+
1339 func (s *Server) handleChannels(c *gin.Context) {
40+ user := c.MustGet("user").(User)
41+ users := map[int64]string{}
42+ for _, u := range s.hub.roster() {
43+ users[u.ID] = u.Username
44+ }
1445 rows, err := s.db.Query(`SELECT id, type, name, position FROM channels ORDER BY position, id`)
1546 if err != nil {
1647 c.JSON(http.StatusInternalServerError, gin.H{"error": "db"})
@@ -24,17 +55,90 @@ func (s *Server) handleChannels(c *gin.Context) {
2455 c.JSON(http.StatusInternalServerError, gin.H{"error": "db"})
2556 return
2657 }
58+ if ch.Type == "dm" {
59+ u1, u2, ok := parseDM(ch.Name)
60+ if !ok || (u1 != user.ID && u2 != user.ID) {
61+ continue
62+ }
63+ peerID := u1
64+ if u1 == user.ID {
65+ peerID = u2
66+ }
67+ ch.Name = users[peerID]
68+ if ch.Name == "" {
69+ continue
70+ }
71+ }
2772 channels = append(channels, ch)
2873 }
2974 c.JSON(http.StatusOK, channels)
3075 }
3176
77+func (s *Server) handleOpenDM(c *gin.Context) {
78+ peerID, err := strconv.ParseInt(c.Param("userId"), 10, 64)
79+ if err != nil {
80+ c.JSON(http.StatusBadRequest, gin.H{"error": "bad user"})
81+ return
82+ }
83+ user := c.MustGet("user").(User)
84+ var peerName string
85+ if err := s.db.QueryRow(`SELECT username FROM users WHERE id = ?`, peerID).Scan(&peerName); err != nil {
86+ if err == sql.ErrNoRows {
87+ c.JSON(http.StatusNotFound, gin.H{"error": "user not found"})
88+ return
89+ }
90+ c.JSON(http.StatusInternalServerError, gin.H{"error": "db"})
91+ return
92+ }
93+ name := dmName(user.ID, peerID)
94+ s.db.Exec(
95+ `INSERT OR IGNORE INTO channels (type, name, position, created_at) VALUES ('dm', ?, 0, ?)`,
96+ name, time.Now().Unix(),
97+ )
98+ var ch Channel
99+ if err := s.db.QueryRow(`SELECT id, type, position FROM channels WHERE type = 'dm' AND name = ?`, name).Scan(&ch.ID, &ch.Type, &ch.Position); err != nil {
100+ c.JSON(http.StatusInternalServerError, gin.H{"error": "db"})
101+ return
102+ }
103+ ch.Name = peerName
104+ c.JSON(http.StatusOK, ch)
105+}
106+
107+func (s *Server) checkTextOrDM(c *gin.Context, channelID, userID int64) (string, string, bool) {
108+ var chType, chName string
109+ if err := s.db.QueryRow(`SELECT type, name FROM channels WHERE id = ?`, channelID).Scan(&chType, &chName); err != nil {
110+ if err == sql.ErrNoRows {
111+ c.JSON(http.StatusNotFound, gin.H{"error": "channel not found"})
112+ return "", "", false
113+ }
114+ c.JSON(http.StatusInternalServerError, gin.H{"error": "db"})
115+ return "", "", false
116+ }
117+ if chType == "dm" {
118+ u1, u2, ok := parseDM(chName)
119+ if !ok || (u1 != userID && u2 != userID) {
120+ c.JSON(http.StatusForbidden, gin.H{"error": "forbidden"})
121+ return "", "", false
122+ }
123+ return chType, chName, true
124+ }
125+ if chType != "text" {
126+ c.JSON(http.StatusBadRequest, gin.H{"error": "not a text channel"})
127+ return "", "", false
128+ }
129+ return chType, chName, true
130+}
131+
32132 func (s *Server) handleMessages(c *gin.Context) {
33133 channelID, err := strconv.ParseInt(c.Param("id"), 10, 64)
34134 if err != nil {
35135 c.JSON(http.StatusBadRequest, gin.H{"error": "bad channel"})
36136 return
37137 }
138+ user := c.MustGet("user").(User)
139+ if _, _, ok := s.checkTextOrDM(c, channelID, user.ID); !ok {
140+ return
141+ }
38142 rows, err := s.db.Query(
39143 `SELECT m.id, m.channel_id, m.user_id, u.username, m.body, m.created_at, COALESCE(m.edited_at, 0)
40144 FROM messages m JOIN users u ON u.id = m.user_id
@@ -83,17 +187,8 @@ func (s *Server) handleSendMessage(c *gin.Context) {
83187 return
84188 }
85189 user := c.MustGet("user").(User)
86- var channelType string
87- if err := s.db.QueryRow(`SELECT type FROM channels WHERE id = ?`, channelID).Scan(&channelType); err != nil {
88- if err == sql.ErrNoRows {
89- c.JSON(http.StatusNotFound, gin.H{"error": "channel not found"})
90- return
91- }
92- c.JSON(http.StatusInternalServerError, gin.H{"error": "db"})
93- return
94- }
95- if channelType != "text" {
96- c.JSON(http.StatusBadRequest, gin.H{"error": "not a text channel"})
190+ chType, chName, ok := s.checkTextOrDM(c, channelID, user.ID)
191+ if !ok {
97192 return
98193 }
99194 now := time.Now().Unix()
@@ -107,7 +202,7 @@ func (s *Server) handleSendMessage(c *gin.Context) {
107202 }
108203 id, _ := res.LastInsertId()
109204 msg := Message{ID: id, ChannelID: channelID, UserID: user.ID, Username: user.Username, Body: body, CreatedAt: now}
110- s.hub.broadcast(event{Type: "message", Message: &msg})
205+ s.notifyChannel(chType, chName, event{Type: "message", Message: &msg})
111206 c.JSON(http.StatusOK, msg)
112207 }
113208
@@ -145,7 +240,9 @@ func (s *Server) handleEditMessage(c *gin.Context) {
145240 return
146241 }
147242 m.Username = user.Username
148- s.hub.broadcast(event{Type: "message_edit", Message: &m})
243+ var chType, chName string
244+ s.db.QueryRow(`SELECT type, name FROM channels WHERE id = ?`, m.ChannelID).Scan(&chType, &chName)
245+ s.notifyChannel(chType, chName, event{Type: "message_edit", Message: &m})
149246 c.JSON(http.StatusOK, m)
150247 }
151248
@@ -169,6 +266,8 @@ func (s *Server) handleDeleteMessage(c *gin.Context) {
169266 c.JSON(http.StatusInternalServerError, gin.H{"error": "db"})
170267 return
171268 }
172- s.hub.broadcast(event{Type: "message_delete", Message: &m})
269+ var chType, chName string
270+ s.db.QueryRow(`SELECT type, name FROM channels WHERE id = ?`, m.ChannelID).Scan(&chType, &chName)
271+ s.notifyChannel(chType, chName, event{Type: "message_delete", Message: &m})
173272 c.Status(http.StatusNoContent)
174273 }