check for active period

Author: e7mac

Leanplum-SDK/Classes/LPActionManager.h

@@ -33,10 +33,11 @@ struct LeanplumMessageMatchResult {
     BOOL matchedTrigger;
     BOOL matchedUnlessTrigger;
     BOOL matchedLimit;
+    BOOL matchedActivePeriod;
 };
 typedef struct LeanplumMessageMatchResult LeanplumMessageMatchResult;
 
-LeanplumMessageMatchResult LeanplumMessageMatchResultMake(BOOL matchedTrigger, BOOL matchedUnlessTrigger, BOOL matchedLimit);
+LeanplumMessageMatchResult LeanplumMessageMatchResultMake(BOOL matchedTrigger, BOOL matchedUnlessTrigger, BOOL matchedLimit, BOOL matchedActivePeriod);
 
 typedef enum {
     kLeanplumActionFilterForeground = 0b1,

Leanplum-SDK/Classes/LPActionManager.m

@@ -37,12 +37,13 @@
 #import <objc/runtime.h>
 #import <objc/message.h>
 
-LeanplumMessageMatchResult LeanplumMessageMatchResultMake(BOOL matchedTrigger, BOOL matchedUnlessTrigger, BOOL matchedLimit)
+LeanplumMessageMatchResult LeanplumMessageMatchResultMake(BOOL matchedTrigger, BOOL matchedUnlessTrigger, BOOL matchedLimit, BOOL matchedActivePeriod)
 {
     LeanplumMessageMatchResult result;
     result.matchedTrigger = matchedTrigger;
     result.matchedUnlessTrigger = matchedUnlessTrigger;
     result.matchedLimit = matchedLimit;
+    result.matchedActivePeriod = matchedActivePeriod;
     return result;
 }
 
@@ -1064,7 +1065,7 @@ - (LeanplumMessageMatchResult)shouldShowMessage:(NSString *)messageId
                                   withEventName:(NSString *)eventName
                                contextualValues:(LPContextualValues *)contextualValues
 {
-    LeanplumMessageMatchResult result = LeanplumMessageMatchResultMake(NO, NO, NO);
+    LeanplumMessageMatchResult result = LeanplumMessageMatchResultMake(NO, NO, NO, NO);
 
     // 1. Must not be muted.
     if ([[NSUserDefaults standardUserDefaults] boolForKey:
@@ -1088,6 +1089,13 @@ - (LeanplumMessageMatchResult)shouldShowMessage:(NSString *)messageId
     // 3. Must match all limit conditions.
     NSDictionary *limitConfig = messageConfig[@"whenLimits"];
     result.matchedLimit = [self matchesLimits:limitConfig messageId:messageId];
+
+    // 4. Must be within active period
+    NSTimeInterval now = [[NSDate date] timeIntervalSince1970];
+    NSTimeInterval startTime = [messageConfig[@"startTime"] doubleValue] / 1000.0;
+    NSTimeInterval endTime = [messageConfig[@"endTime"] doubleValue] / 1000.0;
+    result.matchedActivePeriod = now > startTime && now < endTime;
+    
     return result;
 }
 

Leanplum-SDK/Classes/Leanplum.m

@@ -1727,7 +1727,7 @@ + (void)maybePerformActions:(NSArray *)whenConditions
             }
         }
 
-        LeanplumMessageMatchResult result = LeanplumMessageMatchResultMake(NO, NO, NO);
+        LeanplumMessageMatchResult result = LeanplumMessageMatchResultMake(NO, NO, NO, NO);
         for (NSString *when in whenConditions) {
             LeanplumMessageMatchResult conditionResult =
             [[LPInternalState sharedState].actionManager shouldShowMessage:internalMessageId
@@ -1738,8 +1738,14 @@ + (void)maybePerformActions:(NSArray *)whenConditions
             result.matchedTrigger |= conditionResult.matchedTrigger;
             result.matchedUnlessTrigger |= conditionResult.matchedUnlessTrigger;
             result.matchedLimit |= conditionResult.matchedLimit;
+            result.matchedActivePeriod |= conditionResult.matchedActivePeriod;
         }
 
+        // Make sure it's within the active period.
+        if (!result.matchedActivePeriod) {
+            continue;
+        }
+        
         // Make sure we cancel before matching in case the criteria overlap.
         if (result.matchedUnlessTrigger) {
             NSString *cancelActionName = [@"__Cancel" stringByAppendingString:actionType];