-
Entsperrcode
-
+
+
+
🔓 Entsperrcode
+
+
+
+
+
-
-
+
+
+
🔒 Lock schließen
+
+
Nutze den Entsperrcode um den Schlüssel wieder zu verschließen.
+
+
+
+
+
+
+
-
-
🏆
-
Level 6 erreicht!
-
-
-
-
-
-
-
00:00
-
+
@@ -291,6 +251,17 @@
+
+
+
Bestätigung
+
+
+
+
+
+
+
+
diff --git a/src/main/java/Ideen.txt b/src/main/java/Ideen.txt
index 64b32e5..96bd128 100644
--- a/src/main/java/Ideen.txt
+++ b/src/main/java/Ideen.txt
@@ -1,13 +1,4 @@
-Umsetzung des Spiels:
-Der Lockee hat eine Stunde Zeit das Spiel zu starten, dies geschieht per Knopfdruck
-Wenn er dies nicht schafft -> bei Keyholder, benachrichtige Keyholder und lass sie/ihn entscheiden, ansonsten freeze wie bei freeze card
-Übernimm die Logik des Spiels aus dem BDSM Game.
-Falls eine Zeitstrafe eine temporäre Öffnung vor oder nach der Aufgabe benötigt, öffne das Lock für 5 Minuten. Überzogene Zeit wird addiert und am Ende des Locks gefreezed
-Selbiges gilt, falls der finisher eine temporäre Öffnung danach erfoldert
-Benötigt der Finisher eine Öffnung davor, verwende die Logik der Cum Card, und addiere diese Zeit auf die möglicherweise schon vorhandenen Freeze Zeit am Ende des Locks
-
-
wenn ich dates erfasse kann ich diese auch zu einer Verantstaltung machen,
hier kann ich die auswählen, zu denen ich "Ich bin dabei" gedrückt habe, das
diff --git a/src/main/java/de/oaa/xxx/config/StringListConverter.java b/src/main/java/de/oaa/xxx/config/StringListConverter.java
index dfb2566..0241591 100644
--- a/src/main/java/de/oaa/xxx/config/StringListConverter.java
+++ b/src/main/java/de/oaa/xxx/config/StringListConverter.java
@@ -1,38 +1,43 @@
-package de.oaa.xxx.config;
-
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import jakarta.persistence.AttributeConverter;
-import jakarta.persistence.Converter;
-
-import java.util.List;
-
-@Converter
-public class StringListConverter implements AttributeConverter
, String> {
-
- private static final ObjectMapper mapper = new ObjectMapper();
-
- @Override
- public String convertToDatabaseColumn(List list) {
- if (list == null || list.isEmpty()) return null;
- try {
- return mapper.writeValueAsString(list);
- } catch (Exception e) {
- return null;
- }
- }
-
- @Override
- public List convertToEntityAttribute(String json) {
- if (json == null || json.isBlank()) return List.of();
- try {
- if (!json.startsWith("[")) {
- // Legacy: single base64 string
- return List.of(json);
- }
- return mapper.readValue(json, new TypeReference<>() {});
- } catch (Exception e) {
- return List.of();
- }
- }
-}
+package de.oaa.xxx.config;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.persistence.AttributeConverter;
+import jakarta.persistence.Converter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+@Converter
+public class StringListConverter implements AttributeConverter, String> {
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(StringListConverter.class);
+ private static final ObjectMapper mapper = new ObjectMapper();
+
+ @Override
+ public String convertToDatabaseColumn(List list) {
+ if (list == null || list.isEmpty()) return null;
+ try {
+ return mapper.writeValueAsString(list);
+ } catch (Exception e) {
+ LOGGER.warn("Fehler beim Serialisieren der String-Liste in DB-Spalte", e);
+ return null;
+ }
+ }
+
+ @Override
+ public List convertToEntityAttribute(String json) {
+ if (json == null || json.isBlank()) return List.of();
+ try {
+ if (!json.startsWith("[")) {
+ // Legacy: single base64 string
+ return List.of(json);
+ }
+ return mapper.readValue(json, new TypeReference<>() {});
+ } catch (Exception e) {
+ LOGGER.warn("Fehler beim Deserialisieren der String-Liste aus DB-Spalte: {}", json, e);
+ return List.of();
+ }
+ }
+}
diff --git a/src/main/java/de/oaa/xxx/dating/DatingController.java b/src/main/java/de/oaa/xxx/dating/DatingController.java
index f282cf6..10b0adb 100644
--- a/src/main/java/de/oaa/xxx/dating/DatingController.java
+++ b/src/main/java/de/oaa/xxx/dating/DatingController.java
@@ -3,6 +3,8 @@ package de.oaa.xxx.dating;
import de.oaa.xxx.social.SseService;
import de.oaa.xxx.subscription.SubscriptionLimitService;
import de.oaa.xxx.user.Geschlecht;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import de.oaa.xxx.user.Neigung;
import de.oaa.xxx.user.UserEntity;
import de.oaa.xxx.user.UserRepository;
@@ -24,6 +26,8 @@ import java.util.stream.Collectors;
@RequestMapping("/dating")
public class DatingController {
+ private static final Logger LOGGER = LoggerFactory.getLogger(DatingController.class);
+
private static final Set POSITIVE_RATINGS = Set.of(
VorliebeBewertung.MAG_ICH, VorliebeBewertung.UNBEDINGT, VorliebeBewertung.WILL_AUSPROBIEREN);
@@ -254,7 +258,10 @@ public class DatingController {
return values.stream()
.map(s -> {
try { return Enum.valueOf(enumClass, s); }
- catch (IllegalArgumentException e) { return null; }
+ catch (IllegalArgumentException e) {
+ LOGGER.warn("Ungültiger Enum-Wert in Dating: {}", s);
+ return null;
+ }
})
.filter(Objects::nonNull)
.toList();
diff --git a/src/main/java/de/oaa/xxx/dating/DatingDateController.java b/src/main/java/de/oaa/xxx/dating/DatingDateController.java
index 7076773..39b0a21 100644
--- a/src/main/java/de/oaa/xxx/dating/DatingDateController.java
+++ b/src/main/java/de/oaa/xxx/dating/DatingDateController.java
@@ -4,6 +4,8 @@ import de.oaa.xxx.social.SystemMessageService;
import de.oaa.xxx.social.entity.MessageCause;
import de.oaa.xxx.social.repository.BlockRepository;
import de.oaa.xxx.subscription.SubscriptionLimitService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import de.oaa.xxx.user.Geschlecht;
import de.oaa.xxx.user.Neigung;
import de.oaa.xxx.user.UserEntity;
@@ -24,6 +26,8 @@ import java.util.stream.Collectors;
@RequestMapping("/dating/dates")
public class DatingDateController {
+ private static final Logger LOGGER = LoggerFactory.getLogger(DatingDateController.class);
+
private static final int MAX_DATES_STANDARD = 1;
private static final int MAX_DATES_PRO = 5;
@@ -388,7 +392,10 @@ public class DatingDateController {
return values.stream()
.map(s -> {
try { return Enum.valueOf(enumClass, s); }
- catch (IllegalArgumentException e) { return null; }
+ catch (IllegalArgumentException e) {
+ LOGGER.warn("Ungültiger Enum-Wert in DatingDate: {}", s);
+ return null;
+ }
})
.filter(Objects::nonNull)
.toList();
diff --git a/src/main/java/de/oaa/xxx/emailchange/EmailChangeController.java b/src/main/java/de/oaa/xxx/emailchange/EmailChangeController.java
index b6ac423..14d05d0 100644
--- a/src/main/java/de/oaa/xxx/emailchange/EmailChangeController.java
+++ b/src/main/java/de/oaa/xxx/emailchange/EmailChangeController.java
@@ -102,6 +102,7 @@ public class EmailChangeController {
try {
tokenId = UUID.fromString(token);
} catch (IllegalArgumentException e) {
+ LOGGER.warn("Ungültige E-Mail-Adresse beim Ändern: {}", e.getMessage());
response.sendRedirect("/login.html");
return;
}
diff --git a/src/main/java/de/oaa/xxx/feed/FeedController.java b/src/main/java/de/oaa/xxx/feed/FeedController.java
index 98380db..20b6f29 100644
--- a/src/main/java/de/oaa/xxx/feed/FeedController.java
+++ b/src/main/java/de/oaa/xxx/feed/FeedController.java
@@ -147,6 +147,7 @@ public class FeedController extends BaseController {
try {
typ = BeitragTyp.valueOf(req.beitragTyp());
} catch (Exception e) {
+ LOGGER.warn("Ungültiger BeitragTyp: {}", req.beitragTyp());
return ResponseEntity.badRequest().build();
}
@@ -202,6 +203,7 @@ public class FeedController extends BaseController {
try {
typ = BeitragTyp.valueOf(req.beitragTyp());
} catch (Exception e) {
+ LOGGER.warn("Ungültiger BeitragTyp: {}", req.beitragTyp());
return ResponseEntity.badRequest().build();
}
diff --git a/src/main/java/de/oaa/xxx/feedback/FeedbackController.java b/src/main/java/de/oaa/xxx/feedback/FeedbackController.java
index b682866..a8ac1ac 100644
--- a/src/main/java/de/oaa/xxx/feedback/FeedbackController.java
+++ b/src/main/java/de/oaa/xxx/feedback/FeedbackController.java
@@ -4,6 +4,8 @@ import de.oaa.xxx.mail.Email;
import de.oaa.xxx.mail.MailService;
import de.oaa.xxx.support.SupportUserService;
import de.oaa.xxx.user.UserRepository;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import jakarta.servlet.http.HttpServletRequest;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@@ -20,6 +22,8 @@ import java.util.concurrent.ConcurrentHashMap;
@RequestMapping("/api/feedback")
public class FeedbackController {
+ private static final Logger LOGGER = LoggerFactory.getLogger(FeedbackController.class);
+
private final MailService mailService;
private final FeedbackRepository feedbackRepository;
private final UserRepository userRepository;
@@ -104,7 +108,7 @@ public class FeedbackController {
);
mailService.send(email);
} catch (Exception e) {
- // Mail-Server nicht erreichbar – Eintrag ist bereits gespeichert
+ LOGGER.warn("Mail-Server nicht erreichbar – Feedback-Eintrag gespeichert, E-Mail nicht versandt", e);
}
return ResponseEntity.ok().build();
diff --git a/src/main/java/de/oaa/xxx/games/bdsm/controller/AufgabenGruppeController.java b/src/main/java/de/oaa/xxx/games/bdsm/controller/AufgabenGruppeController.java
index 3cd776c..c598276 100644
--- a/src/main/java/de/oaa/xxx/games/bdsm/controller/AufgabenGruppeController.java
+++ b/src/main/java/de/oaa/xxx/games/bdsm/controller/AufgabenGruppeController.java
@@ -199,8 +199,10 @@ public class AufgabenGruppeController {
aufgabenGruppeService.copyGruppe(gruppeId, user.getUserId());
return ResponseEntity.status(201).build();
} catch (IllegalStateException e) {
+ LOGGER.warn("Konflikt beim Speichern der AufgabenGruppe: {}", e.getMessage());
return ResponseEntity.status(409).build();
} catch (IllegalArgumentException e) {
+ LOGGER.warn("Ungültiger Wert in AufgabenGruppe: {}", e.getMessage());
String msg = e.getMessage();
if (msg != null && msg.contains("nicht gefunden")) return ResponseEntity.notFound().build();
return ResponseEntity.status(403).build();
diff --git a/src/main/java/de/oaa/xxx/games/bdsm/controller/BdsmGameController.java b/src/main/java/de/oaa/xxx/games/bdsm/controller/BdsmGameController.java
index 5b05c79..889f20a 100644
--- a/src/main/java/de/oaa/xxx/games/bdsm/controller/BdsmGameController.java
+++ b/src/main/java/de/oaa/xxx/games/bdsm/controller/BdsmGameController.java
@@ -567,10 +567,12 @@ public class BdsmGameController extends BaseController {
response.put("unlockCode", newLock.getUnlockCode());
return ResponseEntity.ok(response);
} catch (IllegalArgumentException e) {
+ LOGGER.warn("Ungültiger Parameter in BdsmGame: {}", e.getMessage());
String msg = e.getMessage();
if (msg != null && msg.contains("Session")) return ResponseEntity.notFound().build();
return ResponseEntity.badRequest().build();
} catch (IllegalStateException e) {
+ LOGGER.warn("Konflikt in BdsmGame: {}", e.getMessage());
return ResponseEntity.status(409).build();
}
}
diff --git a/src/main/java/de/oaa/xxx/games/chastity/cardlock/CardCountMapConverter.java b/src/main/java/de/oaa/xxx/games/chastity/cardlock/CardCountMapConverter.java
index d0314bc..d7cc8b7 100644
--- a/src/main/java/de/oaa/xxx/games/chastity/cardlock/CardCountMapConverter.java
+++ b/src/main/java/de/oaa/xxx/games/chastity/cardlock/CardCountMapConverter.java
@@ -4,6 +4,8 @@ import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import jakarta.persistence.AttributeConverter;
import jakarta.persistence.Converter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.LinkedHashMap;
import java.util.Map;
@@ -11,6 +13,7 @@ import java.util.Map;
@Converter
public class CardCountMapConverter implements AttributeConverter, String> {
+ private static final Logger LOGGER = LoggerFactory.getLogger(CardCountMapConverter.class);
private static final ObjectMapper mapper = new ObjectMapper();
@Override
@@ -19,6 +22,7 @@ public class CardCountMapConverter implements AttributeConverter() {});
} catch (Exception e) {
+ LOGGER.warn("Fehler beim Deserialisieren der CardCount-Map aus DB-Spalte", e);
return new LinkedHashMap<>();
}
}
diff --git a/src/main/java/de/oaa/xxx/games/chastity/cardlock/CardEnumListConverter.java b/src/main/java/de/oaa/xxx/games/chastity/cardlock/CardEnumListConverter.java
index cb2c45b..9c46e42 100644
--- a/src/main/java/de/oaa/xxx/games/chastity/cardlock/CardEnumListConverter.java
+++ b/src/main/java/de/oaa/xxx/games/chastity/cardlock/CardEnumListConverter.java
@@ -1,36 +1,41 @@
-package de.oaa.xxx.games.chastity.cardlock;
-
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import jakarta.persistence.AttributeConverter;
-import jakarta.persistence.Converter;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Converter
-public class CardEnumListConverter implements AttributeConverter, String> {
-
- private static final ObjectMapper mapper = new ObjectMapper();
-
- @Override
- public String convertToDatabaseColumn(List list) {
- if (list == null || list.isEmpty()) return null;
- try {
- return mapper.writeValueAsString(list.stream().map(Enum::name).toList());
- } catch (Exception e) {
- return null;
- }
- }
-
- @Override
- public List convertToEntityAttribute(String json) {
- if (json == null || json.isBlank()) return new ArrayList<>();
- try {
- List names = mapper.readValue(json, new TypeReference<>() {});
- return new ArrayList<>(names.stream().map(CardEnum::valueOf).toList());
- } catch (Exception e) {
- return new ArrayList<>();
- }
- }
-}
+package de.oaa.xxx.games.chastity.cardlock;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.persistence.AttributeConverter;
+import jakarta.persistence.Converter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Converter
+public class CardEnumListConverter implements AttributeConverter, String> {
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(CardEnumListConverter.class);
+ private static final ObjectMapper mapper = new ObjectMapper();
+
+ @Override
+ public String convertToDatabaseColumn(List list) {
+ if (list == null || list.isEmpty()) return null;
+ try {
+ return mapper.writeValueAsString(list.stream().map(Enum::name).toList());
+ } catch (Exception e) {
+ LOGGER.warn("Fehler beim Serialisieren der CardEnum-Liste in DB-Spalte", e);
+ return null;
+ }
+ }
+
+ @Override
+ public List convertToEntityAttribute(String json) {
+ if (json == null || json.isBlank()) return new ArrayList<>();
+ try {
+ List names = mapper.readValue(json, new TypeReference<>() {});
+ return new ArrayList<>(names.stream().map(CardEnum::valueOf).toList());
+ } catch (Exception e) {
+ LOGGER.warn("Fehler beim Deserialisieren der CardEnum-Liste aus DB-Spalte", e);
+ return new ArrayList<>();
+ }
+ }
+}
diff --git a/src/main/java/de/oaa/xxx/games/chastity/cardlock/CardLockController.java b/src/main/java/de/oaa/xxx/games/chastity/cardlock/CardLockController.java
index d5dd892..6e52d33 100644
--- a/src/main/java/de/oaa/xxx/games/chastity/cardlock/CardLockController.java
+++ b/src/main/java/de/oaa/xxx/games/chastity/cardlock/CardLockController.java
@@ -61,11 +61,15 @@ import de.oaa.xxx.social.SystemMessageService;
import de.oaa.xxx.subscription.SubscriptionLimitService;
import de.oaa.xxx.user.UserRepository;
import de.oaa.xxx.user.UserService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@RestController
@RequestMapping("/keyholder")
public class CardLockController {
+ private static final Logger LOGGER = LoggerFactory.getLogger(CardLockController.class);
+
private final CardlockRepository cardlockRepository;
private final UserRepository userRepository;
private final KeyholderInvitationRepository invitationRepository;
@@ -1174,6 +1178,7 @@ public class CardLockController {
for (int i = 0; i < count; i++)
toAdd.add(type);
} catch (IllegalArgumentException e) {
+ LOGGER.warn("Ungültiger CardEnum-Wert beim Hinzufügen von Karten: {}", entry.getKey());
return ResponseEntity.badRequest().build();
}
}
@@ -1238,6 +1243,7 @@ public class CardLockController {
}
}
} catch (IllegalArgumentException e) {
+ LOGGER.warn("Ungültiger CardEnum-Wert beim Entfernen von Karten");
return ResponseEntity.badRequest().build();
}
}
@@ -1477,6 +1483,7 @@ public class CardLockController {
try {
until = LocalDateTime.parse(req.until());
} catch (Exception e) {
+ LOGGER.warn("Ungültiges Datumsformat für SpeedEffect: {}", req.until());
return ResponseEntity.badRequest().body(Map.of("error", "Ungültiges Datumsformat."));
}
if (!until.isAfter(LocalDateTime.now()))
diff --git a/src/main/java/de/oaa/xxx/games/chastity/cardlock/CardlockTemplateController.java b/src/main/java/de/oaa/xxx/games/chastity/cardlock/CardlockTemplateController.java
index 785cc52..56358cb 100644
--- a/src/main/java/de/oaa/xxx/games/chastity/cardlock/CardlockTemplateController.java
+++ b/src/main/java/de/oaa/xxx/games/chastity/cardlock/CardlockTemplateController.java
@@ -3,6 +3,8 @@ package de.oaa.xxx.games.chastity.cardlock;
import de.oaa.xxx.games.chastity.tasks.TaskMode;
import de.oaa.xxx.subscription.SubscriptionLimitService;
import de.oaa.xxx.user.UserService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
@@ -18,6 +20,8 @@ import java.util.stream.Collectors;
@RequestMapping("/cardlock/templates")
public class CardlockTemplateController {
+ private static final Logger LOGGER = LoggerFactory.getLogger(CardlockTemplateController.class);
+
private final CardlockTemplateRepository templateRepository;
private final UserService userService;
private final TimeLockTemplateRepository timeLockTemplateRepository;
@@ -152,6 +156,7 @@ public class CardlockTemplateController {
.data(Map.of("min", min, "max", max, "avg", sum / total), MediaType.APPLICATION_JSON));
emitter.complete();
} catch (Exception e) {
+ LOGGER.warn("Fehler beim Senden des SSE-Events für Cardlock-Template: {}", e.getMessage());
emitter.completeWithError(e);
}
}).start();
diff --git a/src/main/java/de/oaa/xxx/games/chastity/common/LockGameController.java b/src/main/java/de/oaa/xxx/games/chastity/common/LockGameController.java
index 9cfc1b6..c9ae95c 100644
--- a/src/main/java/de/oaa/xxx/games/chastity/common/LockGameController.java
+++ b/src/main/java/de/oaa/xxx/games/chastity/common/LockGameController.java
@@ -1,13 +1,14 @@
package de.oaa.xxx.games.chastity.common;
import java.security.Principal;
-import java.time.LocalDateTime;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.transaction.annotation.Transactional;
@@ -25,6 +26,7 @@ import de.oaa.xxx.games.chastity.lockcontroll.LockControlFactory;
import de.oaa.xxx.games.chastity.unlock.UnlockCodeHistoryService;
import de.oaa.xxx.games.common.aufgaben.AufgabenList;
import de.oaa.xxx.games.common.aufgaben.AvailableIn;
+import de.oaa.xxx.games.common.aufgaben.Sperre;
import de.oaa.xxx.games.common.entity.AufgabeEntity;
import de.oaa.xxx.games.common.entity.AufgabenGruppeEntity;
import de.oaa.xxx.games.common.entity.FinisherEntity;
@@ -40,6 +42,7 @@ import de.oaa.xxx.user.UserService;
@RequestMapping("/lock-game")
public class LockGameController {
+ private static final Logger LOGGER = LoggerFactory.getLogger(LockGameController.class);
private static final int AUFGABEN_PRO_LEVEL = 3;
private final LockGameRepository lockGameRepository;
@@ -231,6 +234,7 @@ public class LockGameController {
return ResponseEntity.ok(Map.of("gameId", game.getGameId().toString()));
} catch (Exception e) {
+ LOGGER.error("Fehler beim Initialisieren des LockGames", e);
return ResponseEntity.internalServerError().body(Map.of("error", e.getMessage()));
}
}
@@ -243,6 +247,7 @@ public class LockGameController {
try {
return ResponseEntity.ok(buildService(opt.get()).getGameState());
} catch (Exception ex) {
+ LOGGER.error("Fehler beim Laden des GameState", ex);
return ResponseEntity.internalServerError().build();
}
}
@@ -256,6 +261,7 @@ public class LockGameController {
buildService(opt.get()).initNextTask();
return ResponseEntity.noContent().build();
} catch (Exception e) {
+ LOGGER.error("Fehler beim Ziehen der nächsten Aufgabe", e);
return ResponseEntity.internalServerError().body(Map.of("error", e.getMessage()));
}
}
@@ -269,6 +275,7 @@ public class LockGameController {
buildService(opt.get()).abandonActiveTask();
return ResponseEntity.noContent().build();
} catch (Exception e) {
+ LOGGER.error("Fehler beim Abbrechen der aktiven Aufgabe", e);
return ResponseEntity.internalServerError().body(Map.of("error", e.getMessage()));
}
}
@@ -282,30 +289,33 @@ public class LockGameController {
Integer seconds = buildService(opt.get()).applyTaskInQueue();
return ResponseEntity.ok(Map.of("seconds", seconds != null ? seconds : 0));
} catch (Exception e) {
+ LOGGER.error("Fehler beim Anwenden der Aufgabe aus der Queue", e);
return ResponseEntity.internalServerError().body(Map.of("error", e.getMessage()));
}
}
@PostMapping("/check-locks")
- public ResponseEntity> checkLocks(Principal principal) {
+ public ResponseEntity> checkLocks(Principal principal) {
UUID userId = userService.requireUser(principal).getUserId();
var opt = lockGameRepository.findByUserId(userId);
if (opt.isEmpty()) return ResponseEntity.ok(List.of());
try {
return ResponseEntity.ok(buildService(opt.get()).checkLocks());
} catch (Exception e) {
+ LOGGER.warn("Fehler beim Prüfen abgelaufener Sperren", e);
return ResponseEntity.ok(List.of());
}
}
@GetMapping("/release-locks")
- public ResponseEntity> releaseLocks(Principal principal) {
+ public ResponseEntity> releaseLocks(Principal principal) {
UUID userId = userService.requireUser(principal).getUserId();
var opt = lockGameRepository.findByUserId(userId);
if (opt.isEmpty()) return ResponseEntity.ok(List.of());
try {
return ResponseEntity.ok(buildService(opt.get()).releaseLocks());
} catch (Exception e) {
+ LOGGER.warn("Fehler beim Auflösen aller Sperren", e);
return ResponseEntity.ok(List.of());
}
}
@@ -319,6 +329,7 @@ public class LockGameController {
buildService(opt.get()).startFinisher();
return ResponseEntity.noContent().build();
} catch (Exception e) {
+ LOGGER.error("Fehler beim Starten des Finishers", e);
return ResponseEntity.internalServerError().body(Map.of("error", e.getMessage()));
}
}
@@ -332,6 +343,7 @@ public class LockGameController {
buildService(opt.get()).endFinisher();
return ResponseEntity.noContent().build();
} catch (Exception e) {
+ LOGGER.error("Fehler beim Beenden des Finishers", e);
return ResponseEntity.internalServerError().body(Map.of("error", e.getMessage()));
}
}
@@ -346,6 +358,7 @@ public class LockGameController {
buildService(opt.get()).startTempOpening();
return ResponseEntity.noContent().build();
} catch (Exception e) {
+ LOGGER.error("Fehler beim Starten der temporären Öffnung", e);
return ResponseEntity.internalServerError().body(Map.of("error", e.getMessage()));
}
}
@@ -357,9 +370,10 @@ public class LockGameController {
var opt = lockGameRepository.findByUserId(userId);
if (opt.isEmpty()) return ResponseEntity.notFound().build();
try {
- buildService(opt.get()).endTempOpening();
- return ResponseEntity.noContent().build();
+ String newCode = buildService(opt.get()).endTempOpening();
+ return ResponseEntity.ok(newCode != null ? Map.of("newUnlockCode", newCode) : Map.of());
} catch (Exception e) {
+ LOGGER.error("Fehler beim Beenden der temporären Öffnung", e);
return ResponseEntity.internalServerError().body(Map.of("error", e.getMessage()));
}
}
diff --git a/src/main/java/de/oaa/xxx/games/chastity/common/LockGameService.java b/src/main/java/de/oaa/xxx/games/chastity/common/LockGameService.java
index 360e122..3a92987 100644
--- a/src/main/java/de/oaa/xxx/games/chastity/common/LockGameService.java
+++ b/src/main/java/de/oaa/xxx/games/chastity/common/LockGameService.java
@@ -56,7 +56,9 @@ public class LockGameService implements LockControlCallback {
try {
benoetigtAktiv = new ObjectMapper().readValue(gamestate.getActiveTaskBenoetigtAktiv(),
new com.fasterxml.jackson.core.type.TypeReference>() {});
- } catch (Exception ignored) {}
+ } catch (Exception e) {
+ LOGGER.warn("Fehler beim Deserialisieren von activeTaskBenoetigtAktiv", e);
+ }
}
return new GameState(gamestate.getGameId(), gamestate.getUserId(), gamestate.getLevel(),
gamestate.getActiveTask(), gamestate.getActiveTaskEnd(), benoetigtAktiv,
@@ -86,6 +88,9 @@ public class LockGameService implements LockControlCallback {
String result = null;
if (gamestate.getLevel() <= 5) {
+ gamestate.setTaskInQueue(null);
+ gamestate.setLockInQueue(null);
+
int nextInt = new Random().nextInt(1, 100);
boolean isZeitstrafe = nextInt < 25;
LOGGER.info("[LockGame {}] Ziehung: Level={}, Würfel={}, Typ={}", gamestate.getUserId(),
@@ -132,24 +137,52 @@ public class LockGameService implements LockControlCallback {
}
private String findAufgabe() throws JsonProcessingException {
- var list = gamestate.getActiveLocks().stream().flatMap(lock -> lock.getLockFor().stream()).toList();
+ var locked = gamestate.getActiveLocks().stream().flatMap(lock -> lock.getLockFor().stream()).toList();
+ ObjectMapper mapper = new ObjectMapper();
+
+ // First pass: unplayed tasks
var level = gamestate.getLevel();
while (level > 0) {
final var levelcp = level;
- var aufgaben = aufgabenList.getAufgaben().stream()
- .filter(aufgabe -> aufgabe.getLevel() == levelcp && aufgabe.getBenoetigtAktiv().stream().noneMatch(item -> list.contains(item)))
+ var candidates = aufgabenList.getAufgaben().stream()
+ .filter(a -> a.getLevel() == levelcp && a.getBenoetigtAktiv().stream().noneMatch(locked::contains))
.toList();
- if (!aufgaben.isEmpty()) {
- ObjectMapper mapper = new ObjectMapper();
- var aufgabe = aufgaben.get(new Random().nextInt(aufgaben.size()));
- LOGGER.info("[LockGame {}] AUFGABE gezogen: kurzText='{}', level={}, sekunden={}-{}",
+ if (!candidates.isEmpty()) {
+ var aufgabe = candidates.get(new Random().nextInt(candidates.size()));
+ LOGGER.info("[LockGame {}] AUFGABE gezogen (neu): kurzText='{}', level={}, sekunden={}-{}",
gamestate.getUserId(), aufgabe.getKurzText(), aufgabe.getLevel(),
aufgabe.getSekundenVon(), aufgabe.getSekundenBis());
+ aufgabenList.getAufgaben().remove(aufgabe);
+ if (aufgabenList.getUsedAufgaben() == null) aufgabenList.setUsedAufgaben(new ArrayList<>());
+ aufgabenList.getUsedAufgaben().add(aufgabe);
+ gamestate.setAufgaben(mapper.writeValueAsString(aufgabenList));
gamestate.setTaskInQueue(mapper.writeValueAsString(aufgabe));
return aufgabe.getText();
}
level--;
}
+
+ // Second pass: fallback to already-played tasks
+ var used = aufgabenList.getUsedAufgaben();
+ if (used != null && !used.isEmpty()) {
+ level = gamestate.getLevel();
+ while (level > 0) {
+ final var levelcp = level;
+ var candidates = used.stream()
+ .filter(a -> a.getLevel() == levelcp && a.getBenoetigtAktiv().stream().noneMatch(locked::contains))
+ .toList();
+ if (!candidates.isEmpty()) {
+ var aufgabe = candidates.get(new Random().nextInt(candidates.size()));
+ LOGGER.info("[LockGame {}] AUFGABE gezogen (Wiederholung): kurzText='{}', level={}, sekunden={}-{}",
+ gamestate.getUserId(), aufgabe.getKurzText(), aufgabe.getLevel(),
+ aufgabe.getSekundenVon(), aufgabe.getSekundenBis());
+ gamestate.setTaskInQueue(mapper.writeValueAsString(aufgabe));
+ return aufgabe.getText();
+ }
+ level--;
+ }
+ }
+
return null;
}
@@ -182,8 +215,8 @@ public class LockGameService implements LockControlCallback {
}
private Integer getLockTime(Sperre sperre) {
- int von = sperre.getMinutenVon() != null ? sperre.getMinutenVon() : 0;
- int bis = sperre.getMinutenBis() != null ? sperre.getMinutenBis() : von;
+ int von = sperre.getMinutenVon() != null ? sperre.getMinutenVon() * 60 : 0;
+ int bis = sperre.getMinutenBis() != null ? sperre.getMinutenBis() * 60 : von;
int time = von < bis ? new Random().nextInt(von, bis) : von;
return (int) (time * gamestate.getZeitfaktorZeitstrafen());
}
@@ -221,45 +254,59 @@ public class LockGameService implements LockControlCallback {
entity.setLockFor(lock.getSperreFuer());
entity.setReleaseText(lock.getReleaseText());
entity.setTempUnlockRequired(lock.getTempUnlockRequired());
- int lockMinutes = getLockTime(lock);
- entity.setReleaseTime(LocalDateTime.now().plusMinutes(lockMinutes));
+ int lockSeconds = getLockTime(lock);
+ entity.setReleaseTime(LocalDateTime.now().plusSeconds(lockSeconds));
LOGGER.info("[LockGame {}] ZEITSTRAFE aktiv: kurzText='{}', berechnete Zeit={}min (Range: {}min-{}min), sperreFuer={}",
- gamestate.getUserId(), lock.getKurzText(), lockMinutes,
+ gamestate.getUserId(), lock.getKurzText(), lockSeconds,
lock.getMinutenVon(), lock.getMinutenBis(), lock.getSperreFuer());
lockGameLockRepository.save(entity);
}
- public List checkLocks() {
- var result = new ArrayList();
+ public List checkLocks() {
+ var result = new ArrayList();
for (LockGameLockEntity entity : lockGameLockRepository.findByGameId(gamestate.getGameId())) {
if (entity.getReleaseTime().isBefore(LocalDateTime.now())) {
- result.add(entity.getReleaseText());
+ result.add(toSperre(entity));
if (Boolean.TRUE.equals(entity.getTempUnlockRequired())) {
startTempOpening();
}
lockGameLockRepository.delete(entity);
-
}
}
return result;
}
- public List releaseLocks() {
- var result = new ArrayList();
+ public List releaseLocks() {
+ var result = new ArrayList();
for (LockGameLockEntity entity : lockGameLockRepository.findByGameId(gamestate.getGameId())) {
- result.add(entity.getReleaseText());
+ result.add(toSperre(entity));
lockGameLockRepository.delete(entity);
}
return result;
}
+ private Sperre toSperre(LockGameLockEntity entity) {
+ var sperre = new Sperre();
+ sperre.setReleaseText(entity.getReleaseText());
+ sperre.setSperreFuer(entity.getLockFor());
+ sperre.setTempUnlockRequired(entity.getTempUnlockRequired());
+ return sperre;
+ }
+
public void initFinisher() throws JsonProcessingException {
var finisher = aufgabenList.getFinisher().get(new Random().nextInt(aufgabenList.getFinisher().size()));
ObjectMapper mapper = new ObjectMapper();
gamestate.setFinisher(mapper.writeValueAsString(finisher));
gamestate.setActiveTask(null);
gamestate.setActiveTaskBenoetigtAktiv(null);
- lockGameLockRepository.deleteAll(lockGameLockRepository.findByGameId(gamestate.getGameId()));
+
+ var activeLocks = lockGameLockRepository.findByGameId(gamestate.getGameId());
+ boolean needsTempOpen = activeLocks.stream().anyMatch(l -> Boolean.TRUE.equals(l.getTempUnlockRequired()));
+ if (needsTempOpen) {
+ startTempOpening();
+ }
+
+ lockGameLockRepository.deleteAll(activeLocks);
lockGameRepository.save(gamestate);
}
@@ -293,7 +340,7 @@ public class LockGameService implements LockControlCallback {
unlockCodeHistoryService.save(lock.getLockee(), lock.getLockId(), lock.getName(), lock.getUnlockCode(), TempOpeningReason.TASK.toString());
}
- public void endTempOpening() {
+ public String endTempOpening() {
var lock = baseLockRepository.findById(gamestate.getLockId()).get();
var overtime = BaseLockHelper.calcOvertime(lock);
if (overtime != null) {
@@ -310,8 +357,13 @@ public class LockGameService implements LockControlCallback {
if (lockControl != null
&& lock.getControllType() != de.oaa.xxx.games.chastity.lockcontroll.LockControllType.UNLOCK_CODE) {
lockControl.lock();
+ return null;
}
}
+ var code = CodeCreator.createNumeric(lock.getUnlockCodeLength() != null ? lock.getUnlockCodeLength() : 5);
+ lock.setUnlockCode(code);
+ baseLockRepository.save(lock);
+ return code;
}
@Override
diff --git a/src/main/java/de/oaa/xxx/games/chastity/keyholder/KeyholderOfferController.java b/src/main/java/de/oaa/xxx/games/chastity/keyholder/KeyholderOfferController.java
index 6f00869..0fc1e69 100644
--- a/src/main/java/de/oaa/xxx/games/chastity/keyholder/KeyholderOfferController.java
+++ b/src/main/java/de/oaa/xxx/games/chastity/keyholder/KeyholderOfferController.java
@@ -9,6 +9,8 @@ import java.util.List;
import java.util.Map;
import java.util.UUID;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.http.ResponseEntity;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.DeleteMapping;
@@ -45,6 +47,8 @@ import de.oaa.xxx.user.UserService;
@RequestMapping("/keyholder-offers")
public class KeyholderOfferController {
+ private static final Logger LOGGER = LoggerFactory.getLogger(KeyholderOfferController.class);
+
private final KeyholderOfferRepository offerRepository;
private final BaseLockTemplateRepository templateRepository;
private final TemplateSubscriptionRepository subscriptionRepository;
@@ -358,7 +362,9 @@ public class KeyholderOfferController {
try {
CardEnum card = CardEnum.valueOf(type);
for (int i = 0; i < count; i++) cards.add(card);
- } catch (IllegalArgumentException ignored) {}
+ } catch (IllegalArgumentException e) {
+ LOGGER.warn("Ungültiger Wert beim Keyholder-Angebot: {}", e.getMessage());
+ }
}
});
return cards;
diff --git a/src/main/java/de/oaa/xxx/games/chastity/spinningwheel/SpinningWheelConverter.java b/src/main/java/de/oaa/xxx/games/chastity/spinningwheel/SpinningWheelConverter.java
index 3eba677..2c80252 100644
--- a/src/main/java/de/oaa/xxx/games/chastity/spinningwheel/SpinningWheelConverter.java
+++ b/src/main/java/de/oaa/xxx/games/chastity/spinningwheel/SpinningWheelConverter.java
@@ -1,39 +1,44 @@
-package de.oaa.xxx.games.chastity.spinningwheel;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import jakarta.persistence.AttributeConverter;
-import jakarta.persistence.Converter;
-
-@Converter
-public class SpinningWheelConverter implements AttributeConverter, String> {
-
- private static final ObjectMapper mapper = new ObjectMapper();
-
- @Override
- public String convertToDatabaseColumn(List list) {
- if (list == null || list.isEmpty())
- return null;
- try {
- return mapper.writeValueAsString(list);
- } catch (Exception e) {
- return null;
- }
- }
-
- @Override
- public List convertToEntityAttribute(String json) {
- if (json == null || json.isBlank())
- return new ArrayList<>();
- try {
- return new ArrayList<>(mapper.readValue(json, new TypeReference>() {
- }));
- } catch (Exception e) {
- return new ArrayList<>();
- }
- }
-}
+package de.oaa.xxx.games.chastity.spinningwheel;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import jakarta.persistence.AttributeConverter;
+import jakarta.persistence.Converter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+@Converter
+public class SpinningWheelConverter implements AttributeConverter, String> {
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(SpinningWheelConverter.class);
+ private static final ObjectMapper mapper = new ObjectMapper();
+
+ @Override
+ public String convertToDatabaseColumn(List list) {
+ if (list == null || list.isEmpty())
+ return null;
+ try {
+ return mapper.writeValueAsString(list);
+ } catch (Exception e) {
+ LOGGER.warn("Fehler beim Serialisieren der SpinningWheel-Einträge in DB-Spalte", e);
+ return null;
+ }
+ }
+
+ @Override
+ public List convertToEntityAttribute(String json) {
+ if (json == null || json.isBlank())
+ return new ArrayList<>();
+ try {
+ return new ArrayList<>(mapper.readValue(json, new TypeReference>() {
+ }));
+ } catch (Exception e) {
+ LOGGER.warn("Fehler beim Deserialisieren der SpinningWheel-Einträge aus DB-Spalte", e);
+ return new ArrayList<>();
+ }
+ }
+}
diff --git a/src/main/java/de/oaa/xxx/games/chastity/tasks/TaskListConverter.java b/src/main/java/de/oaa/xxx/games/chastity/tasks/TaskListConverter.java
index f887435..90d78a6 100644
--- a/src/main/java/de/oaa/xxx/games/chastity/tasks/TaskListConverter.java
+++ b/src/main/java/de/oaa/xxx/games/chastity/tasks/TaskListConverter.java
@@ -1,35 +1,40 @@
-package de.oaa.xxx.games.chastity.tasks;
-
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import jakarta.persistence.AttributeConverter;
-import jakarta.persistence.Converter;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Converter
-public class TaskListConverter implements AttributeConverter, String> {
-
- private static final ObjectMapper mapper = new ObjectMapper();
-
- @Override
- public String convertToDatabaseColumn(List list) {
- if (list == null || list.isEmpty()) return null;
- try {
- return mapper.writeValueAsString(list);
- } catch (Exception e) {
- return null;
- }
- }
-
- @Override
- public List convertToEntityAttribute(String json) {
- if (json == null || json.isBlank()) return new ArrayList<>();
- try {
- return new ArrayList<>(mapper.readValue(json, new TypeReference>() {}));
- } catch (Exception e) {
- return new ArrayList<>();
- }
- }
-}
+package de.oaa.xxx.games.chastity.tasks;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.persistence.AttributeConverter;
+import jakarta.persistence.Converter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Converter
+public class TaskListConverter implements AttributeConverter, String> {
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(TaskListConverter.class);
+ private static final ObjectMapper mapper = new ObjectMapper();
+
+ @Override
+ public String convertToDatabaseColumn(List list) {
+ if (list == null || list.isEmpty()) return null;
+ try {
+ return mapper.writeValueAsString(list);
+ } catch (Exception e) {
+ LOGGER.warn("Fehler beim Serialisieren der Task-Liste in DB-Spalte", e);
+ return null;
+ }
+ }
+
+ @Override
+ public List convertToEntityAttribute(String json) {
+ if (json == null || json.isBlank()) return new ArrayList<>();
+ try {
+ return new ArrayList<>(mapper.readValue(json, new TypeReference>() {}));
+ } catch (Exception e) {
+ LOGGER.warn("Fehler beim Deserialisieren der Task-Liste aus DB-Spalte", e);
+ return new ArrayList<>();
+ }
+ }
+}
diff --git a/src/main/java/de/oaa/xxx/games/chastity/timelock/TimeLockController.java b/src/main/java/de/oaa/xxx/games/chastity/timelock/TimeLockController.java
index b345f45..73255a7 100644
--- a/src/main/java/de/oaa/xxx/games/chastity/timelock/TimeLockController.java
+++ b/src/main/java/de/oaa/xxx/games/chastity/timelock/TimeLockController.java
@@ -47,11 +47,15 @@ import de.oaa.xxx.games.chastity.unlock.UnlockCodeHistoryService;
import de.oaa.xxx.social.SystemMessageService;
import de.oaa.xxx.user.UserRepository;
import de.oaa.xxx.user.UserService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@RestController
@RequestMapping("/keyholder")
public class TimeLockController {
+ private static final Logger LOGGER = LoggerFactory.getLogger(TimeLockController.class);
+
private final TimeLockRepository timeLockRepository;
private final TimeLockTemplateRepository templateRepository;
private final UserRepository userRepository;
@@ -755,6 +759,7 @@ public class TimeLockController {
try {
until = LocalDateTime.parse(req.frozenUntil());
} catch (Exception e) {
+ LOGGER.warn("Ungültiges Datumsformat für TimeLock-Freeze: {}", req.frozenUntil());
return ResponseEntity.badRequest().body(Map.of("error", "Ungültiges Datumsformat."));
}
if (!until.isAfter(LocalDateTime.now()))
diff --git a/src/main/java/de/oaa/xxx/games/chastity/ttlock/TTLockCallback.java b/src/main/java/de/oaa/xxx/games/chastity/ttlock/TTLockCallback.java
index f616888..39352e3 100644
--- a/src/main/java/de/oaa/xxx/games/chastity/ttlock/TTLockCallback.java
+++ b/src/main/java/de/oaa/xxx/games/chastity/ttlock/TTLockCallback.java
@@ -186,7 +186,7 @@ public class TTLockCallback {
wrapper.setRecords(recordList);
}
} catch (Exception e) {
- System.err.println("Fehler beim Parsen des TTLock Callbacks: " + e.getMessage());
+ LOGGER.error("Fehler beim Parsen des TTLock-Callbacks", e);
}
return wrapper;
diff --git a/src/main/java/de/oaa/xxx/games/chastity/ttlock/TTLockService.java b/src/main/java/de/oaa/xxx/games/chastity/ttlock/TTLockService.java
index ecccc87..4d635bf 100644
--- a/src/main/java/de/oaa/xxx/games/chastity/ttlock/TTLockService.java
+++ b/src/main/java/de/oaa/xxx/games/chastity/ttlock/TTLockService.java
@@ -20,9 +20,14 @@ import lombok.Data;
import lombok.Getter;
import lombok.Setter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
@Service
public class TTLockService {
+ private static final Logger LOGGER = LoggerFactory.getLogger(TTLockService.class);
+
private final RestTemplate restTemplate;
private static final String UNLOCK_CODE_NAME = "xxx-unlock-code";
@@ -41,10 +46,10 @@ public class TTLockService {
HttpHeaders headers = new HttpHeaders();
headers.setAccept(Collections.singletonList(MediaType.APPLICATION_JSON));
TTLockDetailResponse response = restTemplate.getForObject(url, TTLockDetailResponse.class);
- System.out.println(response);
+ LOGGER.debug("TTLock-Details abgerufen: {}", response);
return response;
} catch (Exception e) {
- System.err.println("Fehler beim Abrufen der Details: " + e.getMessage());
+ LOGGER.error("Fehler beim Abrufen der TTLock-Details für Lock {}", e.getMessage(), e);
return null;
}
}
@@ -74,11 +79,11 @@ public class TTLockService {
if (response.getBody() != null && response.getBody().isSuccess()) {
return response.getBody().getKeyboardPwdId();
} else {
- System.out.println("Fehler von TTLock: " + response.getBody().getErrmsg());
+ LOGGER.warn("TTLock meldet Fehler beim Hinzufügen des Passcodes: {}", response.getBody().getErrmsg());
return null;
}
} catch (Exception e) {
- e.printStackTrace();
+ LOGGER.error("Fehler beim Hinzufügen eines TTLock-Passcodes", e);
return null;
}
}
@@ -103,6 +108,7 @@ public class TTLockService {
ResponseEntity response = restTemplate.postForEntity(url, request, String.class);
return response.getBody();
} catch (Exception e) {
+ LOGGER.error("Fehler beim Löschen des TTLock-Passcodes", e);
return "{\"errcode\":-1, \"errmsg\":\"" + e.getMessage() + "\"}";
}
}
@@ -134,7 +140,7 @@ public class TTLockService {
}
}
} catch (Exception e) {
- System.err.println("Fehler beim Massenlöschen: " + e.getMessage());
+ LOGGER.error("Fehler beim Massenlöschen der TTLock-Passcodes", e);
}
}
diff --git a/src/main/java/de/oaa/xxx/games/common/aufgaben/AufgabenList.java b/src/main/java/de/oaa/xxx/games/common/aufgaben/AufgabenList.java
index 05d163d..c21777b 100644
--- a/src/main/java/de/oaa/xxx/games/common/aufgaben/AufgabenList.java
+++ b/src/main/java/de/oaa/xxx/games/common/aufgaben/AufgabenList.java
@@ -10,6 +10,7 @@ import java.util.List;
public class AufgabenList {
private List aufgaben;
+ private List usedAufgaben;
private List sperren;
private List strafen;
private List finisher;
diff --git a/src/main/java/de/oaa/xxx/games/common/aufgaben/DefaultFiller.java b/src/main/java/de/oaa/xxx/games/common/aufgaben/DefaultFiller.java
index b78ce26..fcf3b63 100644
--- a/src/main/java/de/oaa/xxx/games/common/aufgaben/DefaultFiller.java
+++ b/src/main/java/de/oaa/xxx/games/common/aufgaben/DefaultFiller.java
@@ -11,6 +11,8 @@ import de.oaa.xxx.games.common.repository.SperreRepository;
import de.oaa.xxx.games.common.repository.StrafeRepository;
import de.oaa.xxx.games.common.repository.ToyRepository;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
@@ -30,6 +32,8 @@ import java.util.UUID;
@Component
public class DefaultFiller {
+ private static final Logger LOGGER = LoggerFactory.getLogger(DefaultFiller.class);
+
private final AufgabeRepository aufgabeRepository;
private final AufgabenGruppeRepository gruppeRepository;
private final SperreRepository sperreRepository;
@@ -362,7 +366,7 @@ public class DefaultFiller {
entity.setBild(stream.readAllBytes());
}
} catch (IOException e) {
- e.printStackTrace();
+ LOGGER.error("Fehler beim Lesen des Gruppenbilds", e);
}
gruppeRepository.save(entity);
return entity;
diff --git a/src/main/java/de/oaa/xxx/gruppe/GruppenbeitragController.java b/src/main/java/de/oaa/xxx/gruppe/GruppenbeitragController.java
index 5d3080b..107519e 100644
--- a/src/main/java/de/oaa/xxx/gruppe/GruppenbeitragController.java
+++ b/src/main/java/de/oaa/xxx/gruppe/GruppenbeitragController.java
@@ -124,6 +124,7 @@ public class GruppenbeitragController extends BaseController {
try {
typ = BeitragTyp.valueOf(req.beitragTyp());
} catch (Exception e) {
+ LOGGER.warn("Ungültiger BeitragTyp: {}", req.beitragTyp());
return ResponseEntity.badRequest().build();
}
diff --git a/src/main/java/de/oaa/xxx/passwordreset/PasswordResetController.java b/src/main/java/de/oaa/xxx/passwordreset/PasswordResetController.java
index 43866d9..1819ed6 100644
--- a/src/main/java/de/oaa/xxx/passwordreset/PasswordResetController.java
+++ b/src/main/java/de/oaa/xxx/passwordreset/PasswordResetController.java
@@ -64,6 +64,7 @@ public class PasswordResetController {
try {
tokenId = UUID.fromString(confirm.token());
} catch (IllegalArgumentException e) {
+ LOGGER.warn("Ungültiger Parameter beim Passwort-Reset: {}", e.getMessage());
return ResponseEntity.badRequest().build();
}
var entity = passwordResetRepository.findById(tokenId);
diff --git a/src/main/java/de/oaa/xxx/registration/ActivationController.java b/src/main/java/de/oaa/xxx/registration/ActivationController.java
index 1a3210c..20a9c75 100644
--- a/src/main/java/de/oaa/xxx/registration/ActivationController.java
+++ b/src/main/java/de/oaa/xxx/registration/ActivationController.java
@@ -2,6 +2,8 @@ package de.oaa.xxx.registration;
import java.net.URI;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
@@ -12,6 +14,8 @@ import org.springframework.web.bind.annotation.RestController;
@RequestMapping("/activation")
public class ActivationController {
+ private static final Logger LOGGER = LoggerFactory.getLogger(ActivationController.class);
+
private final RegistrationService registrationService;
public ActivationController(RegistrationService registrationService) {
@@ -25,9 +29,11 @@ public class ActivationController {
String redirect = "/login.html?email=" + java.net.URLEncoder.encode(email, java.nio.charset.StandardCharsets.UTF_8);
return ResponseEntity.status(302).location(URI.create(redirect)).build();
} catch (IllegalStateException e) {
+ LOGGER.warn("Ungültiger Aktivierungsstatus: {}", e.getMessage());
// Bereits aktiviert → trotzdem zum Login weiterleiten (idempotent)
return ResponseEntity.noContent().build();
} catch (IllegalArgumentException e) {
+ LOGGER.warn("Ungültiger Aktivierungsparameter: {}", e.getMessage());
return ResponseEntity.noContent().build();
} catch (Exception e) {
return ResponseEntity.internalServerError().build();
diff --git a/src/main/java/de/oaa/xxx/registration/RegistrationService.java b/src/main/java/de/oaa/xxx/registration/RegistrationService.java
index 6136799..2b7249c 100644
--- a/src/main/java/de/oaa/xxx/registration/RegistrationService.java
+++ b/src/main/java/de/oaa/xxx/registration/RegistrationService.java
@@ -39,6 +39,7 @@ public class RegistrationService {
registration = registrationRepository.findById(registrationId)
.orElseThrow(() -> new IllegalArgumentException("Registration nicht gefunden: " + token));
} catch (IllegalArgumentException e) {
+ LOGGER.debug("Aktivierungscode ist kein UUID-Format, suche nach Kurzcode: {}", token);
// Kein UUID-Format → nach kurzem Aktivierungscode suchen
registration = registrationRepository.findByActivationCode(token)
.orElseThrow(() -> new IllegalArgumentException("Aktivierungscode ungültig: " + token));
diff --git a/src/main/java/de/oaa/xxx/social/SseService.java b/src/main/java/de/oaa/xxx/social/SseService.java
index a2d68f4..65eac2e 100644
--- a/src/main/java/de/oaa/xxx/social/SseService.java
+++ b/src/main/java/de/oaa/xxx/social/SseService.java
@@ -1,6 +1,8 @@
package de.oaa.xxx.social;
import jakarta.annotation.PreDestroy;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Service;
import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
@@ -15,6 +17,8 @@ import java.util.concurrent.CopyOnWriteArrayList;
@Service
public class SseService {
+ private static final Logger LOGGER = LoggerFactory.getLogger(SseService.class);
+
private final Map> emitters = new ConcurrentHashMap<>();
@PreDestroy
@@ -42,6 +46,7 @@ public class SseService {
emitter.send(SseEmitter.event().name(eventName).data(data, MediaType.APPLICATION_JSON));
return false;
} catch (IOException e) {
+ LOGGER.debug("SSE-Verbindung für User {} unterbrochen, Emitter wird entfernt", userId);
return true;
}
});
diff --git a/src/main/java/de/oaa/xxx/user/LoginController.java b/src/main/java/de/oaa/xxx/user/LoginController.java
index 974600b..d7f8883 100644
--- a/src/main/java/de/oaa/xxx/user/LoginController.java
+++ b/src/main/java/de/oaa/xxx/user/LoginController.java
@@ -89,7 +89,9 @@ public class LoginController {
if (jti != null) {
tokenBlacklist.blacklist(jti, claims.getExpiration().getTime());
}
- } catch (Exception ignored) {}
+ } catch (Exception e) {
+ LOGGER.debug("JWT beim Logout nicht valide, Blacklisting übersprungen", e);
+ }
});
}
response.addHeader(HttpHeaders.SET_COOKIE, cookieFactory.jwtCookie("", Duration.ZERO).toString());
diff --git a/src/main/java/de/oaa/xxx/user/UserController.java b/src/main/java/de/oaa/xxx/user/UserController.java
index 9c44886..1deb8f9 100644
--- a/src/main/java/de/oaa/xxx/user/UserController.java
+++ b/src/main/java/de/oaa/xxx/user/UserController.java
@@ -132,7 +132,7 @@ public class UserController {
user.setDatingLon(request.datingLon());
if (request.datingGeschlechter() != null && !request.datingGeschlechter().isEmpty()) {
String joined = request.datingGeschlechter().stream()
- .filter(g -> { try { Geschlecht.valueOf(g); return true; } catch (IllegalArgumentException e) { return false; } })
+ .filter(g -> { try { Geschlecht.valueOf(g); return true; } catch (IllegalArgumentException e) { LOGGER.warn("Ungültiger Wert in UserController: {}", g); return false; } })
.collect(Collectors.joining(","));
user.setDatingGeschlechter(joined.isBlank() ? null : joined);
} else {
@@ -154,7 +154,7 @@ public class UserController {
return ResponseEntity.status(HttpStatus.FORBIDDEN).build();
if (request.datingGeschlechter() != null) {
String joined = request.datingGeschlechter().stream()
- .filter(g -> { try { Geschlecht.valueOf(g); return true; } catch (IllegalArgumentException e) { return false; } })
+ .filter(g -> { try { Geschlecht.valueOf(g); return true; } catch (IllegalArgumentException e) { LOGGER.warn("Ungültiger Wert in UserController: {}", g); return false; } })
.collect(Collectors.joining(","));
user.setDatingGeschlechter(joined.isBlank() ? null : joined);
}
@@ -248,6 +248,7 @@ public class UserController {
try {
cause = MessageCause.valueOf(entry.getKey());
} catch (IllegalArgumentException e) {
+ LOGGER.warn("Ungültiger Wert in UserController: {}", entry.getKey());
continue;
}
NotificationPreferenceEntity pref = notificationPreferenceRepository
@@ -500,8 +501,10 @@ public class UserController {
userService.createUser(registration);
return ResponseEntity.status(201).build();
} catch (IllegalArgumentException e) {
+ LOGGER.warn("Ungültiger Wert in UserController: {}", e.getMessage());
return ResponseEntity.badRequest().build();
} catch (IllegalStateException e) {
+ LOGGER.warn("Ungültiger Wert in UserController: {}", e.getMessage());
return ResponseEntity.status(409).build();
} catch (Exception e) {
LOGGER.error(e.getMessage(), e);
diff --git a/src/main/java/de/oaa/xxx/vorlieben/VorliebenController.java b/src/main/java/de/oaa/xxx/vorlieben/VorliebenController.java
index 6f585ab..c2d241a 100644
--- a/src/main/java/de/oaa/xxx/vorlieben/VorliebenController.java
+++ b/src/main/java/de/oaa/xxx/vorlieben/VorliebenController.java
@@ -3,6 +3,8 @@ package de.oaa.xxx.vorlieben;
import de.oaa.xxx.social.entity.FriendshipEntity;
import de.oaa.xxx.social.repository.FriendshipRepository;
import de.oaa.xxx.user.Sichtbarkeit;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import de.oaa.xxx.user.UserEntity;
import de.oaa.xxx.user.UserRepository;
import de.oaa.xxx.user.UserService;
@@ -19,6 +21,8 @@ import java.util.stream.Collectors;
@Transactional
public class VorliebenController {
+ private static final Logger LOGGER = LoggerFactory.getLogger(VorliebenController.class);
+
private final VorliebeKategorieRepository kategorieRepository;
private final VorliebeItemRepository itemRepository;
private final UserVorliebeRepository userVorliebeRepository;
@@ -81,7 +85,10 @@ public class VorliebenController {
for (var entry : ratings.entrySet()) {
UUID itemId;
try { itemId = UUID.fromString(entry.getKey()); }
- catch (IllegalArgumentException e) { continue; }
+ catch (IllegalArgumentException e) {
+ LOGGER.warn("Ungültiger Vorlieben-Wert: {}", entry.getKey());
+ continue;
+ }
String bewertungStr = entry.getValue();
if (bewertungStr == null || bewertungStr.isBlank()) {
@@ -90,7 +97,10 @@ public class VorliebenController {
} else {
VorliebeBewertung bewertung;
try { bewertung = VorliebeBewertung.valueOf(bewertungStr); }
- catch (IllegalArgumentException e) { continue; }
+ catch (IllegalArgumentException e) {
+ LOGGER.warn("Ungültiger Vorlieben-Wert: {}", bewertungStr);
+ continue;
+ }
UserVorliebeEntity uv = userVorliebeRepository.findByUserIdAndItemId(userId, itemId)
.orElseGet(() -> {
diff --git a/src/main/resources/static/games/chastity/taskgame.html b/src/main/resources/static/games/chastity/taskgame.html
index 82c3651..36ffa82 100644
--- a/src/main/resources/static/games/chastity/taskgame.html
+++ b/src/main/resources/static/games/chastity/taskgame.html
@@ -23,6 +23,7 @@
letter-spacing: 0.08em;
margin-bottom: 0.5rem;
height: 1.2rem;
+ text-align: center;
}
.game-text {
font-size: 1rem;
@@ -31,6 +32,7 @@
white-space: pre-wrap;
height: 14rem;
overflow-y: auto;
+ text-align: center;
}
.game-timer {
font-size: 2.2rem;
@@ -67,16 +69,6 @@
object-fit: contain;
}
- .lock-messages {
- background: rgba(233,69,96,0.1);
- border: 1px solid rgba(233,69,96,0.3);
- border-radius: 10px;
- padding: 1rem 1.1rem;
- margin-bottom: 1.25rem;
- }
- .lock-messages p { margin: 0 0 0.5rem; font-size: 0.9rem; line-height: 1.5; }
- .lock-messages p:last-child { margin: 0; }
-
.init-box {
background: var(--color-card);
border: 1px solid var(--color-secondary);
@@ -137,15 +129,13 @@
margin-top: 0.6rem;
}
- #finisherBox {
- background: linear-gradient(135deg, rgba(233,69,96,0.15), rgba(155,89,182,0.12));
- border: 1px solid rgba(233,69,96,0.4);
- border-radius: 14px;
- padding: 1.5rem;
+ #levelTrophy {
+ font-size: 3.5rem;
+ line-height: 72px;
+ width: 72px;
+ height: 72px;
text-align: center;
}
- #finisherBox .trophy { font-size: 2.5rem; margin-bottom: 0.5rem; }
- #finisherBox h2 { font-size: 1.1rem; margin: 0 0 0.75rem; color: var(--color-primary); }
@@ -156,11 +146,9 @@
![Level]()
+
🏆
-
-
-
@@ -201,38 +189,50 @@
-
🔓 Sperre aufgehoben
+
🔓 Zeitstrafe verbüßt
-
-
🔓 Temporäre Öffnung erforderlich
-
-
-
Entsperrcode
-
+
+
+
🔓 Entsperrcode
+
+
+
+
+
-
-
+
+
+
🔒 Lock schließen
+
+
Nutze den Entsperrcode um den Schlüssel wieder zu verschließen.
+
+
+
+
+
+
+
-
-
🏆
-
Level 6 erreicht!
-
-
-
-
-
-
-
00:00
-
+
@@ -251,6 +251,17 @@
+
+
+
Bestätigung
+
+
+
+
+
+
+
+
-
-
-
-
Bestätigung
-
-
-
-
-
-
-