keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Some more standards

Browse source
This commit is contained in:
Michael 2023-02-13 23:57:39 +00:00
parent c643eb8cb2
commit 41f6e72aa0
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/Protocol/ActivityPub/ClientToServer.php
View file

@ -336,7 +336,7 @@ class ClientToServer
$permissionSets = DI::permissionSet()->selectByContactId($requester_id, $owner['uid']); $permissionSets = DI::permissionSet()->selectByContactId($requester_id, $owner['uid']);
if (!empty($permissionSets)) { if (!empty($permissionSets)) {
$condition = ['psid' => array_merge($permissionSets->column('id'), $condition = ['psid' => array_merge($permissionSets->column('id'),
[DI::permissionSet()->selectPublicForUser($owner['uid'])])]; [DI::permissionSet()->selectPublicForUser($owner['uid'])])];
} }
} }
} }
@ -361,15 +361,24 @@ class ClientToServer
{ {
$owner = User::getOwnerDataById($uid); $owner = User::getOwnerDataById($uid);
$condition = ['gravity' => [Item::GRAVITY_PARENT, Item::GRAVITY_COMMENT], 'network' => [Protocol::ACTIVITYPUB, Protocol::DFRN], 'uid' => $uid]; $condition = [
'gravity' => [Item::GRAVITY_PARENT, Item::GRAVITY_COMMENT],
'network' => [Protocol::ACTIVITYPUB, Protocol::DFRN],
'uid' => $uid
];
return self::getCollection($condition, DI::baseUrl() . '/inbox/' . $owner['nickname'], $page, $max_id, $uid, null); return self::getCollection($condition, DI::baseUrl() . '/inbox/' . $owner['nickname'], $page, $max_id, $uid, null);
} }
public static function getPublicInbox(int $uid, int $page = null, int $max_id = null) public static function getPublicInbox(int $uid, int $page = null, int $max_id = null)
{ {
$condition = ['gravity' => [Item::GRAVITY_PARENT, Item::GRAVITY_COMMENT], 'private' => Item::PUBLIC, $condition = [
'network' => [Protocol::ACTIVITYPUB, Protocol::DFRN], 'author-blocked' => false, 'author-hidden' => false]; 'gravity' => [Item::GRAVITY_PARENT, Item::GRAVITY_COMMENT],
'private' => Item::PUBLIC,
'network' => [Protocol::ACTIVITYPUB, Protocol::DFRN],
'author-blocked' => false,
'author-hidden' => false
];
return self::getCollection($condition, DI::baseUrl() . '/inbox', $page, $max_id, $uid, null); return self::getCollection($condition, DI::baseUrl() . '/inbox', $page, $max_id, $uid, null);
} }