X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FItem.php;h=60e88757e051bb9bfe2ba88639feeff3984880bc;hb=921e070b2235436ca0947e3f27706cbd5cd9d0a1;hp=5ef488b9777109309915cbe49591781187544663;hpb=9c8ae42c04428e62f6ae1e00f8386541d4a5ebdc;p=friendica.git diff --git a/src/Model/Item.php b/src/Model/Item.php index 5ef488b977..60e88757e0 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -31,6 +31,7 @@ use Friendica\Core\System; use Friendica\Core\Worker; use Friendica\Database\DBA; use Friendica\DI; +use Friendica\Network\HTTPException\InternalServerErrorException; use Friendica\Protocol\Activity; use Friendica\Protocol\ActivityPub; use Friendica\Protocol\Delivery; @@ -78,6 +79,7 @@ class Item 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; @@ -233,7 +235,7 @@ class Item Post\Media::insertFromAttachment($item['uri-id'], $fields['attach']); } - // We only need to notfiy others when it is an original entry from us. + // We only need to notify others when it is an original entry from us. // Only call the notifier when the item had been edited and records had been changed. if ($item['origin'] && !empty($fields['edited']) && ($previous['edited'] != $fields['edited'])) { $notify_items[] = $item['id']; @@ -243,7 +245,15 @@ class Item 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']); } @@ -875,7 +885,7 @@ class Item /* * Do we already have this item? * We have to check several networks since Friendica posts could be repeated - * via OStatus (maybe Diasporsa as well) + * via OStatus (maybe Diaspora as well) */ $duplicate = self::getDuplicateID($item); if ($duplicate) { @@ -892,6 +902,8 @@ class Item $item['post-type'] = empty($item['title']) ? self::PT_NOTE : self::PT_ARTICLE; } + $defined_permissions = isset($item['allow_cid']) && isset($item['allow_gid']) && isset($item['deny_cid']) && isset($item['deny_gid']) && isset($item['private']); + $item['wall'] = intval($item['wall'] ?? 0); $item['extid'] = trim($item['extid'] ?? ''); $item['author-name'] = trim($item['author-name'] ?? ''); @@ -931,7 +943,7 @@ class Item $item['inform'] = trim($item['inform'] ?? ''); $item['file'] = trim($item['file'] ?? ''); - // Communities aren't working with the Diaspora protoccol + // Communities aren't working with the Diaspora protocol if (($uid != 0) && ($item['network'] == Protocol::DIASPORA)) { $user = User::getById($uid, ['account-type']); if ($user['account-type'] == Contact::TYPE_COMMUNITY) { @@ -993,7 +1005,7 @@ class Item $item['wall'] = $toplevel_parent['wall']; // Reshares have to keep their permissions to allow forums to work - if (!$item['origin'] || ($item['verb'] != Activity::ANNOUNCE)) { + if (!$defined_permissions && (!$item['origin'] || ($item['verb'] != Activity::ANNOUNCE))) { $item['allow_cid'] = $toplevel_parent['allow_cid']; $item['allow_gid'] = $toplevel_parent['allow_gid']; $item['deny_cid'] = $toplevel_parent['deny_cid']; @@ -1016,7 +1028,7 @@ class Item * This differs from the above settings as it subtly allows comments from * email correspondents to be private even if the overall thread is not. */ - if ($toplevel_parent['private']) { + if (!$defined_permissions && $toplevel_parent['private']) { $item['private'] = $toplevel_parent['private']; } @@ -1063,7 +1075,7 @@ class Item } // ACL settings - if (!empty($item['allow_cid'] . $item['allow_gid'] . $item['deny_cid'] . $item['deny_gid'])) { + if (!$defined_permissions && !empty($item['allow_cid'] . $item['allow_gid'] . $item['deny_cid'] . $item['deny_gid'])) { $item['private'] = self::PRIVATE; } @@ -1392,10 +1404,16 @@ class Item * * @param integer $uri_id * @return void + * @throws InternalServerErrorException + * @throws \ImagickException */ public static function updateDisplayCache(int $uri_id) { $item = Post::selectFirst(self::DISPLAY_FIELDLIST, ['uri-id' => $uri_id]); + if (!$item) { + return; + } + self::prepareBody($item, false, false, true); } @@ -1497,7 +1515,7 @@ class Item $users = []; - /// @todo add a field "pcid" in the contact table that referrs to the public contact id. + /// @todo add a field "pcid" in the contact table that refers to the public contact id. $owner = DBA::selectFirst('contact', ['url', 'nurl', 'alias'], ['id' => $parent['owner-id']]); if (!DBA::isResult($owner)) { return; @@ -1607,7 +1625,7 @@ class Item 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; } @@ -2032,7 +2050,11 @@ class Item } // 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); @@ -2232,7 +2254,7 @@ class Item 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); @@ -2492,22 +2514,27 @@ class Item /** * 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 { - $aclFormater = DI::aclFormatter(); + $aclFormatter = DI::aclFormatter(); - $allow_people = $aclFormater->expand($obj['allow_cid']); - $allow_groups = Group::expand($obj['uid'], $aclFormater->expand($obj['allow_gid']), $check_dead); - $deny_people = $aclFormater->expand($obj['deny_cid']); - $deny_groups = Group::expand($obj['uid'], $aclFormater->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; } @@ -2613,7 +2640,7 @@ class Item * Activity verb. One of * like, unlike, dislike, undislike, attendyes, unattendyes, * attendno, unattendno, attendmaybe, unattendmaybe, - * announce, unannouce + * announce, unannounce * @param int $uid * @param string $allow_cid * @param string $allow_gid @@ -2873,9 +2900,9 @@ class Item /* * 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); @@ -2998,6 +3025,7 @@ class Item 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']; @@ -3015,13 +3043,19 @@ class Item 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]]); @@ -3040,7 +3074,11 @@ class Item } if (!empty($quote_uri_id)) { - $item['body'] .= "\n" . DI::contentItem()->createSharedBlockByArray($shared_item); + if (isset($shared_item['plink'])) { + $item['body'] .= "\n" . DI::contentItem()->createSharedBlockByArray($shared_item); + } else { + DI::logger()->warning('Missing plink in shared item', ['item' => $item, 'shared' => $shared, 'quote_uri_id' => $quote_uri_id, 'shared_item' => $shared_item]); + } } if (!empty($shared_item['uri-id'])) { @@ -3109,12 +3147,14 @@ class Item } 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); @@ -3164,6 +3204,24 @@ class Item ]); } + /** + * 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(' $src_url, 'preview' => $preview_url, 'attachment' => $attachment]; + $images[] = ['src' => $src_url, 'preview' => $preview_url, 'attachment' => $attachment, 'uri_id' => $item['uri-id']]; } }