Merge pull request #4736 from nextcloud/fix/share-user-settings

fix applying time zone for shares

Author: dartcafe

lib/Activity/PollChanges.php

@@ -5,6 +5,7 @@
  * SPDX-FileCopyrightText: 2021 Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
+
 namespace OCA\Polls\Activity;
 
 use OCA\Polls\AppInfo\Application;

lib/Controller/BaseApiV2OCSController.php

@@ -5,6 +5,7 @@
  * SPDX-FileCopyrightText: 2024 Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
+
 namespace OCA\Polls\Controller;
 
 use Closure;
@@ -45,10 +46,8 @@ public function __construct(
 	protected function response(Closure $callback, int $successStatus = Http::STATUS_OK): DataResponse {
 		try {
 			return new DataResponse($callback(), $successStatus);
-
 		} catch (DoesNotExistException $e) {
 			throw new OCSNotFoundException($e->getMessage());
-
 		} catch (Exception $e) {
 			throw match ($e->getStatus()) {
 				Http::STATUS_NOT_MODIFIED => new OCSException($e->getMessage(), Http::STATUS_NOT_MODIFIED),

lib/Controller/PublicController.php

@@ -121,7 +121,6 @@ public function getSession(): JSONResponse {
 		});
 	}
 
-
 	/**
 	 * Watch poll for updates
 	 * @param string $mode the mode of watching, e.g. 'longPolling'
@@ -448,7 +447,6 @@ public function setDisplayName(string $token, string $displayName): JSONResponse
 		]);
 	}
 
-
 	/**
 	 * Set EmailAddress
 	 * @param string $token Share token
@@ -507,9 +505,10 @@ public function register(string $token, string $displayName, string $emailAddres
 	#[FrontpageRoute(verb: 'POST', url: '/s/{token}/resend')]
 	public function resendInvitation(string $token): JSONResponse {
 		$share = $this->shareService->getEffectiveShare($token);
+		$sentResult = new SentResult();
 		return $this->response(fn () => [
 			'share' => $share,
-			'sentResult' => $this->mailService->sendInvitation($share, new SentResult()),
+			'sentResult' => $this->mailService->sendInvitation($share, $sentResult),
 		]);
 	}
 }

lib/Cron/JanitorCron.php

@@ -102,7 +102,6 @@ protected function run($argument) {
 				$this->logger->info('JanitorCron: ' . $message);
 			}
 
-
 			// archive polls after defined days after closing date
 			$autoArchiveOffset = $this->appSettings->getAutoArchiveOffsetDays();
 

lib/Cron/UserDeletedJob.php

@@ -13,7 +13,6 @@
 use OCA\Polls\Db\LogMapper;
 use OCA\Polls\Db\OptionMapper;
 use OCA\Polls\Db\PollMapper;
-
 use OCA\Polls\Db\PreferencesMapper;
 use OCA\Polls\Db\Share;
 use OCA\Polls\Db\ShareMapper;

lib/Db/CommentMapper.php

@@ -94,7 +94,6 @@ public function purgeDeletedComments(int $offset): int {
 		$query->setMaxResults(999);
 
 		return $query->executeStatement();
-
 	}
 
 	/**

lib/Db/Log.php

@@ -9,7 +9,6 @@
 namespace OCA\Polls\Db;
 
 use JsonSerializable;
-
 use OCP\AppFramework\Db\Entity;
 
 /**

lib/Db/OptionMapper.php

@@ -134,7 +134,6 @@ public function getMinDate(int $pollId): int|false {
 		return $qb->executeQuery()->fetchOne();
 	}
 
-
 	/**
 	 * Get the maximum date of all options in a poll
 	 *
@@ -207,15 +206,13 @@ protected function buildQuery(bool $hideResults = false): IQueryBuilder {
 			->groupBy(self::TABLE . '.id')
 			->orderBy('order', 'ASC');
 
-
 		$this->joinVotesCount($qb, self::TABLE, hideResults: $hideResults);
 		$this->joinPollForLimits($qb, self::TABLE);
 		$this->joinCurrentUserVote($qb, self::TABLE, $currentUserId);
 		$this->joinCurrentUserVoteCount($qb, self::TABLE, $currentUserId);
 		$this->joinAnon($qb, self::TABLE);
 		$this->joinShareRole($qb, self::TABLE, $currentUserId);
 
-
 		return $qb;
 	}
 

lib/Db/Poll.php

@@ -611,7 +611,6 @@ private function getMaxDate(): int {
 		return $this->maxDate;
 	}
 
-
 	private function setMiscSettingsArray(array $value): void {
 		$this->setMiscSettings(json_encode($value));
 	}
@@ -926,7 +925,6 @@ public function getIsPollOwner(): bool {
 		return ($this->getUserRole() === Poll::ROLE_OWNER);
 	}
 
-
 	/**
 	 * Permission checks
 	 */
@@ -1044,5 +1042,4 @@ private function getAllowShowResults(): bool {
 		return $this->getShowResults() === Poll::SHOW_RESULTS_ALWAYS;
 	}
 
-
 }

lib/Db/PollGroupMapper.php

@@ -98,7 +98,6 @@ public function add(PollGroup $pollGroup): PollGroup {
 		$pollGroup->setCreated(time());
 		$pollGroup->setOwner($this->userSession->getCurrentUserId());
 		return $this->insert($pollGroup);
-
 	}
 
 	/**