X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fitem.php;h=498cf27132a5a70bf5c1ed4f44f58dc1ad2e5bf3;hb=4ba28e019926b43b7f7eee59885b4baf9e7173e9;hp=7c11d7311a125c393b19530aa1d5a83124084d8a;hpb=abcbbd2ec1247e4d144ac6500b383dafebe2f47d;p=friendica.git diff --git a/mod/item.php b/mod/item.php index 7c11d7311a..498cf27132 100644 --- a/mod/item.php +++ b/mod/item.php @@ -1,6 +1,6 @@ local_user(), 'profile_uid' => $profile_uid, 'toplevel_item_id' => $toplevel_item_id, 'network' => $toplevel_item['network']]); notice(DI::l10n()->t('Permission denied.')); if ($return_path) { DI::baseUrl()->redirect($return_path); @@ -217,12 +216,16 @@ function item_post(App $a) { $attachment_img_width = $_REQUEST['attachment_img_width'] ?? 0; $attachment_img_height = $_REQUEST['attachment_img_height'] ?? 0; - $attachment = [ - 'type' => $attachment_type, - 'title' => $attachment_title, - 'text' => $attachment_text, - 'url' => $attachment_url, - ]; + + // Fetch the basic attachment data + $attachment = ParseUrl::getSiteinfoCached($attachment_url); + unset($attachment['keywords']); + + // Overwrite the basic data with possible changes from the frontend + $attachment['type'] = $attachment_type; + $attachment['title'] = $attachment_title; + $attachment['text'] = $attachment_text; + $attachment['url'] = $attachment_url; if (!empty($attachment_img_src)) { $attachment['images'] = [ @@ -232,6 +235,8 @@ function item_post(App $a) { 'height' => $attachment_img_height ] ]; + } else { + unset($attachment['images']); } $att_bbcode = "\n" . PageInfo::getFooterFromData($attachment); @@ -343,7 +348,8 @@ function item_post(App $a) { $filedas = FileTag::fileToArray($categories); } - $categories = FileTag::listToFile(trim($_REQUEST['category'] ?? ''), 'category'); + $list_array = explode(',', trim($_REQUEST['category'] ?? '')); + $categories = FileTag::arrayToFile($list_array, 'category'); if (!empty($filedas) && is_array($filedas)) { // append the fileas stuff to the new categories list @@ -374,73 +380,34 @@ function item_post(App $a) { $contact_record = DBA::selectFirst('contact', [], ['uid' => $profile_uid, 'self' => true]) ?: []; } - // Look for any tags and linkify them - $inform = ''; - $private_forum = false; - $private_id = null; - $only_to_forum = false; - $forum_contact = []; - - $body = BBCode::performWithEscapedTags($body, ['noparse', 'pre', 'code', 'img'], function ($body) use ($profile_uid, $network, $str_contact_allow, &$inform, &$private_forum, &$private_id, &$only_to_forum, &$forum_contact) { - $tags = BBCode::getTags($body); - - $tagged = []; - - foreach ($tags as $tag) { - $tag_type = substr($tag, 0, 1); - - if ($tag_type == Tag::TAG_CHARACTER[Tag::HASHTAG]) { - continue; - } - - /* If we already tagged 'Robert Johnson', don't try and tag 'Robert'. - * Robert Johnson should be first in the $tags array - */ - foreach ($tagged as $nextTag) { - if (stristr($nextTag, $tag . ' ')) { - continue 2; - } - } - - $success = ItemHelper::replaceTag($body, $inform, local_user() ? local_user() : $profile_uid, $tag, $network); - if ($success['replaced']) { - $tagged[] = $tag; - } - // When the forum is private or the forum is addressed with a "!" make the post private - if (!empty($success['contact']['prv']) || ($tag_type == Tag::TAG_CHARACTER[Tag::EXCLUSIVE_MENTION])) { - $private_forum = $success['contact']['prv']; - $only_to_forum = ($tag_type == Tag::TAG_CHARACTER[Tag::EXCLUSIVE_MENTION]); - $private_id = $success['contact']['id']; - $forum_contact = $success['contact']; - } elseif (!empty($success['contact']['forum']) && ($str_contact_allow == '<' . $success['contact']['id'] . '>')) { - $private_forum = false; - $only_to_forum = true; - $private_id = $success['contact']['id']; - $forum_contact = $success['contact']; - } - } - - return $body; - }); - - $original_contact_id = $contact_id; + // Personal notes must never be altered to a forum post. + if ($posttype != Item::PT_PERSONAL_NOTE) { + // Look for any tags and linkify them + $item = [ + 'uid' => local_user() ? local_user() : $profile_uid, + 'gravity' => $toplevel_item_id ? GRAVITY_COMMENT : GRAVITY_PARENT, + 'network' => $network, + 'body' => $body, + 'postopts' => $postopts, + 'private' => $private, + 'allow_cid' => $str_contact_allow, + 'allow_gid' => $str_group_allow, + 'deny_cid' => $str_contact_deny, + 'deny_gid' => $str_group_deny, + ]; - if (!$toplevel_item_id && !empty($forum_contact) && ($private_forum || $only_to_forum)) { - // we tagged a forum in a top level post. Now we change the post - $private = $private_forum; + $item = DI::contentItem()->expandTags($item); - $str_group_allow = ''; - $str_contact_deny = ''; - $str_group_deny = ''; - if ($private_forum) { - $str_contact_allow = '<' . $private_id . '>'; - } else { - $str_contact_allow = ''; - } - $contact_id = $private_id; - $contact_record = $forum_contact; - $_REQUEST['origin'] = false; - $wall = 0; + $body = $item['body']; + $inform = $item['inform']; + $postopts = $item['postopts']; + $private = $item['private']; + $str_contact_allow = $item['allow_cid']; + $str_group_allow = $item['allow_gid']; + $str_contact_deny = $item['deny_cid']; + $str_group_deny = $item['deny_gid']; + } else { + $inform = ''; } /* @@ -455,7 +422,7 @@ function item_post(App $a) { $match = null; - if (!$preview && Photo::setPermissionFromBody($body, $uid, $original_contact_id, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny)) { + if (!$preview && Photo::setPermissionFromBody($body, $uid, $contact_id, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny)) { $objecttype = Activity\ObjectType::IMAGE; } @@ -470,7 +437,7 @@ function item_post(App $a) { if (count($attaches)) { foreach ($attaches as $attach) { // Ensure to only modify attachments that you own - $srch = '<' . intval($original_contact_id) . '>'; + $srch = '<' . intval($contact_id) . '>'; $condition = ['allow_cid' => $srch, 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '', 'id' => $attach]; @@ -574,11 +541,11 @@ function item_post(App $a) { $datarray['author-link'] = $author['url']; $datarray['author-avatar'] = $author['thumb']; $datarray['author-id'] = Contact::getIdForURL($datarray['author-link']); - $datarray['created'] = DateTimeFormat::utcNow(); - $datarray['edited'] = DateTimeFormat::utcNow(); - $datarray['commented'] = DateTimeFormat::utcNow(); + $datarray['created'] = empty($_REQUEST['created_at']) ? DateTimeFormat::utcNow() : $_REQUEST['created_at']; + $datarray['edited'] = $datarray['created']; + $datarray['commented'] = $datarray['created']; + $datarray['changed'] = $datarray['created']; $datarray['received'] = DateTimeFormat::utcNow(); - $datarray['changed'] = DateTimeFormat::utcNow(); $datarray['extid'] = $extid; $datarray['guid'] = $guid; $datarray['uri'] = $uri; @@ -606,6 +573,8 @@ function item_post(App $a) { $datarray['origin'] = $origin; $datarray['object'] = $object; + $datarray['attachments'] = $_REQUEST['attachments'] ?? []; + /* * These fields are for the convenience of addons... * 'self' if true indicates the owner is posting on their own wall @@ -652,14 +621,34 @@ function item_post(App $a) { $datarray["id"] = -1; $datarray["uri-id"] = -1; $datarray["author-network"] = Protocol::DFRN; + $datarray["author-updated"] = ''; + $datarray["author-gsid"] = 0; + $datarray["owner-updated"] = ''; - $o = conversation($a, [array_merge($contact_record, $datarray)], 'search', false, true); + $o = DI::conversation()->create([array_merge($contact_record, $datarray)], 'search', false, true); System::jsonExit(['preview' => $o]); } Hook::callAll('post_local',$datarray); + if (!empty($_REQUEST['scheduled_at'])) { + $scheduled_at = DateTimeFormat::convert($_REQUEST['scheduled_at'], 'UTC', $a->getTimeZone()); + if ($scheduled_at > DateTimeFormat::utcNow()) { + unset($datarray['created']); + unset($datarray['edited']); + unset($datarray['commented']); + unset($datarray['received']); + unset($datarray['changed']); + unset($datarray['edit']); + unset($datarray['self']); + unset($datarray['api_source']); + + Post\Delayed::add($datarray['uri'], $datarray, PRIORITY_HIGH, Post\Delayed::PREPARED_NO_HOOK, $scheduled_at); + item_post_return(DI::baseUrl(), $api_source, $return_path); + } + } + if (!empty($datarray['cancel'])) { Logger::info('mod_item: post cancelled by addon.'); if ($return_path) { @@ -674,6 +663,8 @@ function item_post(App $a) { System::jsonExit($json); } + $datarray['uri-id'] = ItemURI::getIdByURI($datarray['uri']); + if ($orig_post) { // Fill the cache field // This could be done in Item::update as well - but we have to check for the existance of some fields. @@ -702,13 +693,6 @@ function item_post(App $a) { unset($datarray['self']); unset($datarray['api_source']); - if ($origin) { - $signed = Diaspora::createCommentSignature($uid, $datarray); - if (!empty($signed)) { - $datarray['diaspora_signed_text'] = json_encode($signed); - } - } - $post_id = Item::insert($datarray); if (!$post_id) { @@ -740,7 +724,7 @@ function item_post(App $a) { // These notifications are sent if someone else is commenting other your wall if ($contact_record != $author) { if ($toplevel_item_id) { - notification([ + DI::notify()->createFromArray([ 'type' => Notification\Type::COMMENT, 'otype' => Notification\ObjectType::ITEM, 'verb' => Activity::POST, @@ -750,7 +734,7 @@ function item_post(App $a) { 'link' => DI::baseUrl() . '/display/' . urlencode($datarray['guid']), ]); } elseif (empty($forum_contact)) { - notification([ + DI::notify()->createFromArray([ 'type' => Notification\Type::WALL, 'otype' => Notification\ObjectType::ITEM, 'verb' => Activity::POST, @@ -778,12 +762,6 @@ function item_post(App $a) { } } - // When we are doing some forum posting via ! we have to start the notifier manually. - // These kind of posts don't initiate the notifier call in the item class. - if ($only_to_forum) { - Worker::add(['priority' => PRIORITY_HIGH, 'dont_fork' => false], "Notifier", Delivery::POST, (int)$datarray['uri-id'], (int)$datarray['uid']); - } - Logger::info('post_complete'); if ($api_source) { @@ -895,6 +873,7 @@ function drop_item(int $id, string $return = '') item_redirect_after_action($item, $return); } else { + Logger::notice('Permission denied.', ['local' => local_user(), 'uid' => $item['uid'], 'cid' => $contact_id]); notice(DI::l10n()->t('Permission denied.')); DI::baseUrl()->redirect('display/' . $item['guid']); //NOTREACHED