const PR_DISTRIBUTE = 79;
const PR_PUSHED = 80;
const PR_LOCAL = 81;
+ const PR_AUDIENCE = 82;
// system.accept_only_sharer setting values
const COMPLETION_NONE = 1;
DBA::close($items);
foreach ($notify_items as $notify_item) {
- $post = Post::selectFirst(['uri-id', 'uid'], ['id' => $notify_item]);
+ $post = Post::selectFirst([], ['id' => $notify_item]);
+
+ if ($post['gravity'] != self::GRAVITY_PARENT) {
+ $signed = Diaspora::createCommentSignature($post);
+ if (!empty($signed)) {
+ DBA::replace('diaspora-interaction', ['uri-id' => $post['uri-id'], 'interaction' => json_encode($signed)]);
+ }
+ }
+
Worker::add(Worker::PRIORITY_HIGH, 'Notifier', Delivery::POST, (int)$post['uri-id'], (int)$post['uid']);
}
if (($uid != 0) && (($item['gravity'] == self::GRAVITY_PARENT) || $is_reshare) &&
DI::pConfig()->get($uid, 'system', 'accept_only_sharer') == self::COMPLETION_NONE &&
- !in_array($item['post-reason'], [self::PR_FOLLOWER, self::PR_TAG, self::PR_TO, self::PR_CC, self::PR_ACTIVITY])) {
+ !in_array($item['post-reason'], [self::PR_FOLLOWER, self::PR_TAG, self::PR_TO, self::PR_CC, self::PR_ACTIVITY, self::PR_AUDIENCE])) {
Logger::info('Contact is not a follower, thread will not be stored', ['author' => $item['author-link'], 'uid' => $uid, 'uri-id' => $uri_id, 'post-reason' => $item['post-reason']]);
return 0;
}
}
// Glue it together to be able to make a hash from it
- $host_id = implode('/', $parsed);
+ if (!empty($parsed)) {
+ $host_id = implode('/', $parsed);
+ } else {
+ $host_id = $uri;
+ }
// Use a mixture of several hashes to provide some GUID like experience
return hash('crc32', $hostPart) . '-' . hash('joaat', $host_id) . '-' . hash('fnv164', $host_id);
if ($owner['page-flags'] == User::PAGE_FLAGS_PRVGROUP) {
$allow_cid = '';
- $allow_gid = '<' . Group::FOLLOWERS . '>';
+ $allow_gid = '<' . Circle::FOLLOWERS . '>';
$deny_cid = '';
$deny_gid = '';
self::performActivity($item['id'], 'announce', $uid, $allow_cid, $allow_gid, $deny_cid, $deny_gid);
/**
* Returns an array of contact-ids that are allowed to see this object
*
- * @param array $obj Item array with at least uid, allow_cid, allow_gid, deny_cid and deny_gid
- * @param bool $check_dead Prunes unavailable contacts from the result
+ * @param array $obj Item array with at least uid, allow_cid, allow_gid, deny_cid and deny_gid
+ * @param bool $check_dead Prunes unavailable contacts from the result
+ * @param bool $expand_followers Expand the list of followers
* @return array
* @throws \Exception
*/
- public static function enumeratePermissions(array $obj, bool $check_dead = false): array
+ public static function enumeratePermissions(array $obj, bool $check_dead = false, bool $expand_followers = true): array
{
$aclFormatter = DI::aclFormatter();
- $allow_people = $aclFormatter->expand($obj['allow_cid']);
- $allow_groups = Group::expand($obj['uid'], $aclFormatter->expand($obj['allow_gid']), $check_dead);
- $deny_people = $aclFormatter->expand($obj['deny_cid']);
- $deny_groups = Group::expand($obj['uid'], $aclFormatter->expand($obj['deny_gid']), $check_dead);
- $recipients = array_unique(array_merge($allow_people, $allow_groups));
- $deny = array_unique(array_merge($deny_people, $deny_groups));
- $recipients = array_diff($recipients, $deny);
+ if (!$expand_followers && (!empty($obj['deny_cid']) || !empty($obj['deny_gid']))) {
+ $expand_followers = true;
+ }
+
+ $allow_people = $aclFormatter->expand($obj['allow_cid']);
+ $allow_circles = Circle::expand($obj['uid'], $aclFormatter->expand($obj['allow_gid']), $check_dead, $expand_followers);
+ $deny_people = $aclFormatter->expand($obj['deny_cid']);
+ $deny_circles = Circle::expand($obj['uid'], $aclFormatter->expand($obj['deny_gid']), $check_dead);
+ $recipients = array_unique(array_merge($allow_people, $allow_circles));
+ $deny = array_unique(array_merge($deny_people, $deny_circles));
+ $recipients = array_diff($recipients, $deny);
return $recipients;
}
/*
* Authenticated visitor. Unless pre-verified,
* check that the contact belongs to this $owner_id
- * and load the groups the visitor belongs to.
+ * and load the circles the visitor belongs to.
* If pre-verified, the caller is expected to have already
- * done this and passed the groups into this function.
+ * done this and passed the circles into this function.
*/
$permissionSets = DI::permissionSet()->selectByContactId($remote_user, $owner_id);
if (!$is_preview) {
$item['body'] = preg_replace("#\s*\[attachment .*?].*?\[/attachment]\s*#ism", "\n", $item['body']);
$item['body'] = Post\Media::removeFromEndOfBody($item['body'] ?? '');
+ $item['body'] = Post\Media::replaceImage($item['body']);
}
$body = $item['body'];
if (!empty($shared['post'])) {
$shared_item = $shared['post'];
$shared_item['body'] = Post\Media::removeFromEndOfBody($shared_item['body']);
+ $shared_item['body'] = Post\Media::replaceImage($shared_item['body']);
$quote_uri_id = $shared['post']['uri-id'];
$shared_links[] = strtolower($shared['post']['uri']);
$item['body'] = BBCode::removeSharedData($item['body']);
} elseif (empty($shared_item['uri-id']) && empty($item['quote-uri-id']) && ($item['network'] != Protocol::DIASPORA)) {
$media = Post\Media::getByURIId($item['uri-id'], [Post\Media::ACTIVITY]);
if (!empty($media)) {
- $shared_item = Post::selectFirst($fields, ['plink' => $media[0]['url'], 'uid' => [$item['uid'], 0]]);
+ $shared_item = Post::selectFirst($fields, ['uri-id' => $media[0]['media-uri-id'], 'uid' => [$item['uid'], 0]]);
+ if (empty($shared_item['uri-id'])) {
+ $shared_item = Post::selectFirst($fields, ['plink' => $media[0]['url'], 'uid' => [$item['uid'], 0]]);
+ } elseif (!in_array(strtolower($media[0]['url']), $shared_links)) {
+ $shared_links[] = strtolower($media[0]['url']);
+ }
if (empty($shared_item['uri-id'])) {
$shared_item = Post::selectFirst($fields, ['uri' => $media[0]['url'], 'uid' => [$item['uid'], 0]]);
}
if (!empty($shared_attachments)) {
+ $s = self::addGallery($s, $shared_attachments, $item['uri-id']);
$s = self::addVisualAttachments($shared_attachments, $shared_item, $s, true);
$s = self::addLinkAttachment($shared_uri_id ?: $item['uri-id'], $shared_attachments, $body, $s, true, $quote_shared_links);
$s = self::addNonVisualAttachments($shared_attachments, $item, $s, true);
$body = BBCode::removeSharedData($body);
}
+ $s = self::addGallery($s, $attachments, $item['uri-id']);
$s = self::addVisualAttachments($attachments, $item, $s, false);
$s = self::addLinkAttachment($item['uri-id'], $attachments, $body, $s, false, $shared_links);
$s = self::addNonVisualAttachments($attachments, $item, $s, false);
]);
}
+ /**
+ * Modify links to pictures to links for the "Fancybox" gallery
+ *
+ * @param string $s
+ * @param array $attachments
+ * @param integer $uri_id
+ * @return string
+ */
+ private static function addGallery(string $s, array $attachments, int $uri_id): string
+ {
+ foreach ($attachments['visual'] as $attachment) {
+ if (empty($attachment['preview']) || ($attachment['type'] != Post\Media::IMAGE)) {
+ continue;
+ }
+ $s = str_replace('<a href="' . $attachment['url'] . '"', '<a data-fancybox="' . $uri_id . '" href="' . $attachment['url'] . '"', $s);
+ }
+ return $s;
+ }
/**
* Check if the body contains a link
foreach ($attachments['visual'] as $attachment) {
if (!empty($attachment['preview'])) {
+ if (Network::isLocalLink($attachment['preview'])) {
+ continue;
+ }
$proxy = Post\Media::getPreviewUrlForId($attachment['id'], Proxy::SIZE_LARGE);
$search = ['[img=' . $attachment['preview'] . ']', ']' . $attachment['preview'] . '[/img]'];
$replace = ['[img=' . $proxy . ']', ']' . $proxy . '[/img]'];
$body = str_replace($search, $replace, $body);
} elseif ($attachment['filetype'] == 'image') {
+ if (Network::isLocalLink($attachment['url'])) {
+ continue;
+ }
$proxy = Post\Media::getUrlForId($attachment['id']);
$search = ['[img=' . $attachment['url'] . ']', ']' . $attachment['url'] . '[/img]'];
$replace = ['[img=' . $proxy . ']', ']' . $proxy . '[/img]'];
if (self::containsLink($item['body'], $src_url)) {
continue;
}
- $images[] = ['src' => $src_url, 'preview' => $preview_url, 'attachment' => $attachment];
+ $images[] = ['src' => $src_url, 'preview' => $preview_url, 'attachment' => $attachment, 'uri_id' => $item['uri-id']];
}
}
projects / friendica.git / blobdiff