api/ws- make User.Conn private

nektro · Apr 17, 2022 · aa34e81 · aa34e81
1 parent c81a372
commit aa34e81
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/pkg/handler/ws.go b/pkg/handler/ws.go
@@ -24,7 +24,7 @@ func Websocket(w http.ResponseWriter, r *http.Request) {
 	// message intake loop
 	for {
 		// Read message from browser
-		_, msg, err := wuser.Conn.ReadMessage()
+		_, msg, err := wuser.ReadMessage()
 		if err != nil {
 			break
 		}

diff --git a/pkg/ws/user.go b/pkg/ws/user.go
@@ -8,7 +8,7 @@ import (
 )
 
 type User struct {
-	Conn *websocket.Conn
+	conn *websocket.Conn
 	User *db.User
 }
 
@@ -21,20 +21,24 @@ func (u *User) Disconnect() {
 			"type": "user-disconnect",
 			"user": u.User.UUID,
 		})
-		u.Conn.Close()
+		u.conn.Close()
 	}
 }
 
+func (u *User) ReadMessage() (int, []byte, error) {
+	return u.conn.ReadMessage()
+}
+
 func (u *User) IsConnected() bool {
 	return store.This.ListHas(keyOnline, u.User.UUID.String())
 }
 
 func (u *User) SendWsMessage(msg map[string]interface{}) {
-	u.Conn.WriteJSON(msg)
+	u.conn.WriteJSON(msg)
 }
 
 func (u *User) SendWsMessageRaw(msg []byte) {
-	u.Conn.WriteMessage(websocket.TextMessage, msg)
+	u.conn.WriteMessage(websocket.TextMessage, msg)
 }
 
 func (u *User) SendMessage(in *db.Channel, msg string) {