X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fitem.php;h=72c2ed8c5d10679fef6b2ddeca31d5752f0b10cd;hb=7feeffb2458c44b9c4e0a98cdc22ac9b5e3188b9;hp=5b40a67de20b9ee2369d6b34414846d491d75652;hpb=d1a951f0acbfacf0280da38e6f0aba9b7d32eedb;p=friendica.git

diff --git a/mod/item.php b/mod/item.php
index 5b40a67de2..72c2ed8c5d 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -19,7 +19,7 @@
  *
  * This is the POST destination for most all locally posted
  * text stuff. This function handles status, wall-to-wall status,
- * local comments, and remote coments that are posted on this site
+ * local comments, and remote comments that are posted on this site
  * (as opposed to being delivered in a feed).
  * Also processed here are posts and comments coming through the
  * statusnet/twitter API.
@@ -29,6 +29,7 @@
  */
 
 use Friendica\App;
+use Friendica\Content\Conversation;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
@@ -40,27 +41,19 @@ use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Item;
 use Friendica\Model\ItemURI;
-use Friendica\Model\Photo;
 use Friendica\Model\Post;
 use Friendica\Network\HTTPException;
-use Friendica\Protocol\Activity;
 use Friendica\Util\DateTimeFormat;
 
 function item_post(App $a) {
 	$uid = DI::userSession()->getLocalUserId();
 
-	if (!DI::userSession()->isAuthenticated() || !$uid) {
+	if (!$uid) {
 		throw new HTTPException\ForbiddenException();
 	}
 
 	if (!empty($_REQUEST['dropitems'])) {
-		$arr_drop = explode(',', $_REQUEST['dropitems']);
-		foreach ($arr_drop as $item) {
-			Item::deleteForUser(['id' => $item], $uid);
-		}
-
-		$json = ['success' => 1];
-		System::jsonExit($json);
+		item_drop($uid, $_REQUEST['dropitems']);
 	}
 
 	Hook::callAll('post_local_start', $_REQUEST);
@@ -74,67 +67,107 @@ function item_post(App $a) {
 	 * after it's been previewed
 	 */
 	if (!$preview && !empty($_REQUEST['post_id_random'])) {
-		if (!empty($_SESSION['post-random']) && $_SESSION['post-random'] == $_REQUEST['post_id_random']) {
+		if (DI::session()->get('post-random') == $_REQUEST['post_id_random']) {
 			Logger::warning('duplicate post');
 			item_post_return(DI::baseUrl(), $return_path);
 		} else {
-			$_SESSION['post-random'] = $_REQUEST['post_id_random'];
+			DI::session()->set('post-random', $_REQUEST['post_id_random']);
 		}
 	}
 
-	$post_id = intval($_REQUEST['post_id'] ?? 0);
-
-	// is this an edited post?
-	if ($post_id > 0) {
-		$orig_post = Post::selectFirst(Item::ITEM_FIELDLIST, ['id' => $post_id]);
+	if (empty($_REQUEST['post_id'])) {
+		item_insert($uid, $_REQUEST, $preview, $return_path);
 	} else {
-		$orig_post = null;
+		item_edit($uid, $_REQUEST, $preview, $return_path);
 	}
+}
 
-	$emailcc = trim($_REQUEST['emailcc']  ?? '');
-
-	$post = ['uid' => $uid];
+function item_drop(int $uid, string $dropitems)
+{
+	$arr_drop = explode(',', $dropitems);
+	foreach ($arr_drop as $item) {
+		Item::deleteForUser(['id' => $item], $uid);
+	}
 
-	$post = DI::contentItem()->initializePost($post);
+	System::jsonExit(['success' => 1]);
+}
 
-	$post['edit']       = $orig_post;
-	$post['self']       = true;
-	$post['api_source'] = false;
-	$post['file']       = '';
-	$post['attach']     = '';
-	$post['inform']     = '';
-	$post['postopts']   = '';
-	$post['wall']       = $_REQUEST['wall'] ?? true;
-	$post['post-type']  = $_REQUEST['post_type'] ?? '';
-	$post['title']      = trim($_REQUEST['title'] ?? '');
-	$post['body']       = $_REQUEST['body'] ?? '';
-	$post['location']   = trim($_REQUEST['location'] ?? '');
-	$post['coord']      = trim($_REQUEST['coord'] ?? '');
-	$post['parent']     = intval($_REQUEST['parent'] ?? 0);
-	$post['pubmail']    = $_REQUEST['pubmail_enable'] ?? false;
-	$post['created']    = $_REQUEST['created_at'] ?? DateTimeFormat::utcNow();
-	$post['edited']     = $post['changed'] = $post['commented'] = $post['created'];
-	$post['app']        = '';
-
-	if ($post['parent']) {
-		if ($post['parent']) {
-			$parent_item = Post::selectFirst(Item::ITEM_FIELDLIST, ['id' => $post['parent']]);
+function item_edit(int $uid, array $request, bool $preview, string $return_path)
+{
+	$post = Post::selectFirst(Item::ITEM_FIELDLIST, ['id' => $request['post_id'], 'uid' => $uid]);
+	if (!DBA::isResult($post)) {
+		if ($return_path) {
+			DI::sysmsg()->addNotice(DI::l10n()->t('Unable to locate original post.'));
+			DI::baseUrl()->redirect($return_path);
 		}
+		throw new HTTPException\NotFoundException(DI::l10n()->t('Unable to locate original post.'));
+	}
+
+	$post['edit'] = $post;
+	$post['file'] = Post\Category::getTextByURIId($post['uri-id'], $post['uid']);
+
+	Post\Media::deleteByURIId($post['uri-id'], [Post\Media::AUDIO, Post\Media::VIDEO, Post\Media::IMAGE, Post\Media::HTML]);
+	$post = item_process($post, $request, $preview, $return_path);
+
+	$fields = [
+		'title'    => $post['title'],
+		'body'     => $post['body'],
+		'attach'   => $post['attach'],
+		'file'     => $post['file'],
+		'location' => $post['location'],
+		'coord'    => $post['coord'],
+		'edited'   => DateTimeFormat::utcNow(),
+		'changed'  => DateTimeFormat::utcNow()
+	];
+
+	$fields['body'] = Item::setHashtags($fields['body']);
+
+	$quote_uri_id = Item::getQuoteUriId($fields['body'], $post['uid']);
+	if (!empty($quote_uri_id)) {
+		$fields['quote-uri-id'] = $quote_uri_id;
+		$fields['body']         = BBCode::removeSharedData($post['body']);
+	}
+
+	Item::update($fields, ['id' => $post['id']]);
+	Item::updateDisplayCache($post['uri-id']);
+
+	if ($return_path) {
+		DI::baseUrl()->redirect($return_path);
+	}
+
+	throw new HTTPException\OKException(DI::l10n()->t('Post updated.'));
+}
 
-		// if this isn't the top-level parent of the conversation, find it
-		if (DBA::isResult($parent_item)) {
-			// The URI and the contact is taken from the direct parent which needn't to be the top parent
-			$post['thr-parent'] = $parent_item['uri'];
-			$toplevel_item = $parent_item;
+function item_insert(int $uid, array $request, bool $preview, string $return_path)
+{
+	$post = ['uid' => $uid];
+	$post = DI::contentItem()->initializePost($post);
 
+	$post['edit']      = null;
+	$post['post-type'] = $request['post_type'] ?? '';
+	$post['wall']      = $request['wall'] ?? true;
+	$post['pubmail']   = $request['pubmail_enable'] ?? false;
+	$post['created']   = $request['created_at'] ?? DateTimeFormat::utcNow();
+	$post['edited']    = $post['changed'] = $post['commented'] = $post['created'];
+	$post['app']       = '';
+	$post['inform']    = '';
+	$post['postopts']  = '';
+	$post['file']      = '';
+
+	if (!empty($request['parent'])) {
+		$parent_item = Post::selectFirst(Item::ITEM_FIELDLIST, ['id' => $request['parent']]);
+		if ($parent_item) {
+			// if this isn't the top-level parent of the conversation, find it
 			if ($parent_item['gravity'] != Item::GRAVITY_PARENT) {
-				$toplevel_item = Post::selectFirst(Item::ITEM_FIELDLIST, ['id' => $toplevel_item['parent']]);
+				$toplevel_item = Post::selectFirst(Item::ITEM_FIELDLIST, ['id' => $parent_item['parent']]);
+			} else {
+				$toplevel_item = $parent_item;
 			}
 		}
 
-		if (!DBA::isResult($toplevel_item)) {
-			DI::sysmsg()->addNotice(DI::l10n()->t('Unable to locate original post.'));
+		if (empty($toplevel_item)) {
 			if ($return_path) {
+				DI::sysmsg()->addNotice(DI::l10n()->t('Unable to locate original post.'));
 				DI::baseUrl()->redirect($return_path);
 			}
 			throw new HTTPException\NotFoundException(DI::l10n()->t('Unable to locate original post.'));
@@ -145,13 +178,11 @@ function item_post(App $a) {
 		if ($toplevel_item['uid'] == 0) {
 			$stored = Item::storeForUserByUriId($toplevel_item['uri-id'], $post['uid'], ['post-reason' => Item::PR_ACTIVITY]);
 			Logger::info('Public item stored for user', ['uri-id' => $toplevel_item['uri-id'], 'uid' => $post['uid'], 'stored' => $stored]);
-			if ($stored) {
-				$toplevel_item = Post::selectFirst(Item::ITEM_FIELDLIST, ['id' => $stored]);
-			}
 		}
 
 		$post['parent']      = $toplevel_item['id'];
 		$post['gravity']     = Item::GRAVITY_COMMENT;
+		$post['thr-parent']  = $parent_item['uri'];
 		$post['wall']        = $toplevel_item['wall'];
 	} else {
 		$parent_item         = [];
@@ -160,27 +191,57 @@ function item_post(App $a) {
 		$post['thr-parent']  = $post['uri'];
 	}
 
-	$post = DI::contentItem()->getACL($post, $parent_item, $_REQUEST);
+	$post = DI::contentItem()->getACL($post, $parent_item, $request);
 
 	$post['pubmail'] = $post['pubmail'] && !$post['private'];
 
-	if (!empty($orig_post)) {
-		$post['file'] = Post\Category::getTextByURIId($orig_post['uri-id'], $orig_post['uid']);
-	}
+	$post = item_process($post, $request, $preview, $return_path);
+
+	$post_id = Item::insert($post);
+	if (!$post_id) {
+		if ($return_path) {
+			DI::sysmsg()->addNotice(DI::l10n()->t('Item wasn\'t stored.'));
+			DI::baseUrl()->redirect($return_path);
+		}
 
-	$post = DI::contentItem()->addCategories($post, $_REQUEST['category'] ?? '');
+		throw new HTTPException\InternalServerErrorException(DI::l10n()->t('Item wasn\'t stored.'));
+	}
 
-	if (!$preview) {
-		if (Photo::setPermissionFromBody($post['body'], $post['uid'], $post['contact-id'], $post['allow_cid'], $post['allow_gid'], $post['deny_cid'], $post['deny_gid'])) {
-			$post['object-type'] = Activity\ObjectType::IMAGE;
+	$post = Post::selectFirst(Item::ITEM_FIELDLIST, ['id' => $post_id]);
+	if (!$post) {
+		Logger::error('Item couldn\'t be fetched.', ['post_id' => $post_id]);
+		if ($return_path) {
+			DI::baseUrl()->redirect($return_path);
 		}
 
-		$post = DI::contentItem()->moveAttachmentsFromBodyToAttach($post);
+		throw new HTTPException\InternalServerErrorException(DI::l10n()->t('Item couldn\'t be fetched.'));
 	}
 
+	$recipients = explode(',', $request['emailcc'] ?? '');
+
+	DI::contentItem()->postProcessPost($post, $recipients);
+
+	Logger::debug('post_complete');
+
+	item_post_return(DI::baseUrl(), $return_path);
+	// NOTREACHED
+}
+
+function item_process(array $post, array $request, bool $preview, string $return_path): array
+{
+	$post['self']       = true;
+	$post['api_source'] = false;
+	$post['attach']     = '';
+	$post['title']      = trim($request['title'] ?? '');
+	$post['body']       = $request['body'] ?? '';
+	$post['location']   = trim($request['location'] ?? '');
+	$post['coord']      = trim($request['coord'] ?? '');
+
+	$post = DI::contentItem()->addCategories($post, $request['category'] ?? '');
+
 	// Add the attachment to the body.
-	if (!empty($_REQUEST['has_attachment'])) {
-		$post['body'] .= DI::contentItem()->storeAttachmentFromRequest($_REQUEST);
+	if (!empty($request['has_attachment'])) {
+		$post['body'] .= DI::contentItem()->storeAttachmentFromRequest($request);
 	}
 
 	$post = DI::contentItem()->finalizePost($post);
@@ -190,8 +251,8 @@ function item_post(App $a) {
 			System::jsonExit(['preview' => '']);
 		}
 
-		DI::sysmsg()->addNotice(DI::l10n()->t('Empty post discarded.'));
 		if ($return_path) {
+			DI::sysmsg()->addNotice(DI::l10n()->t('Empty post discarded.'));
 			DI::baseUrl()->redirect($return_path);
 		}
 
@@ -205,6 +266,7 @@ function item_post(App $a) {
 		$post['uri-id']         = -1;
 		$post['author-network'] = Protocol::DFRN;
 		$post['author-updated'] = '';
+		$post['author-alias']   = '';
 		$post['author-gsid']    = 0;
 		$post['author-uri-id']  = ItemURI::getIdByURI($post['author-link']);
 		$post['owner-updated']  = '';
@@ -213,7 +275,7 @@ function item_post(App $a) {
 		$post['body']           = BBCode::removeSharedData(Item::setHashtags($post['body']));
 		$post['writable']       = true;
 
-		$o = DI::conversation()->create([$post], 'search', false, true);
+		$o = DI::conversation()->render([$post], Conversation::MODE_SEARCH, false, true);
 
 		System::jsonExit(['preview' => $o]);
 	}
@@ -224,8 +286,8 @@ function item_post(App $a) {
 	unset($post['self']);
 	unset($post['api_source']);
 
-	if (!empty($_REQUEST['scheduled_at'])) {
-		$scheduled_at = DateTimeFormat::convert($_REQUEST['scheduled_at'], 'UTC', $a->getTimeZone());
+	if (!empty($request['scheduled_at'])) {
+		$scheduled_at = DateTimeFormat::convert($request['scheduled_at'], 'UTC', DI::app()->getTimeZone());
 		if ($scheduled_at > DateTimeFormat::utcNow()) {
 			unset($post['created']);
 			unset($post['edited']);
@@ -245,69 +307,14 @@ function item_post(App $a) {
 		}
 
 		$json = ['cancel' => 1];
-		if (!empty($_REQUEST['jsreload'])) {
-			$json['reload'] = DI::baseUrl() . '/' . $_REQUEST['jsreload'];
+		if (!empty($request['jsreload'])) {
+			$json['reload'] = DI::baseUrl() . '/' . $request['jsreload'];
 		}
 
 		System::jsonExit($json);
 	}
 
-	if ($orig_post) {
-		$fields = [
-			'title'        => $post['title'],
-			'body'         => $post['body'],
-			'attach'       => $post['attach'],
-			'file'         => $post['file'],
-			'edited'       => DateTimeFormat::utcNow(),
-			'changed'      => DateTimeFormat::utcNow()
-		];
-
-		$fields['body'] = Item::setHashtags($fields['body']);
-
-		$quote_uri_id = Item::getQuoteUriId($fields['body'], $post['uid']);
-		if (!empty($quote_uri_id)) {
-			$fields['quote-uri-id'] = $quote_uri_id;
-			$fields['body']         = BBCode::removeSharedData($post['body']);
-		}
-
-		Item::update($fields, ['id' => $post_id]);
-		Item::updateDisplayCache($orig_post['uri-id']);
-
-		if ($return_path) {
-			DI::baseUrl()->redirect($return_path);
-		}
-
-		throw new HTTPException\OKException(DI::l10n()->t('Post updated.'));
-	}
-
-	$post_id = Item::insert($post);
-	if (!$post_id) {
-		DI::sysmsg()->addNotice(DI::l10n()->t('Item wasn\'t stored.'));
-		if ($return_path) {
-			DI::baseUrl()->redirect($return_path);
-		}
-
-		throw new HTTPException\InternalServerErrorException(DI::l10n()->t('Item wasn\'t stored.'));
-	}
-
-	$post = Post::selectFirst(Item::ITEM_FIELDLIST, ['id' => $post_id]);
-	if (!DBA::isResult($post)) {
-		Logger::error('Item couldn\'t be fetched.', ['post_id' => $post_id]);
-		if ($return_path) {
-			DI::baseUrl()->redirect($return_path);
-		}
-
-		throw new HTTPException\InternalServerErrorException(DI::l10n()->t('Item couldn\'t be fetched.'));
-	}
-
-	$recipients = explode(',', $emailcc);
-
-	DI::contentItem()->postProcessPost($post, $recipients);
-
-	Logger::debug('post_complete');
-
-	item_post_return(DI::baseUrl(), $return_path);
-	// NOTREACHED
+	return $post;
 }
 
 function item_post_return($baseurl, $return_path)
@@ -334,7 +341,7 @@ function item_content(App $a)
 
 	$args = DI::args();
 
-	if (!$args->has(3)) {
+	if (!$args->has(2)) {
 		throw new HTTPException\BadRequestException();
 	}
 
@@ -362,6 +369,38 @@ function item_content(App $a)
 
 			Contact\User::setBlocked($item['author-id'], DI::userSession()->getLocalUserId(), true);
 
+			if (DI::mode()->isAjax()) {
+				// ajax return: [<item id>, 0 (no perm) | <owner id>]
+				System::jsonExit([intval($args->get(2)), DI::userSession()->getLocalUserId()]);
+			} else {
+				item_redirect_after_action($item, $args->get(3));
+			}
+			break;
+
+		case 'ignore':
+			$item = Post::selectFirstForUser(DI::userSession()->getLocalUserId(), ['guid', 'author-id', 'parent', 'gravity'], ['id' => $args->get(2)]);
+			if (empty($item['author-id'])) {
+				throw new HTTPException\NotFoundException('Item not found');
+			}
+
+			Contact\User::setIgnored($item['author-id'], DI::userSession()->getLocalUserId(), true);
+
+			if (DI::mode()->isAjax()) {
+				// ajax return: [<item id>, 0 (no perm) | <owner id>]
+				System::jsonExit([intval($args->get(2)), DI::userSession()->getLocalUserId()]);
+			} else {
+				item_redirect_after_action($item, $args->get(3));
+			}
+			break;
+
+		case 'collapse':
+			$item = Post::selectFirstForUser(DI::userSession()->getLocalUserId(), ['guid', 'author-id', 'parent', 'gravity'], ['id' => $args->get(2)]);
+			if (empty($item['author-id'])) {
+				throw new HTTPException\NotFoundException('Item not found');
+			}
+
+			Contact\User::setCollapsed($item['author-id'], DI::userSession()->getLocalUserId(), true);
+
 			if (DI::mode()->isAjax()) {
 				// ajax return: [<item id>, 0 (no perm) | <owner id>]
 				System::jsonExit([intval($args->get(2)), DI::userSession()->getLocalUserId()]);