diff --git a/main.py b/main.py index ea7ce89..5cf3c65 100644 --- a/main.py +++ b/main.py @@ -3,7 +3,7 @@ import base64 import secrets import re import bleach -from datetime import datetime +from datetime import datetime, timedelta from urllib.parse import quote_plus from bleach import Linker from flask import Flask, render_template, request, redirect, url_for, flash, jsonify, abort, session, make_response @@ -782,6 +782,8 @@ def my_requests(): user_id = session.get('user_id') requests = [] + MAX_TTL = 24 * 60 * 60 # 24 часа + cursor = 0 try: while True: @@ -797,6 +799,11 @@ def my_requests(): token = key.replace("request:", "") ttl = redis_client.ttl(key) + if ttl > 0: + created_at = datetime.now() - timedelta(seconds=(MAX_TTL - ttl)) + else: + created_at = datetime.now() - timedelta(hours=24) + note_key = f"request_note:{token}" note = redis_client.get(note_key) or '' @@ -811,7 +818,7 @@ def my_requests(): 'note': safe_note, 'ttl_seconds': ttl, 'ttl_hours': round(ttl / 3600, 1), - 'created_at': datetime.now() + 'created_at': created_at }) if cursor == 0: @@ -824,6 +831,7 @@ def my_requests(): return render_template('my_requests.html', requests=requests) + @app.route('/request//delete', methods=['POST']) @login_required def request_secret_delete(token): diff --git a/templates/base.html b/templates/base.html index 202f4fd..de9daea 100644 --- a/templates/base.html +++ b/templates/base.html @@ -57,7 +57,7 @@ {% block content %}{% endblock %}