mid prog

Enums/WsMessageFrom/WsMessageFrom.go

@@ -0,0 +1,9 @@
+package WsMessageFrom
+
+type WsMessageToUserFrom uint8
+
+const (
+	Server WsMessageToUserFrom = iota
+	DirectMessage
+	Group
+)

enums.go

@@ -1,9 +0,0 @@
-package main
-
-type WsMessageToUserFrom uint8
-
-const (
-	Server_ WsMessageToUserFrom = iota
-	DirectMessage_
-	Group_
-)

structs.go

@@ -20,9 +20,10 @@ type User struct {
 
 type Connection struct {
 	CreatedAt   time.Time `json:"createdAt"`
-	With       uint32    `json:"-"`
-	IsFromUser bool      `json:"isFromUser"`
-	IsAccepted bool      `json:"isAccepted"`
+	Id          uint32    `json:"id"`
+	RequestorId uint32    `json:"requestorId"`
+	RecipientId uint32    `json:"recipientId"`
+	MessagesBuf
 }
 
 type Group struct {

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)