post merge

This commit is contained in:
Marek Maslowski
2026-04-05 10:26:23 +02:00
parent b8c3d5b3d1
commit 0d3a10120a
2 changed files with 4 additions and 1 deletions
+1 -1
View File
@@ -735,7 +735,7 @@ function runMigrations(db: Database.Database): void {
}, },
() => { () => {
try {db.exec('UPDATE addons SET enabled = 0 WHERE id = memories');} catch (err) {} try {db.exec('UPDATE addons SET enabled = 0 WHERE id = memories');} catch (err) {}
} },
// Migration 69: Place region cache for sub-national Atlas regions // Migration 69: Place region cache for sub-national Atlas regions
() => { () => {
db.exec(` db.exec(`
@@ -293,6 +293,9 @@ async function _notifySharedTripPhotos(
const actorRow = db.prepare('SELECT username FROM users WHERE id = ?').get(actorUserId) as { username: string | null }; const actorRow = db.prepare('SELECT username FROM users WHERE id = ?').get(actorUserId) as { username: string | null };
const tripInfo = db.prepare('SELECT title FROM trips WHERE id = ?').get(tripId) as { title: string } | undefined; 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', { await notifyTripMembers(Number(tripId), actorUserId, 'photos_shared', {
trip: tripInfo?.title || 'Untitled', trip: tripInfo?.title || 'Untitled',
actor: actorRow?.username || 'Unknown', actor: actorRow?.username || 'Unknown',