Fixes fuer unseren Kalender auf der website #57
No reviewers
Labels
No labels
Compat/Breaking
Kind/Bug
Kind/Documentation
Kind/Enhancement
Kind/Feature
Kind/Security
Kind/Testing
Priority
Critical
Priority
High
Priority
Low
Priority
Medium
Reviewed
Confirmed
Reviewed
Duplicate
Reviewed
Invalid
Reviewed
Won't Fix
Status
Abandoned
Status
Blocked
Status
Need More Info
No milestone
No project
No assignees
1 participant
Notifications
Due date
No due date set.
Dependencies
No dependencies set
Reference
cccb-website-team/www!57
Loading…
Reference in a new issue
No description provided.
Delete branch "hauke/www:kalender"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
An occurrence of a recurring event that was changed on its own carries a RECURRENCE-ID and is stored as an additional VEVENT next to the event it belongs to. `getAllSubcomponents("vevent")` returns those components as well, and since they have no RRULE of their own they were handled as separate single events. The occurrence therefore ended up in the list twice: once from expanding the recurring event, which resolves the modified time through the exception, and once more from the extra VEVENT. To make it worse the two rows disagreed, because name and URL were taken from the recurring event while the time came from the modification, so the first row showed the new time under the old name. Skip components that are a recurrence exception, they are already covered by the event they modify, and take name and URL from the occurrence details, which point at the modification where there is one and at the event itself otherwise. Events whose RECURRENCE-ID refers to an event that is not in the file are dropped by this, which cannot happen in a full calendar export. The published calendar currently contains no RECURRENCE-ID at all, so nothing changes for it today. It is exported from a CalDAV server though, and moving a single Club Discordia or Plenum out of the way of a holiday is exactly what creates such a modification. With a recurring Plenum whose 25.08. occurrence is moved two hours earlier and renamed: before: 25.08. 18:00 CCCB Plenum 25.08. 18:00 CCCB Plenum (verschoben) after: 25.08. 18:00 CCCB Plenum (verschoben) Fixes:c28f04c6e8("switch to ics files; make calendars work; fix some minor issues") Assisted-by: Claude:claude-opus-5 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>The response of the fetch went to the parser without ever looking at it. When the calendar could not be loaded the error page of the web server was parsed as a calendar, which threw inside a promise nobody was waiting on. The result was an empty table, an unhandled rejection in the console and an error message about broken calendar syntax that says nothing about the actual problem, a calendar that is not there. Refuse a response that is not ok, naming the status, and log failures in the chain, like the calendar page already does. before: Uncaught (in promise) Error: invalid line (no token ";" or ":") "<html>404 Not Found</html>" after: Fehler beim Laden der Termine: Error: /calendars/all.ics: 404 Not Found The table stays empty either way, there is nothing to show without a calendar. Fixes:c28f04c6e8("switch to ics files; make calendars work; fix some minor issues") Assisted-by: Claude:claude-opus-5 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>The calendar page brought its own ICS parser and its own RRULE expansion. Both only covered the cases that happened to be needed when they were written, and the calendar has moved on since. Against the published calendar, for September 2026: Spieleabend FREQ=WEEKLY;INTERVAL=2;BYDAY=SA shown 05. 12. 19. 26., correct 05. 19. CCCB Plenum FREQ=MONTHLY;BYDAY=TU;BYSETPOS=2 shown 01., correct 08. CCCB Plenum FREQ=MONTHLY;BYDAY=TU;BYSETPOS=4 shown 01., correct 22. INTERVAL was only read for monthly rules, so the Spieleabend was shown twice as often as it takes place. BYSETPOS was not implemented at all, and since parseInt("TU") is NaN the fallback turned both Plenum rules into "first Tuesday", putting two Plenums on a day without one and none on the two days with one. UNTIL, COUNT, EXDATE, RECURRENCE-ID, BYMONTHDAY and a BYDAY listing more than one weekday were not handled either. The text was no better. Content lines longer than 75 characters are continued on the next line, of which there are 477 in the calendar, and the parser did not join them, so it cut values off in the middle of a word. It also split every line at the first colon, which lands inside the parameter of DESCRIPTION;ALTREP="data:text/html,...". And it never resolved the escaping, so "\n" was shown as those two characters. 30 of 31 descriptions were wrong: before: "Der Club Discordia ist ein öffentliches Treffen in den Clubr" after: "Der Club Discordia ist ein öffentliches Treffen in den Clubräumen des CCC Berlin" Hand the parsing and the expansion to ical.js, which is vendored for the start page anyway. The month view now asks the library for the occurrences that touch the month, which removes the reimplementation along with all of the above. While the events are being reduced to what the view needs: - An event is entered on every day it covers, so the Amateurfunk trip from 30.10. to 01.11. is no longer marked on 30.10. alone. The end of an event is not part of it, so one ending at midnight stays on the day before. - Days and times are derived in Europe/Berlin instead of from the digits of the ICS string. Every event currently carries TZID=Europe/Berlin, so the wall clock time shown does not change, but a UTC timestamp would have been shown in UTC. - The URL of the event is used for the link in the detail panel. Events without one are shown without a link, as on the start page. This replaces createEventLink(), which guessed URLs from the title and was never called, and the panel no longer builds an <h> element, which is not an element. Descriptions may contain line breaks, so keep them in the panel. Fixes: 4068fab5b1ea ("improved calendar and fixed url temporarily") Assisted-by: Claude:claude-opus-5 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>The two columns of the table on the start page touched each other, so the entry read "Donnerstag, 27.08., 19:00 UhrClub Discordia". The table is created with the classes "table table-condensed", which no stylesheet of the site defines, and the table styling that the theme applies inside prose addresses "tbody td". The table is delivered empty and its rows are added through the DOM, where a tr appended to a table stays a direct child instead of being put into a tbody the way the HTML parser would. The rows are therefore outside of any tbody and the padding of the theme never applied. Give the column holding the date its own padding, and keep the date on one line, it is one piece of information and reads badly broken after the weekday. The padding alone does not fit, though. The table stands in a prose column that the theme limits to 65 characters so that running text stays readable, and a date and the name of an event next to each other are wider than that, so the names would be wrapped over several lines. Lift the limit off the column and put it back on everything in it except the table, which leaves the table room to grow while the heading and the paragraph around it keep their width. That much space then has to be filled sensibly. The theme lays a table out as a block, "table { display: block; overflow: auto }", so that a wide one can be scrolled sideways, and a block fills its parent instead of shrinking to its content the way a table does. Spanning the page the entries would all sit at its left edge. Ask for the width of the content with fit-content, which the automatic margins then centre. Addressing the table by its id keeps all of this to the start page and takes precedence over the theme, whose prose rules are written with :where() and carry no specificity. Measured in a browser at 1280, 768 and 500 pixels: date and name share one line at the first two, the table is 602 pixels wide with the same distance left and right, and at 500 the column is narrower than the table, so the table fills it and only the longest name wraps. The page never scrolls sideways. Fixes:c28f04c6e8("switch to ics files; make calendars work; fix some minor issues") Assisted-by: Claude:claude-opus-5 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>cf9dd30905tod3201792a4d3201792a4to98c3207c0098c3207c00tofad1e6be61fad1e6be61to6782da49d4