Web production deployment

apple/OmnivoreKit/Sources/App/AppExtensions/Share/Views/ShareExtensionView.swift

@@ -396,7 +396,7 @@ public struct ShareExtensionView: View {
           .frame(maxWidth: .infinity)
           .font(Font.system(size: 14))
           .accentColor(.blue)
-        #if os(macos)
+        #if os(macOS)
           .introspectTextView { textView in
             textView.textContainerInset = NSSize(width: 10, height: 10)
           }

apple/OmnivoreKit/Sources/App/Views/AI/DigestConfigView.swift

@@ -9,30 +9,41 @@ import Transmission
 @MainActor
 public class DigestConfigViewModel: ObservableObject {
   @Published var isLoading = false
+  @Published var digestEnabled = false
+
+  @Published var isIneligible = false
+  @Published var hasOptInError = false
   @Published var digest: DigestResult?
   @Published var chapterInfo: [(DigestChapter, DigestChapterData)]?
   @Published var presentedLibraryItem: String?
   @Published var presentWebContainer = false
 
   @AppStorage(UserDefaultKey.lastVisitedDigestId.rawValue) var lastVisitedDigestId = ""
 
-  func load(dataService: DataService) async {
+  func checkAlreadyOptedIn(dataService: DataService) async {
+    isLoading = true
+    if let user = try? await dataService.fetchViewer() {
+      digestEnabled = user.hasFeatureGranted("ai-digest")
+    }
+    isLoading = false
+  }
+
+  func enableDigest(dataService: DataService) async {
     isLoading = true
-    if !dataService.digestNeedsRefresh() {
-      if let digest = dataService.loadStoredDigest() {
-        self.digest = digest
+    do {
+      if try await dataService.optInFeature(name: "ai-digest") == nil {
+        throw BasicError.message(messageText: "Could not opt into feature")
       }
-    } else {
-      do {
-        if let digest = try await dataService.getLatestDigest(timeoutInterval: 10) {
-          self.digest = digest
-        }
-      } catch {
-        print("ERROR WITH DIGEST: ", error)
-        self.digest = nil
+      try await dataService.setupUserDigestConfig()
+      try await dataService.refreshDigest()
+      digestEnabled = true
+    } catch {
+      if error is IneligibleError {
+        isIneligible = true
+      } else {
+        hasOptInError = true
       }
     }
-
     isLoading = false
   }
 }
@@ -41,12 +52,14 @@ public class DigestConfigViewModel: ObservableObject {
 @MainActor
 struct DigestConfigView: View {
   @StateObject var viewModel = DigestConfigViewModel()
+  let homeViewModel: HomeFeedViewModel
   let dataService: DataService
 
   @Environment(\.dismiss) private var dismiss
 
-  public init(dataService: DataService) {
+  public init(dataService: DataService, homeViewModel: HomeFeedViewModel) {
     self.dataService = dataService
+    self.homeViewModel = homeViewModel
   }
 
   var titleBlock: some View {
@@ -65,12 +78,31 @@ struct DigestConfigView: View {
     VStack {
       titleBlock
         .padding(.top, 10)
-      itemBody
-        .padding(15)
+
+      if viewModel.isLoading {
+        HStack {
+          Spacer()
+          ProgressView()
+          Spacer()
+        }
+        .padding(.top, 50)
+      } else if viewModel.digestEnabled {
+        Text("You've been added to the AI Digest demo. You first issue should be ready soon.")
+          .padding(15)
+      } else if viewModel.isIneligible {
+        Text("To enable digest you need to have saved at least ten library items and have two active subscriptions.")
+          .padding(15)
+      } else if viewModel.hasOptInError {
+        Text("There was an error setting up digest for your account.")
+          .padding(15)
+      } else {
+        itemBody
+          .padding(15)
+      }
 
       Spacer()
      }.task {
-       await viewModel.load(dataService: dataService)
+       await viewModel.checkAlreadyOptedIn(dataService: dataService)
      }
   }
 
@@ -123,10 +155,17 @@ struct DigestConfigView: View {
       HStack {
         Spacer()
 
-        Button(action: {}, label: { Text("Hide digest") })
+        Button(action: {
+          homeViewModel.hideDigestIcon = true
+          dismiss()
+        }, label: { Text("Hide digest") })
           .buttonStyle(RoundedRectButtonStyle())
 
-        Button(action: {}, label: { Text("Enable digest") })
+        Button(action: {
+          Task {
+            await viewModel.enableDigest(dataService: dataService)
+          }
+        }, label: { Text("Enable digest") })
           .buttonStyle(RoundedRectButtonStyle(color: Color.blue, textColor: Color.white))
       }
     }

apple/OmnivoreKit/Sources/App/Views/AI/FullScreenDigestView.swift

@@ -38,6 +38,7 @@ func formatTimeInterval(_ time: TimeInterval) -> String? {
 @MainActor
 public class FullScreenDigestViewModel: ObservableObject {
   @Published var isLoading = false
+  @Published var hasError = false
   @Published var digest: DigestResult?
   @Published var chapterInfo: [(DigestChapter, DigestChapterData)]?
   @Published var presentedLibraryItem: String?
@@ -46,6 +47,9 @@ public class FullScreenDigestViewModel: ObservableObject {
   @AppStorage(UserDefaultKey.lastVisitedDigestId.rawValue) var lastVisitedDigestId = ""
 
   func load(dataService: DataService, audioController: AudioController) async {
+    hasError = false
+    isLoading = true
+
     if !dataService.digestNeedsRefresh() {
       if let digest = dataService.loadStoredDigest() {
         self.digest = digest
@@ -72,6 +76,8 @@ public class FullScreenDigestViewModel: ObservableObject {
         let chapterData = self.chapterInfo?.map { $0.1 }
         audioController.play(itemAudioProperties: DigestAudioItem(digest: digest, chapters: chapterData ?? []))
       }
+    } else {
+      hasError = true
     }
 
     isLoading = false
@@ -164,6 +170,19 @@ struct FullScreenDigestView: View {
             ProgressView()
             Spacer()
           }
+        } else if viewModel.hasError {
+          VStack {
+            Spacer()
+            Text("There was an error loading your digest.")
+            Button(action: {
+              Task {
+                await viewModel.load(dataService: dataService, audioController: audioController)
+              }
+            }, label: { Text("Try again") })
+              .buttonStyle(RoundedRectButtonStyle(color: Color.blue, textColor: Color.white))
+
+            Spacer()
+          }
         } else {
           itemBody
         }

apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewIOS.swift

@@ -1,3 +1,4 @@
+// swiftlint:disable file_length type_body_length
 import CoreData
 import Models
 import Services
@@ -334,7 +335,7 @@ struct AnimatingCellHeight: AnimatableModifier {
       .sheet(isPresented: $showDigestConfig) {
         if #available(iOS 17.0, *) {
           NavigationView {
-            DigestConfigView(dataService: dataService)
+            DigestConfigView(dataService: dataService, homeViewModel: viewModel)
           }
         } else {
           Text("Sorry digest is only available on iOS 17 and above")
@@ -415,17 +416,7 @@ struct AnimatingCellHeight: AnimatableModifier {
                   )
                   .buttonStyle(.plain)
                   .padding(.trailing, 4)
-                }
-//                if #available(iOS 17.0, *), !dataService.featureFlags.digestEnabled, !viewModel.digestHidden {
-//                  Button(
-//                    action: { showDigestConfig = true },
-//                    label: { Image.tabDigestSelected }
-//                  )
-//                  .buttonStyle(.plain)
-//                  .padding(.trailing, 4)
-//                }
-                if #available(iOS 17.0, *), !dataService.featureFlags.digestEnabled, !viewModel.digestHidden {
-                  // Give the user an opportunity to enable digest
+                } else if #available(iOS 17.0, *), !dataService.featureFlags.digestEnabled, !viewModel.hideDigestIcon {
                   Button(
                     action: { showDigestConfig = true },
                     label: { Image.tabDigestSelected }

apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewModel.swift

@@ -49,7 +49,7 @@ enum LoadingBarStyle {
   @AppStorage(UserDefaultKey.hideFeatureSection.rawValue) var hideFeatureSection = false
   @AppStorage(UserDefaultKey.stopUsingFollowingPrimer.rawValue) var stopUsingFollowingPrimer = false
   @AppStorage("LibraryTabView::hideFollowingTab") var hideFollowingTab = false
-  @AppStorage("LibraryTabView::digestHidden") var digestHidden = false
+  @AppStorage("LibraryTabView::hideDigestIcon") var hideDigestIcon = false
   @AppStorage(UserDefaultKey.lastVisitedDigestId.rawValue) var lastVisitedDigestId = ""
 
   @AppStorage(UserDefaultKey.lastSelectedFeaturedItemFilter.rawValue) var featureFilter = 
@@ -403,7 +403,8 @@ enum LoadingBarStyle {
 
   func checkForDigestUpdate(dataService: DataService) async {
     do {
-      if dataService.featureFlags.digestEnabled, let result = try? await dataService.getLatestDigest(timeoutInterval: 2) {
+      if dataService.featureFlags.digestEnabled, 
+          let result = try? await dataService.getLatestDigest(timeoutInterval: 2) {
         if result.id != lastVisitedDigestId {
           digestIsUnread = true
         }

apple/OmnivoreKit/Sources/App/Views/Profile/FiltersView.swift

@@ -19,6 +19,8 @@ import Views
   }
 
   @AppStorage("LibraryTabView::hideFollowingTab") var hideFollowingTab = false
+  @AppStorage("LibraryTabView::hideDigestIcon") var hideDigestIcon = false
+
   @AppStorage(UserDefaultKey.hideFeatureSection.rawValue) var hideFeatureSection = false
 
   func loadFilters(dataService: DataService) async {
@@ -95,6 +97,7 @@ struct FiltersView: View {
     List {
       Section(header: Text("User Interface")) {
         Toggle("Hide following tab", isOn: $viewModel.hideFollowingTab)
+        Toggle("Hide digest icon", isOn: $viewModel.hideDigestIcon)
         Toggle("Hide feature section", isOn: $viewModel.hideFeatureSection)
       }
 

apple/OmnivoreKit/Sources/Services/DataService/AI/AITasks.swift

@@ -97,8 +97,7 @@ public struct ExplainResult: Codable {
   public let text: String
 }
 
-extension DataService {  
-
+extension DataService {
   public func digestNeedsRefresh() -> Bool {
     let fileManager = FileManager.default
     let localURL = URL.om_cachesDirectory.appendingPathComponent("digest.json")