openclawd/config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix calendar: expand recurring events, strip XML-encoded carriage returns

Browse source
This commit is contained in:
Hoid 2026-02-18 07:41:20 +00:00
parent 27d8f16313
commit f896561771
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
bin/calendar
View file

@ -31,9 +31,14 @@ function caldavRequest(startDate, endDate) {
const url = new URL(`/remote.php/dav/calendars/${USER}/${CALENDAR}/`, BASE_URL); const url = new URL(`/remote.php/dav/calendars/${USER}/${CALENDAR}/`, BASE_URL);
const auth = Buffer.from(`${USER}:${PASS}`).toString('base64'); const auth = Buffer.from(`${USER}:${PASS}`).toString('base64');
// Use calendar-multiget with expand to get expanded recurrences
const body = `<?xml version="1.0" encoding="UTF-8"?> const body = `<?xml version="1.0" encoding="UTF-8"?>
<c:calendar-query xmlns:d="DAV:" xmlns:c="urn:ietf:params:xml:ns:caldav"> <c:calendar-query xmlns:d="DAV:" xmlns:c="urn:ietf:params:xml:ns:caldav">
<d:prop><c:calendar-data/></d:prop> <d:prop>
<c:calendar-data>
<c:expand start="${startDate}" end="${endDate}"/>
</c:calendar-data>
</d:prop>
<c:filter> <c:filter>
<c:comp-filter name="VCALENDAR"> <c:comp-filter name="VCALENDAR">
<c:comp-filter name="VEVENT"> <c:comp-filter name="VEVENT">
@ -68,15 +73,17 @@ function caldavRequest(startDate, endDate) {
function parseEvents(xmlData) { function parseEvents(xmlData) {
const events = []; const events = [];
// Strip carriage returns (raw and XML-encoded) from entire response
xmlData = xmlData.replace(/\r/g, '').replace(/&#13;/g, '');
const eventBlocks = xmlData.split('BEGIN:VEVENT'); const eventBlocks = xmlData.split('BEGIN:VEVENT');
for (let i = 1; i < eventBlocks.length; i++) { for (let i = 1; i < eventBlocks.length; i++) {
const block = eventBlocks[i].split('END:VEVENT')[0]; const block = eventBlocks[i].split('END:VEVENT')[0];
const get = (key) => { const get = (key) => {
// Handle both folded and unfolded lines // Handle both folded and unfolded lines, strip \r
const regex = new RegExp(`${key}[^:]*:(.+?)(?:\\r?\\n(?! ))`, 's'); const regex = new RegExp(`${key}[^:]*:(.+?)(?:\\r?\\n(?! ))`, 's');
const m = block.match(regex); const m = block.match(regex);
return m ? m[1].replace(/\r?\n\s/g, '').trim() : null; return m ? m[1].replace(/\r?\n\s/g, '').replace(/\r/g, '').trim() : null;
}; };
const summary = get('SUMMARY'); const summary = get('SUMMARY');