Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-19 16:15:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

only include mentions when evaluating AUDIENCE_FOLLOWERS

Browse source
This commit is contained in:
Mike Macgirvin 2024-06-16 11:19:12 +10:00
parent 1c2075a1c0
commit bba34a23d0
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/permissions.php
View file

@ -516,7 +516,7 @@ function check_list_permissions($uid, $arr, $perm)
return($result);
}
function check_deliver_permissions($item, $arr)
function check_deliver_permissions($item, $arr, $includeMentions = false)
{
$result = [];
$uid = $item['uid'] ?? 0;
@ -565,7 +565,7 @@ function check_deliver_permissions($item, $arr)
}
}
// Send mentions even if you have no permission to do so. They might allow it.
if ($terms) {
if ($terms && $includeMentions) {
foreach ($terms as $term) {
$r = q("select * from hubloc where (hubloc_hash = '%s' or hubloc_id_url = '%s') and hubloc_deleted = 0",
dbesc($term['url']),

4
src/Daemon/Notifier.php
View file

@ -497,7 +497,7 @@ class Notifier implements DaemonInterface
foreach ($r as $rv) {
self::$recipients[] = $rv['abook_xchan'];
}
self::$recipients = check_deliver_permissions($target_item, self::$recipients);
self::$recipients = check_deliver_permissions($target_item, self::$recipients, true);
}
}
elseif (($audience & AUDIENCE_SENDER) || ($audience & AUDIENCE_FOLLOWERS)
@ -524,7 +524,7 @@ class Notifier implements DaemonInterface
}
}
}
self::$recipients = check_deliver_permissions($target_item, $sendto);
self::$recipients = check_deliver_permissions($target_item, $sendto, ($audience & AUDIENCE_FOLLOWERS));
}
else {
self::$private = false;