DebaucheryLibrarian
/
traxxx-web
1
1
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: DebaucheryLibrarian:652c38984014f31f4e26756503cfb59af059816c
Branches Tags
DebaucheryLibrarian:main
..
compare: DebaucheryLibrarian:cec927ba0bc309d26eb2e4895623ba8ad51c2c5d
Branches Tags
DebaucheryLibrarian:main

No commits in common. "652c38984014f31f4e26756503cfb59af059816c" and "cec927ba0bc309d26eb2e4895623ba8ad51c2c5d" have entirely different histories.
652c389840 ... cec927ba0b

3 changed files with 44 additions and 50 deletions
Show Stats Expand all files Collapse all files

4
package-lock.json generated
View File

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

2
package.json
View File

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

18
src/alerts.js
View File

@ -150,8 +150,7 @@ export async function fetchNotifications(reqUser, options = {}) {
return []; return [];
} }
const [notifications, rawUnseen] = await Promise.all([ const notifications = await knex('notifications')
knex('notifications')
.select( .select(
'notifications.*', 'notifications.*',
'alerts.id as alert_id', '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_entities', 'alerts_entities.alert_id', 'alerts.id')
.leftJoin('alerts_matches', 'alerts_matches.alert_id', 'alerts.id') .leftJoin('alerts_matches', 'alerts_matches.alert_id', 'alerts.id')
.where('notifications.user_id', reqUser.id) .where('notifications.user_id', reqUser.id)
.limit(options.limit)
.groupBy('notifications.id', 'alerts.id') .groupBy('notifications.id', 'alerts.id')
.orderBy('created_at', 'desc'), .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 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); const scene = scenes.find((sceneX) => sceneX.id === notification.scene_id);
return { return {