jiazhizhong/OpenIsle
1
0
Fork 0
mirror of https://github.com/nagisa77/OpenIsle.git synced 2026-04-21 19:37:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: 邮件、讯息通知

Browse Source
This commit is contained in:
Tim
2025-07-30 12:06:23 +08:00
parent fb010607f1
commit 748f7f9709
2 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/com/openisle/service/NotificationService.java
View File

@@ -2,6 +2,7 @@ package com.openisle.service;
import com.openisle.model.*; import com.openisle.model.*;
import com.openisle.repository.NotificationRepository; import com.openisle.repository.NotificationRepository;
import com.openisle.repository.ReactionRepository;
import com.openisle.repository.UserRepository; import com.openisle.repository.UserRepository;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import com.openisle.service.EmailSender; import com.openisle.service.EmailSender;
@@ -20,6 +21,7 @@ public class NotificationService {
private final UserRepository userRepository; private final UserRepository userRepository;
private final EmailSender emailSender; private final EmailSender emailSender;
private final PushNotificationService pushNotificationService; private final PushNotificationService pushNotificationService;
private final ReactionRepository reactionRepository;
@Value("${app.website-url}") @Value("${app.website-url}")
private String websiteUrl; private String websiteUrl;
@@ -56,16 +58,28 @@ public class NotificationService {
n.setContent(content); n.setContent(content);
n = notificationRepository.save(n); n = notificationRepository.save(n);
String body = "You have a new notification";
String url = websiteUrl + "/messages";
if (type == NotificationType.COMMENT_REPLY && post != null && comment != null) {
body = "有人回复了你";
url = String.format("%s/posts/%d#comment-%d", websiteUrl, post.getId(), comment.getId());
}
sendCustomPush(user, body, url);
if (type == NotificationType.COMMENT_REPLY && user.getEmail() != null && post != null && comment != null) { if (type == NotificationType.COMMENT_REPLY && user.getEmail() != null && post != null && comment != null) {
String url = String.format("%s/posts/%d#comment-%d", websiteUrl, post.getId(), comment.getId());
emailSender.sendEmail(user.getEmail(), "【OpenIsle】有人回复了你", url); emailSender.sendEmail(user.getEmail(), "【OpenIsle】有人回复了你", url);
sendCustomPush(user, "有人回复了你", url);
} else if (type == NotificationType.REACTION && comment != null) {
long count = reactionRepository.countReceived(comment.getAuthor().getUsername());
if (count % 5 == 0) {
String url = websiteUrl + "/messages";
sendCustomPush(comment.getAuthor(), "你有新的互动", url);
if (comment.getAuthor().getEmail() != null) {
emailSender.sendEmail(comment.getAuthor().getEmail(), "【OpenIsle】你有新的互动", url);
}
}
} else if (type == NotificationType.REACTION && post != null) {
long count = reactionRepository.countReceived(post.getAuthor().getUsername());
if (count % 5 == 0) {
String url = websiteUrl + "/messages";
sendCustomPush(post.getAuthor(), "你有新的互动", url);
if (post.getAuthor().getEmail() != null) {
emailSender.sendEmail(post.getAuthor().getEmail(), "【OpenIsle】你有新的互动", url);
}
}
} }
return n; return n;

16
src/main/java/com/openisle/service/ReactionService.java
View File

@@ -47,14 +47,6 @@ public class ReactionService {
reaction = reactionRepository.save(reaction); reaction = reactionRepository.save(reaction);
if (!user.getId().equals(post.getAuthor().getId())) { if (!user.getId().equals(post.getAuthor().getId())) {
notificationService.createNotification(post.getAuthor(), NotificationType.REACTION, post, null, null, user, type, null); notificationService.createNotification(post.getAuthor(), NotificationType.REACTION, post, null, null, user, type, null);
long count = reactionRepository.countReceived(post.getAuthor().getUsername());
if (count % 5 == 0) {
String url = websiteUrl + "/messages";
notificationService.sendCustomPush(post.getAuthor(), "你有新的互动", url);
if (post.getAuthor().getEmail() != null) {
emailSender.sendEmail(post.getAuthor().getEmail(), "【OpenIsle】你有新的互动", url);
}
}
} }
return reaction; return reaction;
} }
@@ -78,14 +70,6 @@ public class ReactionService {
reaction = reactionRepository.save(reaction); reaction = reactionRepository.save(reaction);
if (!user.getId().equals(comment.getAuthor().getId())) { if (!user.getId().equals(comment.getAuthor().getId())) {
notificationService.createNotification(comment.getAuthor(), NotificationType.REACTION, comment.getPost(), comment, null, user, type, null); notificationService.createNotification(comment.getAuthor(), NotificationType.REACTION, comment.getPost(), comment, null, user, type, null);
long count = reactionRepository.countReceived(comment.getAuthor().getUsername());
if (count % 5 == 0) {
String url = websiteUrl + "/messages";
notificationService.sendCustomPush(comment.getAuthor(), "你有新的互动", url);
if (comment.getAuthor().getEmail() != null) {
emailSender.sendEmail(comment.getAuthor().getEmail(), "【OpenIsle】你有新的互动", url);
}
}
} }
return reaction; return reaction;
} }