Skip to content

[FIX] "수다"를 "피드"로 변경 #327

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 23, 2025
Merged

[FIX] "수다"를 "피드"로 변경 #327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7657f32
[FIX] 푸시알림 내용 수다글에서 글로 변경
rinarina0429 Mar 23, 2025
0167933
[FIX] hiddenMessage 수다글에서 글로 변경
rinarina0429 Mar 23, 2025
bd2ed4b
[FIX] 그 외 서버에서 쓰이는 용어 변경 ex.디스코드알림
rinarina0429 Mar 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/main/java/org/websoso/WSSServer/domain/common/DiscordMessageTemplate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,18 @@
public enum DiscordMessageTemplate {

FEED_REPORT(
"```[%s] 🚨 수다 %s 신고 접수 🚨\n\n"
"```[%s] 🚨 피드 %s 신고 접수 🚨\n\n"
+ "📌 [신고 정보]\n"
+ "- 신고한 유저: %s (ID: %d)\n\n"
+ "💬 [신고된 수다]\n"
+ "💬 [신고된 피드]\n"
+ "- 작성자: %s (ID: %d)\n"
+ "- 내용: %s\n\n"
+ "🔔 [처리 상태]\n"
+ "- 신고 횟수: 총 %d회\n"
+ "- %s\n```"),

COMMENT_REPORT(
"```[%s] 🚨 수다 댓글 %s 신고 접수 🚨\n\n"
"```[%s] 🚨 피드 댓글 %s 신고 접수 🚨\n\n"
+ "📌 [신고 정보]\n"
+ "- 신고한 유저: %s (ID: %d)\n\n"
+ "💬 [신고된 댓글]\n"
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/websoso/WSSServer/domain/common/NotificationTypeGroup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
public enum NotificationTypeGroup {

NOTICE("공지사항", "이벤트"),
FEED("지금뜨는수다글", "댓글", "좋아요");
FEED("지금뜨는글", "댓글", "좋아요");

private final Set<String> types;

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/websoso/WSSServer/service/CommentService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ private void sendCommentPushMessageToFeedOwner(User user, Feed feed) {
NotificationType notificationTypeComment = notificationTypeRepository.findByNotificationTypeName("댓글");

String notificationTitle = createNotificationTitle(feed);
String notificationBody = String.format("%s님이 내 수다글에 댓글을 남겼어요.", user.getNickname());
String notificationBody = String.format("%s님이 내 글에 댓글을 남겼어요.", user.getNickname());
Long feedId = feed.getFeedId();

Notification notification = Notification.create(
Expand Down Expand Up @@ -138,7 +138,7 @@ private void sendCommentPushMessageToCommenters(User user, Feed feed) {
NotificationType notificationTypeComment = notificationTypeRepository.findByNotificationTypeName("댓글");

String notificationTitle = createNotificationTitle(feed);
String notificationBody = "내가 댓글 단 수다글에 또 다른 댓글이 달렸어요.";
String notificationBody = "내가 댓글 단 글에 또 다른 댓글이 달렸어요.";
Long feedId = feed.getFeedId();

commenters.forEach(commenter -> {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/websoso/WSSServer/service/FeedService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ private void sendLikePushMessage(User liker, Feed feed) {
NotificationType notificationTypeComment = notificationTypeRepository.findByNotificationTypeName("좋아요");

String notificationTitle = createNotificationTitle(feed);
String notificationBody = String.format("%s님이 내 수다글을 좋아해요.", liker.getNickname());
String notificationBody = String.format("%s님이 내 글을 좋아해요.", liker.getNickname());
Long feedId = feed.getFeedId();

Notification notification = Notification.create(
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/websoso/WSSServer/service/MessageFormatter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ public class MessageFormatter {
public static String formatFeedReportMessage(User user, Feed feed, ReportedType reportedType, int reportedCount,
boolean isHidden) {
String hiddenMessage = isHidden
? "해당 수다는 숨김 처리되었습니다."
: "해당 수다는 숨김 처리되지 않았습니다.";
? "해당 글은 숨김 처리되었습니다."
: "해당 글은 숨김 처리되지 않았습니다.";
return String.format(
FEED_REPORT.getTemplate(),
DiscordMessageTemplate.getCurrentDateTime(),
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/websoso/WSSServer/service/PopularFeedService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@ public void createPopularFeed(Feed feed) {
}

private void sendPopularFeedPushMessage(Feed feed) {
NotificationType notificationTypeComment = notificationTypeRepository.findByNotificationTypeName("지금뜨는수다글");
NotificationType notificationTypeComment = notificationTypeRepository.findByNotificationTypeName("지금뜨는글");

User feedOwner = feed.getUser();
Long feedId = feed.getFeedId();
String notificationTitle = "지금 뜨는 수다글 등극\uD83D\uDE4C";
String notificationTitle = "지금 뜨는 글 등극\uD83D\uDE4C";
String notificationBody = createNotificationBody(feed);

Notification notification = Notification.create(
Expand Down
Loading