From: PhiTux <redacted>
Date: Fri, 15 Aug 2025 09:16:22 +0000 (+0200)
Subject: changes in a-look-back
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=99be02309fe189805d653b9ec0cf9372e15dbb7e;p=DailyTxT.git

changes in a-look-back
---

diff --git a/backend/handlers/users.go b/backend/handlers/users.go
index 5d9ef2f..7582c02 100644
--- a/backend/handlers/users.go
+++ b/backend/handlers/users.go
@@ -5,6 +5,7 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
+	"maps"
 	"net/http"
 	"strings"
 	"sync"
@@ -416,6 +417,18 @@ func CheckLogin(w http.ResponseWriter, r *http.Request) {
 	})
 }
 
+func GetDefaultSettings() map[string]any {
+	// Default settings
+	return map[string]any{
+		"autoloadImagesByDefault":    false,
+		"setAutoloadImagesPerDevice": true,
+		"useALookBack":               true,
+		"aLookBackYears":             []int{1, 5, 10},
+		"useBrowserTimezone":         true,
+		"timezone":                   "UTC",
+	}
+}
+
 // GetUserSettings retrieves user settings
 func GetUserSettings(w http.ResponseWriter, r *http.Request) {
 	// Get user ID from context
@@ -440,14 +453,7 @@ func GetUserSettings(w http.ResponseWriter, r *http.Request) {
 	}
 
 	// Default settings
-	defaultSettings := map[string]any{
-		"autoloadImagesByDefault":    false,
-		"setAutoloadImagesPerDevice": true,
-		"useOnThisDay":               true,
-		"onThisDayYears":             []int{1, 5, 10},
-		"useBrowserTimezone":         true,
-		"timezone":                   "UTC",
-	}
+	defaultSettings := GetDefaultSettings()
 
 	// If no settings found, return defaults
 	if len(encryptedSettings) == 0 {
@@ -543,20 +549,11 @@ func SaveUserSettings(w http.ResponseWriter, r *http.Request) {
 
 	// If no settings or empty, use defaults
 	if len(currentSettings) == 0 {
-		currentSettings = map[string]any{
-			"autoloadImagesByDefault":    false,
-			"setAutoloadImagesPerDevice": true,
-			"useOnThisDay":               true,
-			"onThisDayYears":             []int{1, 5, 10},
-			"useBrowserTimezone":         true,
-			"timezone":                   "UTC",
-		}
+		currentSettings = GetDefaultSettings()
 	}
 
 	// Update settings
-	for key, value := range newSettings {
-		currentSettings[key] = value
-	}
+	maps.Copy(currentSettings, newSettings)
 
 	// Encrypt settings
 	settingsJSON, err := json.Marshal(currentSettings)
diff --git a/frontend/src/lib/OnThisDay.svelte b/frontend/src/lib/ALookBack.svelte
similarity index 99%
rename from frontend/src/lib/OnThisDay.svelte
rename to frontend/src/lib/ALookBack.svelte
index 73b9e73..f1813d0 100644
--- a/frontend/src/lib/OnThisDay.svelte
+++ b/frontend/src/lib/ALookBack.svelte
@@ -139,6 +139,7 @@
 		<button
 			onclick={() => {
 				$selectedDate = { year: log.year, month: log.month, day: log.day };
+				closeModal();
 			}}
 			class="btn btn-primary"
 			id="closeZoom">Öffnen</button
diff --git a/frontend/src/routes/(authed)/write/+page.svelte b/frontend/src/routes/(authed)/write/+page.svelte
index 3230265..4b87a27 100644
--- a/frontend/src/routes/(authed)/write/+page.svelte
+++ b/frontend/src/routes/(authed)/write/+page.svelte
@@ -33,7 +33,7 @@
 	import ImageViewer from '$lib/ImageViewer.svelte';
 	import TemplateDropdown from '$lib/TemplateDropdown.svelte';
 	import { templates, insertTemplate } from '$lib/templateStore';
-	import OnThisDay from '$lib/OnThisDay.svelte';
+	import ALookBack from '$lib/ALookBack.svelte';
 	import { marked } from 'marked';
 
 	axios.interceptors.request.use((config) => {
@@ -223,7 +223,7 @@
 
 			logDateWritten = response.data.date_written;
 
-			getOnThisDay();
+			getALookBack();
 
 			return true;
 		} catch (error) {
@@ -236,25 +236,25 @@
 		}
 	}
 
-	let onThisDay = $state([]);
+	let aLookBack = $state([]);
 
-	function getOnThisDay() {
-		if (!$settings.useOnThisDay) {
-			onThisDay = [];
+	function getALookBack() {
+		if (!$settings.useALookBack) {
+			aLookBack = [];
 			return;
 		}
 
 		axios
-			.get(API_URL + '/logs/getOnThisDay', {
+			.get(API_URL + '/logs/getALookBack', {
 				params: {
 					day: $selectedDate.day,
 					month: $selectedDate.month,
 					year: $selectedDate.year,
-					last_years: $settings.onThisDayYears.join(',')
+					last_years: $settings.aLookBackYears.join(',')
 				}
 			})
 			.then((response) => {
-				onThisDay = response.data;
+				aLookBack = response.data;
 			})
 			.catch((error) => {
 				console.error(error);
@@ -924,10 +924,10 @@
 				{/if}
 			{/if}
 
-			{#if $settings.useOnThisDay && onThisDay.length > 0}
+			{#if $settings.useALookBack && aLookBack.length > 0}
 				<div class="mt-3 d-flex gap-2">
-					{#each onThisDay as log}
-						<OnThisDay {log} />
+					{#each aLookBack as log}
+						<ALookBack {log} />
 					{/each}
 				</div>
 			{/if}