From 67a108e0ac5983f091b2364e0ffb6d4d585643d0 Mon Sep 17 00:00:00 2001
From: Reckless_Satoshi <reckless.satoshi@protonmail.com>
Date: Thu, 24 Feb 2022 13:59:16 -0800
Subject: [PATCH] Fix bugs, second dispute statement is awaited.

---
 api/logics.py   | 2 +-
 api/messages.py | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/api/logics.py b/api/logics.py
index eea82ed9..c9b32bb6 100644
--- a/api/logics.py
+++ b/api/logics.py
@@ -362,7 +362,7 @@ class Logics:
             order.taker_statement = statement
 
         # If both statements are in, move status to wait for dispute resolution
-        if order.maker_statement not in [None,""] or order.taker_statement not in [None,""]:
+        if order.maker_statement not in [None,""] and order.taker_statement not in [None,""]:
             order.status = Order.Status.WFR
             order.expires_at = timezone.now() + timedelta(
                 seconds=Order.t_to_expire[Order.Status.WFR])
diff --git a/api/messages.py b/api/messages.py
index 1e42e8a9..164b43a0 100644
--- a/api/messages.py
+++ b/api/messages.py
@@ -44,7 +44,12 @@ class Telegram():
 
     def welcome(self, user):
         lang = user.profile.telegram_lang_code
-        order = Order.objects.get(maker=user, status=Order.Status.PUB)
+
+        # In weird cases the order cannot be found (e.g. it is cancelled)
+
+        queryset = Order.objects.filter(maker=user)
+        order = queryset.last()
+
         print(str(order.id))
         if lang == 'es':
             text = f'Hola {user.username}, te enviaré un mensaje cuando tu orden con ID {str(order.id)} haya sido tomada.'