Skip to content

Commit 5de9aff

Browse files
authored
Merge pull request #327 from Team-WSS/fix/#326
[FIX] "수다"를 "피드"로 변경
2 parents 56bbbfc + bd2ed4b commit 5de9aff

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

src/main/java/org/websoso/WSSServer/domain/common/DiscordMessageTemplate.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,18 @@
1010
public enum DiscordMessageTemplate {
1111

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

2323
COMMENT_REPORT(
24-
"```[%s] 🚨 수다 댓글 %s 신고 접수 🚨\n\n"
24+
"```[%s] 🚨 피드 댓글 %s 신고 접수 🚨\n\n"
2525
+ "📌 [신고 정보]\n"
2626
+ "- 신고한 유저: %s (ID: %d)\n\n"
2727
+ "💬 [신고된 댓글]\n"

src/main/java/org/websoso/WSSServer/domain/common/NotificationTypeGroup.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
public enum NotificationTypeGroup {
88

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

1212
private final Set<String> types;
1313

src/main/java/org/websoso/WSSServer/service/CommentService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ private void sendCommentPushMessageToFeedOwner(User user, Feed feed) {
6464
NotificationType notificationTypeComment = notificationTypeRepository.findByNotificationTypeName("댓글");
6565

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

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

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

144144
commenters.forEach(commenter -> {

src/main/java/org/websoso/WSSServer/service/FeedService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ private void sendLikePushMessage(User liker, Feed feed) {
137137
NotificationType notificationTypeComment = notificationTypeRepository.findByNotificationTypeName("좋아요");
138138

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

143143
Notification notification = Notification.create(

src/main/java/org/websoso/WSSServer/service/MessageFormatter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ public class MessageFormatter {
1919
public static String formatFeedReportMessage(User user, Feed feed, ReportedType reportedType, int reportedCount,
2020
boolean isHidden) {
2121
String hiddenMessage = isHidden
22-
? "해당 수다는 숨김 처리되었습니다."
23-
: "해당 수다는 숨김 처리되지 않았습니다.";
22+
? "해당 글은 숨김 처리되었습니다."
23+
: "해당 글은 숨김 처리되지 않았습니다.";
2424
return String.format(
2525
FEED_REPORT.getTemplate(),
2626
DiscordMessageTemplate.getCurrentDateTime(),

src/main/java/org/websoso/WSSServer/service/PopularFeedService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ public void createPopularFeed(Feed feed) {
4141
}
4242

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

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

5151
Notification notification = Notification.create(

0 commit comments

Comments
 (0)