Merge 64dbe41 into 2c5f60f

backportbot[bot] · web-flow · commit b8b620b3cd58 · 2026-05-10T21:35:29.000+02:00
diff --git a/lib/MailQueueHandler.php b/lib/MailQueueHandler.php
@@ -148,11 +148,11 @@ protected function getAffectedUsers(?int $limit, int $latestSend, bool $forceSen
 
 		if ($restrictEmails !== null) {
 			if ($restrictEmails === UserSettings::EMAIL_SEND_HOURLY) {
-				$query->where($query->expr()->eq('amq_timestamp', $query->func()->subtract('amq_latest_send', $query->expr()->literal(3600))));
+				$query->where($query->expr()->eq('amq_timestamp', $query->func()->subtract('amq_latest_send', $query->expr()->literal(UserSettings::BATCH_TIME_HOURLY))));
 			} elseif ($restrictEmails === UserSettings::EMAIL_SEND_DAILY) {
-				$query->where($query->expr()->eq('amq_timestamp', $query->func()->subtract('amq_latest_send', $query->expr()->literal(3600 * 24))));
+				$query->where($query->expr()->eq('amq_timestamp', $query->func()->subtract('amq_latest_send', $query->expr()->literal(UserSettings::BATCH_TIME_DAILY))));
 			} elseif ($restrictEmails === UserSettings::EMAIL_SEND_WEEKLY) {
-				$query->where($query->expr()->eq('amq_timestamp', $query->func()->subtract('amq_latest_send', $query->expr()->literal(3600 * 24 * 7))));
+				$query->where($query->expr()->eq('amq_timestamp', $query->func()->subtract('amq_latest_send', $query->expr()->literal(UserSettings::BATCH_TIME_WEEKLY))));
 			} elseif ($restrictEmails === UserSettings::EMAIL_SEND_ASAP) {
 				$query->where($query->expr()->eq('amq_timestamp', 'amq_latest_send'));
 			}
diff --git a/lib/UserSettings.php b/lib/UserSettings.php
@@ -26,6 +26,10 @@ class UserSettings {
 	public const EMAIL_SEND_WEEKLY = 2;
 	public const EMAIL_SEND_ASAP = 3;
 
+	public const BATCH_TIME_HOURLY = 3600;
+	public const BATCH_TIME_DAILY = 3600 * 24;
+	public const BATCH_TIME_WEEKLY = 3600 * 24 * 7;
+
 	/**
 	 * @param IManager $manager
 	 * @param IConfig $config
@@ -109,7 +113,7 @@ public function getAdminSetting($method, $type) {
 	protected function getDefaultSetting($method, $type) {
 		if ($method === 'setting') {
 			if ($type === 'batchtime') {
-				return 3600;
+				return self::BATCH_TIME_HOURLY;
 			}
 
 			if ($type === 'self') {
