fix(dav): expand recurrences when searching

Signed-off-by: Richard Steinmetz <[email protected]>

Author: st3iny

apps/dav/lib/CalDAV/CalDavBackend.php

@@ -20,6 +20,7 @@
  * @author Thomas Citharel <[email protected]>
  * @author Thomas Müller <[email protected]>
  * @author Vinicius Cubas Brand <[email protected]>
+ * @author Richard Steinmetz <[email protected]>
  *
  * @license AGPL-3.0
  *
@@ -1959,8 +1960,18 @@ public function search(array $calendarInfo, $pattern, array $searchProperties,
 		});
 		$result->closeCursor();
 
-		return array_map(function ($o) {
+		return array_map(function ($o) use ($options) {
 			$calendarData = Reader::read($o['calendardata']);
+
+			// Expand recurrences if an explicit time range is requested
+			if ($calendarData instanceof VCalendar
+				&& isset($options['timerange']['start'], $options['timerange']['end'])) {
+				$calendarData = $calendarData->expand(
+					$options['timerange']['start'],
+					$options['timerange']['end'],
+				);
+			}
+
 			$comps = $calendarData->getComponents();
 			$objects = [];
 			$timezones = [];