nextcloud · dartcafe · Mar 6, 2026 · Dec 21, 2025 · Dec 29, 2025 · Jan 4, 2026
diff --git a/.github/ISSUE_TEMPLATE/BUG_REPORT.yml b/.github/ISSUE_TEMPLATE/BUG_REPORT.yml
@@ -172,20 +172,17 @@ body:
       description: |
         Which Nextcloud Server version are you running.
       options:
-        - 'Nextcloud 27'
-        - 'Nextcloud 28'
-        - 'Nextcloud 29'
-        - 'Nextcloud 30'
-        - 'Nextcloud 31'
-        - 'Nextcloud 32'
+        - 'Nextcloud 31 (Hub 10)'
+        - 'Nextcloud 32 (Hub 25 Autumn)'
+        - 'Nextcloud 33 (Hub 26 Winter)'
         - "Other/Don't know"
     validations:
       required: true
   - type: input
     id: server-nc-version-other
     attributes:
       label: Other Nextcloud version
-      placeholder: i.e. Nextcloud 21.1.1
+      placeholder: i.e. Nextcloud 29 or Hub 8
 
   - type: dropdown
     id: server-php

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,18 @@
 # 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
+ - Drop support for Nexcloud Hub 10
+ - Drop support for PHP 8.1
+
 ## [8.6.3] - 2026-01-18
 ### Fixed
  - Fixed missing user menu items, when table view is active

diff --git a/appinfo/info.xml b/appinfo/info.xml
@@ -4,7 +4,7 @@
   <name>Polls</name>
   <summary>A polls app, similar to Doodle/DuD-Poll with the possibility to restrict access.</summary>
   <description>A polls app, similar to Doodle/DuD-Poll with the possibility to restrict access (members, certain groups/users, hidden and public).</description>
-  <version>8.6.3</version>
+  <version>9.0.0-beta.2</version>
   <licence>agpl</licence>
   <author>Vinzenz Rosenkranz</author>
   <author>René Gieling</author>
@@ -25,7 +25,7 @@
   <donation>https://buymeacoffee.com/dartcafe</donation>
   <dependencies>
     <php min-version="8.1"/>
-    <nextcloud min-version="31" max-version="33"/>
+    <nextcloud min-version="32" max-version="33"/>
   </dependencies>
   <background-jobs>
     <job>OCA\Polls\Cron\NotificationCron</job>

diff --git a/composer.json b/composer.json
@@ -40,7 +40,7 @@
 		"doctrine/dbal": "3.8.6",
 		"league/factory-muffin": "^3.0",
 		"league/factory-muffin-faker": "^2.0",
-		"nextcloud/ocp": "dev-stable30"
+		"nextcloud/ocp": "dev-stable32"
 	},
 	"scripts": {
 		"lint": "find . -name \\*.php -not -path './vendor*/*' -print0 | xargs -0 -n1 php -l",
@@ -67,4 +67,4 @@
 		"league/commonmark": "^2.1",
 		"rlanvin/php-rrule": "^2.3"
 	}
-}
+}
diff --git a/composer.lock b/composer.lock
diff --git a/lib/Command/Db/CleanMigrations.php b/lib/Command/Db/CleanMigrations.php
@@ -10,7 +10,7 @@
 
 use Doctrine\DBAL\Schema\Schema;
 use OCA\Polls\Command\Command;
-use OCA\Polls\Db\V5\TableManager;
+use OCA\Polls\Db\V6\TableManager;
 use OCP\IDBConnection;
 
 /**

diff --git a/lib/Command/Db/CreateIndices.php b/lib/Command/Db/CreateIndices.php
@@ -10,7 +10,7 @@
 
 use Doctrine\DBAL\Schema\Schema;
 use OCA\Polls\Command\Command;
-use OCA\Polls\Db\V5\IndexManager;
+use OCA\Polls\Db\V6\IndexManager;
 use OCP\IDBConnection;
 
 /**

diff --git a/lib/Command/Db/FixDB.php b/lib/Command/Db/FixDB.php
@@ -10,7 +10,7 @@
 
 use Doctrine\DBAL\Schema\Schema;
 use OCA\Polls\Command\Command;
-use OCA\Polls\Db\V5\TableManager;
+use OCA\Polls\Db\V6\TableManager;
 use OCP\IDBConnection;
 
 /**

diff --git a/lib/Command/Db/Purge.php b/lib/Command/Db/Purge.php
@@ -9,7 +9,7 @@
 namespace OCA\Polls\Command\Db;
 
 use OCA\Polls\Command\Command;
-use OCA\Polls\Db\V5\TableManager;
+use OCA\Polls\Db\V6\TableManager;
 use OCP\IDBConnection;
 
 /**

diff --git a/lib/Command/Db/Rebuild.php b/lib/Command/Db/Rebuild.php
@@ -9,8 +9,8 @@
 namespace OCA\Polls\Command\Db;
 
 use Doctrine\DBAL\Schema\Schema;
-use OCA\Polls\Db\V5\TableManager;
-use OCA\Polls\Db\V5\IndexManager;
+use OCA\Polls\Db\V6\TableManager;
+use OCA\Polls\Db\V6\IndexManager;
 use OCA\Polls\Command\Command;
 use OCP\IDBConnection;
 

diff --git a/lib/Command/Db/RemoveFKConstraints.php b/lib/Command/Db/RemoveFKConstraints.php
@@ -10,7 +10,7 @@
 
 use Doctrine\DBAL\Schema\Schema;
 use OCA\Polls\Command\Command;
-use OCA\Polls\Db\V5\IndexManager;
+use OCA\Polls\Db\V6\IndexManager;
 use OCP\IDBConnection;
 
 /**

diff --git a/lib/Command/Db/RemoveOptionalIndices.php b/lib/Command/Db/RemoveOptionalIndices.php
@@ -10,7 +10,7 @@
 
 use Doctrine\DBAL\Schema\Schema;
 use OCA\Polls\Command\Command;
-use OCA\Polls\Db\V5\IndexManager;
+use OCA\Polls\Db\V6\IndexManager;
 use OCP\IDBConnection;
 
 /**

diff --git a/lib/Command/Db/RemoveUniqueIndices.php b/lib/Command/Db/RemoveUniqueIndices.php
@@ -10,7 +10,7 @@
 
 use Doctrine\DBAL\Schema\Schema;
 use OCA\Polls\Command\Command;
-use OCA\Polls\Db\V5\IndexManager;
+use OCA\Polls\Db\V6\IndexManager;
 use OCP\IDBConnection;
 
 /**

diff --git a/lib/Command/Db/ResetWatch.php b/lib/Command/Db/ResetWatch.php
@@ -10,10 +10,10 @@
 
 use Doctrine\DBAL\Schema\Schema;
 use OCA\Polls\Command\Command;
-use OCA\Polls\Db\V5\IndexManager;
-use OCA\Polls\Db\V5\TableManager;
+use OCA\Polls\Db\V6\IndexManager;
+use OCA\Polls\Db\V6\TableManager;
 use OCA\Polls\Db\Watch;
-use OCA\Polls\Migration\V5\TableSchema;
+use OCA\Polls\Migration\V6\TableSchema;
 use OCP\IDBConnection;
 
 /**

diff --git a/lib/Controller/OptionApiController.php b/lib/Controller/OptionApiController.php
@@ -8,6 +8,8 @@
 
 namespace OCA\Polls\Controller;
 
+use OCA\Polls\Model\DateInterval;
+use OCA\Polls\Model\DateTimeImmutable;
 use OCA\Polls\Model\Sequence;
 use OCA\Polls\Model\SimpleOption;
 use OCA\Polls\Service\OptionService;
@@ -22,6 +24,8 @@
 
 /**
  * @psalm-api
+ * @psalm-import-type SimpleOptionsArray from SimpleOption
+ * @psalm-import-type SequenceArray from Sequence
  */
 class OptionApiController extends BaseApiV2Controller {
 	public function __construct(
@@ -47,10 +51,11 @@ public function list(int $pollId): DataResponse {
 
 	/**
 	 * Add a new option
+	 *
 	 * @param int $pollId poll id
-	 * @param array $option Options text for text poll
-	 * @param array $sequence Sequence of the option
-	 * @param bool $voteYes Vote yes
+	 * @param SimpleOptionsArray $option The array containing the option data
+	 * @param bool $voteYes Vote yes for this option and for all generated sequence
+	 * @param SequenceArray $sequence Sequence of the option
 	 */
 	#[CORS]
 	#[NoAdminRequired]
@@ -99,8 +104,13 @@ public function addBulk(int $pollId, string $text = ''): DataResponse {
 	#[NoAdminRequired]
 	#[NoCSRFRequired]
 	#[ApiRoute(verb: 'PUT', url: '/api/v1.0/option/{optionId}', requirements: ['apiVersion' => '(v2)'])]
-	public function update(int $optionId, int $timestamp = 0, string $text = '', int $duration = 0): DataResponse {
-		return $this->response(fn () => ['option' => $this->optionService->update($optionId, $timestamp, $text, $duration)]);
+	public function update(int $optionId, int $timestamp = 0, string $text = '', int $duration = 0, ?string $isoTimestamo = null, ?string $isoDuration = null): DataResponse {
+		return $this->response(fn () => ['option' => $this->optionService->update(
+			$optionId,
+			$text,
+			new DateTimeImmutable($isoTimestamo ?? $timestamp),
+			new DateInterval($isoDuration ?? $duration),
+		)]);
 	}
 
 	/**

diff --git a/lib/Controller/OptionController.php b/lib/Controller/OptionController.php
@@ -8,6 +8,8 @@
 
 namespace OCA\Polls\Controller;
 
+use OCA\Polls\Model\DateInterval;
+use OCA\Polls\Model\DateTimeImmutable;
 use OCA\Polls\Model\Sequence;
 use OCA\Polls\Model\SimpleOption;
 use OCA\Polls\Service\CalendarService;
@@ -21,6 +23,8 @@
 
 /**
  * @psalm-api
+ * @psalm-import-type SimpleOptionsArray from SimpleOption
+ * @psalm-import-type SequenceArray from Sequence
  */
 class OptionController extends BaseController {
 	public function __construct(
@@ -48,9 +52,9 @@ public function list(int $pollId): JSONResponse {
 	/**
 	 * Add a new option
 	 * @param int $pollId poll id
-	 * @param array $option Options text for text poll
-	 * @param array $sequence sequence of new options
+	 * @param SimpleOptionsArray $option Options text for text poll
 	 * @param bool $voteYes vote yes
+	 * @param SequenceArray $sequence sequence of new options
 	 * @return JSONResponse
 	 */
 	#[NoAdminRequired]
@@ -88,14 +92,19 @@ public function addBulk(int $pollId, string $text = ''): JSONResponse {
 	/**
 	 * Update option
 	 * @param int $optionId option id
-	 * @param int $timestamp timestamp for datepoll
+	 * @param string $isoTimestamp ISO 8601 timestamp for date poll
 	 * @param string $text Option text for text poll
-	 * @param int duration duration of option
+	 * @param string $isoDuration ISO 8601 duration for date poll
 	 */
 	#[NoAdminRequired]
 	#[FrontpageRoute(verb: 'PUT', url: '/option/{optionId}')]
-	public function update(int $optionId, int $timestamp, string $text, int $duration): JSONResponse {
-		return $this->response(fn () => ['option' => $this->optionService->update($optionId, $timestamp, $text, $duration)]);
+	public function update(int $optionId, string $isoTimestamp, string $text, string $isoDuration): JSONResponse {
+		return $this->response(fn () => ['option' => $this->optionService->update(
+			$optionId,
+			$text,
+			new DateTimeImmutable($isoTimestamp),
+			new DateInterval($isoDuration),
+		)]);
 	}
 
 	/**