From 0b7a1669b8027067b6335f9b2cd640d01fc0e9e9 Mon Sep 17 00:00:00 2001
From: Isaque Veras <46972789+isaqueveras@users.noreply.github.com>
Date: Sat, 3 Jun 2023 16:28:02 -0300
Subject: [PATCH] chore(listener): removing redundancy (#64)

---
 listener.go | 29 +++++++----------------------
 1 file changed, 7 insertions(+), 22 deletions(-)

diff --git a/listener.go b/listener.go
index 2d3ab6a..b581d3e 100644
--- a/listener.go
+++ b/listener.go
@@ -17,9 +17,7 @@ func GetListeningFilters() nostr.Filters {
 	var respfilters = make(nostr.Filters, 0, len(listeners)*2)
 
 	listenersMutex.Lock()
-	defer func() {
-		listenersMutex.Unlock()
-	}()
+	defer listenersMutex.Unlock()
 
 	// here we go through all the existing listeners
 	for _, connlisteners := range listeners {
@@ -48,9 +46,7 @@ func GetListeningFilters() nostr.Filters {
 
 func setListener(id string, ws *WebSocket, filters nostr.Filters) {
 	listenersMutex.Lock()
-	defer func() {
-		listenersMutex.Unlock()
-	}()
+	defer listenersMutex.Unlock()
 
 	subs, ok := listeners[ws]
 	if !ok {
@@ -58,20 +54,15 @@ func setListener(id string, ws *WebSocket, filters nostr.Filters) {
 		listeners[ws] = subs
 	}
 
-	subs[id] = &Listener{
-		filters: filters,
-	}
+	subs[id] = &Listener{filters: filters}
 }
 
 // Remove a specific subscription id from listeners for a given ws client
 func removeListenerId(ws *WebSocket, id string) {
 	listenersMutex.Lock()
-	defer func() {
-		listenersMutex.Unlock()
-	}()
+	defer listenersMutex.Unlock()
 
-	subs, ok := listeners[ws]
-	if ok {
+	if subs, ok := listeners[ws]; ok {
 		delete(listeners[ws], id)
 		if len(subs) == 0 {
 			delete(listeners, ws)
@@ -83,18 +74,12 @@ func removeListenerId(ws *WebSocket, id string) {
 func removeListener(ws *WebSocket) {
 	listenersMutex.Lock()
 	defer listenersMutex.Unlock()
-
-	_, ok := listeners[ws]
-	if ok {
-		delete(listeners, ws)
-	}
+	delete(listeners, ws)
 }
 
 func notifyListeners(event *nostr.Event) {
 	listenersMutex.Lock()
-	defer func() {
-		listenersMutex.Unlock()
-	}()
+	defer listenersMutex.Unlock()
 
 	for ws, subs := range listeners {
 		for id, listener := range subs {