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-17] fixing meetup failing to create if no location is provided

Browse Source
This commit is contained in:
Sheldan
2023-02-22 16:16:08 +01:00
parent c70815f25d
commit f78ab3372e
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
application/sissi-modules/meetup/src/main/java/dev/sheldan/sissi/module/meetup/commands/CreateMeetup.java
View File

@@ -73,6 +73,7 @@ public class CreateMeetup extends AbstractConditionableCommand {
private static final String DESCRIPTION_PARAMETER = "description"; private static final String DESCRIPTION_PARAMETER = "description";
private static final String LOCATION_PARAMETER = "location"; private static final String LOCATION_PARAMETER = "location";
private static final String CONFIRMATION_TEMPLATE = "createMeetup_confirmation"; private static final String CONFIRMATION_TEMPLATE = "createMeetup_confirmation";
private static final String DEFAULT_LOCATION_STRING = "\"\"";
@Override @Override
public CompletableFuture<CommandResult> executeAsync(CommandContext commandContext) { public CompletableFuture<CommandResult> executeAsync(CommandContext commandContext) {
@@ -87,7 +88,7 @@ public class CreateMeetup extends AbstractConditionableCommand {
} }
AUserInAServer organizer = userInServerManagementService.loadOrCreateUser(commandContext.getAuthor()); AUserInAServer organizer = userInServerManagementService.loadOrCreateUser(commandContext.getAuthor());
AChannel meetupChannel = channelManagementService.loadChannel(commandContext.getChannel().getIdLong()); 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 confirmationId = componentService.generateComponentId();
String cancelId = componentService.generateComponentId(); String cancelId = componentService.generateComponentId();
MeetupConfirmationModel model = MeetupConfirmationModel MeetupConfirmationModel model = MeetupConfirmationModel
@@ -124,7 +125,7 @@ public class CreateMeetup extends AbstractConditionableCommand {
if(slashCommandParameterService.hasCommandOption(LOCATION_PARAMETER, event)) { if(slashCommandParameterService.hasCommandOption(LOCATION_PARAMETER, event)) {
location = slashCommandParameterService.getCommandOption(LOCATION_PARAMETER, event, String.class); location = slashCommandParameterService.getCommandOption(LOCATION_PARAMETER, event, String.class);
} else { } else {
location = null; location = DEFAULT_LOCATION_STRING;
} }
Instant meetupTime = Instant.ofEpochSecond(time); Instant meetupTime = Instant.ofEpochSecond(time);
AUserInAServer organizer = userInServerManagementService.loadOrCreateUser(event.getMember()); AUserInAServer organizer = userInServerManagementService.loadOrCreateUser(event.getMember());