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

[yemkareems]

Add a extra check to not send the email to user who is disabled.

In my local i made jane a disabled user

And add the condition. This triggered a email to alice, bob and john. And it did not send the email to jane

[cypress]

ActivityRun #2059

Run Properties: Passed #2059 • 8789e1bf33: fix: do not send daily digest email to user who is disabled

Project	Activity
Branch Review	fix/834/dont-sent-digest-email-to-disabled-user
Run status	Passed #2059
Run duration	02m 56s
Commit	8789e1bf33: fix: do not send daily digest email to user who is disabled
Committer	yemkareems
View all properties for this run ↗︎

---

Test results
Failures	0
Flaky	1
Pending	0
Skipped	0
Passing	10
View all changes introduced in this branch ↗︎

[artonge]

Seems enough 👍

[come-nc]

Would it be possible to instead take an IUser object in sendDigestForUser and check the enabled state in parent method sendDigests ?
That would allow to also not update the activity.digest config value for disabled users, as that may be confusing. Would also be a bit better in performance to bail out earlier for disabled users.

[nickvergessen]

That would allow to also not update the activity.digest config value for disabled users, as that may be confusing. Would also be a bit better in performance to bail out earlier for disabled users.

I was wondering if we should even call

$this->config->setUserValue($user->getUID(), 'activity', 'activity_digest_last_send', (string)$lastActivityId);

so after re-enabling the user is not spamed with old legacy info from the day they got disabled.

[yemkareems]

That would allow to also not update the activity.digest config value for disabled users, as that may be confusing. Would also be a bit better in performance to bail out earlier for disabled users.

I was wondering if we should even call

$this->config->setUserValue($user->getUID(), 'activity', 'activity_digest_last_send', (string)$lastActivityId);

so after re-enabling the user is not spamed with old legacy info from the day they got disabled.

Hi @nickvergessen , @come-nc Do we need to do this for disabled user. I see there is a ACTIVITY_LIMIT and first time after re enabling user the notifications ll be cluttered and after that it should be fine. Please let me know and i ll do it accordingly

[yemkareems]

Hi @come-nc , @nickvergessen I will add the user disabled check in sendDigests method as Côme suggested but will also add one updateLastSentForUser which will do
$this->config->setUserValue($user->getUID(), 'activity', 'activity_digest_last_send', (string)$lastActivityId);
as Joas suggested.

[yemkareems]

Hi @come-nc, @nickvergessen I have done this change as requested but however i do not see a entry in oc_preferences for the disabled user(jane). I see the mail has gone out for admin user and only entry for admin user and not for the disabled user jane for whom i did some file rename just before disabling. Checking it locally now what is going wrong

[nickvergessen]

Could you push, so we can see what your code is?

[come-nc]

Good apart from 2 small changes.

[yemkareems]

/backport to stable28

[yemkareems]

/backport to stable29

[yemkareems]

/backport to stable30

[artonge]

/backport to stable28

Addressed.

[yemkareems]

/backport to stable29

[artonge]

/backport to stable29

[artonge]

/backport to stable30