Bugfixes im Dating und im Profil
Some checks failed
Host-Based Deploy (Java 21 Fix) / build-and-run (push) Has been cancelled
Some checks failed
Host-Based Deploy (Java 21 Fix) / build-and-run (push) Has been cancelled
This commit is contained in:
@@ -57,8 +57,9 @@ public class SystemMessageService {
|
||||
.findByUserIdAndCause(receiverId, cause)
|
||||
.orElseGet(() -> NotificationPreferenceEntity.defaultFor(receiverId, cause));
|
||||
|
||||
// FRIENDREQUEST und INVITATION sind immer nur in-app, kein E-Mail
|
||||
boolean sendInApp = cause == MessageCause.FRIENDREQUEST || cause == MessageCause.INVITATION || pref.isInApp();
|
||||
// FRIENDREQUEST, INVITATION und DATE_INTEREST sind immer nur in-app, kein E-Mail
|
||||
boolean sendInApp = cause == MessageCause.FRIENDREQUEST || cause == MessageCause.INVITATION
|
||||
|| cause == MessageCause.DATE_INTEREST || pref.isInApp();
|
||||
|
||||
if (sendInApp) {
|
||||
MessageEntity msg = new MessageEntity();
|
||||
@@ -76,7 +77,7 @@ public class SystemMessageService {
|
||||
sseService.push(receiverId, "NOTIFICATION", Map.of("unreadCount", unread, "text", text));
|
||||
}
|
||||
|
||||
if (pref.isEmail() && cause != MessageCause.INVITATION) {
|
||||
if (pref.isEmail() && cause != MessageCause.INVITATION && cause != MessageCause.DATE_INTEREST) {
|
||||
userRepository.findById(receiverId).ifPresent(user -> {
|
||||
try {
|
||||
Email email = new Email();
|
||||
@@ -107,6 +108,7 @@ public class SystemMessageService {
|
||||
case EMERGENCY -> "XXX The Game – ⚠️ Notfall";
|
||||
case FRIENDREQUEST -> "XXX The Game – Neue Freundschaftsanfrage";
|
||||
case SUPPORT -> "xXx Sphere – Nachricht vom Support";
|
||||
case DATE_INTEREST -> "xXx Sphere – Interesse an deinem Date";
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user