Filter nudges and fix serializing of command actions

Author: Cavallando

Sources/CommandBarIOS/CommandBar/InternalSDK.swift

@@ -64,9 +64,7 @@ final class CommandBarInternalSDK : CommandBarInternalSDKDelegate {
         guard let config = CommandBarInternalSDK.shared.config else { return }
 
         // TODO: Can probably hook up some sort of background queue to enqueue to from here
-        if let nudge = config.nudges_v2.filter({ nudge in
-            return nudge.is_live && !nudge.archived && nudge.trigger == .whenConditionsPass
-        }).first {
+        if let nudge = filterNudges().first {
             NudgeWindowManager.shared.renderNudge(nudge)
         }
     }
@@ -75,14 +73,55 @@ final class CommandBarInternalSDK : CommandBarInternalSDKDelegate {
     func triggerNudges(withEvent event: String) {
         guard let config = CommandBarInternalSDK.shared.config else { return }
 
-        if let nudge = config.nudges_v2.filter({ nudge in
-            return nudge.trigger == .onEvent(PushTrigger.OnEventMeta(event: event)) && nudge.is_live && !nudge.archived
-        }).first {
+        if let nudge = filterNudges().first {
             NudgeWindowManager.shared.renderNudge(nudge)
         }
     }
 
 
+    func filterNudges() -> [Nudge] {
+        guard let config = CommandBarInternalSDK.shared.config else { return [] }
+        
+        return config.nudges_v2.filter({ nudge in
+            if (!nudge.is_live || nudge.archived) {
+                return false
+            }
+            
+            let hasUnsupportedStep = nudge.steps.contains(where: { step in
+                if (step.form_factor.type == .pin) {
+                    return true
+                }
+                let hasUnsupportedContent = step.content.contains(where: { content in
+                    if (content.type == .button) {
+                        if let actionMeta = content.meta as? NudgeContentButtonBlockMeta {
+                            if (actionMeta.action.isSameType(as: "execute_command")) {
+                                return true
+                            } else if (actionMeta.action.isSameType(as: "click")) {
+                                return true
+                            } else if (actionMeta.action.isSameType(as: "open_bar")) {
+                                return true
+                            } else if (actionMeta.action.isSameType(as: "questlist")) {
+                                return true
+                            } else if (actionMeta.action.isSameType(as: "snooze")) {
+                                return true
+                            } else if (actionMeta.action.isSameType(as: "open_chat")) {
+                                return true
+                            } else {
+                                return false
+                            }
+                        }
+                    } else if (content.type == .contentList || content.type == .helpDoc) {
+                        return true
+                    }
+                    
+                    return true
+                })
+                return hasUnsupportedContent;
+            })
+            return hasUnsupportedStep
+        })
+    }
+    
     public func trackEvent(event: String) {
         CommandBarInternalSDK.shared.triggerNudges(withEvent: event)
     }

Sources/CommandBarIOS/Types/Actions.swift

@@ -102,7 +102,6 @@ struct CommandAction: Codable {
     var meta: Meta
 
     struct Meta: Codable {
-        var type: String
         var command: String
     }
 }
@@ -126,6 +125,27 @@ struct QuestlistAction: Codable {
     var value: Int
 }
 
+extension Action {
+    func isSameType(as action: String) -> Bool {
+        switch (self, action) {
+        case (.command, "execute_command"),
+             (.none, "no_action"),
+             (.click, "click"),
+             (.link, "link"),
+             (.openChat, "open_chat"),
+             (.dismiss, "dismiss"),
+             (.snooze, "snooze"),
+             (.questlist, "questlist"),
+             (.nudge, "nudge"),
+             (.goToNudgeStep, "go_to_step"),
+             (.stepBack, "step_back"),
+             (.openBar, "open_bar"): return true
+        default: return false
+        }
+    }
+}
+
+
 enum Action: Codable {
     case command(CommandAction)
     case none(NoAction)
@@ -145,7 +165,7 @@ enum Action: Codable {
     }
 
     enum ActionTypes: String, Codable {
-        case command = "command"
+        case command = "execute_command"
         case none = "no_action"
         case click = "click"
         case link = "link"