linting

Author: Thomas Stromberg

pkg/srv/client.go

@@ -15,7 +15,7 @@ import (
 // Connection management follows a simple pattern:
 //   - ONE goroutine (Run) handles ALL writes to avoid concurrent write issues
 //   - Server sends pings every pingInterval to detect dead connections
-//   - Client responds with pongs; server tracks responses via RecordPong
+//   - Client responds with pongs; read loop resets deadline on any message
 //   - Read loop (in websocket.go) detects disconnects and closes the connection
 type Client struct {
 	conn         *websocket.Conn
@@ -62,7 +62,7 @@ func NewClient(id string, sub Subscription, conn *websocket.Conn, hub *Hub, user
 //
 // Connection management:
 //  1. Server sends ping every pingInterval (54s)
-//  2. Client must respond with pong (tracked by RecordPong in read loop)
+//  2. Client must respond with pong (read loop resets deadline on any message)
 //  3. If client doesn't respond, read timeout (90s) will disconnect them
 //  4. Any write error immediately closes the connection
 func (c *Client) Run(ctx context.Context, pingInterval, writeTimeout time.Duration) {
@@ -128,16 +128,6 @@ func (c *Client) write(msg any, timeout time.Duration) error {
 	return nil
 }
 
-// RecordPong records receipt of a pong from the client.
-// This is called by the read loop when a pong message is received.
-// The read loop's timeout (90s) is what actually enforces disconnection.
-func (*Client) RecordPong(_ int64) {
-	// No-op: pong receipt is tracked implicitly by the read loop's timeout.
-	// The read loop resets its deadline on any message (including pong),
-	// so as long as pongs arrive, the connection stays alive.
-	// We keep this method for logging/debugging if needed in the future.
-}
-
 // Close gracefully closes the client.
 func (c *Client) Close() {
 	c.closeOnce.Do(func() {

pkg/srv/subscription.go

@@ -173,18 +173,6 @@ func parsePRUrl(prURL string) (*prURLInfo, error) {
 
 // Helper functions to reduce cognitive complexity.
 
-func matchesEventType(sub Subscription, eventType string) bool {
-	if len(sub.EventTypes) == 0 {
-		return true // No filter means all events
-	}
-	for _, allowedType := range sub.EventTypes {
-		if eventType == allowedType {
-			return true
-		}
-	}
-	return false
-}
-
 func extractEventOrg(payload map[string]any) string {
 	// Check repository owner first
 	if repo, ok := payload["repository"].(map[string]any); ok {
@@ -254,8 +242,17 @@ func matchesPRSubscription(sub Subscription, payload map[string]any, eventOrg st
 
 func matches(sub Subscription, event Event, payload map[string]any, userOrgs map[string]bool) bool {
 	// Check if event type matches subscription
-	if !matchesEventType(sub, event.Type) {
-		return false
+	if len(sub.EventTypes) > 0 {
+		found := false
+		for _, allowedType := range sub.EventTypes {
+			if event.Type == allowedType {
+				found = true
+				break
+			}
+		}
+		if !found {
+			return false
+		}
 	}
 
 	// Extract the organization from the event
@@ -310,18 +307,6 @@ func matchesUserInObject(user map[string]any, username string) bool {
 	return ok && strings.EqualFold(login, username)
 }
 
-// matchesUserInList checks if username matches any login in a list of user objects.
-func matchesUserInList(users []any, username string) bool {
-	for _, item := range users {
-		if user, ok := item.(map[string]any); ok {
-			if matchesUserInObject(user, username) {
-				return true
-			}
-		}
-	}
-	return false
-}
-
 // checkPullRequestUsers checks PR author, assignees, and reviewers.
 func checkPullRequestUsers(pr map[string]any, username string) bool {
 	// Check PR author
@@ -333,15 +318,23 @@ func checkPullRequestUsers(pr map[string]any, username string) bool {
 
 	// Check assignees
 	if assignees, ok := pr["assignees"].([]any); ok {
-		if matchesUserInList(assignees, username) {
-			return true
+		for _, item := range assignees {
+			if user, ok := item.(map[string]any); ok {
+				if matchesUserInObject(user, username) {
+					return true
+				}
+			}
 		}
 	}
 
 	// Check requested reviewers
 	if reviewers, ok := pr["requested_reviewers"].([]any); ok {
-		if matchesUserInList(reviewers, username) {
-			return true
+		for _, item := range reviewers {
+			if user, ok := item.(map[string]any); ok {
+				if matchesUserInObject(user, username) {
+					return true
+				}
+			}
 		}
 	}
 

pkg/srv/websocket.go

@@ -761,9 +761,8 @@ func (h *WebSocketHandler) Handle(ws *websocket.Conn) {
 				switch msgType {
 				case "pong":
 					// Pong received - connection is alive
-					if seq, ok := msgMap["seq"].(float64); ok {
-						client.RecordPong(int64(seq))
-					}
+					// No explicit tracking needed: the read loop's deadline reset
+					// (which happens for ANY message including pong) keeps the connection alive
 					continue
 				case "ping":
 					// Client sent us a ping, send pong back