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

Merge branch 'dev' into nomadic

Browse source
This commit is contained in:
Mike Macgirvin 2024-05-12 10:04:02 +10:00
commit 2118b2aeaf
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
include/permissions.php
View file

@ -522,12 +522,18 @@ function check_deliver_permissions($uid, $arr)
$r = q("select * from abconfig where chan = %d and cat = 'system' and k = 'my_perms' and v not like '%%deliver_stream%%'", $r = q("select * from abconfig where chan = %d and cat = 'system' and k = 'my_perms' and v not like '%%deliver_stream%%'",
intval($uid) intval($uid)
); );
$disallowed = ids_to_array($r,'xchan'); $willNotSend = ids_to_array($r,'xchan');
// Find actors accepting our posts
$r = q("select * from abconfig where chan = %d and cat = 'system' and k = 'their_perms' and v like '%%send_stream%%'",
intval($uid)
);
$theyAccept = ids_to_array($r, 'xchan');
// Filter the recipient list accordingly. // Filter the recipient list accordingly.
if ($arr) { if ($arr) {
foreach ($arr as $x) { foreach ($arr as $x) {
if (! in_array($x, $disallowed)) { if (in_array($x, $theyAccept) && ! in_array($x, $willNotSend)) {
$result[] = $x; $result[] = $x;
} }
} }

1
src/Daemon/Notifier.php
View file

@ -500,6 +500,7 @@ class Notifier implements DaemonInterface
foreach ($r as $rv) { foreach ($r as $rv) {
self::$recipients[] = $rv['abook_xchan']; self::$recipients[] = $rv['abook_xchan'];
} }
self::$recipients = check_deliver_permissions($target_item['uid'], self::$recipients);
} }
} }
else { else {