fix(*): fixing bugs.

dezh-tech · Jan 6, 2025 · 2d22f22 · 2d22f22
1 parent 10488f7
commit 2d22f22
Showing 1 changed file with 29 additions and 28 deletions.
diff --git a/delivery/websocket/event_handler.go b/delivery/websocket/event_handler.go
@@ -58,33 +58,33 @@ func (s *Server) handleEvent(conn *websocket.Conn, m message.Message) { //nolint
 
 	pipe := s.redis.Client.Pipeline()
 
-	// bloomCheckCmd := pipe.BFExists(qCtx, s.redis.BloomFilterName, eID[:])
+	bloomCheckCmd := pipe.BFExists(qCtx, s.redis.BloomFilterName, eID[:])
 
 	// todo::: check config to enable/disable filter checks.
-	// whiteListCheckCmd := pipe.CFExists(qCtx, s.redis.WhiteListFilterName, pubkey)
+	whiteListCheckCmd := pipe.CFExists(qCtx, s.redis.WhiteListFilterName, pubkey)
 	blackListCheckCmd := pipe.CFExists(qCtx, s.redis.BlackListFilterName, pubkey)
 
 	_, err := pipe.Exec(qCtx)
 	if err != nil {
 		log.Printf("error: checking filters: %s", err.Error())
 	}
 
-	// exists, err := bloomCheckCmd.Result()
-	// if err != nil {
-	// 	okm := message.MakeOK(false, msg.Event.ID, "error: internal error")
-	// 	_ = conn.WriteMessage(1, okm)
+	exists, err := bloomCheckCmd.Result()
+	if err != nil {
+		okm := message.MakeOK(false, msg.Event.ID, "error: internal error")
+		_ = conn.WriteMessage(1, okm)
 
-	// 	status = serverFail
+		status = serverFail
 
-	// 	return
-	// }
+		return
+	}
 
-	// if exists {
-	// 	okm := message.MakeOK(false, msg.Event.ID, "duplicate: this event is already received.")
-	// 	_ = conn.WriteMessage(1, okm)
+	if exists {
+		okm := message.MakeOK(false, msg.Event.ID, "duplicate: this event is already received.")
+		_ = conn.WriteMessage(1, okm)
 
-	// 	return
-	// }
+		return
+	}
 
 	notAllowedToWrite, err := blackListCheckCmd.Result()
 	if err != nil {
@@ -104,23 +104,23 @@ func (s *Server) handleEvent(conn *websocket.Conn, m message.Message) { //nolint
 		return
 	}
 
-	// allowedToWrite, err := whiteListCheckCmd.Result()
-	// if err != nil {
-	// 	okm := message.MakeOK(false, msg.Event.ID, "error: internal error")
-	// 	_ = conn.WriteMessage(1, okm)
+	allowedToWrite, err := whiteListCheckCmd.Result()
+	if err != nil {
+		okm := message.MakeOK(false, msg.Event.ID, "error: internal error")
+		_ = conn.WriteMessage(1, okm)
 
-	// 	status = serverFail
+		status = serverFail
 
-	// 	return
-	// }
-	// if !allowedToWrite {
-	// 	okm := message.MakeOK(false, msg.Event.ID, "restricted: not allowed to write.")
-	// 	_ = conn.WriteMessage(1, okm)
+		return
+	}
+	if !allowedToWrite {
+		okm := message.MakeOK(false, msg.Event.ID, "restricted: not allowed to write.")
+		_ = conn.WriteMessage(1, okm)
 
-	// 	status = limitsFail
+		status = limitsFail
 
-	// 	return
-	// }
+		return
+	}
 
 	client, ok := s.conns[conn]
 	if !ok {
@@ -281,9 +281,10 @@ func (s *Server) handleEvent(conn *websocket.Conn, m message.Message) { //nolint
 
 			return
 		}
-		_ = conn.WriteMessage(1, message.MakeOK(true, msg.Event.ID, ""))
 	}
 
+	_ = conn.WriteMessage(1, message.MakeOK(true, msg.Event.ID, ""))
+
 	_, err = s.redis.Client.BFAdd(qCtx, s.redis.BloomFilterName, eID[:]).Result()
 	if err != nil {
 		log.Printf("error: adding event to bloom filter.")