fix(deps): update mobile

mobile/openapi/lib/api/timeline_api.dart

@@ -67,12 +67,9 @@ class TimelineApi {
   /// * [bool] withPartners:
   ///   Include assets shared by partners
   ///
-  /// * [bool] withSharedAlbums:
-  ///   Include assets from shared albums (do not use!)
-  ///
   /// * [bool] withStacked:
   ///   Include stacked assets in the response. When true, only primary assets from stacks are returned.
-  Future<Response> getTimeBucketWithHttpInfo(String timeBucket, { String? albumId, String? bbox, bool? isFavorite, bool? isTrashed, String? key, AssetOrder? order, AssetOrderBy? orderBy, String? personId, String? slug, String? tagId, String? userId, AssetVisibility? visibility, bool? withCoordinates, bool? withPartners, bool? withSharedAlbums, bool? withStacked, Future<void>? abortTrigger, }) async {
+  Future<Response> getTimeBucketWithHttpInfo(String timeBucket, { String? albumId, String? bbox, bool? isFavorite, bool? isTrashed, String? key, AssetOrder? order, AssetOrderBy? orderBy, String? personId, String? slug, String? tagId, String? userId, AssetVisibility? visibility, bool? withCoordinates, bool? withPartners, bool? withStacked, Future<void>? abortTrigger, }) async {
     // ignore: prefer_const_declarations
     final apiPath = r'/timeline/bucket';
 
@@ -126,9 +123,6 @@ class TimelineApi {
     if (withPartners != null) {
       queryParams.addAll(_queryParams('', 'withPartners', withPartners));
     }
-    if (withSharedAlbums != null) {
-      queryParams.addAll(_queryParams('', 'withSharedAlbums', withSharedAlbums));
-    }
     if (withStacked != null) {
       queryParams.addAll(_queryParams('', 'withStacked', withStacked));
     }
@@ -197,13 +191,10 @@ class TimelineApi {
   /// * [bool] withPartners:
   ///   Include assets shared by partners
   ///
-  /// * [bool] withSharedAlbums:
-  ///   Include assets from shared albums (do not use!)
-  ///
   /// * [bool] withStacked:
   ///   Include stacked assets in the response. When true, only primary assets from stacks are returned.
-  Future<TimeBucketAssetResponseDto?> getTimeBucket(String timeBucket, { String? albumId, String? bbox, bool? isFavorite, bool? isTrashed, String? key, AssetOrder? order, AssetOrderBy? orderBy, String? personId, String? slug, String? tagId, String? userId, AssetVisibility? visibility, bool? withCoordinates, bool? withPartners, bool? withSharedAlbums, bool? withStacked, Future<void>? abortTrigger, }) async {
-    final response = await getTimeBucketWithHttpInfo(timeBucket, albumId: albumId, bbox: bbox, isFavorite: isFavorite, isTrashed: isTrashed, key: key, order: order, orderBy: orderBy, personId: personId, slug: slug, tagId: tagId, userId: userId, visibility: visibility, withCoordinates: withCoordinates, withPartners: withPartners, withSharedAlbums: withSharedAlbums, withStacked: withStacked, abortTrigger: abortTrigger,);
+  Future<TimeBucketAssetResponseDto?> getTimeBucket(String timeBucket, { String? albumId, String? bbox, bool? isFavorite, bool? isTrashed, String? key, AssetOrder? order, AssetOrderBy? orderBy, String? personId, String? slug, String? tagId, String? userId, AssetVisibility? visibility, bool? withCoordinates, bool? withPartners, bool? withStacked, Future<void>? abortTrigger, }) async {
+    final response = await getTimeBucketWithHttpInfo(timeBucket, albumId: albumId, bbox: bbox, isFavorite: isFavorite, isTrashed: isTrashed, key: key, order: order, orderBy: orderBy, personId: personId, slug: slug, tagId: tagId, userId: userId, visibility: visibility, withCoordinates: withCoordinates, withPartners: withPartners, withStacked: withStacked, abortTrigger: abortTrigger,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -265,12 +256,9 @@ class TimelineApi {
   /// * [bool] withPartners:
   ///   Include assets shared by partners
   ///
-  /// * [bool] withSharedAlbums:
-  ///   Include assets from shared albums (do not use!)
-  ///
   /// * [bool] withStacked:
   ///   Include stacked assets in the response. When true, only primary assets from stacks are returned.
-  Future<Response> getTimeBucketsWithHttpInfo({ String? albumId, String? bbox, bool? isFavorite, bool? isTrashed, String? key, AssetOrder? order, AssetOrderBy? orderBy, String? personId, String? slug, String? tagId, String? userId, AssetVisibility? visibility, bool? withCoordinates, bool? withPartners, bool? withSharedAlbums, bool? withStacked, Future<void>? abortTrigger, }) async {
+  Future<Response> getTimeBucketsWithHttpInfo({ String? albumId, String? bbox, bool? isFavorite, bool? isTrashed, String? key, AssetOrder? order, AssetOrderBy? orderBy, String? personId, String? slug, String? tagId, String? userId, AssetVisibility? visibility, bool? withCoordinates, bool? withPartners, bool? withStacked, Future<void>? abortTrigger, }) async {
     // ignore: prefer_const_declarations
     final apiPath = r'/timeline/buckets';
 
@@ -323,9 +311,6 @@ class TimelineApi {
     if (withPartners != null) {
       queryParams.addAll(_queryParams('', 'withPartners', withPartners));
     }
-    if (withSharedAlbums != null) {
-      queryParams.addAll(_queryParams('', 'withSharedAlbums', withSharedAlbums));
-    }
     if (withStacked != null) {
       queryParams.addAll(_queryParams('', 'withStacked', withStacked));
     }
@@ -391,13 +376,10 @@ class TimelineApi {
   /// * [bool] withPartners:
   ///   Include assets shared by partners
   ///
-  /// * [bool] withSharedAlbums:
-  ///   Include assets from shared albums (do not use!)
-  ///
   /// * [bool] withStacked:
   ///   Include stacked assets in the response. When true, only primary assets from stacks are returned.
-  Future<List<TimeBucketsResponseDto>?> getTimeBuckets({ String? albumId, String? bbox, bool? isFavorite, bool? isTrashed, String? key, AssetOrder? order, AssetOrderBy? orderBy, String? personId, String? slug, String? tagId, String? userId, AssetVisibility? visibility, bool? withCoordinates, bool? withPartners, bool? withSharedAlbums, bool? withStacked, Future<void>? abortTrigger, }) async {
-    final response = await getTimeBucketsWithHttpInfo(albumId: albumId, bbox: bbox, isFavorite: isFavorite, isTrashed: isTrashed, key: key, order: order, orderBy: orderBy, personId: personId, slug: slug, tagId: tagId, userId: userId, visibility: visibility, withCoordinates: withCoordinates, withPartners: withPartners, withSharedAlbums: withSharedAlbums, withStacked: withStacked, abortTrigger: abortTrigger,);
+  Future<List<TimeBucketsResponseDto>?> getTimeBuckets({ String? albumId, String? bbox, bool? isFavorite, bool? isTrashed, String? key, AssetOrder? order, AssetOrderBy? orderBy, String? personId, String? slug, String? tagId, String? userId, AssetVisibility? visibility, bool? withCoordinates, bool? withPartners, bool? withStacked, Future<void>? abortTrigger, }) async {
+    final response = await getTimeBucketsWithHttpInfo(albumId: albumId, bbox: bbox, isFavorite: isFavorite, isTrashed: isTrashed, key: key, order: order, orderBy: orderBy, personId: personId, slug: slug, tagId: tagId, userId: userId, visibility: visibility, withCoordinates: withCoordinates, withPartners: withPartners, withStacked: withStacked, abortTrigger: abortTrigger,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }

mobile/pubspec.yaml

@@ -34,7 +34,7 @@ dependencies:
   flutter_web_auth_2: ^5.0.2
   fluttertoast: ^8.2.14
   geolocator: ^14.0.2
-  home_widget: ^0.8.1
+  home_widget: ^0.9.0
   hooks_riverpod: ^2.6.1
   http: ^1.6.0
   image_picker: ^1.2.1
@@ -43,7 +43,7 @@ dependencies:
   intl: ^0.20.2
   local_auth: ^2.3.0
   logging: ^1.3.0
-  maplibre_gl: ^0.22.0
+  maplibre_gl: ^0.26.0
   native_video_player:
     git:
       url: https://github.com/immich-app/native_video_player
@@ -67,7 +67,7 @@ dependencies:
   sliver_tools: ^0.2.12
   stream_transform: ^2.1.1
   thumbhash: 0.1.0+1
-  timezone: ^0.9.4
+  timezone: ^0.11.0
   url_launcher: ^6.3.2
   uuid: ^4.5.3
   wakelock_plus: ^1.3.3

open-api/immich-openapi-specs.json

@@ -13571,15 +13571,6 @@
               "type": "boolean"
             }
           },
-          {
-            "name": "withSharedAlbums",
-            "required": false,
-            "in": "query",
-            "description": "Include assets from shared albums (do not use!)",
-            "schema": {
-              "type": "boolean"
-            }
-          },
           {
             "name": "withStacked",
             "required": false,
@@ -13769,15 +13760,6 @@
               "type": "boolean"
             }
           },
-          {
-            "name": "withSharedAlbums",
-            "required": false,
-            "in": "query",
-            "description": "Include assets from shared albums (do not use!)",
-            "schema": {
-              "type": "boolean"
-            }
-          },
           {
             "name": "withStacked",
             "required": false,

packages/sdk/src/fetch-client.ts

@@ -6317,7 +6317,7 @@ export function tagAssets({ id, bulkIdsDto }: {
 /**
  * Get time bucket
  */
-export function getTimeBucket({ albumId, bbox, isFavorite, isTrashed, key, order, orderBy, personId, slug, tagId, timeBucket, userId, visibility, withCoordinates, withPartners, withSharedAlbums, withStacked }: {
+export function getTimeBucket({ albumId, bbox, isFavorite, isTrashed, key, order, orderBy, personId, slug, tagId, timeBucket, userId, visibility, withCoordinates, withPartners, withStacked }: {
     albumId?: string;
     bbox?: string;
     isFavorite?: boolean;
@@ -6333,7 +6333,6 @@ export function getTimeBucket({ albumId, bbox, isFavorite, isTrashed, key, order
     visibility?: AssetVisibility;
     withCoordinates?: boolean;
     withPartners?: boolean;
-    withSharedAlbums?: boolean;
     withStacked?: boolean;
 }, opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchJson<{
@@ -6355,7 +6354,6 @@ export function getTimeBucket({ albumId, bbox, isFavorite, isTrashed, key, order
         visibility,
         withCoordinates,
         withPartners,
-        withSharedAlbums,
         withStacked
     }))}`, {
         ...opts
@@ -6364,7 +6362,7 @@ export function getTimeBucket({ albumId, bbox, isFavorite, isTrashed, key, order
 /**
  * Get time buckets
  */
-export function getTimeBuckets({ albumId, bbox, isFavorite, isTrashed, key, order, orderBy, personId, slug, tagId, userId, visibility, withCoordinates, withPartners, withSharedAlbums, withStacked }: {
+export function getTimeBuckets({ albumId, bbox, isFavorite, isTrashed, key, order, orderBy, personId, slug, tagId, userId, visibility, withCoordinates, withPartners, withStacked }: {
     albumId?: string;
     bbox?: string;
     isFavorite?: boolean;
@@ -6379,7 +6377,6 @@ export function getTimeBuckets({ albumId, bbox, isFavorite, isTrashed, key, orde
     visibility?: AssetVisibility;
     withCoordinates?: boolean;
     withPartners?: boolean;
-    withSharedAlbums?: boolean;
     withStacked?: boolean;
 }, opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchJson<{
@@ -6400,7 +6397,6 @@ export function getTimeBuckets({ albumId, bbox, isFavorite, isTrashed, key, orde
         visibility,
         withCoordinates,
         withPartners,
-        withSharedAlbums,
         withStacked
     }))}`, {
         ...opts

server/src/dtos/time-bucket.dto.ts

@@ -30,8 +30,6 @@ const TimeBucketQueryBaseSchema = z
       'Filter by asset visibility status (ARCHIVE, TIMELINE, HIDDEN, LOCKED)',
     ),
     withCoordinates: stringToBool.optional().describe('Include location data in the response'),
-    // TODO: Remove this after #12614 is resolved
-    withSharedAlbums: z.boolean().optional().describe('Include assets from shared albums (do not use!)'),
     key: z.string().optional(),
     slug: z.string().optional(),
     bbox: z

server/src/repositories/asset.repository.ts

@@ -84,7 +84,6 @@ interface AssetBuilderOptions {
   assetType?: AssetType;
   visibility?: AssetVisibility;
   withCoordinates?: boolean;
-  withSharedAlbums?: boolean;
   bbox?: BoundingBox;
 }
 
@@ -745,40 +744,7 @@ export class AssetRepository {
               )
               .where((eb) => eb.or([eb('asset.stackId', 'is', null), eb(eb.table('stack'), 'is not', null)])),
           )
-          .$if(!!options.userIds, (qb) =>
-            qb.where((eb) =>
-              eb.or([
-                eb('asset.ownerId', '=', anyUuid(options.userIds!)),
-                // TODO: Rework, this is inefficient, temporary solution until #12614 is resolved
-                ...(options.withSharedAlbums
-                  ? [
-                      eb.exists(
-                        eb
-                          .selectFrom('album_asset')
-                          .innerJoin('album', 'album.id', 'album_asset.albumId')
-                          .whereRef('album_asset.assetId', '=', 'asset.id')
-                          .where((eb) =>
-                            eb.or([
-                              eb.exists(
-                                eb
-                                  .selectFrom('album_user')
-                                  .whereRef('album_user.albumId', '=', 'album.id')
-                                  .where('album_user.userId', '=', anyUuid(options.userIds!)),
-                              ),
-                              eb.exists(
-                                eb
-                                  .selectFrom('shared_link')
-                                  .whereRef('shared_link.albumId', '=', 'album.id')
-                                  .where('shared_link.userId', '=', anyUuid(options.userIds!)),
-                              ),
-                            ]),
-                          ),
-                      ),
-                    ]
-                  : []),
-              ]),
-            ),
-          )
+          .$if(!!options.userIds, (qb) => qb.where('asset.ownerId', '=', anyUuid(options.userIds!)))
           .$if(options.isFavorite !== undefined, (qb) => qb.where('asset.isFavorite', '=', options.isFavorite!))
           .$if(!!options.assetType, (qb) => qb.where('asset.type', '=', options.assetType!))
           .$if(options.isDuplicate !== undefined, (qb) =>
@@ -864,39 +830,7 @@ export class AssetRepository {
             ),
           )
           .$if(!!options.personId, (qb) => hasPeople(qb, [options.personId!]))
-          .$if(!!options.userIds, (qb) =>
-            qb.where((eb) =>
-              eb.or([
-                eb('asset.ownerId', '=', anyUuid(options.userIds!)),
-                ...(options.withSharedAlbums
-                  ? [
-                      eb.exists(
-                        eb
-                          .selectFrom('album_asset')
-                          .innerJoin('album', 'album.id', 'album_asset.albumId')
-                          .whereRef('album_asset.assetId', '=', 'asset.id')
-                          .where((eb) =>
-                            eb.or([
-                              eb.exists(
-                                eb
-                                  .selectFrom('album_user')
-                                  .whereRef('album_user.albumId', '=', 'album.id')
-                                  .where('album_user.userId', '=', anyUuid(options.userIds!)),
-                              ),
-                              eb.exists(
-                                eb
-                                  .selectFrom('shared_link')
-                                  .whereRef('shared_link.albumId', '=', 'album.id')
-                                  .where('shared_link.userId', '=', anyUuid(options.userIds!)),
-                              ),
-                            ]),
-                          ),
-                      ),
-                    ]
-                  : []),
-              ]),
-            ),
-          )
+          .$if(!!options.userIds, (qb) => qb.where('asset.ownerId', '=', anyUuid(options.userIds!)))
           .$if(options.isFavorite !== undefined, (qb) => qb.where('asset.isFavorite', '=', options.isFavorite!))
           .$if(!!options.withStacked, (qb) =>
             qb

server/src/services/timeline.service.ts

@@ -35,7 +35,7 @@ export class TimelineService extends BaseService {
         const partnerIds = await getMyPartnerIds({
           userId: auth.user.id,
           repository: this.partnerRepository,
-          timelineEnabled: dto.bbox === undefined, // ignore this option in map view
+          timelineEnabled: true,
         });
         userIds.push(...partnerIds);
       }

web/src/routes/(user)/map/[[photos=photos]]/[[assetId=id]]/MapTimelinePanel.svelte

@@ -85,7 +85,6 @@
     visibility: $mapSettings.includeArchived ? undefined : AssetVisibility.Timeline,
     isFavorite: $mapSettings.onlyFavorites || undefined,
     withPartners: $mapSettings.withPartners || undefined,
-    withSharedAlbums: $mapSettings.withSharedAlbums || undefined,
     assetFilter: selectedClusterIds,
   });