Sync fork with official Ente aac8ee79eb

.github/CODEOWNERS

@@ -1,3 +1,3 @@
-/.github/ @mnvr @ua741
-/server/ @ua741 @mnvr
+/.github/ @mnvr @ua741 @mnvr-sudo
+/server/ @ua741 @mnvr @mnvr-sudo
 /mobile/packages/ente_components/ @ashilkn @AmanRajSinghMourya

mobile/apps/photos/changes/memories-comments-and-reactions.md

@@ -0,0 +1 @@
+- Add comments and reactions to memories.

mobile/apps/photos/lib/db/social_db.dart

@@ -153,12 +153,48 @@ class SocialDB {
     return rows.map(_rowToComment).toList();
   }
 
-  Future<int> getCommentCountForFile(int fileID) async {
+  /// Restricts the lookup to [candidateCollectionIDs] so the composite
+  /// file/collection index can narrow the rows considered for the latest item.
+  Future<Comment?> getLatestCommentForFile(
+    int fileID, {
+    required List<int> candidateCollectionIDs,
+  }) async {
+    if (candidateCollectionIDs.isEmpty) {
+      return null;
+    }
+
+    final placeholders = List.filled(
+      candidateCollectionIDs.length,
+      '?',
+    ).join(',');
+    final db = await database;
+    final rows = await db.query(
+      _commentsTable,
+      where:
+          'file_id = ? AND is_deleted = 0 '
+          'AND collection_id IN ($placeholders)',
+      whereArgs: [fileID, ...candidateCollectionIDs],
+      orderBy: 'created_at DESC',
+      limit: 1,
+    );
+    return rows.isEmpty ? null : _rowToComment(rows.first);
+  }
+
+  Future<int> getCommentCountForFileInCollections(
+    int fileID,
+    List<int> collectionIDs,
+  ) async {
+    if (collectionIDs.isEmpty) {
+      return 0;
+    }
+
+    final placeholders = List.filled(collectionIDs.length, '?').join(',');
     final db = await database;
     final result = await db.rawQuery(
       'SELECT COUNT(*) as count FROM $_commentsTable '
-      'WHERE file_id = ? AND is_deleted = 0',
-      [fileID],
+      'WHERE file_id = ? AND collection_id IN ($placeholders) '
+      'AND is_deleted = 0',
+      [fileID, ...collectionIDs],
     );
     return Sqflite.firstIntValue(result) ?? 0;
   }
@@ -269,6 +305,30 @@ class SocialDB {
     return rows.map(_rowToReaction).toList();
   }
 
+  Future<bool> hasUserReactedToFileInCollections(
+    int fileID,
+    int userID,
+    List<int> collectionIDs,
+  ) async {
+    if (collectionIDs.isEmpty) {
+      return false;
+    }
+
+    final placeholders = List.filled(collectionIDs.length, '?').join(',');
+    final db = await database;
+    final rows = await db.rawQuery(
+      '''
+      SELECT 1 FROM $_reactionsTable
+      WHERE file_id = ? AND user_id = ?
+        AND collection_id IN ($placeholders)
+        AND comment_id IS NULL AND is_deleted = 0
+      LIMIT 1
+      ''',
+      [fileID, userID, ...collectionIDs],
+    );
+    return rows.isNotEmpty;
+  }
+
   Future<List<Reaction>> getReactionsForFileInCollection(
     int fileID,
     int collectionID,

mobile/apps/photos/lib/l10n/intl_en.arb

@@ -344,7 +344,7 @@
   "theyAlsoGetXGb": "They also get {storageAmountInGB} GB",
   "referralStorageForBoth": "{storageAmountInGB} GB for them + {storageAmountInGB} GB for you when they upgrade.",
   "freeStorageOnReferralSuccess": "{storageAmountInGB} GB each time someone signs up for a paid plan and applies your code",
-  "shareTextReferralCode": "Ente Photos is a private and safe home for your photos\n* Download Ente Photos from https://ente.com/app\n* Create an account\n* Apply the referral code {referralCode} in Settings->Referral\n* Get {referralStorageInGB}GB free when you upgrade to a paid plan",
+  "shareTextReferralCode": "Ente Photos is a private and safe home for your photos\n* Download Ente Photos from https://ente.com/app\n* Create an account\n* Apply the referral code {referralCode} in Settings->Referral\n* Get extra {referralStorageInGB} GB free!",
   "claimFreeStorage": "Claim free storage",
   "inviteYourFriends": "Invite your friends",
   "earnFreeStorage": "Earn free storage",

mobile/apps/photos/lib/models/social/social_data_provider.dart

@@ -24,8 +24,23 @@ class SocialDataProvider {
     return _db.getCommentsForFile(fileID);
   }
 
-  Future<int> getCommentCountForFile(int fileID) {
-    return _db.getCommentCountForFile(fileID);
+  /// [candidateCollectionIDs] narrows the indexed lookup to collections the
+  /// caller already knows are eligible.
+  Future<Comment?> getLatestCommentForFile(
+    int fileID, {
+    required List<int> candidateCollectionIDs,
+  }) {
+    return _db.getLatestCommentForFile(
+      fileID,
+      candidateCollectionIDs: candidateCollectionIDs,
+    );
+  }
+
+  Future<int> getCommentCountForFileInCollections(
+    int fileID,
+    List<int> collectionIDs,
+  ) {
+    return _db.getCommentCountForFileInCollections(fileID, collectionIDs);
   }
 
   Future<int> getCommentCountForFileInCollection(int fileID, int collectionID) {
@@ -36,6 +51,14 @@ class SocialDataProvider {
     return _db.getReactionsForFile(fileID);
   }
 
+  Future<bool> hasUserReactedToFileInCollections(
+    int fileID,
+    int userID,
+    List<int> collectionIDs,
+  ) {
+    return _db.hasUserReactedToFileInCollections(fileID, userID, collectionIDs);
+  }
+
   Future<List<Reaction>> getReactionsForFileInCollection(
     int fileID,
     int collectionID,

mobile/apps/photos/lib/services/collections_service.dart

@@ -295,48 +295,76 @@ class CollectionsService {
     return false;
   }
 
-  /// Returns the count of shared collections containing this file.
-  /// Uses early exit optimization - stops counting at 2.
+  /// Returns the shared collections containing [uploadedFileID].
   ///
-  /// Returns:
-  /// - 0: File not in any shared collection
-  /// - 1: File in exactly one shared collection
-  /// - 2: File in multiple shared collections (early exit)
-  Future<int> getSharedCollectionCountForFile(int uploadedFileID) async {
+  /// A collection is considered shared if it has sharees, has a public link,
+  /// or is owned by someone else (incoming share).
+  Future<List<Collection>> getSharedCollectionsForFile(
+    int uploadedFileID, {
+    bool includeHidden = false,
+  }) async {
     final Set<int> collectionIDs = await _filesDB.getAllCollectionIDsOfFile(
       uploadedFileID,
     );
-
-    if (collectionIDs.isEmpty) {
-      return 0;
-    }
-
     final int? currentUserID = _config.getUserID();
-    if (currentUserID == null) {
-      return 0;
+    if (collectionIDs.isEmpty || currentUserID == null) {
+      return [];
     }
 
-    int sharedCount = 0;
-    for (final int collectionID in collectionIDs) {
-      final Collection? collection = _collectionIDToCollections[collectionID];
-
-      if (collection == null || collection.isDeleted) {
-        continue;
+    final sharedCollections = <Collection>[];
+    for (final collectionID in collectionIDs) {
+      final collection = _collectionIDToCollections[collectionID];
+      if (_isEligibleSharedCollection(
+        collection,
+        currentUserID,
+        includeHidden: includeHidden,
+      )) {
+        sharedCollections.add(collection!);
       }
+    }
+    return sharedCollections;
+  }
 
-      // Same logic as isFileInSharedCollection
-      if (collection.hasSharees ||
-          collection.hasLink ||
-          !collection.isOwner(currentUserID)) {
-        sharedCount++;
-        // Early exit: we only need to distinguish between 0, 1, and >1
-        if (sharedCount > 1) {
-          return 2;
-        }
+  /// Returns IDs of shared collections containing [uploadedFileID].
+  ///
+  /// Use this to scope social content on the view path without constructing a
+  /// list of collection objects.
+  Future<List<int>> getSharedCollectionIDsForFile(
+    int uploadedFileID, {
+    bool includeHidden = false,
+  }) async {
+    final collectionIDs = await _filesDB.getAllCollectionIDsOfFile(
+      uploadedFileID,
+    );
+    final currentUserID = _config.getUserID();
+    if (collectionIDs.isEmpty || currentUserID == null) {
+      return [];
+    }
+
+    final sharedCollectionIDs = <int>[];
+    for (final collectionID in collectionIDs) {
+      if (_isEligibleSharedCollection(
+        _collectionIDToCollections[collectionID],
+        currentUserID,
+        includeHidden: includeHidden,
+      )) {
+        sharedCollectionIDs.add(collectionID);
       }
     }
+    return sharedCollectionIDs;
+  }
 
-    return sharedCount;
+  bool _isEligibleSharedCollection(
+    Collection? collection,
+    int currentUserID, {
+    required bool includeHidden,
+  }) {
+    return collection != null &&
+        !collection.isDeleted &&
+        (includeHidden || !collection.isHidden()) &&
+        (collection.hasSharees ||
+            collection.hasLink ||
+            !collection.isOwner(currentUserID));
   }
 
   Future<List<Collection>> getArchivedCollection() async {