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

fix: do not send daily digest email to user who is disabled #1803

Merged
merged 7 commits into from
Oct 28, 2024
Merged

fix: do not send daily digest email to user who is disabled #1803

Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c4790c1
fix: do not send daily digest email to user who is disabled
yemkareems Sep 24, 2024
1583c3d
fix: do not send digest email for disabled user
yemkareems Oct 9, 2024
7222b5f
fix: cs fix and psalm error fix
yemkareems Oct 15, 2024
451ab20
Merge branch 'master' into fix/834/dont-sent-digest-email-to-disabled…
yemkareems Oct 17, 2024
4bd5530
fix: updateLastSentForUser changed to private and removed count as it…
yemkareems Oct 18, 2024
b8038f4
fix: user renamed to userObject
yemkareems Oct 28, 2024
b13e269
Merge branch 'master' into fix/834/dont-sent-digest-email-to-disabled…
yemkareems Oct 28, 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
23 changes: 20 additions & 3 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,6 +69,12 @@
// User got todays digest already
continue;
}
$user = $this->userManager->get($user);
yemkareems marked this conversation as resolved.
Show resolved Hide resolved
if(!$user->isEnabled()) {
// User is disabled so do not send the email but update last sent since after enabling avoid flooding
$this->updateLastSentForUser($user, $now);
continue;
}

try {
$this->sendDigestForUser($user, $now, $timezone, $language);
Expand All @@ -78,7 +85,7 @@
}
// We still update the digest time after an failed email,
// so it hopefully works tomorrow
$this->config->setUserValue($user, 'activity', 'digest', $timezoneDigestDay[$timezone]);

Check failure on line 88 in lib/DigestSender.php

View workflow job for this annotation

GitHub Actions / static-psalm-analysis

InvalidArgument 

lib/DigestSender.php:88:32: InvalidArgument: Argument 1 of OCP\IConfig::setUserValue expects string, but OCP\IUser provided (see https://psalm.dev/004)
}

$this->activityManager->setRequirePNG(false);
Expand All @@ -103,11 +110,21 @@
return $this->data->getFirstActivitySince($user, $now - (24 * 60 * 60));
}

public function sendDigestForUser(string $uid, int $now, string $timezone, string $language) {
public function updateLastSentForUser(IUser $user, int $now): void {
yemkareems marked this conversation as resolved.
Show resolved Hide resolved
$uid = $user->getUID();
$lastSend = $this->getLastSendActivity($uid, $now);

['count' => $count, 'max' => $lastActivityId] = $this->data->getActivitySince($uid, $lastSend, true);
yemkareems marked this conversation as resolved.
Show resolved Hide resolved
$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;
}
Expand Down Expand Up @@ -181,7 +198,7 @@
$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 Down
Loading