}
/**
- * Get a minimal actror array for the C2S API
+ * Get a minimal actor array for the C2S API
*
* @param integer $cid
* @return array
/**
* Creates an array of permissions from an item thread
*
- * @param array $item Item array
- * @param boolean $blindcopy addressing via "bcc" or "cc"?
- * @param integer $last_id Last item id for adding receivers
+ * @param array $item Item array
+ * @param boolean $blindcopy addressing via "bcc" or "cc"?
+ * @param boolean $expand_followers Expand the list of followers
+ * @param integer $last_id Last item id for adding receivers
*
* @return array with permission data
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- private static function createPermissionBlockForItem(array $item, bool $blindcopy, int $last_id = 0): array
+ private static function createPermissionBlockForItem(array $item, bool $blindcopy, bool $expand_followers, int $last_id = 0): array
{
if ($last_id == 0) {
$last_id = $item['id'];
$networks = [Protocol::ACTIVITYPUB, Protocol::OSTATUS];
}
- $data = ['to' => [], 'cc' => [], 'bcc' => []];
+ $data = ['to' => [], 'cc' => [], 'bcc' => [] , 'audience' => []];
if ($item['gravity'] == Item::GRAVITY_PARENT) {
$actor_profile = APContact::getByURL($item['owner-link']);
if ($term['type'] == Tag::EXCLUSIVE_MENTION) {
$exclusive = true;
if (!empty($profile['followers']) && ($profile['type'] == 'Group')) {
- $data['cc'][] = $profile['followers'];
+ $data['cc'][] = $profile['followers'];
+ $data['audience'][] = $profile['url'];
}
} elseif (($term['type'] == Tag::MENTION) && ($profile['type'] == 'Group')) {
$mention = true;
$data['to'][] = $profile['url'];
}
}
+ if (!$exclusive && ($item['private'] == Item::UNLISTED)) {
+ $data['to'][] = $actor_profile['followers'];
+ }
} else {
- $receiver_list = Item::enumeratePermissions($item, true);
+ $receiver_list = Item::enumeratePermissions($item, true, $expand_followers);
foreach ($terms as $term) {
$cid = Contact::getIdForURL($term['url'], $item['uid']);
if ($term['type'] == Tag::EXCLUSIVE_MENTION) {
$exclusive = true;
if (!empty($profile['followers']) && ($profile['type'] == 'Group')) {
- $data['cc'][] = $profile['followers'];
+ $data['cc'][] = $profile['followers'];
+ $data['audience'][] = $profile['url'];
}
} elseif (($term['type'] == Tag::MENTION) && ($profile['type'] == 'Group')) {
$mention = true;
$data['cc'][] = $follower;
} elseif (!$exclusive) {
foreach ($receiver_list as $receiver) {
+ if ($receiver == -1) {
+ $data['to'][] = $actor_profile['followers'];
+ continue;
+ }
+
$contact = DBA::selectFirst('contact', ['url', 'hidden', 'network', 'protocol', 'gsid'], ['id' => $receiver, 'network' => Protocol::FEDERATED]);
if (!DBA::isResult($contact) || !self::isAPContact($contact, $networks)) {
continue;
}
if (!empty($item['parent'])) {
- $parents = Post::select(['id', 'author-link', 'owner-link', 'gravity', 'uri'], ['parent' => $item['parent']], ['order' => ['id']]);
+ if ($item['private'] == Item::PRIVATE) {
+ $condition = ['parent' => $item['parent'], 'uri-id' => $item['thr-parent-id']];
+ } else {
+ $condition = ['parent' => $item['parent']];
+ }
+ $parents = Post::select(['id', 'author-link', 'owner-link', 'gravity', 'uri'], $condition, ['order' => ['id']]);
while ($parent = Post::fetch($parents)) {
if ($parent['gravity'] == Item::GRAVITY_PARENT) {
$profile = APContact::getByURL($parent['owner-link'], false);
DBA::close($parents);
}
- $data['to'] = array_unique($data['to']);
- $data['cc'] = array_unique($data['cc']);
- $data['bcc'] = array_unique($data['bcc']);
+ $data['to'] = array_unique($data['to']);
+ $data['cc'] = array_unique($data['cc']);
+ $data['bcc'] = array_unique($data['bcc']);
+ $data['audience'] = array_unique($data['audience']);
if (($key = array_search($item['author-link'], $data['to'])) !== false) {
unset($data['to'][$key]);
unset($data['bcc'][$key]);
}
+ if (($key = array_search($item['author-link'], $data['audience'])) !== false) {
+ unset($data['audience'][$key]);
+ }
+
foreach ($data['to'] as $to) {
if (($key = array_search($to, $data['cc'])) !== false) {
unset($data['cc'][$key]);
$receivers = ['to' => array_values($data['to']), 'cc' => array_values($data['cc']), 'bcc' => array_values($data['bcc'])];
+ if (!empty($data['audience'])) {
+ $receivers['audience'] = array_values($data['audience']);
+ if (count($receivers['audience']) == 1) {
+ $receivers['audience'] = $receivers['audience'][0];
+ }
+ }
+
if (!$blindcopy) {
unset($receivers['bcc']);
}
*/
public static function fetchTargetInboxes(array $item, int $uid, bool $personal = false, int $last_id = 0): array
{
- $permissions = self::createPermissionBlockForItem($item, true, $last_id);
+ $permissions = self::createPermissionBlockForItem($item, true, true, $last_id);
if (empty($permissions)) {
return [];
}
$data['actor'] = $mail['author-link'];
$data['published'] = DateTimeFormat::utc($mail['created'] . '+00:00', DateTimeFormat::ATOM);
$data['instrument'] = self::getService();
- $data = array_merge($data, self::createPermissionBlockForItem($mail, true));
+ $data = array_merge($data, self::createPermissionBlockForItem($mail, true, false));
if (empty($data['to']) && !empty($data['cc'])) {
$data['to'] = $data['cc'];
$data['instrument'] = self::getService();
- $data = array_merge($data, self::createPermissionBlockForItem($item, false));
+ $data = array_merge($data, self::createPermissionBlockForItem($item, false, false));
if (in_array($data['type'], ['Create', 'Update', 'Delete'])) {
$data['object'] = self::createNote($item, $api_mode);
$data['name'] = BBCode::toPlaintext($item['title'], false);
}
- $permission_block = self::createPermissionBlockForItem($item, false);
+ $permission_block = self::createPermissionBlockForItem($item, false, false);
$real_quote = false;
+ $item = Post\Media::addHTMLAttachmentToItem($item);
+
$body = $item['body'];
if ($type == 'Note') {
$item['body'] = $announce['comment'] . "\n" . $announce['object']['plink'];
$activity['object'] = self::createNote($item, $api_mode);
- /// @todo Finally descide how to implement this in AP. This is a possible way:
+ /// @todo Finally decide how to implement this in AP. This is a possible way:
$activity['object']['attachment'][] = self::createNote($announce['object']);
$activity['object']['source']['content'] = $orig_body;
}
/**
- * Return announce related data if the item is an annunce
+ * Return announce related data if the item is an announce
*
* @param array $item
* @return array Announcement array
projects / friendica.git / blobdiff