xinyin025/OpenIsle
1
0
Fork 0
mirror of https://github.com/nagisa77/OpenIsle.git synced 2026-06-05 05:16:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into codex/integrate-browser-notifications-for-website

Browse Source
This commit is contained in:
Tim
2025-07-30 11:39:58 +08:00
parent aa138afe61 02b0628bfc
commit fe79a5481a
8 changed files with 125 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,6 +4,8 @@ import com.openisle.model.*;
import com.openisle.repository.NotificationRepository;
import com.openisle.repository.UserRepository;
import lombok.RequiredArgsConstructor;
import com.openisle.service.EmailSender;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -14,8 +16,12 @@ import java.util.List;
public class NotificationService {
private final NotificationRepository notificationRepository;
private final UserRepository userRepository;
private final EmailSender emailSender;
private final PushNotificationService pushNotificationService;
@Value("${app.website-url}")
private String websiteUrl;
public Notification createNotification(User user, NotificationType type, Post post, Comment comment, Boolean approved) {
return createNotification(user, type, post, comment, approved, null, null, null);
}
@@ -31,9 +37,15 @@ public class NotificationService {
n.setFromUser(fromUser);
n.setReactionType(reactionType);
n.setContent(content);
Notification saved = notificationRepository.save(n);
n = notificationRepository.save(n);
pushNotificationService.sendNotification(user, "You have a new notification");
return saved;
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);
}
return n;
}
/**