From 6a520b34107ca30474cde48aeb4695a2dd99c1eb Mon Sep 17 00:00:00 2001
From: Riley Testut <riley@rileytestut.com>
Date: Mon, 11 Dec 2023 14:06:34 -0600
Subject: [PATCH] Revert "Fixes always showing non-featured apps last in
 FeaturedViewController"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit f76e3a12b6457a25dfa227a9938b53d6023e6df8.

We’re not sure we want to commit to this behavior, so reverting for now.
---
 AltStore/Browse/FeaturedViewController.swift |  5 ++
 AltStoreCore/Model/DatabaseManager.swift     | 52 ++++++--------------
 2 files changed, 19 insertions(+), 38 deletions(-)

diff --git a/AltStore/Browse/FeaturedViewController.swift b/AltStore/Browse/FeaturedViewController.swift
index 6125f25a..59739f6e 100644
--- a/AltStore/Browse/FeaturedViewController.swift
+++ b/AltStore/Browse/FeaturedViewController.swift
@@ -348,6 +348,11 @@ private extension FeaturedViewController
             // Instead, sort by StoreApp.installedApp.storeApp.source.sourceIdentifier, which will be either nil OR source ID.
             NSSortDescriptor(keyPath: \StoreApp.installedApp?.storeApp?.sourceIdentifier, ascending: true),
             
+            // Show featured apps first.
+            // Sorting by StoreApp.featuringSource crashes because Source does not respond to compare:
+            // Instead, sort by StoreApp.featuringSource.identifier, which will be either nil OR source ID.
+            NSSortDescriptor(keyPath: \StoreApp.featuringSource?.identifier, ascending: false),
+            
             // Randomize order within sections.
             NSSortDescriptor(keyPath: \StoreApp.featuredSortID, ascending: true),
             
diff --git a/AltStoreCore/Model/DatabaseManager.swift b/AltStoreCore/Model/DatabaseManager.swift
index 50d6ac26..9a72ea53 100644
--- a/AltStoreCore/Model/DatabaseManager.swift
+++ b/AltStoreCore/Model/DatabaseManager.swift
@@ -188,15 +188,11 @@ public extension DatabaseManager
             {
                 // Randomize source order
                 let fetchRequest = Source.fetchRequest()
-                fetchRequest.relationshipKeyPathsForPrefetching = [#keyPath(Source._apps)]
-                
                 let sources = try context.fetch(fetchRequest)
+                
                 for source in sources
                 {
                     source.featuredSortID = UUID().uuidString
-                    
-                    // Randomize app order
-                    self.updateAppFeaturedSortIDs(for: source)
                 }
                 
                 try context.save()
@@ -205,43 +201,23 @@ public extension DatabaseManager
             {
                 Logger.main.error("Failed to update source order. \(error.localizedDescription, privacy: .public)")
             }
-        }
-    }
-    
-    private func updateAppFeaturedSortIDs(for source: Source)
-    {
-        let featuredAppSlots = 5
-        
-        // Filter out already installed apps.
-        var featuredApps = Set(source.effectiveFeaturedApps.filter { $0.installedApp == nil }.prefix(featuredAppSlots)) // Take just first 5 featured apps
-        var otherApps = source.apps.filter { $0.installedApp == nil && !featuredApps.contains($0) }
-        
-        let remainingSlots = featuredAppSlots - featuredApps.count
-        
-        // Fill in remaining featured app slots with random uninstalled apps.
-        for _ in 0 ..< remainingSlots
-        {
-            guard let index = otherApps.indices.randomElement() else {
-                // No remaining apps, so stop filling in slots.
-                break
-            }
             
-            let randomApp = otherApps[index]
-            
-            featuredApps.insert(randomApp)
-            otherApps.remove(at: index)
-        }
-        
-        for storeApp in source.apps
-        {
-            if featuredApps.contains(storeApp)
+            do
             {
-                storeApp.featuredSortID = UUID().uuidString
+                // Randomize app order
+                let fetchRequest = StoreApp.fetchRequest()
+                let apps = try context.fetch(fetchRequest)
+                
+                for app in apps
+                {
+                    app.featuredSortID = UUID().uuidString
+                }
+                
+                try context.save()
             }
-            else
+            catch
             {
-                // Prepend "_" to ensure it's sorted after featuredApps.
-                storeApp.featuredSortID = "_" + UUID().uuidString
+                Logger.main.error("Failed to update app order. \(error.localizedDescription, privacy: .public)")
             }
         }
     }