updates/fixes related to tildeclub.

cronjob.py

@@ -5,29 +5,37 @@ from fosspay.config import _cfg
 from fosspay.email import send_thank_you, send_declined
 
 from datetime import datetime, timedelta
-
 import requests
 import stripe
 import subprocess
+import sys                           # ← required for sys.exit below  ❱❱ ADDED
 
 stripe.api_key = _cfg("stripe-secret")
-
 currency = _cfg("currency")
 
 print("Processing monthly donations at " + str(datetime.utcnow()))
 
-donations = Donation.query \
-    .filter(Donation.type == DonationType.monthly) \
-    .filter(Donation.active) \
-    .all()
+donations = (Donation.query
+    .filter(Donation.type == DonationType.monthly)
+    .filter(Donation.active)
+    .all())
 
 limit = datetime.now() - timedelta(days=30)
 
 for donation in donations:
     if donation.updated < limit:
-        print("Charging {}".format(donation))
+        print(f"Charging {donation}")
         user = donation.user
-        customer = stripe.Customer.retrieve(user.stripe_customer)
+
+        # ── guard against missing customer IDs ─────────────────────────
+        if not user.stripe_customer:
+            print("  • no stripe_customer on record → skipped")
+            continue
+
+        customer = stripe.Customer.retrieve(           # ❱❱ FIXED
+            user.stripe_customer,
+            expand=["sources"]                         # ensure .sources exists
+        )
         try:
             charge = stripe.Charge.create(
                 amount=donation.amount,
@@ -35,31 +43,34 @@ for donation in donations:
                 customer=user.stripe_customer,
                 description="Donation to " + _cfg("your-name")
             )
-        except stripe.error.CardError as e:
+        except stripe.error.CardError:
             donation.active = False
             db.commit()
             send_declined(user, donation.amount)
-            print("Declined")
+            print("  • declined")
             continue
 
-        send_thank_you(user, donation.amount, donation.type == DonationType.monthly)
+        send_thank_you(user, donation.amount, True)
         donation.updated = datetime.now()
         donation.payments += 1
         db.commit()
     else:
-        print("Skipping {}".format(donation))
+        print(f"Skipping {donation}")
 
-print("{} records processed.".format(len(donations)))
+print(f"{len(donations)} records processed.")
 
+# ───────────────────────── Patreon token refresh ──────────────────────
 if _cfg("patreon-refresh-token"):
     print("Updating Patreon API token")
-
-    r = requests.post('https://www.patreon.com/api/oauth2/token', params={
-        'grant_type': 'refresh_token',
-        'refresh_token': _cfg("patreon-refresh-token"),
-        'client_id': _cfg("patreon-client-id"),
-        'client_secret': _cfg("patreon-client-secret")
-    })
+    r = requests.post(
+        'https://www.patreon.com/api/oauth2/token',
+        params={
+            'grant_type':     'refresh_token',
+            'refresh_token':  _cfg("patreon-refresh-token"),
+            'client_id':      _cfg("patreon-client-id"),
+            'client_secret':  _cfg("patreon-client-secret")
+        }
+    )
     if r.status_code != 200:
         print("Failed to update Patreon API token")
         sys.exit(1)
@@ -71,6 +82,7 @@ if _cfg("patreon-refresh-token"):
     with open("config.ini", "w") as f:
         f.write(config)
     print("Refreshed Patreon API token")
+
     reload_cmd = _cfg("reload-command")
     if not reload_cmd:
         print("Cannot reload application, add reload-command to config.ini")