Some more standards
This commit is contained in:
parent
c643eb8cb2
commit
41f6e72aa0
|
@ -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);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user