Merge branch 'main' into manual-payment-check

F-Node-Karlsruhe · Jun 28, 2021 · 34c9f8c · 34c9f8c
2 parents d998159 + c7aa15a
commit 34c9f8c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/app.py b/app.py
@@ -109,14 +109,15 @@ def proxy(slug):
             return ghost.get_post(slug, get_exp_date(user_token_hash))
 
         return render_template('expired.html',
-                                exp_date = datetime.fromisoformat(pop_from_paid_db(user_token_hash)).strftime('%d.%m.%y %H:%M'))
+                                exp_date = datetime.fromisoformat(pop_from_paid_db(user_token_hash)).strftime('%d.%m.%y %H:%M UTC'))
 
     return ghost.get_post_payment(slug, render_template('pay.html',
                                                         user_token_hash = user_token_hash,
                                                         iota_address = get_iota_address(slug, iota_listener),
                                                         price = price_per_content,
                                                         exp_date =  (datetime.utcnow() + timedelta(hours = session_lifetime))
-                                                        .strftime('%d.%m.%y %H:%M')))
+                                                        .strftime('%d.%m.%y %H:%M UTC')))
+
 
 
 # socket endpoint to receive payment event

diff --git a/ghost_api.py b/ghost_api.py
@@ -35,7 +35,7 @@ def get_post(slug, exp_date):
     # append expire date
     html.find('div', {'class': 'byline-meta-content'}).append(BeautifulSoup(
         '<time class="byline-meta-date"><span class="bull">•</span>Expires %s</time>'
-        % exp_date.strftime('%d.%m.%y %H:%M'),
+        % exp_date.strftime('%d.%m.%y %H:%M UTC'),
         "html.parser"))
 
     # insert the actual post content