+1 -8

src/applications/calendar/editor/PhabricatorCalendarEventEditEngine.php

reviewed

··· 155 155 } 156 156 157 157 if ($this->getIsCreate() || $object->getIsRecurring()) { 158 158 - $until_datetime = $object->newUntilDateTime(); 159 159 - if ($until_datetime) { 160 160 - $until_epoch = $until_datetime->getEpoch(); 161 161 - } else { 162 162 - $until_epoch = null; 163 163 - } 164 164 - 165 158 $fields[] = id(new PhabricatorEpochEditField()) 166 159 ->setAllowNull(true) 167 160 ->setKey('until') ··· 171 164 ->setDescription(pht('Last instance of the event.')) 172 165 ->setConduitDescription(pht('Change when the event repeats until.')) 173 166 ->setConduitTypeDescription(pht('New final event time.')) 174 174 - ->setValue($until_epoch); 167 167 + ->setValue($object->getUntilDateTimeEpoch()); 175 168 } 176 169 177 170 $fields[] = id(new PhabricatorBoolEditField())

+4 -4

src/applications/calendar/editor/PhabricatorCalendarEventEditor.php

reviewed

··· 139 139 WHERE phid IN (%Ls) AND availabilityCacheTTL >= %d', 140 140 $user->getTableName(), 141 141 $phids, 142 142 - $object->getDateFromForCache()); 142 142 + $object->getStartDateTimeEpochForCache()); 143 143 } 144 144 145 145 return $xactions; ··· 159 159 $recurrence_end_xaction = 160 160 PhabricatorCalendarEventUntilDateTransaction::TRANSACTIONTYPE; 161 161 162 162 - $start_date = $object->getDateFrom(); 163 163 - $end_date = $object->getDateTo(); 164 164 - $recurrence_end = $object->getRecurrenceEndDate(); 162 162 + $start_date = $object->getStartDateTimeEpoch(); 163 163 + $end_date = $object->getEndDateTimeEpoch(); 164 164 + $recurrence_end = $object->getUntilDateTimeEpoch(); 165 165 $is_recurring = $object->getIsRecurring(); 166 166 167 167 $errors = array();

+13 -3

src/applications/calendar/storage/PhabricatorCalendarEvent.php

reviewed

··· 184 184 ->setDescription($parent->getDescription()); 185 185 186 186 $sequence = $this->getSequenceIndex(); 187 187 - $duration = $this->getDuration(); 187 187 + $duration = $parent->getDuration(); 188 188 $epochs = $parent->getSequenceIndexEpochs($actor, $sequence, $duration); 189 189 190 190 $this ··· 277 277 } 278 278 279 279 public function getDuration() { 280 280 - return $this->getDateTo() - $this->getDateFrom(); 280 280 + return ($this->getEndDateTimeEpoch() - $this->getStartDateTimeEpoch()); 281 281 } 282 282 283 283 public function getDateEpochForTimezone( ··· 366 366 * 367 367 * @return int Event start date for availability caches. 368 368 */ 369 369 - public function getDateFromForCache() { 369 369 + public function getStartDateTimeEpochForCache() { 370 370 $epoch = $this->getStartDateTimeEpoch(); 371 371 $window = phutil_units('15 minutes in seconds'); 372 372 return ($epoch - $window); ··· 792 792 return null; 793 793 } 794 794 return $this->newDateTimeFromEpoch($epoch); 795 795 + } 796 796 + 797 797 + public function getUntilDateTimeEpoch() { 798 798 + $datetime = $this->newUntilDateTime(); 799 799 + 800 800 + if (!$datetime) { 801 801 + return null; 802 802 + } 803 803 + 804 804 + return $datetime->getEpoch(); 795 805 } 796 806 797 807 public function newDuration() {

+2 -1

src/applications/calendar/xaction/PhabricatorCalendarEventEndDateTransaction.php

reviewed

··· 6 6 const TRANSACTIONTYPE = 'calendar.enddate'; 7 7 8 8 public function generateOldValue($object) { 9 9 - return $object->getDateTo(); 9 9 + // TODO: Upgrade this. 10 10 + return $object->getEndDateTimeEpoch(); 10 11 } 11 12 12 13 public function applyInternalEffects($object, $value) {

+2 -1

src/applications/calendar/xaction/PhabricatorCalendarEventStartDateTransaction.php

reviewed

··· 6 6 const TRANSACTIONTYPE = 'calendar.startdate'; 7 7 8 8 public function generateOldValue($object) { 9 9 - return $object->getDateFrom(); 9 9 + // TODO: Upgrade this. 10 10 + return $object->getStartDateTimeEpoch(); 10 11 } 11 12 12 13 public function applyInternalEffects($object, $value) {

+2 -1

src/applications/calendar/xaction/PhabricatorCalendarEventUntilDateTransaction.php

reviewed

··· 6 6 const TRANSACTIONTYPE = 'calendar.recurrenceenddate'; 7 7 8 8 public function generateOldValue($object) { 9 9 - return $object->getRecurrenceEndDate(); 9 9 + // TODO: Upgrade this. 10 10 + return $object->getUntilDateTimeEpoch(); 10 11 } 11 12 12 13 public function applyInternalEffects($object, $value) {

+1 -1

src/applications/people/query/PhabricatorPeopleQuery.php

reviewed

··· 431 431 // because of an event, we check again for events after that one ends. 432 432 while (true) { 433 433 foreach ($events as $event) { 434 434 - $from = $event->getDateFromForCache(); 434 434 + $from = $event->getStartDateTimeEpochForCache(); 435 435 $to = $event->getEndDateTimeEpoch(); 436 436 if (($from <= $cursor) && ($to > $cursor)) { 437 437 $cursor = $to;