Fluffik3666 patch 4

Promptly/MQTT/MQTTManager.swift

@@ -82,22 +82,27 @@ class MQTTManager: ObservableObject {
         client?.unsubscribe(from: topic)
     }
 
-    func subscribeToShowChanges(onChange: @escaping (String, String) -> Void) {
+    func subscribeToShowChanges(onChange: @escaping (String, String, String, String?) -> Void) {
         let showsPattern = "shows/#"
 
         client?.messagePublisher
             .filter { message in
                 let components = message.topic.split(separator: "/")
-                return components.count == 2 && components.first == "shows"
+                return components.count >= 2 && components.first == "shows"
             }
-            .sink { message in
+            .sink { [weak self] message in
                 let topic = message.topic
                 let messageString = message.payload.string ?? ""
+                let components = topic.split(separator: "/").map(String.init)
 
-                if let showId = topic.split(separator: "/").last.map(String.init) {
-                    DispatchQueue.main.async {
-                        onChange(showId, messageString)
-                    }
+                guard components.count >= 2 else { return }
+
+                let showId = components[1]
+                let property = components.count > 2 ? components[2] : ""
+                let title = self?.receivedMessages["shows/\(showId)/title"]
+
+                DispatchQueue.main.async {
+                    onChange(showId, property, messageString, title)
                 }
             }
             .store(in: &cancellables)

Promptly/Views/Home Screen/HomeScreenView.swift

@@ -16,7 +16,7 @@ struct HomeScreenView: View {
     @State var navStackMessage: String = ""
     @State var addShow: Bool = false
     @State var showNetworkSettings: Bool = false
-    @State var availableShows: [String] = []
+    @State var availableShows: [String: String] = [:]
 
     @StateObject private var mqttManager = MQTTManager()
 
@@ -38,9 +38,9 @@ struct HomeScreenView: View {
 
                 mqttManager.connect(to: Constants.mqttIP, port: Constants.mqttPort)
 
-                mqttManager.subscribeToShowChanges { showId, message in
-                    if UUID(uuidString: showId) != nil && !availableShows.contains(showId) {
-                        availableShows.append(showId)
+                mqttManager.subscribeToShowChanges { showId, property, message, title in
+                    if UUID(uuidString: showId) != nil && availableShows[showId] == nil {
+                        availableShows[showId] = title ?? "Unknown Show"
                     }
                 }
             }
@@ -81,9 +81,9 @@ struct HomeScreenView: View {
                         Text("No available shows")
                             .foregroundStyle(.secondary)
                     } else {
-                        ForEach(availableShows, id: \.self) { showId in
+                        ForEach(Array(availableShows.keys), id: \.self) { showId in
                             NavigationLink(destination: MultiPlayerShowDetail(showID: showId, mqttManager: self.mqttManager)) {
-                                Text("Show \(showId)")
+                                Text(availableShows[showId] ?? "Unknown Show")
                             }
                         }
                     }

Promptly/Views/Performance Mode/LivePerforemanceView.swift

@@ -1635,6 +1635,7 @@ extension DSMPerformanceView {
         }
 
         calledCues.insert(cue.id)
+
         let execution = ReportCueExecution(
             timestamp: Date(),
             cueLabel: cue.label,
@@ -1644,13 +1645,24 @@ extension DSMPerformanceView {
         )
         cueExecutions.append(execution)
 
+        if cue.hasAlert {
+            showCueAlert()
+        }
+
         if cue.type.isStandby {
             logCall("REMOTE STANDBY: \(cue.label)", type: .call)
         } else {
             logCall("REMOTE GO: \(cue.label)", type: .action)
         }
 
-        // SEND THE UPDATE HERE TOO
+        let timer = Timer.scheduledTimer(withTimeInterval: 5.0, repeats: false) { _ in
+            withAnimation(.easeOut(duration: 0.3)) {
+                hiddenCues.insert(cue.id)
+            }
+            cueHideTimers.removeValue(forKey: cue.id)
+        }
+        cueHideTimers[cue.id] = timer
+
         let uuidStrings = calledCues.map { $0.uuidString }
         if let jsonData = try? JSONEncoder().encode(uuidStrings),
            let jsonString = String(data: jsonData, encoding: .utf8) {