Broadcast messages to chatroom

Author: robwillup

api.http

@@ -20,7 +20,7 @@ Content-Type: application/json
 
 > {% client.global.set("token", response.body.token) %}
 
-### Post Chat Message
+### Post Question Chat Message
 POST {{baseUrl}}/messages
 Authorization: Bearer {{token}}
 Content-Type: application/json
@@ -29,6 +29,15 @@ Content-Type: application/json
   "content": "Hi, I'm a new student. How do I check my grades?"
 }
 
+### Post Reply Chat Message
+POST {{baseUrl}}/messages
+Authorization: Bearer {{token}}
+Content-Type: application/json
+
+{
+  "content": "Go to the Home Page, click on My Profile and then on Grades"
+}
+
 ### Get Last 50 Messages
 GET {{baseUrl}}/messages
 Authorization: Bearer {{token}}

cmd/server/main.go

@@ -59,7 +59,7 @@ func fetchStockQuote(stockCode string) (string, error) {
 }
 
 func runBot(cmdClient *mq.RabbitMQ, msgClient *mq.RabbitMQ) {
-	msgs, err := cmdClient.Consume(false) // manual ack
+	msgs, err := cmdClient.Consume(false)
 	if err != nil {
 		log.Fatalf("Bot: Failed to consume command queue: %v", err)
 	}
@@ -167,7 +167,7 @@ func main() {
 			log.Println("Saving bot message")
 			chat.SaveMessage(message)
 
-			chat.BroadcastMessageToClients(msg.Content, "bot", message.CreatedAt)
+			chat.BroadcastMessageToClients(msg.Content, "bot", BOT_ID, message.CreatedAt)
 			d.Ack(false)
 		}
 	}()

internal/chat/handler.go

@@ -23,12 +23,6 @@ type StockCommand struct {
 	StockCode string `json:"stock_code"`
 }
 
-type BroadcastMessage struct {
-	Content   string    `json:"content"`
-	User      string    `json:"user"`
-	Timestamp time.Time `json:"timestamp"`
-}
-
 var rabbitCmd, rabbitMsgs *mq.RabbitMQ
 
 func getUserID(username string) (int, error) {
@@ -92,7 +86,9 @@ func PostMessage(c *gin.Context) {
 		log.Printf("Failed to save message: %v", err)
 		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to save message"})
 	}
-	
+
+	BroadcastMessageToClients(msg.Content, username.(string), userID, msg.CreatedAt)
+
 	c.JSON(http.StatusCreated, gin.H{"message": "Message saved."})
 }
 
@@ -132,16 +128,13 @@ func SaveMessage(message models.Message) error {
 	return nil
 }
 
-func BroadcastMessageToClients(content, user string, timestamp time.Time) {
-	msg := BroadcastMessage{
+func BroadcastMessageToClients(content, user string, userID int, timestamp time.Time) {
+	msg := websocket.BroadcastMessage{
 		Content:   content,
 		User:      user,
+		UserID:    userID,
 		Timestamp: timestamp,
 	}
-	msgBytes, err := json.Marshal(msg)
-	if err != nil {
-		log.Printf("Failed to marshal broadcast message: %v", err)
-	}
 
-	websocket.Broadcast <- msgBytes
+	websocket.Broadcast <- msg
 }

internal/websocket/websocket.go

@@ -1,22 +1,32 @@
 package websocket
 
 import (
+	"encoding/json"
 	"log"
 	"net/http"
 	"sync"
+	"time"
 
 	"github.com/gin-gonic/gin"
 	"github.com/gorilla/websocket"
 )
 
 type Client struct {
-	Conn *websocket.Conn
-	Send chan []byte
+	Conn   *websocket.Conn
+	Send   chan BroadcastMessage
+	UserID int
+}
+
+type BroadcastMessage struct {
+	Content   string    `json:"content"`
+	User      string    `json:"user"`
+	UserID    int       `json:"user_id"`
+	Timestamp time.Time `json:"timestamp"`
 }
 
 var (
 	clients   = make(map[*Client]bool)
-	Broadcast = make(chan []byte)
+	Broadcast = make(chan BroadcastMessage)
 	mutex     = &sync.Mutex{}
 	upgrader  = websocket.Upgrader{
 		CheckOrigin: func(r *http.Request) bool { return true },
@@ -31,14 +41,18 @@ func HandleConnections(c *gin.Context) {
 	}
 	defer ws.Close()
 
-	client := &Client{Conn: ws, Send: make(chan []byte)}
+	client := &Client{Conn: ws, Send: make(chan BroadcastMessage), UserID: -1}
 	mutex.Lock()
 	clients[client] = true
 	mutex.Unlock()
 
 	go func() {
 		for msg := range client.Send {
-			err := client.Conn.WriteMessage(websocket.TextMessage, msg)
+			msgBytes, err := json.Marshal(msg)
+			if err != nil {
+				log.Printf("Failed to marshal broadcast message: %v", err)
+			}
+			err = client.Conn.WriteMessage(websocket.TextMessage, msgBytes)
 			if err != nil {
 				log.Printf("Write error: %v", err)
 				break
@@ -54,7 +68,12 @@ func HandleConnections(c *gin.Context) {
 			mutex.Unlock()
 			break
 		}
-		Broadcast <- msg
+		var broadcastMessage BroadcastMessage
+		err = json.Unmarshal(msg, &broadcastMessage)
+		if err != nil {
+			log.Printf("Failed to unmarshal broadcast message: %v", err)
+		}
+		Broadcast <- broadcastMessage
 	}
 }
 
@@ -63,6 +82,9 @@ func HandleMessages() {
 		msg := <-Broadcast
 		mutex.Lock()
 		for client := range clients {
+			if client.UserID == msg.UserID {
+				continue
+			}
 			select {
 			case client.Send <- msg:
 			default: