Update app.py

app.py

@@ -80,12 +80,16 @@ def api():
                                                    "quoted_msg_id": payload.get("quoted_msg_id")}
         else:
             message_list[payload.get("msg_id")] = {"user_id": payload.get("user_id"),
-                                                   "amount": get_amount(payload.get("msg_text"))}
+                                                   "amount": get_amount(payload.get("msg_text")),
+                                                   "quote_token": get_amount(payload.get("quote_token"))}
 
         for msg_id, data in message_list.items():
             quoted_msg_id = data.get("quoted_msg_id")
             quoted_msg_list = {key: value for key, value in message_list.items() if value.get("quoted_msg_id") == msg_id}
 
+            if msg_id == payload.get("quoted_msg_id") or quoted_msg_id == payload.get("quoted_msg_id"):
+                break
+
             if not quoted_msg_id and len(quoted_msg_list) != 0:
                 amount: float = data.get("amount")
                 paid: float = 0.0
@@ -93,7 +97,7 @@ def api():
                     paid += value.get("amount")
                 print(amount, paid)
                 if (amount-paid > 1):
-                    send_text(payload.get("token"), "未付清", data.get("quote_token"))
+                    send_text(payload.get("token"), f"$ {amount-paid} 未付清", data.get("quote_token"))
                     break
 
             # if quoted_msg_id:
@@ -161,16 +165,16 @@ def get_users_number() -> int:
 
 
 def get_amount(text: str) -> float | None:
-    # try:
-    after_dollar = text.split("$")[1]
-    rows = after_dollar.split("\n")
-    number_string = rows[0]
-    divisor = 1
-    if len(rows) > 1 and "/" in rows[1]:
-        divisor = int(rows[1].replace("/", ""))
-    return round(float(simple_eval(number_string))/divisor, 2)
-    # except:
-    #     return None
+    try:
+        after_dollar = text.split("$")[1]
+        rows = after_dollar.split("\n")
+        number_string = rows[0]
+        divisor = 1
+        if len(rows) > 1 and "/" in rows[1]:
+            divisor = int(rows[1].replace("/", ""))
+        return round(float(simple_eval(number_string))/divisor, 2)
+    except:
+        return None
 
 
 if __name__ == "__main__":