From f25a4e59b4a9a210407e8a169283c001cb2d3c44 Mon Sep 17 00:00:00 2001
From: ashilkn <ashilkn99@gmail.com>
Date: Mon, 20 Nov 2023 14:27:01 +0530
Subject: [PATCH] fix: archived files which are not part of an archived album
 were coming up in moments

---
 lib/db/files_db.dart               | 3 +++
 lib/services/memories_service.dart | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/lib/db/files_db.dart b/lib/db/files_db.dart
index 8f6c7a6b7..bf5b5991c 100644
--- a/lib/db/files_db.dart
+++ b/lib/db/files_db.dart
@@ -699,6 +699,7 @@ class FilesDB {
   Future<List<EnteFile>> getFilesCreatedWithinDurations(
     List<List<int>> durations,
     Set<int> ignoredCollectionIDs, {
+    int? visibility,
     String order = 'ASC',
   }) async {
     if (durations.isEmpty) {
@@ -714,6 +715,8 @@ class FilesDB {
           ")";
       if (index != durations.length - 1) {
         whereClause += " OR ";
+      } else if (visibility != null) {
+        whereClause += ' AND $columnMMdVisibility = $visibility';
       }
     }
     whereClause += ")";
diff --git a/lib/services/memories_service.dart b/lib/services/memories_service.dart
index 1b6cbf476..2bfefcb2f 100644
--- a/lib/services/memories_service.dart
+++ b/lib/services/memories_service.dart
@@ -8,6 +8,7 @@ import "package:photos/events/files_updated_event.dart";
 import "package:photos/events/memories_setting_changed.dart";
 import 'package:photos/models/filters/important_items_filter.dart';
 import 'package:photos/models/memory.dart';
+import "package:photos/models/metadata/common_keys.dart";
 import 'package:photos/services/collections_service.dart';
 import "package:shared_preferences/shared_preferences.dart";
 
@@ -108,6 +109,7 @@ class MemoriesService extends ChangeNotifier {
     final files = await _filesDB.getFilesCreatedWithinDurations(
       durations,
       ignoredCollections,
+      visibility: visibleVisibility,
     );
     final seenTimes = await _memoriesDB.getSeenTimes();
     final List<Memory> memories = [];