code/push: only send push to most recent token

Author: mfycheng

pkg/code/push/data.go

@@ -2,6 +2,7 @@ package push
 
 import (
 	"context"
+	"slices"
 
 	"github.com/sirupsen/logrus"
 
@@ -98,47 +99,43 @@ func sendMutableNotificationToOwner(
 		log.WithError(err).Warn("failure getting push tokens for owner")
 		return err
 	}
+	if len(pushTokenRecords) == 0 {
+		log.Debug("No push tokens found")
+		return nil
+	}
 
-	log.WithField("tokens", pushTokenRecords).Info("Found push tokens")
-
-	seenPushTokens := make(map[string]struct{})
-	for _, pushTokenRecord := range pushTokenRecords {
-		// Dedup push tokens, since they may appear more than once per app install
-		if _, ok := seenPushTokens[pushTokenRecord.PushToken]; ok {
-			continue
-		}
-
-		log := log.WithField("push_token", pushTokenRecord.PushToken)
+	log.WithField("tokens", pushTokenRecords).Debug("Found push tokens")
+	slices.SortFunc(pushTokenRecords, func(a, b *push_data.Record) int {
+		return b.CreatedAt.Compare(a.CreatedAt)
+	})
 
-		// Try push
-		var err error
-		switch pushTokenRecord.TokenType {
-		case push_data.TokenTypeFcmApns:
-			log.Info("Sending mutable push")
-			err = pusher.SendMutableAPNSPush(
-				ctx,
-				pushTokenRecord.PushToken,
-				titleKey,
-				string(notificationType),
-				titleKey, // All mutable pushes have a thread ID that's the title
-				kvs,
-			)
-		case push_data.TokenTypeFcmAndroid:
-			// todo: anything special required for Android?
-			log.Info("Sending data push")
-			err = pusher.SendDataPush(
-				ctx,
-				pushTokenRecord.PushToken,
-				kvs,
-			)
-		}
+	pushTokenRecord := pushTokenRecords[0]
+	log = log.WithField("push_token", pushTokenRecord.PushToken)
 
-		if err != nil {
-			log.WithError(err).Warn("failure sending push notification")
-			onPushError(ctx, data, pusher, pushTokenRecord)
-		}
+	// Try push
+	switch pushTokenRecord.TokenType {
+	case push_data.TokenTypeFcmApns:
+		err = pusher.SendMutableAPNSPush(
+			ctx,
+			pushTokenRecord.PushToken,
+			titleKey,
+			string(notificationType),
+			titleKey, // All mutable pushes have a thread ID that's the title
+			kvs,
+		)
+	case push_data.TokenTypeFcmAndroid:
+		// todo: anything special required for Android?
+		err = pusher.SendDataPush(
+			ctx,
+			pushTokenRecord.PushToken,
+			kvs,
+		)
+	}
 
-		seenPushTokens[pushTokenRecord.PushToken] = struct{}{}
+	if err != nil {
+		log.WithError(err).Warn("failure sending push notification")
+		onPushError(ctx, data, pusher, pushTokenRecord)
 	}
+
 	return nil
 }

pkg/code/server/grpc/chat/v2/server.go

@@ -1425,8 +1425,6 @@ func (s *Server) sendPushNotifications(chatId chat.ChatId, chatTitle string, sen
 		return
 	}
 
-	log.WithField("members", members).Info("Found members for push")
-
 	var eg errgroup.Group
 	eg.SetLimit(min(32, len(members)))
 
@@ -1437,7 +1435,7 @@ func (s *Server) sendPushNotifications(chatId chat.ChatId, chatTitle string, sen
 				"isSender":       m.MemberId == sender,
 				"isMuted":        m.IsMuted,
 				"isUnsubscribed": m.IsUnsubscribed,
-			}).Info("skipping member")
+			}).Debug("skipping member")
 
 			continue
 		}
@@ -1450,7 +1448,6 @@ func (s *Server) sendPushNotifications(chatId chat.ChatId, chatTitle string, sen
 
 		m := m
 		eg.Go(func() error {
-			log.WithField("member", m.MemberId.String()).Info("sending push notification")
 			err = push_util.SendChatMessagePushNotificationV2(
 				context.Background(),
 				s.data,