also send username in msg

ruskaof · Mar 25, 2024 · 38d78cc · 38d78cc
1 parent 154bdf5
commit 38d78cc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/src/dto/dto.go b/src/dto/dto.go
@@ -17,9 +17,10 @@ type WebSocketClientMessage struct {
 }
 
 type WebSocketServerMessage struct {
-	ChatId  int64  `json:"chatId"`
-	UserId  int64  `json:"userId"`
-	Message string `json:"message"`
+	ChatId   int64  `json:"chatId"`
+	UserId   int64  `json:"userId"`
+	Username string `json:"username"`
+	Message  string `json:"message"`
 }
 
 func SerializeWebSocketServerMessage(message WebSocketServerMessage) []byte {

diff --git a/src/service/usrserv/usrserv.go b/src/service/usrserv/usrserv.go
@@ -161,10 +161,12 @@ func (us *UserService) handleMessage(message chat.IncomingClientMessage) {
 
 	// check if user is in chat
 	inChat := false
+	var username string
 	var receiversUserIds []int64
 	for _, user := range chatEntity.Users {
 		if user.ID == message.ClientId {
 			inChat = true
+			username = user.Username
 		}
 		receiversUserIds = append(receiversUserIds, user.ID)
 	}
@@ -175,9 +177,10 @@ func (us *UserService) handleMessage(message chat.IncomingClientMessage) {
 	}
 
 	serverMessage := dto.WebSocketServerMessage{
-		ChatId:  message.Message.ChatId,
-		UserId:  message.ClientId,
-		Message: message.Message.Message,
+		ChatId:   message.Message.ChatId,
+		UserId:   message.ClientId,
+		Username: username,
+		Message:  message.Message.Message,
 	}
 
 	us.wsHub.SendToSelected(serverMessage, receiversUserIds)