Update app.py

app.py

@@ -67,19 +67,25 @@ def handle_message():
         subscription = page_config.get('subscription', 'NONE')
         expiration = page_config.get('expiration', 'NONE')
 
-        # If Basic subscription, check expiration date
-        if subscription == "Basic" and expiration != "NONE":
+        # Check expiration date for any subscription type that has one
+        if subscription in ["Basic", "Plus"] and expiration != "NONE":
             from datetime import datetime
             try:
                 expiration_date = datetime.strptime(expiration, "%Y-%m-%d")
                 current_date = datetime.now()
-                if current_date.date() >= expiration_date.date():
-                    print(f"Page ID {page_id} has an expired Basic subscription. Skipping...")
+                if current_date.date() > expiration_date.date():
+                    print(f"Page ID {page_id} has an expired {subscription} subscription. Skipping...")
                     continue
             except Exception as e:
                 print(f"Error checking expiration date: {str(e)}")
+                # If there's an error parsing the date, we should skip processing
                 continue
 
+        # If no subscription, skip processing
+        if subscription == "NONE":
+            print(f"Page ID {page_id} has no subscription. Skipping...")
+            continue
+
         # Fetch the system prompt dynamically for each request
         system_prompt = page_config.get('system', 'Default system prompt')
 
@@ -173,10 +179,6 @@ def handle_message():
                     if attachments:
                         print(f"Basic subscriber tried to send attachments. Skipping...")
                         continue
-                else:
-                    # Non-subscribers can't use the service
-                    print(f"Non-subscriber tried to use the service. Skipping...")
-                    continue
 
                 # Create content based on subscription level
                 content = []