Sheldan/Sissi
1
0
Fork 0
mirror of https://github.com/Sheldan/Sissi.git synced 2026-01-26 19:21:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

[SIS-3] adding separator for the meetup members

Browse Source 
adding member counter to message display
only notify member with yes/maybe decision of meetup cancellation
This commit is contained in:
Sheldan
2022-06-20 19:15:30 +02:00
parent 6ae631c78d
commit 533c9e3a63
2 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
application/sissi-modules/meetup/src/main/java/dev/sheldan/sissi/module/meetup/service/MeetupServiceBean.java
View File

@@ -147,12 +147,18 @@ public class MeetupServiceBean {
Meetup meetup = meetupManagementServiceBean.getMeetup(meetupId, serverId); Meetup meetup = meetupManagementServiceBean.getMeetup(meetupId, serverId);
MeetupMessageModel model = getMeetupMessageModel(meetup); MeetupMessageModel model = getMeetupMessageModel(meetup);
MessageToSend messageToSend = templateService.renderEmbedTemplate(MEETUP_CANCELLATION_TEMPLATE, model); MessageToSend messageToSend = templateService.renderEmbedTemplate(MEETUP_CANCELLATION_TEMPLATE, model);
meetup.getParticipants().forEach(meetupParticipator -> { meetup
Long userId = meetupParticipator.getParticipator().getUserReference().getId(); .getParticipants()
userService.retrieveUserForId(userId) .stream()
.thenCompose(user -> messageService.sendMessageToSendToUser(user, messageToSend)) .filter(meetupParticipator ->
.thenAccept(message -> log.info("Notified user {} about cancellation of meetup {} in server {}.", userId, meetupId, serverId)); meetupParticipator.getDecision().equals(MeetupDecision.MAYBE) ||
}); meetupParticipator.getDecision().equals(MeetupDecision.YES))
.forEach(meetupParticipator -> {
Long userId = meetupParticipator.getParticipator().getUserReference().getId();
userService.retrieveUserForId(userId)
.thenCompose(user -> messageService.sendMessageToSendToUser(user, messageToSend))
.thenAccept(message -> log.info("Notified user {} about cancellation of meetup {} in server {}.", userId, meetupId, serverId));
});
} }
@Transactional @Transactional
@@ -209,11 +215,11 @@ public class MeetupServiceBean {
meetupParticipator.getDecision().equals(MeetupDecision.MAYBE) || meetupParticipator.getDecision().equals(MeetupDecision.MAYBE) ||
meetupParticipator.getDecision().equals(MeetupDecision.YES)) meetupParticipator.getDecision().equals(MeetupDecision.YES))
.forEach(meetupParticipator -> { .forEach(meetupParticipator -> {
Long userId = meetupParticipator.getParticipator().getUserReference().getId(); Long userId = meetupParticipator.getParticipator().getUserReference().getId();
userService.retrieveUserForId(userId) userService.retrieveUserForId(userId)
.thenCompose(user -> messageService.sendMessageToSendToUser(user, messageToSend)) .thenCompose(user -> messageService.sendMessageToSendToUser(user, messageToSend))
.thenAccept(message -> log.info("Notified user {} about incoming meetup {} in server {}.", userId, meetupId, serverId)); .thenAccept(message -> log.info("Notified user {} about incoming meetup {} in server {}.", userId, meetupId, serverId));
}); });
} }
@Transactional @Transactional

6
templates/sissi-templates/module-templates/meetup-templates/src/main/resources/en_US/general/meetup_display_embed_en_US.ftl
View File

@@ -11,9 +11,9 @@
<#assign time><@format_instant_date_time instant=meetupTime/></#assign> <#assign time><@format_instant_date_time instant=meetupTime/></#assign>
<#assign timeRelative><@format_instant_relative instant=meetupTime/></#assign> <#assign timeRelative><@format_instant_relative instant=meetupTime/></#assign>
<#assign descriptionText>${description?json_string}</#assign> <#assign descriptionText>${description?json_string}</#assign>
<#assign participantsText><#list participants as member>${member.memberMention}<#else><#include "meetup_message_no_member"></#list></#assign> <#assign participantsText> (${participants?size}) <#list participants as member>${member.memberMention}<#sep>, </#sep><#else><#include "meetup_message_no_member"></#list></#assign>
<#assign maybeParticipantsText><#list maybeParticipants as member>${member.memberMention}<#else><#include "meetup_message_no_member"></#list></#assign> <#assign maybeParticipantsText> (${maybeParticipants?size}) <#list maybeParticipants as member>${member.memberMention}<#sep>, </#sep><#else><#include "meetup_message_no_member"></#list></#assign>
<#assign declinedParticipantsText><#list declinedParticipants as member>${member.memberMention}<#else><#include "meetup_message_no_member"></#list></#assign> <#assign declinedParticipantsText> (${declinedParticipants?size}) <#list declinedParticipants as member>${member.memberMention}<#sep>, </#sep><#else><#include "meetup_message_no_member"></#list></#assign>
"description": "<#if cancelled>~~</#if><#include "meetup_display_description"><#if cancelled>~~</#if>" "description": "<#if cancelled>~~</#if><#include "meetup_display_description"><#if cancelled>~~</#if>"
} }
], ],