X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FModel%2FItem.php;h=bf1f2585a1511392116f6c10a2a41d7c4450d8d1;hb=edf65b0f552258a613e5b3fae5803c2f5258270b;hp=8327252abc7acc2f69bb062cb732e06884edd2e9;hpb=5246b9c4b01a0f3dc6fe2fcbae8afdb3703a0b01;p=friendica.git diff --git a/src/Model/Item.php b/src/Model/Item.php index 8327252abc..bf1f2585a1 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -1,6 +1,6 @@ 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']); @@ -1424,6 +1428,17 @@ class Item private static function storeForUser(array $item, int $uid) { if (Post::exists(['uri-id' => $item['uri-id'], 'uid' => $uid])) { + if (!empty($item['event-id'])) { + $post = Post::selectFirst(['event-id'], ['uri-id' => $item['uri-id'], 'uid' => $uid]); + if (!empty($post['event-id'])) { + $event = DBA::selectFirst('event', ['edited', 'start', 'finish', 'summary', 'desc', 'location', 'nofinish', 'adjust'], ['id' => $item['event-id']]); + if (!empty($event)) { + // We aren't using "Event::store" here, since we don't want to trigger any further action + $ret = DBA::update('event', $event, ['id' => $post['event-id']]); + Logger::info('Event updated', ['uid' => $uid, 'source-event' => $item['event-id'], 'target-event' => $post['event-id'], 'ret' => $ret]); + } + } + } Logger::info('Item already exists', ['uri-id' => $item['uri-id'], 'uid' => $uid]); return 0; } @@ -1766,15 +1781,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']]); } } @@ -1858,73 +1873,60 @@ class Item { $mention = false; - $user = DBA::selectFirst('user', [], ['uid' => $uid]); - if (!DBA::isResult($user)) { + $owner = User::getOwnerDataById($uid); + if (!DBA::isResult($owner)) { + Logger::warning('User not found, quitting.', ['uid' => $uid]); return false; } - $community_page = (($user['page-flags'] == User::PAGE_FLAGS_COMMUNITY) ? true : false); - $prvgroup = (($user['page-flags'] == User::PAGE_FLAGS_PRVGROUP) ? true : false); + if ($owner['contact-type'] != User::ACCOUNT_TYPE_COMMUNITY) { + Logger::debug('Owner is no community, quitting here.', ['uid' => $uid, 'id' => $item_id]); + return false; + } $item = Post::selectFirst(self::ITEM_FIELDLIST, ['id' => $item_id]); if (!DBA::isResult($item)) { + Logger::warning('Post not found, quitting.', ['id' => $item_id]); return false; } - $link = Strings::normaliseLink(DI::baseUrl() . '/profile/' . $user['nickname']); - - /* - * Diaspora uses their own hardwired link URL in @-tags - * instead of the one we supply with webfinger - */ - $dlink = Strings::normaliseLink(DI::baseUrl() . '/u/' . $user['nickname']); + if ($item['wall'] || $item['origin'] || ($item['gravity'] != GRAVITY_PARENT)) { + Logger::debug('Wall item, origin item or no parent post, quitting here.', ['wall' => $item['wall'], 'origin' => $item['origin'], 'gravity' => $item['gravity'], 'id' => $item_id, 'uri-id' => $item['uri-id'], 'guid' => $item['guid']]); + return false; + } - $cnt = preg_match_all('/[\@\!]\[url\=(.*?)\](.*?)\[\/url\]/ism', $item['body'], $matches, PREG_SET_ORDER); - if ($cnt) { - foreach ($matches as $mtch) { - if (Strings::compareLink($link, $mtch[1]) || Strings::compareLink($dlink, $mtch[1])) { - $mention = true; - Logger::log('mention found: ' . $mtch[2]); - } + $tags = Tag::getByURIId($item['uri-id'], [Tag::MENTION, Tag::EXCLUSIVE_MENTION]); + foreach ($tags as $tag) { + if (Strings::compareLink($owner['url'], $tag['url'])) { + $mention = true; + Logger::info('Mention found in tag.', ['url' => $tag['url'], 'uri' => $item['uri'], 'uid' => $uid, 'id' => $item_id, 'uri-id' => $item['uri-id'], 'guid' => $item['guid']]); } } + // This check can most likely be removed since we always are having the tags if (!$mention) { - $tags = Tag::getByURIId($item['uri-id'], [Tag::MENTION, Tag::EXCLUSIVE_MENTION]); - foreach ($tags as $tag) { - if (Strings::compareLink($link, $tag['url']) || Strings::compareLink($dlink, $tag['url'])) { - $mention = true; - DI::logger()->info('mention found in tag.', ['url' => $tag['url']]); + $cnt = preg_match_all('/[\@\!]\[url\=(.*?)\](.*?)\[\/url\]/ism', $item['body'], $matches, PREG_SET_ORDER); + if ($cnt) { + foreach ($matches as $mtch) { + if (Strings::compareLink($owner['url'], $mtch[1])) { + $mention = true; + Logger::notice('Mention found in body.', ['mention' => $mtch[2], 'uri' => $item['uri'], 'uid' => $uid, 'id' => $item_id, 'uri-id' => $item['uri-id'], 'guid' => $item['guid']]); + } } } } if (!$mention) { - if (($community_page || $prvgroup) && - !$item['wall'] && !$item['origin'] && ($item['gravity'] == GRAVITY_PARENT)) { - Logger::info('Delete private group/communiy top-level item without mention', ['id' => $item['id'], 'guid'=> $item['guid']]); - Post\User::delete(['uri-id' => $item['uri-id'], 'uid' => $item['uid']]); - return true; - } - return false; + Logger::info('Top-level post without mention is deleted.', ['uri' => $item['uri'], $uid, 'id' => $item_id, 'uri-id' => $item['uri-id'], 'guid' => $item['guid']]); + Post\User::delete(['uri-id' => $item['uri-id'], 'uid' => $item['uid']]); + return true; } - $arr = ['item' => $item, 'user' => $user]; + $arr = ['item' => $item, 'user' => $owner]; Hook::callAll('tagged', $arr); - if (!$community_page && !$prvgroup) { - return false; - } - - /* - * tgroup delivery - setup a second delivery chain - * prevent delivery looping - only proceed - * if the message originated elsewhere and is a top-level post - */ - if ($item['wall'] || $item['origin'] || ($item['id'] != $item['parent'])) { - return false; - } + Logger::info('Community post will be distributed', ['uri' => $item['uri'], 'uid' => $uid, 'id' => $item_id, 'uri-id' => $item['uri-id'], 'guid' => $item['guid']]); self::performActivity($item['id'], 'announce', $uid); @@ -1935,39 +1937,33 @@ class Item * Or possibly we could store the receivers that had been in the "announce" message above and use this. */ - // now change this copy of the post to a forum head message and deliver to all the tgroup members - $self = DBA::selectFirst('contact', ['id', 'name', 'url', 'thumb'], ['uid' => $uid, 'self' => true]); - if (!DBA::isResult($self)) { - return false; - } - - $owner_id = Contact::getIdForURL($self['url']); - // also reset all the privacy bits to the forum default permissions - if ($user['allow_cid'] || $user['allow_gid'] || $user['deny_cid'] || $user['deny_gid']) { + if ($owner['allow_cid'] || $owner['allow_gid'] || $owner['deny_cid'] || $owner['deny_gid']) { $private = self::PRIVATE; - } elseif (DI::pConfig()->get($user['uid'], 'system', 'unlisted')) { + } elseif (DI::pConfig()->get($owner['uid'], 'system', 'unlisted')) { $private = self::UNLISTED; } else { $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( + $owner['uid'], + $owner['allow_cid'], + $owner['allow_gid'], + $owner['deny_cid'], + $owner['deny_gid'] + )); - $forum_mode = ($prvgroup ? 2 : 1); + $forum_mode = ($owner['page-flags'] == User::PAGE_FLAGS_PRVGROUP) ? 2 : 1; - $fields = ['wall' => true, 'origin' => true, 'forum_mode' => $forum_mode, 'contact-id' => $self['id'], - 'owner-id' => $owner_id, 'private' => $private, 'psid' => $psid]; + $fields = ['wall' => true, 'origin' => true, 'forum_mode' => $forum_mode, 'contact-id' => $owner['id'], + 'owner-id' => Contact::getPublicIdByUserId($uid), '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']); + Logger::info('Community post had been distributed', ['uri' => $item['uri'], 'uid' => $uid, 'id' => $item_id, 'uri-id' => $item['uri-id'], 'guid' => $item['guid']]); return false; } @@ -2256,8 +2252,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); @@ -2303,7 +2299,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) @@ -2352,7 +2348,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; } @@ -2549,12 +2545,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')); } } @@ -2595,10 +2591,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 = ''; } @@ -2988,8 +2984,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) { @@ -3260,6 +3257,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 { @@ -3352,7 +3361,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);