From f78ab3372ed58a3a930597ac8a73fdeb9c54dc6a Mon Sep 17 00:00:00 2001 From: Sheldan <5037282+Sheldan@users.noreply.github.com> Date: Wed, 22 Feb 2023 16:16:08 +0100 Subject: [PATCH] [SIS-17] fixing meetup failing to create if no location is provided --- .../sheldan/sissi/module/meetup/commands/CreateMeetup.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/application/sissi-modules/meetup/src/main/java/dev/sheldan/sissi/module/meetup/commands/CreateMeetup.java b/application/sissi-modules/meetup/src/main/java/dev/sheldan/sissi/module/meetup/commands/CreateMeetup.java index cf530a2a..18e85753 100644 --- a/application/sissi-modules/meetup/src/main/java/dev/sheldan/sissi/module/meetup/commands/CreateMeetup.java +++ b/application/sissi-modules/meetup/src/main/java/dev/sheldan/sissi/module/meetup/commands/CreateMeetup.java @@ -73,6 +73,7 @@ public class CreateMeetup extends AbstractConditionableCommand { private static final String DESCRIPTION_PARAMETER = "description"; private static final String LOCATION_PARAMETER = "location"; private static final String CONFIRMATION_TEMPLATE = "createMeetup_confirmation"; + private static final String DEFAULT_LOCATION_STRING = "\"\""; @Override public CompletableFuture executeAsync(CommandContext commandContext) { @@ -87,7 +88,7 @@ public class CreateMeetup extends AbstractConditionableCommand { } AUserInAServer organizer = userInServerManagementService.loadOrCreateUser(commandContext.getAuthor()); AChannel meetupChannel = channelManagementService.loadChannel(commandContext.getChannel().getIdLong()); - Meetup meetup = meetupManagementServiceBean.createMeetup(meetupTime, meetupTopic, description, organizer, meetupChannel, null); + Meetup meetup = meetupManagementServiceBean.createMeetup(meetupTime, meetupTopic, description, organizer, meetupChannel, DEFAULT_LOCATION_STRING); String confirmationId = componentService.generateComponentId(); String cancelId = componentService.generateComponentId(); MeetupConfirmationModel model = MeetupConfirmationModel @@ -124,7 +125,7 @@ public class CreateMeetup extends AbstractConditionableCommand { if(slashCommandParameterService.hasCommandOption(LOCATION_PARAMETER, event)) { location = slashCommandParameterService.getCommandOption(LOCATION_PARAMETER, event, String.class); } else { - location = null; + location = DEFAULT_LOCATION_STRING; } Instant meetupTime = Instant.ofEpochSecond(time); AUserInAServer organizer = userInServerManagementService.loadOrCreateUser(event.getMember());