mirror of
https://github.com/Sheldan/Sissi.git
synced 2026-01-26 19:21:43 +00:00
[SIS-xxx] fixing cancelling a meetup trying to insert a wrong decision
This commit is contained in:
@@ -49,9 +49,13 @@ public class MeetupDecisionListener implements ButtonClickedListener {
|
|||||||
public ButtonClickedListenerResult execute(ButtonClickedListenerModel model) {
|
public ButtonClickedListenerResult execute(ButtonClickedListenerModel model) {
|
||||||
MeetupDecisionPayload payload = (MeetupDecisionPayload) model.getDeserializedPayload();
|
MeetupDecisionPayload payload = (MeetupDecisionPayload) model.getDeserializedPayload();
|
||||||
Meetup meetup = meetupManagementServiceBean.getMeetup(payload.getMeetupId(), payload.getGuildId());
|
Meetup meetup = meetupManagementServiceBean.getMeetup(payload.getMeetupId(), payload.getGuildId());
|
||||||
if(payload.getMeetupDecision().equals(MeetupDecision.CANCEL) && model.getEvent().getUser().getIdLong() == meetup.getOrganizer().getUserReference().getId()) {
|
if(payload.getMeetupDecision().equals(MeetupDecision.CANCEL)) {
|
||||||
meetupServiceBean.cancelMeetup(meetup, payload.getComponentPayloads());
|
if(model.getEvent().getUser().getIdLong() == meetup.getOrganizer().getUserReference().getId()) {
|
||||||
return ButtonClickedListenerResult.ACKNOWLEDGED;
|
meetupServiceBean.cancelMeetup(meetup, payload.getComponentPayloads());
|
||||||
|
return ButtonClickedListenerResult.ACKNOWLEDGED;
|
||||||
|
} else {
|
||||||
|
return ButtonClickedListenerResult.IGNORED;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
AUserInAServer userInAServer = userInServerManagementService.loadOrCreateUser(model.getEvent().getMember());
|
AUserInAServer userInAServer = userInServerManagementService.loadOrCreateUser(model.getEvent().getMember());
|
||||||
|
|
||||||
@@ -64,12 +68,12 @@ public class MeetupDecisionListener implements ButtonClickedListener {
|
|||||||
MeetupMessageModel meetupMessageModel = meetupServiceBean.getMeetupMessageModel(meetup);
|
MeetupMessageModel meetupMessageModel = meetupServiceBean.getMeetupMessageModel(meetup);
|
||||||
addParticipationToModel(meetupMessageModel, userInAServer, payload.getMeetupDecision());
|
addParticipationToModel(meetupMessageModel, userInAServer, payload.getMeetupDecision());
|
||||||
MessageToSend messageToSend = meetupServiceBean.getMeetupMessage(meetupMessageModel);
|
MessageToSend messageToSend = meetupServiceBean.getMeetupMessage(meetupMessageModel);
|
||||||
channelService.editEmbedMessageInAChannel(messageToSend.getEmbeds().get(0), model.getEvent().getChannel(), meetup.getMessageId()).thenAccept(message -> {
|
channelService.editEmbedMessageInAChannel(messageToSend.getEmbeds().get(0), model.getEvent().getChannel(), meetup.getMessageId())
|
||||||
log.info("Updated message of meetup {} in channel {} in server {}.", meetup.getId().getId(), meetup.getMeetupChannel().getId(), meetup.getServer().getId());
|
.thenAccept(message -> log.info("Updated message of meetup {} in channel {} in server {}.", meetup.getId().getId(), meetup.getMeetupChannel().getId(), meetup.getServer().getId()))
|
||||||
}).exceptionally(throwable -> {
|
.exceptionally(throwable -> {
|
||||||
log.info("Failed to update message of meetup {} in channel {} in server {}.", meetup.getId().getId(), meetup.getMeetupChannel().getId(), meetup.getServer().getId(), throwable);
|
log.info("Failed to update message of meetup {} in channel {} in server {}.", meetup.getId().getId(), meetup.getMeetupChannel().getId(), meetup.getServer().getId(), throwable);
|
||||||
return null;
|
return null;
|
||||||
});
|
});
|
||||||
return ButtonClickedListenerResult.ACKNOWLEDGED;
|
return ButtonClickedListenerResult.ACKNOWLEDGED;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user