diff --git a/app.py b/app.py index 57965c2..0af1ddf 100755 --- a/app.py +++ b/app.py @@ -900,11 +900,23 @@ def handle_request_map_data(): @auth.require_secret def index(path): app_config = auth.return_app_config() + + # Generate dynamic Open Graph meta tags for Telegram preview + og_title = app_config.get('TITLE_LONG', 'Default Title') + og_description = "... uns aber, die wir gerettet werden, ist es eine Gotteskraft." + + # If secret or token is provided, show folder names in description + folder_names = list(session['folders'].keys()) + if folder_names: + folder_list = ", ".join(folder_names) + og_description = folder_list return render_template("app.html", - search_folders = list(session['folders'].keys()), + search_folders = folder_names, title_short=app_config.get('TITLE_SHORT', 'Default Title'), title_long=app_config.get('TITLE_LONG' , 'Default Title'), + og_title=og_title, + og_description=og_description, admin_enabled=auth.is_admin() ) diff --git a/auth.py b/auth.py index ef17168..b7e524e 100644 --- a/auth.py +++ b/auth.py @@ -103,17 +103,17 @@ def require_secret(f): # 4) Re-check validity of each secret and token to also catch previous ones # If a secret is no longer valid (or not in config), remove it. - for secret_in_session in session['valid_secrets'][:]: + for secret_in_session in session.get('valid_secrets', [])[:]: # Find the current config item with matching secret config_item = next( (c for c in folder_config if c['secret'] == secret_in_session), None ) - # If the config item doesn’t exist or is invalid, remove secret + # If the config item doesn't exist or is invalid, remove secret if config_item is None or not is_valid_secret(config_item, secret_in_session): session['valid_secrets'].remove(secret_in_session) - for token_in_session in session['valid_tokens'][:]: + for token_in_session in session.get('valid_tokens', [])[:]: if not is_valid_token(token_in_session): session['valid_tokens'].remove(token_in_session) @@ -130,7 +130,6 @@ def require_secret(f): session['admin'] = False # 5) Build session['folders'] fresh from the valid secrets - # If admin, grant access to ALL folders session['folders'] = {} if is_admin(): @@ -139,7 +138,7 @@ def require_secret(f): for folder_info in config_item['folders']: session['folders'][folder_info['foldername']] = folder_info['folderpath'] else: - # Normal users only get folders from their valid secrets/tokens + # Normal users only get folders from their valid secrets for secret_in_session in session.get('valid_secrets', []): config_item = next( (c for c in folder_config if c['secret'] == secret_in_session), @@ -149,10 +148,21 @@ def require_secret(f): for folder_info in config_item['folders']: session['folders'][folder_info['foldername']] = folder_info['folderpath'] - for token_in_session in session.get('valid_tokens', []): + # Add token folders for both admin and regular users + for token_in_session in session.get('valid_tokens', []): + try: token_item = decode_token(token_in_session) - for folder_info in token_item['folders']: + print(f"DEBUG: Decoded token: {token_item}") + for folder_info in token_item.get('folders', []): + print(f"DEBUG: Adding folder '{folder_info['foldername']}' -> '{folder_info['folderpath']}'") session['folders'][folder_info['foldername']] = folder_info['folderpath'] + except Exception as e: + print(f"ERROR: Failed to process token: {e}") + + # Mark session as modified to ensure it's saved + session.modified = True + print(f"DEBUG: Final session['folders'] keys: {list(session['folders'].keys())}") + print(f"DEBUG: session['valid_tokens']: {session.get('valid_tokens', [])}") # 6) If we have folders, proceed; otherwise show index if session['folders']: @@ -161,14 +171,16 @@ def require_secret(f): if 'device_id' not in session: session['device_id'] = os.urandom(32).hex() - # AUTO-JUMP FOR TOKENS - try: - if args_token and is_valid_token(args_token): - token_item = decode_token(args_token) - target_foldername = token_item['folders'][0]['foldername'] - return redirect(f"path/{target_foldername}") - except Exception as e: - print(f"Error during auto-jump: {e}") + # AUTO-JUMP FOR TOKENS - Disabled for now to debug + # try: + # if args_token and is_valid_token(args_token): + # token_item = decode_token(args_token) + # target_foldername = token_item['folders'][0]['foldername'] + # # Mark session as modified to ensure it's saved before redirect + # session.modified = True + # return redirect(f"/path/{target_foldername}") + # except Exception as e: + # print(f"Error during auto-jump: {e}") return f(*args, **kwargs) else: diff --git a/static/app.css b/static/app.css index 01a754e..11a1fa6 100644 --- a/static/app.css +++ b/static/app.css @@ -528,6 +528,30 @@ footer { margin-bottom: 10px; } +.message-content h1 { + font-size: 1.5rem; +} + +.message-content h2 { + font-size: 1.3rem; +} + +.message-content h3 { + font-size: 1.1rem; +} + +.message-content h4 { + font-size: 1rem; +} + +.message-content h5 { + font-size: 0.9rem; +} + +.message-content h6 { + font-size: 0.85rem; +} + .message-content p { margin-bottom: 10px; } diff --git a/static/messages.js b/static/messages.js index 232cfdb..767648d 100644 --- a/static/messages.js +++ b/static/messages.js @@ -258,9 +258,14 @@ function openMessageModal(messageId = null) { messageIdInput.value = message.id; titleInput.value = message.title; - // Format datetime for input + // Format datetime for input (convert to local time) const date = new Date(message.datetime); - const formattedDate = date.toISOString().slice(0, 16); + const year = date.getFullYear(); + const month = String(date.getMonth() + 1).padStart(2, '0'); + const day = String(date.getDate()).padStart(2, '0'); + const hours = String(date.getHours()).padStart(2, '0'); + const minutes = String(date.getMinutes()).padStart(2, '0'); + const formattedDate = `${year}-${month}-${day}T${hours}:${minutes}`; datetimeInput.value = formattedDate; contentInput.value = message.content; @@ -271,9 +276,14 @@ function openMessageModal(messageId = null) { messageIdInput.value = ''; titleInput.value = ''; - // Set current datetime + // Set current datetime (use local time) const now = new Date(); - const formattedNow = now.toISOString().slice(0, 16); + const year = now.getFullYear(); + const month = String(now.getMonth() + 1).padStart(2, '0'); + const day = String(now.getDate()).padStart(2, '0'); + const hours = String(now.getHours()).padStart(2, '0'); + const minutes = String(now.getMinutes()).padStart(2, '0'); + const formattedNow = `${year}-${month}-${day}T${hours}:${minutes}`; datetimeInput.value = formattedNow; contentInput.value = ''; diff --git a/templates/app.html b/templates/app.html index 5c5a0cc..68853f0 100644 --- a/templates/app.html +++ b/templates/app.html @@ -6,9 +6,10 @@ {{ title_short }} - - + + + @@ -83,21 +84,7 @@ - -
-
- {% if admin_enabled %} -
- -
- {% endif %} -
- -
-
-
+ {% include 'messages_section.html' %}
diff --git a/templates/messages_section.html b/templates/messages_section.html new file mode 100644 index 0000000..cda834f --- /dev/null +++ b/templates/messages_section.html @@ -0,0 +1,68 @@ + +
+
+ {% if admin_enabled %} +
+ +
+ {% endif %} +
+ +
+
+
+ + +