X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FItem.php;h=f923fe2691d84109e6ec20f0e918fed26a4d2da6;hb=6dbbd081795fa1c8fe57db2248ac162efeeada88;hp=3e0faddf75bac667b98427023366150c5b02fc18;hpb=835152d418e9cc006faf8ec0a742d3ac6f732b17;p=friendica.git diff --git a/src/Model/Item.php b/src/Model/Item.php index 3e0faddf75..f923fe2691 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -1,6 +1,6 @@ ['id' => false]]; $parent = Post::selectFirst($fields, $condition, $params); + if (!DBA::isResult($parent) && $item['origin']) { + $stored = Item::storeForUserByUriId($item['thr-parent-id'], $item['uid']); + Logger::info('Stored thread parent item for user', ['uri-id' => $item['thr-parent-id'], 'uid' => $item['uid'], 'stored' => $stored]); + $parent = Post::selectFirst($fields, $condition, $params); + } + if (!DBA::isResult($parent)) { Logger::notice('item parent was not found - ignoring item', ['thr-parent-id' => $item['thr-parent-id'], 'uid' => $item['uid']]); return []; @@ -673,6 +679,13 @@ class Item 'uid' => $parent['uid']]; $params = ['order' => ['id' => false]]; $toplevel_parent = Post::selectFirst($fields, $condition, $params); + + if (!DBA::isResult($toplevel_parent) && $item['origin']) { + $stored = Item::storeForUserByUriId($item['parent-uri-id'], $item['uid']); + Logger::info('Stored parent item for user', ['uri-id' => $item['parent-uri-id'], 'uid' => $item['uid'], 'stored' => $stored]); + $toplevel_parent = Post::selectFirst($fields, $condition, $params); + } + if (!DBA::isResult($toplevel_parent)) { Logger::notice('item top level parent was not found - ignoring item', ['parent-uri-id' => $parent['parent-uri-id'], 'uid' => $parent['uid']]); return []; @@ -706,7 +719,7 @@ class Item return GRAVITY_UNKNOWN; // Should not happen } - public static function insert($item, $notify = false, $dontcache = false) + public static function insert(array $item, bool $notify = false, bool $post_local = true) { $orig_item = $item; @@ -931,12 +944,14 @@ class Item $item["private"] = self::PRIVATE; } - if ($notify) { + if ($notify && $post_local) { $item['edit'] = false; $item['parent'] = $parent_id; // Trigger automatic reactions for addons - $item['api_source'] = true; + if (!isset($item['api_source'])) { + $item['api_source'] = true; + } // We have to tell the hooks who we are - this really should be improved if (!local_user()) { @@ -953,12 +968,12 @@ class Item unset($_SESSION['authenticated']); unset($_SESSION['uid']); } - } else { + } elseif (!$notify) { Hook::callAll('post_remote', $item); } if (!empty($item['cancel'])) { - Logger::log('post cancelled by addon.'); + Logger::notice('post cancelled by addon.'); return 0; } @@ -967,13 +982,14 @@ class Item } // Creates or assigns the permission set - $item['psid'] = PermissionSet::getIdFromACL( - $item['uid'], - $item['allow_cid'], - $item['allow_gid'], - $item['deny_cid'], - $item['deny_gid'] - ); + $item['psid'] = DI::permissionSet()->selectOrCreate( + DI::permissionSetFactory()->createFromString( + $item['uid'], + $item['allow_cid'], + $item['allow_gid'], + $item['deny_cid'], + $item['deny_gid'] + ))->id; if (!empty($item['extid'])) { $item['external-id'] = ItemURI::getIdByURI($item['extid']); @@ -1039,7 +1055,7 @@ class Item } $event_id = Event::store($ev); - $item = Event::getItemArrayForId($event_id, $item); + $item = Event::getItemArrayForImportedId($event_id, $item); Logger::info('Event was stored', ['id' => $event_id]); } @@ -1141,15 +1157,13 @@ class Item return 0; } - if (!$dontcache) { - if ($notify) { - if (!\Friendica\Content\Feature::isEnabled($posted_item['uid'], 'explicit_mentions') && ($posted_item['gravity'] == GRAVITY_COMMENT)) { - Tag::createImplicitMentions($posted_item['uri-id'], $posted_item['thr-parent-id']); - } - Hook::callAll('post_local_end', $posted_item); - } else { - Hook::callAll('post_remote_end', $posted_item); + if ($notify) { + if (!\Friendica\Content\Feature::isEnabled($posted_item['uid'], 'explicit_mentions') && ($posted_item['gravity'] == GRAVITY_COMMENT)) { + Tag::createImplicitMentions($posted_item['uri-id'], $posted_item['thr-parent-id']); } + Hook::callAll('post_local_end', $posted_item); + } else { + Hook::callAll('post_remote_end', $posted_item); } if ($posted_item['gravity'] === GRAVITY_PARENT) { @@ -1162,8 +1176,6 @@ class Item Post\UserNotification::setNotification($posted_item['uri-id'], $posted_item['uid']); - check_user_notification($posted_item['uri-id'], $posted_item['uid']); - // Distribute items to users who subscribed to their tags self::distributeByTags($posted_item); @@ -1465,7 +1477,7 @@ class Item } } - $distributed = self::insert($item, $notify, true); + $distributed = self::insert($item, $notify); if (!$distributed) { Logger::info("Distributed item wasn't stored", ['uri-id' => $item['uri-id'], 'user' => $uid]); @@ -1534,7 +1546,7 @@ class Item $item['contact-id'] = $item['author-id']; } - $public_shadow = self::insert($item, false, true); + $public_shadow = self::insert($item); Logger::info('Stored public shadow', ['thread' => $itemid, 'id' => $public_shadow]); } @@ -1593,7 +1605,7 @@ class Item unset($item['post-reason']); $item['contact-id'] = Contact::getIdForURL($item['author-link']); - $public_shadow = self::insert($item, false, true); + $public_shadow = self::insert($item); Logger::info('Stored public shadow', ['uri-id' => $item['uri-id'], 'id' => $public_shadow]); @@ -1757,15 +1769,15 @@ class Item } else { $condition = ['id' => $arr['contact-id'], 'self' => false]; } - DBA::update('contact', ['failed' => false, 'success_update' => $arr['received'], 'last-item' => $arr['received']], $condition); + Contact::update(['failed' => false, 'success_update' => $arr['received'], 'last-item' => $arr['received']], $condition); } // Now do the same for the system wide contacts with uid=0 if ($arr['private'] != self::PRIVATE) { - DBA::update('contact', ['failed' => false, 'success_update' => $arr['received'], 'last-item' => $arr['received']], + Contact::update(['failed' => false, 'success_update' => $arr['received'], 'last-item' => $arr['received']], ['id' => $arr['owner-id']]); if ($arr['owner-id'] != $arr['author-id']) { - DBA::update('contact', ['failed' => false, 'success_update' => $arr['received'], 'last-item' => $arr['received']], + Contact::update(['failed' => false, 'success_update' => $arr['received'], 'last-item' => $arr['received']], ['id' => $arr['author-id']]); } } @@ -1875,7 +1887,7 @@ class Item foreach ($matches as $mtch) { if (Strings::compareLink($link, $mtch[1]) || Strings::compareLink($dlink, $mtch[1])) { $mention = true; - Logger::log('mention found: ' . $mtch[2]); + Logger::notice('mention found', ['mention' => $mtch[2]]); } } } @@ -1943,18 +1955,19 @@ class Item $private = self::PUBLIC; } - $psid = PermissionSet::getIdFromACL( - $user['uid'], - $user['allow_cid'], - $user['allow_gid'], - $user['deny_cid'], - $user['deny_gid'] - ); + $permissionSet = DI::permissionSet()->selectOrCreate( + DI::permissionSetFactory()->createFromString( + $user['uid'], + $user['allow_cid'], + $user['allow_gid'], + $user['deny_cid'], + $user['deny_gid'] + )); $forum_mode = ($prvgroup ? 2 : 1); $fields = ['wall' => true, 'origin' => true, 'forum_mode' => $forum_mode, 'contact-id' => $self['id'], - 'owner-id' => $owner_id, 'private' => $private, 'psid' => $psid]; + 'owner-id' => $owner_id, 'private' => $private, 'psid' => $permissionSet->id]; self::update($fields, ['id' => $item['id']]); Worker::add(['priority' => PRIORITY_HIGH, 'dont_fork' => true], 'Notifier', Delivery::POST, (int)$item['uri-id'], (int)$item['uid']); @@ -2247,8 +2260,8 @@ class Item $condition[] = $network; } - $condition[0] .= " AND `received` < UTC_TIMESTAMP() - INTERVAL ? DAY"; - $condition[] = $days; + $condition[0] .= " AND `received` < ?"; + $condition[] = DateTimeFormat::utc('now - ' . $days . ' day'); $items = Post::select(['resource-id', 'starred', 'id', 'post-type', 'uid', 'uri-id'], $condition); @@ -2294,7 +2307,7 @@ class Item ++$expired; } DBA::close($items); - Logger::log('User ' . $uid . ": expired $expired items; expire items: $expire_items, expire notes: $expire_notes, expire starred: $expire_starred, expire photos: $expire_photos"); + Logger::notice('User ' . $uid . ": expired $expired items; expire items: $expire_items, expire notes: $expire_notes, expire starred: $expire_starred, expire photos: $expire_photos"); } public static function firstPostDate($uid, $wall = false) @@ -2343,7 +2356,7 @@ class Item $item = Post::selectFirst(self::ITEM_FIELDLIST, ['id' => $item_id]); if (!DBA::isResult($item)) { - Logger::log('like: unknown item ' . $item_id); + Logger::notice('like: unknown item', ['id' => $item_id]); return false; } @@ -2540,12 +2553,12 @@ class Item $condition = []; } elseif ($remote_user) { // Authenticated visitor - fetch the matching permissionsets - $set = PermissionSet::get($owner_id, $remote_user); + $permissionSets = DI::permissionSet()->selectByContactId($remote_user, $owner_id); if (!empty($set)) { $condition = ["(`private` != ? OR (`private` = ? AND `wall` AND `psid` IN (" . implode(', ', array_fill(0, count($set), '?')) . ")))", self::PRIVATE, self::PRIVATE]; - $condition = array_merge($condition, $set); + $condition = array_merge($condition, $permissionSets->column('id')); } } @@ -2586,10 +2599,10 @@ class Item * If pre-verified, the caller is expected to have already * done this and passed the groups into this function. */ - $set = PermissionSet::get($owner_id, $remote_user); + $permissionSets = DI::permissionSet()->selectByContactId($remote_user, $owner_id); if (!empty($set)) { - $sql_set = sprintf(" OR (" . $table . "`private` = %d AND " . $table . "`wall` AND " . $table . "`psid` IN (", self::PRIVATE) . implode(',', $set) . "))"; + $sql_set = sprintf(" OR (" . $table . "`private` = %d AND " . $table . "`wall` AND " . $table . "`psid` IN (", self::PRIVATE) . implode(',', $permissionSets->column('id')) . "))"; } else { $sql_set = ''; } @@ -2759,6 +2772,8 @@ class Item $filter_reasons[] = DI::l10n()->t('Content warning: %s', $item['content-warning']); } + $item['attachments'] = $attachments; + $hook_data = [ 'item' => $item, 'filter_reasons' => $filter_reasons @@ -2977,8 +2992,9 @@ class Item private static function addLinkAttachment(int $uriid, array $attachments, string $body, string $content, bool $shared, array $ignore_links) { DI::profiler()->startRecording('rendering'); - // @ToDo Check only for audio and video - $preview = empty($attachments['visual']); + // Don't show a preview when there is a visual attachment (audio or video) + $types = array_column($attachments['visual'], 'type'); + $preview = !in_array(Post\Media::IMAGE, $types) && !in_array(Post\Media::VIDEO, $types); if (!empty($attachments['link'])) { foreach ($attachments['link'] as $link) { @@ -3249,6 +3265,18 @@ class Item return $item_id; } + $hookData = [ + 'uri' => $uri, + 'uid' => $uid, + 'item_id' => null, + ]; + + Hook::callAll('item_by_link', $hookData); + + if (isset($hookData['item_id'])) { + return is_numeric($hookData['item_id']) ? $hookData['item_id'] : 0; + } + if ($fetched_uri = ActivityPub\Processor::fetchMissingActivity($uri)) { $item_id = self::searchByLink($fetched_uri, $uid); } else { @@ -3341,7 +3369,7 @@ class Item $body = $shared_item['body']; } - $item['body'] = preg_replace("/\[share ([^\[\]]*)\].*\[\/share\]/ism", '[share $1]' . $body . '[/share]', $item['body']); + $item['body'] = preg_replace("/\[share ([^\[\]]*)\].*\[\/share\]/ism", '[share $1]' . str_replace('$', '\$', $body) . '[/share]', $item['body']); unset($shared_item['body']); return array_merge($item, $shared_item);