Change option's time handling and add timezones

CHANGELOG.md

@@ -5,6 +5,16 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [unreleased] - tbd
+### Added
+ - Timezone support for polls and options
+   - Set default timezone for any poll
+   - Choose timezone to display, if the poll's original timezone differs from the user's one
+   - Choose timezone, when adding options in case of different timezones between poll and user
+
+### Changed
+ - Use ISO formatted timestamps and durations
+
 ## [8.6.3] - 2026-01-18
 ### Fixed
  - Fixed missing user menu items, when table view is active

lib/Controller/PollController.php

@@ -106,49 +106,17 @@ public function get(int $pollId): JSONResponse {
 	#[OpenAPI(OpenAPI::SCOPE_IGNORE)]
 	#[FrontpageRoute(verb: 'GET', url: '/poll/{pollId}')]
 	public function getFull(int $pollId): JSONResponse {
-		return $this->response(fn () => $this->getFullPoll($pollId, true), Http::STATUS_OK);
+		return $this->response(fn () => $this->getFullPoll($pollId), Http::STATUS_OK);
 	}
 
-	private function getFullPoll(int $pollId, bool $withTimings = false): array {
-		$timerMicro['start'] = microtime(true);
-
+	private function getFullPoll(int $pollId): array {
 		$poll = $this->pollService->get($pollId);
-		$timerMicro['poll'] = microtime(true);
-
 		$options = $this->optionService->list($pollId);
-		$timerMicro['options'] = microtime(true);
-
 		$votes = $this->voteService->list($pollId);
-		$timerMicro['votes'] = microtime(true);
-
 		$comments = $this->commentService->list($pollId);
-		$timerMicro['comments'] = microtime(true);
-
 		$shares = $this->shareService->list($pollId);
-		$timerMicro['shares'] = microtime(true);
-
 		$subscribed = $this->subscriptionService->get($pollId);
-		$timerMicro['subscribed'] = microtime(true);
-
-		$diffMicro['total'] = microtime(true) - $timerMicro['start'];
-		$diffMicro['poll'] = $timerMicro['poll'] - $timerMicro['start'];
-		$diffMicro['options'] = $timerMicro['options'] - $timerMicro['poll'];
-		$diffMicro['votes'] = $timerMicro['votes'] - $timerMicro['options'];
-		$diffMicro['comments'] = $timerMicro['comments'] - $timerMicro['votes'];
-		$diffMicro['shares'] = $timerMicro['shares'] - $timerMicro['comments'];
-		$diffMicro['subscribed'] = $timerMicro['subscribed'] - $timerMicro['shares'];
 
-		if ($withTimings) {
-			return [
-				'poll' => $poll,
-				'options' => $options,
-				'votes' => $votes,
-				'comments' => $comments,
-				'shares' => $shares,
-				'subscribed' => $subscribed,
-				'diffMicro' => $diffMicro,
-			];
-		}
 		return [
 			'poll' => $poll,
 			'options' => $options,
@@ -170,10 +138,10 @@ private function getFullPoll(int $pollId, bool $withTimings = false): array {
 	#[NoAdminRequired]
 	#[OpenAPI(OpenAPI::SCOPE_IGNORE)]
 	#[FrontpageRoute(verb: 'POST', url: '/poll/add')]
-	public function add(string $type, string $title, string $votingVariant = Poll::VARIANT_SIMPLE): JSONResponse {
+	public function add(string $type, string $title, ?string $timezoneName = null, string $votingVariant = Poll::VARIANT_SIMPLE): JSONResponse {
 		return $this->response(
 			fn () => [
-				'poll' => $this->pollService->add($type, $title, $votingVariant)
+				'poll' => $this->pollService->add($type, $title, $timezoneName, $votingVariant)
 			],
 			Http::STATUS_CREATED
 		);

lib/Controller/PublicController.php

@@ -10,6 +10,7 @@
 
 use OCA\Polls\AppConstants;
 use OCA\Polls\Attributes\ShareTokenRequired;
+use OCA\Polls\Exceptions\InsufficientAttributesException;
 use OCA\Polls\Model\SentResult;
 use OCA\Polls\Model\Sequence;
 use OCA\Polls\Model\Settings\AppSettings;
@@ -224,6 +225,12 @@ public function addOption(
 		?array $sequence = null,
 	): JSONResponse {
 		$pollId = $this->userSession->getShare()->getPollId();
+
+		/** @psalm-suppress RiskyTruthyFalsyComparison */
+		if (!$pollId) {
+			throw new InsufficientAttributesException('PollId of share is missing or invalid');
+		}
+
 		return $this->response(fn () => array_merge(
 			$this->optionService->addWithSequenceAndAutoVote(
 				$pollId,

lib/Db/Option.php

@@ -43,6 +43,10 @@
  * @method void setTimestamp(int $value)
  * @method int getDeleted()
  * @method void setDeleted(int $value)
+ * @method int getIsoTimestamp()
+ * @method void setIsoTimestamp(string $value)
+ * @method int getIsoDuration()
+ * @method void setIsoDuration(string $value)
  *
  * Joined Attributes
  * @method string getUserVoteAnswer()
@@ -64,7 +68,9 @@ class Option extends EntityWithUser implements JsonSerializable {
 	protected string $pollOptionText = '';
 	protected string $pollOptionHash = '';
 	protected int $timestamp = 0;
+	protected string $isoTimestamp = '';
 	protected int $duration = 0;
+	protected string $isoDuration = '';
 	protected int $order = 0;
 	protected int $confirmed = 0;
 	protected string $owner = '';
@@ -102,6 +108,13 @@ public function __construct() {
 		$this->addType('showResults', 'integer');
 	}
 
+	public function __clone() {
+		$this->setPollId(0);
+		$this->setDeleted(0);
+		$this->setConfirmed(0);
+		$this->setOwner('');
+		$this->updateHash();
+	}
 	/**
 	 * @return array
 	 *
@@ -113,6 +126,8 @@ public function jsonSerialize(): array {
 			'pollId' => $this->getPollId(),
 			'text' => $this->getPollOptionText(),
 			'timestamp' => $this->getTimestamp(),
+			'isoTimestamp' => $this->getIsoTimestamp(),
+			'isoDuration' => $this->getIsoDuration(),
 			'deleted' => $this->getDeleted(),
 			'order' => $this->getOrder(),
 			'confirmed' => $this->getConfirmed(),
@@ -148,6 +163,8 @@ public function setFromSimpleOption(SimpleOption $option): void {
 			$option->getDuration(),
 			$option->getText(),
 			$option->getOrder(),
+			$option->getIsoTimestamp(),
+			$option->getIsoDuration(),
 		);
 		$this->setDeleted(0);
 		$this->syncOption();
@@ -168,11 +185,15 @@ public function setOption(
 		int $duration = 0,
 		string $pollOptionText = '',
 		int $order = 0,
+		string $isoTimestamp = '',
+		string $isoDuration = '',
 	): void {
 
 		if ($timestamp) {
 			$this->setTimestamp($timestamp);
 			$this->setDuration($duration);
+			$this->setIsoTimestamp($isoTimestamp);
+			$this->setIsoDuration($isoDuration);
 		} elseif ($pollOptionText) {
 			$this->setPollOptionText($pollOptionText);
 			if ($order > 0) {

lib/Db/Poll.php

@@ -14,7 +14,6 @@
 use OCA\Polls\Helper\Container;
 use OCA\Polls\Model\Settings\AppSettings;
 use OCA\Polls\Model\Settings\SystemSettings;
-use OCA\Polls\Model\User\User;
 use OCA\Polls\Model\UserBase;
 use OCA\Polls\UserSession;
 use OCP\IURLGenerator;
@@ -65,6 +64,7 @@
  * @method void setMiscSettings(string $value)
  * @method string getVotingVariant()
  * @method void setVotingVariant(string $value)
+ * @method void setTimezoneName(?string $value)
  *
  * Magic functions for joined columns
  * @method string getShareToken()
@@ -162,6 +162,7 @@ class Poll extends EntityWithUser implements JsonSerializable {
 	protected int $lastInteraction = 0;
 	protected ?string $miscSettings = '';
 	protected string $votingVariant = '';
+	protected ?string $timezoneName = null;
 
 	// joined columns
 	protected ?int $isCurrentUserLocked = 0;
@@ -209,6 +210,16 @@ public function __construct() {
 		$this->userSession = Container::queryClass(UserSession::class);
 	}
 
+	public function __clone() {
+		$this->setId(0);
+		$this->setTitle('Clone of ' . $this->getTitle());
+		$this->setDeleted(0);
+		$this->setCreated(time());
+		$this->setAccess(self::ACCESS_PRIVATE);
+		// deanonymize cloned polls by default, to avoid locked anonymous polls
+		$this->setAnonymous(0);
+	}
+
 	/**
 	 * @return array
 	 *
@@ -237,7 +248,7 @@ public function getStatusArray(): array {
 			'created' => $this->getCreated(),
 			'isAnonymous' => boolval($this->getAnonymous()),
 			'isArchived' => boolval($this->getDeleted()),
-			'isExpired' => $this->getExpired(),
+			'isExpired' => $this->getIsExpired(),
 			'isRealAnonymous' => $this->getAnonymous() < 0,
 			'relevantThreshold' => $this->getRelevantThreshold(),
 			'deletionDate' => $this->getDeletionDate(),
@@ -268,6 +279,7 @@ public function getConfigurationArray(): array {
 			'showResults' => $this->getShowResults(),
 			'title' => $this->getTitle(),
 			'useNo' => boolval($this->getUseNo()),
+			'timezoneName' => $this->getTimezoneName(),
 		];
 	}
 
@@ -336,10 +348,11 @@ public function deserializeArray(array $pollConfiguration): self {
 		$this->setUseNo($pollConfiguration['useNo'] ?? $this->getUseNo());
 		$this->setOptionLimit($pollConfiguration['maxVotesPerOption'] ?? $this->getOptionLimit());
 		$this->setVoteLimit($pollConfiguration['maxVotesPerUser'] ?? $this->getVoteLimit());
+		$this->setTimezoneName($pollConfiguration['timezoneName'] ?? $this->getTimezoneName());
 		return $this;
 	}
 
-	public function getExpired(): bool {
+	public function getIsExpired(): bool {
 		$compareTime = time();
 		$expiry = $this->getExpire();
 
@@ -353,6 +366,16 @@ public function getPollOwnerId() {
 		return $this->getOwner();
 	}
 
+	/**
+	 * @psalm-return non-empty-string|null
+	 */
+	public function getTimezoneName(): ?string {
+		if ($this->timezoneName === '') {
+			return null;
+		}
+		return $this->timezoneName;
+	}
+
 	public function getUserRole(): string {
 		if ($this->getCurrentUserIsEntityUser()) {
 			return self::ROLE_OWNER;
@@ -473,6 +496,7 @@ private function getGroupShares(): array {
 	 * @psalm-return list<int>
 	 */
 	public function getPollGroups(): array {
+		/** @psalm-suppress RiskyTruthyFalsyComparison */
 		if (!$this->pollGroups) {
 			return [];
 		}
@@ -487,6 +511,7 @@ public function getPollGroups(): array {
 	 * @psalm-return list<string>
 	 */
 	public function getPollGroupUserShares(): array {
+		/** @psalm-suppress RiskyTruthyFalsyComparison */
 		if (!$this->pollGroupUserShares) {
 			return [];
 		}
@@ -503,7 +528,7 @@ private function getAccess(): string {
 		return $this->access;
 	}
 
-	private function getProposalsExpired(): bool {
+	private function getProposalPeriodIsExpired(): bool {
 		return (
 			$this->getProposalsExpire() > 0
 			&& $this->getProposalsExpire() < time()
@@ -798,7 +823,7 @@ private function getAllowAddOptions(): bool {
 		}
 
 		// Request for option proposals is expired, deny
-		if ($this->getProposalsExpired()) {
+		if ($this->getProposalPeriodIsExpired()) {
 			return false;
 		}
 
@@ -826,21 +851,14 @@ private function getAllowDeleteOption(): bool {
 	 * Is current user allowed to confirm options
 	 */
 	private function getAllowConfirmOption(): bool {
-		return $this->getAllowEditPoll() && $this->getExpired();
+		return $this->getAllowEditPoll() && $this->getIsExpired();
 	}
 
 	/**
 	 * Is current user allowed to confirm options
 	 */
 	private function getAllowReorderOptions(): bool {
-		return $this->getAllowEditPoll() && !$this->getExpired() && $this->getType() === Poll::TYPE_TEXT;
-	}
-
-	/**
-	 * Compare $userId with current user's id
-	 */
-	public function matchUser(string $userId): bool {
-		return (bool)$this->userSession->getCurrentUser()->getId() && $this->userSession->getCurrentUser()->getId() === $userId;
+		return $this->getAllowEditPoll() && !$this->getIsExpired() && $this->getType() === Poll::TYPE_TEXT;
 	}
 
 	/**
@@ -931,7 +949,7 @@ private function getAllowVote(): bool {
 		}
 
 		// deny votes, if poll is expired
-		return !$this->getExpired();
+		return !$this->getIsExpired();
 	}
 
 	/**
@@ -961,7 +979,7 @@ private function getAllowShowResults(): bool {
 		}
 
 		// show results, when poll is closed
-		if ($this->getShowResults() === Poll::SHOW_RESULTS_CLOSED && $this->getExpired()) {
+		if ($this->getShowResults() === Poll::SHOW_RESULTS_CLOSED && $this->getIsExpired()) {
 			return true;
 		}
 		// return poll settings

lib/Exceptions/InsufficientAttributesException.php

@@ -14,6 +14,6 @@ class InsufficientAttributesException extends Exception {
 	public function __construct(
 		string $e = 'Attribut constraints not met',
 	) {
-		parent::__construct($e, Http::STATUS_CONFLICT);
+		parent::__construct($e, Http::STATUS_BAD_REQUEST);
 	}
 }