github/TREK
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix for settings page

Browse Source
This commit is contained in:
Marek Maslowski
2026-04-05 11:08:58 +02:00
parent 0d3a10120a
commit b0b85fff3a
4 changed files with 264 additions and 1451 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
server/src/services/memories/unifiedService.ts
View File

@@ -1,5 +1,5 @@
import { db, canAccessTrip } from '../../db/database';
import { notifyTripMembers } from '../notifications';
import { send } from '../notificationService';
import { broadcast } from '../../websocket';
import {
ServiceResult,
@@ -290,17 +290,12 @@ async function _notifySharedTripPhotos(
if (added <= 0) return fail('No photos shared, skipping notifications', 200);
try {
const actorRow = db.prepare('SELECT username FROM users WHERE id = ?').get(actorUserId) as { username: string | null };
const actorRow = db.prepare('SELECT username, email FROM users WHERE id = ?').get(actorUserId) as { username: string | null, email: string | null };
const tripInfo = db.prepare('SELECT title FROM trips WHERE id = ?').get(tripId) as { title: string } | undefined;
//send({ event: 'photos_shared', actorId: authReq.user.id, scope: 'trip', targetId: Number(tripId), params: { trip: tripInfo?.title || 'Untitled', actor: authReq.user.email, count: String(added), tripId: String(tripId) } }).catch(() => {});
await notifyTripMembers(Number(tripId), actorUserId, 'photos_shared', {
trip: tripInfo?.title || 'Untitled',
actor: actorRow?.username || 'Unknown',
count: String(added),
});
send({ event: 'photos_shared', actorId: actorUserId, scope: 'trip', targetId: Number(tripId), params: { trip: tripInfo?.title || 'Untitled', actor: actorRow?.email || 'Unknown', count: String(added), tripId: String(tripId) } }).catch(() => {});
return success(undefined);
} catch {
return fail('Failed to send notifications', 500);