X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fapi.php;h=a5088756ae20625d8e71b0edd96af539467e5ee0;hb=d643e00d33883584ff599d92a8929351c6e48503;hp=af71e2f1cf2693eda373c45167c385106f2fdb9c;hpb=7d1bb9ecf482874155695488ba54021ce0200f5c;p=friendica.git

diff --git a/include/api.php b/include/api.php
index af71e2f1cf..a5088756ae 100644
--- a/include/api.php
+++ b/include/api.php
@@ -688,59 +688,8 @@ function api_get_user(App $a, $contact_id = null)
 
 		$usr = dba::selectFirst('user', ['default-location'], ['uid' => api_user()]);
 		$profile = dba::selectFirst('profile', ['about'], ['uid' => api_user(), 'is-default' => true]);
-
-		/// @TODO old-lost code? (twice)
-		// Counting is deactivated by now, due to performance issues
-		// count public wall messages
-		//$r = q("SELECT COUNT(*) as `count` FROM `item` WHERE `uid` = %d AND `wall`",
-		//		intval($uinfo[0]['uid'])
-		//);
-		//$countitms = $r[0]['count'];
-		$countitms = 0;
-	} else {
-		// Counting is deactivated by now, due to performance issues
-		//$r = q("SELECT count(*) as `count` FROM `item`
-		//		WHERE  `contact-id` = %d",
-		//		intval($uinfo[0]['id'])
-		//);
-		//$countitms = $r[0]['count'];
-		$countitms = 0;
-	}
-
-		/// @TODO old-lost code? (twice)
-		/*
-		// Counting is deactivated by now, due to performance issues
-		// count friends
-		$r = q("SELECT count(*) as `count` FROM `contact`
-				WHERE  `uid` = %d AND `rel` IN ( %d, %d )
-				AND `self`=0 AND NOT `blocked` AND NOT `pending` AND `hidden`=0",
-				intval($uinfo[0]['uid']),
-				intval(CONTACT_IS_SHARING),
-				intval(CONTACT_IS_FRIEND)
-		);
-		$countfriends = $r[0]['count'];
-
-		$r = q("SELECT count(*) as `count` FROM `contact`
-				WHERE  `uid` = %d AND `rel` IN ( %d, %d )
-				AND `self`=0 AND NOT `blocked` AND NOT `pending` AND `hidden`=0",
-				intval($uinfo[0]['uid']),
-				intval(CONTACT_IS_FOLLOWER),
-				intval(CONTACT_IS_FRIEND)
-		);
-		$countfollowers = $r[0]['count'];
-
-		$r = q("SELECT count(*) as `count` FROM item where starred = 1 and uid = %d and deleted = 0",
-			intval($uinfo[0]['uid'])
-		);
-		$starred = $r[0]['count'];
-
-
-		if (! $uinfo[0]['self']) {
-			$countfriends = 0;
-			$countfollowers = 0;
-			$starred = 0;
-		}
-		*/
+	}
+	$countitems = 0;
 	$countfriends = 0;
 	$countfollowers = 0;
 	$starred = 0;
@@ -790,7 +739,7 @@ function api_get_user(App $a, $contact_id = null)
 		'time_zone' => 'UTC',
 		'geo_enabled' => false,
 		'verified' => true,
-		'statuses_count' => intval($countitms),
+		'statuses_count' => intval($countitems),
 		'lang' => '',
 		'contributors_enabled' => false,
 		'is_translator' => false,
@@ -1173,18 +1122,8 @@ function api_statuses_update($type)
 		if ($throttle_day > 0) {
 			$datefrom = date(DateTimeFormat::MYSQL, time() - 24*60*60);
 
-			$r = q(
-				"SELECT COUNT(*) AS `posts_day` FROM `item` WHERE `uid`=%d AND `wall`
-				AND `created` > '%s' AND `id` = `parent`",
-				intval(api_user()),
-				dbesc($datefrom)
-			);
-
-			if (DBM::is_result($r)) {
-				$posts_day = $r[0]["posts_day"];
-			} else {
-				$posts_day = 0;
-			}
+			$condition = ["`uid` = ? AND `wall` AND `created` > ? AND `id` = `parent`", api_user(), $datefrom];
+			$posts_day = dba::count('item', $condition);
 
 			if ($posts_day > $throttle_day) {
 				logger('Daily posting limit reached for user '.api_user(), LOGGER_DEBUG);
@@ -1197,18 +1136,8 @@ function api_statuses_update($type)
 		if ($throttle_week > 0) {
 			$datefrom = date(DateTimeFormat::MYSQL, time() - 24*60*60*7);
 
-			$r = q(
-				"SELECT COUNT(*) AS `posts_week` FROM `item` WHERE `uid`=%d AND `wall`
-				AND `created` > '%s' AND `id` = `parent`",
-				intval(api_user()),
-				dbesc($datefrom)
-			);
-
-			if (DBM::is_result($r)) {
-				$posts_week = $r[0]["posts_week"];
-			} else {
-				$posts_week = 0;
-			}
+			$condition = ["`uid` = ? AND `wall` AND `created` > ? AND `id` = `parent`", api_user(), $datefrom];
+			$posts_week = dba::count('item', $condition);
 
 			if ($posts_week > $throttle_week) {
 				logger('Weekly posting limit reached for user '.api_user(), LOGGER_DEBUG);
@@ -1221,18 +1150,8 @@ function api_statuses_update($type)
 		if ($throttle_month > 0) {
 			$datefrom = date(DateTimeFormat::MYSQL, time() - 24*60*60*30);
 
-			$r = q(
-				"SELECT COUNT(*) AS `posts_month` FROM `item` WHERE `uid`=%d AND `wall`
-				AND `created` > '%s' AND `id` = `parent`",
-				intval(api_user()),
-				dbesc($datefrom)
-			);
-
-			if (DBM::is_result($r)) {
-				$posts_month = $r[0]["posts_month"];
-			} else {
-				$posts_month = 0;
-			}
+			$condition = ["`uid` = ? AND `wall` AND `created` > ? AND `id` = `parent`", api_user(), $datefrom];
+			$posts_month = dba::count('item', $condition);
 
 			if ($posts_month > $throttle_month) {
 				logger('Monthly posting limit reached for user '.api_user(), LOGGER_DEBUG);
@@ -1626,9 +1545,9 @@ function api_search($type)
 	}
 
 	$params = ['order' => ['id' => true], 'limit' => [$start, $count]];
-	$statuses = Item::select(api_user(), [], $condition, $params);
+	$statuses = Item::selectForUser(api_user(), [], $condition, $params);
 
-	$data['status'] = api_format_items(dba::inArray($statuses), $user_info);
+	$data['status'] = api_format_items(Item::inArray($statuses), $user_info);
 
 	return api_format_data("statuses", $type, $data);
 }
@@ -1693,9 +1612,9 @@ function api_statuses_home_timeline($type)
 	}
 
 	$params = ['order' => ['id' => true], 'limit' => [$start, $count]];
-	$statuses = Item::select(api_user(), [], $condition, $params);
+	$statuses = Item::selectForUser(api_user(), [], $condition, $params);
 
-	$items = dba::inArray($statuses);
+	$items = Item::inArray($statuses);
 
 	$ret = api_format_items($items, $user_info, false, $type);
 
@@ -1770,9 +1689,9 @@ function api_statuses_public_timeline($type)
 		}
 
 		$params = ['order' => ['iid' => true], 'limit' => [$start, $count]];
-		$statuses = Item::selectThread(api_user(), [], $condition, $params);
+		$statuses = Item::selectThreadForUser(api_user(), Item::DISPLAY_FIELDLIST, $condition, $params);
 
-		$r = dba::inArray($statuses);
+		$r = Item::inArray($statuses);
 	} else {
 		$condition = ["`verb` = ? AND `id` > ? AND NOT `private` AND `wall` AND NOT `user`.`hidewall` AND `item`.`origin`",
 			ACTIVITY_POST, $since_id];
@@ -1787,9 +1706,9 @@ function api_statuses_public_timeline($type)
 		}
 
 		$params = ['order' => ['id' => true], 'limit' => [$start, $count]];
-		$statuses = Item::select(api_user(), [], $condition, $params);
+		$statuses = Item::selectForUser(api_user(), [], $condition, $params);
 
-		$r = dba::inArray($statuses);
+		$r = Item::inArray($statuses);
 	}
 
 	$ret = api_format_items($r, $user_info, false, $type);
@@ -1846,9 +1765,9 @@ function api_statuses_networkpublic_timeline($type)
 	}
 
 	$params = ['order' => ['iid' => true], 'limit' => [$start, $count]];
-	$statuses = Item::selectThread(api_user(), [], $condition, $params);
+	$statuses = Item::selectThreadForUser(api_user(), Item::DISPLAY_FIELDLIST, $condition, $params);
 
-	$ret = api_format_items(dba::inArray($statuses), $user_info, false, $type);
+	$ret = api_format_items(Item::inArray($statuses), $user_info, false, $type);
 
 	$data = ['status' => $ret];
 	switch ($type) {
@@ -1917,14 +1836,14 @@ function api_statuses_show($type)
 		$params = [];
 	}
 
-	$statuses = Item::select(api_user(), [], $condition, $params);
+	$statuses = Item::selectForUser(api_user(), [], $condition, $params);
 
 	/// @TODO How about copying this to above methods which don't check $r ?
 	if (!DBM::is_result($statuses)) {
 		throw new BadRequestException("There is no status with this id.");
 	}
 
-	$ret = api_format_items(dba::inArray($statuses), $user_info, false, $type);
+	$ret = api_format_items(Item::inArray($statuses), $user_info, false, $type);
 
 	if ($conversation) {
 		$data = ['status' => $ret];
@@ -1998,13 +1917,13 @@ function api_conversation_show($type)
 	}
 
 	$params = ['order' => ['id' => true], 'limit' => [$start, $count]];
-	$statuses = Item::select(api_user(), [], $condition, $params);
+	$statuses = Item::selectForUser(api_user(), [], $condition, $params);
 
 	if (!DBM::is_result($statuses)) {
 		throw new BadRequestException("There is no status with id $id.");
 	}
 
-	$ret = api_format_items(dba::inArray($statuses), $user_info, false, $type);
+	$ret = api_format_items(Item::inArray($statuses), $user_info, false, $type);
 
 	$data = ['status' => $ret];
 	return api_format_data("statuses", $type, $data);
@@ -2048,7 +1967,7 @@ function api_statuses_repeat($type)
 	logger('API: api_statuses_repeat: '.$id);
 
 	$fields = ['body', 'author-name', 'author-link', 'author-avatar', 'guid', 'created', 'plink'];
-	$item = Item::selectFirst(api_user(), $fields, ['id' => $id, 'private' => false]);
+	$item = Item::selectFirst($fields, ['id' => $id, 'private' => false]);
 
 	if (DBM::is_result($item) && $item['body'] != "") {
 		if (strpos($item['body'], "[/share]") !== false) {
@@ -2168,9 +2087,9 @@ function api_statuses_mentions($type)
 	}
 
 	$params = ['order' => ['id' => true], 'limit' => [$start, $count]];
-	$statuses = Item::select(api_user(), [], $condition, $params);
+	$statuses = Item::selectForUser(api_user(), [], $condition, $params);
 
-	$ret = api_format_items(dba::inArray($statuses), $user_info, false, $type);
+	$ret = api_format_items(Item::inArray($statuses), $user_info, false, $type);
 
 	$data = ['status' => $ret];
 	switch ($type) {
@@ -2248,9 +2167,9 @@ function api_statuses_user_timeline($type)
 	}
 
 	$params = ['order' => ['id' => true], 'limit' => [$start, $count]];
-	$statuses = Item::select(api_user(), [], $condition, $params);
+	$statuses = Item::selectForUser(api_user(), [], $condition, $params);
 
-	$ret = api_format_items(dba::inArray($statuses), $user_info, true, $type);
+	$ret = api_format_items(Item::inArray($statuses), $user_info, true, $type);
 
 	$data = ['status' => $ret];
 	switch ($type) {
@@ -2300,7 +2219,7 @@ function api_favorites_create_destroy($type)
 		$itemid = intval($_REQUEST['id']);
 	}
 
-	$item = Item::selectFirst(api_user(), [], ['id' => $itemid, 'uid' => api_user()]);
+	$item = Item::selectFirstForUser(api_user(), [], ['id' => $itemid, 'uid' => api_user()]);
 
 	if (!DBM::is_result($item)) {
 		throw new BadRequestException("Invalid item.");
@@ -2390,9 +2309,9 @@ function api_favorites($type)
 			$condition[] = $max_id;
 		}
 
-		$statuses = Item::select(api_user(), [], $condition, $params);
+		$statuses = Item::selectForUser(api_user(), [], $condition, $params);
 
-		$ret = api_format_items(dba::inArray($statuses), $user_info, false, $type);
+		$ret = api_format_items(Item::inArray($statuses), $user_info, false, $type);
 	}
 
 	$data = ['status' => $ret];
@@ -2806,20 +2725,16 @@ function api_format_items_activities(&$item, $type = "json")
 		'attendmaybe' => [],
 	];
 
-	$items = q(
-		'SELECT * FROM `item`
-			WHERE `uid` = %d AND `thr-parent` = "%s" AND `visible` AND NOT `deleted`',
-		intval($item['uid']),
-		dbesc($item['uri'])
-	);
+	$condition = ['uid' => $item['uid'], 'thr-parent' => $item['uri']];
+	$ret = Item::selectForUser($item['uid'], ['author-id', 'verb'], $condition);
 
-	foreach ($items as $i) {
+	while ($item = Item::fetch($ret)) {
 		// not used as result should be structured like other user data
 		//builtin_activity_puller($i, $activities);
 
 		// get user data and add it to the array of the activity
-		$user = api_get_user($a, $i['author-id']);
-		switch ($i['verb']) {
+		$user = api_get_user($a, $item['author-id']);
+		switch ($item['verb']) {
 			case ACTIVITY_LIKE:
 				$activities['like'][] = $user;
 				break;
@@ -2840,6 +2755,8 @@ function api_format_items_activities(&$item, $type = "json")
 		}
 	}
 
+	dba::close($ret);
+
 	if ($type == "xml") {
 		$xml_activities = [];
 		foreach ($activities as $k => $v) {
@@ -3198,9 +3115,9 @@ function api_lists_statuses($type)
 	}
 
 	$params = ['order' => ['id' => true], 'limit' => [$start, $count]];
-	$statuses = Item::select(api_user(), [], $condition, $params);
+	$statuses = Item::selectForUser(api_user(), [], $condition, $params);
 
-	$items = api_format_items(dba::inArray($statuses), $user_info, false, $type);
+	$items = api_format_items(Item::inArray($statuses), $user_info, false, $type);
 
 	$data = ['status' => $items];
 	switch ($type) {
@@ -3700,12 +3617,9 @@ api_register_func('api/direct_messages/destroy', 'api_direct_messages_destroy',
 function api_direct_messages_box($type, $box, $verbose)
 {
 	$a = get_app();
-	$user_info = api_get_user($a);
-
-	if (api_user() === false || $user_info === false) {
+	if (api_user() === false) {
 		throw new ForbiddenException();
 	}
-
 	// params
 	$count = (x($_GET, 'count') ? $_GET['count'] : 20);
 	$page = (x($_REQUEST, 'page') ? $_REQUEST['page'] -1 : 0);
@@ -3726,6 +3640,10 @@ function api_direct_messages_box($type, $box, $verbose)
 	unset($_REQUEST["screen_name"]);
 	unset($_GET["screen_name"]);
 
+	$user_info = api_get_user($a);
+	if ($user_info === false) {
+		throw new ForbiddenException();
+	}
 	$profile_url = $user_info["url"];
 
 	// pagination
@@ -3923,16 +3841,13 @@ function api_fr_photoalbum_delete($type)
 	// function for setting the items to "deleted = 1" which ensures that comments, likes etc. are not shown anymore
 	// to the user and the contacts of the users (drop_items() performs the federation of the deletion to other networks
 	foreach ($r as $rr) {
-		$photo_item = q(
-			"SELECT `id` FROM `item` WHERE `uid` = %d AND `resource-id` = '%s' AND `type` = 'photo'",
-			intval(local_user()),
-			dbesc($rr['resource-id'])
-		);
+		$condition = ['uid' => local_user(), 'resource-id' => $rr['resource-id'], 'type' => 'photo'];
+		$photo_item = Item::selectFirstForUser(local_user(), ['id'], $condition);
 
 		if (!DBM::is_result($photo_item)) {
 			throw new InternalServerErrorException("problem with deleting items occured");
 		}
-		Item::deleteForUser(['id' => $photo_item[0]['id']], api_user());
+		Item::deleteForUser(['id' => $photo_item['id']], api_user());
 	}
 
 	// now let's delete all photos from the album
@@ -4213,18 +4128,15 @@ function api_fr_photo_delete($type)
 	// return success of deletion or error message
 	if ($result) {
 		// retrieve the id of the parent element (the photo element)
-		$photo_item = q(
-			"SELECT `id` FROM `item` WHERE `uid` = %d AND `resource-id` = '%s' AND `type` = 'photo'",
-			intval(local_user()),
-			dbesc($photo_id)
-		);
+		$condition = ['uid' => local_user(), 'resource-id' => $photo_id, 'type' => 'photo'];
+		$photo_item = Item::selectFirstForUser(local_user(), ['id'], $condition);
 
 		if (!DBM::is_result($photo_item)) {
 			throw new InternalServerErrorException("problem with deleting items occured");
 		}
 		// function for setting the items to "deleted = 1" which ensures that comments, likes etc. are not shown anymore
 		// to the user and the contacts of the users (drop_items() do all the necessary magic to avoid orphans in database and federate deletion)
-		Item::deleteForUser(['id' => $photo_item[0]['id']], api_user());
+		Item::deleteForUser(['id' => $photo_item['id']], api_user());
 
 		$answer = ['result' => 'deleted', 'message' => 'photo with id `' . $photo_id . '` has been deleted from server.'];
 		return api_format_data("photo_delete", $type, ['$result' => $answer]);
@@ -4712,21 +4624,19 @@ function prepare_photo_data($type, $scale, $photo_id)
 	}
 
 	// retrieve item element for getting activities (like, dislike etc.) related to photo
-	$item = q(
-		"SELECT * FROM `item` WHERE `uid` = %d AND `resource-id` = '%s' AND `type` = 'photo'",
-		intval(local_user()),
-		dbesc($photo_id)
-	);
-	$data['photo']['friendica_activities'] = api_format_items_activities($item[0], $type);
+	$condition = ['uid' => local_user(), 'resource-id' => $photo_id, 'type' => 'photo'];
+	$item = Item::selectFirstForUser(local_user(), ['id'], $condition);
+
+	$data['photo']['friendica_activities'] = api_format_items_activities($item, $type);
 
 	// retrieve comments on photo
 	$condition = ["`parent` = ? AND `uid` = ? AND (`verb` = ? OR `type`='photo')",
 		$item[0]['parent'], api_user(), ACTIVITY_POST];
 
-	$statuses = Item::select(api_user(), [], $condition);
+	$statuses = Item::selectForUser(api_user(), [], $condition);
 
 	// prepare output of comments
-	$commentData = api_format_items(dba::inArray($statuses), $user_info, false, $type);
+	$commentData = api_format_items(Item::inArray($statuses), $user_info, false, $type);
 	$comments = [];
 	if ($type == "xml") {
 		$k = 0;
@@ -5012,35 +4922,26 @@ function api_in_reply_to($item)
 	$in_reply_to['screen_name'] = null;
 
 	if (($item['thr-parent'] != $item['uri']) && (intval($item['parent']) != intval($item['id']))) {
-		$r = q(
-			"SELECT `id` FROM `item` WHERE `uid` = %d AND `uri` = '%s' LIMIT 1",
-			intval($item['uid']),
-			dbesc($item['thr-parent'])
-		);
-
-		if (DBM::is_result($r)) {
-			$in_reply_to['status_id'] = intval($r[0]['id']);
+		$parent = Item::selectFirst(['id'], ['uid' => $item['uid'], 'uri' => $item['thr-parent']]);
+		if (DBM::is_result($parent)) {
+			$in_reply_to['status_id'] = intval($parent['id']);
 		} else {
 			$in_reply_to['status_id'] = intval($item['parent']);
 		}
 
 		$in_reply_to['status_id_str'] = (string) intval($in_reply_to['status_id']);
 
-		$r = q(
-			"SELECT `contact`.`nick`, `contact`.`name`, `contact`.`id`, `contact`.`url` FROM `item`
-			STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`author-id`
-			WHERE `item`.`id` = %d LIMIT 1",
-			intval($in_reply_to['status_id'])
-		);
+		$fields = ['author-nick', 'author-name', 'author-id', 'author-link'];
+		$parent = Item::selectFirst($fields, ['id' => $in_reply_to['status_id']]);
 
-		if (DBM::is_result($r)) {
-			if ($r[0]['nick'] == "") {
-				$r[0]['nick'] = api_get_nick($r[0]["url"]);
+		if (DBM::is_result($parent)) {
+			if ($parent['author-nick'] == "") {
+				$parent['author-nick'] = api_get_nick($parent['author-link']);
 			}
 
-			$in_reply_to['screen_name'] = (($r[0]['nick']) ? $r[0]['nick'] : $r[0]['name']);
-			$in_reply_to['user_id'] = intval($r[0]['id']);
-			$in_reply_to['user_id_str'] = (string) intval($r[0]['id']);
+			$in_reply_to['screen_name'] = (($parent['author-nick']) ? $parent['author-nick'] : $parent['author-name']);
+			$in_reply_to['user_id'] = intval($parent['author-id']);
+			$in_reply_to['user_id_str'] = (string) intval($parent['author-id']);
 		}
 
 		// There seems to be situation, where both fields are identical:
@@ -5716,7 +5617,7 @@ function api_friendica_notification_seen($type)
 	$nm->setSeen($note);
 	if ($note['otype']=='item') {
 		// would be really better with an ItemsManager and $im->getByID() :-P
-		$item = Item::selectFirst(api_user(), [], ['id' => $note['iid'], 'uid' => api_user()]);
+		$item = Item::selectFirstForUser(api_user(), [], ['id' => $note['iid'], 'uid' => api_user()]);
 		if (DBM::is_result($$item)) {
 			// we found the item, return it to the user
 			$ret = api_format_items([$item], $user_info, false, $type);