mid prog

wsServer.go

@@ -3,6 +3,7 @@ package main
 import (
 	"context"
 	"errors"
+	"go-socket/Enums/WsMessageFrom"
 	"log"
 	"net/http"
 	"time"
@@ -84,7 +85,7 @@ func sendToAllMessageCloseIfTimeout(message *map[string]any) {
 
 func WsSendToUser(from *User, to *User, message string) {
 	var msg = map[string]any{
-		"type":    WsMessageToUserFrom(DirectMessage_),
+		"type":    WsMessageFrom.DirectMessage,
 		"from":    from.Id,
 		"content": message,
 	}
@@ -99,7 +100,7 @@ func WsSendToGroup(group *Group, sender *User, message string) error {
 		}
 
 		var msg = map[string]any{
-			"type":    WsMessageToUserFrom(Group_),
+			"type":    WsMessageFrom.Group,
 			"from":    group.Id,
 			"sender":  sender.Id,
 			"content": message,
@@ -118,7 +119,7 @@ func handleUnauthenticatedMessage(ctx context.Context, user *User, userMessage *
 	token, ok := (*userMessage)["token"].(string)
 	if !ok {
 		var msg = map[string]any{
-			"type":  WsMessageToUserFrom(Server_),
+			"type":  WsMessageFrom.Server,
 			"error": "no token in message",
 		}
 		sendMessageCloseIfTimeout(user, &msg)
@@ -128,7 +129,7 @@ func handleUnauthenticatedMessage(ctx context.Context, user *User, userMessage *
 	userId, err := TokenValidateGetId(token)
 	if err != nil {
 		var msg = map[string]any{
-			"type":  WsMessageToUserFrom(Server_),
+			"type":  WsMessageFrom.Server,
 			"error": "invalid token",
 		}
 		sendMessageCloseIfTimeout(user, &msg)
@@ -138,7 +139,7 @@ func handleUnauthenticatedMessage(ctx context.Context, user *User, userMessage *
 	userFromCache, err := CacheGetUserById(userId)
 	if err != nil {
 		var msg = map[string]any{
-			"type":  WsMessageToUserFrom(Server_),
+			"type":  WsMessageFrom.Server,
 			"error": "user not found",
 		}
 		sendMessageCloseIfTimeout(user, &msg)