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-22] fixing always url encoding the location for meetups

Browse Source
This commit is contained in:
Sheldan
2023-07-10 01:31:21 +02:00
parent e6cccef48d
commit ac815b5972
3 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
application/sissi-modules/meetup/src/main/java/dev/sheldan/sissi/module/meetup/model/template/MeetupMessageModel.java
View File

@@ -16,6 +16,7 @@ public class MeetupMessageModel {
private String description; private String description;
private Instant meetupTime; private Instant meetupTime;
private String location; private String location;
private String decodedLocation;
private MemberDisplay organizer; private MemberDisplay organizer;
private Long meetupId; private Long meetupId;
private String yesId; private String yesId;

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

@@ -176,11 +176,13 @@ public class MeetupServiceBean {
.stream() .stream()
.filter(meetupParticipator -> meetupParticipator.getDecision().equals(MeetupDecision.NO_TIME)) .filter(meetupParticipator -> meetupParticipator.getDecision().equals(MeetupDecision.NO_TIME))
.collect(Collectors.toList()); .collect(Collectors.toList());
String rawLocation = java.net.URLDecoder.decode(meetup.getLocation(), StandardCharsets.UTF_8);
return MeetupMessageModel return MeetupMessageModel
.builder() .builder()
.description(meetup.getDescription()) .description(meetup.getDescription())
.topic(meetup.getTopic()) .topic(meetup.getTopic())
.location(meetup.getLocation()) .location(meetup.getLocation())
.decodedLocation(rawLocation)
.noTimeId(meetup.getNoTimeButtonId()) .noTimeId(meetup.getNoTimeButtonId())
.yesId(meetup.getYesButtonId()) .yesId(meetup.getYesButtonId())
.maybeId(meetup.getMaybeButtonId()) .maybeId(meetup.getMaybeButtonId())

2
templates/sissi-templates/module-templates/meetup-templates/src/main/resources/en_US/general/meetup_ice_file_download_en_US.ftl
View File

@@ -8,6 +8,6 @@ DTSTART:${meetupIcsModel.icsFormattedStartTime}
DTEND:${meetupIcsModel.icsFormattedEndTime} DTEND:${meetupIcsModel.icsFormattedEndTime}
SUMMARY:${topic} SUMMARY:${topic}
<#if description?has_content>DESCRIPTION:${description}</#if> <#if description?has_content>DESCRIPTION:${description}</#if>
<#if location?? && location != "%22%22">LOCATION:${location}</#if> <#if decodedLocation?? && decodedLocation != "">LOCATION:${decodedLocation}</#if>
END:VEVENT END:VEVENT
END:VCALENDAR END:VCALENDAR