🐛 Fix notifiable check

pkg/internal/services/notifications.go

@@ -74,33 +74,27 @@ func NewNotificationBatch(notifications []models.Notification) error {
 	notifiable := CheckNotificationNotifiableBatch(lo.Map(notifications, func(item models.Notification, index int) models.Account {
 		return item.Account
 	}), notifications[0].Topic)
-	accountIdx := lo.Map(
-		lo.Filter(notifications, func(item models.Notification, index int) bool {
-			return notifiable[index]
-		}),
-		func(item models.Notification, index int) uint {
-			return item.AccountID
-		},
-	)
 
-	if len(accountIdx) == 0 {
+	notifications = lo.Filter(notifications, func(item models.Notification, index int) bool {
-		return nil
+		return notifiable[index]
-	}
+	})
 
 	if err := database.C.CreateInBatches(notifications, 1000).Error; err != nil {
 		return err
 	}
 
-	PushNotificationBatch(notifications)
+	PushNotificationBatch(notifications, true)
 	return nil
 }
 
 // PushNotification will push a notification to the user, via websocket, firebase, or APNs
 // Please provide the notification with the account field is not empty
-func PushNotification(notification models.Notification) error {
+func PushNotification(notification models.Notification, skipNotifiableCheck ...bool) error {
-	if ok := CheckNotificationNotifiable(notification.Account, notification.Topic); !ok {
+	if len(skipNotifiableCheck) == 0 || !skipNotifiableCheck[0] {
-		log.Info().Str("topic", notification.Topic).Uint("uid", notification.AccountID).Msg("Notification dismissed by user...")
+		if ok := CheckNotificationNotifiable(notification.Account, notification.Topic); !ok {
-		return nil
+			log.Info().Str("topic", notification.Topic).Uint("uid", notification.AccountID).Msg("Notification dismissed by user...")
+			return nil
+		}
 	}
 
 	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
@@ -158,22 +152,32 @@ func PushNotification(notification models.Notification) error {
 	return err
 }
 
-func PushNotificationBatch(notifications []models.Notification) {
+func PushNotificationBatch(notifications []models.Notification, skipNotifiableCheck ...bool) {
 	if len(notifications) == 0 {
 		return
 	}
 
-	notifiable := CheckNotificationNotifiableBatch(lo.Map(notifications, func(item models.Notification, index int) models.Account {
+	var accountIdx []uint
-		return item.Account
+	if len(skipNotifiableCheck) == 0 || !skipNotifiableCheck[0] {
-	}), notifications[0].Topic)
+		notifiable := CheckNotificationNotifiableBatch(lo.Map(notifications, func(item models.Notification, index int) models.Account {
-	accountIdx := lo.Map(
+			return item.Account
-		lo.Filter(notifications, func(item models.Notification, index int) bool {
+		}), notifications[0].Topic)
-			return notifiable[index]
+		accountIdx = lo.Map(
-		}),
+			lo.Filter(notifications, func(item models.Notification, index int) bool {
-		func(item models.Notification, index int) uint {
+				return notifiable[index]
-			return item.AccountID
+			}),
-		},
+			func(item models.Notification, index int) uint {
-	)
+				return item.AccountID
+			},
+		)
+	} else {
+		accountIdx = lo.Map(
+			notifications,
+			func(item models.Notification, index int) uint {
+				return item.AccountID
+			},
+		)
+	}
 
 	if len(accountIdx) == 0 {
 		return

pkg/internal/services/preferences.go

@@ -62,15 +62,15 @@ func CheckNotificationNotifiableBatch(accounts []models.Account, topic string) [
 		})
 	}
 
-	var notifiable []bool
+	var notifiable = make([]bool, len(accounts))
-	for _, notification := range notifications {
+	for idx, notification := range notifications {
 		if val, ok := notification.Config[topic]; ok {
 			if status, ok := val.(bool); ok {
-				notifiable = append(notifiable, status)
+				notifiable[idx] = status
 				continue
 			}
 		}
-		notifiable = append(notifiable, true)
+		notifiable[idx] = true
 	}
 
 	return notifiable