diff --git a/_events/0_A meeting template.md b/_events/0_A meeting template.md index 4556f26d6..bbadbb0b2 100644 --- a/_events/0_A meeting template.md +++ b/_events/0_A meeting template.md @@ -30,10 +30,8 @@ recurrence-exceptions: # - yyyy-mm-dd recurrence-additions: # List of date-times on which the event is additionally taking place. Format: -# - start: yyyy-mm-dd hh:mm -# end: yyyy-mm-dd hh:mm -# - start: yyyy-mm-dd hh:mm -# end: yyyy-mm-dd hh:mm +# - yyyy-mm-dd hh:mm +# - yyyy-mm-dd hh:mm location: # Required. Must be an osm.org relation ID or the text 'online'. location-label: diff --git a/_events/community-meeting.md b/_events/community-meeting.md index 1746f99ad..2c136ceb0 100644 --- a/_events/community-meeting.md +++ b/_events/community-meeting.md @@ -13,8 +13,7 @@ recurrence-rule: FREQ=MONTHLY;BYDAY=SA;BYSETPOS=2 recurrence-exceptions: - 2022-10-08 recurrence-additions: -- start: 2022-10-22 16:00 - end: 2022-10-22 17:00 +- 2022-10-22 16:00 location: online location-label: AntennaPod's Jitsi Meet more-information: https://forum.antennapod.org/t/monthly-community-call/1869 diff --git a/events-with-RDATE.ics b/events-with-RDATE.ics deleted file mode 100644 index cc95f5fdd..000000000 --- a/events-with-RDATE.ics +++ /dev/null @@ -1,102 +0,0 @@ ---- -layout: null ---- -BEGIN:VCALENDAR -CALSCALE:GREGORIAN -VERSION:2.0 -PRODID:-//AntennaPod//Website events section 0.1//EN -LAST-MODIFIED:{{ 'now' | date: "%Y%m%dT%H%M00Z"}} -NAME:AntennaPod - -{%- assign recurringevents = site.events | sort: 'datetime-start' | reverse | where:"recurring", true %} -{%- assign normalevents = site.events | sort: 'datetime-start' | reverse | where:"recurring", false %} -{%- assign events = recurringevents | concat: normalevents %} - -{%- for event in events -%}{% if event.unlisted != true %} -BEGIN:VEVENT -DTSTAMP:{{ event.datetime-start | date: "%Y%m%dT%H%M00Z" }}{% if event.sequence %} -SEQUENCE:{{ event.sequence }}{% endif %} -UID:{{ event.uid | upcase }} -DTSTART -{%- if event.timezone -%};TZID={{ event.timezone }}{% endif %}: -{{- event.datetime-start | date: "%Y%m%dT%H%M00" }}{% unless event.timezone %}Z{% endunless %} -DTEND -{%- if event.timezone -%};TZID={{ event.timezone }}{% endif %}: -{{- event.datetime-end | date: "%Y%m%dT%H%M00" }}{% unless event.timezone %}Z{% endunless %} -STATUS:CONFIRMED -SUMMARY:{{ event.title }} - -{%- capture description %} -DESCRIPTION: -{{- event.content | remove_last: '

' | replace: '

','\n\n' | strip_html | replace:',','\,' | replace:':','\:' | replace:';','\;' | strip_newlines }} -{%- if event.location == 'online' %}{% if event.location-label %}\n\n{{ event.meeting-room }}{% endif %}{% endif %} -{%- endcapture %} -{%- assign description = description | replace: '\n\n\n\n','\n\n' %} - -{%- assign descriptionChars = description.size %} -{%- assign descriptionTotalRows = descriptionChars | divided_by: 74.00 | ceil %} -{%- assign descriptionChars = descriptionChars | plus: descriptionTotalRows %} -{%- assign descriptionTotalRows = descriptionChars | divided_by: 74.00 | ceil %} -{%- assign descriptionChars = descriptionChars | minus: descriptionTotalRows %} -{%- assign start = 0 %} -{%- assign separator = '\||/' %} -{%- assign descriptionWorker = '' %} - -{%- for rowToBe in (1..descriptionTotalRows) %} - {%- if descriptionChars <= 74 %} - {%- assign descriptionWorker = description %} - {%- break %} - {%- else %} - {%- assign descriptionRow = description | slice: start, 73 | prepend: ' ' | append: separator %} - {%- assign descriptionWorker = descriptionWorker | append: descriptionRow %} - {%- assign start = start | plus: 73 %} - {%- endif %} -{%- endfor %} - -{%- if descriptionChars > 74 %} - {%- assign descriptionWorker = descriptionWorker | lstrip %} - {%- assign lastChar = descriptionWorker.size | minus: separator.size %} - {%- assign descriptionWorker = descriptionWorker | slice: 0, lastChar %} - {%- assign descriptionArray = descriptionWorker | split: separator %} -{%- endif %} - -{%- for descriptionLine in descriptionArray %} -{{ descriptionLine }} -{%- endfor %} -LOCATION:{% if event.location-label %}{{ event.location-label }} -{%- elsif event.location == 'online' %}{{ event.meeting-room }} -{%- else %}{{ site.data.event-links[location].url }}{{ event.location }} -{%- endif %}{% if event.location == 'online' %} -URL:{{ event.meeting-room }} -CONFERENCE:{{ event.meeting-room }} -{%- endif %}{% if event.recurring == true %} -RRULE:{{ event.recurrence-rule -}} -{%- endif %}{% if event.recurrence-exceptions %} -EXDATE -{%- if event.timezone -%};TZID={{ event.timezone }}{% endif %}: -{%- for exception in event.recurrence-exceptions %} -{{- exception | date: "%Y%m%d" }}T{{ event.datetime-start | date: "%H%M00" }}{% unless event.timezone %}Z{% endunless %} -{%- unless forloop.last %},{% endunless %} -{%- endfor -%} -{%- endif %}{% if event.recurrence-additions %} -RDATE;VALUE=PERIOD -{%- if event.timezone -%};TZID={{ event.timezone }}{% endif %}: -{%- for extra-occurrence in event.recurrence-additions %} -{{- extra-occurrence.start | date: "%Y%m%dT%H%M00" }}{% unless event.timezone %}Z{% endunless %}/ -{{- extra-occurrence.end | date: "%Y%m%dT%H%M00" }}{% unless event.timezone %}Z{% endunless %} -{%- unless forloop.last %},{% endunless %} -{%- endfor -%} -{%- endif %} -END:VEVENT -{%- endif %} -{%- endfor %}{%- for timezone in site.data.ics-timezones %} -BEGIN:VTIMEZONE -TZID:{{ timezone[0] }} -{%- comment %} Following is unfortunately necessary to ensure that CRLF is used for EOL, as Jekyll uses LF when printing an array value in build process on Unix machine {% endcomment %} -{%- assign timezoneDefinitionArray = timezone[1] | split: ' ' %} -{%- for definitionLine in timezoneDefinitionArray %} -{{ definitionLine }} -{%- endfor %} -END:VTIMEZONE -{%- endfor %} -END:VCALENDAR diff --git a/events.ics b/events.ics index a4ee19f88..d729bca5c 100644 --- a/events.ics +++ b/events.ics @@ -78,6 +78,12 @@ EXDATE {{- exception | date: "%Y%m%d" }}T{{ event.datetime-start | date: "%H%M00" }}{% unless event.timezone %}Z{% endunless %} {%- unless forloop.last %},{% endunless %} {%- endfor -%} +{%- endif %}{% if event.recurrence-additions %} +RDATE{%- if event.timezone -%};TZID={{ event.timezone }}{% endif %}: +{%- for extra-occurrence in event.recurrence-additions %} +{{- extra-occurrence | date: "%Y%m%dT%H%M00" }}{% unless event.timezone %}Z{% endunless %} +{%- unless forloop.last %},{% endunless %} +{%- endfor -%} {%- endif %} END:VEVENT {%- endif %}