Merge pull request #65 from CS3219-AY2425S1/collab-post-ms6

prevent users from matching with themselves

Author: tzyian

collab/main.go

@@ -139,6 +139,9 @@ func (h *Hub) Run() {
 			}
 			h.mutex.Unlock()
 		}
+
+
+		
 	}
 }
 
@@ -161,6 +164,7 @@ func serveWs(
 		return
 	}
 
+	
 	client := &Client{conn: conn, roomID: roomID}
 	hub.register <- client
 
@@ -214,6 +218,8 @@ func handleMessages(
 			log.Printf("Failed to parse message: %v", err)
 			continue
 		}
+
+
 		if msgData["type"] == "auth" {
 			token, tokenOk := msgData["token"].(string)
 			if !tokenOk {

matching-service/storage/client_mappings.go

@@ -43,6 +43,12 @@ func (db *ClientMappings) HandleRequest(request models.IncomingRequests) (*model
 	}
 
 	for _, user1 := range currMappings {
+		
+		if user1 == user2 {
+			//users cannot match with themselves
+			continue
+		}
+		
 		result, err := db.Conn.HGetAll(ctx, user1).Result()
 
 		if err == redis.Nil {

peerprep/next.config.js

@@ -2,6 +2,9 @@
 const nextConfig = {};
 
 module.exports = {
+  eslint: {
+    ignoreDuringBuilds: true,
+  },
   reactStrictMode: false,
   async rewrites() {
     return [