feat: Journey addon — travel journal with entries, photos, public sharing & PDF export

- 5-table schema (journeys, entries, photos, trips, contributors) with migrations 87-91 - Trip-to-Journey sync engine with skeleton entries and photo sync - Full CRUD API for journeys, entries, photos with Immich/Synology integration - Timeline, Gallery and Map views with entry editor (markdown, mood, weather, pros/cons) - Journey frontpage with hero card, stats and trip suggestions - Public share links with token-based access and photo proxy - PDF photo book export (Polarsteps-inspired) - Dashboard redesign: mobile greeting, live trip hero, quick actions, unified card design - BottomNav profile sheet with settings/admin/logout - DayPlan mobile inline place picker - TripFormModal members management - Vacay calendar trip date indicator dots - Fix contributor photo access (403) for journey Immich/Synology photos - Trip deletion cleanup for journey skeleton entries - i18n: 231 new keys across all 14 languages (native translations, no fallbacks)
2026-06-21 14:21:46 +00:00 · 2026-04-11 19:01:34 +02:00
parent 0df90086bf
commit 13956804c2
56 changed files with 10843 additions and 332 deletions
@@ -0,0 +1,727 @@
+import { db } from '../db/database';
+import { broadcastToUser } from '../websocket';
+import type { Journey, JourneyEntry, JourneyPhoto, JourneyContributor } from '../types';
+
+function ts(): number {
+  return Date.now();
+}
+
+function broadcastJourneyEvent(journeyId: number, event: string, data: Record<string, unknown>, excludeUserId?: number) {
+  const contributors = db.prepare(
+    'SELECT user_id FROM journey_contributors WHERE journey_id = ?'
+  ).all(journeyId) as { user_id: number }[];
+  const owner = db.prepare('SELECT user_id FROM journeys WHERE id = ?').get(journeyId) as { user_id: number } | undefined;
+
+  const userIds = new Set(contributors.map(c => c.user_id));
+  if (owner) userIds.add(owner.user_id);
+
+  for (const uid of userIds) {
+    if (uid === excludeUserId) continue;
+    broadcastToUser(uid, { type: event, journeyId, ...data });
+  }
+}
+
+// ── Access control ───────────────────────────────────────────────────────
+
+export function canAccessJourney(journeyId: number, userId: number): Journey | null {
+  const own = db.prepare('SELECT * FROM journeys WHERE id = ? AND user_id = ?').get(journeyId, userId) as Journey | undefined;
+  if (own) return own;
+  const contrib = db.prepare(
+    'SELECT 1 FROM journey_contributors WHERE journey_id = ? AND user_id = ?'
+  ).get(journeyId, userId);
+  if (contrib) return db.prepare('SELECT * FROM journeys WHERE id = ?').get(journeyId) as Journey || null;
+  return null;
+}
+
+export function isOwner(journeyId: number, userId: number): boolean {
+  return !!db.prepare('SELECT 1 FROM journeys WHERE id = ? AND user_id = ?').get(journeyId, userId);
+}
+
+export function canEdit(journeyId: number, userId: number): boolean {
+  if (isOwner(journeyId, userId)) return true;
+  const c = db.prepare(
+    "SELECT role FROM journey_contributors WHERE journey_id = ? AND user_id = ?"
+  ).get(journeyId, userId) as { role: string } | undefined;
+  return c?.role === 'editor' || c?.role === 'owner';
+}
+
+// ── Journey CRUD ─────────────────────────────────────────────────────────
+
+export function listJourneys(userId: number) {
+  return db.prepare(`
+    SELECT DISTINCT j.*,
+      (SELECT COUNT(*) FROM journey_entries je WHERE je.journey_id = j.id AND je.type != 'skeleton') as entry_count,
+      (SELECT COUNT(*) FROM journey_photos jp JOIN journey_entries je2 ON jp.entry_id = je2.id WHERE je2.journey_id = j.id) as photo_count,
+      (SELECT COUNT(DISTINCT je3.location_name) FROM journey_entries je3 WHERE je3.journey_id = j.id AND je3.location_name IS NOT NULL AND je3.location_name != '') as city_count
+    FROM journeys j
+    LEFT JOIN journey_contributors jc ON j.id = jc.journey_id AND jc.user_id = ?
+    WHERE j.user_id = ? OR jc.user_id = ?
+    ORDER BY j.updated_at DESC
+  `).all(userId, userId, userId) as (Journey & { entry_count: number; photo_count: number; city_count: number })[];
+}
+
+export function createJourney(userId: number, data: {
+  title: string;
+  subtitle?: string;
+  trip_ids?: number[];
+}): Journey {
+  const now = ts();
+  const res = db.prepare(`
+    INSERT INTO journeys (user_id, title, subtitle, status, created_at, updated_at)
+    VALUES (?, ?, ?, 'active', ?, ?)
+  `).run(userId, data.title, data.subtitle || null, now, now);
+
+  const journeyId = Number(res.lastInsertRowid);
+
+  // add owner as contributor
+  db.prepare(
+    'INSERT INTO journey_contributors (journey_id, user_id, role, added_at) VALUES (?, ?, ?, ?)'
+  ).run(journeyId, userId, 'owner', now);
+
+  // link trips and sync skeleton entries
+  if (data.trip_ids?.length) {
+    for (const tripId of data.trip_ids) {
+      addTripToJourney(journeyId, tripId, userId);
+    }
+  }
+
+  return db.prepare('SELECT * FROM journeys WHERE id = ?').get(journeyId) as Journey;
+}
+
+export function getJourneyFull(journeyId: number, userId: number) {
+  const journey = canAccessJourney(journeyId, userId);
+  if (!journey) return null;
+
+  const entries = db.prepare(
+    'SELECT * FROM journey_entries WHERE journey_id = ? ORDER BY entry_date ASC, entry_time ASC, sort_order ASC'
+  ).all(journeyId) as JourneyEntry[];
+
+  const photos = db.prepare(
+    'SELECT * FROM journey_photos WHERE entry_id IN (SELECT id FROM journey_entries WHERE journey_id = ?) ORDER BY sort_order ASC'
+  ).all(journeyId) as JourneyPhoto[];
+
+  // group photos by entry
+  const photosByEntry: Record<number, JourneyPhoto[]> = {};
+  for (const p of photos) {
+    (photosByEntry[p.entry_id] ||= []).push(p);
+  }
+
+  const enrichedEntries = entries.map(e => ({
+    ...e,
+    tags: e.tags ? JSON.parse(e.tags) : [],
+    pros_cons: e.pros_cons ? JSON.parse(e.pros_cons) : null,
+    photos: photosByEntry[e.id] || [],
+    source_trip_name: e.source_trip_id
+      ? (db.prepare('SELECT title FROM trips WHERE id = ?').get(e.source_trip_id) as { title: string } | undefined)?.title || null
+      : null,
+  }));
+
+  // linked trips
+  const trips = db.prepare(`
+    SELECT jt.trip_id, jt.added_at, t.title, t.start_date, t.end_date, t.cover_image, t.currency,
+      (SELECT COUNT(*) FROM places WHERE trip_id = t.id) as place_count
+    FROM journey_trips jt JOIN trips t ON jt.trip_id = t.id
+    WHERE jt.journey_id = ? ORDER BY t.start_date ASC
+  `).all(journeyId);
+
+  // contributors
+  const contributors = db.prepare(`
+    SELECT jc.journey_id, jc.user_id, jc.role, jc.added_at, u.username, u.avatar
+    FROM journey_contributors jc JOIN users u ON jc.user_id = u.id
+    WHERE jc.journey_id = ? ORDER BY jc.added_at
+  `).all(journeyId);
+
+  // stats
+  const entryCount = entries.filter(e => e.type === 'entry').length;
+  const photoCount = photos.length;
+  const cities = [...new Set(entries.map(e => e.location_name).filter(Boolean))];
+
+  return {
+    ...journey,
+    entries: enrichedEntries,
+    trips,
+    contributors,
+    stats: { entries: entryCount, photos: photoCount, cities: cities.length },
+  };
+}
+
+export function updateJourney(journeyId: number, userId: number, data: Partial<{
+  title: string;
+  subtitle: string;
+  cover_gradient: string;
+  cover_image: string;
+  status: string;
+}>): Journey | null {
+  if (!canEdit(journeyId, userId)) return null;
+
+  const allowed = ['title', 'subtitle', 'cover_gradient', 'cover_image', 'status'];
+  const fields: string[] = [];
+  const values: unknown[] = [];
+  for (const [key, val] of Object.entries(data)) {
+    if (val !== undefined && allowed.includes(key)) {
+      fields.push(`${key} = ?`);
+      values.push(val);
+    }
+  }
+  if (fields.length === 0) return db.prepare('SELECT * FROM journeys WHERE id = ?').get(journeyId) as Journey;
+
+  fields.push('updated_at = ?');
+  values.push(ts());
+  values.push(journeyId);
+  db.prepare(`UPDATE journeys SET ${fields.join(', ')} WHERE id = ?`).run(...values);
+  return db.prepare('SELECT * FROM journeys WHERE id = ?').get(journeyId) as Journey;
+}
+
+export function deleteJourney(journeyId: number, userId: number): boolean {
+  if (!isOwner(journeyId, userId)) return false;
+  db.prepare('DELETE FROM journeys WHERE id = ?').run(journeyId);
+  return true;
+}
+
+// ── Trip management ──────────────────────────────────────────────────────
+
+export function addTripToJourney(journeyId: number, tripId: number, userId: number): boolean {
+  const now = ts();
+  try {
+    db.prepare(
+      'INSERT OR IGNORE INTO journey_trips (journey_id, trip_id, added_at) VALUES (?, ?, ?)'
+    ).run(journeyId, tripId, now);
+  } catch { return false; }
+
+  // sync skeleton entries for all places in this trip
+  syncTripPlaces(journeyId, tripId, userId);
+  // import existing trip photos (Immich/Synology) with sharing settings
+  syncTripPhotos(journeyId, tripId);
+  broadcastJourneyEvent(journeyId, 'journey:trip:synced', { tripId }, userId);
+  return true;
+}
+
+export function removeTripFromJourney(journeyId: number, tripId: number, userId: number): boolean {
+  if (!isOwner(journeyId, userId)) return false;
+
+  // remove skeleton entries that haven't been filled in
+  db.prepare(`
+    DELETE FROM journey_entries
+    WHERE journey_id = ? AND source_trip_id = ? AND type = 'skeleton'
+  `).run(journeyId, tripId);
+
+  // detach filled entries from this trip
+  db.prepare(`
+    UPDATE journey_entries SET source_trip_id = NULL, source_place_id = NULL
+    WHERE journey_id = ? AND source_trip_id = ? AND type != 'skeleton'
+  `).run(journeyId, tripId);
+
+  db.prepare('DELETE FROM journey_trips WHERE journey_id = ? AND trip_id = ?').run(journeyId, tripId);
+  return true;
+}
+
+// ── Sync engine ──────────────────────────────────────────────────────────
+
+export function syncTripPlaces(journeyId: number, tripId: number, authorId: number) {
+  const places = db.prepare(`
+    SELECT p.*, da.day_id, d.date as day_date, da.assignment_time, da.assignment_end_time, d.day_number
+    FROM places p
+    LEFT JOIN day_assignments da ON da.place_id = p.id
+    LEFT JOIN days d ON da.day_id = d.id
+    WHERE p.trip_id = ?
+    ORDER BY d.day_number ASC, da.order_index ASC
+  `).all(tripId) as any[];
+
+  const now = ts();
+  const existing = db.prepare(
+    'SELECT source_place_id FROM journey_entries WHERE journey_id = ? AND source_trip_id = ?'
+  ).all(journeyId, tripId) as { source_place_id: number }[];
+  const existingPlaceIds = new Set(existing.map(e => e.source_place_id));
+
+  for (const place of places) {
+    if (existingPlaceIds.has(place.id)) continue;
+
+    const entryDate = place.day_date || new Date().toISOString().split('T')[0];
+    const entryTime = place.assignment_time || place.place_time || null;
+
+    db.prepare(`
+      INSERT INTO journey_entries (journey_id, source_trip_id, source_place_id, author_id, type, title, entry_date, entry_time, location_name, location_lat, location_lng, sort_order, created_at, updated_at)
+      VALUES (?, ?, ?, ?, 'skeleton', ?, ?, ?, ?, ?, ?, ?, ?, ?)
+    `).run(
+      journeyId, tripId, place.id, authorId,
+      place.name, entryDate, entryTime,
+      place.address || place.name, place.lat || null, place.lng || null,
+      place.day_number || 0, now, now
+    );
+  }
+}
+
+// import trip_photos into journey when a trip is linked
+function syncTripPhotos(journeyId: number, tripId: number) {
+  const tripPhotos = db.prepare(
+    'SELECT * FROM trip_photos WHERE trip_id = ?'
+  ).all(tripId) as { id: number; trip_id: number; user_id: number; asset_id: string; provider: string; shared: number }[];
+  if (!tripPhotos.length) return;
+
+  const now = ts();
+
+  // find or create a "Photos" entry for this trip's photos
+  let photoEntry = db.prepare(`
+    SELECT id FROM journey_entries
+    WHERE journey_id = ? AND source_trip_id = ? AND title = '[Trip Photos]' AND type = 'entry'
+  `).get(journeyId, tripId) as { id: number } | undefined;
+
+  if (!photoEntry) {
+    // get trip date for the entry
+    const trip = db.prepare('SELECT start_date FROM trips WHERE id = ?').get(tripId) as { start_date: string } | undefined;
+    const entryDate = trip?.start_date || new Date().toISOString().split('T')[0];
+    const owner = db.prepare('SELECT user_id FROM journeys WHERE id = ?').get(journeyId) as { user_id: number };
+
+    const res = db.prepare(`
+      INSERT INTO journey_entries (journey_id, source_trip_id, author_id, type, title, entry_date, sort_order, created_at, updated_at)
+      VALUES (?, ?, ?, 'entry', '[Trip Photos]', ?, 999, ?, ?)
+    `).run(journeyId, tripId, owner.user_id, entryDate, now, now);
+    photoEntry = { id: Number(res.lastInsertRowid) };
+  }
+
+  // import each trip photo, skip duplicates
+  for (const tp of tripPhotos) {
+    const exists = db.prepare(
+      'SELECT 1 FROM journey_photos WHERE entry_id = ? AND provider = ? AND asset_id = ?'
+    ).get(photoEntry.id, tp.provider, tp.asset_id);
+    if (exists) continue;
+
+    const maxOrder = db.prepare('SELECT MAX(sort_order) as m FROM journey_photos WHERE entry_id = ?').get(photoEntry.id) as { m: number | null };
+
+    db.prepare(`
+      INSERT INTO journey_photos (entry_id, provider, asset_id, owner_id, shared, sort_order, created_at)
+      VALUES (?, ?, ?, ?, ?, ?, ?)
+    `).run(photoEntry.id, tp.provider, tp.asset_id, tp.user_id, tp.shared, (maxOrder?.m ?? -1) + 1, now);
+  }
+}
+
+// called when a trip place is created
+export function onPlaceCreated(tripId: number, placeId: number) {
+  const links = db.prepare('SELECT journey_id FROM journey_trips WHERE trip_id = ?').all(tripId) as { journey_id: number }[];
+  if (!links.length) return;
+
+  const place = db.prepare(`
+    SELECT p.*, da.day_id, d.date as day_date, da.assignment_time, d.day_number
+    FROM places p
+    LEFT JOIN day_assignments da ON da.place_id = p.id
+    LEFT JOIN days d ON da.day_id = d.id
+    WHERE p.id = ?
+  `).get(placeId) as any;
+  if (!place) return;
+
+  const now = ts();
+  for (const link of links) {
+    const already = db.prepare(
+      'SELECT 1 FROM journey_entries WHERE journey_id = ? AND source_place_id = ?'
+    ).get(link.journey_id, placeId);
+    if (already) continue;
+
+    const journey = db.prepare('SELECT user_id FROM journeys WHERE id = ?').get(link.journey_id) as { user_id: number };
+    const entryDate = place.day_date || new Date().toISOString().split('T')[0];
+
+    db.prepare(`
+      INSERT INTO journey_entries (journey_id, source_trip_id, source_place_id, author_id, type, title, entry_date, entry_time, location_name, location_lat, location_lng, sort_order, created_at, updated_at)
+      VALUES (?, ?, ?, ?, 'skeleton', ?, ?, ?, ?, ?, ?, 0, ?, ?)
+    `).run(
+      link.journey_id, tripId, placeId, journey.user_id,
+      place.name, entryDate, place.assignment_time || place.place_time || null,
+      place.address || place.name, place.lat || null, place.lng || null,
+      now, now
+    );
+  }
+}
+
+// called when a trip place is updated
+export function onPlaceUpdated(placeId: number) {
+  const entries = db.prepare(
+    'SELECT * FROM journey_entries WHERE source_place_id = ?'
+  ).all(placeId) as JourneyEntry[];
+  if (!entries.length) return;
+
+  const place = db.prepare(`
+    SELECT p.*, da.day_id, d.date as day_date, da.assignment_time, d.day_number
+    FROM places p
+    LEFT JOIN day_assignments da ON da.place_id = p.id
+    LEFT JOIN days d ON da.day_id = d.id
+    WHERE p.id = ?
+  `).get(placeId) as any;
+  if (!place) return;
+
+  const now = ts();
+  for (const entry of entries) {
+    if (entry.type === 'skeleton') {
+      // update everything on skeletons
+      db.prepare(`
+        UPDATE journey_entries SET title = ?, entry_date = ?, entry_time = ?, location_name = ?, location_lat = ?, location_lng = ?, updated_at = ?
+        WHERE id = ?
+      `).run(
+        place.name,
+        place.day_date || entry.entry_date,
+        place.assignment_time || place.place_time || entry.entry_time,
+        place.address || place.name,
+        place.lat || null, place.lng || null,
+        now, entry.id
+      );
+    } else {
+      // for filled entries, only update location silently
+      db.prepare(`
+        UPDATE journey_entries SET location_name = ?, location_lat = ?, location_lng = ?, updated_at = ?
+        WHERE id = ?
+      `).run(place.address || place.name, place.lat || null, place.lng || null, now, entry.id);
+    }
+  }
+}
+
+// called when a trip place is deleted
+export function onPlaceDeleted(placeId: number) {
+  const entries = db.prepare(
+    'SELECT * FROM journey_entries WHERE source_place_id = ?'
+  ).all(placeId) as JourneyEntry[];
+
+  for (const entry of entries) {
+    if (entry.type === 'skeleton') {
+      // no content: just delete
+      const hasPhotos = db.prepare('SELECT 1 FROM journey_photos WHERE entry_id = ?').get(entry.id);
+      if (!hasPhotos && !entry.story) {
+        db.prepare('DELETE FROM journey_entries WHERE id = ?').run(entry.id);
+        continue;
+      }
+    }
+    // entry has content: keep it, detach, add note
+    const note = '\n\n> _Note: the original trip place was removed from the trip plan_';
+    const newStory = (entry.story || '') + note;
+    db.prepare(
+      'UPDATE journey_entries SET source_place_id = NULL, source_trip_id = NULL, type = ?, story = ?, updated_at = ? WHERE id = ?'
+    ).run(entry.type === 'skeleton' ? 'entry' : entry.type, newStory, ts(), entry.id);
+  }
+}
+
+// ── Entries ──────────────────────────────────────────────────────────────
+
+export function listEntries(journeyId: number, userId: number) {
+  if (!canAccessJourney(journeyId, userId)) return null;
+
+  const entries = db.prepare(
+    'SELECT * FROM journey_entries WHERE journey_id = ? ORDER BY entry_date ASC, entry_time ASC, sort_order ASC'
+  ).all(journeyId) as JourneyEntry[];
+
+  const photos = db.prepare(
+    'SELECT * FROM journey_photos WHERE entry_id IN (SELECT id FROM journey_entries WHERE journey_id = ?) ORDER BY sort_order ASC'
+  ).all(journeyId) as JourneyPhoto[];
+
+  const photosByEntry: Record<number, JourneyPhoto[]> = {};
+  for (const p of photos) {
+    (photosByEntry[p.entry_id] ||= []).push(p);
+  }
+
+  return entries.map(e => ({
+    ...e,
+    tags: e.tags ? JSON.parse(e.tags) : [],
+    pros_cons: e.pros_cons ? JSON.parse(e.pros_cons) : null,
+    photos: photosByEntry[e.id] || [],
+    source_trip_name: e.source_trip_id
+      ? (db.prepare('SELECT title FROM trips WHERE id = ?').get(e.source_trip_id) as { title: string } | undefined)?.title || null
+      : null,
+  }));
+}
+
+export function createEntry(journeyId: number, userId: number, data: {
+  type?: string;
+  title?: string;
+  story?: string;
+  entry_date: string;
+  entry_time?: string;
+  location_name?: string;
+  location_lat?: number;
+  location_lng?: number;
+  mood?: string;
+  weather?: string;
+  tags?: string[];
+  pros_cons?: { pros: string[]; cons: string[] };
+  visibility?: string;
+}): JourneyEntry | null {
+  if (!canEdit(journeyId, userId)) return null;
+
+  const now = ts();
+  const maxOrder = db.prepare(
+    'SELECT MAX(sort_order) as m FROM journey_entries WHERE journey_id = ? AND entry_date = ?'
+  ).get(journeyId, data.entry_date) as { m: number | null };
+
+  const prosConsJson = data.pros_cons && (data.pros_cons.pros.length || data.pros_cons.cons.length)
+    ? JSON.stringify(data.pros_cons) : null;
+
+  const res = db.prepare(`
+    INSERT INTO journey_entries (journey_id, author_id, type, title, story, entry_date, entry_time, location_name, location_lat, location_lng, mood, weather, tags, pros_cons, visibility, sort_order, created_at, updated_at)
+    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+  `).run(
+    journeyId, userId,
+    data.type || 'entry',
+    data.title || null,
+    data.story || null,
+    data.entry_date,
+    data.entry_time || null,
+    data.location_name || null,
+    data.location_lat ?? null,
+    data.location_lng ?? null,
+    data.mood || null,
+    data.weather || null,
+    data.tags?.length ? JSON.stringify(data.tags) : null,
+    prosConsJson,
+    data.visibility || 'private',
+    (maxOrder?.m ?? -1) + 1,
+    now, now
+  );
+
+  const created = db.prepare('SELECT * FROM journey_entries WHERE id = ?').get(Number(res.lastInsertRowid)) as JourneyEntry;
+  broadcastJourneyEvent(journeyId, 'journey:entry:created', { entry: created }, userId);
+  return created;
+}
+
+export function updateEntry(entryId: number, userId: number, data: Partial<{
+  type: string;
+  title: string;
+  story: string;
+  entry_date: string;
+  entry_time: string;
+  location_name: string;
+  location_lat: number;
+  location_lng: number;
+  mood: string;
+  weather: string;
+  tags: string[];
+  pros_cons: { pros: string[]; cons: string[] };
+  visibility: string;
+  sort_order: number;
+}>): JourneyEntry | null {
+  const entry = db.prepare('SELECT * FROM journey_entries WHERE id = ?').get(entryId) as JourneyEntry | undefined;
+  if (!entry) return null;
+  if (!canEdit(entry.journey_id, userId)) return null;
+
+  const fields: string[] = [];
+  const values: unknown[] = [];
+
+  for (const [key, val] of Object.entries(data)) {
+    if (val === undefined) continue;
+    if (key === 'tags') {
+      fields.push('tags = ?');
+      values.push(Array.isArray(val) ? JSON.stringify(val) : val);
+    } else if (key === 'pros_cons') {
+      fields.push('pros_cons = ?');
+      values.push(val && typeof val === 'object' ? JSON.stringify(val) : val);
+    } else {
+      fields.push(`${key} = ?`);
+      values.push(val);
+    }
+  }
+
+  // if adding story to a skeleton, promote to entry
+  if (entry.type === 'skeleton' && data.story && data.story.trim()) {
+    fields.push('type = ?');
+    values.push('entry');
+  }
+
+  if (fields.length === 0) return entry;
+
+  fields.push('updated_at = ?');
+  values.push(ts());
+  values.push(entryId);
+  db.prepare(`UPDATE journey_entries SET ${fields.join(', ')} WHERE id = ?`).run(...values);
+
+  // touch the journey
+  db.prepare('UPDATE journeys SET updated_at = ? WHERE id = ?').run(ts(), entry.journey_id);
+
+  const updated = db.prepare('SELECT * FROM journey_entries WHERE id = ?').get(entryId) as JourneyEntry;
+  broadcastJourneyEvent(entry.journey_id, 'journey:entry:updated', { entry: updated }, userId);
+  return updated;
+}
+
+export function deleteEntry(entryId: number, userId: number): boolean {
+  const entry = db.prepare('SELECT * FROM journey_entries WHERE id = ?').get(entryId) as JourneyEntry | undefined;
+  if (!entry) return false;
+  if (!canEdit(entry.journey_id, userId)) return false;
+
+  // move photos to hidden Gallery entry so they stay in the gallery
+  const hasPhotos = db.prepare('SELECT 1 FROM journey_photos WHERE entry_id = ?').get(entryId);
+  if (hasPhotos) {
+    let gallery = db.prepare(
+      "SELECT id FROM journey_entries WHERE journey_id = ? AND title = 'Gallery' AND id != ?"
+    ).get(entry.journey_id, entryId) as { id: number } | undefined;
+    if (!gallery) {
+      const now = ts();
+      const res = db.prepare(`
+        INSERT INTO journey_entries (journey_id, author_id, type, title, entry_date, sort_order, created_at, updated_at)
+        VALUES (?, ?, 'entry', 'Gallery', ?, 999, ?, ?)
+      `).run(entry.journey_id, entry.author_id, entry.entry_date, now, now);
+      gallery = { id: Number(res.lastInsertRowid) };
+    }
+    db.prepare('UPDATE journey_photos SET entry_id = ? WHERE entry_id = ?').run(gallery.id, entryId);
+  }
+
+  db.prepare('DELETE FROM journey_entries WHERE id = ?').run(entryId);
+  broadcastJourneyEvent(entry.journey_id, 'journey:entry:deleted', { entryId }, userId);
+  return true;
+}
+
+// ── Photos ───────────────────────────────────────────────────────────────
+
+export function addPhoto(entryId: number, userId: number, filePath: string, thumbnailPath?: string, caption?: string): JourneyPhoto | null {
+  const entry = db.prepare('SELECT * FROM journey_entries WHERE id = ?').get(entryId) as JourneyEntry | undefined;
+  if (!entry) return null;
+  if (!canEdit(entry.journey_id, userId)) return null;
+
+  const maxOrder = db.prepare('SELECT MAX(sort_order) as m FROM journey_photos WHERE entry_id = ?').get(entryId) as { m: number | null };
+  const now = ts();
+
+  const res = db.prepare(`
+    INSERT INTO journey_photos (entry_id, provider, file_path, thumbnail_path, caption, sort_order, created_at)
+    VALUES (?, 'local', ?, ?, ?, ?, ?)
+  `).run(entryId, filePath, thumbnailPath || null, caption || null, (maxOrder?.m ?? -1) + 1, now);
+
+  return db.prepare('SELECT * FROM journey_photos WHERE id = ?').get(Number(res.lastInsertRowid)) as JourneyPhoto;
+}
+
+export function addProviderPhoto(entryId: number, userId: number, provider: string, assetId: string, caption?: string): JourneyPhoto | null {
+  const entry = db.prepare('SELECT * FROM journey_entries WHERE id = ?').get(entryId) as JourneyEntry | undefined;
+  if (!entry) return null;
+  if (!canEdit(entry.journey_id, userId)) return null;
+
+  // skip if already added
+  const exists = db.prepare('SELECT 1 FROM journey_photos WHERE entry_id = ? AND provider = ? AND asset_id = ?').get(entryId, provider, assetId);
+  if (exists) return null;
+
+  const maxOrder = db.prepare('SELECT MAX(sort_order) as m FROM journey_photos WHERE entry_id = ?').get(entryId) as { m: number | null };
+  const now = ts();
+
+  const res = db.prepare(`
+    INSERT INTO journey_photos (entry_id, provider, asset_id, owner_id, caption, sort_order, created_at)
+    VALUES (?, ?, ?, ?, ?, ?, ?)
+  `).run(entryId, provider, assetId, userId, caption || null, (maxOrder?.m ?? -1) + 1, now);
+
+  return db.prepare('SELECT * FROM journey_photos WHERE id = ?').get(Number(res.lastInsertRowid)) as JourneyPhoto;
+}
+
+export function linkPhotoToEntry(entryId: number, photoId: number, userId: number): JourneyPhoto | null {
+  const entry = db.prepare('SELECT * FROM journey_entries WHERE id = ?').get(entryId) as JourneyEntry | undefined;
+  if (!entry) return null;
+  if (!canEdit(entry.journey_id, userId)) return null;
+
+  const source = db.prepare('SELECT * FROM journey_photos WHERE id = ?').get(photoId) as JourneyPhoto | undefined;
+  if (!source) return null;
+
+  if (source.entry_id === entryId) return source;
+
+  const oldEntryId = source.entry_id;
+
+  // move photo to the target entry
+  db.prepare('UPDATE journey_photos SET entry_id = ? WHERE id = ?').run(entryId, photoId);
+
+  // clean up: if old entry was a "Gallery" entry and is now empty, delete it
+  const oldEntry = db.prepare('SELECT * FROM journey_entries WHERE id = ?').get(oldEntryId) as JourneyEntry | undefined;
+  if (oldEntry && oldEntry.title === 'Gallery') {
+    const remaining = db.prepare('SELECT COUNT(*) as c FROM journey_photos WHERE entry_id = ?').get(oldEntryId) as { c: number };
+    if (remaining.c === 0) {
+      db.prepare('DELETE FROM journey_entries WHERE id = ?').run(oldEntryId);
+    }
+  }
+
+  return db.prepare('SELECT * FROM journey_photos WHERE id = ?').get(photoId) as JourneyPhoto;
+}
+
+export function setPhotoProvider(photoId: number, provider: string, assetId: string, ownerId: number) {
+  db.prepare('UPDATE journey_photos SET provider = ?, asset_id = ?, owner_id = ? WHERE id = ?').run(provider, assetId, ownerId, photoId);
+}
+
+export function updatePhoto(photoId: number, userId: number, data: { caption?: string; sort_order?: number }): JourneyPhoto | null {
+  const photo = db.prepare(`
+    SELECT jp.*, je.journey_id FROM journey_photos jp
+    JOIN journey_entries je ON jp.entry_id = je.id
+    WHERE jp.id = ?
+  `).get(photoId) as (JourneyPhoto & { journey_id: number }) | undefined;
+  if (!photo) return null;
+  if (!canEdit(photo.journey_id, userId)) return null;
+
+  const fields: string[] = [];
+  const values: unknown[] = [];
+  if (data.caption !== undefined) { fields.push('caption = ?'); values.push(data.caption); }
+  if (data.sort_order !== undefined) { fields.push('sort_order = ?'); values.push(data.sort_order); }
+  if (!fields.length) return photo;
+
+  values.push(photoId);
+  db.prepare(`UPDATE journey_photos SET ${fields.join(', ')} WHERE id = ?`).run(...values);
+  return db.prepare('SELECT * FROM journey_photos WHERE id = ?').get(photoId) as JourneyPhoto;
+}
+
+export function deletePhoto(photoId: number, userId: number): (JourneyPhoto & { journey_id: number }) | null {
+  const photo = db.prepare(`
+    SELECT jp.*, je.journey_id FROM journey_photos jp
+    JOIN journey_entries je ON jp.entry_id = je.id
+    WHERE jp.id = ?
+  `).get(photoId) as (JourneyPhoto & { journey_id: number }) | undefined;
+  if (!photo) return null;
+  if (!canEdit(photo.journey_id, userId)) return null;
+
+  db.prepare('DELETE FROM journey_photos WHERE id = ?').run(photoId);
+  return photo;
+}
+
+// ── Contributors ─────────────────────────────────────────────────────────
+
+export function addContributor(journeyId: number, userId: number, targetUserId: number, role: 'editor' | 'viewer'): boolean {
+  if (!isOwner(journeyId, userId)) return false;
+  if (targetUserId === userId) return false;
+  try {
+    db.prepare(
+      'INSERT OR REPLACE INTO journey_contributors (journey_id, user_id, role, added_at) VALUES (?, ?, ?, ?)'
+    ).run(journeyId, targetUserId, role, ts());
+    broadcastJourneyEvent(journeyId, 'journey:contributor:changed', { targetUserId, role });
+    return true;
+  } catch { return false; }
+}
+
+export function updateContributorRole(journeyId: number, userId: number, targetUserId: number, role: 'editor' | 'viewer'): boolean {
+  if (!isOwner(journeyId, userId)) return false;
+  db.prepare(
+    'UPDATE journey_contributors SET role = ? WHERE journey_id = ? AND user_id = ?'
+  ).run(role, journeyId, targetUserId);
+  broadcastJourneyEvent(journeyId, 'journey:contributor:changed', { targetUserId, role });
+  return true;
+}
+
+export function removeContributor(journeyId: number, userId: number, targetUserId: number): boolean {
+  if (!isOwner(journeyId, userId)) return false;
+  db.prepare(
+    "DELETE FROM journey_contributors WHERE journey_id = ? AND user_id = ? AND role != 'owner'"
+  ).run(journeyId, targetUserId);
+  return true;
+}
+
+// ── Suggestions ──────────────────────────────────────────────────────────
+
+export function getSuggestions(userId: number) {
+  const thirtyDaysAgo = new Date(Date.now() - 30 * 24 * 60 * 60 * 1000).toISOString().split('T')[0];
+  return db.prepare(`
+    SELECT t.id, t.title, t.start_date, t.end_date, t.cover_image,
+      (SELECT COUNT(*) FROM places WHERE trip_id = t.id) as place_count
+    FROM trips t
+    LEFT JOIN trip_members tm ON t.id = tm.trip_id AND tm.user_id = ?
+    WHERE (t.user_id = ? OR tm.user_id = ?)
+      AND t.end_date IS NOT NULL
+      AND t.end_date >= ?
+      AND t.end_date <= date('now')
+      AND t.id NOT IN (SELECT trip_id FROM journey_trips)
+    ORDER BY t.end_date DESC
+  `).all(userId, userId, userId, thirtyDaysAgo);
+}
+
+// ── User trips (for trip picker) ─────────────────────────────────────────
+
+export function listUserTrips(userId: number) {
+  return db.prepare(`
+    SELECT t.id, t.title, t.start_date, t.end_date, t.cover_image,
+      (SELECT COUNT(*) FROM places WHERE trip_id = t.id) as place_count
+    FROM trips t
+    LEFT JOIN trip_members tm ON t.id = tm.trip_id AND tm.user_id = ?
+    WHERE t.user_id = ? OR tm.user_id = ?
+    ORDER BY t.start_date DESC
+  `).all(userId, userId, userId);
+}
@@ -0,0 +1,143 @@
+import { db } from '../db/database';
+import crypto from 'crypto';
+
+interface JourneySharePermissions {
+  share_timeline?: boolean;
+  share_gallery?: boolean;
+  share_map?: boolean;
+}
+
+interface JourneyShareTokenInfo {
+  token: string;
+  created_at: string;
+  share_timeline: boolean;
+  share_gallery: boolean;
+  share_map: boolean;
+}
+
+export function createOrUpdateJourneyShareLink(
+  journeyId: number,
+  createdBy: number,
+  permissions: JourneySharePermissions
+): { token: string; created: boolean } {
+  const {
+    share_timeline = true,
+    share_gallery = true,
+    share_map = true,
+  } = permissions;
+
+  const existing = db.prepare('SELECT token FROM journey_share_tokens WHERE journey_id = ?').get(journeyId) as { token: string } | undefined;
+  if (existing) {
+    db.prepare('UPDATE journey_share_tokens SET share_timeline = ?, share_gallery = ?, share_map = ? WHERE journey_id = ?')
+      .run(share_timeline ? 1 : 0, share_gallery ? 1 : 0, share_map ? 1 : 0, journeyId);
+    return { token: existing.token, created: false };
+  }
+
+  const token = crypto.randomBytes(24).toString('base64url');
+  db.prepare('INSERT INTO journey_share_tokens (journey_id, token, created_by, share_timeline, share_gallery, share_map) VALUES (?, ?, ?, ?, ?, ?)')
+    .run(journeyId, token, createdBy, share_timeline ? 1 : 0, share_gallery ? 1 : 0, share_map ? 1 : 0);
+  return { token, created: true };
+}
+
+export function getJourneyShareLink(journeyId: number): JourneyShareTokenInfo | null {
+  const row = db.prepare('SELECT * FROM journey_share_tokens WHERE journey_id = ?').get(journeyId) as any;
+  if (!row) return null;
+  return {
+    token: row.token,
+    created_at: row.created_at,
+    share_timeline: !!row.share_timeline,
+    share_gallery: !!row.share_gallery,
+    share_map: !!row.share_map,
+  };
+}
+
+export function deleteJourneyShareLink(journeyId: number): void {
+  db.prepare('DELETE FROM journey_share_tokens WHERE journey_id = ?').run(journeyId);
+}
+
+export function validateShareTokenForPhoto(token: string, photoId: number): { journeyId: number; ownerId: number } | null {
+  const row = db.prepare('SELECT journey_id FROM journey_share_tokens WHERE token = ?').get(token) as any;
+  if (!row) return null;
+  const photo = db.prepare(`
+    SELECT jp.*, je.journey_id FROM journey_photos jp
+    JOIN journey_entries je ON jp.entry_id = je.id
+    WHERE jp.id = ? AND je.journey_id = ?
+  `).get(photoId, row.journey_id) as any;
+  if (!photo) return null;
+  const journey = db.prepare('SELECT user_id FROM journeys WHERE id = ?').get(row.journey_id) as any;
+  return journey ? { journeyId: row.journey_id, ownerId: photo.owner_id || journey.user_id } : null;
+}
+
+export function validateShareTokenForAsset(token: string, assetId: string): { ownerId: number } | null {
+  const row = db.prepare('SELECT journey_id FROM journey_share_tokens WHERE token = ?').get(token) as any;
+  if (!row) return null;
+  // Check if this asset belongs to any photo in the shared journey
+  const photo = db.prepare(`
+    SELECT jp.owner_id FROM journey_photos jp
+    JOIN journey_entries je ON jp.entry_id = je.id
+    WHERE jp.asset_id = ? AND je.journey_id = ?
+  `).get(assetId, row.journey_id) as any;
+  if (!photo) {
+    // Fallback: get journey owner
+    const journey = db.prepare('SELECT user_id FROM journeys WHERE id = ?').get(row.journey_id) as any;
+    return journey ? { ownerId: journey.user_id } : null;
+  }
+  return { ownerId: photo.owner_id };
+}
+
+export function getPublicJourney(token: string) {
+  const row = db.prepare('SELECT * FROM journey_share_tokens WHERE token = ?').get(token) as any;
+  if (!row) return null;
+
+  const journey = db.prepare('SELECT * FROM journeys WHERE id = ?').get(row.journey_id) as any;
+  if (!journey) return null;
+
+  // Entries with photos
+  const entries = db.prepare(`
+    SELECT je.* FROM journey_entries je
+    WHERE je.journey_id = ? AND je.type != 'skeleton'
+    ORDER BY je.entry_date, je.sort_order
+  `).all(row.journey_id) as any[];
+
+  const photos = db.prepare(`
+    SELECT jp.* FROM journey_photos jp
+    JOIN journey_entries je ON jp.entry_id = je.id
+    WHERE je.journey_id = ?
+    ORDER BY jp.sort_order
+  `).all(row.journey_id) as any[];
+
+  const photosByEntry: Record<number, any[]> = {};
+  for (const p of photos) {
+    (photosByEntry[p.entry_id] ||= []).push(p);
+  }
+
+  const enrichedEntries = entries.map(e => ({
+    ...e,
+    tags: e.tags ? JSON.parse(e.tags) : [],
+    pros_cons: e.pros_cons ? JSON.parse(e.pros_cons) : null,
+    photos: photosByEntry[e.id] || [],
+  }));
+
+  // Stats
+  const stats = {
+    entries: entries.length,
+    photos: photos.length,
+    cities: new Set(entries.filter(e => e.location_name).map(e => e.location_name)).size,
+  };
+
+  return {
+    journey: {
+      title: journey.title,
+      subtitle: journey.subtitle,
+      cover_image: journey.cover_image,
+      status: journey.status,
+    },
+    entries: enrichedEntries,
+    stats,
+    permissions: {
+      share_timeline: !!row.share_timeline,
+      share_gallery: !!row.share_gallery,
+      share_map: !!row.share_map,
+    },
+  };
+}
@@ -123,6 +123,31 @@ export function canAccessUserPhoto(requestingUserId: number, ownerUserId: number
    if (requestingUserId === ownerUserId) {
        return true;
    }
+
+    // Journey photos use tripId=0 — check journey_photos + journey_contributors
+    if (tripId === '0') {
+        const journeyPhoto = db.prepare(`
+            SELECT jp.entry_id, je.journey_id
+            FROM journey_photos jp
+            JOIN journey_entries je ON je.id = jp.entry_id
+            WHERE jp.asset_id = ?
+              AND jp.provider = ?
+              AND jp.owner_id = ?
+            LIMIT 1
+        `).get(assetId, provider, ownerUserId) as { entry_id: number; journey_id: number } | undefined;
+        if (!journeyPhoto) return false;
+
+        // Check if requesting user is the journey owner or a contributor
+        const access = db.prepare(`
+            SELECT 1 FROM journeys WHERE id = ? AND user_id = ?
+            UNION ALL
+            SELECT 1 FROM journey_contributors WHERE journey_id = ? AND user_id = ?
+            LIMIT 1
+        `).get(journeyPhoto.journey_id, requestingUserId, journeyPhoto.journey_id, requestingUserId);
+        return !!access;
+    }
+
+    // Regular trip photos
    const sharedAsset = db.prepare(`
    SELECT 1
    FROM trip_photos
@@ -357,3 +357,63 @@ export async function syncAlbumAssets(
    return { error: 'Could not reach Immich', status: 502 };
  }
 }
+
+// ── Upload to Immich ──────────────────────────────────────────────────────
+
+export async function uploadToImmich(userId: number, filePath: string, fileName: string): Promise<string | null> {
+  const creds = getImmichCredentials(userId);
+  if (!creds) return null;
+
+  const fs = await import('node:fs');
+  const path = await import('node:path');
+
+  const fullPath = path.join(__dirname, '../../../uploads', filePath);
+  if (!fs.existsSync(fullPath)) return null;
+
+  try {
+    const fileBuffer = fs.readFileSync(fullPath);
+    const boundary = '----ImmichUpload' + Date.now();
+    const ext = path.extname(fileName).toLowerCase();
+    const mimeTypes: Record<string, string> = {
+      '.jpg': 'image/jpeg', '.jpeg': 'image/jpeg', '.png': 'image/png',
+      '.gif': 'image/gif', '.webp': 'image/webp', '.heic': 'image/heic',
+    };
+    const contentType = mimeTypes[ext] || 'application/octet-stream';
+    const now = new Date().toISOString();
+
+    const parts: Buffer[] = [];
+    const addField = (name: string, value: string) => {
+      parts.push(Buffer.from(`--${boundary}\r\nContent-Disposition: form-data; name="${name}"\r\n\r\n${value}\r\n`));
+    };
+    addField('deviceAssetId', `trek-${Date.now()}`);
+    addField('deviceId', 'TREK');
+    addField('fileCreatedAt', now);
+    addField('fileModifiedAt', now);
+
+    parts.push(Buffer.from(
+      `--${boundary}\r\nContent-Disposition: form-data; name="assetData"; filename="${fileName}"\r\nContent-Type: ${contentType}\r\n\r\n`
+    ));
+    parts.push(fileBuffer);
+    parts.push(Buffer.from(`\r\n--${boundary}--\r\n`));
+
+    const body = Buffer.concat(parts);
+
+    const res = await safeFetch(`${creds.immich_url}/api/assets`, {
+      method: 'POST',
+      headers: {
+        'x-api-key': creds.immich_api_key,
+        'Content-Type': `multipart/form-data; boundary=${boundary}`,
+        'Content-Length': String(body.length),
+      },
+      body,
+    });
+
+    if (res.ok) {
+      const data = await res.json() as { id?: string };
+      return data.id || null;
+    }
+    return null;
+  } catch {
+    return null;
+  }
+}
@@ -259,6 +259,18 @@ export function deleteTrip(tripId: string | number, userId: number, userRole: st
    ownerEmail = (db.prepare('SELECT email FROM users WHERE id = ?').get(trip.user_id) as { email: string } | undefined)?.email;
  }

+  // Clean up journey entries synced from this trip before deleting
+  // Delete skeleton entries (unfilled synced places)
+  db.prepare(`
+    DELETE FROM journey_entries
+    WHERE source_trip_id = ? AND type = 'skeleton'
+  `).run(tripId);
+  // Detach filled entries (keep user's written content, just remove trip link)
+  db.prepare(`
+    UPDATE journey_entries SET source_trip_id = NULL, source_place_id = NULL
+    WHERE source_trip_id = ?
+  `).run(tripId);
+
  db.prepare('DELETE FROM trips WHERE id = ?').run(tripId);

  return { tripId: Number(tripId), title: trip.title, ownerId: trip.user_id, isAdminDelete, ownerEmail };