Skip to content

[3.0] Only digests the boards and topics a member asked to be emailed about #9614

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

Open
albertlast wants to merge 1 commit into
base: release-3.0
Choose a base branch
from
+34 −3
Open

[3.0] Only digests the boards and topics a member asked to be emailed about #9614

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
37 changes: 34 additions & 3 deletions Sources/Tasks/SendDigests.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,40 @@ public function execute(): bool
return true;
}

// The preferred way...
$prefs = Notify::getNotifyPrefs(
array_keys($members),
array_merge(
['msg_notify_type', 'msg_notify_pref', 'board_notify', 'topic_notify'],
array_map(fn($id) => 'board_notify_' . $id, array_keys($notify['boards'] ?? [])),
array_map(fn($id) => 'topic_notify_' . $id, array_keys($notify['topics'] ?? [])),
),
true,
);

// Watching a board or a topic is not on its own a request to be
// emailed about it: the alert and the email are separate bits of the
// same preference, and a member can ask for one without the other. A
// digest is an email, so the members who only wanted an alert do not
// belong in the lists that decide who is told about what.
foreach (['boards' => 'board', 'topics' => 'topic'] as $key => $type) {
foreach ($notify[$key] ?? [] as $id => $watchers) {
$notify[$key][$id] = array_values(
array_filter(
$watchers,
function ($mid) use ($prefs, $type, $id) {
// A per board or per topic preference of zero means
// nothing was chosen for that one in particular, so
// the member's general preference decides.
$pref = !empty($prefs[$mid][$type . '_notify_' . $id]) ? $prefs[$mid][$type . '_notify_' . $id] : ($prefs[$mid][$type . '_notify'] ?? 0);

return (bool) ($pref & self::RECEIVE_NOTIFY_EMAIL);
},
),
);
}
}

// Just get the board names.
$request = Db::$db->query(
'SELECT id_board, name
Expand Down Expand Up @@ -204,9 +238,6 @@ public function execute(): bool
IntegrationHook::call('integrate_daily_digest_lang', [&$langtxt, $lang]);
}

// The preferred way...
$prefs = Notify::getNotifyPrefs(array_keys($members), ['msg_notify_type', 'msg_notify_pref'], true);

// Right - send out the silly things - this will take quite some space!
$members_sent = [];

Expand Down