From e67fd8ea1f52fe7a59a037bcd00418f1bbd343f2 Mon Sep 17 00:00:00 2001
From: Ed <ed@404.blue>
Date: Thu, 2 Feb 2023 22:47:06 +0100
Subject: [PATCH] Fixed crash when loading a canceled order

---
 export.py |  2 +-
 ext.py    | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/export.py b/export.py
index b9fcb52..8ba4a12 100644
--- a/export.py
+++ b/export.py
@@ -22,9 +22,9 @@ async def export_csv(request, order: Order):
 		if r.status_code == 404: break
 		
 		for r in r.json()['results']:
-			if r['status'] not in ['n', 'p']: continue
 		
 			o = Order(r)
+			if o.status not in ['pending', 'paid']: continue
 			orders[o.code] = o
 
 			ret += (';'.join(map(lambda x: str(x),
diff --git a/ext.py b/ext.py
index de45b17..8783379 100644
--- a/ext.py
+++ b/ext.py
@@ -14,6 +14,10 @@ class Order:
 		self.time = time()
 		self.data = data
 		self.status = {'n': 'pending', 'p': 'paid', 'e': 'expired', 'c': 'canceled'}[self.data['status']]
+		
+		if not len(self.data['positions']):
+			self.status = 'canceled'
+		
 		self.code = data['code']
 		self.pending_update = False
 		
@@ -181,7 +185,8 @@ class OrderManager:
 		
 					data = res.json()
 					for o in data['results']:
-						if o['status'] in ['c', 'e']: continue
+						o = Order(o)
+						if o.status in ['canceled', 'expired']: continue
 						self.add_cache(Order(o))
 
 		# If a cached order is needed, just get it if available
@@ -207,11 +212,11 @@ class OrderManager:
 
 				res = res.json()
 			
-				if res['status'] in ['c', 'e']:
+				order = Order(res)
+				if order.status in ['canceled', 'expired']:
 					if request:
 						raise exceptions.Forbidden(f"Your order has been deleted. Contact support with your order identifier ({res['code']}) for further info.")
 			
-				order = Order(res)
 				self.add_cache(order)
 			
 				if request and secret != res['secret']: