Refactor data sources and feed model

IrisCompanion/iris/Models/HeuristicRanker.swift

@@ -27,49 +27,65 @@ final class HeuristicRanker {
         self.lastShownAtProvider = lastShownAt
     }
 
-    func pickWinner(from candidates: [Candidate], now: Int? = nil, context: UserContext) -> Winner {
+    struct Ranked: Equatable {
+        let item: FeedItem
+        let confidence: Double
+        let isEligibleForRightNow: Bool
+    }
+
+    struct WinnerSelection: Equatable {
+        let item: FeedItem
+        let priority: Double
+    }
+
+    func pickWinner(from items: [Ranked], now: Int? = nil, context: UserContext) -> WinnerSelection? {
         let currentTime = now ?? nowProvider()
 
-        let valid = candidates
-            .filter { !$0.isExpired(at: currentTime) }
+        let valid = items
+            .filter { $0.item.ttlSec > 0 }
             .filter { $0.confidence >= 0.0 }
+            .filter { $0.isEligibleForRightNow }
 
-        guard !valid.isEmpty else {
-            return WinnerEnvelope.allQuiet(now: currentTime).winner
-        }
+        guard !valid.isEmpty else { return nil }
 
-        var best: (candidate: Candidate, score: Double)?
-        for candidate in valid {
-            let baseWeight = baseWeight(for: candidate.type)
-            var score = baseWeight * min(max(candidate.confidence, 0.0), 1.0)
-            if let shownAt = lastShownAtProvider(candidate.id),
+        var best: (item: FeedItem, score: Double, confidence: Double)?
+        for proposed in valid {
+            let baseWeight = baseWeight(for: proposed.item.type)
+            var score = baseWeight * min(max(proposed.confidence, 0.0), 1.0)
+            if let shownAt = lastShownAtProvider(proposed.item.id),
                currentTime - shownAt <= 2 * 60 * 60 {
                 score -= 0.4
             }
             if best == nil || score > best!.score {
-                best = (candidate, score)
+                best = (proposed.item, score, proposed.confidence)
             }
         }
 
         guard let best else {
-            return WinnerEnvelope.allQuiet(now: currentTime).winner
+            return nil
         }
 
         let priority = min(max(best.score, 0.0), 1.0)
-        return Winner(
-            id: best.candidate.id,
-            type: best.candidate.type,
-            title: best.candidate.title.truncated(maxLength: TextConstraints.titleMax),
-            subtitle: best.candidate.subtitle.truncated(maxLength: TextConstraints.subtitleMax),
+        let item = FeedItem(
+            id: best.item.id,
+            type: best.item.type,
+            title: best.item.title.truncated(maxLength: TextConstraints.titleMax),
+            subtitle: best.item.subtitle.truncated(maxLength: TextConstraints.subtitleMax),
             priority: priority,
-            ttlSec: max(1, best.candidate.ttlSec)
+            ttlSec: max(1, best.item.ttlSec),
+            condition: best.item.condition,
+            startsAt: best.item.startsAt,
+            bucket: .rightNow,
+            actions: ["DISMISS"]
         )
+        return WinnerSelection(item: item, priority: priority)
     }
 
-    private func baseWeight(for type: WinnerType) -> Double {
+    private func baseWeight(for type: FeedItemType) -> Double {
         switch type {
         case .weatherWarning: return 1.0
         case .weatherAlert: return 0.9
+        case .calendarEvent: return 0.8
         case .transit: return 0.75
         case .poiNearby: return 0.6
         case .info: return 0.4