use Friendica\DI;
use Friendica\Model\APContact;
use Friendica\Model\Contact;
-use Friendica\Model\Group;
+use Friendica\Model\Circle;
use Friendica\Model\Item;
use Friendica\Model\Post;
use Friendica\Model\User;
* @param array $ldactivity
* @return array
*/
- private static function updateContent(int $uid, string $object_id, array $application, array $ldactivity):array
+ private static function updateContent(int $uid, string $object_id, array $application, array $ldactivity): array
{
$id = Item::fetchByLink($object_id, $uid);
$original_post = Post::selectFirst(['uri-id'], ['uid' => $uid, 'origin' => true, 'id' => $id]);
$targets = [];
- foreach (['as:to', 'as:cc', 'as:bto', 'as:bcc'] as $element) {
+ foreach (['as:to', 'as:cc', 'as:bto', 'as:bcc', 'as:audience'] as $element) {
switch ($element) {
case 'as:to':
$type = Receiver::TARGET_TO;
case 'as:bcc':
$type = Receiver::TARGET_BCC;
break;
+ case 'as:audience':
+ $type = Receiver::TARGET_AUDIENCE;
+ break;
}
$receiver_list = JsonLD::fetchElementArray($object, $element, '@id');
if (empty($receiver_list)) {
$item['contact-id'] = $owner['id'];
$item['author-id'] = $item['owner-id'] = Contact::getPublicIdByUserId($uid);
$item['title'] = $object_data['name'];
- $item['body'] = Markdown::toBBCode($object_data['content']);
+ $item['body'] = Markdown::toBBCode($object_data['content'] ?? '');
$item['app'] = $application['name'] ?? 'API';
if (!empty($object_data['target'][Receiver::TARGET_GLOBAL])) {
$item['private'] = Item::UNLISTED;
} elseif (!empty($object_data['target'][Receiver::TARGET_FOLLOWER])) {
$item['allow_cid'] = '';
- $item['allow_gid'] = '<' . Group::FOLLOWERS . '>';
+ $item['allow_gid'] = '<' . Circle::FOLLOWERS . '>';
$item['deny_cid'] = '';
$item['deny_gid'] = '';
$item['private'] = Item::PRIVATE;
*/
public static function getOutbox(array $owner, int $uid, int $page = null, int $max_id = null, string $requester = ''): array
{
- $condition = ['gravity' => [Item::GRAVITY_PARENT, Item::GRAVITY_COMMENT], 'private' => [Item::PUBLIC, Item::UNLISTED]];
+ $condition = [
+ 'gravity' => [Item::GRAVITY_PARENT, Item::GRAVITY_COMMENT],
+ 'private' => [Item::PUBLIC, Item::UNLISTED]
+ ];
if (!empty($requester)) {
$requester_id = Contact::getIdForURL($requester, $owner['uid']);
$permissionSets = DI::permissionSet()->selectByContactId($requester_id, $owner['uid']);
if (!empty($permissionSets)) {
$condition = ['psid' => array_merge($permissionSets->column('id'),
- [DI::permissionSet()->selectPublicForUser($owner['uid'])])];
+ [DI::permissionSet()->selectPublicForUser($owner['uid'])])];
}
}
}
$apcontact = APContact::getByURL($owner['url']);
+ if (empty($apcontact)) {
+ throw new \Friendica\Network\HTTPException\NotFoundException();
+ }
+
return self::getCollection($condition, DI::baseUrl() . '/outbox/' . $owner['nickname'], $page, $max_id, $uid, $apcontact['statuses_count']);
}
{
$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);
}
public static function getPublicInbox(int $uid, int $page = null, int $max_id = null)
{
- $condition = ['gravity' => [Item::GRAVITY_PARENT, Item::GRAVITY_COMMENT], 'private' => Item::PUBLIC,
- 'network' => [Protocol::ACTIVITYPUB, Protocol::DFRN], 'author-blocked' => false, 'author-hidden' => false];
+ $condition = [
+ '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);
}