Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@ public GroupChatMessageResponse sendMessage(Integer clubId, Integer userId, Stri
Integer messageId = message.getId();
Integer senderId = sender.getId();
String senderName = sender.getName();
String clubName = room.getClub().getName();
String messageContent = message.getContent();
LocalDateTime createdAt = message.getCreatedAt();

Expand All @@ -170,6 +171,7 @@ public GroupChatMessageResponse sendMessage(Integer clubId, Integer userId, Stri
notificationService.sendGroupChatNotification(
roomId,
senderId,
clubName,
senderName,
messageContent,
filteredRecipients
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ public void sendChatNotification(Integer receiverId, Integer roomId, String send

String truncatedBody = buildPreview(messageContent);
Map<String, Object> data = new HashMap<>();
data.put("path", "chats/rooms/" + roomId + "?type=DIRECT");
data.put("path", "chats/rooms/" + roomId);

List<ExpoPushMessage> messages = tokens.stream()
.map(token -> new ExpoPushMessage(token, senderName, truncatedBody, data))
Expand Down Expand Up @@ -197,6 +197,7 @@ public void sendChatNotification(Integer receiverId, Integer roomId, String send
public void sendGroupChatNotification(
Integer roomId,
Integer senderId,
String clubName,
String senderName,
String messageContent,
List<Integer> recipientUserIds
Expand All @@ -213,8 +214,9 @@ public void sendGroupChatNotification(
}

String truncatedBody = buildPreview(messageContent);
String previewBody = senderName + ": " + truncatedBody;
Map<String, Object> data = new HashMap<>();
data.put("path", "chats/rooms/" + roomId + "?type=GROUP");
data.put("path", "chats/rooms/" + roomId);

for (Integer recipientId : filteredRecipients) {
try {
Expand All @@ -235,7 +237,7 @@ public void sendGroupChatNotification(
}

List<ExpoPushMessage> messages = tokens.stream()
.map(token -> new ExpoPushMessage(token, senderName, truncatedBody, data))
.map(token -> new ExpoPushMessage(token, clubName, previewBody, data))
.toList();

HttpHeaders headers = new HttpHeaders();
Expand Down