Page MenuHomePhabricator
Files F15461104

D16667.diff
No OneTemporary
Actions

D16667.diff
View Options

diff --git a/src/applications/calendar/query/PhabricatorCalendarEventQuery.php b/src/applications/calendar/query/PhabricatorCalendarEventQuery.php
--- a/src/applications/calendar/query/PhabricatorCalendarEventQuery.php
+++ b/src/applications/calendar/query/PhabricatorCalendarEventQuery.php
@@ -203,8 +203,8 @@
$end_times[] = $this->rangeEnd;
}
- if ($event->getRecurrenceEndDate()) {
- $end_times[] = $event->getRecurrenceEndDate();
+ if ($event->getUntilDateTimeEpoch()) {
+ $end_times[] = $event->getUntilDateTimeEpoch();
}
if ($enforced_end) {
diff --git a/src/applications/calendar/storage/PhabricatorCalendarEvent.php b/src/applications/calendar/storage/PhabricatorCalendarEvent.php
--- a/src/applications/calendar/storage/PhabricatorCalendarEvent.php
+++ b/src/applications/calendar/storage/PhabricatorCalendarEvent.php
@@ -176,15 +176,15 @@
->setDescription($parent->getDescription());
$sequence = $this->getSequenceIndex();
- $duration = $parent->getDuration();
- $epochs = $parent->getSequenceIndexEpochs($actor, $sequence, $duration);
+ $start_datetime = $parent->newSequenceIndexDateTime($sequence);
- $start_datetime = PhutilCalendarAbsoluteDateTime::newFromEpoch(
- $epochs['dateFrom'],
- $parent->newStartDateTime()->getTimezone());
- $end_datetime = PhutilCalendarAbsoluteDateTime::newFromEpoch(
- $epochs['dateTo'],
- $parent->newEndDateTime()->getTimezone());
+ if (!$start_datetime) {
+ throw new Exception(
+ "Sequence {$sequence} does not exist for event!");
+ }
+
+ $duration = $parent->newDuration();
+ $end_datetime = $start_datetime->newRelativeDateTime($duration);
$this
->setStartDateTime($start_datetime)
@@ -194,42 +194,21 @@
}
public function isValidSequenceIndex(PhabricatorUser $viewer, $sequence) {
- try {
- $this->getSequenceIndexEpochs($viewer, $sequence, $this->getDuration());
- return true;
- } catch (Exception $ex) {
- return false;
- }
+ return (bool)$this->newSequenceIndexDateTime($sequence);
}
- private function getSequenceIndexEpochs(
- PhabricatorUser $viewer,
- $sequence,
- $duration) {
-
- $frequency = $this->getFrequencyUnit();
- $modify_key = '+'.$sequence.' '.$frequency;
-
- $date_time = $this->newStartDateTime()
- ->setViewerTimezone($viewer->getTimezoneIdentifier())
- ->newPHPDateTime();
-
- $date_time->modify($modify_key);
- $date = $date_time->format('U');
-
- $end_date = $this->getUntilDateTimeEpoch();
- if ($end_date && $date > $end_date) {
- throw new Exception(
- pht(
- 'Sequence "%s" is invalid for this event: it would occur after '.
- 'the event stops repeating.',
- $sequence));
+ public function newSequenceIndexDateTime($sequence) {
+ $set = $this->newRecurrenceSet();
+ if (!$set) {
+ return null;
}
- return array(
- 'dateFrom' => $date,
- 'dateTo' => $date + $duration,
- );
+ $instances = $set->getEventsBetween(
+ null,
+ $this->newUntilDateTime(),
+ $sequence + 1);
+
+ return idx($instances, $sequence, null);
}
public function newStub(PhabricatorUser $actor, $sequence) {
@@ -785,13 +764,12 @@
return null;
}
- $epochs = $this->getParentEvent()->getSequenceIndexEpochs(
- new PhabricatorUser(),
- $this->getSequenceIndex(),
- $this->getDuration());
+ $index = $this->getSequenceIndex();
+ if (!$index) {
+ return null;
+ }
- $epoch = $epochs['dateFrom'];
- return $this->newDateTimeFromEpoch($epoch);
+ return $this->newSequenceIndexDateTime($index);
}
private function newDateTimeFromEpoch($epoch) {
@@ -845,6 +823,40 @@
$datetime->newAbsoluteDateTime()->toDictionary());
}
+
+ public function newRecurrenceRule() {
+ if ($this->isChildEvent()) {
+ return $this->getParentEvent()->newRecurrenceRule();
+ }
+
+ // TODO: This is a little fragile since it relies on the convenient
+ // definition of FREQUENCY constants here and in RecurrenceRule, but
+ // should be gone soon.
+ $map = array(
+ 'FREQ' => phutil_utf8_strtoupper($this->getFrequencyRule()),
+ );
+
+ $rrule = PhutilCalendarRecurrenceRule::newFromDictionary($map);
+
+ $start = $this->newStartDateTime();
+ $rrule->setStartDateTime($start);
+
+ return $rrule;
+ }
+
+ public function newRecurrenceSet() {
+ if ($this->isChildEvent()) {
+ return $this->getParentEvent()->newRecurrenceSet();
+ }
+
+ $set = new PhutilCalendarRecurrenceSet();
+
+ $rrule = $this->newRecurrenceRule();
+ $set->addSource($rrule);
+
+ return $set;
+ }
+
/* -( Markup Interface )--------------------------------------------------- */

File Metadata

Mime Type
text/plain
Expires
Wed, Apr 2, 5:16 AM (3 d, 11 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7391323
Default Alt Text
D16667.diff (4 KB)

Event Timeline

Phabricator · Built by Phacility