Skip to content

feat: use full date and time in activity emails #2078

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
miaulalala merged 1 commit into from
Aug 25, 2025
Merged

feat: use full date and time in activity emails #2078

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 20 additions & 10 deletions lib/MailQueueHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public function __construct(
* @param $limit Number of users we want to send an email to
* @param $sendTime The latest send time
* @param $forceSending Ignores latest send and just sends all emails
* @param $restrictEmails null or one of UserSettings::EMAIL_SEND_*
* @param $restrictEmails null or one of UserSettings::EMAIL_SEND_*, will overwrite force send
* @return int Number of users we sent an email to
*/
public function sendEmails(int $limit, int $sendTime, bool $forceSending = false, ?int $restrictEmails = null): int {
Expand Down Expand Up @@ -141,12 +141,6 @@ protected function getAffectedUsers(?int $limit, int $latestSend, bool $forceSen
$query->setMaxResults($limit);
}

if ($forceSending) {
$query->where($query->expr()->lt('amq_timestamp', $query->createNamedParameter($latestSend)));
} else {
$query->where($query->expr()->lt('amq_latest_send', $query->createNamedParameter($latestSend)));
}

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))));
Expand All @@ -157,6 +151,22 @@ protected function getAffectedUsers(?int $limit, int $latestSend, bool $forceSen
} elseif ($restrictEmails === UserSettings::EMAIL_SEND_ASAP) {
$query->where($query->expr()->eq('amq_timestamp', 'amq_latest_send'));
}

$result = $query->executeQuery();

$affectedUsers = [];
while ($row = $result->fetch()) {
$affectedUsers[] = $row['amq_affecteduser'];
}
$result->closeCursor();

return $affectedUsers;
}

if ($forceSending) {
Comment on lines +154 to +166

@nickvergessen nickvergessen Aug 24, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I prefer simplicity over "early return" which duplicates 12 lines :D

Suggested change
$result = $query->executeQuery();
$affectedUsers = [];
while ($row = $result->fetch()) {
$affectedUsers[] = $row['amq_affecteduser'];
}
$result->closeCursor();
return $affectedUsers;
}
if ($forceSending) {
} elseif ($forceSending) {

$query->where($query->expr()->lt('amq_timestamp', $query->createNamedParameter($latestSend)));
} else {
$query->where($query->expr()->lt('amq_latest_send', $query->createNamedParameter($latestSend)));
}

$result = $query->executeQuery();
Expand Down Expand Up @@ -294,7 +304,7 @@ protected function sendEmailToUser(string $userName, string $email, string $lang
function ($event) use ($timezone, $l) {
return [
'event' => $event,
'relativeDateTime' => $this->dateFormatter->formatDateTimeRelativeDay(
'dateTime' => $this->dateFormatter->formatDateTime(
$event->getTimestamp(),
'long', 'short',
new \DateTimeZone($timezone), $l
Expand Down Expand Up @@ -322,9 +332,9 @@ function ($event) use ($timezone, $l) {

foreach ($activityEvents as $activity) {
$event = $activity['event'];
$relativeDateTime = $activity['relativeDateTime'];
$activityDateTime = $activity['dateTime'];

$template->addBodyListItem($this->getHTMLSubject($event), $relativeDateTime, $event->getIcon(), $event->getParsedSubject());
$template->addBodyListItem($this->getHTMLSubject($event), $activityDateTime, $event->getIcon(), $event->getParsedSubject());
}

if ($skippedCount) {
Expand Down
Loading