package-lock.json

@@ -1,11 +1,11 @@
 {
   "name": "traxxx-web",
-  "version": "0.19.1",
+  "version": "0.19.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
-      "version": "0.19.1",
+      "version": "0.19.0",
       "dependencies": {
         "@brillout/json-serializer": "^0.5.8",
         "@dicebear/collection": "^7.0.5",

package.json

@@ -75,5 +75,5 @@
     "postcss-custom-media": "^10.0.2",
     "postcss-nesting": "^12.0.2"
   },
-  "version": "0.19.1"
+  "version": "0.19.0"
 }

src/alerts.js

@@ -150,8 +150,7 @@ export async function fetchNotifications(reqUser, options = {}) {
 		return [];
 	}
 
-	const [notifications, rawUnseen] = await Promise.all([
-		knex('notifications')
+	const notifications = await knex('notifications')
 		.select(
 			'notifications.*',
 			'alerts.id as alert_id',
@@ -166,20 +165,15 @@ export async function fetchNotifications(reqUser, options = {}) {
 		.leftJoin('alerts_entities', 'alerts_entities.alert_id', 'alerts.id')
 		.leftJoin('alerts_matches', 'alerts_matches.alert_id', 'alerts.id')
 		.where('notifications.user_id', reqUser.id)
-			.limit(options.limit)
 		.groupBy('notifications.id', 'alerts.id')
-			.orderBy('created_at', 'desc'),
-		knex('notifications')
-			.select(knex.raw('count(id)'))
-			.where('user_id', reqUser.id)
-			.where('seen', false)
-			.first(),
-	]);
+		.orderBy('created_at', 'desc');
 
 	const scenes = await fetchScenesById(notifications.map((notification) => notification.scene_id));
-	const unseen = Number(rawUnseen.count);
+	const unseen = notifications.filter((notification) => !notification.seen).length;
 
-	const curatedNotifications = notifications.map((notification) => {
+	const curatedNotifications = notifications
+		.slice(0, options.limit || 10)
+		.map((notification) => {
 			const scene = scenes.find((sceneX) => sceneX.id === notification.scene_id);
 
 			return {