nextcloud / server

apps/dav/lib/CalDAV/Schedule/IMipPlugin.php

Indentation +261 added lines, -261 removed lines

@@ -46,175 +46,175 @@ 
  */
 class IMipPlugin extends SabreIMipPlugin {
 	
-	private ?VCalendar $vCalendar = null;
-	public const MAX_DATE = '2038-01-01';
-	public const METHOD_REQUEST = 'request';
-	public const METHOD_REPLY = 'reply';
-	public const METHOD_CANCEL = 'cancel';
-	public const IMIP_INDENT = 15;
-
-	public function __construct(
-		private IAppConfig $config,
-		private IMailer $mailer,
-		private LoggerInterface $logger,
-		private ITimeFactory $timeFactory,
-		private Defaults $defaults,
-		private IUserSession $userSession,
-		private IMipService $imipService,
-		private EventComparisonService $eventComparisonService,
-		private IMailManager $mailManager,
-	) {
-		parent::__construct('');
-	}
-
-	public function initialize(DAV\Server $server): void {
-		parent::initialize($server);
-		$server->on('beforeWriteContent', [$this, 'beforeWriteContent'], 10);
-	}
-
-	/**
-	 * Check quota before writing content
-	 *
-	 * @param string $uri target file URI
-	 * @param INode $node Sabre Node
-	 * @param resource $data data
-	 * @param bool $modified modified
-	 */
-	public function beforeWriteContent($uri, INode $node, $data, $modified): void {
-		if (!$node instanceof CalendarObject) {
-			return;
-		}
-		/** @var VCalendar $vCalendar */
-		$vCalendar = Reader::read($node->get());
-		$this->setVCalendar($vCalendar);
-	}
-
-	/**
-	 * Event handler for the 'schedule' event.
-	 *
-	 * @param Message $iTipMessage
-	 * @return void
-	 */
-	public function schedule(Message $iTipMessage) {
-
-		// Not sending any emails if the system considers the update insignificant
-		if (!$iTipMessage->significantChange) {
-			if (!$iTipMessage->scheduleStatus) {
-				$iTipMessage->scheduleStatus = '1.0;We got the message, but it\'s not significant enough to warrant an email';
-			}
-			return;
-		}
-
-		if (parse_url($iTipMessage->sender, PHP_URL_SCHEME) !== 'mailto'
-			|| parse_url($iTipMessage->recipient, PHP_URL_SCHEME) !== 'mailto') {
-			return;
-		}
-
-		// don't send out mails for events that already took place
-		$lastOccurrence = $this->imipService->getLastOccurrence($iTipMessage->message);
-		$currentTime = $this->timeFactory->getTime();
-		if ($lastOccurrence < $currentTime) {
-			return;
-		}
-
-		// Strip off mailto:
-		$recipient = substr($iTipMessage->recipient, 7);
-		if (!$this->mailer->validateMailAddress($recipient)) {
-			// Nothing to send if the recipient doesn't have a valid email address
-			$iTipMessage->scheduleStatus = '5.0; EMail delivery failed';
-			return;
-		}
-		$recipientName = $iTipMessage->recipientName ? (string)$iTipMessage->recipientName : null;
-
-		$newEvents = $iTipMessage->message;
-		$oldEvents = $this->getVCalendar();
-
-		$modified = $this->eventComparisonService->findModified($newEvents, $oldEvents);
-		/** @var VEvent $vEvent */
-		$vEvent = array_pop($modified['new']);
-		/** @var VEvent $oldVevent */
-		$oldVevent = !empty($modified['old']) && is_array($modified['old']) ? array_pop($modified['old']) : null;
-		$isModified = isset($oldVevent);
-
-		// No changed events after all - this shouldn't happen if there is significant change yet here we are
-		// The scheduling status is debatable
-		if (empty($vEvent)) {
-			$this->logger->warning('iTip message said the change was significant but comparison did not detect any updated VEvents');
-			$iTipMessage->scheduleStatus = '1.0;We got the message, but it\'s not significant enough to warrant an email';
-			return;
-		}
-
-		// we (should) have one event component left
-		// as the ITip\Broker creates one iTip message per change
-		// and triggers the "schedule" event once per message
-		// we also might not have an old event as this could be a new
-		// invitation, or a new recurrence exception
-		$attendee = $this->imipService->getCurrentAttendee($iTipMessage);
-		if ($attendee === null) {
-			$uid = $vEvent->UID ?? 'no UID found';
-			$this->logger->debug('Could not find recipient ' . $recipient . ' as attendee for event with UID ' . $uid);
-			$iTipMessage->scheduleStatus = '5.0; EMail delivery failed';
-			return;
-		}
-		// Don't send emails to rooms, resources and circles
-		if ($this->imipService->isRoomOrResource($attendee)
-				|| $this->imipService->isCircle($attendee)) {
-			$this->logger->debug('No invitation sent as recipient is room, resource or circle', [
-				'attendee' => $recipient,
-			]);
-			$iTipMessage->scheduleStatus = '1.0;We got the message, but it\'s not significant enough to warrant an email';
-			return;
-		}
-		$this->imipService->setL10n($attendee);
-
-		// Build the sender name.
-		// Due to a bug in sabre, the senderName property for an iTIP message can actually also be a VObject Property
-		// If the iTIP message senderName is null or empty use the user session name as the senderName
-		if (($iTipMessage->senderName instanceof Parameter) && !empty(trim($iTipMessage->senderName->getValue()))) {
-			$senderName = trim($iTipMessage->senderName->getValue());
-		} elseif (is_string($iTipMessage->senderName) && !empty(trim($iTipMessage->senderName))) {
-			$senderName = trim($iTipMessage->senderName);
-		} elseif ($this->userSession->getUser() !== null) {
-			$senderName = trim($this->userSession->getUser()->getDisplayName());
-		} else {
-			$senderName = '';
-		}
-
-		$sender = substr($iTipMessage->sender, 7);
-
-		$replyingAttendee = null;
-		switch (strtolower($iTipMessage->method)) {
-			case self::METHOD_REPLY:
-				$method = self::METHOD_REPLY;
-				$data = $this->imipService->buildBodyData($vEvent, $oldVevent);
-				$replyingAttendee = $this->imipService->getReplyingAttendee($iTipMessage);
-				break;
-			case self::METHOD_CANCEL:
-				$method = self::METHOD_CANCEL;
-				$data = $this->imipService->buildCancelledBodyData($vEvent);
-				break;
-			default:
-				$method = self::METHOD_REQUEST;
-				$data = $this->imipService->buildBodyData($vEvent, $oldVevent);
-				break;
-		}
-
-		$data['attendee_name'] = ($recipientName ?: $recipient);
-		$data['invitee_name'] = ($senderName ?: $sender);
-
-		$fromEMail = Util::getDefaultEmailAddress('invitations-noreply');
-		$fromName = $this->imipService->getFrom($senderName, $this->defaults->getName());
-
-		$template = $this->mailer->createEMailTemplate('dav.calendarInvite.' . $method, $data);
-		$template->addHeader();
-
-		$this->imipService->addSubjectAndHeading($template, $method, $data['invitee_name'], $data['meeting_title'], $isModified, $replyingAttendee);
-		$this->imipService->addBulletList($template, $vEvent, $data);
-
-		// Only add response buttons to invitation requests: Fix Issue #11230
-		if (strcasecmp($method, self::METHOD_REQUEST) === 0 && $this->imipService->getAttendeeRsvpOrReqForParticipant($attendee)) {
-
-			/*
+    private ?VCalendar $vCalendar = null;
+    public const MAX_DATE = '2038-01-01';
+    public const METHOD_REQUEST = 'request';
+    public const METHOD_REPLY = 'reply';
+    public const METHOD_CANCEL = 'cancel';
+    public const IMIP_INDENT = 15;
+
+    public function __construct(
+        private IAppConfig $config,
+        private IMailer $mailer,
+        private LoggerInterface $logger,
+        private ITimeFactory $timeFactory,
+        private Defaults $defaults,
+        private IUserSession $userSession,
+        private IMipService $imipService,
+        private EventComparisonService $eventComparisonService,
+        private IMailManager $mailManager,
+    ) {
+        parent::__construct('');
+    }
+
+    public function initialize(DAV\Server $server): void {
+        parent::initialize($server);
+        $server->on('beforeWriteContent', [$this, 'beforeWriteContent'], 10);
+    }
+
+    /**
+     * Check quota before writing content
+     *
+     * @param string $uri target file URI
+     * @param INode $node Sabre Node
+     * @param resource $data data
+     * @param bool $modified modified
+     */
+    public function beforeWriteContent($uri, INode $node, $data, $modified): void {
+        if (!$node instanceof CalendarObject) {
+            return;
+        }
+        /** @var VCalendar $vCalendar */
+        $vCalendar = Reader::read($node->get());
+        $this->setVCalendar($vCalendar);
+    }
+
+    /**
+     * Event handler for the 'schedule' event.
+     *
+     * @param Message $iTipMessage
+     * @return void
+     */
+    public function schedule(Message $iTipMessage) {
+
+        // Not sending any emails if the system considers the update insignificant
+        if (!$iTipMessage->significantChange) {
+            if (!$iTipMessage->scheduleStatus) {
+                $iTipMessage->scheduleStatus = '1.0;We got the message, but it\'s not significant enough to warrant an email';
+            }
+            return;
+        }
+
+        if (parse_url($iTipMessage->sender, PHP_URL_SCHEME) !== 'mailto'
+            || parse_url($iTipMessage->recipient, PHP_URL_SCHEME) !== 'mailto') {
+            return;
+        }
+
+        // don't send out mails for events that already took place
+        $lastOccurrence = $this->imipService->getLastOccurrence($iTipMessage->message);
+        $currentTime = $this->timeFactory->getTime();
+        if ($lastOccurrence < $currentTime) {
+            return;
+        }
+
+        // Strip off mailto:
+        $recipient = substr($iTipMessage->recipient, 7);
+        if (!$this->mailer->validateMailAddress($recipient)) {
+            // Nothing to send if the recipient doesn't have a valid email address
+            $iTipMessage->scheduleStatus = '5.0; EMail delivery failed';
+            return;
+        }
+        $recipientName = $iTipMessage->recipientName ? (string)$iTipMessage->recipientName : null;
+
+        $newEvents = $iTipMessage->message;
+        $oldEvents = $this->getVCalendar();
+
+        $modified = $this->eventComparisonService->findModified($newEvents, $oldEvents);
+        /** @var VEvent $vEvent */
+        $vEvent = array_pop($modified['new']);
+        /** @var VEvent $oldVevent */
+        $oldVevent = !empty($modified['old']) && is_array($modified['old']) ? array_pop($modified['old']) : null;
+        $isModified = isset($oldVevent);
+
+        // No changed events after all - this shouldn't happen if there is significant change yet here we are
+        // The scheduling status is debatable
+        if (empty($vEvent)) {
+            $this->logger->warning('iTip message said the change was significant but comparison did not detect any updated VEvents');
+            $iTipMessage->scheduleStatus = '1.0;We got the message, but it\'s not significant enough to warrant an email';
+            return;
+        }
+
+        // we (should) have one event component left
+        // as the ITip\Broker creates one iTip message per change
+        // and triggers the "schedule" event once per message
+        // we also might not have an old event as this could be a new
+        // invitation, or a new recurrence exception
+        $attendee = $this->imipService->getCurrentAttendee($iTipMessage);
+        if ($attendee === null) {
+            $uid = $vEvent->UID ?? 'no UID found';
+            $this->logger->debug('Could not find recipient ' . $recipient . ' as attendee for event with UID ' . $uid);
+            $iTipMessage->scheduleStatus = '5.0; EMail delivery failed';
+            return;
+        }
+        // Don't send emails to rooms, resources and circles
+        if ($this->imipService->isRoomOrResource($attendee)
+                || $this->imipService->isCircle($attendee)) {
+            $this->logger->debug('No invitation sent as recipient is room, resource or circle', [
+                'attendee' => $recipient,
+            ]);
+            $iTipMessage->scheduleStatus = '1.0;We got the message, but it\'s not significant enough to warrant an email';
+            return;
+        }
+        $this->imipService->setL10n($attendee);
+
+        // Build the sender name.
+        // Due to a bug in sabre, the senderName property for an iTIP message can actually also be a VObject Property
+        // If the iTIP message senderName is null or empty use the user session name as the senderName
+        if (($iTipMessage->senderName instanceof Parameter) && !empty(trim($iTipMessage->senderName->getValue()))) {
+            $senderName = trim($iTipMessage->senderName->getValue());
+        } elseif (is_string($iTipMessage->senderName) && !empty(trim($iTipMessage->senderName))) {
+            $senderName = trim($iTipMessage->senderName);
+        } elseif ($this->userSession->getUser() !== null) {
+            $senderName = trim($this->userSession->getUser()->getDisplayName());
+        } else {
+            $senderName = '';
+        }
+
+        $sender = substr($iTipMessage->sender, 7);
+
+        $replyingAttendee = null;
+        switch (strtolower($iTipMessage->method)) {
+            case self::METHOD_REPLY:
+                $method = self::METHOD_REPLY;
+                $data = $this->imipService->buildBodyData($vEvent, $oldVevent);
+                $replyingAttendee = $this->imipService->getReplyingAttendee($iTipMessage);
+                break;
+            case self::METHOD_CANCEL:
+                $method = self::METHOD_CANCEL;
+                $data = $this->imipService->buildCancelledBodyData($vEvent);
+                break;
+            default:
+                $method = self::METHOD_REQUEST;
+                $data = $this->imipService->buildBodyData($vEvent, $oldVevent);
+                break;
+        }
+
+        $data['attendee_name'] = ($recipientName ?: $recipient);
+        $data['invitee_name'] = ($senderName ?: $sender);
+
+        $fromEMail = Util::getDefaultEmailAddress('invitations-noreply');
+        $fromName = $this->imipService->getFrom($senderName, $this->defaults->getName());
+
+        $template = $this->mailer->createEMailTemplate('dav.calendarInvite.' . $method, $data);
+        $template->addHeader();
+
+        $this->imipService->addSubjectAndHeading($template, $method, $data['invitee_name'], $data['meeting_title'], $isModified, $replyingAttendee);
+        $this->imipService->addBulletList($template, $vEvent, $data);
+
+        // Only add response buttons to invitation requests: Fix Issue #11230
+        if (strcasecmp($method, self::METHOD_REQUEST) === 0 && $this->imipService->getAttendeeRsvpOrReqForParticipant($attendee)) {
+
+            /*
 			** Only offer invitation accept/reject buttons, which link back to the
 			** nextcloud server, to recipients who can access the nextcloud server via
 			** their internet/intranet.  Issue #12156
@@ -233,97 +233,97 @@ 
 			** To suppress URLs entirely, set invitation_link_recipients to boolean "no".
 			*/
 
-			$recipientDomain = substr(strrchr($recipient, '@'), 1);
-			$invitationLinkRecipients = explode(',', preg_replace('/\s+/', '', strtolower($this->config->getValueString('dav', 'invitation_link_recipients', 'yes'))));
-
-			if (strcmp('yes', $invitationLinkRecipients[0]) === 0
-				|| in_array(strtolower($recipient), $invitationLinkRecipients)
-				|| in_array(strtolower($recipientDomain), $invitationLinkRecipients)) {
-				$token = $this->imipService->createInvitationToken($iTipMessage, $vEvent, $lastOccurrence);
-				$this->imipService->addResponseButtons($template, $token);
-				$this->imipService->addMoreOptionsButton($template, $token);
-			}
-		}
-
-		$template->addFooter();
-		// convert iTip Message to string
-		$itip_msg = $iTipMessage->message->serialize();
-
-		$user = null;
-		$mailService = null;
-
-		try {
-			if ($this->config->getValueBool('core', 'mail_providers_enabled', true)) {
-				// retrieve user object
-				$user = $this->userSession->getUser();
-				if ($user !== null) {
-					// retrieve appropriate service with the same address as sender
-					$mailService = $this->mailManager->findServiceByAddress($user->getUID(), $sender);
-				}
-			}
-			// evaluate if a mail service was found and has sending capabilities
-			if ($mailService !== null && $mailService instanceof IMessageSend) {
-				// construct mail message and set required parameters
-				$message = $mailService->initiateMessage();
-				$message->setFrom(
-					(new Address($sender, $fromName))
-				);
-				$message->setTo(
-					(new Address($recipient, $recipientName))
-				);
-				$message->setSubject($template->renderSubject());
-				$message->setBodyPlain($template->renderText());
-				$message->setBodyHtml($template->renderHtml());
-				$message->setAttachments((new Attachment(
-					$itip_msg,
-					null,
-					'text/calendar; name=event.ics; method=' . $iTipMessage->method,
-					true
-				)));
-				// send message
-				$mailService->sendMessage($message);
-			} else {
-				// construct symfony mailer message and set required parameters
-				$message = $this->mailer->createMessage();
-				$message->setFrom([$fromEMail => $fromName]);
-				$message->setTo(
-					(($recipientName !== null) ? [$recipient => $recipientName] : [$recipient])
-				);
-				$message->setReplyTo(
-					(($senderName !== null) ? [$sender => $senderName] : [$sender])
-				);
-				$message->useTemplate($template);
-				$message->attachInline(
-					$itip_msg,
-					'event.ics',
-					'text/calendar; method=' . $iTipMessage->method
-				);
-				$failed = $this->mailer->send($message);
-			}
-
-			$iTipMessage->scheduleStatus = '1.1; Scheduling message is sent via iMip';
-			if (!empty($failed)) {
-				$this->logger->error('Unable to deliver message to {failed}', ['app' => 'dav', 'failed' => implode(', ', $failed)]);
-				$iTipMessage->scheduleStatus = '5.0; EMail delivery failed';
-			}
-		} catch (\Exception $ex) {
-			$this->logger->error($ex->getMessage(), ['app' => 'dav', 'exception' => $ex]);
-			$iTipMessage->scheduleStatus = '5.0; EMail delivery failed';
-		}
-	}
-
-	/**
-	 * @return ?VCalendar
-	 */
-	public function getVCalendar(): ?VCalendar {
-		return $this->vCalendar;
-	}
-
-	/**
-	 * @param ?VCalendar $vCalendar
-	 */
-	public function setVCalendar(?VCalendar $vCalendar): void {
-		$this->vCalendar = $vCalendar;
-	}
+            $recipientDomain = substr(strrchr($recipient, '@'), 1);
+            $invitationLinkRecipients = explode(',', preg_replace('/\s+/', '', strtolower($this->config->getValueString('dav', 'invitation_link_recipients', 'yes'))));
+
+            if (strcmp('yes', $invitationLinkRecipients[0]) === 0
+                || in_array(strtolower($recipient), $invitationLinkRecipients)
+                || in_array(strtolower($recipientDomain), $invitationLinkRecipients)) {
+                $token = $this->imipService->createInvitationToken($iTipMessage, $vEvent, $lastOccurrence);
+                $this->imipService->addResponseButtons($template, $token);
+                $this->imipService->addMoreOptionsButton($template, $token);
+            }
+        }
+
+        $template->addFooter();
+        // convert iTip Message to string
+        $itip_msg = $iTipMessage->message->serialize();
+
+        $user = null;
+        $mailService = null;
+
+        try {
+            if ($this->config->getValueBool('core', 'mail_providers_enabled', true)) {
+                // retrieve user object
+                $user = $this->userSession->getUser();
+                if ($user !== null) {
+                    // retrieve appropriate service with the same address as sender
+                    $mailService = $this->mailManager->findServiceByAddress($user->getUID(), $sender);
+                }
+            }
+            // evaluate if a mail service was found and has sending capabilities
+            if ($mailService !== null && $mailService instanceof IMessageSend) {
+                // construct mail message and set required parameters
+                $message = $mailService->initiateMessage();
+                $message->setFrom(
+                    (new Address($sender, $fromName))
+                );
+                $message->setTo(
+                    (new Address($recipient, $recipientName))
+                );
+                $message->setSubject($template->renderSubject());
+                $message->setBodyPlain($template->renderText());
+                $message->setBodyHtml($template->renderHtml());
+                $message->setAttachments((new Attachment(
+                    $itip_msg,
+                    null,
+                    'text/calendar; name=event.ics; method=' . $iTipMessage->method,
+                    true
+                )));
+                // send message
+                $mailService->sendMessage($message);
+            } else {
+                // construct symfony mailer message and set required parameters
+                $message = $this->mailer->createMessage();
+                $message->setFrom([$fromEMail => $fromName]);
+                $message->setTo(
+                    (($recipientName !== null) ? [$recipient => $recipientName] : [$recipient])
+                );
+                $message->setReplyTo(
+                    (($senderName !== null) ? [$sender => $senderName] : [$sender])
+                );
+                $message->useTemplate($template);
+                $message->attachInline(
+                    $itip_msg,
+                    'event.ics',
+                    'text/calendar; method=' . $iTipMessage->method
+                );
+                $failed = $this->mailer->send($message);
+            }
+
+            $iTipMessage->scheduleStatus = '1.1; Scheduling message is sent via iMip';
+            if (!empty($failed)) {
+                $this->logger->error('Unable to deliver message to {failed}', ['app' => 'dav', 'failed' => implode(', ', $failed)]);
+                $iTipMessage->scheduleStatus = '5.0; EMail delivery failed';
+            }
+        } catch (\Exception $ex) {
+            $this->logger->error($ex->getMessage(), ['app' => 'dav', 'exception' => $ex]);
+            $iTipMessage->scheduleStatus = '5.0; EMail delivery failed';
+        }
+    }
+
+    /**
+     * @return ?VCalendar
+     */
+    public function getVCalendar(): ?VCalendar {
+        return $this->vCalendar;
+    }
+
+    /**
+     * @param ?VCalendar $vCalendar
+     */
+    public function setVCalendar(?VCalendar $vCalendar): void {
+        $this->vCalendar = $vCalendar;
+    }
 
 }

apps/dav/lib/CalDAV/Schedule/IMipService.php

Indentation +1230 added lines, -1230 removed lines

@@ -27,1240 +27,1240 @@
 
 class IMipService {
 
-	private IL10N $l10n;
-
-	/** @var string[] */
-	private const STRING_DIFF = [
-		'meeting_title' => 'SUMMARY',
-		'meeting_description' => 'DESCRIPTION',
-		'meeting_url' => 'URL',
-		'meeting_location' => 'LOCATION'
-	];
-
-	public function __construct(
-		private URLGenerator $urlGenerator,
-		private IConfig $config,
-		private IDBConnection $db,
-		private ISecureRandom $random,
-		private L10NFactory $l10nFactory,
-		private ITimeFactory $timeFactory,
-	) {
-		$language = $this->l10nFactory->findGenericLanguage();
-		$locale = $this->l10nFactory->findLocale($language);
-		$this->l10n = $this->l10nFactory->get('dav', $language, $locale);
-	}
-
-	/**
-	 * @param string|null $senderName
-	 * @param string $default
-	 * @return string
-	 */
-	public function getFrom(?string $senderName, string $default): string {
-		if ($senderName === null) {
-			return $default;
-		}
-
-		return $this->l10n->t('%1$s via %2$s', [$senderName, $default]);
-	}
-
-	public static function readPropertyWithDefault(VEvent $vevent, string $property, string $default) {
-		if (isset($vevent->$property)) {
-			$value = $vevent->$property->getValue();
-			if (!empty($value)) {
-				return $value;
-			}
-		}
-		return $default;
-	}
-
-	private function generateDiffString(VEvent $vevent, VEvent $oldVEvent, string $property, string $default): ?string {
-		$strikethrough = "<span style='text-decoration: line-through'>%s</span><br />%s";
-		if (!isset($vevent->$property)) {
-			return $default;
-		}
-		$newstring = $vevent->$property->getValue();
-		if (isset($oldVEvent->$property) && $oldVEvent->$property->getValue() !== $newstring) {
-			$oldstring = $oldVEvent->$property->getValue();
-			return sprintf($strikethrough, $oldstring, $newstring);
-		}
-		return $newstring;
-	}
-
-	/**
-	 * Like generateDiffString() but linkifies the property values if they are urls.
-	 */
-	private function generateLinkifiedDiffString(VEvent $vevent, VEvent $oldVEvent, string $property, string $default): ?string {
-		if (!isset($vevent->$property)) {
-			return $default;
-		}
-		/** @var string|null $newString */
-		$newString = $vevent->$property->getValue();
-		$oldString = isset($oldVEvent->$property) ? $oldVEvent->$property->getValue() : null;
-		if ($oldString !== $newString) {
-			return sprintf(
-				"<span style='text-decoration: line-through'>%s</span><br />%s",
-				$this->linkify($oldString) ?? $oldString ?? '',
-				$this->linkify($newString) ?? $newString ?? ''
-			);
-		}
-		return $this->linkify($newString) ?? $newString;
-	}
-
-	/**
-	 * Convert a given url to a html link element or return null otherwise.
-	 */
-	private function linkify(?string $url): ?string {
-		if ($url === null) {
-			return null;
-		}
-		if (!str_starts_with($url, 'http://') && !str_starts_with($url, 'https://')) {
-			return null;
-		}
-
-		return sprintf('<a href="%1$s">%1$s</a>', htmlspecialchars($url));
-	}
-
-	/**
-	 * @param VEvent $vEvent
-	 * @param VEvent|null $oldVEvent
-	 * @return array
-	 */
-	public function buildBodyData(VEvent $vEvent, ?VEvent $oldVEvent): array {
-
-		// construct event reader
-		$eventReaderCurrent = new EventReader($vEvent);
-		$eventReaderPrevious = !empty($oldVEvent) ? new EventReader($oldVEvent) : null;
-		$defaultVal = '';
-		$data = [];
-		$data['meeting_when'] = $this->generateWhenString($eventReaderCurrent);
-
-		foreach (self::STRING_DIFF as $key => $property) {
-			$data[$key] = self::readPropertyWithDefault($vEvent, $property, $defaultVal);
-		}
-
-		$data['meeting_url_html'] = self::readPropertyWithDefault($vEvent, 'URL', $defaultVal);
-
-		if (($locationHtml = $this->linkify($data['meeting_location'])) !== null) {
-			$data['meeting_location_html'] = $locationHtml;
-		}
-
-		if (!empty($oldVEvent)) {
-			$oldMeetingWhen = $this->generateWhenString($eventReaderPrevious);
-			$data['meeting_title_html'] = $this->generateDiffString($vEvent, $oldVEvent, 'SUMMARY', $data['meeting_title']);
-			$data['meeting_description_html'] = $this->generateDiffString($vEvent, $oldVEvent, 'DESCRIPTION', $data['meeting_description']);
-			$data['meeting_location_html'] = $this->generateLinkifiedDiffString($vEvent, $oldVEvent, 'LOCATION', $data['meeting_location']);
-
-			$oldUrl = self::readPropertyWithDefault($oldVEvent, 'URL', $defaultVal);
-			$data['meeting_url_html'] = !empty($oldUrl) && $oldUrl !== $data['meeting_url'] ? sprintf('<a href="%1$s">%1$s</a>', $oldUrl) : $data['meeting_url'];
-
-			$data['meeting_when_html'] = $oldMeetingWhen !== $data['meeting_when'] ? sprintf("<span style='text-decoration: line-through'>%s</span><br />%s", $oldMeetingWhen, $data['meeting_when']) : $data['meeting_when'];
-		}
-		// generate occurring next string
-		if ($eventReaderCurrent->recurs()) {
-			$data['meeting_occurring'] = $this->generateOccurringString($eventReaderCurrent);
-		}
+    private IL10N $l10n;
+
+    /** @var string[] */
+    private const STRING_DIFF = [
+        'meeting_title' => 'SUMMARY',
+        'meeting_description' => 'DESCRIPTION',
+        'meeting_url' => 'URL',
+        'meeting_location' => 'LOCATION'
+    ];
+
+    public function __construct(
+        private URLGenerator $urlGenerator,
+        private IConfig $config,
+        private IDBConnection $db,
+        private ISecureRandom $random,
+        private L10NFactory $l10nFactory,
+        private ITimeFactory $timeFactory,
+    ) {
+        $language = $this->l10nFactory->findGenericLanguage();
+        $locale = $this->l10nFactory->findLocale($language);
+        $this->l10n = $this->l10nFactory->get('dav', $language, $locale);
+    }
+
+    /**
+     * @param string|null $senderName
+     * @param string $default
+     * @return string
+     */
+    public function getFrom(?string $senderName, string $default): string {
+        if ($senderName === null) {
+            return $default;
+        }
+
+        return $this->l10n->t('%1$s via %2$s', [$senderName, $default]);
+    }
+
+    public static function readPropertyWithDefault(VEvent $vevent, string $property, string $default) {
+        if (isset($vevent->$property)) {
+            $value = $vevent->$property->getValue();
+            if (!empty($value)) {
+                return $value;
+            }
+        }
+        return $default;
+    }
+
+    private function generateDiffString(VEvent $vevent, VEvent $oldVEvent, string $property, string $default): ?string {
+        $strikethrough = "<span style='text-decoration: line-through'>%s</span><br />%s";
+        if (!isset($vevent->$property)) {
+            return $default;
+        }
+        $newstring = $vevent->$property->getValue();
+        if (isset($oldVEvent->$property) && $oldVEvent->$property->getValue() !== $newstring) {
+            $oldstring = $oldVEvent->$property->getValue();
+            return sprintf($strikethrough, $oldstring, $newstring);
+        }
+        return $newstring;
+    }
+
+    /**
+     * Like generateDiffString() but linkifies the property values if they are urls.
+     */
+    private function generateLinkifiedDiffString(VEvent $vevent, VEvent $oldVEvent, string $property, string $default): ?string {
+        if (!isset($vevent->$property)) {
+            return $default;
+        }
+        /** @var string|null $newString */
+        $newString = $vevent->$property->getValue();
+        $oldString = isset($oldVEvent->$property) ? $oldVEvent->$property->getValue() : null;
+        if ($oldString !== $newString) {
+            return sprintf(
+                "<span style='text-decoration: line-through'>%s</span><br />%s",
+                $this->linkify($oldString) ?? $oldString ?? '',
+                $this->linkify($newString) ?? $newString ?? ''
+            );
+        }
+        return $this->linkify($newString) ?? $newString;
+    }
+
+    /**
+     * Convert a given url to a html link element or return null otherwise.
+     */
+    private function linkify(?string $url): ?string {
+        if ($url === null) {
+            return null;
+        }
+        if (!str_starts_with($url, 'http://') && !str_starts_with($url, 'https://')) {
+            return null;
+        }
+
+        return sprintf('<a href="%1$s">%1$s</a>', htmlspecialchars($url));
+    }
+
+    /**
+     * @param VEvent $vEvent
+     * @param VEvent|null $oldVEvent
+     * @return array
+     */
+    public function buildBodyData(VEvent $vEvent, ?VEvent $oldVEvent): array {
+
+        // construct event reader
+        $eventReaderCurrent = new EventReader($vEvent);
+        $eventReaderPrevious = !empty($oldVEvent) ? new EventReader($oldVEvent) : null;
+        $defaultVal = '';
+        $data = [];
+        $data['meeting_when'] = $this->generateWhenString($eventReaderCurrent);
+
+        foreach (self::STRING_DIFF as $key => $property) {
+            $data[$key] = self::readPropertyWithDefault($vEvent, $property, $defaultVal);
+        }
+
+        $data['meeting_url_html'] = self::readPropertyWithDefault($vEvent, 'URL', $defaultVal);
+
+        if (($locationHtml = $this->linkify($data['meeting_location'])) !== null) {
+            $data['meeting_location_html'] = $locationHtml;
+        }
+
+        if (!empty($oldVEvent)) {
+            $oldMeetingWhen = $this->generateWhenString($eventReaderPrevious);
+            $data['meeting_title_html'] = $this->generateDiffString($vEvent, $oldVEvent, 'SUMMARY', $data['meeting_title']);
+            $data['meeting_description_html'] = $this->generateDiffString($vEvent, $oldVEvent, 'DESCRIPTION', $data['meeting_description']);
+            $data['meeting_location_html'] = $this->generateLinkifiedDiffString($vEvent, $oldVEvent, 'LOCATION', $data['meeting_location']);
+
+            $oldUrl = self::readPropertyWithDefault($oldVEvent, 'URL', $defaultVal);
+            $data['meeting_url_html'] = !empty($oldUrl) && $oldUrl !== $data['meeting_url'] ? sprintf('<a href="%1$s">%1$s</a>', $oldUrl) : $data['meeting_url'];
+
+            $data['meeting_when_html'] = $oldMeetingWhen !== $data['meeting_when'] ? sprintf("<span style='text-decoration: line-through'>%s</span><br />%s", $oldMeetingWhen, $data['meeting_when']) : $data['meeting_when'];
+        }
+        // generate occurring next string
+        if ($eventReaderCurrent->recurs()) {
+            $data['meeting_occurring'] = $this->generateOccurringString($eventReaderCurrent);
+        }
 		
-		return $data;
-	}
-
-	/**
-	 * generates a when string based on if a event has an recurrence or not
-	 *
-	 * @since 30.0.0
-	 *
-	 * @param EventReader $er
-	 *
-	 * @return string
-	 */
-	public function generateWhenString(EventReader $er): string {
-		return match ($er->recurs()) {
-			true => $this->generateWhenStringRecurring($er),
-			false => $this->generateWhenStringSingular($er)
-		};
-	}
-
-	/**
-	 * generates a when string for a non recurring event
-	 *
-	 * @since 30.0.0
-	 *
-	 * @param EventReader $er
-	 *
-	 * @return string
-	 */
-	public function generateWhenStringSingular(EventReader $er): string {
-		// initialize
-		$startTime = null;
-		$endTime = null;
-		// calculate time difference from now to start of event
-		$occurring = $this->minimizeInterval($this->timeFactory->getDateTime()->diff($er->recurrenceDate()));
-		// extract start date
-		$startDate = $this->l10n->l('date', $er->startDateTime(), ['width' => 'full']);
-		// time of the day
-		if (!$er->entireDay()) {
-			$startTime = $this->l10n->l('time', $er->startDateTime(), ['width' => 'short']);
-			$startTime .= $er->startTimeZone() != $er->endTimeZone() ? ' (' . $er->startTimeZone()->getName() . ')' : '';
-			$endTime = $this->l10n->l('time', $er->endDateTime(), ['width' => 'short']) . ' (' . $er->endTimeZone()->getName() . ')';
-		}
-		// generate localized when string
-		// TRANSLATORS
-		// Indicates when a calendar event will happen, shown on invitation emails
-		// Output produced in order:
-		// In a minute/hour/day/week/month/year on July 1, 2024 for the entire day
-		// In a minute/hour/day/week/month/year on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)
-		// In 2 minutes/hours/days/weeks/months/years on July 1, 2024 for the entire day
-		// In 2 minutes/hours/days/weeks/months/years on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)
-		return match ([$occurring['scale'], $endTime !== null]) {
-			['past', false] => $this->l10n->t(
-				'In the past on %1$s for the entire day',
-				[$startDate]
-			),
-			['minute', false] => $this->l10n->n(
-				'In a minute on %1$s for the entire day',
-				'In %n minutes on %1$s for the entire day',
-				$occurring['interval'],
-				[$startDate]
-			),
-			['hour', false] => $this->l10n->n(
-				'In a hour on %1$s for the entire day',
-				'In %n hours on %1$s for the entire day',
-				$occurring['interval'],
-				[$startDate]
-			),
-			['day', false] => $this->l10n->n(
-				'In a day on %1$s for the entire day',
-				'In %n days on %1$s for the entire day',
-				$occurring['interval'],
-				[$startDate]
-			),
-			['week', false] => $this->l10n->n(
-				'In a week on %1$s for the entire day',
-				'In %n weeks on %1$s for the entire day',
-				$occurring['interval'],
-				[$startDate]
-			),
-			['month', false] => $this->l10n->n(
-				'In a month on %1$s for the entire day',
-				'In %n months on %1$s for the entire day',
-				$occurring['interval'],
-				[$startDate]
-			),
-			['year', false] => $this->l10n->n(
-				'In a year on %1$s for the entire day',
-				'In %n years on %1$s for the entire day',
-				$occurring['interval'],
-				[$startDate]
-			),
-			['past', true] => $this->l10n->t(
-				'In the past on %1$s between %2$s - %3$s',
-				[$startDate, $startTime, $endTime]
-			),
-			['minute', true] => $this->l10n->n(
-				'In a minute on %1$s between %2$s - %3$s',
-				'In %n minutes on %1$s between %2$s - %3$s',
-				$occurring['interval'],
-				[$startDate, $startTime, $endTime]
-			),
-			['hour', true] => $this->l10n->n(
-				'In a hour on %1$s between %2$s - %3$s',
-				'In %n hours on %1$s between %2$s - %3$s',
-				$occurring['interval'],
-				[$startDate, $startTime, $endTime]
-			),
-			['day', true] => $this->l10n->n(
-				'In a day on %1$s between %2$s - %3$s',
-				'In %n days on %1$s between %2$s - %3$s',
-				$occurring['interval'],
-				[$startDate, $startTime, $endTime]
-			),
-			['week', true] => $this->l10n->n(
-				'In a week on %1$s between %2$s - %3$s',
-				'In %n weeks on %1$s between %2$s - %3$s',
-				$occurring['interval'],
-				[$startDate, $startTime, $endTime]
-			),
-			['month', true] => $this->l10n->n(
-				'In a month on %1$s between %2$s - %3$s',
-				'In %n months on %1$s between %2$s - %3$s',
-				$occurring['interval'],
-				[$startDate, $startTime, $endTime]
-			),
-			['year', true] => $this->l10n->n(
-				'In a year on %1$s between %2$s - %3$s',
-				'In %n years on %1$s between %2$s - %3$s',
-				$occurring['interval'],
-				[$startDate, $startTime, $endTime]
-			),
-			default => $this->l10n->t('Could not generate when statement')
-		};
-	}
-
-	/**
-	 * generates a when string based on recurrence precision/frequency
-	 *
-	 * @since 30.0.0
-	 *
-	 * @param EventReader $er
-	 *
-	 * @return string
-	 */
-	public function generateWhenStringRecurring(EventReader $er): string {
-		return match ($er->recurringPrecision()) {
-			'daily' => $this->generateWhenStringRecurringDaily($er),
-			'weekly' => $this->generateWhenStringRecurringWeekly($er),
-			'monthly' => $this->generateWhenStringRecurringMonthly($er),
-			'yearly' => $this->generateWhenStringRecurringYearly($er),
-			'fixed' => $this->generateWhenStringRecurringFixed($er),
-		};
-	}
-
-	/**
-	 * generates a when string for a daily precision/frequency
-	 *
-	 * @since 30.0.0
-	 *
-	 * @param EventReader $er
-	 *
-	 * @return string
-	 */
-	public function generateWhenStringRecurringDaily(EventReader $er): string {
+        return $data;
+    }
+
+    /**
+     * generates a when string based on if a event has an recurrence or not
+     *
+     * @since 30.0.0
+     *
+     * @param EventReader $er
+     *
+     * @return string
+     */
+    public function generateWhenString(EventReader $er): string {
+        return match ($er->recurs()) {
+            true => $this->generateWhenStringRecurring($er),
+            false => $this->generateWhenStringSingular($er)
+        };
+    }
+
+    /**
+     * generates a when string for a non recurring event
+     *
+     * @since 30.0.0
+     *
+     * @param EventReader $er
+     *
+     * @return string
+     */
+    public function generateWhenStringSingular(EventReader $er): string {
+        // initialize
+        $startTime = null;
+        $endTime = null;
+        // calculate time difference from now to start of event
+        $occurring = $this->minimizeInterval($this->timeFactory->getDateTime()->diff($er->recurrenceDate()));
+        // extract start date
+        $startDate = $this->l10n->l('date', $er->startDateTime(), ['width' => 'full']);
+        // time of the day
+        if (!$er->entireDay()) {
+            $startTime = $this->l10n->l('time', $er->startDateTime(), ['width' => 'short']);
+            $startTime .= $er->startTimeZone() != $er->endTimeZone() ? ' (' . $er->startTimeZone()->getName() . ')' : '';
+            $endTime = $this->l10n->l('time', $er->endDateTime(), ['width' => 'short']) . ' (' . $er->endTimeZone()->getName() . ')';
+        }
+        // generate localized when string
+        // TRANSLATORS
+        // Indicates when a calendar event will happen, shown on invitation emails
+        // Output produced in order:
+        // In a minute/hour/day/week/month/year on July 1, 2024 for the entire day
+        // In a minute/hour/day/week/month/year on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)
+        // In 2 minutes/hours/days/weeks/months/years on July 1, 2024 for the entire day
+        // In 2 minutes/hours/days/weeks/months/years on July 1, 2024 between 8:00 AM - 9:00 AM (America/Toronto)
+        return match ([$occurring['scale'], $endTime !== null]) {
+            ['past', false] => $this->l10n->t(
+                'In the past on %1$s for the entire day',
+                [$startDate]
+            ),
+            ['minute', false] => $this->l10n->n(
+                'In a minute on %1$s for the entire day',
+                'In %n minutes on %1$s for the entire day',
+                $occurring['interval'],
+                [$startDate]
+            ),
+            ['hour', false] => $this->l10n->n(
+                'In a hour on %1$s for the entire day',
+                'In %n hours on %1$s for the entire day',
+                $occurring['interval'],
+                [$startDate]
+            ),
+            ['day', false] => $this->l10n->n(
+                'In a day on %1$s for the entire day',
+                'In %n days on %1$s for the entire day',
+                $occurring['interval'],
+                [$startDate]
+            ),
+            ['week', false] => $this->l10n->n(
+                'In a week on %1$s for the entire day',
+                'In %n weeks on %1$s for the entire day',
+                $occurring['interval'],
+                [$startDate]
+            ),
+            ['month', false] => $this->l10n->n(
+                'In a month on %1$s for the entire day',
+                'In %n months on %1$s for the entire day',
+                $occurring['interval'],
+                [$startDate]
+            ),
+            ['year', false] => $this->l10n->n(
+                'In a year on %1$s for the entire day',
+                'In %n years on %1$s for the entire day',
+                $occurring['interval'],
+                [$startDate]
+            ),
+            ['past', true] => $this->l10n->t(
+                'In the past on %1$s between %2$s - %3$s',
+                [$startDate, $startTime, $endTime]
+            ),
+            ['minute', true] => $this->l10n->n(
+                'In a minute on %1$s between %2$s - %3$s',
+                'In %n minutes on %1$s between %2$s - %3$s',
+                $occurring['interval'],
+                [$startDate, $startTime, $endTime]
+            ),
+            ['hour', true] => $this->l10n->n(
+                'In a hour on %1$s between %2$s - %3$s',
+                'In %n hours on %1$s between %2$s - %3$s',
+                $occurring['interval'],
+                [$startDate, $startTime, $endTime]
+            ),
+            ['day', true] => $this->l10n->n(
+                'In a day on %1$s between %2$s - %3$s',
+                'In %n days on %1$s between %2$s - %3$s',
+                $occurring['interval'],
+                [$startDate, $startTime, $endTime]
+            ),
+            ['week', true] => $this->l10n->n(
+                'In a week on %1$s between %2$s - %3$s',
+                'In %n weeks on %1$s between %2$s - %3$s',
+                $occurring['interval'],
+                [$startDate, $startTime, $endTime]
+            ),
+            ['month', true] => $this->l10n->n(
+                'In a month on %1$s between %2$s - %3$s',
+                'In %n months on %1$s between %2$s - %3$s',
+                $occurring['interval'],
+                [$startDate, $startTime, $endTime]
+            ),
+            ['year', true] => $this->l10n->n(
+                'In a year on %1$s between %2$s - %3$s',
+                'In %n years on %1$s between %2$s - %3$s',
+                $occurring['interval'],
+                [$startDate, $startTime, $endTime]
+            ),
+            default => $this->l10n->t('Could not generate when statement')
+        };
+    }
+
+    /**
+     * generates a when string based on recurrence precision/frequency
+     *
+     * @since 30.0.0
+     *
+     * @param EventReader $er
+     *
+     * @return string
+     */
+    public function generateWhenStringRecurring(EventReader $er): string {
+        return match ($er->recurringPrecision()) {
+            'daily' => $this->generateWhenStringRecurringDaily($er),
+            'weekly' => $this->generateWhenStringRecurringWeekly($er),
+            'monthly' => $this->generateWhenStringRecurringMonthly($er),
+            'yearly' => $this->generateWhenStringRecurringYearly($er),
+            'fixed' => $this->generateWhenStringRecurringFixed($er),
+        };
+    }
+
+    /**
+     * generates a when string for a daily precision/frequency
+     *
+     * @since 30.0.0
+     *
+     * @param EventReader $er
+     *
+     * @return string
+     */
+    public function generateWhenStringRecurringDaily(EventReader $er): string {
 		
-		// initialize
-		$interval = (int)$er->recurringInterval();
-		$startTime = null;
-		$conclusion = null;
-		// time of the day
-		if (!$er->entireDay()) {
-			$startTime = $this->l10n->l('time', $er->startDateTime(), ['width' => 'short']);
-			$startTime .= $er->startTimeZone() != $er->endTimeZone() ? ' (' . $er->startTimeZone()->getName() . ')' : '';
-			$endTime = $this->l10n->l('time', $er->endDateTime(), ['width' => 'short']) . ' (' . $er->endTimeZone()->getName() . ')';
-		}
-		// conclusion
-		if ($er->recurringConcludes()) {
-			$conclusion = $this->l10n->l('date', $er->recurringConcludesOn(), ['width' => 'long']);
-		}
-		// generate localized when string
-		// TRANSLATORS
-		// Indicates when a calendar event will happen, shown on invitation emails
-		// Output produced in order:
-		// Every Day for the entire day
-		// Every Day for the entire day until July 13, 2024
-		// Every Day between 8:00 AM - 9:00 AM (America/Toronto)
-		// Every Day between 8:00 AM - 9:00 AM (America/Toronto) until July 13, 2024
-		// Every 3 Days for the entire day
-		// Every 3 Days for the entire day until July 13, 2024
-		// Every 3 Days between 8:00 AM - 9:00 AM (America/Toronto)
-		// Every 3 Days between 8:00 AM - 9:00 AM (America/Toronto) until July 13, 2024
-		return match ([($interval > 1), $startTime !== null, $conclusion !== null]) {
-			[false, false, false] => $this->l10n->t('Every Day for the entire day'),
-			[false, false, true] => $this->l10n->t('Every Day for the entire day until %1$s', [$conclusion]),
-			[false, true, false] => $this->l10n->t('Every Day between %1$s - %2$s', [$startTime, $endTime]),
-			[false, true, true] => $this->l10n->t('Every Day between %1$s - %2$s until %3$s', [$startTime, $endTime, $conclusion]),
-			[true, false, false] => $this->l10n->t('Every %1$d Days for the entire day', [$interval]),
-			[true, false, true] => $this->l10n->t('Every %1$d Days for the entire day until %2$s', [$interval, $conclusion]),
-			[true, true, false] => $this->l10n->t('Every %1$d Days between %2$s - %3$s', [$interval, $startTime, $endTime]),
-			[true, true, true] => $this->l10n->t('Every %1$d Days between %2$s - %3$s until %4$s', [$interval, $startTime, $endTime, $conclusion]),
-			default => $this->l10n->t('Could not generate event recurrence statement')
-		};
-
-	}
-
-	/**
-	 * generates a when string for a weekly precision/frequency
-	 *
-	 * @since 30.0.0
-	 *
-	 * @param EventReader $er
-	 *
-	 * @return string
-	 */
-	public function generateWhenStringRecurringWeekly(EventReader $er): string {
+        // initialize
+        $interval = (int)$er->recurringInterval();
+        $startTime = null;
+        $conclusion = null;
+        // time of the day
+        if (!$er->entireDay()) {
+            $startTime = $this->l10n->l('time', $er->startDateTime(), ['width' => 'short']);
+            $startTime .= $er->startTimeZone() != $er->endTimeZone() ? ' (' . $er->startTimeZone()->getName() . ')' : '';
+            $endTime = $this->l10n->l('time', $er->endDateTime(), ['width' => 'short']) . ' (' . $er->endTimeZone()->getName() . ')';
+        }
+        // conclusion
+        if ($er->recurringConcludes()) {
+            $conclusion = $this->l10n->l('date', $er->recurringConcludesOn(), ['width' => 'long']);
+        }
+        // generate localized when string
+        // TRANSLATORS
+        // Indicates when a calendar event will happen, shown on invitation emails
+        // Output produced in order:
+        // Every Day for the entire day
+        // Every Day for the entire day until July 13, 2024
+        // Every Day between 8:00 AM - 9:00 AM (America/Toronto)
+        // Every Day between 8:00 AM - 9:00 AM (America/Toronto) until July 13, 2024
+        // Every 3 Days for the entire day
+        // Every 3 Days for the entire day until July 13, 2024
+        // Every 3 Days between 8:00 AM - 9:00 AM (America/Toronto)
+        // Every 3 Days between 8:00 AM - 9:00 AM (America/Toronto) until July 13, 2024
+        return match ([($interval > 1), $startTime !== null, $conclusion !== null]) {
+            [false, false, false] => $this->l10n->t('Every Day for the entire day'),
+            [false, false, true] => $this->l10n->t('Every Day for the entire day until %1$s', [$conclusion]),
+            [false, true, false] => $this->l10n->t('Every Day between %1$s - %2$s', [$startTime, $endTime]),
+            [false, true, true] => $this->l10n->t('Every Day between %1$s - %2$s until %3$s', [$startTime, $endTime, $conclusion]),
+            [true, false, false] => $this->l10n->t('Every %1$d Days for the entire day', [$interval]),
+            [true, false, true] => $this->l10n->t('Every %1$d Days for the entire day until %2$s', [$interval, $conclusion]),
+            [true, true, false] => $this->l10n->t('Every %1$d Days between %2$s - %3$s', [$interval, $startTime, $endTime]),
+            [true, true, true] => $this->l10n->t('Every %1$d Days between %2$s - %3$s until %4$s', [$interval, $startTime, $endTime, $conclusion]),
+            default => $this->l10n->t('Could not generate event recurrence statement')
+        };
+
+    }
+
+    /**
+     * generates a when string for a weekly precision/frequency
+     *
+     * @since 30.0.0
+     *
+     * @param EventReader $er
+     *
+     * @return string
+     */
+    public function generateWhenStringRecurringWeekly(EventReader $er): string {
 		
-		// initialize
-		$interval = (int)$er->recurringInterval();
-		$startTime = null;
-		$conclusion = null;
-		// days of the week
-		$days = implode(', ', array_map(function ($value) { return $this->localizeDayName($value); }, $er->recurringDaysOfWeekNamed()));
-		// time of the day
-		if (!$er->entireDay()) {
-			$startTime = $this->l10n->l('time', $er->startDateTime(), ['width' => 'short']);
-			$startTime .= $er->startTimeZone() != $er->endTimeZone() ? ' (' . $er->startTimeZone()->getName() . ')' : '';
-			$endTime = $this->l10n->l('time', $er->endDateTime(), ['width' => 'short']) . ' (' . $er->endTimeZone()->getName() . ')';
-		}
-		// conclusion
-		if ($er->recurringConcludes()) {
-			$conclusion = $this->l10n->l('date', $er->recurringConcludesOn(), ['width' => 'long']);
-		}
-		// generate localized when string
-		// TRANSLATORS
-		// Indicates when a calendar event will happen, shown on invitation emails
-		// Output produced in order:
-		// Every Week on Monday, Wednesday, Friday for the entire day
-		// Every Week on Monday, Wednesday, Friday for the entire day until July 13, 2024
-		// Every Week on Monday, Wednesday, Friday between 8:00 AM - 9:00 AM (America/Toronto)
-		// Every Week on Monday, Wednesday, Friday between 8:00 AM - 9:00 AM (America/Toronto) until July 13, 2024
-		// Every 2 Weeks on Monday, Wednesday, Friday for the entire day
-		// Every 2 Weeks on Monday, Wednesday, Friday for the entire day until July 13, 2024
-		// Every 2 Weeks on Monday, Wednesday, Friday between 8:00 AM - 9:00 AM (America/Toronto)
-		// Every 2 Weeks on Monday, Wednesday, Friday between 8:00 AM - 9:00 AM (America/Toronto) until July 13, 2024
-		return match ([($interval > 1), $startTime !== null, $conclusion !== null]) {
-			[false, false, false] => $this->l10n->t('Every Week on %1$s for the entire day', [$days]),
-			[false, false, true] => $this->l10n->t('Every Week on %1$s for the entire day until %2$s', [$days, $conclusion]),
-			[false, true, false] => $this->l10n->t('Every Week on %1$s between %2$s - %3$s', [$days, $startTime, $endTime]),
-			[false, true, true] => $this->l10n->t('Every Week on %1$s between %2$s - %3$s until %4$s', [$days, $startTime, $endTime, $conclusion]),
-			[true, false, false] => $this->l10n->t('Every %1$d Weeks on %2$s for the entire day', [$interval, $days]),
-			[true, false, true] => $this->l10n->t('Every %1$d Weeks on %2$s for the entire day until %3$s', [$interval, $days, $conclusion]),
-			[true, true, false] => $this->l10n->t('Every %1$d Weeks on %2$s between %3$s - %4$s', [$interval, $days, $startTime, $endTime]),
-			[true, true, true] => $this->l10n->t('Every %1$d Weeks on %2$s between %3$s - %4$s until %5$s', [$interval, $days, $startTime, $endTime, $conclusion]),
-			default => $this->l10n->t('Could not generate event recurrence statement')
-		};
-
-	}
-
-	/**
-	 * generates a when string for a monthly precision/frequency
-	 *
-	 * @since 30.0.0
-	 *
-	 * @param EventReader $er
-	 *
-	 * @return string
-	 */
-	public function generateWhenStringRecurringMonthly(EventReader $er): string {
+        // initialize
+        $interval = (int)$er->recurringInterval();
+        $startTime = null;
+        $conclusion = null;
+        // days of the week
+        $days = implode(', ', array_map(function ($value) { return $this->localizeDayName($value); }, $er->recurringDaysOfWeekNamed()));
+        // time of the day
+        if (!$er->entireDay()) {
+            $startTime = $this->l10n->l('time', $er->startDateTime(), ['width' => 'short']);
+            $startTime .= $er->startTimeZone() != $er->endTimeZone() ? ' (' . $er->startTimeZone()->getName() . ')' : '';
+            $endTime = $this->l10n->l('time', $er->endDateTime(), ['width' => 'short']) . ' (' . $er->endTimeZone()->getName() . ')';
+        }
+        // conclusion
+        if ($er->recurringConcludes()) {
+            $conclusion = $this->l10n->l('date', $er->recurringConcludesOn(), ['width' => 'long']);
+        }
+        // generate localized when string
+        // TRANSLATORS
+        // Indicates when a calendar event will happen, shown on invitation emails
+        // Output produced in order:
+        // Every Week on Monday, Wednesday, Friday for the entire day
+        // Every Week on Monday, Wednesday, Friday for the entire day until July 13, 2024
+        // Every Week on Monday, Wednesday, Friday between 8:00 AM - 9:00 AM (America/Toronto)
+        // Every Week on Monday, Wednesday, Friday between 8:00 AM - 9:00 AM (America/Toronto) until July 13, 2024
+        // Every 2 Weeks on Monday, Wednesday, Friday for the entire day
+        // Every 2 Weeks on Monday, Wednesday, Friday for the entire day until July 13, 2024
+        // Every 2 Weeks on Monday, Wednesday, Friday between 8:00 AM - 9:00 AM (America/Toronto)
+        // Every 2 Weeks on Monday, Wednesday, Friday between 8:00 AM - 9:00 AM (America/Toronto) until July 13, 2024
+        return match ([($interval > 1), $startTime !== null, $conclusion !== null]) {
+            [false, false, false] => $this->l10n->t('Every Week on %1$s for the entire day', [$days]),
+            [false, false, true] => $this->l10n->t('Every Week on %1$s for the entire day until %2$s', [$days, $conclusion]),
+            [false, true, false] => $this->l10n->t('Every Week on %1$s between %2$s - %3$s', [$days, $startTime, $endTime]),
+            [false, true, true] => $this->l10n->t('Every Week on %1$s between %2$s - %3$s until %4$s', [$days, $startTime, $endTime, $conclusion]),
+            [true, false, false] => $this->l10n->t('Every %1$d Weeks on %2$s for the entire day', [$interval, $days]),
+            [true, false, true] => $this->l10n->t('Every %1$d Weeks on %2$s for the entire day until %3$s', [$interval, $days, $conclusion]),
+            [true, true, false] => $this->l10n->t('Every %1$d Weeks on %2$s between %3$s - %4$s', [$interval, $days, $startTime, $endTime]),
+            [true, true, true] => $this->l10n->t('Every %1$d Weeks on %2$s between %3$s - %4$s until %5$s', [$interval, $days, $startTime, $endTime, $conclusion]),
+            default => $this->l10n->t('Could not generate event recurrence statement')
+        };
+
+    }
+
+    /**
+     * generates a when string for a monthly precision/frequency
+     *
+     * @since 30.0.0
+     *
+     * @param EventReader $er
+     *
+     * @return string
+     */
+    public function generateWhenStringRecurringMonthly(EventReader $er): string {
 		
-		// initialize
-		$interval = (int)$er->recurringInterval();
-		$startTime = null;
-		$conclusion = null;
-		// days of month
-		if ($er->recurringPattern() === 'R') {
-			$days = implode(', ', array_map(function ($value) { return $this->localizeRelativePositionName($value); }, $er->recurringRelativePositionNamed())) . ' ' .
-					implode(', ', array_map(function ($value) { return $this->localizeDayName($value); }, $er->recurringDaysOfWeekNamed()));
-		} else {
-			$days = implode(', ', $er->recurringDaysOfMonth());
-		}
-		// time of the day
-		if (!$er->entireDay()) {
-			$startTime = $this->l10n->l('time', $er->startDateTime(), ['width' => 'short']);
-			$startTime .= $er->startTimeZone() != $er->endTimeZone() ? ' (' . $er->startTimeZone()->getName() . ')' : '';
-			$endTime = $this->l10n->l('time', $er->endDateTime(), ['width' => 'short']) . ' (' . $er->endTimeZone()->getName() . ')';
-		}
-		// conclusion
-		if ($er->recurringConcludes()) {
-			$conclusion = $this->l10n->l('date', $er->recurringConcludesOn(), ['width' => 'long']);
-		}
-		// generate localized when string
-		// TRANSLATORS
-		// Indicates when a calendar event will happen, shown on invitation emails
-		// Output produced in order, output varies depending on if the event is absolute or releative:
-		// Absolute: Every Month on the 1, 8 for the entire day
-		// Relative: Every Month on the First Sunday, Saturday for the entire day
-		// Absolute: Every Month on the 1, 8 for the entire day until December 31, 2024
-		// Relative: Every Month on the First Sunday, Saturday for the entire day until December 31, 2024
-		// Absolute: Every Month on the 1, 8 between 8:00 AM - 9:00 AM (America/Toronto)
-		// Relative: Every Month on the First Sunday, Saturday between 8:00 AM - 9:00 AM (America/Toronto)
-		// Absolute: Every Month on the 1, 8 between 8:00 AM - 9:00 AM (America/Toronto) until December 31, 2024
-		// Relative: Every Month on the First Sunday, Saturday between 8:00 AM - 9:00 AM (America/Toronto) until December 31, 2024
-		// Absolute: Every 2 Months on the 1, 8 for the entire day
-		// Relative: Every 2 Months on the First Sunday, Saturday for the entire day
-		// Absolute: Every 2 Months on the 1, 8 for the entire day until December 31, 2024
-		// Relative: Every 2 Months on the First Sunday, Saturday for the entire day until December 31, 2024
-		// Absolute: Every 2 Months on the 1, 8 between 8:00 AM - 9:00 AM (America/Toronto)
-		// Relative: Every 2 Months on the First Sunday, Saturday between 8:00 AM - 9:00 AM (America/Toronto)
-		// Absolute: Every 2 Months on the 1, 8 between 8:00 AM - 9:00 AM (America/Toronto) until December 31, 2024
-		// Relative: Every 2 Months on the First Sunday, Saturday between 8:00 AM - 9:00 AM (America/Toronto) until December 31, 2024
-		return match ([($interval > 1), $startTime !== null, $conclusion !== null]) {
-			[false, false, false] => $this->l10n->t('Every Month on the %1$s for the entire day', [$days]),
-			[false, false, true] => $this->l10n->t('Every Month on the %1$s for the entire day until %2$s', [$days, $conclusion]),
-			[false, true, false] => $this->l10n->t('Every Month on the %1$s between %2$s - %3$s', [$days, $startTime, $endTime]),
-			[false, true, true] => $this->l10n->t('Every Month on the %1$s between %2$s - %3$s until %4$s', [$days, $startTime, $endTime, $conclusion]),
-			[true, false, false] => $this->l10n->t('Every %1$d Months on the %2$s for the entire day', [$interval, $days]),
-			[true, false, true] => $this->l10n->t('Every %1$d Months on the %2$s for the entire day until %3$s', [$interval, $days, $conclusion]),
-			[true, true, false] => $this->l10n->t('Every %1$d Months on the %2$s between %3$s - %4$s', [$interval, $days, $startTime, $endTime]),
-			[true, true, true] => $this->l10n->t('Every %1$d Months on the %2$s between %3$s - %4$s until %5$s', [$interval, $days, $startTime, $endTime, $conclusion]),
-			default => $this->l10n->t('Could not generate event recurrence statement')
-		};
-	}
-
-	/**
-	 * generates a when string for a yearly precision/frequency
-	 *
-	 * @since 30.0.0
-	 *
-	 * @param EventReader $er
-	 *
-	 * @return string
-	 */
-	public function generateWhenStringRecurringYearly(EventReader $er): string {
+        // initialize
+        $interval = (int)$er->recurringInterval();
+        $startTime = null;
+        $conclusion = null;
+        // days of month
+        if ($er->recurringPattern() === 'R') {
+            $days = implode(', ', array_map(function ($value) { return $this->localizeRelativePositionName($value); }, $er->recurringRelativePositionNamed())) . ' ' .
+                    implode(', ', array_map(function ($value) { return $this->localizeDayName($value); }, $er->recurringDaysOfWeekNamed()));
+        } else {
+            $days = implode(', ', $er->recurringDaysOfMonth());
+        }
+        // time of the day
+        if (!$er->entireDay()) {
+            $startTime = $this->l10n->l('time', $er->startDateTime(), ['width' => 'short']);
+            $startTime .= $er->startTimeZone() != $er->endTimeZone() ? ' (' . $er->startTimeZone()->getName() . ')' : '';
+            $endTime = $this->l10n->l('time', $er->endDateTime(), ['width' => 'short']) . ' (' . $er->endTimeZone()->getName() . ')';
+        }
+        // conclusion
+        if ($er->recurringConcludes()) {
+            $conclusion = $this->l10n->l('date', $er->recurringConcludesOn(), ['width' => 'long']);
+        }
+        // generate localized when string
+        // TRANSLATORS
+        // Indicates when a calendar event will happen, shown on invitation emails
+        // Output produced in order, output varies depending on if the event is absolute or releative:
+        // Absolute: Every Month on the 1, 8 for the entire day
+        // Relative: Every Month on the First Sunday, Saturday for the entire day
+        // Absolute: Every Month on the 1, 8 for the entire day until December 31, 2024
+        // Relative: Every Month on the First Sunday, Saturday for the entire day until December 31, 2024
+        // Absolute: Every Month on the 1, 8 between 8:00 AM - 9:00 AM (America/Toronto)
+        // Relative: Every Month on the First Sunday, Saturday between 8:00 AM - 9:00 AM (America/Toronto)
+        // Absolute: Every Month on the 1, 8 between 8:00 AM - 9:00 AM (America/Toronto) until December 31, 2024
+        // Relative: Every Month on the First Sunday, Saturday between 8:00 AM - 9:00 AM (America/Toronto) until December 31, 2024
+        // Absolute: Every 2 Months on the 1, 8 for the entire day
+        // Relative: Every 2 Months on the First Sunday, Saturday for the entire day
+        // Absolute: Every 2 Months on the 1, 8 for the entire day until December 31, 2024
+        // Relative: Every 2 Months on the First Sunday, Saturday for the entire day until December 31, 2024
+        // Absolute: Every 2 Months on the 1, 8 between 8:00 AM - 9:00 AM (America/Toronto)
+        // Relative: Every 2 Months on the First Sunday, Saturday between 8:00 AM - 9:00 AM (America/Toronto)
+        // Absolute: Every 2 Months on the 1, 8 between 8:00 AM - 9:00 AM (America/Toronto) until December 31, 2024
+        // Relative: Every 2 Months on the First Sunday, Saturday between 8:00 AM - 9:00 AM (America/Toronto) until December 31, 2024
+        return match ([($interval > 1), $startTime !== null, $conclusion !== null]) {
+            [false, false, false] => $this->l10n->t('Every Month on the %1$s for the entire day', [$days]),
+            [false, false, true] => $this->l10n->t('Every Month on the %1$s for the entire day until %2$s', [$days, $conclusion]),
+            [false, true, false] => $this->l10n->t('Every Month on the %1$s between %2$s - %3$s', [$days, $startTime, $endTime]),
+            [false, true, true] => $this->l10n->t('Every Month on the %1$s between %2$s - %3$s until %4$s', [$days, $startTime, $endTime, $conclusion]),
+            [true, false, false] => $this->l10n->t('Every %1$d Months on the %2$s for the entire day', [$interval, $days]),
+            [true, false, true] => $this->l10n->t('Every %1$d Months on the %2$s for the entire day until %3$s', [$interval, $days, $conclusion]),
+            [true, true, false] => $this->l10n->t('Every %1$d Months on the %2$s between %3$s - %4$s', [$interval, $days, $startTime, $endTime]),
+            [true, true, true] => $this->l10n->t('Every %1$d Months on the %2$s between %3$s - %4$s until %5$s', [$interval, $days, $startTime, $endTime, $conclusion]),
+            default => $this->l10n->t('Could not generate event recurrence statement')
+        };
+    }
+
+    /**
+     * generates a when string for a yearly precision/frequency
+     *
+     * @since 30.0.0
+     *
+     * @param EventReader $er
+     *
+     * @return string
+     */
+    public function generateWhenStringRecurringYearly(EventReader $er): string {
 		
-		// initialize
-		$interval = (int)$er->recurringInterval();
-		$startTime = null;
-		$conclusion = null;
-		// months of year
-		$months = implode(', ', array_map(function ($value) { return $this->localizeMonthName($value); }, $er->recurringMonthsOfYearNamed()));
-		// days of month
-		if ($er->recurringPattern() === 'R') {
-			$days = implode(', ', array_map(function ($value) { return $this->localizeRelativePositionName($value); }, $er->recurringRelativePositionNamed())) . ' ' .
-					implode(', ', array_map(function ($value) { return $this->localizeDayName($value); }, $er->recurringDaysOfWeekNamed()));
-		} else {
-			$days = $er->startDateTime()->format('jS');
-		}
-		// time of the day
-		if (!$er->entireDay()) {
-			$startTime = $this->l10n->l('time', $er->startDateTime(), ['width' => 'short']);
-			$startTime .= $er->startTimeZone() != $er->endTimeZone() ? ' (' . $er->startTimeZone()->getName() . ')' : '';
-			$endTime = $this->l10n->l('time', $er->endDateTime(), ['width' => 'short']) . ' (' . $er->endTimeZone()->getName() . ')';
-		}
-		// conclusion
-		if ($er->recurringConcludes()) {
-			$conclusion = $this->l10n->l('date', $er->recurringConcludesOn(), ['width' => 'long']);
-		}
-		// generate localized when string
-		// TRANSLATORS
-		// Indicates when a calendar event will happen, shown on invitation emails
-		// Output produced in order, output varies depending on if the event is absolute or releative:
-		// Absolute: Every Year in July on the 1st for the entire day
-		// Relative: Every Year in July on the First Sunday, Saturday for the entire day
-		// Absolute: Every Year in July on the 1st for the entire day until July 31, 2026
-		// Relative: Every Year in July on the First Sunday, Saturday for the entire day until July 31, 2026
-		// Absolute: Every Year in July on the 1st between 8:00 AM - 9:00 AM (America/Toronto)
-		// Relative: Every Year in July on the First Sunday, Saturday between 8:00 AM - 9:00 AM (America/Toronto)
-		// Absolute: Every Year in July on the 1st between 8:00 AM - 9:00 AM (America/Toronto) until July 31, 2026
-		// Relative: Every Year in July on the First Sunday, Saturday between 8:00 AM - 9:00 AM (America/Toronto) until July 31, 2026
-		// Absolute: Every 2 Years in July on the 1st for the entire day
-		// Relative: Every 2 Years in July on the First Sunday, Saturday for the entire day
-		// Absolute: Every 2 Years in July on the 1st for the entire day until July 31, 2026
-		// Relative: Every 2 Years in July on the First Sunday, Saturday for the entire day until July 31, 2026
-		// Absolute: Every 2 Years in July on the 1st between 8:00 AM - 9:00 AM (America/Toronto)
-		// Relative: Every 2 Years in July on the First Sunday, Saturday between 8:00 AM - 9:00 AM (America/Toronto)
-		// Absolute: Every 2 Years in July on the 1st between 8:00 AM - 9:00 AM (America/Toronto) until July 31, 2026
-		// Relative: Every 2 Years in July on the First Sunday, Saturday between 8:00 AM - 9:00 AM (America/Toronto) until July 31, 2026
-		return match ([($interval > 1), $startTime !== null, $conclusion !== null]) {
-			[false, false, false] => $this->l10n->t('Every Year in %1$s on the %2$s for the entire day', [$months, $days]),
-			[false, false, true] => $this->l10n->t('Every Year in %1$s on the %2$s for the entire day until %3$s', [$months, $days, $conclusion]),
-			[false, true, false] => $this->l10n->t('Every Year in %1$s on the %2$s between %3$s - %4$s', [$months, $days, $startTime, $endTime]),
-			[false, true, true] => $this->l10n->t('Every Year in %1$s on the %2$s between %3$s - %4$s until %5$s', [$months, $days, $startTime, $endTime, $conclusion]),
-			[true, false, false] => $this->l10n->t('Every %1$d Years in %2$s on the %3$s for the entire day', [$interval, $months, $days]),
-			[true, false, true] => $this->l10n->t('Every %1$d Years in %2$s on the %3$s for the entire day until %4$s', [$interval, $months,  $days, $conclusion]),
-			[true, true, false] => $this->l10n->t('Every %1$d Years in %2$s on the %3$s between %4$s - %5$s', [$interval, $months, $days, $startTime, $endTime]),
-			[true, true, true] => $this->l10n->t('Every %1$d Years in %2$s on the %3$s between %4$s - %5$s until %6$s', [$interval, $months, $days, $startTime, $endTime, $conclusion]),
-			default => $this->l10n->t('Could not generate event recurrence statement')
-		};
-	}
-
-	/**
-	 * generates a when string for a fixed precision/frequency
-	 *
-	 * @since 30.0.0
-	 *
-	 * @param EventReader $er
-	 *
-	 * @return string
-	 */
-	public function generateWhenStringRecurringFixed(EventReader $er): string {
-		// initialize
-		$startTime = null;
-		$conclusion = null;
-		// time of the day
-		if (!$er->entireDay()) {
-			$startTime = $this->l10n->l('time', $er->startDateTime(), ['width' => 'short']);
-			$startTime .= $er->startTimeZone() != $er->endTimeZone() ? ' (' . $er->startTimeZone()->getName() . ')' : '';
-			$endTime = $this->l10n->l('time', $er->endDateTime(), ['width' => 'short']) . ' (' . $er->endTimeZone()->getName() . ')';
-		}
-		// conclusion
-		$conclusion = $this->l10n->l('date', $er->recurringConcludesOn(), ['width' => 'long']);
-		// generate localized when string
-		// TRANSLATORS
-		// Indicates when a calendar event will happen, shown on invitation emails
-		// Output produced in order:
-		// On specific dates for the entire day until July 13, 2024
-		// On specific dates between 8:00 AM - 9:00 AM (America/Toronto) until July 13, 2024
-		return match ($startTime !== null) {
-			false => $this->l10n->t('On specific dates for the entire day until %1$s', [$conclusion]),
-			true => $this->l10n->t('On specific dates between %1$s - %2$s until %3$s', [$startTime, $endTime, $conclusion]),
-		};
-	}
+        // initialize
+        $interval = (int)$er->recurringInterval();
+        $startTime = null;
+        $conclusion = null;
+        // months of year
+        $months = implode(', ', array_map(function ($value) { return $this->localizeMonthName($value); }, $er->recurringMonthsOfYearNamed()));
+        // days of month
+        if ($er->recurringPattern() === 'R') {
+            $days = implode(', ', array_map(function ($value) { return $this->localizeRelativePositionName($value); }, $er->recurringRelativePositionNamed())) . ' ' .
+                    implode(', ', array_map(function ($value) { return $this->localizeDayName($value); }, $er->recurringDaysOfWeekNamed()));
+        } else {
+            $days = $er->startDateTime()->format('jS');
+        }
+        // time of the day
+        if (!$er->entireDay()) {
+            $startTime = $this->l10n->l('time', $er->startDateTime(), ['width' => 'short']);
+            $startTime .= $er->startTimeZone() != $er->endTimeZone() ? ' (' . $er->startTimeZone()->getName() . ')' : '';
+            $endTime = $this->l10n->l('time', $er->endDateTime(), ['width' => 'short']) . ' (' . $er->endTimeZone()->getName() . ')';
+        }
+        // conclusion
+        if ($er->recurringConcludes()) {
+            $conclusion = $this->l10n->l('date', $er->recurringConcludesOn(), ['width' => 'long']);
+        }
+        // generate localized when string
+        // TRANSLATORS
+        // Indicates when a calendar event will happen, shown on invitation emails
+        // Output produced in order, output varies depending on if the event is absolute or releative:
+        // Absolute: Every Year in July on the 1st for the entire day
+        // Relative: Every Year in July on the First Sunday, Saturday for the entire day
+        // Absolute: Every Year in July on the 1st for the entire day until July 31, 2026
+        // Relative: Every Year in July on the First Sunday, Saturday for the entire day until July 31, 2026
+        // Absolute: Every Year in July on the 1st between 8:00 AM - 9:00 AM (America/Toronto)
+        // Relative: Every Year in July on the First Sunday, Saturday between 8:00 AM - 9:00 AM (America/Toronto)
+        // Absolute: Every Year in July on the 1st between 8:00 AM - 9:00 AM (America/Toronto) until July 31, 2026
+        // Relative: Every Year in July on the First Sunday, Saturday between 8:00 AM - 9:00 AM (America/Toronto) until July 31, 2026
+        // Absolute: Every 2 Years in July on the 1st for the entire day
+        // Relative: Every 2 Years in July on the First Sunday, Saturday for the entire day
+        // Absolute: Every 2 Years in July on the 1st for the entire day until July 31, 2026
+        // Relative: Every 2 Years in July on the First Sunday, Saturday for the entire day until July 31, 2026
+        // Absolute: Every 2 Years in July on the 1st between 8:00 AM - 9:00 AM (America/Toronto)
+        // Relative: Every 2 Years in July on the First Sunday, Saturday between 8:00 AM - 9:00 AM (America/Toronto)
+        // Absolute: Every 2 Years in July on the 1st between 8:00 AM - 9:00 AM (America/Toronto) until July 31, 2026
+        // Relative: Every 2 Years in July on the First Sunday, Saturday between 8:00 AM - 9:00 AM (America/Toronto) until July 31, 2026
+        return match ([($interval > 1), $startTime !== null, $conclusion !== null]) {
+            [false, false, false] => $this->l10n->t('Every Year in %1$s on the %2$s for the entire day', [$months, $days]),
+            [false, false, true] => $this->l10n->t('Every Year in %1$s on the %2$s for the entire day until %3$s', [$months, $days, $conclusion]),
+            [false, true, false] => $this->l10n->t('Every Year in %1$s on the %2$s between %3$s - %4$s', [$months, $days, $startTime, $endTime]),
+            [false, true, true] => $this->l10n->t('Every Year in %1$s on the %2$s between %3$s - %4$s until %5$s', [$months, $days, $startTime, $endTime, $conclusion]),
+            [true, false, false] => $this->l10n->t('Every %1$d Years in %2$s on the %3$s for the entire day', [$interval, $months, $days]),
+            [true, false, true] => $this->l10n->t('Every %1$d Years in %2$s on the %3$s for the entire day until %4$s', [$interval, $months,  $days, $conclusion]),
+            [true, true, false] => $this->l10n->t('Every %1$d Years in %2$s on the %3$s between %4$s - %5$s', [$interval, $months, $days, $startTime, $endTime]),
+            [true, true, true] => $this->l10n->t('Every %1$d Years in %2$s on the %3$s between %4$s - %5$s until %6$s', [$interval, $months, $days, $startTime, $endTime, $conclusion]),
+            default => $this->l10n->t('Could not generate event recurrence statement')
+        };
+    }
+
+    /**
+     * generates a when string for a fixed precision/frequency
+     *
+     * @since 30.0.0
+     *
+     * @param EventReader $er
+     *
+     * @return string
+     */
+    public function generateWhenStringRecurringFixed(EventReader $er): string {
+        // initialize
+        $startTime = null;
+        $conclusion = null;
+        // time of the day
+        if (!$er->entireDay()) {
+            $startTime = $this->l10n->l('time', $er->startDateTime(), ['width' => 'short']);
+            $startTime .= $er->startTimeZone() != $er->endTimeZone() ? ' (' . $er->startTimeZone()->getName() . ')' : '';
+            $endTime = $this->l10n->l('time', $er->endDateTime(), ['width' => 'short']) . ' (' . $er->endTimeZone()->getName() . ')';
+        }
+        // conclusion
+        $conclusion = $this->l10n->l('date', $er->recurringConcludesOn(), ['width' => 'long']);
+        // generate localized when string
+        // TRANSLATORS
+        // Indicates when a calendar event will happen, shown on invitation emails
+        // Output produced in order:
+        // On specific dates for the entire day until July 13, 2024
+        // On specific dates between 8:00 AM - 9:00 AM (America/Toronto) until July 13, 2024
+        return match ($startTime !== null) {
+            false => $this->l10n->t('On specific dates for the entire day until %1$s', [$conclusion]),
+            true => $this->l10n->t('On specific dates between %1$s - %2$s until %3$s', [$startTime, $endTime, $conclusion]),
+        };
+    }
 	
-	/**
-	 * generates a occurring next string for a recurring event
-	 *
-	 * @since 30.0.0
-	 *
-	 * @param EventReader $er
-	 *
-	 * @return string
-	 */
-	public function generateOccurringString(EventReader $er): string {
-
-		// initialize
-		$occurrence = null;
-		$occurrence2 = null;
-		$occurrence3 = null;
-		// reset to initial occurrence
-		$er->recurrenceRewind();
-		// forward to current date
-		$er->recurrenceAdvanceTo($this->timeFactory->getDateTime());
-		// calculate time difference from now to start of next event occurrence and minimize it
-		$occurrenceIn = $this->minimizeInterval($this->timeFactory->getDateTime()->diff($er->recurrenceDate()));
-		// store next occurrence value
-		$occurrence = $this->l10n->l('date', $er->recurrenceDate(), ['width' => 'long']);
-		// forward one occurrence
-		$er->recurrenceAdvance();
-		// evaluate if occurrence is valid
-		if ($er->recurrenceDate() !== null) {
-			// store following occurrence value
-			$occurrence2 = $this->l10n->l('date', $er->recurrenceDate(), ['width' => 'long']);
-			// forward one occurrence
-			$er->recurrenceAdvance();
-			// evaluate if occurrence is valid
-			if ($er->recurrenceDate()) {
-				// store following occurrence value
-				$occurrence3 = $this->l10n->l('date', $er->recurrenceDate(), ['width' => 'long']);
-			}
-		}
-		// generate localized when string
-		// TRANSLATORS
-		// Indicates when a calendar event will happen, shown on invitation emails
-		// Output produced in order:
-		// In a minute/hour/day/week/month/year on July 1, 2024
-		// In a minute/hour/day/week/month/year on July 1, 2024 then on July 3, 2024
-		// In a minute/hour/day/week/month/year on July 1, 2024 then on July 3, 2024 and July 5, 2024
-		// In 2 minutes/hours/days/weeks/months/years on July 1, 2024
-		// In 2 minutes/hours/days/weeks/months/years on July 1, 2024 then on July 3, 2024
-		// In 2 minutes/hours/days/weeks/months/years on July 1, 2024 then on July 3, 2024 and July 5, 2024
-		return match ([$occurrenceIn['scale'], $occurrence2 !== null, $occurrence3 !== null]) {
-			['past', false, false] => $this->l10n->t(
-				'In the past on %1$s',
-				[$occurrence]
-			),
-			['minute', false, false] => $this->l10n->n(
-				'In a minute on %1$s',
-				'In %n minutes on %1$s',
-				$occurrenceIn['interval'],
-				[$occurrence]
-			),
-			['hour', false, false] => $this->l10n->n(
-				'In a hour on %1$s',
-				'In %n hours on %1$s',
-				$occurrenceIn['interval'],
-				[$occurrence]
-			),
-			['day', false, false] => $this->l10n->n(
-				'In a day on %1$s',
-				'In %n days on %1$s',
-				$occurrenceIn['interval'],
-				[$occurrence]
-			),
-			['week', false, false] => $this->l10n->n(
-				'In a week on %1$s',
-				'In %n weeks on %1$s',
-				$occurrenceIn['interval'],
-				[$occurrence]
-			),
-			['month', false, false] => $this->l10n->n(
-				'In a month on %1$s',
-				'In %n months on %1$s',
-				$occurrenceIn['interval'],
-				[$occurrence]
-			),
-			['year', false, false] => $this->l10n->n(
-				'In a year on %1$s',
-				'In %n years on %1$s',
-				$occurrenceIn['interval'],
-				[$occurrence]
-			),
-			['past', true, false] => $this->l10n->t(
-				'In the past on %1$s then on %2$s',
-				[$occurrence, $occurrence2]
-			),
-			['minute', true, false] => $this->l10n->n(
-				'In a minute on %1$s then on %2$s',
-				'In %n minutes on %1$s then on %2$s',
-				$occurrenceIn['interval'],
-				[$occurrence, $occurrence2]
-			),
-			['hour', true, false] => $this->l10n->n(
-				'In a hour on %1$s then on %2$s',
-				'In %n hours on %1$s then on %2$s',
-				$occurrenceIn['interval'],
-				[$occurrence, $occurrence2]
-			),
-			['day', true, false] => $this->l10n->n(
-				'In a day on %1$s then on %2$s',
-				'In %n days on %1$s then on %2$s',
-				$occurrenceIn['interval'],
-				[$occurrence, $occurrence2]
-			),
-			['week', true, false] => $this->l10n->n(
-				'In a week on %1$s then on %2$s',
-				'In %n weeks on %1$s then on %2$s',
-				$occurrenceIn['interval'],
-				[$occurrence, $occurrence2]
-			),
-			['month', true, false] => $this->l10n->n(
-				'In a month on %1$s then on %2$s',
-				'In %n months on %1$s then on %2$s',
-				$occurrenceIn['interval'],
-				[$occurrence, $occurrence2]
-			),
-			['year', true, false] => $this->l10n->n(
-				'In a year on %1$s then on %2$s',
-				'In %n years on %1$s then on %2$s',
-				$occurrenceIn['interval'],
-				[$occurrence, $occurrence2]
-			),
-			['past', true, true] => $this->l10n->t(
-				'In the past on %1$s then on %2$s and %3$s',
-				[$occurrence, $occurrence2, $occurrence3]
-			),
-			['minute', true, true] => $this->l10n->n(
-				'In a minute on %1$s then on %2$s and %3$s',
-				'In %n minutes on %1$s then on %2$s and %3$s',
-				$occurrenceIn['interval'],
-				[$occurrence, $occurrence2, $occurrence3]
-			),
-			['hour', true, true] => $this->l10n->n(
-				'In a hour on %1$s then on %2$s and %3$s',
-				'In %n hours on %1$s then on %2$s and %3$s',
-				$occurrenceIn['interval'],
-				[$occurrence, $occurrence2, $occurrence3]
-			),
-			['day', true, true] => $this->l10n->n(
-				'In a day on %1$s then on %2$s and %3$s',
-				'In %n days on %1$s then on %2$s and %3$s',
-				$occurrenceIn['interval'],
-				[$occurrence, $occurrence2, $occurrence3]
-			),
-			['week', true, true] => $this->l10n->n(
-				'In a week on %1$s then on %2$s and %3$s',
-				'In %n weeks on %1$s then on %2$s and %3$s',
-				$occurrenceIn['interval'],
-				[$occurrence, $occurrence2, $occurrence3]
-			),
-			['month', true, true] => $this->l10n->n(
-				'In a month on %1$s then on %2$s and %3$s',
-				'In %n months on %1$s then on %2$s and %3$s',
-				$occurrenceIn['interval'],
-				[$occurrence, $occurrence2, $occurrence3]
-			),
-			['year', true, true] => $this->l10n->n(
-				'In a year on %1$s then on %2$s and %3$s',
-				'In %n years on %1$s then on %2$s and %3$s',
-				$occurrenceIn['interval'],
-				[$occurrence, $occurrence2, $occurrence3]
-			),
-			default => $this->l10n->t('Could not generate next recurrence statement')
-		};
-
-	}
-
-	/**
-	 * @param VEvent $vEvent
-	 * @return array
-	 */
-	public function buildCancelledBodyData(VEvent $vEvent): array {
-		// construct event reader
-		$eventReaderCurrent = new EventReader($vEvent);
-		$defaultVal = '';
-		$strikethrough = "<span style='text-decoration: line-through'>%s</span>";
-
-		$newMeetingWhen = $this->generateWhenString($eventReaderCurrent);
-		$newSummary = isset($vEvent->SUMMARY) && (string)$vEvent->SUMMARY !== '' ? (string)$vEvent->SUMMARY : $this->l10n->t('Untitled event');
-		$newDescription = isset($vEvent->DESCRIPTION) && (string)$vEvent->DESCRIPTION !== '' ? (string)$vEvent->DESCRIPTION : $defaultVal;
-		$newUrl = isset($vEvent->URL) && (string)$vEvent->URL !== '' ? sprintf('<a href="%1$s">%1$s</a>', $vEvent->URL) : $defaultVal;
-		$newLocation = isset($vEvent->LOCATION) && (string)$vEvent->LOCATION !== '' ? (string)$vEvent->LOCATION : $defaultVal;
-		$newLocationHtml = $this->linkify($newLocation) ?? $newLocation;
-
-		$data = [];
-		$data['meeting_when_html'] = $newMeetingWhen === '' ?: sprintf($strikethrough, $newMeetingWhen);
-		$data['meeting_when'] = $newMeetingWhen;
-		$data['meeting_title_html'] = sprintf($strikethrough, $newSummary);
-		$data['meeting_title'] = $newSummary !== '' ? $newSummary: $this->l10n->t('Untitled event');
-		$data['meeting_description_html'] = $newDescription !== '' ? sprintf($strikethrough, $newDescription) : '';
-		$data['meeting_description'] = $newDescription;
-		$data['meeting_url_html'] = $newUrl !== '' ? sprintf($strikethrough, $newUrl) : '';
-		$data['meeting_url'] = isset($vEvent->URL) ? (string)$vEvent->URL : '';
-		$data['meeting_location_html'] = $newLocationHtml !== '' ? sprintf($strikethrough, $newLocationHtml) : '';
-		$data['meeting_location'] = $newLocation;
-		return $data;
-	}
-
-	/**
-	 * Check if event took place in the past
-	 *
-	 * @param VCalendar $vObject
-	 * @return int
-	 */
-	public function getLastOccurrence(VCalendar $vObject) {
-		/** @var VEvent $component */
-		$component = $vObject->VEVENT;
-
-		if (isset($component->RRULE)) {
-			$it = new EventIterator($vObject, (string)$component->UID);
-			$maxDate = new \DateTime(IMipPlugin::MAX_DATE);
-			if ($it->isInfinite()) {
-				return $maxDate->getTimestamp();
-			}
-
-			$end = $it->getDtEnd();
-			while ($it->valid() && $end < $maxDate) {
-				$end = $it->getDtEnd();
-				$it->next();
-			}
-			return $end->getTimestamp();
-		}
-
-		/** @var Property\ICalendar\DateTime $dtStart */
-		$dtStart = $component->DTSTART;
-
-		if (isset($component->DTEND)) {
-			/** @var Property\ICalendar\DateTime $dtEnd */
-			$dtEnd = $component->DTEND;
-			return $dtEnd->getDateTime()->getTimeStamp();
-		}
-
-		if (isset($component->DURATION)) {
-			/** @var \DateTime $endDate */
-			$endDate = clone $dtStart->getDateTime();
-			// $component->DTEND->getDateTime() returns DateTimeImmutable
-			$endDate = $endDate->add(DateTimeParser::parse($component->DURATION->getValue()));
-			return $endDate->getTimestamp();
-		}
-
-		if (!$dtStart->hasTime()) {
-			/** @var \DateTime $endDate */
-			// $component->DTSTART->getDateTime() returns DateTimeImmutable
-			$endDate = clone $dtStart->getDateTime();
-			$endDate = $endDate->modify('+1 day');
-			return $endDate->getTimestamp();
-		}
-
-		// No computation of end time possible - return start date
-		return $dtStart->getDateTime()->getTimeStamp();
-	}
-
-	/**
-	 * @param Property|null $attendee
-	 */
-	public function setL10n(?Property $attendee = null) {
-		if ($attendee === null) {
-			return;
-		}
-
-		$lang = $attendee->offsetGet('LANGUAGE');
-		if ($lang instanceof Parameter) {
-			$lang = $lang->getValue();
-			$this->l10n = $this->l10nFactory->get('dav', $lang);
-		}
-	}
-
-	/**
-	 * @param Property|null $attendee
-	 * @return bool
-	 */
-	public function getAttendeeRsvpOrReqForParticipant(?Property $attendee = null) {
-		if ($attendee === null) {
-			return false;
-		}
-
-		$rsvp = $attendee->offsetGet('RSVP');
-		if (($rsvp instanceof Parameter) && (strcasecmp($rsvp->getValue(), 'TRUE') === 0)) {
-			return true;
-		}
-		$role = $attendee->offsetGet('ROLE');
-		// @see https://datatracker.ietf.org/doc/html/rfc5545#section-3.2.16
-		// Attendees without a role are assumed required and should receive an invitation link even if they have no RSVP set
-		if ($role === null
-			|| (($role instanceof Parameter) && (strcasecmp($role->getValue(), 'REQ-PARTICIPANT') === 0))
-			|| (($role instanceof Parameter) && (strcasecmp($role->getValue(), 'OPT-PARTICIPANT') === 0))
-		) {
-			return true;
-		}
-
-		// RFC 5545 3.2.17: default RSVP is false
-		return false;
-	}
-
-	/**
-	 * @param IEMailTemplate $template
-	 * @param string $method
-	 * @param string $sender
-	 * @param string $summary
-	 * @param string|null $partstat
-	 * @param bool $isModified
-	 */
-	public function addSubjectAndHeading(IEMailTemplate $template,
-		string $method, string $sender, string $summary, bool $isModified, ?Property $replyingAttendee = null): void {
-		if ($method === IMipPlugin::METHOD_CANCEL) {
-			// TRANSLATORS Subject for email, when an invitation is cancelled. Ex: "Cancelled: {{Event Name}}"
-			$template->setSubject($this->l10n->t('Cancelled: %1$s', [$summary]));
-			$template->addHeading($this->l10n->t('"%1$s" has been canceled', [$summary]));
-		} elseif ($method === IMipPlugin::METHOD_REPLY) {
-			// TRANSLATORS Subject for email, when an invitation is replied to. Ex: "Re: {{Event Name}}"
-			$template->setSubject($this->l10n->t('Re: %1$s', [$summary]));
-			// Build the strings
-			$partstat = (isset($replyingAttendee)) ? $replyingAttendee->offsetGet('PARTSTAT') : null;
-			$partstat = ($partstat instanceof Parameter) ? $partstat->getValue() : null;
-			switch ($partstat) {
-				case 'ACCEPTED':
-					$template->addHeading($this->l10n->t('%1$s has accepted your invitation', [$sender]));
-					break;
-				case 'TENTATIVE':
-					$template->addHeading($this->l10n->t('%1$s has tentatively accepted your invitation', [$sender]));
-					break;
-				case 'DECLINED':
-					$template->addHeading($this->l10n->t('%1$s has declined your invitation', [$sender]));
-					break;
-				case null:
-				default:
-					$template->addHeading($this->l10n->t('%1$s has responded to your invitation', [$sender]));
-					break;
-			}
-		} elseif ($method === IMipPlugin::METHOD_REQUEST && $isModified) {
-			// TRANSLATORS Subject for email, when an invitation is updated. Ex: "Invitation updated: {{Event Name}}"
-			$template->setSubject($this->l10n->t('Invitation updated: %1$s', [$summary]));
-			$template->addHeading($this->l10n->t('%1$s updated the event "%2$s"', [$sender, $summary]));
-		} else {
-			// TRANSLATORS Subject for email, when an invitation is sent. Ex: "Invitation: {{Event Name}}"
-			$template->setSubject($this->l10n->t('Invitation: %1$s', [$summary]));
-			$template->addHeading($this->l10n->t('%1$s would like to invite you to "%2$s"', [$sender, $summary]));
-		}
-	}
-
-	/**
-	 * @param string $path
-	 * @return string
-	 */
-	public function getAbsoluteImagePath($path): string {
-		return $this->urlGenerator->getAbsoluteURL(
-			$this->urlGenerator->imagePath('core', $path)
-		);
-	}
-
-	/**
-	 * addAttendees: add organizer and attendee names/emails to iMip mail.
-	 *
-	 * Enable with DAV setting: invitation_list_attendees (default: no)
-	 *
-	 * The default is 'no', which matches old behavior, and is privacy preserving.
-	 *
-	 * To enable including attendees in invitation emails:
-	 *   % php occ config:app:set dav invitation_list_attendees --value yes
-	 *
-	 * @param IEMailTemplate $template
-	 * @param IL10N $this->l10n
-	 * @param VEvent $vevent
-	 * @author brad2014 on github.com
-	 */
-	public function addAttendees(IEMailTemplate $template, VEvent $vevent) {
-		if ($this->config->getAppValue('dav', 'invitation_list_attendees', 'no') === 'no') {
-			return;
-		}
-
-		if (isset($vevent->ORGANIZER)) {
-			/** @var Property | Property\ICalendar\CalAddress $organizer */
-			$organizer = $vevent->ORGANIZER;
-			$organizerEmail = substr($organizer->getNormalizedValue(), 7);
-			/** @var string|null $organizerName */
-			$organizerName = isset($organizer->CN) ? $organizer->CN->getValue() : null;
-			$organizerHTML = sprintf('<a href="%s">%s</a>',
-				htmlspecialchars($organizer->getNormalizedValue()),
-				htmlspecialchars($organizerName ?: $organizerEmail));
-			$organizerText = sprintf('%s <%s>', $organizerName, $organizerEmail);
-			if (isset($organizer['PARTSTAT'])) {
-				/** @var Parameter $partstat */
-				$partstat = $organizer['PARTSTAT'];
-				if (strcasecmp($partstat->getValue(), 'ACCEPTED') === 0) {
-					$organizerHTML .= ' ✔︎';
-					$organizerText .= ' ✔︎';
-				}
-			}
-			$template->addBodyListItem($organizerHTML, $this->l10n->t('Organizer:'),
-				$this->getAbsoluteImagePath('caldav/organizer.png'),
-				$organizerText, '', IMipPlugin::IMIP_INDENT);
-		}
-
-		$attendees = $vevent->select('ATTENDEE');
-		if (count($attendees) === 0) {
-			return;
-		}
-
-		$attendeesHTML = [];
-		$attendeesText = [];
-		foreach ($attendees as $attendee) {
-			$attendeeEmail = substr($attendee->getNormalizedValue(), 7);
-			$attendeeName = isset($attendee['CN']) ? $attendee['CN']->getValue() : null;
-			$attendeeHTML = sprintf('<a href="%s">%s</a>',
-				htmlspecialchars($attendee->getNormalizedValue()),
-				htmlspecialchars($attendeeName ?: $attendeeEmail));
-			$attendeeText = sprintf('%s <%s>', $attendeeName, $attendeeEmail);
-			if (isset($attendee['PARTSTAT'])) {
-				/** @var Parameter $partstat */
-				$partstat = $attendee['PARTSTAT'];
-				if (strcasecmp($partstat->getValue(), 'ACCEPTED') === 0) {
-					$attendeeHTML .= ' ✔︎';
-					$attendeeText .= ' ✔︎';
-				}
-			}
-			$attendeesHTML[] = $attendeeHTML;
-			$attendeesText[] = $attendeeText;
-		}
-
-		$template->addBodyListItem(implode('<br/>', $attendeesHTML), $this->l10n->t('Attendees:'),
-			$this->getAbsoluteImagePath('caldav/attendees.png'),
-			implode("\n", $attendeesText), '', IMipPlugin::IMIP_INDENT);
-	}
-
-	/**
-	 * @param IEMailTemplate $template
-	 * @param VEVENT $vevent
-	 * @param $data
-	 */
-	public function addBulletList(IEMailTemplate $template, VEvent $vevent, $data) {
-		$template->addBodyListItem(
-			$data['meeting_title_html'] ?? $data['meeting_title'], $this->l10n->t('Title:'),
-			$this->getAbsoluteImagePath('caldav/title.png'), $data['meeting_title'], '', IMipPlugin::IMIP_INDENT);
-		if ($data['meeting_when'] !== '') {
-			$template->addBodyListItem($data['meeting_when_html'] ?? $data['meeting_when'], $this->l10n->t('When:'),
-				$this->getAbsoluteImagePath('caldav/time.png'), $data['meeting_when'], '', IMipPlugin::IMIP_INDENT);
-		}
-		if ($data['meeting_location'] !== '') {
-			$template->addBodyListItem($data['meeting_location_html'] ?? $data['meeting_location'], $this->l10n->t('Location:'),
-				$this->getAbsoluteImagePath('caldav/location.png'), $data['meeting_location'], '', IMipPlugin::IMIP_INDENT);
-		}
-		if ($data['meeting_url'] !== '') {
-			$template->addBodyListItem($data['meeting_url_html'] ?? $data['meeting_url'], $this->l10n->t('Link:'),
-				$this->getAbsoluteImagePath('caldav/link.png'), $data['meeting_url'], '', IMipPlugin::IMIP_INDENT);
-		}
-		if (isset($data['meeting_occurring'])) {
-			$template->addBodyListItem($data['meeting_occurring_html'] ?? $data['meeting_occurring'], $this->l10n->t('Occurring:'),
-				$this->getAbsoluteImagePath('caldav/time.png'), $data['meeting_occurring'], '', IMipPlugin::IMIP_INDENT);
-		}
-
-		$this->addAttendees($template, $vevent);
-
-		/* Put description last, like an email body, since it can be arbitrarily long */
-		if ($data['meeting_description']) {
-			$template->addBodyListItem($data['meeting_description_html'] ?? $data['meeting_description'], $this->l10n->t('Description:'),
-				$this->getAbsoluteImagePath('caldav/description.png'), $data['meeting_description'], '', IMipPlugin::IMIP_INDENT);
-		}
-	}
-
-	/**
-	 * @param Message $iTipMessage
-	 * @return null|Property
-	 */
-	public function getCurrentAttendee(Message $iTipMessage): ?Property {
-		/** @var VEvent $vevent */
-		$vevent = $iTipMessage->message->VEVENT;
-		$attendees = $vevent->select('ATTENDEE');
-		foreach ($attendees as $attendee) {
-			if ($iTipMessage->method === 'REPLY' && strcasecmp($attendee->getValue(), $iTipMessage->sender) === 0) {
-				/** @var Property $attendee */
-				return $attendee;
-			} elseif (strcasecmp($attendee->getValue(), $iTipMessage->recipient) === 0) {
-				/** @var Property $attendee */
-				return $attendee;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @param Message $iTipMessage
-	 * @param VEvent $vevent
-	 * @param int $lastOccurrence
-	 * @return string
-	 */
-	public function createInvitationToken(Message $iTipMessage, VEvent $vevent, int $lastOccurrence): string {
-		$token = $this->random->generate(60, ISecureRandom::CHAR_ALPHANUMERIC);
-
-		$attendee = $iTipMessage->recipient;
-		$organizer = $iTipMessage->sender;
-		$sequence = $iTipMessage->sequence;
-		$recurrenceId = isset($vevent->{'RECURRENCE-ID'}) ?
-			$vevent->{'RECURRENCE-ID'}->serialize() : null;
-		$uid = $vevent->{'UID'};
-
-		$query = $this->db->getQueryBuilder();
-		$query->insert('calendar_invitations')
-			->values([
-				'token' => $query->createNamedParameter($token),
-				'attendee' => $query->createNamedParameter($attendee),
-				'organizer' => $query->createNamedParameter($organizer),
-				'sequence' => $query->createNamedParameter($sequence),
-				'recurrenceid' => $query->createNamedParameter($recurrenceId),
-				'expiration' => $query->createNamedParameter($lastOccurrence),
-				'uid' => $query->createNamedParameter($uid)
-			])
-			->executeStatement();
-
-		return $token;
-	}
-
-	/**
-	 * @param IEMailTemplate $template
-	 * @param $token
-	 */
-	public function addResponseButtons(IEMailTemplate $template, $token) {
-		$template->addBodyButtonGroup(
-			$this->l10n->t('Accept'),
-			$this->urlGenerator->linkToRouteAbsolute('dav.invitation_response.accept', [
-				'token' => $token,
-			]),
-			$this->l10n->t('Decline'),
-			$this->urlGenerator->linkToRouteAbsolute('dav.invitation_response.decline', [
-				'token' => $token,
-			])
-		);
-	}
-
-	public function addMoreOptionsButton(IEMailTemplate $template, $token) {
-		$moreOptionsURL = $this->urlGenerator->linkToRouteAbsolute('dav.invitation_response.options', [
-			'token' => $token,
-		]);
-		$html = vsprintf('<small><a href="%s">%s</a></small>', [
-			$moreOptionsURL, $this->l10n->t('More options …')
-		]);
-		$text = $this->l10n->t('More options at %s', [$moreOptionsURL]);
-
-		$template->addBodyText($html, $text);
-	}
-
-	public function getReplyingAttendee(Message $iTipMessage): ?Property {
-		/** @var VEvent $vevent */
-		$vevent = $iTipMessage->message->VEVENT;
-		$attendees = $vevent->select('ATTENDEE');
-		foreach ($attendees as $attendee) {
-			/** @var Property $attendee */
-			if (strcasecmp($attendee->getValue(), $iTipMessage->sender) === 0) {
-				return $attendee;
-			}
-		}
-		return null;
-	}
-
-	public function isRoomOrResource(Property $attendee): bool {
-		$cuType = $attendee->offsetGet('CUTYPE');
-		if (!$cuType instanceof Parameter) {
-			return false;
-		}
-		$type = $cuType->getValue() ?? 'INDIVIDUAL';
-		if (\in_array(strtoupper($type), ['RESOURCE', 'ROOM'], true)) {
-			// Don't send emails to things
-			return true;
-		}
-		return false;
-	}
-
-	public function isCircle(Property $attendee): bool {
-		$cuType = $attendee->offsetGet('CUTYPE');
-		if (!$cuType instanceof Parameter) {
-			return false;
-		}
-
-		$uri = $attendee->getValue();
-		if (!$uri) {
-			return false;
-		}
-
-		$cuTypeValue = $cuType->getValue();
-		return $cuTypeValue === 'GROUP' && str_starts_with($uri, 'mailto:circle+');
-	}
-
-	public function minimizeInterval(\DateInterval $dateInterval): array {
-		// evaluate if time interval is in the past
-		if ($dateInterval->invert == 1) {
-			return ['interval' => 1, 'scale' => 'past'];
-		}
-		// evaluate interval parts and return smallest time period
-		if ($dateInterval->y > 0) {
-			$interval = $dateInterval->y;
-			$scale = 'year';
-		} elseif ($dateInterval->m > 0) {
-			$interval = $dateInterval->m;
-			$scale = 'month';
-		} elseif ($dateInterval->d >= 7) {
-			$interval = (int)($dateInterval->d / 7);
-			$scale = 'week';
-		} elseif ($dateInterval->d > 0) {
-			$interval = $dateInterval->d;
-			$scale = 'day';
-		} elseif ($dateInterval->h > 0) {
-			$interval = $dateInterval->h;
-			$scale = 'hour';
-		} else {
-			$interval = $dateInterval->i;
-			$scale = 'minute';
-		}
-
-		return ['interval' => $interval, 'scale' => $scale];
-	}
-
-	/**
-	 * Localizes week day names to another language
-	 *
-	 * @param string $value
-	 *
-	 * @return string
-	 */
-	public function localizeDayName(string $value): string {
-		return match ($value) {
-			'Monday' => $this->l10n->t('Monday'),
-			'Tuesday' => $this->l10n->t('Tuesday'),
-			'Wednesday' => $this->l10n->t('Wednesday'),
-			'Thursday' => $this->l10n->t('Thursday'),
-			'Friday' => $this->l10n->t('Friday'),
-			'Saturday' => $this->l10n->t('Saturday'),
-			'Sunday' => $this->l10n->t('Sunday'),
-		};
-	}
-
-	/**
-	 * Localizes month names to another language
-	 *
-	 * @param string $value
-	 *
-	 * @return string
-	 */
-	public function localizeMonthName(string $value): string {
-		return match ($value) {
-			'January' => $this->l10n->t('January'),
-			'February' => $this->l10n->t('February'),
-			'March' => $this->l10n->t('March'),
-			'April' => $this->l10n->t('April'),
-			'May' => $this->l10n->t('May'),
-			'June' => $this->l10n->t('June'),
-			'July' => $this->l10n->t('July'),
-			'August' => $this->l10n->t('August'),
-			'September' => $this->l10n->t('September'),
-			'October' => $this->l10n->t('October'),
-			'November' => $this->l10n->t('November'),
-			'December' => $this->l10n->t('December'),
-		};
-	}
-
-	/**
-	 * Localizes relative position names to another language
-	 *
-	 * @param string $value
-	 *
-	 * @return string
-	 */
-	public function localizeRelativePositionName(string $value): string {
-		return match ($value) {
-			'First' => $this->l10n->t('First'),
-			'Second' => $this->l10n->t('Second'),
-			'Third' => $this->l10n->t('Third'),
-			'Fourth' => $this->l10n->t('Fourth'),
-			'Fifth' => $this->l10n->t('Fifth'),
-			'Last' => $this->l10n->t('Last'),
-			'Second Last' => $this->l10n->t('Second Last'),
-			'Third Last' => $this->l10n->t('Third Last'),
-			'Fourth Last' => $this->l10n->t('Fourth Last'),
-			'Fifth Last' => $this->l10n->t('Fifth Last'),
-		};
-	}
+    /**
+     * generates a occurring next string for a recurring event
+     *
+     * @since 30.0.0
+     *
+     * @param EventReader $er
+     *
+     * @return string
+     */
+    public function generateOccurringString(EventReader $er): string {
+
+        // initialize
+        $occurrence = null;
+        $occurrence2 = null;
+        $occurrence3 = null;
+        // reset to initial occurrence
+        $er->recurrenceRewind();
+        // forward to current date
+        $er->recurrenceAdvanceTo($this->timeFactory->getDateTime());
+        // calculate time difference from now to start of next event occurrence and minimize it
+        $occurrenceIn = $this->minimizeInterval($this->timeFactory->getDateTime()->diff($er->recurrenceDate()));
+        // store next occurrence value
+        $occurrence = $this->l10n->l('date', $er->recurrenceDate(), ['width' => 'long']);
+        // forward one occurrence
+        $er->recurrenceAdvance();
+        // evaluate if occurrence is valid
+        if ($er->recurrenceDate() !== null) {
+            // store following occurrence value
+            $occurrence2 = $this->l10n->l('date', $er->recurrenceDate(), ['width' => 'long']);
+            // forward one occurrence
+            $er->recurrenceAdvance();
+            // evaluate if occurrence is valid
+            if ($er->recurrenceDate()) {
+                // store following occurrence value
+                $occurrence3 = $this->l10n->l('date', $er->recurrenceDate(), ['width' => 'long']);
+            }
+        }
+        // generate localized when string
+        // TRANSLATORS
+        // Indicates when a calendar event will happen, shown on invitation emails
+        // Output produced in order:
+        // In a minute/hour/day/week/month/year on July 1, 2024
+        // In a minute/hour/day/week/month/year on July 1, 2024 then on July 3, 2024
+        // In a minute/hour/day/week/month/year on July 1, 2024 then on July 3, 2024 and July 5, 2024
+        // In 2 minutes/hours/days/weeks/months/years on July 1, 2024
+        // In 2 minutes/hours/days/weeks/months/years on July 1, 2024 then on July 3, 2024
+        // In 2 minutes/hours/days/weeks/months/years on July 1, 2024 then on July 3, 2024 and July 5, 2024
+        return match ([$occurrenceIn['scale'], $occurrence2 !== null, $occurrence3 !== null]) {
+            ['past', false, false] => $this->l10n->t(
+                'In the past on %1$s',
+                [$occurrence]
+            ),
+            ['minute', false, false] => $this->l10n->n(
+                'In a minute on %1$s',
+                'In %n minutes on %1$s',
+                $occurrenceIn['interval'],
+                [$occurrence]
+            ),
+            ['hour', false, false] => $this->l10n->n(
+                'In a hour on %1$s',
+                'In %n hours on %1$s',
+                $occurrenceIn['interval'],
+                [$occurrence]
+            ),
+            ['day', false, false] => $this->l10n->n(
+                'In a day on %1$s',
+                'In %n days on %1$s',
+                $occurrenceIn['interval'],
+                [$occurrence]
+            ),
+            ['week', false, false] => $this->l10n->n(
+                'In a week on %1$s',
+                'In %n weeks on %1$s',
+                $occurrenceIn['interval'],
+                [$occurrence]
+            ),
+            ['month', false, false] => $this->l10n->n(
+                'In a month on %1$s',
+                'In %n months on %1$s',
+                $occurrenceIn['interval'],
+                [$occurrence]
+            ),
+            ['year', false, false] => $this->l10n->n(
+                'In a year on %1$s',
+                'In %n years on %1$s',
+                $occurrenceIn['interval'],
+                [$occurrence]
+            ),
+            ['past', true, false] => $this->l10n->t(
+                'In the past on %1$s then on %2$s',
+                [$occurrence, $occurrence2]
+            ),
+            ['minute', true, false] => $this->l10n->n(
+                'In a minute on %1$s then on %2$s',
+                'In %n minutes on %1$s then on %2$s',
+                $occurrenceIn['interval'],
+                [$occurrence, $occurrence2]
+            ),
+            ['hour', true, false] => $this->l10n->n(
+                'In a hour on %1$s then on %2$s',
+                'In %n hours on %1$s then on %2$s',
+                $occurrenceIn['interval'],
+                [$occurrence, $occurrence2]
+            ),
+            ['day', true, false] => $this->l10n->n(
+                'In a day on %1$s then on %2$s',
+                'In %n days on %1$s then on %2$s',
+                $occurrenceIn['interval'],
+                [$occurrence, $occurrence2]
+            ),
+            ['week', true, false] => $this->l10n->n(
+                'In a week on %1$s then on %2$s',
+                'In %n weeks on %1$s then on %2$s',
+                $occurrenceIn['interval'],
+                [$occurrence, $occurrence2]
+            ),
+            ['month', true, false] => $this->l10n->n(
+                'In a month on %1$s then on %2$s',
+                'In %n months on %1$s then on %2$s',
+                $occurrenceIn['interval'],
+                [$occurrence, $occurrence2]
+            ),
+            ['year', true, false] => $this->l10n->n(
+                'In a year on %1$s then on %2$s',
+                'In %n years on %1$s then on %2$s',
+                $occurrenceIn['interval'],
+                [$occurrence, $occurrence2]
+            ),
+            ['past', true, true] => $this->l10n->t(
+                'In the past on %1$s then on %2$s and %3$s',
+                [$occurrence, $occurrence2, $occurrence3]
+            ),
+            ['minute', true, true] => $this->l10n->n(
+                'In a minute on %1$s then on %2$s and %3$s',
+                'In %n minutes on %1$s then on %2$s and %3$s',
+                $occurrenceIn['interval'],
+                [$occurrence, $occurrence2, $occurrence3]
+            ),
+            ['hour', true, true] => $this->l10n->n(
+                'In a hour on %1$s then on %2$s and %3$s',
+                'In %n hours on %1$s then on %2$s and %3$s',
+                $occurrenceIn['interval'],
+                [$occurrence, $occurrence2, $occurrence3]
+            ),
+            ['day', true, true] => $this->l10n->n(
+                'In a day on %1$s then on %2$s and %3$s',
+                'In %n days on %1$s then on %2$s and %3$s',
+                $occurrenceIn['interval'],
+                [$occurrence, $occurrence2, $occurrence3]
+            ),
+            ['week', true, true] => $this->l10n->n(
+                'In a week on %1$s then on %2$s and %3$s',
+                'In %n weeks on %1$s then on %2$s and %3$s',
+                $occurrenceIn['interval'],
+                [$occurrence, $occurrence2, $occurrence3]
+            ),
+            ['month', true, true] => $this->l10n->n(
+                'In a month on %1$s then on %2$s and %3$s',
+                'In %n months on %1$s then on %2$s and %3$s',
+                $occurrenceIn['interval'],
+                [$occurrence, $occurrence2, $occurrence3]
+            ),
+            ['year', true, true] => $this->l10n->n(
+                'In a year on %1$s then on %2$s and %3$s',
+                'In %n years on %1$s then on %2$s and %3$s',
+                $occurrenceIn['interval'],
+                [$occurrence, $occurrence2, $occurrence3]
+            ),
+            default => $this->l10n->t('Could not generate next recurrence statement')
+        };
+
+    }
+
+    /**
+     * @param VEvent $vEvent
+     * @return array
+     */
+    public function buildCancelledBodyData(VEvent $vEvent): array {
+        // construct event reader
+        $eventReaderCurrent = new EventReader($vEvent);
+        $defaultVal = '';
+        $strikethrough = "<span style='text-decoration: line-through'>%s</span>";
+
+        $newMeetingWhen = $this->generateWhenString($eventReaderCurrent);
+        $newSummary = isset($vEvent->SUMMARY) && (string)$vEvent->SUMMARY !== '' ? (string)$vEvent->SUMMARY : $this->l10n->t('Untitled event');
+        $newDescription = isset($vEvent->DESCRIPTION) && (string)$vEvent->DESCRIPTION !== '' ? (string)$vEvent->DESCRIPTION : $defaultVal;
+        $newUrl = isset($vEvent->URL) && (string)$vEvent->URL !== '' ? sprintf('<a href="%1$s">%1$s</a>', $vEvent->URL) : $defaultVal;
+        $newLocation = isset($vEvent->LOCATION) && (string)$vEvent->LOCATION !== '' ? (string)$vEvent->LOCATION : $defaultVal;
+        $newLocationHtml = $this->linkify($newLocation) ?? $newLocation;
+
+        $data = [];
+        $data['meeting_when_html'] = $newMeetingWhen === '' ?: sprintf($strikethrough, $newMeetingWhen);
+        $data['meeting_when'] = $newMeetingWhen;
+        $data['meeting_title_html'] = sprintf($strikethrough, $newSummary);
+        $data['meeting_title'] = $newSummary !== '' ? $newSummary: $this->l10n->t('Untitled event');
+        $data['meeting_description_html'] = $newDescription !== '' ? sprintf($strikethrough, $newDescription) : '';
+        $data['meeting_description'] = $newDescription;
+        $data['meeting_url_html'] = $newUrl !== '' ? sprintf($strikethrough, $newUrl) : '';
+        $data['meeting_url'] = isset($vEvent->URL) ? (string)$vEvent->URL : '';
+        $data['meeting_location_html'] = $newLocationHtml !== '' ? sprintf($strikethrough, $newLocationHtml) : '';
+        $data['meeting_location'] = $newLocation;
+        return $data;
+    }
+
+    /**
+     * Check if event took place in the past
+     *
+     * @param VCalendar $vObject
+     * @return int
+     */
+    public function getLastOccurrence(VCalendar $vObject) {
+        /** @var VEvent $component */
+        $component = $vObject->VEVENT;
+
+        if (isset($component->RRULE)) {
+            $it = new EventIterator($vObject, (string)$component->UID);
+            $maxDate = new \DateTime(IMipPlugin::MAX_DATE);
+            if ($it->isInfinite()) {
+                return $maxDate->getTimestamp();
+            }
+
+            $end = $it->getDtEnd();
+            while ($it->valid() && $end < $maxDate) {
+                $end = $it->getDtEnd();
+                $it->next();
+            }
+            return $end->getTimestamp();
+        }
+
+        /** @var Property\ICalendar\DateTime $dtStart */
+        $dtStart = $component->DTSTART;
+
+        if (isset($component->DTEND)) {
+            /** @var Property\ICalendar\DateTime $dtEnd */
+            $dtEnd = $component->DTEND;
+            return $dtEnd->getDateTime()->getTimeStamp();
+        }
+
+        if (isset($component->DURATION)) {
+            /** @var \DateTime $endDate */
+            $endDate = clone $dtStart->getDateTime();
+            // $component->DTEND->getDateTime() returns DateTimeImmutable
+            $endDate = $endDate->add(DateTimeParser::parse($component->DURATION->getValue()));
+            return $endDate->getTimestamp();
+        }
+
+        if (!$dtStart->hasTime()) {
+            /** @var \DateTime $endDate */
+            // $component->DTSTART->getDateTime() returns DateTimeImmutable
+            $endDate = clone $dtStart->getDateTime();
+            $endDate = $endDate->modify('+1 day');
+            return $endDate->getTimestamp();
+        }
+
+        // No computation of end time possible - return start date
+        return $dtStart->getDateTime()->getTimeStamp();
+    }
+
+    /**
+     * @param Property|null $attendee
+     */
+    public function setL10n(?Property $attendee = null) {
+        if ($attendee === null) {
+            return;
+        }
+
+        $lang = $attendee->offsetGet('LANGUAGE');
+        if ($lang instanceof Parameter) {
+            $lang = $lang->getValue();
+            $this->l10n = $this->l10nFactory->get('dav', $lang);
+        }
+    }
+
+    /**
+     * @param Property|null $attendee
+     * @return bool
+     */
+    public function getAttendeeRsvpOrReqForParticipant(?Property $attendee = null) {
+        if ($attendee === null) {
+            return false;
+        }
+
+        $rsvp = $attendee->offsetGet('RSVP');
+        if (($rsvp instanceof Parameter) && (strcasecmp($rsvp->getValue(), 'TRUE') === 0)) {
+            return true;
+        }
+        $role = $attendee->offsetGet('ROLE');
+        // @see https://datatracker.ietf.org/doc/html/rfc5545#section-3.2.16
+        // Attendees without a role are assumed required and should receive an invitation link even if they have no RSVP set
+        if ($role === null
+            || (($role instanceof Parameter) && (strcasecmp($role->getValue(), 'REQ-PARTICIPANT') === 0))
+            || (($role instanceof Parameter) && (strcasecmp($role->getValue(), 'OPT-PARTICIPANT') === 0))
+        ) {
+            return true;
+        }
+
+        // RFC 5545 3.2.17: default RSVP is false
+        return false;
+    }
+
+    /**
+     * @param IEMailTemplate $template
+     * @param string $method
+     * @param string $sender
+     * @param string $summary
+     * @param string|null $partstat
+     * @param bool $isModified
+     */
+    public function addSubjectAndHeading(IEMailTemplate $template,
+        string $method, string $sender, string $summary, bool $isModified, ?Property $replyingAttendee = null): void {
+        if ($method === IMipPlugin::METHOD_CANCEL) {
+            // TRANSLATORS Subject for email, when an invitation is cancelled. Ex: "Cancelled: {{Event Name}}"
+            $template->setSubject($this->l10n->t('Cancelled: %1$s', [$summary]));
+            $template->addHeading($this->l10n->t('"%1$s" has been canceled', [$summary]));
+        } elseif ($method === IMipPlugin::METHOD_REPLY) {
+            // TRANSLATORS Subject for email, when an invitation is replied to. Ex: "Re: {{Event Name}}"
+            $template->setSubject($this->l10n->t('Re: %1$s', [$summary]));
+            // Build the strings
+            $partstat = (isset($replyingAttendee)) ? $replyingAttendee->offsetGet('PARTSTAT') : null;
+            $partstat = ($partstat instanceof Parameter) ? $partstat->getValue() : null;
+            switch ($partstat) {
+                case 'ACCEPTED':
+                    $template->addHeading($this->l10n->t('%1$s has accepted your invitation', [$sender]));
+                    break;
+                case 'TENTATIVE':
+                    $template->addHeading($this->l10n->t('%1$s has tentatively accepted your invitation', [$sender]));
+                    break;
+                case 'DECLINED':
+                    $template->addHeading($this->l10n->t('%1$s has declined your invitation', [$sender]));
+                    break;
+                case null:
+                default:
+                    $template->addHeading($this->l10n->t('%1$s has responded to your invitation', [$sender]));
+                    break;
+            }
+        } elseif ($method === IMipPlugin::METHOD_REQUEST && $isModified) {
+            // TRANSLATORS Subject for email, when an invitation is updated. Ex: "Invitation updated: {{Event Name}}"
+            $template->setSubject($this->l10n->t('Invitation updated: %1$s', [$summary]));
+            $template->addHeading($this->l10n->t('%1$s updated the event "%2$s"', [$sender, $summary]));
+        } else {
+            // TRANSLATORS Subject for email, when an invitation is sent. Ex: "Invitation: {{Event Name}}"
+            $template->setSubject($this->l10n->t('Invitation: %1$s', [$summary]));
+            $template->addHeading($this->l10n->t('%1$s would like to invite you to "%2$s"', [$sender, $summary]));
+        }
+    }
+
+    /**
+     * @param string $path
+     * @return string
+     */
+    public function getAbsoluteImagePath($path): string {
+        return $this->urlGenerator->getAbsoluteURL(
+            $this->urlGenerator->imagePath('core', $path)
+        );
+    }
+
+    /**
+     * addAttendees: add organizer and attendee names/emails to iMip mail.
+     *
+     * Enable with DAV setting: invitation_list_attendees (default: no)
+     *
+     * The default is 'no', which matches old behavior, and is privacy preserving.
+     *
+     * To enable including attendees in invitation emails:
+     *   % php occ config:app:set dav invitation_list_attendees --value yes
+     *
+     * @param IEMailTemplate $template
+     * @param IL10N $this->l10n
+     * @param VEvent $vevent
+     * @author brad2014 on github.com
+     */
+    public function addAttendees(IEMailTemplate $template, VEvent $vevent) {
+        if ($this->config->getAppValue('dav', 'invitation_list_attendees', 'no') === 'no') {
+            return;
+        }
+
+        if (isset($vevent->ORGANIZER)) {
+            /** @var Property | Property\ICalendar\CalAddress $organizer */
+            $organizer = $vevent->ORGANIZER;
+            $organizerEmail = substr($organizer->getNormalizedValue(), 7);
+            /** @var string|null $organizerName */
+            $organizerName = isset($organizer->CN) ? $organizer->CN->getValue() : null;
+            $organizerHTML = sprintf('<a href="%s">%s</a>',
+                htmlspecialchars($organizer->getNormalizedValue()),
+                htmlspecialchars($organizerName ?: $organizerEmail));
+            $organizerText = sprintf('%s <%s>', $organizerName, $organizerEmail);
+            if (isset($organizer['PARTSTAT'])) {
+                /** @var Parameter $partstat */
+                $partstat = $organizer['PARTSTAT'];
+                if (strcasecmp($partstat->getValue(), 'ACCEPTED') === 0) {
+                    $organizerHTML .= ' ✔︎';
+                    $organizerText .= ' ✔︎';
+                }
+            }
+            $template->addBodyListItem($organizerHTML, $this->l10n->t('Organizer:'),
+                $this->getAbsoluteImagePath('caldav/organizer.png'),
+                $organizerText, '', IMipPlugin::IMIP_INDENT);
+        }
+
+        $attendees = $vevent->select('ATTENDEE');
+        if (count($attendees) === 0) {
+            return;
+        }
+
+        $attendeesHTML = [];
+        $attendeesText = [];
+        foreach ($attendees as $attendee) {
+            $attendeeEmail = substr($attendee->getNormalizedValue(), 7);
+            $attendeeName = isset($attendee['CN']) ? $attendee['CN']->getValue() : null;
+            $attendeeHTML = sprintf('<a href="%s">%s</a>',
+                htmlspecialchars($attendee->getNormalizedValue()),
+                htmlspecialchars($attendeeName ?: $attendeeEmail));
+            $attendeeText = sprintf('%s <%s>', $attendeeName, $attendeeEmail);
+            if (isset($attendee['PARTSTAT'])) {
+                /** @var Parameter $partstat */
+                $partstat = $attendee['PARTSTAT'];
+                if (strcasecmp($partstat->getValue(), 'ACCEPTED') === 0) {
+                    $attendeeHTML .= ' ✔︎';
+                    $attendeeText .= ' ✔︎';
+                }
+            }
+            $attendeesHTML[] = $attendeeHTML;
+            $attendeesText[] = $attendeeText;
+        }
+
+        $template->addBodyListItem(implode('<br/>', $attendeesHTML), $this->l10n->t('Attendees:'),
+            $this->getAbsoluteImagePath('caldav/attendees.png'),
+            implode("\n", $attendeesText), '', IMipPlugin::IMIP_INDENT);
+    }
+
+    /**
+     * @param IEMailTemplate $template
+     * @param VEVENT $vevent
+     * @param $data
+     */
+    public function addBulletList(IEMailTemplate $template, VEvent $vevent, $data) {
+        $template->addBodyListItem(
+            $data['meeting_title_html'] ?? $data['meeting_title'], $this->l10n->t('Title:'),
+            $this->getAbsoluteImagePath('caldav/title.png'), $data['meeting_title'], '', IMipPlugin::IMIP_INDENT);
+        if ($data['meeting_when'] !== '') {
+            $template->addBodyListItem($data['meeting_when_html'] ?? $data['meeting_when'], $this->l10n->t('When:'),
+                $this->getAbsoluteImagePath('caldav/time.png'), $data['meeting_when'], '', IMipPlugin::IMIP_INDENT);
+        }
+        if ($data['meeting_location'] !== '') {
+            $template->addBodyListItem($data['meeting_location_html'] ?? $data['meeting_location'], $this->l10n->t('Location:'),
+                $this->getAbsoluteImagePath('caldav/location.png'), $data['meeting_location'], '', IMipPlugin::IMIP_INDENT);
+        }
+        if ($data['meeting_url'] !== '') {
+            $template->addBodyListItem($data['meeting_url_html'] ?? $data['meeting_url'], $this->l10n->t('Link:'),
+                $this->getAbsoluteImagePath('caldav/link.png'), $data['meeting_url'], '', IMipPlugin::IMIP_INDENT);
+        }
+        if (isset($data['meeting_occurring'])) {
+            $template->addBodyListItem($data['meeting_occurring_html'] ?? $data['meeting_occurring'], $this->l10n->t('Occurring:'),
+                $this->getAbsoluteImagePath('caldav/time.png'), $data['meeting_occurring'], '', IMipPlugin::IMIP_INDENT);
+        }
+
+        $this->addAttendees($template, $vevent);
+
+        /* Put description last, like an email body, since it can be arbitrarily long */
+        if ($data['meeting_description']) {
+            $template->addBodyListItem($data['meeting_description_html'] ?? $data['meeting_description'], $this->l10n->t('Description:'),
+                $this->getAbsoluteImagePath('caldav/description.png'), $data['meeting_description'], '', IMipPlugin::IMIP_INDENT);
+        }
+    }
+
+    /**
+     * @param Message $iTipMessage
+     * @return null|Property
+     */
+    public function getCurrentAttendee(Message $iTipMessage): ?Property {
+        /** @var VEvent $vevent */
+        $vevent = $iTipMessage->message->VEVENT;
+        $attendees = $vevent->select('ATTENDEE');
+        foreach ($attendees as $attendee) {
+            if ($iTipMessage->method === 'REPLY' && strcasecmp($attendee->getValue(), $iTipMessage->sender) === 0) {
+                /** @var Property $attendee */
+                return $attendee;
+            } elseif (strcasecmp($attendee->getValue(), $iTipMessage->recipient) === 0) {
+                /** @var Property $attendee */
+                return $attendee;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * @param Message $iTipMessage
+     * @param VEvent $vevent
+     * @param int $lastOccurrence
+     * @return string
+     */
+    public function createInvitationToken(Message $iTipMessage, VEvent $vevent, int $lastOccurrence): string {
+        $token = $this->random->generate(60, ISecureRandom::CHAR_ALPHANUMERIC);
+
+        $attendee = $iTipMessage->recipient;
+        $organizer = $iTipMessage->sender;
+        $sequence = $iTipMessage->sequence;
+        $recurrenceId = isset($vevent->{'RECURRENCE-ID'}) ?
+            $vevent->{'RECURRENCE-ID'}->serialize() : null;
+        $uid = $vevent->{'UID'};
+
+        $query = $this->db->getQueryBuilder();
+        $query->insert('calendar_invitations')
+            ->values([
+                'token' => $query->createNamedParameter($token),
+                'attendee' => $query->createNamedParameter($attendee),
+                'organizer' => $query->createNamedParameter($organizer),
+                'sequence' => $query->createNamedParameter($sequence),
+                'recurrenceid' => $query->createNamedParameter($recurrenceId),
+                'expiration' => $query->createNamedParameter($lastOccurrence),
+                'uid' => $query->createNamedParameter($uid)
+            ])
+            ->executeStatement();
+
+        return $token;
+    }
+
+    /**
+     * @param IEMailTemplate $template
+     * @param $token
+     */
+    public function addResponseButtons(IEMailTemplate $template, $token) {
+        $template->addBodyButtonGroup(
+            $this->l10n->t('Accept'),
+            $this->urlGenerator->linkToRouteAbsolute('dav.invitation_response.accept', [
+                'token' => $token,
+            ]),
+            $this->l10n->t('Decline'),
+            $this->urlGenerator->linkToRouteAbsolute('dav.invitation_response.decline', [
+                'token' => $token,
+            ])
+        );
+    }
+
+    public function addMoreOptionsButton(IEMailTemplate $template, $token) {
+        $moreOptionsURL = $this->urlGenerator->linkToRouteAbsolute('dav.invitation_response.options', [
+            'token' => $token,
+        ]);
+        $html = vsprintf('<small><a href="%s">%s</a></small>', [
+            $moreOptionsURL, $this->l10n->t('More options …')
+        ]);
+        $text = $this->l10n->t('More options at %s', [$moreOptionsURL]);
+
+        $template->addBodyText($html, $text);
+    }
+
+    public function getReplyingAttendee(Message $iTipMessage): ?Property {
+        /** @var VEvent $vevent */
+        $vevent = $iTipMessage->message->VEVENT;
+        $attendees = $vevent->select('ATTENDEE');
+        foreach ($attendees as $attendee) {
+            /** @var Property $attendee */
+            if (strcasecmp($attendee->getValue(), $iTipMessage->sender) === 0) {
+                return $attendee;
+            }
+        }
+        return null;
+    }
+
+    public function isRoomOrResource(Property $attendee): bool {
+        $cuType = $attendee->offsetGet('CUTYPE');
+        if (!$cuType instanceof Parameter) {
+            return false;
+        }
+        $type = $cuType->getValue() ?? 'INDIVIDUAL';
+        if (\in_array(strtoupper($type), ['RESOURCE', 'ROOM'], true)) {
+            // Don't send emails to things
+            return true;
+        }
+        return false;
+    }
+
+    public function isCircle(Property $attendee): bool {
+        $cuType = $attendee->offsetGet('CUTYPE');
+        if (!$cuType instanceof Parameter) {
+            return false;
+        }
+
+        $uri = $attendee->getValue();
+        if (!$uri) {
+            return false;
+        }
+
+        $cuTypeValue = $cuType->getValue();
+        return $cuTypeValue === 'GROUP' && str_starts_with($uri, 'mailto:circle+');
+    }
+
+    public function minimizeInterval(\DateInterval $dateInterval): array {
+        // evaluate if time interval is in the past
+        if ($dateInterval->invert == 1) {
+            return ['interval' => 1, 'scale' => 'past'];
+        }
+        // evaluate interval parts and return smallest time period
+        if ($dateInterval->y > 0) {
+            $interval = $dateInterval->y;
+            $scale = 'year';
+        } elseif ($dateInterval->m > 0) {
+            $interval = $dateInterval->m;
+            $scale = 'month';
+        } elseif ($dateInterval->d >= 7) {
+            $interval = (int)($dateInterval->d / 7);
+            $scale = 'week';
+        } elseif ($dateInterval->d > 0) {
+            $interval = $dateInterval->d;
+            $scale = 'day';
+        } elseif ($dateInterval->h > 0) {
+            $interval = $dateInterval->h;
+            $scale = 'hour';
+        } else {
+            $interval = $dateInterval->i;
+            $scale = 'minute';
+        }
+
+        return ['interval' => $interval, 'scale' => $scale];
+    }
+
+    /**
+     * Localizes week day names to another language
+     *
+     * @param string $value
+     *
+     * @return string
+     */
+    public function localizeDayName(string $value): string {
+        return match ($value) {
+            'Monday' => $this->l10n->t('Monday'),
+            'Tuesday' => $this->l10n->t('Tuesday'),
+            'Wednesday' => $this->l10n->t('Wednesday'),
+            'Thursday' => $this->l10n->t('Thursday'),
+            'Friday' => $this->l10n->t('Friday'),
+            'Saturday' => $this->l10n->t('Saturday'),
+            'Sunday' => $this->l10n->t('Sunday'),
+        };
+    }
+
+    /**
+     * Localizes month names to another language
+     *
+     * @param string $value
+     *
+     * @return string
+     */
+    public function localizeMonthName(string $value): string {
+        return match ($value) {
+            'January' => $this->l10n->t('January'),
+            'February' => $this->l10n->t('February'),
+            'March' => $this->l10n->t('March'),
+            'April' => $this->l10n->t('April'),
+            'May' => $this->l10n->t('May'),
+            'June' => $this->l10n->t('June'),
+            'July' => $this->l10n->t('July'),
+            'August' => $this->l10n->t('August'),
+            'September' => $this->l10n->t('September'),
+            'October' => $this->l10n->t('October'),
+            'November' => $this->l10n->t('November'),
+            'December' => $this->l10n->t('December'),
+        };
+    }
+
+    /**
+     * Localizes relative position names to another language
+     *
+     * @param string $value
+     *
+     * @return string
+     */
+    public function localizeRelativePositionName(string $value): string {
+        return match ($value) {
+            'First' => $this->l10n->t('First'),
+            'Second' => $this->l10n->t('Second'),
+            'Third' => $this->l10n->t('Third'),
+            'Fourth' => $this->l10n->t('Fourth'),
+            'Fifth' => $this->l10n->t('Fifth'),
+            'Last' => $this->l10n->t('Last'),
+            'Second Last' => $this->l10n->t('Second Last'),
+            'Third Last' => $this->l10n->t('Third Last'),
+            'Fourth Last' => $this->l10n->t('Fourth Last'),
+            'Fifth Last' => $this->l10n->t('Fifth Last'),
+        };
+    }
 }

apps/dav/tests/unit/CalDAV/Schedule/IMipPluginTest.php

Indentation +1027 added lines, -1027 removed lines

@@ -31,1080 +31,1080 @@
 use function array_merge;
 
 interface IMailServiceMock extends IMailService, IMailMessageSend {
-	// workaround for creating mock class with multiple interfaces
-	// TODO: remove after phpUnit 10 is supported.
+    // workaround for creating mock class with multiple interfaces
+    // TODO: remove after phpUnit 10 is supported.
 }
 
 class IMipPluginTest extends TestCase {
 
-	/** @var IMessage|MockObject */
-	private $mailMessage;
+    /** @var IMessage|MockObject */
+    private $mailMessage;
 
-	/** @var IMailer|MockObject */
-	private $mailer;
+    /** @var IMailer|MockObject */
+    private $mailer;
 
-	/** @var IEMailTemplate|MockObject */
-	private $emailTemplate;
+    /** @var IEMailTemplate|MockObject */
+    private $emailTemplate;
 
-	/** @var IAttachment|MockObject */
-	private $emailAttachment;
+    /** @var IAttachment|MockObject */
+    private $emailAttachment;
 
-	/** @var ITimeFactory|MockObject */
-	private $timeFactory;
+    /** @var ITimeFactory|MockObject */
+    private $timeFactory;
 
-	/** @var IAppConfig|MockObject */
-	private $config;
+    /** @var IAppConfig|MockObject */
+    private $config;
 
-	/** @var IUserSession|MockObject */
-	private $userSession;
+    /** @var IUserSession|MockObject */
+    private $userSession;
 
-	/** @var IUser|MockObject */
-	private $user;
+    /** @var IUser|MockObject */
+    private $user;
 
-	/** @var IMipPlugin */
-	private $plugin;
+    /** @var IMipPlugin */
+    private $plugin;
 
-	/** @var IMipService|MockObject */
-	private $service;
+    /** @var IMipService|MockObject */
+    private $service;
 
-	/** @var Defaults|MockObject */
-	private $defaults;
+    /** @var Defaults|MockObject */
+    private $defaults;
 
-	/** @var LoggerInterface|MockObject */
-	private $logger;
+    /** @var LoggerInterface|MockObject */
+    private $logger;
 
-	/** @var EventComparisonService|MockObject */
-	private $eventComparisonService;
+    /** @var EventComparisonService|MockObject */
+    private $eventComparisonService;
 
-	/** @var IMailManager|MockObject */
-	private $mailManager;
+    /** @var IMailManager|MockObject */
+    private $mailManager;
 
-	/** @var IMailService|IMailMessageSend|MockObject */
-	private $mailService;
+    /** @var IMailService|IMailMessageSend|MockObject */
+    private $mailService;
 
-	/** @var IMailMessageNew|MockObject */
-	private $mailMessageNew;
+    /** @var IMailMessageNew|MockObject */
+    private $mailMessageNew;
 
-	protected function setUp(): void {
-		$this->mailMessage = $this->createMock(IMessage::class);
-		$this->mailMessage->method('setFrom')->willReturn($this->mailMessage);
-		$this->mailMessage->method('setReplyTo')->willReturn($this->mailMessage);
-		$this->mailMessage->method('setTo')->willReturn($this->mailMessage);
+    protected function setUp(): void {
+        $this->mailMessage = $this->createMock(IMessage::class);
+        $this->mailMessage->method('setFrom')->willReturn($this->mailMessage);
+        $this->mailMessage->method('setReplyTo')->willReturn($this->mailMessage);
+        $this->mailMessage->method('setTo')->willReturn($this->mailMessage);
 
-		$this->mailer = $this->createMock(IMailer::class);
-		$this->mailer->method('createMessage')->willReturn($this->mailMessage);
+        $this->mailer = $this->createMock(IMailer::class);
+        $this->mailer->method('createMessage')->willReturn($this->mailMessage);
 
-		$this->emailTemplate = $this->createMock(IEMailTemplate::class);
-		$this->mailer->method('createEMailTemplate')->willReturn($this->emailTemplate);
+        $this->emailTemplate = $this->createMock(IEMailTemplate::class);
+        $this->mailer->method('createEMailTemplate')->willReturn($this->emailTemplate);
 
-		$this->emailAttachment = $this->createMock(IAttachment::class);
-		$this->mailer->method('createAttachment')->willReturn($this->emailAttachment);
+        $this->emailAttachment = $this->createMock(IAttachment::class);
+        $this->mailer->method('createAttachment')->willReturn($this->emailAttachment);
 
-		$this->logger = $this->createMock(LoggerInterface::class);
+        $this->logger = $this->createMock(LoggerInterface::class);
 
-		$this->timeFactory = $this->createMock(ITimeFactory::class);
-		$this->timeFactory->method('getTime')->willReturn(1496912528); // 2017-01-01
+        $this->timeFactory = $this->createMock(ITimeFactory::class);
+        $this->timeFactory->method('getTime')->willReturn(1496912528); // 2017-01-01
 
-		$this->config = $this->createMock(IAppConfig::class);
+        $this->config = $this->createMock(IAppConfig::class);
 
-		$this->user = $this->createMock(IUser::class);
+        $this->user = $this->createMock(IUser::class);
 
-		$this->userSession = $this->createMock(IUserSession::class);
-		$this->userSession->method('getUser')
-			->willReturn($this->user);
+        $this->userSession = $this->createMock(IUserSession::class);
+        $this->userSession->method('getUser')
+            ->willReturn($this->user);
 
-		$this->defaults = $this->createMock(Defaults::class);
-		$this->defaults->method('getName')
-			->willReturn('Instance Name 123');
+        $this->defaults = $this->createMock(Defaults::class);
+        $this->defaults->method('getName')
+            ->willReturn('Instance Name 123');
 
-		$this->service = $this->createMock(IMipService::class);
+        $this->service = $this->createMock(IMipService::class);
 
-		$this->eventComparisonService = $this->createMock(EventComparisonService::class);
+        $this->eventComparisonService = $this->createMock(EventComparisonService::class);
 
-		$this->mailManager = $this->createMock(IMailManager::class);
+        $this->mailManager = $this->createMock(IMailManager::class);
 
-		$this->mailService = $this->createMock(IMailServiceMock::class);
+        $this->mailService = $this->createMock(IMailServiceMock::class);
 
-		$this->mailMessageNew = $this->createMock(IMailMessageNew::class);
+        $this->mailMessageNew = $this->createMock(IMailMessageNew::class);
 
-		$this->plugin = new IMipPlugin(
-			$this->config,
-			$this->mailer,
-			$this->logger,
-			$this->timeFactory,
-			$this->defaults,
-			$this->userSession,
-			$this->service,
-			$this->eventComparisonService,
-			$this->mailManager,
-		);
-	}
+        $this->plugin = new IMipPlugin(
+            $this->config,
+            $this->mailer,
+            $this->logger,
+            $this->timeFactory,
+            $this->defaults,
+            $this->userSession,
+            $this->service,
+            $this->eventComparisonService,
+            $this->mailManager,
+        );
+    }
 
-	public function testDeliveryNoSignificantChange(): void {
-		$message = new Message();
-		$message->method = 'REQUEST';
-		$message->message = new VCalendar();
-		$message->message->add('VEVENT', array_merge([
-			'UID' => 'uid-1234',
-			'SEQUENCE' => 0,
-			'SUMMARY' => 'Fellowship meeting',
-			'DTSTART' => new \DateTime('2016-01-01 00:00:00')
-		], []));
-		$message->message->VEVENT->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
-		$message->message->VEVENT->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE']);
-		$message->sender = 'mailto:gandalf@wiz.ard';
-		$message->senderName = 'Mr. Wizard';
-		$message->recipient = 'mailto:' . 'frodo@hobb.it';
-		$message->significantChange = false;
-		$this->plugin->schedule($message);
-		$this->assertEquals('1.0', $message->getScheduleStatus());
-	}
+    public function testDeliveryNoSignificantChange(): void {
+        $message = new Message();
+        $message->method = 'REQUEST';
+        $message->message = new VCalendar();
+        $message->message->add('VEVENT', array_merge([
+            'UID' => 'uid-1234',
+            'SEQUENCE' => 0,
+            'SUMMARY' => 'Fellowship meeting',
+            'DTSTART' => new \DateTime('2016-01-01 00:00:00')
+        ], []));
+        $message->message->VEVENT->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
+        $message->message->VEVENT->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE']);
+        $message->sender = 'mailto:gandalf@wiz.ard';
+        $message->senderName = 'Mr. Wizard';
+        $message->recipient = 'mailto:' . 'frodo@hobb.it';
+        $message->significantChange = false;
+        $this->plugin->schedule($message);
+        $this->assertEquals('1.0', $message->getScheduleStatus());
+    }
 
-	public function testParsingSingle(): void {
-		$message = new Message();
-		$message->method = 'REQUEST';
-		$newVCalendar = new VCalendar();
-		$newVevent = new VEvent($newVCalendar, 'one', array_merge([
-			'UID' => 'uid-1234',
-			'SEQUENCE' => 1,
-			'SUMMARY' => 'Fellowship meeting without (!) Boromir',
-			'DTSTART' => new \DateTime('2016-01-01 00:00:00')
-		], []));
-		$newVevent->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
-		$newVevent->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE',  'CN' => 'Frodo']);
-		$message->message = $newVCalendar;
-		$message->sender = 'mailto:gandalf@wiz.ard';
-		$message->senderName = 'Mr. Wizard';
-		$message->recipient = 'mailto:' . 'frodo@hobb.it';
-		// save the old copy in the plugin
-		$oldVCalendar = new VCalendar();
-		$oldVEvent = new VEvent($oldVCalendar, 'one', [
-			'UID' => 'uid-1234',
-			'SEQUENCE' => 0,
-			'SUMMARY' => 'Fellowship meeting',
-			'DTSTART' => new \DateTime('2016-01-01 00:00:00')
-		]);
-		$oldVEvent->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
-		$oldVEvent->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
-		$oldVEvent->add('ATTENDEE', 'mailto:' . 'boromir@tra.it.or', ['RSVP' => 'TRUE']);
-		$oldVCalendar->add($oldVEvent);
-		$data = ['invitee_name' => 'Mr. Wizard',
-			'meeting_title' => 'Fellowship meeting without (!) Boromir',
-			'attendee_name' => 'frodo@hobb.it'
-		];
-		$attendees = $newVevent->select('ATTENDEE');
-		$atnd = '';
-		foreach ($attendees as $attendee) {
-			if (strcasecmp($attendee->getValue(), $message->recipient) === 0) {
-				$atnd = $attendee;
-			}
-		}
-		$this->plugin->setVCalendar($oldVCalendar);
-		$this->service->expects(self::once())
-			->method('getLastOccurrence')
-			->willReturn(1496912700);
-		$this->mailer->expects(self::once())
-			->method('validateMailAddress')
-			->with('frodo@hobb.it')
-			->willReturn(true);
-		$this->eventComparisonService->expects(self::once())
-			->method('findModified')
-			->willReturn(['new' => [$newVevent], 'old' => [$oldVEvent]]);
-		$this->service->expects(self::once())
-			->method('getCurrentAttendee')
-			->with($message)
-			->willReturn($atnd);
-		$this->service->expects(self::once())
-			->method('isRoomOrResource')
-			->with($atnd)
-			->willReturn(false);
-		$this->service->expects(self::once())
-			->method('isCircle')
-			->with($atnd)
-			->willReturn(false);
-		$this->service->expects(self::once())
-			->method('buildBodyData')
-			->with($newVevent, $oldVEvent)
-			->willReturn($data);
-		$this->user->expects(self::any())
-			->method('getUID')
-			->willReturn('user1');
-		$this->user->expects(self::any())
-			->method('getDisplayName')
-			->willReturn('Mr. Wizard');
-		$this->userSession->expects(self::any())
-			->method('getUser')
-			->willReturn($this->user);
-		$this->service->expects(self::once())
-			->method('getFrom');
-		$this->service->expects(self::once())
-			->method('addSubjectAndHeading')
-			->with($this->emailTemplate, 'request', 'Mr. Wizard', 'Fellowship meeting without (!) Boromir', true);
-		$this->service->expects(self::once())
-			->method('addBulletList')
-			->with($this->emailTemplate, $newVevent, $data);
-		$this->service->expects(self::once())
-			->method('getAttendeeRsvpOrReqForParticipant')
-			->willReturn(true);
-		$this->config->expects(self::once())
-			->method('getValueString')
-			->with('dav', 'invitation_link_recipients', 'yes')
-			->willReturn('yes');
-		$this->service->expects(self::once())
-			->method('createInvitationToken')
-			->with($message, $newVevent, 1496912700)
-			->willReturn('token');
-		$this->service->expects(self::once())
-			->method('addResponseButtons')
-			->with($this->emailTemplate, 'token');
-		$this->service->expects(self::once())
-			->method('addMoreOptionsButton')
-			->with($this->emailTemplate, 'token');
-		$this->mailer->expects(self::once())
-			->method('send')
-			->willReturn([]);
-		$this->plugin->schedule($message);
-		$this->assertEquals('1.1', $message->getScheduleStatus());
-	}
+    public function testParsingSingle(): void {
+        $message = new Message();
+        $message->method = 'REQUEST';
+        $newVCalendar = new VCalendar();
+        $newVevent = new VEvent($newVCalendar, 'one', array_merge([
+            'UID' => 'uid-1234',
+            'SEQUENCE' => 1,
+            'SUMMARY' => 'Fellowship meeting without (!) Boromir',
+            'DTSTART' => new \DateTime('2016-01-01 00:00:00')
+        ], []));
+        $newVevent->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
+        $newVevent->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE',  'CN' => 'Frodo']);
+        $message->message = $newVCalendar;
+        $message->sender = 'mailto:gandalf@wiz.ard';
+        $message->senderName = 'Mr. Wizard';
+        $message->recipient = 'mailto:' . 'frodo@hobb.it';
+        // save the old copy in the plugin
+        $oldVCalendar = new VCalendar();
+        $oldVEvent = new VEvent($oldVCalendar, 'one', [
+            'UID' => 'uid-1234',
+            'SEQUENCE' => 0,
+            'SUMMARY' => 'Fellowship meeting',
+            'DTSTART' => new \DateTime('2016-01-01 00:00:00')
+        ]);
+        $oldVEvent->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
+        $oldVEvent->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
+        $oldVEvent->add('ATTENDEE', 'mailto:' . 'boromir@tra.it.or', ['RSVP' => 'TRUE']);
+        $oldVCalendar->add($oldVEvent);
+        $data = ['invitee_name' => 'Mr. Wizard',
+            'meeting_title' => 'Fellowship meeting without (!) Boromir',
+            'attendee_name' => 'frodo@hobb.it'
+        ];
+        $attendees = $newVevent->select('ATTENDEE');
+        $atnd = '';
+        foreach ($attendees as $attendee) {
+            if (strcasecmp($attendee->getValue(), $message->recipient) === 0) {
+                $atnd = $attendee;
+            }
+        }
+        $this->plugin->setVCalendar($oldVCalendar);
+        $this->service->expects(self::once())
+            ->method('getLastOccurrence')
+            ->willReturn(1496912700);
+        $this->mailer->expects(self::once())
+            ->method('validateMailAddress')
+            ->with('frodo@hobb.it')
+            ->willReturn(true);
+        $this->eventComparisonService->expects(self::once())
+            ->method('findModified')
+            ->willReturn(['new' => [$newVevent], 'old' => [$oldVEvent]]);
+        $this->service->expects(self::once())
+            ->method('getCurrentAttendee')
+            ->with($message)
+            ->willReturn($atnd);
+        $this->service->expects(self::once())
+            ->method('isRoomOrResource')
+            ->with($atnd)
+            ->willReturn(false);
+        $this->service->expects(self::once())
+            ->method('isCircle')
+            ->with($atnd)
+            ->willReturn(false);
+        $this->service->expects(self::once())
+            ->method('buildBodyData')
+            ->with($newVevent, $oldVEvent)
+            ->willReturn($data);
+        $this->user->expects(self::any())
+            ->method('getUID')
+            ->willReturn('user1');
+        $this->user->expects(self::any())
+            ->method('getDisplayName')
+            ->willReturn('Mr. Wizard');
+        $this->userSession->expects(self::any())
+            ->method('getUser')
+            ->willReturn($this->user);
+        $this->service->expects(self::once())
+            ->method('getFrom');
+        $this->service->expects(self::once())
+            ->method('addSubjectAndHeading')
+            ->with($this->emailTemplate, 'request', 'Mr. Wizard', 'Fellowship meeting without (!) Boromir', true);
+        $this->service->expects(self::once())
+            ->method('addBulletList')
+            ->with($this->emailTemplate, $newVevent, $data);
+        $this->service->expects(self::once())
+            ->method('getAttendeeRsvpOrReqForParticipant')
+            ->willReturn(true);
+        $this->config->expects(self::once())
+            ->method('getValueString')
+            ->with('dav', 'invitation_link_recipients', 'yes')
+            ->willReturn('yes');
+        $this->service->expects(self::once())
+            ->method('createInvitationToken')
+            ->with($message, $newVevent, 1496912700)
+            ->willReturn('token');
+        $this->service->expects(self::once())
+            ->method('addResponseButtons')
+            ->with($this->emailTemplate, 'token');
+        $this->service->expects(self::once())
+            ->method('addMoreOptionsButton')
+            ->with($this->emailTemplate, 'token');
+        $this->mailer->expects(self::once())
+            ->method('send')
+            ->willReturn([]);
+        $this->plugin->schedule($message);
+        $this->assertEquals('1.1', $message->getScheduleStatus());
+    }
 
-	public function testAttendeeIsResource(): void {
-		$message = new Message();
-		$message->method = 'REQUEST';
-		$newVCalendar = new VCalendar();
-		$newVevent = new VEvent($newVCalendar, 'one', array_merge([
-			'UID' => 'uid-1234',
-			'SEQUENCE' => 1,
-			'SUMMARY' => 'Fellowship meeting without (!) Boromir',
-			'DTSTART' => new \DateTime('2016-01-01 00:00:00')
-		], []));
-		$newVevent->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
-		$newVevent->add('ATTENDEE', 'mailto:' . 'the-shire@hobb.it', ['RSVP' => 'TRUE',  'CN' => 'The Shire', 'CUTYPE' => 'ROOM']);
-		$message->message = $newVCalendar;
-		$message->sender = 'mailto:gandalf@wiz.ard';
-		$message->senderName = 'Mr. Wizard';
-		$message->recipient = 'mailto:' . 'the-shire@hobb.it';
-		// save the old copy in the plugin
-		$oldVCalendar = new VCalendar();
-		$oldVEvent = new VEvent($oldVCalendar, 'one', [
-			'UID' => 'uid-1234',
-			'SEQUENCE' => 0,
-			'SUMMARY' => 'Fellowship meeting',
-			'DTSTART' => new \DateTime('2016-01-01 00:00:00')
-		]);
-		$oldVEvent->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
-		$oldVEvent->add('ATTENDEE', 'mailto:' . 'the-shire@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'The Shire', 'CUTYPE' => 'ROOM']);
-		$oldVEvent->add('ATTENDEE', 'mailto:' . 'boromir@tra.it.or', ['RSVP' => 'TRUE']);
-		$oldVCalendar->add($oldVEvent);
-		$data = ['invitee_name' => 'Mr. Wizard',
-			'meeting_title' => 'Fellowship meeting without (!) Boromir',
-			'attendee_name' => 'frodo@hobb.it'
-		];
-		$attendees = $newVevent->select('ATTENDEE');
-		$room = '';
-		foreach ($attendees as $attendee) {
-			if (strcasecmp($attendee->getValue(), $message->recipient) === 0) {
-				$room = $attendee;
-			}
-		}
-		$this->plugin->setVCalendar($oldVCalendar);
-		$this->service->expects(self::once())
-			->method('getLastOccurrence')
-			->willReturn(1496912700);
-		$this->mailer->expects(self::once())
-			->method('validateMailAddress')
-			->with('the-shire@hobb.it')
-			->willReturn(true);
-		$this->eventComparisonService->expects(self::once())
-			->method('findModified')
-			->willReturn(['new' => [$newVevent], 'old' => [$oldVEvent]]);
-		$this->service->expects(self::once())
-			->method('getCurrentAttendee')
-			->with($message)
-			->willReturn($room);
-		$this->service->expects(self::once())
-			->method('isRoomOrResource')
-			->with($room)
-			->willReturn(true);
-		$this->service->expects(self::never())
-			->method('isCircle');
-		$this->service->expects(self::never())
-			->method('buildBodyData');
-		$this->user->expects(self::any())
-			->method('getUID')
-			->willReturn('user1');
-		$this->user->expects(self::any())
-			->method('getDisplayName')
-			->willReturn('Mr. Wizard');
-		$this->userSession->expects(self::any())
-			->method('getUser')
-			->willReturn($this->user);
-		$this->service->expects(self::never())
-			->method('getFrom');
-		$this->service->expects(self::never())
-			->method('addSubjectAndHeading');
-		$this->service->expects(self::never())
-			->method('addBulletList');
-		$this->service->expects(self::never())
-			->method('getAttendeeRsvpOrReqForParticipant');
-		$this->config->expects(self::never())
-			->method('getValueString');
-		$this->service->expects(self::never())
-			->method('createInvitationToken');
-		$this->service->expects(self::never())
-			->method('addResponseButtons');
-		$this->service->expects(self::never())
-			->method('addMoreOptionsButton');
-		$this->mailer->expects(self::never())
-			->method('send');
-		$this->plugin->schedule($message);
-		$this->assertEquals('1.0', $message->getScheduleStatus());
-	}
+    public function testAttendeeIsResource(): void {
+        $message = new Message();
+        $message->method = 'REQUEST';
+        $newVCalendar = new VCalendar();
+        $newVevent = new VEvent($newVCalendar, 'one', array_merge([
+            'UID' => 'uid-1234',
+            'SEQUENCE' => 1,
+            'SUMMARY' => 'Fellowship meeting without (!) Boromir',
+            'DTSTART' => new \DateTime('2016-01-01 00:00:00')
+        ], []));
+        $newVevent->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
+        $newVevent->add('ATTENDEE', 'mailto:' . 'the-shire@hobb.it', ['RSVP' => 'TRUE',  'CN' => 'The Shire', 'CUTYPE' => 'ROOM']);
+        $message->message = $newVCalendar;
+        $message->sender = 'mailto:gandalf@wiz.ard';
+        $message->senderName = 'Mr. Wizard';
+        $message->recipient = 'mailto:' . 'the-shire@hobb.it';
+        // save the old copy in the plugin
+        $oldVCalendar = new VCalendar();
+        $oldVEvent = new VEvent($oldVCalendar, 'one', [
+            'UID' => 'uid-1234',
+            'SEQUENCE' => 0,
+            'SUMMARY' => 'Fellowship meeting',
+            'DTSTART' => new \DateTime('2016-01-01 00:00:00')
+        ]);
+        $oldVEvent->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
+        $oldVEvent->add('ATTENDEE', 'mailto:' . 'the-shire@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'The Shire', 'CUTYPE' => 'ROOM']);
+        $oldVEvent->add('ATTENDEE', 'mailto:' . 'boromir@tra.it.or', ['RSVP' => 'TRUE']);
+        $oldVCalendar->add($oldVEvent);
+        $data = ['invitee_name' => 'Mr. Wizard',
+            'meeting_title' => 'Fellowship meeting without (!) Boromir',
+            'attendee_name' => 'frodo@hobb.it'
+        ];
+        $attendees = $newVevent->select('ATTENDEE');
+        $room = '';
+        foreach ($attendees as $attendee) {
+            if (strcasecmp($attendee->getValue(), $message->recipient) === 0) {
+                $room = $attendee;
+            }
+        }
+        $this->plugin->setVCalendar($oldVCalendar);
+        $this->service->expects(self::once())
+            ->method('getLastOccurrence')
+            ->willReturn(1496912700);
+        $this->mailer->expects(self::once())
+            ->method('validateMailAddress')
+            ->with('the-shire@hobb.it')
+            ->willReturn(true);
+        $this->eventComparisonService->expects(self::once())
+            ->method('findModified')
+            ->willReturn(['new' => [$newVevent], 'old' => [$oldVEvent]]);
+        $this->service->expects(self::once())
+            ->method('getCurrentAttendee')
+            ->with($message)
+            ->willReturn($room);
+        $this->service->expects(self::once())
+            ->method('isRoomOrResource')
+            ->with($room)
+            ->willReturn(true);
+        $this->service->expects(self::never())
+            ->method('isCircle');
+        $this->service->expects(self::never())
+            ->method('buildBodyData');
+        $this->user->expects(self::any())
+            ->method('getUID')
+            ->willReturn('user1');
+        $this->user->expects(self::any())
+            ->method('getDisplayName')
+            ->willReturn('Mr. Wizard');
+        $this->userSession->expects(self::any())
+            ->method('getUser')
+            ->willReturn($this->user);
+        $this->service->expects(self::never())
+            ->method('getFrom');
+        $this->service->expects(self::never())
+            ->method('addSubjectAndHeading');
+        $this->service->expects(self::never())
+            ->method('addBulletList');
+        $this->service->expects(self::never())
+            ->method('getAttendeeRsvpOrReqForParticipant');
+        $this->config->expects(self::never())
+            ->method('getValueString');
+        $this->service->expects(self::never())
+            ->method('createInvitationToken');
+        $this->service->expects(self::never())
+            ->method('addResponseButtons');
+        $this->service->expects(self::never())
+            ->method('addMoreOptionsButton');
+        $this->mailer->expects(self::never())
+            ->method('send');
+        $this->plugin->schedule($message);
+        $this->assertEquals('1.0', $message->getScheduleStatus());
+    }
 
-	public function testAttendeeIsCircle(): void {
-		$message = new Message();
-		$message->method = 'REQUEST';
-		$newVCalendar = new VCalendar();
-		$newVevent = new VEvent($newVCalendar, 'one', array_merge([
-			'UID' => 'uid-1234',
-			'SEQUENCE' => 1,
-			'SUMMARY' => 'Fellowship meeting without (!) Boromir',
-			'DTSTART' => new \DateTime('2016-01-01 00:00:00')
-		], []));
-		$newVevent->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
-		$newVevent->add('ATTENDEE', 'mailto:' . 'circle+82utEV1Fle8wvxndZLK5TVAPtxj8IIe@middle.earth', ['RSVP' => 'TRUE', 'CN' => 'The Fellowship', 'CUTYPE' => 'GROUP']);
-		$newVevent->add('ATTENDEE', 'mailto:' . 'boromir@tra.it.or', ['RSVP' => 'TRUE', 'MEMBER' => 'circle+82utEV1Fle8wvxndZLK5TVAPtxj8IIe@middle.earth']);
-		$message->message = $newVCalendar;
-		$message->sender = 'mailto:gandalf@wiz.ard';
-		$message->senderName = 'Mr. Wizard';
-		$message->recipient = 'mailto:' . 'circle+82utEV1Fle8wvxndZLK5TVAPtxj8IIe@middle.earth';
-		$attendees = $newVevent->select('ATTENDEE');
-		$circle = '';
-		foreach ($attendees as $attendee) {
-			if (strcasecmp($attendee->getValue(), $message->recipient) === 0) {
-				$circle = $attendee;
-			}
-		}
-		$this->assertNotEmpty($circle, 'Failed to find attendee belonging to the circle');
-		$this->service->expects(self::once())
-			->method('getLastOccurrence')
-			->willReturn(1496912700);
-		$this->mailer->expects(self::once())
-			->method('validateMailAddress')
-			->with('circle+82utEV1Fle8wvxndZLK5TVAPtxj8IIe@middle.earth')
-			->willReturn(true);
-		$this->eventComparisonService->expects(self::once())
-			->method('findModified')
-			->willReturn(['new' => [$newVevent], 'old' => null]);
-		$this->service->expects(self::once())
-			->method('getCurrentAttendee')
-			->with($message)
-			->willReturn($circle);
-		$this->service->expects(self::once())
-			->method('isRoomOrResource')
-			->with($circle)
-			->willReturn(false);
-		$this->service->expects(self::once())
-			->method('isCircle')
-			->with($circle)
-			->willReturn(true);
-		$this->service->expects(self::never())
-			->method('buildBodyData');
-		$this->user->expects(self::any())
-			->method('getUID')
-			->willReturn('user1');
-		$this->user->expects(self::any())
-			->method('getDisplayName')
-			->willReturn('Mr. Wizard');
-		$this->userSession->expects(self::any())
-			->method('getUser')
-			->willReturn($this->user);
-		$this->service->expects(self::never())
-			->method('getFrom');
-		$this->service->expects(self::never())
-			->method('addSubjectAndHeading');
-		$this->service->expects(self::never())
-			->method('addBulletList');
-		$this->service->expects(self::never())
-			->method('getAttendeeRsvpOrReqForParticipant');
-		$this->config->expects(self::never())
-			->method('getValueString');
-		$this->service->expects(self::never())
-			->method('createInvitationToken');
-		$this->service->expects(self::never())
-			->method('addResponseButtons');
-		$this->service->expects(self::never())
-			->method('addMoreOptionsButton');
-		$this->mailer->expects(self::never())
-			->method('send');
-		$this->plugin->schedule($message);
-		$this->assertEquals('1.0', $message->getScheduleStatus());
-	}
+    public function testAttendeeIsCircle(): void {
+        $message = new Message();
+        $message->method = 'REQUEST';
+        $newVCalendar = new VCalendar();
+        $newVevent = new VEvent($newVCalendar, 'one', array_merge([
+            'UID' => 'uid-1234',
+            'SEQUENCE' => 1,
+            'SUMMARY' => 'Fellowship meeting without (!) Boromir',
+            'DTSTART' => new \DateTime('2016-01-01 00:00:00')
+        ], []));
+        $newVevent->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
+        $newVevent->add('ATTENDEE', 'mailto:' . 'circle+82utEV1Fle8wvxndZLK5TVAPtxj8IIe@middle.earth', ['RSVP' => 'TRUE', 'CN' => 'The Fellowship', 'CUTYPE' => 'GROUP']);
+        $newVevent->add('ATTENDEE', 'mailto:' . 'boromir@tra.it.or', ['RSVP' => 'TRUE', 'MEMBER' => 'circle+82utEV1Fle8wvxndZLK5TVAPtxj8IIe@middle.earth']);
+        $message->message = $newVCalendar;
+        $message->sender = 'mailto:gandalf@wiz.ard';
+        $message->senderName = 'Mr. Wizard';
+        $message->recipient = 'mailto:' . 'circle+82utEV1Fle8wvxndZLK5TVAPtxj8IIe@middle.earth';
+        $attendees = $newVevent->select('ATTENDEE');
+        $circle = '';
+        foreach ($attendees as $attendee) {
+            if (strcasecmp($attendee->getValue(), $message->recipient) === 0) {
+                $circle = $attendee;
+            }
+        }
+        $this->assertNotEmpty($circle, 'Failed to find attendee belonging to the circle');
+        $this->service->expects(self::once())
+            ->method('getLastOccurrence')
+            ->willReturn(1496912700);
+        $this->mailer->expects(self::once())
+            ->method('validateMailAddress')
+            ->with('circle+82utEV1Fle8wvxndZLK5TVAPtxj8IIe@middle.earth')
+            ->willReturn(true);
+        $this->eventComparisonService->expects(self::once())
+            ->method('findModified')
+            ->willReturn(['new' => [$newVevent], 'old' => null]);
+        $this->service->expects(self::once())
+            ->method('getCurrentAttendee')
+            ->with($message)
+            ->willReturn($circle);
+        $this->service->expects(self::once())
+            ->method('isRoomOrResource')
+            ->with($circle)
+            ->willReturn(false);
+        $this->service->expects(self::once())
+            ->method('isCircle')
+            ->with($circle)
+            ->willReturn(true);
+        $this->service->expects(self::never())
+            ->method('buildBodyData');
+        $this->user->expects(self::any())
+            ->method('getUID')
+            ->willReturn('user1');
+        $this->user->expects(self::any())
+            ->method('getDisplayName')
+            ->willReturn('Mr. Wizard');
+        $this->userSession->expects(self::any())
+            ->method('getUser')
+            ->willReturn($this->user);
+        $this->service->expects(self::never())
+            ->method('getFrom');
+        $this->service->expects(self::never())
+            ->method('addSubjectAndHeading');
+        $this->service->expects(self::never())
+            ->method('addBulletList');
+        $this->service->expects(self::never())
+            ->method('getAttendeeRsvpOrReqForParticipant');
+        $this->config->expects(self::never())
+            ->method('getValueString');
+        $this->service->expects(self::never())
+            ->method('createInvitationToken');
+        $this->service->expects(self::never())
+            ->method('addResponseButtons');
+        $this->service->expects(self::never())
+            ->method('addMoreOptionsButton');
+        $this->mailer->expects(self::never())
+            ->method('send');
+        $this->plugin->schedule($message);
+        $this->assertEquals('1.0', $message->getScheduleStatus());
+    }
 
-	public function testParsingRecurrence(): void {
-		$message = new Message();
-		$message->method = 'REQUEST';
-		$newVCalendar = new VCalendar();
-		$newVevent = new VEvent($newVCalendar, 'one', [
-			'UID' => 'uid-1234',
-			'LAST-MODIFIED' => 123456,
-			'SEQUENCE' => 2,
-			'SUMMARY' => 'Fellowship meeting',
-			'DTSTART' => new \DateTime('2016-01-01 00:00:00'),
-			'RRULE' => 'FREQ=DAILY;INTERVAL=1;UNTIL=20160201T000000Z'
-		]);
-		$newVevent->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
-		$newVevent->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE',  'CN' => 'Frodo']);
-		$newvEvent2 = new VEvent($newVCalendar, 'two', [
-			'UID' => 'uid-1234',
-			'SEQUENCE' => 1,
-			'SUMMARY' => 'Elevenses',
-			'DTSTART' => new \DateTime('2016-01-01 00:00:00'),
-			'RECURRENCE-ID' => new \DateTime('2016-01-01 00:00:00')
-		]);
-		$newvEvent2->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
-		$newvEvent2->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
-		$message->message = $newVCalendar;
-		$message->sender = 'mailto:gandalf@wiz.ard';
-		$message->recipient = 'mailto:' . 'frodo@hobb.it';
-		// save the old copy in the plugin
-		$oldVCalendar = new VCalendar();
-		$oldVEvent = new VEvent($oldVCalendar, 'one', [
-			'UID' => 'uid-1234',
-			'LAST-MODIFIED' => 123456,
-			'SEQUENCE' => 2,
-			'SUMMARY' => 'Fellowship meeting',
-			'DTSTART' => new \DateTime('2016-01-01 00:00:00'),
-			'RRULE' => 'FREQ=DAILY;INTERVAL=1;UNTIL=20160201T000000Z'
-		]);
-		$oldVEvent->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
-		$oldVEvent->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
-		$data = ['invitee_name' => 'Mr. Wizard',
-			'meeting_title' => 'Elevenses',
-			'attendee_name' => 'frodo@hobb.it'
-		];
-		$attendees = $newVevent->select('ATTENDEE');
-		$atnd = '';
-		foreach ($attendees as $attendee) {
-			if (strcasecmp($attendee->getValue(), $message->recipient) === 0) {
-				$atnd = $attendee;
-			}
-		}
-		$this->plugin->setVCalendar($oldVCalendar);
-		$this->service->expects(self::once())
-			->method('getLastOccurrence')
-			->willReturn(1496912700);
-		$this->mailer->expects(self::once())
-			->method('validateMailAddress')
-			->with('frodo@hobb.it')
-			->willReturn(true);
-		$this->eventComparisonService->expects(self::once())
-			->method('findModified')
-			->willReturn(['old' => [] ,'new' => [$newVevent]]);
-		$this->service->expects(self::once())
-			->method('getCurrentAttendee')
-			->with($message)
-			->willReturn($atnd);
-		$this->service->expects(self::once())
-			->method('isRoomOrResource')
-			->with($atnd)
-			->willReturn(false);
-		$this->service->expects(self::once())
-			->method('isCircle')
-			->with($atnd)
-			->willReturn(false);
-		$this->service->expects(self::once())
-			->method('buildBodyData')
-			->with($newVevent, null)
-			->willReturn($data);
-		$this->user->expects(self::any())
-			->method('getUID')
-			->willReturn('user1');
-		$this->user->expects(self::any())
-			->method('getDisplayName')
-			->willReturn('Mr. Wizard');
-		$this->userSession->expects(self::any())
-			->method('getUser')
-			->willReturn($this->user);
-		$this->service->expects(self::once())
-			->method('getFrom');
-		$this->service->expects(self::once())
-			->method('addSubjectAndHeading')
-			->with($this->emailTemplate, 'request', 'Mr. Wizard', 'Elevenses', false);
-		$this->service->expects(self::once())
-			->method('addBulletList')
-			->with($this->emailTemplate, $newVevent, $data);
-		$this->service->expects(self::once())
-			->method('getAttendeeRsvpOrReqForParticipant')
-			->willReturn(true);
-		$this->config->expects(self::once())
-			->method('getValueString')
-			->with('dav', 'invitation_link_recipients', 'yes')
-			->willReturn('yes');
-		$this->service->expects(self::once())
-			->method('createInvitationToken')
-			->with($message, $newVevent, 1496912700)
-			->willReturn('token');
-		$this->service->expects(self::once())
-			->method('addResponseButtons')
-			->with($this->emailTemplate, 'token');
-		$this->service->expects(self::once())
-			->method('addMoreOptionsButton')
-			->with($this->emailTemplate, 'token');
-		$this->mailer->expects(self::once())
-			->method('send')
-			->willReturn([]);
-		$this->plugin->schedule($message);
-		$this->assertEquals('1.1', $message->getScheduleStatus());
-	}
+    public function testParsingRecurrence(): void {
+        $message = new Message();
+        $message->method = 'REQUEST';
+        $newVCalendar = new VCalendar();
+        $newVevent = new VEvent($newVCalendar, 'one', [
+            'UID' => 'uid-1234',
+            'LAST-MODIFIED' => 123456,
+            'SEQUENCE' => 2,
+            'SUMMARY' => 'Fellowship meeting',
+            'DTSTART' => new \DateTime('2016-01-01 00:00:00'),
+            'RRULE' => 'FREQ=DAILY;INTERVAL=1;UNTIL=20160201T000000Z'
+        ]);
+        $newVevent->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
+        $newVevent->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE',  'CN' => 'Frodo']);
+        $newvEvent2 = new VEvent($newVCalendar, 'two', [
+            'UID' => 'uid-1234',
+            'SEQUENCE' => 1,
+            'SUMMARY' => 'Elevenses',
+            'DTSTART' => new \DateTime('2016-01-01 00:00:00'),
+            'RECURRENCE-ID' => new \DateTime('2016-01-01 00:00:00')
+        ]);
+        $newvEvent2->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
+        $newvEvent2->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
+        $message->message = $newVCalendar;
+        $message->sender = 'mailto:gandalf@wiz.ard';
+        $message->recipient = 'mailto:' . 'frodo@hobb.it';
+        // save the old copy in the plugin
+        $oldVCalendar = new VCalendar();
+        $oldVEvent = new VEvent($oldVCalendar, 'one', [
+            'UID' => 'uid-1234',
+            'LAST-MODIFIED' => 123456,
+            'SEQUENCE' => 2,
+            'SUMMARY' => 'Fellowship meeting',
+            'DTSTART' => new \DateTime('2016-01-01 00:00:00'),
+            'RRULE' => 'FREQ=DAILY;INTERVAL=1;UNTIL=20160201T000000Z'
+        ]);
+        $oldVEvent->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
+        $oldVEvent->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
+        $data = ['invitee_name' => 'Mr. Wizard',
+            'meeting_title' => 'Elevenses',
+            'attendee_name' => 'frodo@hobb.it'
+        ];
+        $attendees = $newVevent->select('ATTENDEE');
+        $atnd = '';
+        foreach ($attendees as $attendee) {
+            if (strcasecmp($attendee->getValue(), $message->recipient) === 0) {
+                $atnd = $attendee;
+            }
+        }
+        $this->plugin->setVCalendar($oldVCalendar);
+        $this->service->expects(self::once())
+            ->method('getLastOccurrence')
+            ->willReturn(1496912700);
+        $this->mailer->expects(self::once())
+            ->method('validateMailAddress')
+            ->with('frodo@hobb.it')
+            ->willReturn(true);
+        $this->eventComparisonService->expects(self::once())
+            ->method('findModified')
+            ->willReturn(['old' => [] ,'new' => [$newVevent]]);
+        $this->service->expects(self::once())
+            ->method('getCurrentAttendee')
+            ->with($message)
+            ->willReturn($atnd);
+        $this->service->expects(self::once())
+            ->method('isRoomOrResource')
+            ->with($atnd)
+            ->willReturn(false);
+        $this->service->expects(self::once())
+            ->method('isCircle')
+            ->with($atnd)
+            ->willReturn(false);
+        $this->service->expects(self::once())
+            ->method('buildBodyData')
+            ->with($newVevent, null)
+            ->willReturn($data);
+        $this->user->expects(self::any())
+            ->method('getUID')
+            ->willReturn('user1');
+        $this->user->expects(self::any())
+            ->method('getDisplayName')
+            ->willReturn('Mr. Wizard');
+        $this->userSession->expects(self::any())
+            ->method('getUser')
+            ->willReturn($this->user);
+        $this->service->expects(self::once())
+            ->method('getFrom');
+        $this->service->expects(self::once())
+            ->method('addSubjectAndHeading')
+            ->with($this->emailTemplate, 'request', 'Mr. Wizard', 'Elevenses', false);
+        $this->service->expects(self::once())
+            ->method('addBulletList')
+            ->with($this->emailTemplate, $newVevent, $data);
+        $this->service->expects(self::once())
+            ->method('getAttendeeRsvpOrReqForParticipant')
+            ->willReturn(true);
+        $this->config->expects(self::once())
+            ->method('getValueString')
+            ->with('dav', 'invitation_link_recipients', 'yes')
+            ->willReturn('yes');
+        $this->service->expects(self::once())
+            ->method('createInvitationToken')
+            ->with($message, $newVevent, 1496912700)
+            ->willReturn('token');
+        $this->service->expects(self::once())
+            ->method('addResponseButtons')
+            ->with($this->emailTemplate, 'token');
+        $this->service->expects(self::once())
+            ->method('addMoreOptionsButton')
+            ->with($this->emailTemplate, 'token');
+        $this->mailer->expects(self::once())
+            ->method('send')
+            ->willReturn([]);
+        $this->plugin->schedule($message);
+        $this->assertEquals('1.1', $message->getScheduleStatus());
+    }
 
-	public function testEmailValidationFailed(): void {
-		$message = new Message();
-		$message->method = 'REQUEST';
-		$message->message = new VCalendar();
-		$message->message->add('VEVENT', array_merge([
-			'UID' => 'uid-1234',
-			'SEQUENCE' => 0,
-			'SUMMARY' => 'Fellowship meeting',
-			'DTSTART' => new \DateTime('2016-01-01 00:00:00')
-		], []));
-		$message->message->VEVENT->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
-		$message->message->VEVENT->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE']);
-		$message->sender = 'mailto:gandalf@wiz.ard';
-		$message->senderName = 'Mr. Wizard';
-		$message->recipient = 'mailto:' . 'frodo@hobb.it';
+    public function testEmailValidationFailed(): void {
+        $message = new Message();
+        $message->method = 'REQUEST';
+        $message->message = new VCalendar();
+        $message->message->add('VEVENT', array_merge([
+            'UID' => 'uid-1234',
+            'SEQUENCE' => 0,
+            'SUMMARY' => 'Fellowship meeting',
+            'DTSTART' => new \DateTime('2016-01-01 00:00:00')
+        ], []));
+        $message->message->VEVENT->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
+        $message->message->VEVENT->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE']);
+        $message->sender = 'mailto:gandalf@wiz.ard';
+        $message->senderName = 'Mr. Wizard';
+        $message->recipient = 'mailto:' . 'frodo@hobb.it';
 
-		$this->service->expects(self::once())
-			->method('getLastOccurrence')
-			->willReturn(1496912700);
-		$this->mailer->expects(self::once())
-			->method('validateMailAddress')
-			->with('frodo@hobb.it')
-			->willReturn(false);
+        $this->service->expects(self::once())
+            ->method('getLastOccurrence')
+            ->willReturn(1496912700);
+        $this->mailer->expects(self::once())
+            ->method('validateMailAddress')
+            ->with('frodo@hobb.it')
+            ->willReturn(false);
 
-		$this->plugin->schedule($message);
-		$this->assertEquals('5.0', $message->getScheduleStatus());
-	}
+        $this->plugin->schedule($message);
+        $this->assertEquals('5.0', $message->getScheduleStatus());
+    }
 
-	public function testFailedDelivery(): void {
-		$message = new Message();
-		$message->method = 'REQUEST';
-		$newVcalendar = new VCalendar();
-		$newVevent = new VEvent($newVcalendar, 'one', array_merge([
-			'UID' => 'uid-1234',
-			'SEQUENCE' => 1,
-			'SUMMARY' => 'Fellowship meeting without (!) Boromir',
-			'DTSTART' => new \DateTime('2016-01-01 00:00:00')
-		], []));
-		$newVevent->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
-		$newVevent->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE',  'CN' => 'Frodo']);
-		$message->message = $newVcalendar;
-		$message->sender = 'mailto:gandalf@wiz.ard';
-		$message->senderName = 'Mr. Wizard';
-		$message->recipient = 'mailto:' . 'frodo@hobb.it';
-		// save the old copy in the plugin
-		$oldVcalendar = new VCalendar();
-		$oldVevent = new VEvent($oldVcalendar, 'one', [
-			'UID' => 'uid-1234',
-			'SEQUENCE' => 0,
-			'SUMMARY' => 'Fellowship meeting',
-			'DTSTART' => new \DateTime('2016-01-01 00:00:00')
-		]);
-		$oldVevent->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
-		$oldVevent->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
-		$oldVevent->add('ATTENDEE', 'mailto:' . 'boromir@tra.it.or', ['RSVP' => 'TRUE']);
-		$oldVcalendar->add($oldVevent);
-		$data = ['invitee_name' => 'Mr. Wizard',
-			'meeting_title' => 'Fellowship meeting without (!) Boromir',
-			'attendee_name' => 'frodo@hobb.it'
-		];
-		$attendees = $newVevent->select('ATTENDEE');
-		$atnd = '';
-		foreach ($attendees as $attendee) {
-			if (strcasecmp($attendee->getValue(), $message->recipient) === 0) {
-				$atnd = $attendee;
-			}
-		}
-		$this->plugin->setVCalendar($oldVcalendar);
-		$this->service->expects(self::once())
-			->method('getLastOccurrence')
-			->willReturn(1496912700);
-		$this->mailer->expects(self::once())
-			->method('validateMailAddress')
-			->with('frodo@hobb.it')
-			->willReturn(true);
-		$this->eventComparisonService->expects(self::once())
-			->method('findModified')
-			->willReturn(['old' => [] ,'new' => [$newVevent]]);
-		$this->service->expects(self::once())
-			->method('getCurrentAttendee')
-			->with($message)
-			->willReturn($atnd);
-		$this->service->expects(self::once())
-			->method('isRoomOrResource')
-			->with($atnd)
-			->willReturn(false);
-		$this->service->expects(self::once())
-			->method('isCircle')
-			->with($atnd)
-			->willReturn(false);
-		$this->service->expects(self::once())
-			->method('buildBodyData')
-			->with($newVevent, null)
-			->willReturn($data);
-		$this->user->expects(self::any())
-			->method('getUID')
-			->willReturn('user1');
-		$this->user->expects(self::any())
-			->method('getDisplayName')
-			->willReturn('Mr. Wizard');
-		$this->userSession->expects(self::any())
-			->method('getUser')
-			->willReturn($this->user);
-		$this->service->expects(self::once())
-			->method('getFrom');
-		$this->service->expects(self::once())
-			->method('addSubjectAndHeading')
-			->with($this->emailTemplate, 'request', 'Mr. Wizard', 'Fellowship meeting without (!) Boromir', false);
-		$this->service->expects(self::once())
-			->method('addBulletList')
-			->with($this->emailTemplate, $newVevent, $data);
-		$this->service->expects(self::once())
-			->method('getAttendeeRsvpOrReqForParticipant')
-			->willReturn(true);
-		$this->config->expects(self::once())
-			->method('getValueString')
-			->with('dav', 'invitation_link_recipients', 'yes')
-			->willReturn('yes');
-		$this->service->expects(self::once())
-			->method('createInvitationToken')
-			->with($message, $newVevent, 1496912700)
-			->willReturn('token');
-		$this->service->expects(self::once())
-			->method('addResponseButtons')
-			->with($this->emailTemplate, 'token');
-		$this->service->expects(self::once())
-			->method('addMoreOptionsButton')
-			->with($this->emailTemplate, 'token');
-		$this->mailer->expects(self::once())
-			->method('send')
-			->willReturn([]);
-		$this->mailer
-			->method('send')
-			->willThrowException(new \Exception());
-		$this->logger->expects(self::once())
-			->method('error');
-		$this->plugin->schedule($message);
-		$this->assertEquals('5.0', $message->getScheduleStatus());
-	}
+    public function testFailedDelivery(): void {
+        $message = new Message();
+        $message->method = 'REQUEST';
+        $newVcalendar = new VCalendar();
+        $newVevent = new VEvent($newVcalendar, 'one', array_merge([
+            'UID' => 'uid-1234',
+            'SEQUENCE' => 1,
+            'SUMMARY' => 'Fellowship meeting without (!) Boromir',
+            'DTSTART' => new \DateTime('2016-01-01 00:00:00')
+        ], []));
+        $newVevent->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
+        $newVevent->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE',  'CN' => 'Frodo']);
+        $message->message = $newVcalendar;
+        $message->sender = 'mailto:gandalf@wiz.ard';
+        $message->senderName = 'Mr. Wizard';
+        $message->recipient = 'mailto:' . 'frodo@hobb.it';
+        // save the old copy in the plugin
+        $oldVcalendar = new VCalendar();
+        $oldVevent = new VEvent($oldVcalendar, 'one', [
+            'UID' => 'uid-1234',
+            'SEQUENCE' => 0,
+            'SUMMARY' => 'Fellowship meeting',
+            'DTSTART' => new \DateTime('2016-01-01 00:00:00')
+        ]);
+        $oldVevent->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
+        $oldVevent->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
+        $oldVevent->add('ATTENDEE', 'mailto:' . 'boromir@tra.it.or', ['RSVP' => 'TRUE']);
+        $oldVcalendar->add($oldVevent);
+        $data = ['invitee_name' => 'Mr. Wizard',
+            'meeting_title' => 'Fellowship meeting without (!) Boromir',
+            'attendee_name' => 'frodo@hobb.it'
+        ];
+        $attendees = $newVevent->select('ATTENDEE');
+        $atnd = '';
+        foreach ($attendees as $attendee) {
+            if (strcasecmp($attendee->getValue(), $message->recipient) === 0) {
+                $atnd = $attendee;
+            }
+        }
+        $this->plugin->setVCalendar($oldVcalendar);
+        $this->service->expects(self::once())
+            ->method('getLastOccurrence')
+            ->willReturn(1496912700);
+        $this->mailer->expects(self::once())
+            ->method('validateMailAddress')
+            ->with('frodo@hobb.it')
+            ->willReturn(true);
+        $this->eventComparisonService->expects(self::once())
+            ->method('findModified')
+            ->willReturn(['old' => [] ,'new' => [$newVevent]]);
+        $this->service->expects(self::once())
+            ->method('getCurrentAttendee')
+            ->with($message)
+            ->willReturn($atnd);
+        $this->service->expects(self::once())
+            ->method('isRoomOrResource')
+            ->with($atnd)
+            ->willReturn(false);
+        $this->service->expects(self::once())
+            ->method('isCircle')
+            ->with($atnd)
+            ->willReturn(false);
+        $this->service->expects(self::once())
+            ->method('buildBodyData')
+            ->with($newVevent, null)
+            ->willReturn($data);
+        $this->user->expects(self::any())
+            ->method('getUID')
+            ->willReturn('user1');
+        $this->user->expects(self::any())
+            ->method('getDisplayName')
+            ->willReturn('Mr. Wizard');
+        $this->userSession->expects(self::any())
+            ->method('getUser')
+            ->willReturn($this->user);
+        $this->service->expects(self::once())
+            ->method('getFrom');
+        $this->service->expects(self::once())
+            ->method('addSubjectAndHeading')
+            ->with($this->emailTemplate, 'request', 'Mr. Wizard', 'Fellowship meeting without (!) Boromir', false);
+        $this->service->expects(self::once())
+            ->method('addBulletList')
+            ->with($this->emailTemplate, $newVevent, $data);
+        $this->service->expects(self::once())
+            ->method('getAttendeeRsvpOrReqForParticipant')
+            ->willReturn(true);
+        $this->config->expects(self::once())
+            ->method('getValueString')
+            ->with('dav', 'invitation_link_recipients', 'yes')
+            ->willReturn('yes');
+        $this->service->expects(self::once())
+            ->method('createInvitationToken')
+            ->with($message, $newVevent, 1496912700)
+            ->willReturn('token');
+        $this->service->expects(self::once())
+            ->method('addResponseButtons')
+            ->with($this->emailTemplate, 'token');
+        $this->service->expects(self::once())
+            ->method('addMoreOptionsButton')
+            ->with($this->emailTemplate, 'token');
+        $this->mailer->expects(self::once())
+            ->method('send')
+            ->willReturn([]);
+        $this->mailer
+            ->method('send')
+            ->willThrowException(new \Exception());
+        $this->logger->expects(self::once())
+            ->method('error');
+        $this->plugin->schedule($message);
+        $this->assertEquals('5.0', $message->getScheduleStatus());
+    }
 
-	public function testMailProviderSend(): void {
-		// construct iTip message with event and attendees
-		$message = new Message();
-		$message->method = 'REQUEST';
-		$calendar = new VCalendar();
-		$event = new VEvent($calendar, 'one', array_merge([
-			'UID' => 'uid-1234',
-			'SEQUENCE' => 1,
-			'SUMMARY' => 'Fellowship meeting without (!) Boromir',
-			'DTSTART' => new \DateTime('2016-01-01 00:00:00')
-		], []));
-		$event->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
-		$event->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE',  'CN' => 'Frodo']);
-		$message->message = $calendar;
-		$message->sender = 'mailto:gandalf@wiz.ard';
-		$message->senderName = 'Mr. Wizard';
-		$message->recipient = 'mailto:' . 'frodo@hobb.it';
-		// construct
-		foreach ($event->select('ATTENDEE') as $entry) {
-			if (strcasecmp($entry->getValue(), $message->recipient) === 0) {
-				$attendee = $entry;
-			}
-		}
-		// construct body data return
-		$data = ['invitee_name' => 'Mr. Wizard',
-			'meeting_title' => 'Fellowship meeting without (!) Boromir',
-			'attendee_name' => 'frodo@hobb.it'
-		];
-		// construct system config mock returns
-		$this->config->expects(self::once())
-			->method('getValueString')
-			->with('dav', 'invitation_link_recipients', 'yes')
-			->willReturn('yes');
-		// construct user mock returns
-		$this->user->expects(self::any())
-			->method('getUID')
-			->willReturn('user1');
-		$this->user->expects(self::any())
-			->method('getDisplayName')
-			->willReturn('Mr. Wizard');
-		// construct user session mock returns
-		$this->userSession->expects(self::any())
-			->method('getUser')
-			->willReturn($this->user);
-		// construct service mock returns
-		$this->service->expects(self::once())
-			->method('getLastOccurrence')
-			->willReturn(1496912700);
-		$this->service->expects(self::once())
-			->method('getCurrentAttendee')
-			->with($message)
-			->willReturn($attendee);
-		$this->service->expects(self::once())
-			->method('isRoomOrResource')
-			->with($attendee)
-			->willReturn(false);
-		$this->service->expects(self::once())
-			->method('isCircle')
-			->with($attendee)
-			->willReturn(false);
-		$this->service->expects(self::once())
-			->method('buildBodyData')
-			->with($event, null)
-			->willReturn($data);
-		$this->service->expects(self::once())
-			->method('getFrom');
-		$this->service->expects(self::once())
-			->method('addSubjectAndHeading')
-			->with($this->emailTemplate, 'request', 'Mr. Wizard', 'Fellowship meeting without (!) Boromir', false);
-		$this->service->expects(self::once())
-			->method('addBulletList')
-			->with($this->emailTemplate, $event, $data);
-		$this->service->expects(self::once())
-			->method('getAttendeeRsvpOrReqForParticipant')
-			->willReturn(true);
-		$this->service->expects(self::once())
-			->method('createInvitationToken')
-			->with($message, $event, 1496912700)
-			->willReturn('token');
-		$this->service->expects(self::once())
-			->method('addResponseButtons')
-			->with($this->emailTemplate, 'token');
-		$this->service->expects(self::once())
-			->method('addMoreOptionsButton')
-			->with($this->emailTemplate, 'token');
-		$this->eventComparisonService->expects(self::once())
-			->method('findModified')
-			->willReturn(['old' => [] ,'new' => [$event]]);
-		// construct mail mock returns
-		$this->mailer->expects(self::once())
-			->method('validateMailAddress')
-			->with('frodo@hobb.it')
-			->willReturn(true);
-		// construct mail provider mock returns
-		$this->mailService
-			->method('initiateMessage')
-			->willReturn($this->mailMessageNew);
-		$this->mailService
-			->method('sendMessage')
-			->with($this->mailMessageNew);
-		$this->mailManager
-			->method('findServiceByAddress')
-			->with('user1', 'gandalf@wiz.ard')
-			->willReturn($this->mailService);
+    public function testMailProviderSend(): void {
+        // construct iTip message with event and attendees
+        $message = new Message();
+        $message->method = 'REQUEST';
+        $calendar = new VCalendar();
+        $event = new VEvent($calendar, 'one', array_merge([
+            'UID' => 'uid-1234',
+            'SEQUENCE' => 1,
+            'SUMMARY' => 'Fellowship meeting without (!) Boromir',
+            'DTSTART' => new \DateTime('2016-01-01 00:00:00')
+        ], []));
+        $event->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
+        $event->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE',  'CN' => 'Frodo']);
+        $message->message = $calendar;
+        $message->sender = 'mailto:gandalf@wiz.ard';
+        $message->senderName = 'Mr. Wizard';
+        $message->recipient = 'mailto:' . 'frodo@hobb.it';
+        // construct
+        foreach ($event->select('ATTENDEE') as $entry) {
+            if (strcasecmp($entry->getValue(), $message->recipient) === 0) {
+                $attendee = $entry;
+            }
+        }
+        // construct body data return
+        $data = ['invitee_name' => 'Mr. Wizard',
+            'meeting_title' => 'Fellowship meeting without (!) Boromir',
+            'attendee_name' => 'frodo@hobb.it'
+        ];
+        // construct system config mock returns
+        $this->config->expects(self::once())
+            ->method('getValueString')
+            ->with('dav', 'invitation_link_recipients', 'yes')
+            ->willReturn('yes');
+        // construct user mock returns
+        $this->user->expects(self::any())
+            ->method('getUID')
+            ->willReturn('user1');
+        $this->user->expects(self::any())
+            ->method('getDisplayName')
+            ->willReturn('Mr. Wizard');
+        // construct user session mock returns
+        $this->userSession->expects(self::any())
+            ->method('getUser')
+            ->willReturn($this->user);
+        // construct service mock returns
+        $this->service->expects(self::once())
+            ->method('getLastOccurrence')
+            ->willReturn(1496912700);
+        $this->service->expects(self::once())
+            ->method('getCurrentAttendee')
+            ->with($message)
+            ->willReturn($attendee);
+        $this->service->expects(self::once())
+            ->method('isRoomOrResource')
+            ->with($attendee)
+            ->willReturn(false);
+        $this->service->expects(self::once())
+            ->method('isCircle')
+            ->with($attendee)
+            ->willReturn(false);
+        $this->service->expects(self::once())
+            ->method('buildBodyData')
+            ->with($event, null)
+            ->willReturn($data);
+        $this->service->expects(self::once())
+            ->method('getFrom');
+        $this->service->expects(self::once())
+            ->method('addSubjectAndHeading')
+            ->with($this->emailTemplate, 'request', 'Mr. Wizard', 'Fellowship meeting without (!) Boromir', false);
+        $this->service->expects(self::once())
+            ->method('addBulletList')
+            ->with($this->emailTemplate, $event, $data);
+        $this->service->expects(self::once())
+            ->method('getAttendeeRsvpOrReqForParticipant')
+            ->willReturn(true);
+        $this->service->expects(self::once())
+            ->method('createInvitationToken')
+            ->with($message, $event, 1496912700)
+            ->willReturn('token');
+        $this->service->expects(self::once())
+            ->method('addResponseButtons')
+            ->with($this->emailTemplate, 'token');
+        $this->service->expects(self::once())
+            ->method('addMoreOptionsButton')
+            ->with($this->emailTemplate, 'token');
+        $this->eventComparisonService->expects(self::once())
+            ->method('findModified')
+            ->willReturn(['old' => [] ,'new' => [$event]]);
+        // construct mail mock returns
+        $this->mailer->expects(self::once())
+            ->method('validateMailAddress')
+            ->with('frodo@hobb.it')
+            ->willReturn(true);
+        // construct mail provider mock returns
+        $this->mailService
+            ->method('initiateMessage')
+            ->willReturn($this->mailMessageNew);
+        $this->mailService
+            ->method('sendMessage')
+            ->with($this->mailMessageNew);
+        $this->mailManager
+            ->method('findServiceByAddress')
+            ->with('user1', 'gandalf@wiz.ard')
+            ->willReturn($this->mailService);
 
-		$this->plugin->schedule($message);
-		$this->assertEquals('1.1', $message->getScheduleStatus());
-	}
+        $this->plugin->schedule($message);
+        $this->assertEquals('1.1', $message->getScheduleStatus());
+    }
 
-	public function testMailProviderDisabled(): void {
-		$message = new Message();
-		$message->method = 'REQUEST';
-		$newVCalendar = new VCalendar();
-		$newVevent = new VEvent($newVCalendar, 'one', array_merge([
-			'UID' => 'uid-1234',
-			'SEQUENCE' => 1,
-			'SUMMARY' => 'Fellowship meeting without (!) Boromir',
-			'DTSTART' => new \DateTime('2016-01-01 00:00:00')
-		], []));
-		$newVevent->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
-		$newVevent->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE',  'CN' => 'Frodo']);
-		$message->message = $newVCalendar;
-		$message->sender = 'mailto:gandalf@wiz.ard';
-		$message->senderName = 'Mr. Wizard';
-		$message->recipient = 'mailto:' . 'frodo@hobb.it';
-		// save the old copy in the plugin
-		$oldVCalendar = new VCalendar();
-		$oldVEvent = new VEvent($oldVCalendar, 'one', [
-			'UID' => 'uid-1234',
-			'SEQUENCE' => 0,
-			'SUMMARY' => 'Fellowship meeting',
-			'DTSTART' => new \DateTime('2016-01-01 00:00:00')
-		]);
-		$oldVEvent->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
-		$oldVEvent->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
-		$oldVEvent->add('ATTENDEE', 'mailto:' . 'boromir@tra.it.or', ['RSVP' => 'TRUE']);
-		$oldVCalendar->add($oldVEvent);
-		$data = ['invitee_name' => 'Mr. Wizard',
-			'meeting_title' => 'Fellowship meeting without (!) Boromir',
-			'attendee_name' => 'frodo@hobb.it'
-		];
-		$attendees = $newVevent->select('ATTENDEE');
-		$atnd = '';
-		foreach ($attendees as $attendee) {
-			if (strcasecmp($attendee->getValue(), $message->recipient) === 0) {
-				$atnd = $attendee;
-			}
-		}
-		$this->plugin->setVCalendar($oldVCalendar);
-		$this->service->expects(self::once())
-			->method('getLastOccurrence')
-			->willReturn(1496912700);
-		$this->mailer->expects(self::once())
-			->method('validateMailAddress')
-			->with('frodo@hobb.it')
-			->willReturn(true);
-		$this->eventComparisonService->expects(self::once())
-			->method('findModified')
-			->willReturn(['new' => [$newVevent], 'old' => [$oldVEvent]]);
-		$this->service->expects(self::once())
-			->method('getCurrentAttendee')
-			->with($message)
-			->willReturn($atnd);
-		$this->service->expects(self::once())
-			->method('isRoomOrResource')
-			->with($atnd)
-			->willReturn(false);
-		$this->service->expects(self::once())
-			->method('isCircle')
-			->with($atnd)
-			->willReturn(false);
-		$this->service->expects(self::once())
-			->method('buildBodyData')
-			->with($newVevent, $oldVEvent)
-			->willReturn($data);
-		$this->user->expects(self::any())
-			->method('getUID')
-			->willReturn('user1');
-		$this->user->expects(self::any())
-			->method('getDisplayName')
-			->willReturn('Mr. Wizard');
-		$this->userSession->expects(self::any())
-			->method('getUser')
-			->willReturn($this->user);
-		$this->service->expects(self::once())
-			->method('getFrom');
-		$this->service->expects(self::once())
-			->method('addSubjectAndHeading')
-			->with($this->emailTemplate, 'request', 'Mr. Wizard', 'Fellowship meeting without (!) Boromir', true);
-		$this->service->expects(self::once())
-			->method('addBulletList')
-			->with($this->emailTemplate, $newVevent, $data);
-		$this->service->expects(self::once())
-			->method('getAttendeeRsvpOrReqForParticipant')
-			->willReturn(true);
-		$this->config->expects(self::once())
-			->method('getValueString')
-			->with('dav', 'invitation_link_recipients', 'yes')
-			->willReturn('yes');
-		$this->config->expects(self::once())
-			->method('getValueBool')
-			->with('core', 'mail_providers_enabled', true)
-			->willReturn(false);
-		$this->service->expects(self::once())
-			->method('createInvitationToken')
-			->with($message, $newVevent, 1496912700)
-			->willReturn('token');
-		$this->service->expects(self::once())
-			->method('addResponseButtons')
-			->with($this->emailTemplate, 'token');
-		$this->service->expects(self::once())
-			->method('addMoreOptionsButton')
-			->with($this->emailTemplate, 'token');
-		$this->mailer->expects(self::once())
-			->method('send')
-			->willReturn([]);
-		$this->plugin->schedule($message);
-		$this->assertEquals('1.1', $message->getScheduleStatus());
-	}
+    public function testMailProviderDisabled(): void {
+        $message = new Message();
+        $message->method = 'REQUEST';
+        $newVCalendar = new VCalendar();
+        $newVevent = new VEvent($newVCalendar, 'one', array_merge([
+            'UID' => 'uid-1234',
+            'SEQUENCE' => 1,
+            'SUMMARY' => 'Fellowship meeting without (!) Boromir',
+            'DTSTART' => new \DateTime('2016-01-01 00:00:00')
+        ], []));
+        $newVevent->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
+        $newVevent->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE',  'CN' => 'Frodo']);
+        $message->message = $newVCalendar;
+        $message->sender = 'mailto:gandalf@wiz.ard';
+        $message->senderName = 'Mr. Wizard';
+        $message->recipient = 'mailto:' . 'frodo@hobb.it';
+        // save the old copy in the plugin
+        $oldVCalendar = new VCalendar();
+        $oldVEvent = new VEvent($oldVCalendar, 'one', [
+            'UID' => 'uid-1234',
+            'SEQUENCE' => 0,
+            'SUMMARY' => 'Fellowship meeting',
+            'DTSTART' => new \DateTime('2016-01-01 00:00:00')
+        ]);
+        $oldVEvent->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
+        $oldVEvent->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
+        $oldVEvent->add('ATTENDEE', 'mailto:' . 'boromir@tra.it.or', ['RSVP' => 'TRUE']);
+        $oldVCalendar->add($oldVEvent);
+        $data = ['invitee_name' => 'Mr. Wizard',
+            'meeting_title' => 'Fellowship meeting without (!) Boromir',
+            'attendee_name' => 'frodo@hobb.it'
+        ];
+        $attendees = $newVevent->select('ATTENDEE');
+        $atnd = '';
+        foreach ($attendees as $attendee) {
+            if (strcasecmp($attendee->getValue(), $message->recipient) === 0) {
+                $atnd = $attendee;
+            }
+        }
+        $this->plugin->setVCalendar($oldVCalendar);
+        $this->service->expects(self::once())
+            ->method('getLastOccurrence')
+            ->willReturn(1496912700);
+        $this->mailer->expects(self::once())
+            ->method('validateMailAddress')
+            ->with('frodo@hobb.it')
+            ->willReturn(true);
+        $this->eventComparisonService->expects(self::once())
+            ->method('findModified')
+            ->willReturn(['new' => [$newVevent], 'old' => [$oldVEvent]]);
+        $this->service->expects(self::once())
+            ->method('getCurrentAttendee')
+            ->with($message)
+            ->willReturn($atnd);
+        $this->service->expects(self::once())
+            ->method('isRoomOrResource')
+            ->with($atnd)
+            ->willReturn(false);
+        $this->service->expects(self::once())
+            ->method('isCircle')
+            ->with($atnd)
+            ->willReturn(false);
+        $this->service->expects(self::once())
+            ->method('buildBodyData')
+            ->with($newVevent, $oldVEvent)
+            ->willReturn($data);
+        $this->user->expects(self::any())
+            ->method('getUID')
+            ->willReturn('user1');
+        $this->user->expects(self::any())
+            ->method('getDisplayName')
+            ->willReturn('Mr. Wizard');
+        $this->userSession->expects(self::any())
+            ->method('getUser')
+            ->willReturn($this->user);
+        $this->service->expects(self::once())
+            ->method('getFrom');
+        $this->service->expects(self::once())
+            ->method('addSubjectAndHeading')
+            ->with($this->emailTemplate, 'request', 'Mr. Wizard', 'Fellowship meeting without (!) Boromir', true);
+        $this->service->expects(self::once())
+            ->method('addBulletList')
+            ->with($this->emailTemplate, $newVevent, $data);
+        $this->service->expects(self::once())
+            ->method('getAttendeeRsvpOrReqForParticipant')
+            ->willReturn(true);
+        $this->config->expects(self::once())
+            ->method('getValueString')
+            ->with('dav', 'invitation_link_recipients', 'yes')
+            ->willReturn('yes');
+        $this->config->expects(self::once())
+            ->method('getValueBool')
+            ->with('core', 'mail_providers_enabled', true)
+            ->willReturn(false);
+        $this->service->expects(self::once())
+            ->method('createInvitationToken')
+            ->with($message, $newVevent, 1496912700)
+            ->willReturn('token');
+        $this->service->expects(self::once())
+            ->method('addResponseButtons')
+            ->with($this->emailTemplate, 'token');
+        $this->service->expects(self::once())
+            ->method('addMoreOptionsButton')
+            ->with($this->emailTemplate, 'token');
+        $this->mailer->expects(self::once())
+            ->method('send')
+            ->willReturn([]);
+        $this->plugin->schedule($message);
+        $this->assertEquals('1.1', $message->getScheduleStatus());
+    }
 
-	public function testNoOldEvent(): void {
-		$message = new Message();
-		$message->method = 'REQUEST';
-		$newVCalendar = new VCalendar();
-		$newVevent = new VEvent($newVCalendar, 'VEVENT', array_merge([
-			'UID' => 'uid-1234',
-			'SEQUENCE' => 1,
-			'SUMMARY' => 'Fellowship meeting',
-			'DTSTART' => new \DateTime('2016-01-01 00:00:00')
-		], []));
-		$newVevent->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
-		$newVevent->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
-		$message->message = $newVCalendar;
-		$message->sender = 'mailto:gandalf@wiz.ard';
-		$message->senderName = 'Mr. Wizard';
-		$message->recipient = 'mailto:' . 'frodo@hobb.it';
-		$data = ['invitee_name' => 'Mr. Wizard',
-			'meeting_title' => 'Fellowship meeting',
-			'attendee_name' => 'frodo@hobb.it'
-		];
-		$attendees = $newVevent->select('ATTENDEE');
-		$atnd = '';
-		foreach ($attendees as $attendee) {
-			if (strcasecmp($attendee->getValue(), $message->recipient) === 0) {
-				$atnd = $attendee;
-			}
-		}
-		$this->service->expects(self::once())
-			->method('getLastOccurrence')
-			->willReturn(1496912700);
-		$this->mailer->expects(self::once())
-			->method('validateMailAddress')
-			->with('frodo@hobb.it')
-			->willReturn(true);
-		$this->eventComparisonService->expects(self::once())
-			->method('findModified')
-			->with($newVCalendar, null)
-			->willReturn(['old' => [] ,'new' => [$newVevent]]);
-		$this->service->expects(self::once())
-			->method('getCurrentAttendee')
-			->with($message)
-			->willReturn($atnd);
-		$this->service->expects(self::once())
-			->method('isRoomOrResource')
-			->with($atnd)
-			->willReturn(false);
-		$this->service->expects(self::once())
-			->method('isCircle')
-			->with($atnd)
-			->willReturn(false);
-		$this->service->expects(self::once())
-			->method('buildBodyData')
-			->with($newVevent, null)
-			->willReturn($data);
-		$this->user->expects(self::any())
-			->method('getUID')
-			->willReturn('user1');
-		$this->user->expects(self::any())
-			->method('getDisplayName')
-			->willReturn('Mr. Wizard');
-		$this->userSession->expects(self::any())
-			->method('getUser')
-			->willReturn($this->user);
-		$this->service->expects(self::once())
-			->method('getFrom');
-		$this->service->expects(self::once())
-			->method('addSubjectAndHeading')
-			->with($this->emailTemplate, 'request', 'Mr. Wizard', 'Fellowship meeting', false);
-		$this->service->expects(self::once())
-			->method('addBulletList')
-			->with($this->emailTemplate, $newVevent, $data);
-		$this->service->expects(self::once())
-			->method('getAttendeeRsvpOrReqForParticipant')
-			->willReturn(true);
-		$this->config->expects(self::once())
-			->method('getValueString')
-			->with('dav', 'invitation_link_recipients', 'yes')
-			->willReturn('yes');
-		$this->service->expects(self::once())
-			->method('createInvitationToken')
-			->with($message, $newVevent, 1496912700)
-			->willReturn('token');
-		$this->service->expects(self::once())
-			->method('addResponseButtons')
-			->with($this->emailTemplate, 'token');
-		$this->service->expects(self::once())
-			->method('addMoreOptionsButton')
-			->with($this->emailTemplate, 'token');
-		$this->mailer->expects(self::once())
-			->method('send')
-			->willReturn([]);
-		$this->mailer
-			->method('send')
-			->willReturn([]);
-		$this->plugin->schedule($message);
-		$this->assertEquals('1.1', $message->getScheduleStatus());
-	}
+    public function testNoOldEvent(): void {
+        $message = new Message();
+        $message->method = 'REQUEST';
+        $newVCalendar = new VCalendar();
+        $newVevent = new VEvent($newVCalendar, 'VEVENT', array_merge([
+            'UID' => 'uid-1234',
+            'SEQUENCE' => 1,
+            'SUMMARY' => 'Fellowship meeting',
+            'DTSTART' => new \DateTime('2016-01-01 00:00:00')
+        ], []));
+        $newVevent->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
+        $newVevent->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
+        $message->message = $newVCalendar;
+        $message->sender = 'mailto:gandalf@wiz.ard';
+        $message->senderName = 'Mr. Wizard';
+        $message->recipient = 'mailto:' . 'frodo@hobb.it';
+        $data = ['invitee_name' => 'Mr. Wizard',
+            'meeting_title' => 'Fellowship meeting',
+            'attendee_name' => 'frodo@hobb.it'
+        ];
+        $attendees = $newVevent->select('ATTENDEE');
+        $atnd = '';
+        foreach ($attendees as $attendee) {
+            if (strcasecmp($attendee->getValue(), $message->recipient) === 0) {
+                $atnd = $attendee;
+            }
+        }
+        $this->service->expects(self::once())
+            ->method('getLastOccurrence')
+            ->willReturn(1496912700);
+        $this->mailer->expects(self::once())
+            ->method('validateMailAddress')
+            ->with('frodo@hobb.it')
+            ->willReturn(true);
+        $this->eventComparisonService->expects(self::once())
+            ->method('findModified')
+            ->with($newVCalendar, null)
+            ->willReturn(['old' => [] ,'new' => [$newVevent]]);
+        $this->service->expects(self::once())
+            ->method('getCurrentAttendee')
+            ->with($message)
+            ->willReturn($atnd);
+        $this->service->expects(self::once())
+            ->method('isRoomOrResource')
+            ->with($atnd)
+            ->willReturn(false);
+        $this->service->expects(self::once())
+            ->method('isCircle')
+            ->with($atnd)
+            ->willReturn(false);
+        $this->service->expects(self::once())
+            ->method('buildBodyData')
+            ->with($newVevent, null)
+            ->willReturn($data);
+        $this->user->expects(self::any())
+            ->method('getUID')
+            ->willReturn('user1');
+        $this->user->expects(self::any())
+            ->method('getDisplayName')
+            ->willReturn('Mr. Wizard');
+        $this->userSession->expects(self::any())
+            ->method('getUser')
+            ->willReturn($this->user);
+        $this->service->expects(self::once())
+            ->method('getFrom');
+        $this->service->expects(self::once())
+            ->method('addSubjectAndHeading')
+            ->with($this->emailTemplate, 'request', 'Mr. Wizard', 'Fellowship meeting', false);
+        $this->service->expects(self::once())
+            ->method('addBulletList')
+            ->with($this->emailTemplate, $newVevent, $data);
+        $this->service->expects(self::once())
+            ->method('getAttendeeRsvpOrReqForParticipant')
+            ->willReturn(true);
+        $this->config->expects(self::once())
+            ->method('getValueString')
+            ->with('dav', 'invitation_link_recipients', 'yes')
+            ->willReturn('yes');
+        $this->service->expects(self::once())
+            ->method('createInvitationToken')
+            ->with($message, $newVevent, 1496912700)
+            ->willReturn('token');
+        $this->service->expects(self::once())
+            ->method('addResponseButtons')
+            ->with($this->emailTemplate, 'token');
+        $this->service->expects(self::once())
+            ->method('addMoreOptionsButton')
+            ->with($this->emailTemplate, 'token');
+        $this->mailer->expects(self::once())
+            ->method('send')
+            ->willReturn([]);
+        $this->mailer
+            ->method('send')
+            ->willReturn([]);
+        $this->plugin->schedule($message);
+        $this->assertEquals('1.1', $message->getScheduleStatus());
+    }
 
-	public function testNoButtons(): void {
-		$message = new Message();
-		$message->method = 'REQUEST';
-		$newVCalendar = new VCalendar();
-		$newVevent = new VEvent($newVCalendar, 'VEVENT', array_merge([
-			'UID' => 'uid-1234',
-			'SEQUENCE' => 1,
-			'SUMMARY' => 'Fellowship meeting',
-			'DTSTART' => new \DateTime('2016-01-01 00:00:00')
-		], []));
-		$newVevent->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
-		$newVevent->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
-		$message->message = $newVCalendar;
-		$message->sender = 'mailto:gandalf@wiz.ard';
-		$message->recipient = 'mailto:' . 'frodo@hobb.it';
-		$data = ['invitee_name' => 'Mr. Wizard',
-			'meeting_title' => 'Fellowship meeting',
-			'attendee_name' => 'frodo@hobb.it'
-		];
-		$attendees = $newVevent->select('ATTENDEE');
-		$atnd = '';
-		foreach ($attendees as $attendee) {
-			if (strcasecmp($attendee->getValue(), $message->recipient) === 0) {
-				$atnd = $attendee;
-			}
-		}
-		$this->service->expects(self::once())
-			->method('getLastOccurrence')
-			->willReturn(1496912700);
-		$this->mailer->expects(self::once())
-			->method('validateMailAddress')
-			->with('frodo@hobb.it')
-			->willReturn(true);
-		$this->eventComparisonService->expects(self::once())
-			->method('findModified')
-			->with($newVCalendar, null)
-			->willReturn(['old' => [] ,'new' => [$newVevent]]);
-		$this->service->expects(self::once())
-			->method('getCurrentAttendee')
-			->with($message)
-			->willReturn($atnd);
-		$this->service->expects(self::once())
-			->method('isRoomOrResource')
-			->with($atnd)
-			->willReturn(false);
-		$this->service->expects(self::once())
-			->method('isCircle')
-			->with($atnd)
-			->willReturn(false);
-		$this->service->expects(self::once())
-			->method('buildBodyData')
-			->with($newVevent, null)
-			->willReturn($data);
-		$this->user->expects(self::any())
-			->method('getUID')
-			->willReturn('user1');
-		$this->user->expects(self::any())
-			->method('getDisplayName')
-			->willReturn('Mr. Wizard');
-		$this->userSession->expects(self::any())
-			->method('getUser')
-			->willReturn($this->user);
-		$this->service->expects(self::once())
-			->method('getFrom');
-		$this->service->expects(self::once())
-			->method('addSubjectAndHeading')
-			->with($this->emailTemplate, 'request', 'Mr. Wizard', 'Fellowship meeting', false);
-		$this->service->expects(self::once())
-			->method('addBulletList')
-			->with($this->emailTemplate, $newVevent, $data);
-		$this->service->expects(self::once())
-			->method('getAttendeeRsvpOrReqForParticipant')
-			->willReturn(true);
-		$this->config->expects(self::once())
-			->method('getValueString')
-			->with('dav', 'invitation_link_recipients', 'yes')
-			->willReturn('no');
-		$this->service->expects(self::never())
-			->method('createInvitationToken');
-		$this->service->expects(self::never())
-			->method('addResponseButtons');
-		$this->service->expects(self::never())
-			->method('addMoreOptionsButton');
-		$this->mailer->expects(self::once())
-			->method('send')
-			->willReturn([]);
-		$this->mailer
-			->method('send')
-			->willReturn([]);
-		$this->plugin->schedule($message);
-		$this->assertEquals('1.1', $message->getScheduleStatus());
-	}
+    public function testNoButtons(): void {
+        $message = new Message();
+        $message->method = 'REQUEST';
+        $newVCalendar = new VCalendar();
+        $newVevent = new VEvent($newVCalendar, 'VEVENT', array_merge([
+            'UID' => 'uid-1234',
+            'SEQUENCE' => 1,
+            'SUMMARY' => 'Fellowship meeting',
+            'DTSTART' => new \DateTime('2016-01-01 00:00:00')
+        ], []));
+        $newVevent->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
+        $newVevent->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
+        $message->message = $newVCalendar;
+        $message->sender = 'mailto:gandalf@wiz.ard';
+        $message->recipient = 'mailto:' . 'frodo@hobb.it';
+        $data = ['invitee_name' => 'Mr. Wizard',
+            'meeting_title' => 'Fellowship meeting',
+            'attendee_name' => 'frodo@hobb.it'
+        ];
+        $attendees = $newVevent->select('ATTENDEE');
+        $atnd = '';
+        foreach ($attendees as $attendee) {
+            if (strcasecmp($attendee->getValue(), $message->recipient) === 0) {
+                $atnd = $attendee;
+            }
+        }
+        $this->service->expects(self::once())
+            ->method('getLastOccurrence')
+            ->willReturn(1496912700);
+        $this->mailer->expects(self::once())
+            ->method('validateMailAddress')
+            ->with('frodo@hobb.it')
+            ->willReturn(true);
+        $this->eventComparisonService->expects(self::once())
+            ->method('findModified')
+            ->with($newVCalendar, null)
+            ->willReturn(['old' => [] ,'new' => [$newVevent]]);
+        $this->service->expects(self::once())
+            ->method('getCurrentAttendee')
+            ->with($message)
+            ->willReturn($atnd);
+        $this->service->expects(self::once())
+            ->method('isRoomOrResource')
+            ->with($atnd)
+            ->willReturn(false);
+        $this->service->expects(self::once())
+            ->method('isCircle')
+            ->with($atnd)
+            ->willReturn(false);
+        $this->service->expects(self::once())
+            ->method('buildBodyData')
+            ->with($newVevent, null)
+            ->willReturn($data);
+        $this->user->expects(self::any())
+            ->method('getUID')
+            ->willReturn('user1');
+        $this->user->expects(self::any())
+            ->method('getDisplayName')
+            ->willReturn('Mr. Wizard');
+        $this->userSession->expects(self::any())
+            ->method('getUser')
+            ->willReturn($this->user);
+        $this->service->expects(self::once())
+            ->method('getFrom');
+        $this->service->expects(self::once())
+            ->method('addSubjectAndHeading')
+            ->with($this->emailTemplate, 'request', 'Mr. Wizard', 'Fellowship meeting', false);
+        $this->service->expects(self::once())
+            ->method('addBulletList')
+            ->with($this->emailTemplate, $newVevent, $data);
+        $this->service->expects(self::once())
+            ->method('getAttendeeRsvpOrReqForParticipant')
+            ->willReturn(true);
+        $this->config->expects(self::once())
+            ->method('getValueString')
+            ->with('dav', 'invitation_link_recipients', 'yes')
+            ->willReturn('no');
+        $this->service->expects(self::never())
+            ->method('createInvitationToken');
+        $this->service->expects(self::never())
+            ->method('addResponseButtons');
+        $this->service->expects(self::never())
+            ->method('addMoreOptionsButton');
+        $this->mailer->expects(self::once())
+            ->method('send')
+            ->willReturn([]);
+        $this->mailer
+            ->method('send')
+            ->willReturn([]);
+        $this->plugin->schedule($message);
+        $this->assertEquals('1.1', $message->getScheduleStatus());
+    }
 }

Spacing +38 added lines, -38 removed lines

@@ -151,10 +151,10 @@ 
 			'DTSTART' => new \DateTime('2016-01-01 00:00:00')
 		], []));
 		$message->message->VEVENT->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
-		$message->message->VEVENT->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE']);
+		$message->message->VEVENT->add('ATTENDEE', 'mailto:'.'frodo@hobb.it', ['RSVP' => 'TRUE']);
 		$message->sender = 'mailto:gandalf@wiz.ard';
 		$message->senderName = 'Mr. Wizard';
-		$message->recipient = 'mailto:' . 'frodo@hobb.it';
+		$message->recipient = 'mailto:'.'frodo@hobb.it';
 		$message->significantChange = false;
 		$this->plugin->schedule($message);
 		$this->assertEquals('1.0', $message->getScheduleStatus());
@@ -171,11 +171,11 @@ 
 			'DTSTART' => new \DateTime('2016-01-01 00:00:00')
 		], []));
 		$newVevent->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
-		$newVevent->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE',  'CN' => 'Frodo']);
+		$newVevent->add('ATTENDEE', 'mailto:'.'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
 		$message->message = $newVCalendar;
 		$message->sender = 'mailto:gandalf@wiz.ard';
 		$message->senderName = 'Mr. Wizard';
-		$message->recipient = 'mailto:' . 'frodo@hobb.it';
+		$message->recipient = 'mailto:'.'frodo@hobb.it';
 		// save the old copy in the plugin
 		$oldVCalendar = new VCalendar();
 		$oldVEvent = new VEvent($oldVCalendar, 'one', [
@@ -185,8 +185,8 @@ 
 			'DTSTART' => new \DateTime('2016-01-01 00:00:00')
 		]);
 		$oldVEvent->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
-		$oldVEvent->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
-		$oldVEvent->add('ATTENDEE', 'mailto:' . 'boromir@tra.it.or', ['RSVP' => 'TRUE']);
+		$oldVEvent->add('ATTENDEE', 'mailto:'.'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
+		$oldVEvent->add('ATTENDEE', 'mailto:'.'boromir@tra.it.or', ['RSVP' => 'TRUE']);
 		$oldVCalendar->add($oldVEvent);
 		$data = ['invitee_name' => 'Mr. Wizard',
 			'meeting_title' => 'Fellowship meeting without (!) Boromir',
@@ -278,11 +278,11 @@ 
 			'DTSTART' => new \DateTime('2016-01-01 00:00:00')
 		], []));
 		$newVevent->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
-		$newVevent->add('ATTENDEE', 'mailto:' . 'the-shire@hobb.it', ['RSVP' => 'TRUE',  'CN' => 'The Shire', 'CUTYPE' => 'ROOM']);
+		$newVevent->add('ATTENDEE', 'mailto:'.'the-shire@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'The Shire', 'CUTYPE' => 'ROOM']);
 		$message->message = $newVCalendar;
 		$message->sender = 'mailto:gandalf@wiz.ard';
 		$message->senderName = 'Mr. Wizard';
-		$message->recipient = 'mailto:' . 'the-shire@hobb.it';
+		$message->recipient = 'mailto:'.'the-shire@hobb.it';
 		// save the old copy in the plugin
 		$oldVCalendar = new VCalendar();
 		$oldVEvent = new VEvent($oldVCalendar, 'one', [
@@ -292,8 +292,8 @@ 
 			'DTSTART' => new \DateTime('2016-01-01 00:00:00')
 		]);
 		$oldVEvent->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
-		$oldVEvent->add('ATTENDEE', 'mailto:' . 'the-shire@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'The Shire', 'CUTYPE' => 'ROOM']);
-		$oldVEvent->add('ATTENDEE', 'mailto:' . 'boromir@tra.it.or', ['RSVP' => 'TRUE']);
+		$oldVEvent->add('ATTENDEE', 'mailto:'.'the-shire@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'The Shire', 'CUTYPE' => 'ROOM']);
+		$oldVEvent->add('ATTENDEE', 'mailto:'.'boromir@tra.it.or', ['RSVP' => 'TRUE']);
 		$oldVCalendar->add($oldVEvent);
 		$data = ['invitee_name' => 'Mr. Wizard',
 			'meeting_title' => 'Fellowship meeting without (!) Boromir',
@@ -371,12 +371,12 @@ 
 			'DTSTART' => new \DateTime('2016-01-01 00:00:00')
 		], []));
 		$newVevent->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
-		$newVevent->add('ATTENDEE', 'mailto:' . 'circle+82utEV1Fle8wvxndZLK5TVAPtxj8IIe@middle.earth', ['RSVP' => 'TRUE', 'CN' => 'The Fellowship', 'CUTYPE' => 'GROUP']);
-		$newVevent->add('ATTENDEE', 'mailto:' . 'boromir@tra.it.or', ['RSVP' => 'TRUE', 'MEMBER' => 'circle+82utEV1Fle8wvxndZLK5TVAPtxj8IIe@middle.earth']);
+		$newVevent->add('ATTENDEE', 'mailto:'.'circle+82utEV1Fle8wvxndZLK5TVAPtxj8IIe@middle.earth', ['RSVP' => 'TRUE', 'CN' => 'The Fellowship', 'CUTYPE' => 'GROUP']);
+		$newVevent->add('ATTENDEE', 'mailto:'.'boromir@tra.it.or', ['RSVP' => 'TRUE', 'MEMBER' => 'circle+82utEV1Fle8wvxndZLK5TVAPtxj8IIe@middle.earth']);
 		$message->message = $newVCalendar;
 		$message->sender = 'mailto:gandalf@wiz.ard';
 		$message->senderName = 'Mr. Wizard';
-		$message->recipient = 'mailto:' . 'circle+82utEV1Fle8wvxndZLK5TVAPtxj8IIe@middle.earth';
+		$message->recipient = 'mailto:'.'circle+82utEV1Fle8wvxndZLK5TVAPtxj8IIe@middle.earth';
 		$attendees = $newVevent->select('ATTENDEE');
 		$circle = '';
 		foreach ($attendees as $attendee) {
@@ -453,7 +453,7 @@ 
 			'RRULE' => 'FREQ=DAILY;INTERVAL=1;UNTIL=20160201T000000Z'
 		]);
 		$newVevent->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
-		$newVevent->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE',  'CN' => 'Frodo']);
+		$newVevent->add('ATTENDEE', 'mailto:'.'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
 		$newvEvent2 = new VEvent($newVCalendar, 'two', [
 			'UID' => 'uid-1234',
 			'SEQUENCE' => 1,
@@ -462,10 +462,10 @@ 
 			'RECURRENCE-ID' => new \DateTime('2016-01-01 00:00:00')
 		]);
 		$newvEvent2->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
-		$newvEvent2->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
+		$newvEvent2->add('ATTENDEE', 'mailto:'.'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
 		$message->message = $newVCalendar;
 		$message->sender = 'mailto:gandalf@wiz.ard';
-		$message->recipient = 'mailto:' . 'frodo@hobb.it';
+		$message->recipient = 'mailto:'.'frodo@hobb.it';
 		// save the old copy in the plugin
 		$oldVCalendar = new VCalendar();
 		$oldVEvent = new VEvent($oldVCalendar, 'one', [
@@ -477,7 +477,7 @@ 
 			'RRULE' => 'FREQ=DAILY;INTERVAL=1;UNTIL=20160201T000000Z'
 		]);
 		$oldVEvent->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
-		$oldVEvent->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
+		$oldVEvent->add('ATTENDEE', 'mailto:'.'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
 		$data = ['invitee_name' => 'Mr. Wizard',
 			'meeting_title' => 'Elevenses',
 			'attendee_name' => 'frodo@hobb.it'
@@ -499,7 +499,7 @@ 
 			->willReturn(true);
 		$this->eventComparisonService->expects(self::once())
 			->method('findModified')
-			->willReturn(['old' => [] ,'new' => [$newVevent]]);
+			->willReturn(['old' => [], 'new' => [$newVevent]]);
 		$this->service->expects(self::once())
 			->method('getCurrentAttendee')
 			->with($message)
@@ -568,10 +568,10 @@ 
 			'DTSTART' => new \DateTime('2016-01-01 00:00:00')
 		], []));
 		$message->message->VEVENT->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
-		$message->message->VEVENT->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE']);
+		$message->message->VEVENT->add('ATTENDEE', 'mailto:'.'frodo@hobb.it', ['RSVP' => 'TRUE']);
 		$message->sender = 'mailto:gandalf@wiz.ard';
 		$message->senderName = 'Mr. Wizard';
-		$message->recipient = 'mailto:' . 'frodo@hobb.it';
+		$message->recipient = 'mailto:'.'frodo@hobb.it';
 
 		$this->service->expects(self::once())
 			->method('getLastOccurrence')
@@ -596,11 +596,11 @@ 
 			'DTSTART' => new \DateTime('2016-01-01 00:00:00')
 		], []));
 		$newVevent->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
-		$newVevent->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE',  'CN' => 'Frodo']);
+		$newVevent->add('ATTENDEE', 'mailto:'.'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
 		$message->message = $newVcalendar;
 		$message->sender = 'mailto:gandalf@wiz.ard';
 		$message->senderName = 'Mr. Wizard';
-		$message->recipient = 'mailto:' . 'frodo@hobb.it';
+		$message->recipient = 'mailto:'.'frodo@hobb.it';
 		// save the old copy in the plugin
 		$oldVcalendar = new VCalendar();
 		$oldVevent = new VEvent($oldVcalendar, 'one', [
@@ -610,8 +610,8 @@ 
 			'DTSTART' => new \DateTime('2016-01-01 00:00:00')
 		]);
 		$oldVevent->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
-		$oldVevent->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
-		$oldVevent->add('ATTENDEE', 'mailto:' . 'boromir@tra.it.or', ['RSVP' => 'TRUE']);
+		$oldVevent->add('ATTENDEE', 'mailto:'.'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
+		$oldVevent->add('ATTENDEE', 'mailto:'.'boromir@tra.it.or', ['RSVP' => 'TRUE']);
 		$oldVcalendar->add($oldVevent);
 		$data = ['invitee_name' => 'Mr. Wizard',
 			'meeting_title' => 'Fellowship meeting without (!) Boromir',
@@ -634,7 +634,7 @@ 
 			->willReturn(true);
 		$this->eventComparisonService->expects(self::once())
 			->method('findModified')
-			->willReturn(['old' => [] ,'new' => [$newVevent]]);
+			->willReturn(['old' => [], 'new' => [$newVevent]]);
 		$this->service->expects(self::once())
 			->method('getCurrentAttendee')
 			->with($message)
@@ -709,11 +709,11 @@ 
 			'DTSTART' => new \DateTime('2016-01-01 00:00:00')
 		], []));
 		$event->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
-		$event->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE',  'CN' => 'Frodo']);
+		$event->add('ATTENDEE', 'mailto:'.'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
 		$message->message = $calendar;
 		$message->sender = 'mailto:gandalf@wiz.ard';
 		$message->senderName = 'Mr. Wizard';
-		$message->recipient = 'mailto:' . 'frodo@hobb.it';
+		$message->recipient = 'mailto:'.'frodo@hobb.it';
 		// construct
 		foreach ($event->select('ATTENDEE') as $entry) {
 			if (strcasecmp($entry->getValue(), $message->recipient) === 0) {
@@ -784,7 +784,7 @@ 
 			->with($this->emailTemplate, 'token');
 		$this->eventComparisonService->expects(self::once())
 			->method('findModified')
-			->willReturn(['old' => [] ,'new' => [$event]]);
+			->willReturn(['old' => [], 'new' => [$event]]);
 		// construct mail mock returns
 		$this->mailer->expects(self::once())
 			->method('validateMailAddress')
@@ -817,11 +817,11 @@ 
 			'DTSTART' => new \DateTime('2016-01-01 00:00:00')
 		], []));
 		$newVevent->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
-		$newVevent->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE',  'CN' => 'Frodo']);
+		$newVevent->add('ATTENDEE', 'mailto:'.'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
 		$message->message = $newVCalendar;
 		$message->sender = 'mailto:gandalf@wiz.ard';
 		$message->senderName = 'Mr. Wizard';
-		$message->recipient = 'mailto:' . 'frodo@hobb.it';
+		$message->recipient = 'mailto:'.'frodo@hobb.it';
 		// save the old copy in the plugin
 		$oldVCalendar = new VCalendar();
 		$oldVEvent = new VEvent($oldVCalendar, 'one', [
@@ -831,8 +831,8 @@ 
 			'DTSTART' => new \DateTime('2016-01-01 00:00:00')
 		]);
 		$oldVEvent->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
-		$oldVEvent->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
-		$oldVEvent->add('ATTENDEE', 'mailto:' . 'boromir@tra.it.or', ['RSVP' => 'TRUE']);
+		$oldVEvent->add('ATTENDEE', 'mailto:'.'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
+		$oldVEvent->add('ATTENDEE', 'mailto:'.'boromir@tra.it.or', ['RSVP' => 'TRUE']);
 		$oldVCalendar->add($oldVEvent);
 		$data = ['invitee_name' => 'Mr. Wizard',
 			'meeting_title' => 'Fellowship meeting without (!) Boromir',
@@ -928,11 +928,11 @@ 
 			'DTSTART' => new \DateTime('2016-01-01 00:00:00')
 		], []));
 		$newVevent->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
-		$newVevent->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
+		$newVevent->add('ATTENDEE', 'mailto:'.'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
 		$message->message = $newVCalendar;
 		$message->sender = 'mailto:gandalf@wiz.ard';
 		$message->senderName = 'Mr. Wizard';
-		$message->recipient = 'mailto:' . 'frodo@hobb.it';
+		$message->recipient = 'mailto:'.'frodo@hobb.it';
 		$data = ['invitee_name' => 'Mr. Wizard',
 			'meeting_title' => 'Fellowship meeting',
 			'attendee_name' => 'frodo@hobb.it'
@@ -954,7 +954,7 @@ 
 		$this->eventComparisonService->expects(self::once())
 			->method('findModified')
 			->with($newVCalendar, null)
-			->willReturn(['old' => [] ,'new' => [$newVevent]]);
+			->willReturn(['old' => [], 'new' => [$newVevent]]);
 		$this->service->expects(self::once())
 			->method('getCurrentAttendee')
 			->with($message)
@@ -1026,10 +1026,10 @@ 
 			'DTSTART' => new \DateTime('2016-01-01 00:00:00')
 		], []));
 		$newVevent->add('ORGANIZER', 'mailto:gandalf@wiz.ard');
-		$newVevent->add('ATTENDEE', 'mailto:' . 'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
+		$newVevent->add('ATTENDEE', 'mailto:'.'frodo@hobb.it', ['RSVP' => 'TRUE', 'CN' => 'Frodo']);
 		$message->message = $newVCalendar;
 		$message->sender = 'mailto:gandalf@wiz.ard';
-		$message->recipient = 'mailto:' . 'frodo@hobb.it';
+		$message->recipient = 'mailto:'.'frodo@hobb.it';
 		$data = ['invitee_name' => 'Mr. Wizard',
 			'meeting_title' => 'Fellowship meeting',
 			'attendee_name' => 'frodo@hobb.it'
@@ -1051,7 +1051,7 @@ 
 		$this->eventComparisonService->expects(self::once())
 			->method('findModified')
 			->with($newVCalendar, null)
-			->willReturn(['old' => [] ,'new' => [$newVevent]]);
+			->willReturn(['old' => [], 'new' => [$newVevent]]);
 		$this->service->expects(self::once())
 			->method('getCurrentAttendee')
 			->with($message)