Skip to content
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

Jump to bottom

[stable30] fix: do not send daily digest email to user who is disabled #1829

Merged
merged 6 commits into from
Oct 29, 2024
Merged

[stable30] fix: do not send daily digest email to user who is disabled #1829

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1e5c1c4
fix: do not send daily digest email to user who is disabled
yemkareems Sep 24, 2024
b80ecf5
fix: do not send digest email for disabled user
yemkareems Oct 9, 2024
235fad8
fix: cs fix and psalm error fix
yemkareems Oct 15, 2024
1e3f689
fix: updateLastSentForUser changed to private and removed count as it…
yemkareems Oct 18, 2024
5ac1928
fix: user renamed to userObject
yemkareems Oct 28, 2024
6db3f79
fix: conflicts resolved
yemkareems Oct 29, 2024
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
35 changes: 26 additions & 9 deletions lib/DigestSender.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
use OCP\IConfig;
use OCP\IDateTimeFormatter;
use OCP\IURLGenerator;
use OCP\IUser;
use OCP\IUserManager;
use OCP\L10N\IFactory;
use OCP\Mail\IMailer;
Expand Down Expand Up @@ -68,17 +69,23 @@ public function sendDigests(int $now): void {
// User got todays digest already
continue;
}
$userObject = $this->userManager->get($user);
if (!$userObject->isEnabled()) {
// User is disabled so do not send the email but update last sent since after enabling avoid flooding
$this->updateLastSentForUser($userObject, $now);
continue;
}

try {
$this->sendDigestForUser($user, $now, $timezone, $language);
$this->sendDigestForUser($userObject, $now, $timezone, $language);
} catch (\Throwable $e) {
$this->logger->error('Exception occurred while sending user digest email', [
'exception' => $e,
]);
}
// We still update the digest time after an failed email,
// so it hopefully works tomorrow
$this->config->setUserValue($user, 'activity', 'digest', $timezoneDigestDay[$timezone]);
$this->config->setUserValue($userObject->getUID(), 'activity', 'digest', $timezoneDigestDay[$timezone]);
}

$this->activityManager->setRequirePNG(false);
Expand All @@ -103,19 +110,29 @@ private function getLastSendActivity(string $user, int $now): int {
return $this->data->getFirstActivitySince($user, $now - (24 * 60 * 60));
}

public function sendDigestForUser(string $uid, int $now, string $timezone, string $language) {
private function updateLastSentForUser(IUser $user, int $now): void {
$uid = $user->getUID();
$lastSend = $this->getLastSendActivity($uid, $now);

['max' => $lastActivityId] = $this->data->getActivitySince($uid, $lastSend, true);
$lastActivityId = (int)$lastActivityId;

$this->config->setUserValue($uid, 'activity', 'activity_digest_last_send', (string)$lastActivityId);
}

public function sendDigestForUser(IUser $user, int $now, string $timezone, string $language) {
$uid = $user->getUID();
$l10n = $this->l10nFactory->get('activity', $language);
$this->groupHelper->setL10n($l10n);
$lastSend = $this->getLastSendActivity($uid, $now);
$user = $this->userManager->get($uid);
if ($lastSend === 0) {
return;
}
$this->activityManager->setCurrentUserId($uid);

['count' => $count, 'max' => $lastActivityId] = $this->data->getActivitySince($uid, $lastSend, true);
$count = (int) $count;
$lastActivityId = (int) $lastActivityId;
$count = (int)$count;
$lastActivityId = (int)$lastActivityId;
if ($count === 0) {
return;
}
Expand Down Expand Up @@ -181,7 +198,7 @@ public function sendDigestForUser(string $uid, int $now, string $timezone, strin
$this->activityManager->setCurrentUserId(null);
try {
$this->mailer->send($message);
$this->config->setUserValue($user->getUID(), 'activity', 'activity_digest_last_send', (string) $lastActivityId);
$this->config->setUserValue($uid, 'activity', 'activity_digest_last_send', (string)$lastActivityId);
} catch (\Exception $e) {
$this->logger->error($e->getMessage());
return;
Expand All @@ -202,9 +219,9 @@ protected function getHTMLSubject(IEvent $event): string {
$placeholders[] = '{' . $placeholder . '}';

if ($parameter['type'] === 'file') {
$replacement = (string) $parameter['path'];
$replacement = (string)$parameter['path'];
} else {
$replacement = (string) $parameter['name'];
$replacement = (string)$parameter['name'];
}

if (isset($parameter['link'])) {
Expand Down
Loading