Merge branch '1.8.x' into spatial-type-attributes

This commit is contained in:
ArnabChatterjee20k
2025-09-04 14:50:49 +05:30
78 changed files with 268 additions and 200 deletions
+12
View File
@@ -638,4 +638,16 @@ class Event
return $events;
}
/**
* Returns the size of the queue.
*
* @param bool $failed Whether to include failed events in the count.
* @return int The size of the queue.
*/
public function getSize(bool $failed = false): int
{
$queue = new Queue($this->getQueue());
return $this->publisher->getQueueSize($queue, $failed);
}
}
+10 -10
View File
@@ -381,22 +381,22 @@ class Certificates extends Action
$template->setParam('{{error}}', \nl2br($errorMessage));
$template->setParam('{{attempts}}', $attempt);
$template->setParam('{{logoUrl}}', $plan['logoUrl'] ?? APP_EMAIL_LOGO_URL);
$template->setParam('{{accentColor}}', $plan['accentColor'] ?? APP_EMAIL_ACCENT_COLOR);
$template->setParam('{{twitterUrl}}', $plan['twitterUrl'] ?? APP_SOCIAL_TWITTER);
$template->setParam('{{discordUrl}}', $plan['discordUrl'] ?? APP_SOCIAL_DISCORD);
$template->setParam('{{githubUrl}}', $plan['githubUrl'] ?? APP_SOCIAL_GITHUB_APPWRITE);
$template->setParam('{{termsUrl}}', $plan['termsUrl'] ?? APP_EMAIL_TERMS_URL);
$template->setParam('{{privacyUrl}}', $plan['privacyUrl'] ?? APP_EMAIL_PRIVACY_URL);
$body = $template->render();
$emailVariables = [
'direction' => $locale->getText('settings.direction'),
'domain' => $domain,
'logoUrl' => $plan['logoUrl'] ?? APP_EMAIL_LOGO_URL,
'accentColor' => $plan['accentColor'] ?? APP_EMAIL_ACCENT_COLOR,
'twitterUrl' => $plan['twitterUrl'] ?? APP_SOCIAL_TWITTER,
'discordUrl' => $plan['discordUrl'] ?? APP_SOCIAL_DISCORD,
'githubUrl' => $plan['githubUrl'] ?? APP_SOCIAL_GITHUB_APPWRITE,
'termsUrl' => $plan['termsUrl'] ?? APP_EMAIL_TERMS_URL,
'privacyUrl' => $plan['privacyUrl'] ?? APP_EMAIL_PRIVACY_URL,
];
$subject = \sprintf($locale->getText("emails.certificate.subject"), $domain);
$preview = \sprintf($locale->getText("emails.certificate.preview"), $domain);
$subject = $locale->getText("emails.certificate.subject");
$preview = $locale->getText("emails.certificate.preview");
$queueForMails
->setSubject($subject)