From cffdbc16b4d9bc49bea3cf005d8378e9e869f1f9 Mon Sep 17 00:00:00 2001
From: Simon Ser <contact@emersion.fr>
Date: Wed, 17 Aug 2022 17:04:11 +0200
Subject: [PATCH] downstream: break findWebPushSubscription in two functions

We'll use that to count the number of existing subscriptions in
the next commit.
---
 downstream.go | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/downstream.go b/downstream.go
index 1c95e0c..d4b879e 100644
--- a/downstream.go
+++ b/downstream.go
@@ -3327,7 +3327,7 @@ func (dc *downstreamConn) handleMessageRegistered(ctx context.Context, msg *irc.
 			newSub.Keys.Auth = string(authKey)
 			newSub.Keys.P256DH = string(p256dhKey)
 
-			oldSub, err := dc.findWebPushSubscription(ctx, endpoint)
+			subs, err := dc.listWebPushSubscriptions(ctx)
 			if err != nil {
 				dc.logger.Printf("failed to fetch Web push subscription: %v", err)
 				return ircError{&irc.Message{
@@ -3336,6 +3336,7 @@ func (dc *downstreamConn) handleMessageRegistered(ctx context.Context, msg *irc.
 				}}
 			}
 
+			oldSub := findWebPushSubscription(subs, endpoint)
 			if oldSub != nil {
 				// Update the old subscription instead of creating a new one
 				newSub.ID = oldSub.ID
@@ -3381,7 +3382,7 @@ func (dc *downstreamConn) handleMessageRegistered(ctx context.Context, msg *irc.
 				return err
 			}
 
-			oldSub, err := dc.findWebPushSubscription(ctx, endpoint)
+			subs, err := dc.listWebPushSubscriptions(ctx)
 			if err != nil {
 				dc.logger.Printf("failed to fetch Web push subscription: %v", err)
 				return ircError{&irc.Message{
@@ -3390,6 +3391,7 @@ func (dc *downstreamConn) handleMessageRegistered(ctx context.Context, msg *irc.
 				}}
 			}
 
+			oldSub := findWebPushSubscription(subs, endpoint)
 			if oldSub == nil {
 				dc.SendMessage(&irc.Message{
 					Prefix:  dc.srv.prefix(),
@@ -3446,23 +3448,22 @@ func (dc *downstreamConn) handleNickServPRIVMSG(ctx context.Context, uc *upstrea
 	}
 }
 
-func (dc *downstreamConn) findWebPushSubscription(ctx context.Context, endpoint string) (*database.WebPushSubscription, error) {
+func (dc *downstreamConn) listWebPushSubscriptions(ctx context.Context) ([]database.WebPushSubscription, error) {
 	var networkID int64
 	if dc.network != nil {
 		networkID = dc.network.ID
 	}
 
-	subs, err := dc.user.srv.db.ListWebPushSubscriptions(ctx, dc.user.ID, networkID)
-	if err != nil {
-		return nil, err
-	}
+	return dc.user.srv.db.ListWebPushSubscriptions(ctx, dc.user.ID, networkID)
+}
 
+func findWebPushSubscription(subs []database.WebPushSubscription, endpoint string) *database.WebPushSubscription {
 	for i, sub := range subs {
 		if sub.Endpoint == endpoint {
-			return &subs[i], nil
+			return &subs[i]
 		}
 	}
-	return nil, nil
+	return nil
 }
 
 func parseNickServCredentials(text, nick string) (username, password string, ok bool) {