0.19.1

package-lock.json

@@ -1,11 +1,11 @@
 {
   "name": "traxxx-web",
-  "version": "0.19.0",
+  "version": "0.19.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
-      "version": "0.19.0",
+      "version": "0.19.1",
       "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.0"
+  "version": "0.19.1"
 }

src/alerts.js

@@ -150,51 +150,57 @@ export async function fetchNotifications(reqUser, options = {}) {
 		return [];
 	}
 
-	const notifications = await knex('notifications')
-		.select(
-			'notifications.*',
-			'alerts.id as alert_id',
-			knex.raw('coalesce(array_agg(alerts_actors.actor_id) filter (where alerts_actors.id is not null), \'{}\') as alert_actors'),
-			knex.raw('coalesce(array_agg(alerts_tags.tag_id) filter (where alerts_tags.id is not null), \'{}\') as alert_tags'),
-			knex.raw('coalesce(array_agg(alerts_entities.entity_id) filter (where alerts_entities.id is not null), \'{}\') as alert_entities'),
-			knex.raw('coalesce(json_agg(alerts_matches) filter (where alerts_matches.id is not null), \'[]\') as alert_matches'),
-		)
-		.leftJoin('alerts', 'alerts.id', 'notifications.alert_id')
-		.leftJoin('alerts_actors', 'alerts_actors.alert_id', 'alerts.id')
-		.leftJoin('alerts_tags', 'alerts_tags.alert_id', 'alerts.id')
-		.leftJoin('alerts_entities', 'alerts_entities.alert_id', 'alerts.id')
-		.leftJoin('alerts_matches', 'alerts_matches.alert_id', 'alerts.id')
-		.where('notifications.user_id', reqUser.id)
-		.groupBy('notifications.id', 'alerts.id')
-		.orderBy('created_at', 'desc');
+	const [notifications, rawUnseen] = await Promise.all([
+		knex('notifications')
+			.select(
+				'notifications.*',
+				'alerts.id as alert_id',
+				knex.raw('coalesce(array_agg(alerts_actors.actor_id) filter (where alerts_actors.id is not null), \'{}\') as alert_actors'),
+				knex.raw('coalesce(array_agg(alerts_tags.tag_id) filter (where alerts_tags.id is not null), \'{}\') as alert_tags'),
+				knex.raw('coalesce(array_agg(alerts_entities.entity_id) filter (where alerts_entities.id is not null), \'{}\') as alert_entities'),
+				knex.raw('coalesce(json_agg(alerts_matches) filter (where alerts_matches.id is not null), \'[]\') as alert_matches'),
+			)
+			.leftJoin('alerts', 'alerts.id', 'notifications.alert_id')
+			.leftJoin('alerts_actors', 'alerts_actors.alert_id', 'alerts.id')
+			.leftJoin('alerts_tags', 'alerts_tags.alert_id', 'alerts.id')
+			.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(),
+	]);
 
 	const scenes = await fetchScenesById(notifications.map((notification) => notification.scene_id));
-	const unseen = notifications.filter((notification) => !notification.seen).length;
+	const unseen = Number(rawUnseen.count);
 
-	const curatedNotifications = notifications
-		.slice(0, options.limit || 10)
-		.map((notification) => {
-			const scene = scenes.find((sceneX) => sceneX.id === notification.scene_id);
+	const curatedNotifications = notifications.map((notification) => {
+		const scene = scenes.find((sceneX) => sceneX.id === notification.scene_id);
 
-			return {
-				id: notification.id,
-				sceneId: notification.scene_id,
-				scene,
-				alertId: notification.alert_id,
-				matchedActors: scene.actors.filter((actor) => notification.alert_actors.includes(actor.id)),
-				matchedTags: scene.tags.filter((tag) => notification.alert_tags.includes(tag.id)),
-				matchedEntity: [scene.channel, scene.network].find((entity) => notification.alert_entities.includes(entity?.id)) || null,
-				matchedExpressions: notification.alert_matches
-					.filter((match) => new RegExp(match.expression, 'ui').test(scene[match.property]))
-					.map((match) => ({
-						id: match.id,
-						property: match.property,
-						expression: match.expression,
-					})),
-				isSeen: notification.seen,
-				createdAt: notification.created_at,
-			};
-		});
+		return {
+			id: notification.id,
+			sceneId: notification.scene_id,
+			scene,
+			alertId: notification.alert_id,
+			matchedActors: scene.actors.filter((actor) => notification.alert_actors.includes(actor.id)),
+			matchedTags: scene.tags.filter((tag) => notification.alert_tags.includes(tag.id)),
+			matchedEntity: [scene.channel, scene.network].find((entity) => notification.alert_entities.includes(entity?.id)) || null,
+			matchedExpressions: notification.alert_matches
+				.filter((match) => new RegExp(match.expression, 'ui').test(scene[match.property]))
+				.map((match) => ({
+					id: match.id,
+					property: match.property,
+					expression: match.expression,
+				})),
+			isSeen: notification.seen,
+			createdAt: notification.created_at,
+		};
+	});
 
 	return {
 		notifications: curatedNotifications,