extracting reserve pub

1 files changed, 10 insertions, 1 deletions

diff --git a/talerbank/app/views.py b/talerbank/app/views.py
index 261dd17..f4c28ec 100644
--- a/talerbank/app/views.py
+++ b/talerbank/app/views.py
@@ -858,6 +858,13 @@ def get_payto_from_account(request, acct):
     h = get_plain_host(request)
     return f"payto://x-taler-bank/{h}/{acct.user.username}"
 
+def get_reserve_pub(subject):
+    # obey to regex: \\b[a-z0-9A-Z]{52}\\b
+    regex = re.compile(r"\b[a-z0-9A-Z]{52}\b")
+    ret = regex.search(subject)
+    if ret:
+        return ret.group(0)
+    return None
 
 @require_GET
 @login_via_headers
@@ -871,12 +878,14 @@ def twg_history_incoming(request, user_account, acct_id):
         start = int(start_str)
     qs = query_history(user_account.bankaccount, "credit", delta, start,)
     for item in qs:
+        if not get_reserve_pub(item.subject):
+            continue
         history.append(
             dict(
                 row_id=item.id,
                 amount=item.amount.stringify(settings.TALER_DIGITS),
                 date=dict(t_ms=(int(item.date.timestamp()) * 1000)),
-                reserve_pub=item.subject,  # fixme: parse/truncate?
+                reserve_pub=get_reserve_pub(item.subject),
                 credit_account=get_payto_from_account(request, item.credit_account),
                 debit_account=get_payto_from_account(request, item.debit_account),
             )