X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fapi.php;h=35ebaef0341994589d4c51a5437ecd05ca9c71af;hb=fc0b3d58cffce1305cb662c23b8c038b414789ca;hp=b5d8f9cf3d8c5d7407a319897bdb488e8061513a;hpb=5a1bb9866dbb09b00861688f4a78baf0391ea58f;p=friendica.git

diff --git a/include/api.php b/include/api.php
index b5d8f9cf3d..35ebaef034 100644
--- a/include/api.php
+++ b/include/api.php
@@ -9,6 +9,14 @@
 	require_once("include/html2plain.php");
 	require_once("mod/share.php");
 	require_once("include/Photo.php");
+	require_once("mod/item.php");
+	require_once('include/security.php');
+	require_once('include/contact_selectors.php');
+	require_once('include/html2bbcode.php');
+	require_once('mod/wall_upload.php');
+	require_once("mod/proxy.php");
+	require_once("include/message.php");
+
 
 	/*
 	 * Twitter-Like API
@@ -151,7 +159,6 @@
 			die('This api requires login');
 		}
 
-		require_once('include/security.php');
 		authenticate_success($record); $_SESSION["allow_api"] = true;
 
 		call_hooks('logged_in', $a->user);
@@ -185,7 +192,11 @@
 				if (strpos($a->query_string, ".atom")>0) $type="atom";
 				if (strpos($a->query_string, ".as")>0) $type="as";
 
+				$stamp =  microtime(true);
 				$r = call_user_func($info['func'], $a, $type);
+				$duration = (float)(microtime(true)-$stamp);
+				logger("API call duration: ".round($duration, 2)."\t".$a->query_string, LOGGER_DEBUG);
+
 				if ($r===false) return;
 
 				switch($type){
@@ -504,8 +515,7 @@
 			$r = q("SELECT id FROM unique_contacts WHERE url='%s' LIMIT 1", dbesc(normalise_link($uinfo[0]['url'])));
 		}
 
-		require_once('include/contact_selectors.php');
-		$network_name = network_to_name($uinfo[0]['network']);
+		$network_name = network_to_name($uinfo[0]['network'], $uinfo[0]['url']);
 
 		$ret = Array(
 			'id' => intval($r[0]['id']),
@@ -552,8 +562,10 @@
 			$author = q("SELECT id FROM unique_contacts WHERE url='%s' LIMIT 1",
 				dbesc(normalise_link($item['author-link'])));
 		} else if ($item["author-link"].$item["author-name"] != $author[0]["url"].$author[0]["name"]) {
-			q("UPDATE unique_contacts SET name = '%s', avatar = '%s' WHERE url = '%s'",
-			dbesc($item["author-name"]), dbesc($item["author-avatar"]), dbesc(normalise_link($item["author-link"])));
+			q("UPDATE unique_contacts SET name = '%s', avatar = '%s' WHERE (`name` != '%s' OR `avatar` != '%s') AND url = '%s'",
+			dbesc($item["author-name"]), dbesc($item["author-avatar"]),
+			dbesc($item["author-name"]), dbesc($item["author-avatar"]),
+			dbesc(normalise_link($item["author-link"])));
 		}
 
 		$owner = q("SELECT id FROM unique_contacts WHERE url='%s' LIMIT 1",
@@ -566,8 +578,10 @@
 			$owner = q("SELECT id FROM unique_contacts WHERE url='%s' LIMIT 1",
 				dbesc(normalise_link($item['owner-link'])));
 		} else if ($item["owner-link"].$item["owner-name"] != $owner[0]["url"].$owner[0]["name"]) {
-			q("UPDATE unique_contacts SET name = '%s', avatar = '%s' WHERE url = '%s'",
-			dbesc($item["owner-name"]), dbesc($item["owner-avatar"]), dbesc(normalise_link($item["owner-link"])));
+			q("UPDATE unique_contacts SET name = '%s', avatar = '%s' WHERE (`name` != '%s' OR `avatar` != '%s') AND url = '%s'",
+			dbesc($item["owner-name"]), dbesc($item["owner-avatar"]),
+			dbesc($item["owner-name"]), dbesc($item["owner-avatar"]),
+			dbesc(normalise_link($item["owner-link"])));
 		}
 
 		// Comments in threads may appear as wall-to-wall postings.
@@ -686,10 +700,10 @@
 		$txt = requestdata('status');
 		//$txt = urldecode(requestdata('status'));
 
-		require_once('library/HTMLPurifier.auto.php');
-		require_once('include/html2bbcode.php');
-
 		if((strpos($txt,'<') !== false) || (strpos($txt,'>') !== false)) {
+
+			require_once('library/HTMLPurifier.auto.php');
+
 			$txt = html2bb_video($txt);
 			$config = HTMLPurifier_Config::createDefault();
 			$config->set('Cache.DefinitionImpl', null);
@@ -701,12 +715,10 @@
 		$a->argv[1]=$user_info['screen_name']; //should be set to username?
 
 		$_REQUEST['hush']='yeah'; //tell wall_upload function to return img info instead of echo
-		require_once('mod/wall_upload.php');
 		$bebop = wall_upload_post($a);
 
 		//now that we have the img url in bbcode we can add it to the status and insert the wall item.
 		$_REQUEST['body']=$txt."\n\n".$bebop;
-		require_once('mod/item.php');
 		item_post($a);
 
 		// this should output the last post (the one we just posted).
@@ -729,18 +741,16 @@
 		// logger('api_post: ' . print_r($_POST,true));
 
 		if(requestdata('htmlstatus')) {
-			require_once('library/HTMLPurifier.auto.php');
-			require_once('include/html2bbcode.php');
-
 			$txt = requestdata('htmlstatus');
 			if((strpos($txt,'<') !== false) || (strpos($txt,'>') !== false)) {
 
+				require_once('library/HTMLPurifier.auto.php');
+
 				$txt = html2bb_video($txt);
 
 				$config = HTMLPurifier_Config::createDefault();
 				$config->set('Cache.DefinitionImpl', null);
 
-
 				$purifier = new HTMLPurifier($config);
 				$txt = $purifier->purify($txt);
 
@@ -753,6 +763,11 @@
 		$_REQUEST['title'] = requestdata('title');
 
 		$parent = requestdata('in_reply_to_status_id');
+
+		// Twidere sends "-1" if it is no reply ...
+		if ($parent == -1)
+			$parent = "";
+
 		if(ctype_digit($parent))
 			$_REQUEST['parent'] = $parent;
 		else
@@ -829,7 +844,6 @@
 		if(x($_FILES,'media')) {
 			// upload the image if we have one
 			$_REQUEST['hush']='yeah'; //tell wall_upload function to return img info instead of echo
-			require_once('mod/wall_upload.php');
 			$media = wall_upload_post($a);
 			if(strlen($media)>0)
 				$_REQUEST['body'] .= "\n\n".$media;
@@ -856,7 +870,6 @@
 
 		// call out normal post function
 
-		require_once('mod/item.php');
 		item_post($a);
 
 		// this should output the last post (the one we just posted).
@@ -879,7 +892,6 @@
 			return false;
 		}
 
-		require_once('mod/wall_upload.php');
 		$media = wall_upload_post($a, false);
 		if(!$media) {
 			// Output error
@@ -906,14 +918,18 @@
 
 		logger('api_status_show: user_info: '.print_r($user_info, true), LOGGER_DEBUG);
 
+		if ($type == "raw")
+			$privacy_sql = "AND `item`.`allow_cid`='' AND `item`.`allow_gid`='' AND `item`.`deny_cid`='' AND `item`.`deny_gid`=''";
+		else
+			$privacy_sql = "";
+
 		// get last public wall message
 		$lastwall = q("SELECT `item`.*, `i`.`contact-id` as `reply_uid`, `i`.`author-link` AS `item-author`
 				FROM `item`, `item` as `i`
 				WHERE `item`.`contact-id` = %d AND `item`.`uid` = %d
 					AND ((`item`.`author-link` IN ('%s', '%s')) OR (`item`.`owner-link` IN ('%s', '%s')))
 					AND `i`.`id` = `item`.`parent`
-					AND `item`.`type`!='activity'
-					AND `item`.`allow_cid`='' AND `item`.`allow_gid`='' AND `item`.`deny_cid`='' AND `item`.`deny_gid`=''
+					AND `item`.`type`!='activity' $privacy_sql
 				ORDER BY `item`.`created` DESC
 				LIMIT 1",
 				intval($user_info['cid']),
@@ -959,7 +975,7 @@
 				$in_reply_to_screen_name = NULL;
 			}
 
-			$converted = api_convert_item($item);
+			$converted = api_convert_item($lastwall);
 
 			$status_info = array(
 				'created_at' => api_date($lastwall['created']),
@@ -996,15 +1012,17 @@
 				$status_info["entities"] = $converted["entities"];
 
 			if (($lastwall['item_network'] != "") AND ($status["source"] == 'web'))
-				$status_info["source"] = network_to_name($lastwall['item_network']);
-			elseif (($lastwall['item_network'] != "") AND (network_to_name($lastwall['item_network']) != $status_info["source"]))
-				$status_info["source"] = trim($status_info["source"].' ('.network_to_name($lastwall['item_network']).')');
+				$status_info["source"] = network_to_name($lastwall['item_network'], $user_info['url']);
+			elseif (($lastwall['item_network'] != "") AND (network_to_name($lastwall['item_network'], $user_info['url']) != $status_info["source"]))
+				$status_info["source"] = trim($status_info["source"].' ('.network_to_name($lastwall['item_network'], $user_info['url']).')');
 
 			// "uid" and "self" are only needed for some internal stuff, so remove it from here
 			unset($status_info["user"]["uid"]);
 			unset($status_info["user"]["self"]);
 		}
 
+		logger('status_info: '.print_r($status_info, true), LOGGER_DEBUG);
+
 		if ($type == "raw")
 			return($status_info);
 
@@ -1068,7 +1086,7 @@
 				}
 			}
 
-			$converted = api_convert_item($item);
+			$converted = api_convert_item($lastwall);
 
 			$user_info['status'] = array(
 				'text' => $converted["text"],
@@ -1095,9 +1113,9 @@
 				$user_info["status"]["entities"] = $converted["entities"];
 
 			if (($lastwall['item_network'] != "") AND ($user_info["status"]["source"] == 'web'))
-				$user_info["status"]["source"] = network_to_name($lastwall['item_network']);
-			if (($lastwall['item_network'] != "") AND (network_to_name($lastwall['item_network']) != $user_info["status"]["source"]))
-				$user_info["status"]["source"] = trim($user_info["status"]["source"].' ('.network_to_name($lastwall['item_network']).')');
+				$user_info["status"]["source"] = network_to_name($lastwall['item_network'], $user_info['url']);
+			if (($lastwall['item_network'] != "") AND (network_to_name($lastwall['item_network'], $user_info['url']) != $user_info["status"]["source"]))
+				$user_info["status"]["source"] = trim($user_info["status"]["source"].' ('.network_to_name($lastwall['item_network'], $user_info['url']).')');
 
 		}
 
@@ -1480,7 +1498,6 @@
 			if (!x($_REQUEST, "source"))
 				$_REQUEST["source"] = api_source();
 
-			require_once('mod/item.php');
 			item_post($a);
 		}
 
@@ -1512,7 +1529,6 @@
 
 		$ret = api_statuses_show($a, $type);
 
-		require_once('include/items.php');
 		drop_item($id, false);
 
 		return($ret);
@@ -1976,7 +1992,6 @@
 		$include_entities = strtolower(x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:"false");
 
 		if ($include_entities != "true") {
-			require_once("mod/proxy.php");
 
 			preg_match_all("/\[img](.*?)\[\/img\]/ism", $bbcode, $images);
 
@@ -2079,7 +2094,6 @@
 					// If image cache is activated, then use the following sizes:
 					// thumb  (150), small (340), medium (600) and large (1024)
 					if (!get_config("system", "proxy_disabled")) {
-						require_once("mod/proxy.php");
 						$media_url = proxy_url($url);
 
 						$sizes = array();
@@ -2214,9 +2228,9 @@
 				$status["entities"] = $converted["entities"];
 
 			if (($item['item_network'] != "") AND ($status["source"] == 'web'))
-				$status["source"] = network_to_name($item['item_network']);
-			else if (($item['item_network'] != "") AND (network_to_name($item['item_network']) != $status["source"]))
-				$status["source"] = trim($status["source"].' ('.network_to_name($item['item_network']).')');
+				$status["source"] = network_to_name($item['item_network'], $user_info['url']);
+			else if (($item['item_network'] != "") AND (network_to_name($item['item_network'], $user_info['url']) != $status["source"]))
+				$status["source"] = trim($status["source"].' ('.network_to_name($item['item_network'], $user_info['url']).')');
 
 
 			// Retweets are only valid for top postings
@@ -2471,8 +2485,6 @@
 
 		$sender = api_get_user($a);
 
-		require_once("include/message.php");
-
 		if ($_POST['screen_name']) {
 			$r = q("SELECT `id`, `nurl`, `network` FROM `contact` WHERE `uid`=%d AND `nick`='%s'",
 					intval(api_user()),
@@ -2875,8 +2887,8 @@ function api_get_nick($profile) {
 	//}
 
 	if ($nick != "") {
-		q("UPDATE unique_contacts SET nick = '%s' WHERE url = '%s'",
-			dbesc($nick), dbesc(normalise_link($profile)));
+		q("UPDATE unique_contacts SET nick = '%s' WHERE `nick` != '%s' AND url = '%s'",
+			dbesc($nick), dbesc($nick), dbesc(normalise_link($profile)));
 		return($nick);
 	}