tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Improved handling with empty user configuration

Browse source
This commit is contained in:
Michael 2022-06-06 05:43:24 +00:00
parent 62701b49e1
commit a07e47f50c
2 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/Navigation/Notifications/Repository/Notification.php
View file

@ -117,7 +117,13 @@ class Notification extends BaseRepository
*/ */
public function selectDetailedForUser(int $uid): Collection\Notifications public function selectDetailedForUser(int $uid): Collection\Notifications
{ {
$condition = ["`type` & ? != 0", $this->pconfig->get($uid, 'system', 'notify_type', 3 | 72 | 4 | 16 | 32) | 128 | 256]; $notify_type = $this->pconfig->get($uid, 'system', 'notify_type');
if (!is_null($notify_type)) {
$condition = ["`type` & ? != 0", $notify_type | UserNotification::TYPE_SHARED | UserNotification::TYPE_FOLLOW];
} else {
$condition = [];
}
if (!$this->pconfig->get($uid, 'system', 'notify_like')) { if (!$this->pconfig->get($uid, 'system', 'notify_like')) {
$condition = DBA::mergeConditions($condition, ['NOT `vid` IN (?, ?)', Verb::getID(\Friendica\Protocol\Activity::LIKE), Verb::getID(\Friendica\Protocol\Activity::DISLIKE)]); $condition = DBA::mergeConditions($condition, ['NOT `vid` IN (?, ?)', Verb::getID(\Friendica\Protocol\Activity::LIKE), Verb::getID(\Friendica\Protocol\Activity::DISLIKE)]);
} }
@ -138,7 +144,14 @@ class Notification extends BaseRepository
*/ */
public function selectDigestForUser(int $uid): Collection\Notifications public function selectDigestForUser(int $uid): Collection\Notifications
{ {
$values = [$uid, $this->pconfig->get($uid, 'system', 'notify_type', 3 | 72 | 4 | 16 | 32) | 128 | 256]; $values = [$uid];
$type_condition = '';
$notify_type = $this->pconfig->get($uid, 'system', 'notify_type');
if (!is_null($notify_type)) {
$type_condition = 'AND `type` & ? != 0';
$values[] = $notify_type | UserNotification::TYPE_SHARED | UserNotification::TYPE_FOLLOW;
}
$like_condition = ''; $like_condition = '';
if (!$this->pconfig->get($uid, 'system', 'notify_like')) { if (!$this->pconfig->get($uid, 'system', 'notify_like')) {
@ -159,7 +172,8 @@ class Notification extends BaseRepository
WHERE `id` IN ( WHERE `id` IN (
SELECT MAX(`id`) SELECT MAX(`id`)
FROM `notification` FROM `notification`
WHERE `uid` = ? AND `type` & ? != 0 WHERE `uid` = ?
$type_condition
$like_condition $like_condition
$announce_condition $announce_condition
GROUP BY IFNULL(`parent-uri-id`, `actor-id`) GROUP BY IFNULL(`parent-uri-id`, `actor-id`)

9
src/Navigation/Notifications/Repository/Notify.php
View file

@ -675,9 +675,14 @@ class Notify extends BaseRepository
return true; return true;
} }
$notify_type = $this->pConfig->get($Notification->uid, 'system', 'notify_type', 3 | 72 | 4 | 16 | 32); $notify_type = $this->pConfig->get($Notification->uid, 'system', 'notify_type');
if ($notify_type & $Notification->type) { // Fallback for the case when the notify type isn't set at all
if (is_null($notify_type) && !in_array($type, [Notification::TYPE_RESHARE, Notification::TYPE_LIKE])) {
return true;
}
if (!is_null($notify_type) && ($notify_type & $Notification->type)) {
return true; return true;
} }