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

diff --git a/include/api.php b/include/api.php
index b5d8f9cf3d..e5ca8ca787 100644
--- a/include/api.php
+++ b/include/api.php
@@ -1,34 +1,66 @@
 <?php
-/* To-Do:
- - Automatically detect if incoming data is HTML or BBCode
-*/
-	require_once("include/bbcode.php");
-	require_once("include/datetime.php");
-	require_once("include/conversation.php");
-	require_once("include/oauth.php");
-	require_once("include/html2plain.php");
-	require_once("mod/share.php");
-	require_once("include/Photo.php");
-
-	/*
-	 * Twitter-Like API
-	 *
-	 */
+/**
+ * @file include/api.php
+ * Friendica implementation of statusnet/twitter API
+ *
+ * @todo Automatically detect if incoming data is HTML or BBCode
+ */
+	require_once('include/HTTPExceptions.php');
+
+	require_once('include/bbcode.php');
+	require_once('include/datetime.php');
+	require_once('include/conversation.php');
+	require_once('include/oauth.php');
+	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');
+	require_once('include/group.php');
+	require_once('include/like.php');
+	require_once('include/NotificationsManager.php');
+
+
+	define('API_METHOD_ANY','*');
+	define('API_METHOD_GET','GET');
+	define('API_METHOD_POST','POST,PUT');
+	define('API_METHOD_DELETE','POST,DELETE');
+
+
 
 	$API = Array();
 	$called_api = Null;
 
+	/**
+	 * @brief Auth API user
+	 *
+	 * It is not sufficient to use local_user() to check whether someone is allowed to use the API,
+	 * because this will open CSRF holes (just embed an image with src=friendicasite.com/api/statuses/update?status=CSRF
+	 * into a page, and visitors will post something without noticing it).
+	 */
 	function api_user() {
-		// It is not sufficient to use local_user() to check whether someone is allowed to use the API,
-		// because this will open CSRF holes (just embed an image with src=friendicasite.com/api/statuses/update?status=CSRF
-		// into a page, and visitors will post something without noticing it).
-		// Instead, use this function.
-		if ($_SESSION["allow_api"])
+		if ($_SESSION['allow_api'])
 			return local_user();
 
 		return false;
 	}
 
+	/**
+	 * @brief Get source name from API client
+	 *
+	 * Clients can send 'source' parameter to be show in post metadata
+	 * as "sent via <source>".
+	 * Some clients doesn't send a source param, we support ones we know
+	 * (only Twidere, atm)
+	 *
+	 * @return string
+	 * 		Client source name, default to "api" if unset/unknown
+	 */
 	function api_source() {
 		if (requestdata('source'))
 			return (requestdata('source'));
@@ -42,25 +74,63 @@
 		return ("api");
 	}
 
+	/**
+	 * @brief Format date for API
+	 *
+	 * @param string $str Source date, as UTC
+	 * @return string Date in UTC formatted as "D M d H:i:s +0000 Y"
+	 */
 	function api_date($str){
 		//Wed May 23 06:01:13 +0000 2007
 		return datetime_convert('UTC', 'UTC', $str, "D M d H:i:s +0000 Y" );
 	}
 
-
-	function api_register_func($path, $func, $auth=false){
+	/**
+	 * @brief Register API endpoint
+	 *
+	 * Register a function to be the endpont for defined API path.
+	 *
+	 * @param string $path API URL path, relative to $a->get_baseurl()
+	 * @param string $func Function name to call on path request
+	 * @param bool $auth API need logged user
+	 * @param string $method
+	 * 	HTTP method reqiured to call this endpoint.
+	 * 	One of API_METHOD_ANY, API_METHOD_GET, API_METHOD_POST.
+	 *  Default to API_METHOD_ANY
+	 */
+	function api_register_func($path, $func, $auth=false, $method=API_METHOD_ANY){
 		global $API;
-		$API[$path] = array('func'=>$func, 'auth'=>$auth);
+		$API[$path] = array(
+			'func'=>$func,
+			'auth'=>$auth,
+			'method'=> $method
+		);
 
 		// Workaround for hotot
 		$path = str_replace("api/", "api/1.1/", $path);
-		$API[$path] = array('func'=>$func, 'auth'=>$auth);
+		$API[$path] = array(
+			'func'=>$func,
+			'auth'=>$auth,
+			'method'=> $method
+		);
 	}
 
 	/**
-	 * Simple HTTP Login
+	 * @brief Login API user
+	 *
+	 * Log in user via OAuth1 or Simple HTTP Auth.
+	 * Simple Auth allow username in form of <pre>user@server</pre>, ignoring server part
+	 *
+	 * @param App $a
+	 * @hook 'authenticate'
+	 * 		array $addon_auth
+	 *			'username' => username from login form
+	 *			'password' => password from login form
+	 *			'authenticated' => return status,
+	 *			'user_record' => return authenticated user record
+	 * @hook 'logged_in'
+	 * 		array $user	logged user record
 	 */
-
 	function api_login(&$a){
 		// login with oauth
 		try{
@@ -73,8 +143,7 @@
 			}
 			echo __file__.__line__.__function__."<pre>"; var_dump($consumer, $token); die();
 		}catch(Exception $e){
-			logger(__file__.__line__.__function__."\n".$e);
-			//die(__file__.__line__.__function__."<pre>".$e); die();
+			logger($e);
 		}
 
 
@@ -151,107 +220,155 @@
 			die('This api requires login');
 		}
 
-		require_once('include/security.php');
 		authenticate_success($record); $_SESSION["allow_api"] = true;
 
 		call_hooks('logged_in', $a->user);
 
 	}
 
-	/**************************
-	 *  MAIN API ENTRY POINT  *
-	 **************************/
+	/**
+	 * @brief Check HTTP method of called API
+	 *
+	 * API endpoints can define which HTTP method to accept when called.
+	 * This function check the current HTTP method agains endpoint
+	 * registered method.
+	 *
+	 * @param string $method Required methods, uppercase, separated by comma
+	 * @return bool
+	 */
+	 function api_check_method($method) {
+		if ($method=="*") return True;
+		return strpos($method, $_SERVER['REQUEST_METHOD']) !== false;
+	 }
+
+	/**
+	 * @brief Main API entry point
+	 *
+	 * Authenticate user, call registered API function, set HTTP headers
+	 *
+	 * @param App $a
+	 * @return string API call result
+	 */
 	function api_call(&$a){
 		GLOBAL $API, $called_api;
-
-		// preset
+		
 		$type="json";
-		foreach ($API as $p=>$info){
-			if (strpos($a->query_string, $p)===0){
-				$called_api= explode("/",$p);
-				//unset($_SERVER['PHP_AUTH_USER']);
-				if ($info['auth']===true && api_user()===false) {
-						api_login($a);
-				}
+		if (strpos($a->query_string, ".xml")>0) $type="xml";
+		if (strpos($a->query_string, ".json")>0) $type="json";
+		if (strpos($a->query_string, ".rss")>0) $type="rss";
+		if (strpos($a->query_string, ".atom")>0) $type="atom";
+		if (strpos($a->query_string, ".as")>0) $type="as";
+		try {
+			foreach ($API as $p=>$info){
+				if (strpos($a->query_string, $p)===0){
+					if (!api_check_method($info['method'])){
+						throw new MethodNotAllowedException();
+					}
+
+					$called_api= explode("/",$p);
+					//unset($_SERVER['PHP_AUTH_USER']);
+					if ($info['auth']===true && api_user()===false) {
+							api_login($a);
+					}
 
-				load_contact_links(api_user());
+					load_contact_links(api_user());
 
-				logger('API call for ' . $a->user['username'] . ': ' . $a->query_string);
-				logger('API parameters: ' . print_r($_REQUEST,true));
-				$type="json";
-				if (strpos($a->query_string, ".xml")>0) $type="xml";
-				if (strpos($a->query_string, ".json")>0) $type="json";
-				if (strpos($a->query_string, ".rss")>0) $type="rss";
-				if (strpos($a->query_string, ".atom")>0) $type="atom";
-				if (strpos($a->query_string, ".as")>0) $type="as";
+					logger('API call for ' . $a->user['username'] . ': ' . $a->query_string);
+					logger('API parameters: ' . print_r($_REQUEST,true));
 
-				$r = call_user_func($info['func'], $a, $type);
-				if ($r===false) return;
+					$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);
 
-				switch($type){
-					case "xml":
-						$r = mb_convert_encoding($r, "UTF-8",mb_detect_encoding($r));
-						header ("Content-Type: text/xml");
-						return '<?xml version="1.0" encoding="UTF-8"?>'."\n".$r;
-						break;
-					case "json":
-						header ("Content-Type: application/json");
-						foreach($r as $rr)
-							$json = json_encode($rr);
-							if ($_GET['callback'])
-								$json = $_GET['callback']."(".$json.")";
-							return $json;
-						break;
-					case "rss":
-						header ("Content-Type: application/rss+xml");
-						return '<?xml version="1.0" encoding="UTF-8"?>'."\n".$r;
-						break;
-					case "atom":
-						header ("Content-Type: application/atom+xml");
-						return '<?xml version="1.0" encoding="UTF-8"?>'."\n".$r;
-						break;
-					case "as":
-						//header ("Content-Type: application/json");
-						//foreach($r as $rr)
-						//	return json_encode($rr);
-						return json_encode($r);
-						break;
+					if ($r===false) {
+						// api function returned false withour throw an
+						// exception. This should not happend, throw a 500
+						throw new InternalServerErrorException();
+					}
+
+					switch($type){
+						case "xml":
+							$r = mb_convert_encoding($r, "UTF-8",mb_detect_encoding($r));
+							header ("Content-Type: text/xml");
+							return '<?xml version="1.0" encoding="UTF-8"?>'."\n".$r;
+							break;
+						case "json":
+							header ("Content-Type: application/json");
+							foreach($r as $rr)
+								$json = json_encode($rr);
+								if ($_GET['callback'])
+									$json = $_GET['callback']."(".$json.")";
+								return $json;
+							break;
+						case "rss":
+							header ("Content-Type: application/rss+xml");
+							return '<?xml version="1.0" encoding="UTF-8"?>'."\n".$r;
+							break;
+						case "atom":
+							header ("Content-Type: application/atom+xml");
+							return '<?xml version="1.0" encoding="UTF-8"?>'."\n".$r;
+							break;
+						case "as":
+							//header ("Content-Type: application/json");
+							//foreach($r as $rr)
+							//	return json_encode($rr);
+							return json_encode($r);
+							break;
 
+					}
 				}
-				//echo "<pre>"; var_dump($r); die();
 			}
+			logger('API call not implemented: '.$a->query_string);
+			throw new NotImplementedException();
+		} catch (HTTPException $e) {
+			header("HTTP/1.1 {$e->httpcode} {$e->httpdesc}");
+			return api_error($a, $type, $e);
 		}
-		header("HTTP/1.1 404 Not Found");
-		logger('API call not implemented: '.$a->query_string." - ".print_r($_REQUEST,true));
-		return(api_error($a, $type, "not implemented"));
-
 	}
 
-	function api_error(&$a, $type, $error) {
+	/**
+	 * @brief Format API error string
+	 *
+	 * @param Api $a
+	 * @param string $type Return type (xml, json, rss, as)
+	 * @param string $error Error message
+	 */
+	function api_error(&$a, $type, $e) {
+		$error = ($e->getMessage()!==""?$e->getMessage():$e->httpdesc);
 		# TODO:  https://dev.twitter.com/overview/api/response-codes
-		$r = "<status><error>".$error."</error><request>".$a->query_string."</request></status>";
+		$xmlstr = "<status><error>{$error}</error><code>{$e->httpcode} {$e->httpdesc}</code><request>{$a->query_string}</request></status>";
 		switch($type){
 			case "xml":
 				header ("Content-Type: text/xml");
-				return '<?xml version="1.0" encoding="UTF-8"?>'."\n".$r;
+				return '<?xml version="1.0" encoding="UTF-8"?>'."\n".$xmlstr;
 				break;
 			case "json":
 				header ("Content-Type: application/json");
-				return json_encode(array('error' => $error, 'request' => $a->query_string));
+				return json_encode(array(
+					'error' => $error,
+					'request' => $a->query_string,
+					'code' => $e->httpcode." ".$e->httpdesc
+				));
 				break;
 			case "rss":
 				header ("Content-Type: application/rss+xml");
-				return '<?xml version="1.0" encoding="UTF-8"?>'."\n".$r;
+				return '<?xml version="1.0" encoding="UTF-8"?>'."\n".$xmlstr;
 				break;
 			case "atom":
 				header ("Content-Type: application/atom+xml");
-				return '<?xml version="1.0" encoding="UTF-8"?>'."\n".$r;
+				return '<?xml version="1.0" encoding="UTF-8"?>'."\n".$xmlstr;
 				break;
 		}
 	}
 
 	/**
-	 * RSS extra info
+	 * @brief Set values for RSS template
+	 *
+	 * @param App $a
+	 * @param array $arr Array to be passed to template
+	 * @param array $user_info
+	 * @return array
 	 */
 	function api_rss_extra(&$a, $arr, $user_info){
 		if (is_null($user_info)) $user_info = api_get_user($a);
@@ -271,10 +388,14 @@
 
 
 	/**
-	 * Unique contact to contact url.
+	 * @brief Unique contact to contact url.
+	 *
+	 * @param int $id Contact id
+	 * @return bool|string
+	 * 		Contact url or False if contact id is unknown
 	 */
 	function api_unique_id_to_url($id){
-		$r = q("SELECT url FROM unique_contacts WHERE id=%d LIMIT 1",
+		$r = q("SELECT `url` FROM `gcontact` WHERE `id`=%d LIMIT 1",
 			intval($id));
 		if ($r)
 			return ($r[0]["url"]);
@@ -283,7 +404,11 @@
 	}
 
 	/**
-	 * Returns user info array.
+	 * @brief Get user info array.
+	 *
+	 * @param Api $a
+	 * @param int|string $contact_id Contact ID or URL
+	 * @param string $type Return type (for errors)
 	 */
 	function api_get_user(&$a, $contact_id = Null, $type = "json"){
 		global $called_api;
@@ -307,7 +432,7 @@
 			$user = dbesc(api_unique_id_to_url($contact_id));
 
 			if ($user == "")
-				die(api_error($a, $type, t("User not found.")));
+				throw new BadRequestException("User not found.");
 
 			$url = $user;
 			$extra_query = "AND `contact`.`nurl` = '%s' ";
@@ -318,7 +443,7 @@
 			$user = dbesc(api_unique_id_to_url($_GET['user_id']));
 
 			if ($user == "")
-				die(api_error($a, $type, t("User not found.")));
+				throw new BadRequestException("User not found.");
 
 			$url = $user;
 			$extra_query = "AND `contact`.`nurl` = '%s' ";
@@ -355,7 +480,8 @@
 
 		if (!$user) {
 			if (api_user()===false) {
-				api_login($a); return False;
+				api_login($a);
+				return False;
 			} else {
 				$user = $_SESSION['uid'];
 				$extra_query = "AND `contact`.`uid` = %d AND `contact`.`self` = 1 ";
@@ -379,9 +505,7 @@
 			$r = array();
 
 			if ($url != "")
-				$r = q("SELECT * FROM unique_contacts WHERE url='%s' LIMIT 1", $url);
-			elseif ($nick != "")
-				$r = q("SELECT * FROM unique_contacts WHERE nick='%s' LIMIT 1", $nick);
+				$r = q("SELECT * FROM `gcontact` WHERE `nurl`='%s' LIMIT 1", dbesc(normalise_link($url)));
 
 			if ($r) {
 				// If no nick where given, extract it from the address
@@ -393,14 +517,14 @@
 					'id_str' => (string) $r[0]["id"],
 					'name' => $r[0]["name"],
 					'screen_name' => (($r[0]['nick']) ? $r[0]['nick'] : $r[0]['name']),
-					'location' => NULL,
-					'description' => NULL,
+					'location' => $r[0]["location"],
+					'description' => $r[0]["about"],
 					'url' => $r[0]["url"],
 					'protected' => false,
 					'followers_count' => 0,
 					'friends_count' => 0,
 					'listed_count' => 0,
-					'created_at' => api_date(0),
+					'created_at' => api_date($r[0]["created"]),
 					'favourites_count' => 0,
 					'utc_offset' => 0,
 					'time_zone' => 'UTC',
@@ -411,8 +535,8 @@
 					'contributors_enabled' => false,
 					'is_translator' => false,
 					'is_translation_enabled' => false,
-					'profile_image_url' => $r[0]["avatar"],
-					'profile_image_url_https' => $r[0]["avatar"],
+					'profile_image_url' => $r[0]["photo"],
+					'profile_image_url_https' => $r[0]["photo"],
 					'following' => false,
 					'follow_request_sent' => false,
 					'notifications' => false,
@@ -422,13 +546,13 @@
 					'uid' => 0,
 					'cid' => 0,
 					'self' => 0,
-					'network' => '',
+					'network' => $r[0]["network"],
 				);
 
 				return $ret;
-			} else
-				die(api_error($a, $type, t("User not found.")));
-
+			} else {
+				throw new BadRequestException("User not found.");
+			}
 		}
 
 		if($uinfo[0]['self']) {
@@ -493,23 +617,14 @@
 			$uinfo[0]['nick'] = api_get_nick($uinfo[0]["url"]);
 		}
 
-		// Fetching unique id
-		$r = q("SELECT id FROM unique_contacts WHERE url='%s' LIMIT 1", dbesc(normalise_link($uinfo[0]['url'])));
+		$network_name = network_to_name($uinfo[0]['network'], $uinfo[0]['url']);
 
-		// If not there, then add it
-		if (count($r) == 0) {
-			q("INSERT INTO unique_contacts (url, name, nick, avatar) VALUES ('%s', '%s', '%s', '%s')",
-				dbesc(normalise_link($uinfo[0]['url'])), dbesc($uinfo[0]['name']),dbesc($uinfo[0]['nick']), dbesc($uinfo[0]['micro']));
-
-			$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']);
+		$gcontact_id  = get_gcontact_id(array("url" => $uinfo[0]['url'], "network" => $uinfo[0]['network'],
+							"photo" => $uinfo[0]['micro'], "name" => $uinfo[0]['name']));
 
 		$ret = Array(
-			'id' => intval($r[0]['id']),
-			'id_str' => (string) intval($r[0]['id']),
+			'id' => intval($gcontact_id),
+			'id_str' => (string) intval($gcontact_id),
 			'name' => (($uinfo[0]['name']) ? $uinfo[0]['name'] : $uinfo[0]['nick']),
 			'screen_name' => (($uinfo[0]['nick']) ? $uinfo[0]['nick'] : $uinfo[0]['name']),
 			'location' => ($usr) ? $usr[0]['default-location'] : $network_name,
@@ -529,7 +644,8 @@
 			'verified' => true,
 			'statusnet_blocking' => false,
 			'notifications' => false,
-			'statusnet_profile_url' => $a->get_baseurl()."/contacts/".$uinfo[0]['cid'],
+			//'statusnet_profile_url' => $a->get_baseurl()."/contacts/".$uinfo[0]['cid'],
+			'statusnet_profile_url' => $uinfo[0]['url'],
 			'uid' => intval($uinfo[0]['uid']),
 			'cid' => intval($uinfo[0]['cid']),
 			'self' => $uinfo[0]['self'],
@@ -542,33 +658,12 @@
 
 	function api_item_get_user(&$a, $item) {
 
-		$author = q("SELECT * FROM unique_contacts WHERE url='%s' LIMIT 1",
-			dbesc(normalise_link($item['author-link'])));
-
-		if (count($author) == 0) {
-			q("INSERT INTO unique_contacts (url, name, avatar) VALUES ('%s', '%s', '%s')",
-			dbesc(normalise_link($item["author-link"])), dbesc($item["author-name"]), dbesc($item["author-avatar"]));
-
-			$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"])));
-		}
+		// Make sure that there is an entry in the global contacts for author and owner
+		get_gcontact_id(array("url" => $item['author-link'], "network" => $item['network'],
+					"photo" => $item['author-avatar'], "name" => $item['author-name']));
 
-		$owner = q("SELECT id FROM unique_contacts WHERE url='%s' LIMIT 1",
-			dbesc(normalise_link($item['owner-link'])));
-
-		if (count($owner) == 0) {
-			q("INSERT INTO unique_contacts (url, name, avatar) VALUES ('%s', '%s', '%s')",
-			dbesc(normalise_link($item["owner-link"])), dbesc($item["owner-name"]), dbesc($item["owner-avatar"]));
-
-			$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"])));
-		}
+		get_gcontact_id(array("url" => $item['owner-link'], "network" => $item['network'],
+					"photo" => $item['owner-avatar'], "name" => $item['owner-name']));
 
 		// Comments in threads may appear as wall-to-wall postings.
 		// So only take the owner at the top posting.
@@ -587,6 +682,34 @@
 	}
 
 
+	/**
+	 * @brief transform $data array in xml without a template
+	 *
+	 * @param array $data
+	 * @return string xml string
+	 */
+	function api_array_to_xml($data, $ename="") {
+		$attrs="";
+		$childs="";
+		if (count($data)==1 && !is_array($data[0])) {
+			$ename = array_keys($data)[0];
+			$v = $data[$ename];
+			return "<$ename>$v</$ename>";
+		}
+		foreach($data as $k=>$v) {
+			$k=trim($k,'$');
+			if (!is_array($v)) {
+				$attrs .= sprintf('%s="%s" ', $k, $v);
+			} else {
+				if (is_numeric($k)) $k=trim($ename,'s');
+				$childs.=api_array_to_xml($v, $k);
+			}
+		}
+		$res = $childs;
+		if ($ename!="") $res = "<$ename $attrs>$res</$ename>";
+		return $res;
+	}
+
 	/**
 	 *  load api $templatename for $type and replace $data array
 	 */
@@ -599,13 +722,17 @@
 			case "rss":
 			case "xml":
 				$data = array_xmlify($data);
-				$tpl = get_markup_template("api_".$templatename."_".$type.".tpl");
-				if(! $tpl) {
-					header ("Content-Type: text/xml");
-					echo '<?xml version="1.0" encoding="UTF-8"?>'."\n".'<status><error>not implemented</error></status>';
-					killme();
+				if ($templatename==="<auto>") {
+					$ret = api_array_to_xml($data); 
+				} else {
+					$tpl = get_markup_template("api_".$templatename."_".$type.".tpl");
+					if(! $tpl) {
+						header ("Content-Type: text/xml");
+						echo '<?xml version="1.0" encoding="UTF-8"?>'."\n".'<status><error>not implemented</error></status>';
+						killme();
+					}
+					$ret = replace_macros($tpl, $data);
 				}
-				$ret = replace_macros($tpl, $data);
 				break;
 			case "json":
 				$ret = $data;
@@ -625,7 +752,7 @@
 	 * http://developer.twitter.com/doc/get/account/verify_credentials
 	 */
 	function api_account_verify_credentials(&$a, $type){
-		if (api_user()===false) return false;
+		if (api_user()===false) throw new ForbiddenException();
 
 		unset($_REQUEST["user_id"]);
 		unset($_GET["user_id"]);
@@ -676,7 +803,7 @@
 	function api_statuses_mediap(&$a, $type) {
 		if (api_user()===false) {
 			logger('api_statuses_update: no user');
-			return false;
+			throw new ForbiddenException();
 		}
 		$user_info = api_get_user($a);
 
@@ -686,10 +813,8 @@
 		$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)) {
+
 			$txt = html2bb_video($txt);
 			$config = HTMLPurifier_Config::createDefault();
 			$config->set('Cache.DefinitionImpl', null);
@@ -701,25 +826,23 @@
 		$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).
 		return api_status_show($a,$type);
 	}
-	api_register_func('api/statuses/mediap','api_statuses_mediap', true);
+	api_register_func('api/statuses/mediap','api_statuses_mediap', true, API_METHOD_POST);
 /*Waitman Gobble Mod*/
 
 
 	function api_statuses_update(&$a, $type) {
 		if (api_user()===false) {
 			logger('api_statuses_update: no user');
-			return false;
+			throw new ForbiddenException();
 		}
 
 		$user_info = api_get_user($a);
@@ -729,18 +852,13 @@
 		// 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)) {
-
 				$txt = html2bb_video($txt);
 
 				$config = HTMLPurifier_Config::createDefault();
 				$config->set('Cache.DefinitionImpl', null);
 
-
 				$purifier = new HTMLPurifier($config);
 				$txt = $purifier->purify($txt);
 
@@ -753,6 +871,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 +952,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,34 +978,32 @@
 
 		// call out normal post function
 
-		require_once('mod/item.php');
 		item_post($a);
 
 		// this should output the last post (the one we just posted).
 		return api_status_show($a,$type);
 	}
-	api_register_func('api/statuses/update','api_statuses_update', true);
-	api_register_func('api/statuses/update_with_media','api_statuses_update', true);
+	api_register_func('api/statuses/update','api_statuses_update', true, API_METHOD_POST);
+	api_register_func('api/statuses/update_with_media','api_statuses_update', true, API_METHOD_POST);
 
 
 	function api_media_upload(&$a, $type) {
 		if (api_user()===false) {
 			logger('no user');
-			return false;
+			throw new ForbiddenException();
 		}
 
 		$user_info = api_get_user($a);
 
 		if(!x($_FILES,'media')) {
 			// Output error
-			return false;
+			throw new BadRequestException("No media.");
 		}
 
-		require_once('mod/wall_upload.php');
 		$media = wall_upload_post($a, false);
 		if(!$media) {
 			// Output error
-			return false;
+			throw new InternalServerErrorException();
 		}
 
 		$returndata = array();
@@ -898,22 +1018,25 @@
 
 		return array("media" => $returndata);
 	}
-
-	api_register_func('api/media/upload','api_media_upload', true);
+	api_register_func('api/media/upload','api_media_upload', true, API_METHOD_POST);
 
 	function api_status_show(&$a, $type){
 		$user_info = api_get_user($a);
 
 		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']),
@@ -936,7 +1059,7 @@
 				$in_reply_to_status_id= intval($lastwall['parent']);
 				$in_reply_to_status_id_str = (string) intval($lastwall['parent']);
 
-				$r = q("SELECT * FROM unique_contacts WHERE `url` = '%s'", dbesc(normalise_link($lastwall['item-author'])));
+				$r = q("SELECT * FROM `gcontact` WHERE `nurl` = '%s'", dbesc(normalise_link($lastwall['item-author'])));
 				if ($r) {
 					if ($r[0]['nick'] == "")
 						$r[0]['nick'] = api_get_nick($r[0]["url"]);
@@ -959,7 +1082,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 +1119,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);
 
@@ -1056,7 +1181,7 @@
 					$in_reply_to_status_id = intval($lastwall['parent']);
 					$in_reply_to_status_id_str = (string) intval($lastwall['parent']);
 
-					$r = q("SELECT * FROM unique_contacts WHERE `url` = '%s'", dbesc(normalise_link($reply[0]['item-author'])));
+					$r = q("SELECT * FROM `gcontact` WHERE `nurl` = '%s'", dbesc(normalise_link($reply[0]['item-author'])));
 					if ($r) {
 						if ($r[0]['nick'] == "")
 							$r[0]['nick'] = api_get_nick($r[0]["url"]);
@@ -1068,7 +1193,7 @@
 				}
 			}
 
-			$converted = api_convert_item($item);
+			$converted = api_convert_item($lastwall);
 
 			$user_info['status'] = array(
 				'text' => $converted["text"],
@@ -1095,9 +1220,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']).')');
 
 		}
 
@@ -1117,9 +1242,9 @@
 		$userlist = array();
 
 		if (isset($_GET["q"])) {
-			$r = q("SELECT id FROM unique_contacts WHERE name='%s'", dbesc($_GET["q"]));
+			$r = q("SELECT id FROM `gcontact` WHERE `name`='%s'", dbesc($_GET["q"]));
 			if (!count($r))
-				$r = q("SELECT id FROM unique_contacts WHERE nick='%s'", dbesc($_GET["q"]));
+				$r = q("SELECT `id` FROM `gcontact` WHERE `nick`='%s'", dbesc($_GET["q"]));
 
 			if (count($r)) {
 				foreach ($r AS $user) {
@@ -1129,11 +1254,12 @@
 					$userlist[] = $userdata["user"];
 				}
 				$userlist = array("users" => $userlist);
-			} else
-				die(api_error($a, $type, t("User not found.")));
-		} else
-			die(api_error($a, $type, t("User not found.")));
-
+			} else {
+				throw new BadRequestException("User not found.");
+			}
+		} else {
+			throw new BadRequestException("User not found.");
+		}
 		return ($userlist);
 	}
 
@@ -1147,7 +1273,7 @@
 	 * TODO: Add reply info
 	 */
 	function api_statuses_home_timeline(&$a, $type){
-		if (api_user()===false) return false;
+		if (api_user()===false) throw new ForbiddenException();
 
 		unset($_REQUEST["user_id"]);
 		unset($_GET["user_id"]);
@@ -1230,7 +1356,7 @@
 	api_register_func('api/statuses/friends_timeline','api_statuses_home_timeline', true);
 
 	function api_statuses_public_timeline(&$a, $type){
-		if (api_user()===false) return false;
+		if (api_user()===false) throw new ForbiddenException();
 
 		$user_info = api_get_user($a);
 		// get last newtork messages
@@ -1300,7 +1426,7 @@
 	 *
 	 */
 	function api_statuses_show(&$a, $type){
-		if (api_user()===false) return false;
+		if (api_user()===false) throw new ForbiddenException();
 
 		$user_info = api_get_user($a);
 
@@ -1338,8 +1464,9 @@
 			intval($id)
 		);
 
-		if (!$r)
-			die(api_error($a, $type, t("There is no status with this id.")));
+		if (!$r) {
+			throw new BadRequestException("There is no status with this id.");
+		}
 
 		$ret = api_format_items($r,$user_info);
 
@@ -1363,7 +1490,7 @@
 	 *
 	 */
 	function api_conversation_show(&$a, $type){
-		if (api_user()===false) return false;
+		if (api_user()===false) throw new ForbiddenException();
 
 		$user_info = api_get_user($a);
 
@@ -1413,7 +1540,7 @@
 		);
 
 		if (!$r)
-			die(api_error($a, $type, t("There is no conversation with this id.")));
+			throw new BadRequestException("There is no conversation with this id.");
 
 		$ret = api_format_items($r,$user_info);
 
@@ -1429,7 +1556,7 @@
 	function api_statuses_repeat(&$a, $type){
 		global $called_api;
 
-		if (api_user()===false) return false;
+		if (api_user()===false) throw new ForbiddenException();
 
 		$user_info = api_get_user($a);
 
@@ -1453,6 +1580,8 @@
 			WHERE `item`.`visible` = 1 and `item`.`moderated` = 0 AND `item`.`deleted` = 0
 			AND `contact`.`id` = `item`.`contact-id`
 			AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+			AND NOT `item`.`private` AND `item`.`allow_cid` = '' AND `item`.`allow`.`gid` = ''
+			AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = ''
 			$sql_extra
 			AND `item`.`id`=%d",
 			intval($id)
@@ -1480,21 +1609,21 @@
 			if (!x($_REQUEST, "source"))
 				$_REQUEST["source"] = api_source();
 
-			require_once('mod/item.php');
 			item_post($a);
-		}
+		} else
+			throw new ForbiddenException();
 
 		// this should output the last post (the one we just posted).
 		$called_api = null;
 		return(api_status_show($a,$type));
 	}
-	api_register_func('api/statuses/retweet','api_statuses_repeat', true);
+	api_register_func('api/statuses/retweet','api_statuses_repeat', true, API_METHOD_POST);
 
 	/**
 	 *
 	 */
 	function api_statuses_destroy(&$a, $type){
-		if (api_user()===false) return false;
+		if (api_user()===false) throw new ForbiddenException();
 
 		$user_info = api_get_user($a);
 
@@ -1512,12 +1641,11 @@
 
 		$ret = api_statuses_show($a, $type);
 
-		require_once('include/items.php');
 		drop_item($id, false);
 
 		return($ret);
 	}
-	api_register_func('api/statuses/destroy','api_statuses_destroy', true);
+	api_register_func('api/statuses/destroy','api_statuses_destroy', true, API_METHOD_DELETE);
 
 	/**
 	 *
@@ -1525,7 +1653,7 @@
 	 *
 	 */
 	function api_statuses_mentions(&$a, $type){
-		if (api_user()===false) return false;
+		if (api_user()===false) throw new ForbiddenException();
 
 		unset($_REQUEST["user_id"]);
 		unset($_GET["user_id"]);
@@ -1604,7 +1732,7 @@
 
 
 	function api_statuses_user_timeline(&$a, $type){
-		if (api_user()===false) return false;
+		if (api_user()===false) throw new ForbiddenException();
 
 		$user_info = api_get_user($a);
 		// get last network messages
@@ -1665,7 +1793,6 @@
 
 		return  api_apply_template("timeline", $type, $data);
 	}
-
 	api_register_func('api/statuses/user_timeline','api_statuses_user_timeline', true);
 
 
@@ -1676,10 +1803,10 @@
 	 * api v1 : https://web.archive.org/web/20131019055350/https://dev.twitter.com/docs/api/1/post/favorites/create/%3Aid
 	 */
 	function api_favorites_create_destroy(&$a, $type){
-		if (api_user()===false) return false;
+		if (api_user()===false) throw new ForbiddenException();
 
-		# for versioned api.
-		# TODO: we need a better global soluton
+		// for versioned api.
+		/// @TODO We need a better global soluton
 		$action_argv_id=2;
 		if ($a->argv[1]=="1.1") $action_argv_id=3;
 
@@ -1694,7 +1821,8 @@
 		$item = q("SELECT * FROM item WHERE id=%d AND uid=%d",
 				$itemid, api_user());
 
-		if ($item===false || count($item)==0) die(api_error($a, $type, t("Invalid item.")));
+		if ($item===false || count($item)==0)
+			throw new BadRequestException("Invalid item.");
 
 		switch($action){
 			case "create":
@@ -1704,7 +1832,7 @@
 				$item[0]['starred']=0;
 				break;
 			default:
-				die(api_error($a, $type, t("Invalid action. ".$action)));
+				throw new BadRequestException("Invalid action ".$action);
 		}
 		$r = q("UPDATE item SET starred=%d WHERE id=%d AND uid=%d",
 				$item[0]['starred'], $itemid, api_user());
@@ -1712,7 +1840,8 @@
 		q("UPDATE thread SET starred=%d WHERE iid=%d AND uid=%d",
 			$item[0]['starred'], $itemid, api_user());
 
-		if ($r===false) die(api_error($a, $type, t("DB error")));
+		if ($r===false)
+			throw InternalServerErrorException("DB error");
 
 
 		$user_info = api_get_user($a);
@@ -1728,14 +1857,13 @@
 
 		return api_apply_template("status", $type, $data);
 	}
-
-	api_register_func('api/favorites/create', 'api_favorites_create_destroy', true);
-	api_register_func('api/favorites/destroy', 'api_favorites_create_destroy', true);
+	api_register_func('api/favorites/create', 'api_favorites_create_destroy', true, API_METHOD_POST);
+	api_register_func('api/favorites/destroy', 'api_favorites_create_destroy', true, API_METHOD_DELETE);
 
 	function api_favorites(&$a, $type){
 		global $called_api;
 
-		if (api_user()===false) return false;
+		if (api_user()===false) throw new ForbiddenException();
 
 		$called_api= array();
 
@@ -1793,14 +1921,12 @@
 
 		return  api_apply_template("timeline", $type, $data);
 	}
-
 	api_register_func('api/favorites','api_favorites', true);
 
 
 
 
 	function api_format_as($a, $ret, $user_info) {
-
 		$as = array();
 		$as['title'] = $a->config['sitename']." Public Timeline";
 		$items = array();
@@ -1976,7 +2102,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 +2204,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();
@@ -2121,7 +2245,7 @@
 
 		return($entities);
 	}
-	function api_format_items_embeded_images($item, $text){
+	function api_format_items_embeded_images(&$item, $text){
 		$a = get_app();
 		$text = preg_replace_callback(
 				"|data:image/([^;]+)[^=]+=*|m",
@@ -2132,6 +2256,46 @@
 		return $text;
 	}
 
+	/**
+	 * @brief return likes, dislikes and attend status for item
+	 *
+	 * @param array $item
+	 * @return array
+	 * 			likes => int count
+	 * 			dislikes => int count
+	 */
+	function api_format_items_likes(&$item) {
+		$activities = array(
+			'like' => array(),
+			'dislike' => array(),
+			'attendyes' => array(),
+			'attendno' => array(),
+			'attendmaybe' => array()
+		);
+		$items = q('SELECT * FROM item
+					WHERE uid=%d AND `thr-parent`="%s" AND visible AND NOT deleted',
+					intval($item['uid']),
+					dbesc($item['uri']));
+		foreach ($items as $i){
+			builtin_activity_puller($i, $activities);
+		}
+
+		$res = array();
+		$uri = $item['uri'];
+		foreach($activities as $k => $v) {
+			$res[$k] = (x($v,$uri)?$v[$uri]:0);
+		}
+
+		return $res;
+	}
+
+	/**
+	 * @brief format items to be returned by api
+	 *
+	 * @param array $r array of items
+	 * @param array $user_info
+	 * @param bool $filter_user filter items by $user_info
+	 */
 	function api_format_items($r,$user_info, $filter_user = false) {
 
 		$a = get_app();
@@ -2166,7 +2330,7 @@
 					intval(api_user()),
 					intval($in_reply_to_status_id));
 				if ($r) {
-					$r = q("SELECT * FROM unique_contacts WHERE `url` = '%s'", dbesc(normalise_link($r[0]['author-link'])));
+					$r = q("SELECT * FROM `gcontact` WHERE `url` = '%s'", dbesc(normalise_link($r[0]['author-link'])));
 
 					if ($r) {
 						if ($r[0]['nick'] == "")
@@ -2205,6 +2369,7 @@
 				//'entities' => NULL,
 				'statusnet_html'		=> $converted["html"],
 				'statusnet_conversation_id'	=> $item['parent'],
+				'friendica_activities' => api_format_items_likes($item),
 			);
 
 			if (count($converted["attachments"]) > 0)
@@ -2214,9 +2379,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
@@ -2252,7 +2417,6 @@
 
 
 	function api_account_rate_limit_status(&$a,$type) {
-
 		$hash = array(
 			  'reset_time_in_seconds' => strtotime('now + 1 hour'),
 			  'remaining_hits' => (string) 150,
@@ -2263,31 +2427,26 @@
 			$hash['resettime_in_seconds'] = $hash['reset_time_in_seconds'];
 
 		return api_apply_template('ratelimit', $type, array('$hash' => $hash));
-
 	}
 	api_register_func('api/account/rate_limit_status','api_account_rate_limit_status',true);
 
 	function api_help_test(&$a,$type) {
-
 		if ($type == 'xml')
 			$ok = "true";
 		else
 			$ok = "ok";
 
 		return api_apply_template('test', $type, array("$ok" => $ok));
-
 	}
 	api_register_func('api/help/test','api_help_test',false);
 
 	function api_lists(&$a,$type) {
-
 		$ret = array();
 		return array($ret);
 	}
 	api_register_func('api/lists','api_lists',true);
 
 	function api_lists_list(&$a,$type) {
-
 		$ret = array();
 		return array($ret);
 	}
@@ -2299,7 +2458,7 @@
 	 *  returns: json, xml
 	 **/
 	function api_statuses_f(&$a, $type, $qtype) {
-		if (api_user()===false) return false;
+		if (api_user()===false) throw new ForbiddenException();
 		$user_info = api_get_user($a);
 
 		if (x($_GET,'cursor') && $_GET['cursor']=='undefined'){
@@ -2392,26 +2551,28 @@
 	api_register_func('api/statusnet/config','api_statusnet_config',false);
 
 	function api_statusnet_version(&$a,$type) {
-
 		// liar
+		$fake_statusnet_version = "0.9.7";
 
 		if($type === 'xml') {
 			header("Content-type: application/xml");
-			echo '<?xml version="1.0" encoding="UTF-8"?>' . "\r\n" . '<version>0.9.7</version>' . "\r\n";
+			echo '<?xml version="1.0" encoding="UTF-8"?>' . "\r\n" . '<version>'.$fake_statusnet_version.'</version>' . "\r\n";
 			killme();
 		}
 		elseif($type === 'json') {
 			header("Content-type: application/json");
-			echo '"0.9.7"';
+			echo '"'.$fake_statusnet_version.'"';
 			killme();
 		}
 	}
+	api_register_func('api/gnusocial/version','api_statusnet_version',false);
 	api_register_func('api/statusnet/version','api_statusnet_version',false);
 
-
+	/**
+	 * @todo use api_apply_template() to return data
+	 */
 	function api_ff_ids(&$a,$type,$qtype) {
-		if(! api_user())
-			return false;
+		if(! api_user()) throw new ForbiddenException();
 
 		$user_info = api_get_user($a);
 
@@ -2425,7 +2586,7 @@
 
 		$stringify_ids = (x($_REQUEST,'stringify_ids')?$_REQUEST['stringify_ids']:false);
 
-		$r = q("SELECT unique_contacts.id FROM contact, unique_contacts WHERE contact.nurl = unique_contacts.url AND `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 $sql_extra",
+		$r = q("SELECT `gcontact`.`id` FROM `contact`, `gcontact` WHERE `contact`.`nurl` = `gcontact`.`nurl` AND `uid` = %d AND NOT `self` AND NOT `blocked` AND NOT `pending` $sql_extra",
 			intval(api_user())
 		);
 
@@ -2465,14 +2626,12 @@
 
 
 	function api_direct_messages_new(&$a, $type) {
-		if (api_user()===false) return false;
+		if (api_user()===false) throw new ForbiddenException();
 
 		if (!x($_POST, "text") OR (!x($_POST,"screen_name") AND !x($_POST,"user_id"))) return;
 
 		$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()),
@@ -2524,11 +2683,10 @@
 		return  api_apply_template("direct_messages", $type, $data);
 
 	}
-	api_register_func('api/direct_messages/new','api_direct_messages_new',true);
+	api_register_func('api/direct_messages/new','api_direct_messages_new',true, API_METHOD_POST);
 
 	function api_direct_messages_box(&$a, $type, $box) {
-		if (api_user()===false) return false;
-
+		if (api_user()===false) throw new ForbiddenException();
 
 		// params
 		$count = (x($_GET,'count')?$_GET['count']:20);
@@ -2658,36 +2816,75 @@
 
 
 	function api_fr_photos_list(&$a,$type) {
-		if (api_user()===false) return false;
-		$r = q("select distinct `resource-id` from photo where uid = %d and album != 'Contact Photos' ",
+		if (api_user()===false) throw new ForbiddenException();
+		$r = q("select `resource-id`, max(scale) as scale, album, filename, type from photo
+				where uid = %d and album != 'Contact Photos' group by `resource-id`",
 			intval(local_user())
 		);
+		$typetoext = array(
+		'image/jpeg' => 'jpg',
+		'image/png' => 'png',
+		'image/gif' => 'gif'
+		);
+		$data = array('photos'=>array());
 		if($r) {
-			$ret = array();
-			foreach($r as $rr)
-				$ret[] = $rr['resource-id'];
-			header("Content-type: application/json");
-			echo json_encode($ret);
+			foreach($r as $rr) {
+				$photo = array();
+				$photo['id'] = $rr['resource-id'];
+				$photo['album'] = $rr['album'];
+				$photo['filename'] = $rr['filename'];
+				$photo['type'] = $rr['type'];
+				$photo['thumb'] = $a->get_baseurl()."/photo/".$rr['resource-id']."-".$rr['scale'].".".$typetoext[$rr['type']];
+				$data['photos'][] = $photo;
+			}
 		}
-		killme();
+		return  api_apply_template("photos_list", $type, $data);
 	}
 
 	function api_fr_photo_detail(&$a,$type) {
-		if (api_user()===false) return false;
-		if(! $_REQUEST['photo_id']) return false;
-		$scale = ((array_key_exists('scale',$_REQUEST)) ? intval($_REQUEST['scale']) : 0);
- 		$r = q("select * from photo where uid = %d and `resource-id` = '%s' and scale = %d limit 1",
+		if (api_user()===false) throw new ForbiddenException();
+		if(!x($_REQUEST,'photo_id')) throw new BadRequestException("No photo id.");
+
+		$scale = (x($_REQUEST, 'scale') ? intval($_REQUEST['scale']) : false);
+		$scale_sql = ($scale === false ? "" : sprintf("and scale=%d",intval($scale)));
+		$data_sql = ($scale === false ? "" : "data, ");
+
+ 		$r = q("select %s `resource-id`, `created`, `edited`, `title`, `desc`, `album`, `filename`,
+						`type`, `height`, `width`, `datasize`, `profile`, min(`scale`) as minscale, max(`scale`) as maxscale
+				from photo where `uid` = %d and `resource-id` = '%s' %s group by `resource-id`",
+			$data_sql,
 			intval(local_user()),
 			dbesc($_REQUEST['photo_id']),
-			intval($scale)
+			$scale_sql
 		);
-		if($r) {
-			header("Content-type: application/json");
-			$r[0]['data'] = base64_encode($r[0]['data']);
-			echo json_encode($r[0]);
+
+		$typetoext = array(
+		'image/jpeg' => 'jpg',
+		'image/png' => 'png',
+		'image/gif' => 'gif'
+		);
+
+		if ($r) {
+			$data = array('photo' => $r[0]);
+			if ($scale !== false) {
+				$data['photo']['data'] = base64_encode($data['photo']['data']);
+			} else {
+				unset($data['photo']['datasize']); //needed only with scale param
+			}
+			$data['photo']['link'] = array();
+			for($k=intval($data['photo']['minscale']); $k<=intval($data['photo']['maxscale']); $k++) {
+				$data['photo']['link'][$k] = $a->get_baseurl()."/photo/".$data['photo']['resource-id']."-".$k.".".$typetoext[$data['photo']['type']];
+			}
+			$data['photo']['id'] = $data['photo']['resource-id'];
+			unset($data['photo']['resource-id']);
+			unset($data['photo']['minscale']);
+			unset($data['photo']['maxscale']);
+
+		} else {
+			throw new NotFoundException();
 		}
 
-		killme();
+		return api_apply_template("photo_detail", $type, $data);
 	}
 
 	api_register_func('api/friendica/photos/list', 'api_fr_photos_list', true);
@@ -2711,7 +2908,7 @@
 		$c_url = ((x($_GET,'c_url')) ? $_GET['c_url'] : '');
 
 		if ($url === '' || $c_url === '')
-			die((api_error($a, 'json', "Wrong parameters")));
+			throw new BadRequestException("Wrong parameters.");
 
 		$c_url = normalise_link($c_url);
 
@@ -2723,7 +2920,7 @@
 		);
 
 		if ((! count($r)) || ($r[0]['network'] !== NETWORK_DFRN))
-			die((api_error($a, 'json', "Unknown contact")));
+			throw new BadRequestException("Unknown contact");
 
 		$cid = $r[0]['id'];
 
@@ -2758,225 +2955,524 @@
 	api_register_func('api/friendica/remoteauth', 'api_friendica_remoteauth', true);
 
 
+	function api_share_as_retweet(&$item) {
+		$body = trim($item["body"]);
 
-function api_share_as_retweet(&$item) {
-	$body = trim($item["body"]);
+		// Skip if it isn't a pure repeated messages
+		// Does it start with a share?
+		if (strpos($body, "[share") > 0)
+			return(false);
 
-	// Skip if it isn't a pure repeated messages
-	// Does it start with a share?
-	if (strpos($body, "[share") > 0)
-		return(false);
+		// Does it end with a share?
+		if (strlen($body) > (strrpos($body, "[/share]") + 8))
+			return(false);
 
-	// Does it end with a share?
-	if (strlen($body) > (strrpos($body, "[/share]") + 8))
-		return(false);
+		$attributes = preg_replace("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism","$1",$body);
+		// Skip if there is no shared message in there
+		if ($body == $attributes)
+			return(false);
 
-	$attributes = preg_replace("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism","$1",$body);
-	// Skip if there is no shared message in there
-	if ($body == $attributes)
-		return(false);
+		$author = "";
+		preg_match("/author='(.*?)'/ism", $attributes, $matches);
+		if ($matches[1] != "")
+			$author = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8');
 
-	$author = "";
-	preg_match("/author='(.*?)'/ism", $attributes, $matches);
-	if ($matches[1] != "")
-		$author = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8');
+		preg_match('/author="(.*?)"/ism', $attributes, $matches);
+		if ($matches[1] != "")
+			$author = $matches[1];
 
-	preg_match('/author="(.*?)"/ism', $attributes, $matches);
-	if ($matches[1] != "")
-		$author = $matches[1];
+		$profile = "";
+		preg_match("/profile='(.*?)'/ism", $attributes, $matches);
+		if ($matches[1] != "")
+			$profile = $matches[1];
 
-	$profile = "";
-	preg_match("/profile='(.*?)'/ism", $attributes, $matches);
-	if ($matches[1] != "")
-		$profile = $matches[1];
+		preg_match('/profile="(.*?)"/ism', $attributes, $matches);
+		if ($matches[1] != "")
+			$profile = $matches[1];
 
-	preg_match('/profile="(.*?)"/ism', $attributes, $matches);
-	if ($matches[1] != "")
-		$profile = $matches[1];
+		$avatar = "";
+		preg_match("/avatar='(.*?)'/ism", $attributes, $matches);
+		if ($matches[1] != "")
+			$avatar = $matches[1];
 
-	$avatar = "";
-	preg_match("/avatar='(.*?)'/ism", $attributes, $matches);
-	if ($matches[1] != "")
-		$avatar = $matches[1];
+		preg_match('/avatar="(.*?)"/ism', $attributes, $matches);
+		if ($matches[1] != "")
+			$avatar = $matches[1];
 
-	preg_match('/avatar="(.*?)"/ism', $attributes, $matches);
-	if ($matches[1] != "")
-		$avatar = $matches[1];
+		$link = "";
+		preg_match("/link='(.*?)'/ism", $attributes, $matches);
+		if ($matches[1] != "")
+			$link = $matches[1];
 
-	$link = "";
-	preg_match("/link='(.*?)'/ism", $attributes, $matches);
-	if ($matches[1] != "")
-		$link = $matches[1];
+		preg_match('/link="(.*?)"/ism', $attributes, $matches);
+		if ($matches[1] != "")
+			$link = $matches[1];
 
-	preg_match('/link="(.*?)"/ism', $attributes, $matches);
-	if ($matches[1] != "")
-		$link = $matches[1];
+		$shared_body = preg_replace("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism","$2",$body);
 
-	$shared_body = preg_replace("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism","$2",$body);
+		if (($shared_body == "") OR ($profile == "") OR ($author == "") OR ($avatar == ""))
+			return(false);
 
-	if (($shared_body == "") OR ($profile == "") OR ($author == "") OR ($avatar == ""))
-		return(false);
+		$item["body"] = $shared_body;
+		$item["author-name"] = $author;
+		$item["author-link"] = $profile;
+		$item["author-avatar"] = $avatar;
+		$item["plink"] = $link;
 
-	$item["body"] = $shared_body;
-	$item["author-name"] = $author;
-	$item["author-link"] = $profile;
-	$item["author-avatar"] = $avatar;
-	$item["plink"] = $link;
+		return(true);
+
+	}
 
-	return(true);
+	function api_get_nick($profile) {
+		/* To-Do:
+		 - remove trailing junk from profile url
+		 - pump.io check has to check the website
+		*/
 
-}
+		$nick = "";
 
-function api_get_nick($profile) {
-/* To-Do:
- - remove trailing jung from profile url
- - pump.io check has to check the website
-*/
+		$r = q("SELECT `nick` FROM `gcontact` WHERE `nurl` = '%s'",
+			dbesc(normalise_link($profile)));
+		if ($r)
+			$nick = $r[0]["nick"];
 
-	$nick = "";
+		if (!$nick == "") {
+			$r = q("SELECT `nick` FROM `contact` WHERE `uid` = 0 AND `nurl` = '%s'",
+				dbesc(normalise_link($profile)));
+			if ($r)
+				$nick = $r[0]["nick"];
+		}
 
-	$friendica = preg_replace("=https?://(.*)/profile/(.*)=ism", "$2", $profile);
-	if ($friendica != $profile)
-		$nick = $friendica;
+		if (!$nick == "") {
+			$friendica = preg_replace("=https?://(.*)/profile/(.*)=ism", "$2", $profile);
+			if ($friendica != $profile)
+				$nick = $friendica;
+		}
 
-	if (!$nick == "") {
-		$diaspora = preg_replace("=https?://(.*)/u/(.*)=ism", "$2", $profile);
-		if ($diaspora != $profile)
-			$nick = $diaspora;
-	}
+		if (!$nick == "") {
+			$diaspora = preg_replace("=https?://(.*)/u/(.*)=ism", "$2", $profile);
+			if ($diaspora != $profile)
+				$nick = $diaspora;
+		}
 
-	if (!$nick == "") {
-		$twitter = preg_replace("=https?://twitter.com/(.*)=ism", "$1", $profile);
-		if ($twitter != $profile)
-			$nick = $twitter;
-	}
+		if (!$nick == "") {
+			$twitter = preg_replace("=https?://twitter.com/(.*)=ism", "$1", $profile);
+			if ($twitter != $profile)
+				$nick = $twitter;
+		}
 
 
-	if (!$nick == "") {
-		$StatusnetHost = preg_replace("=https?://(.*)/user/(.*)=ism", "$1", $profile);
-		if ($StatusnetHost != $profile) {
-			$StatusnetUser = preg_replace("=https?://(.*)/user/(.*)=ism", "$2", $profile);
-			if ($StatusnetUser != $profile) {
-				$UserData = fetch_url("http://".$StatusnetHost."/api/users/show.json?user_id=".$StatusnetUser);
-				$user = json_decode($UserData);
-				if ($user)
-					$nick = $user->screen_name;
+		if (!$nick == "") {
+			$StatusnetHost = preg_replace("=https?://(.*)/user/(.*)=ism", "$1", $profile);
+			if ($StatusnetHost != $profile) {
+				$StatusnetUser = preg_replace("=https?://(.*)/user/(.*)=ism", "$2", $profile);
+				if ($StatusnetUser != $profile) {
+					$UserData = fetch_url("http://".$StatusnetHost."/api/users/show.json?user_id=".$StatusnetUser);
+					$user = json_decode($UserData);
+					if ($user)
+						$nick = $user->screen_name;
+				}
 			}
 		}
+
+		// To-Do: look at the page if its really a pumpio site
+		//if (!$nick == "") {
+		//	$pumpio = preg_replace("=https?://(.*)/(.*)/=ism", "$2", $profile."/");
+		//	if ($pumpio != $profile)
+		//		$nick = $pumpio;
+			//      <div class="media" id="profile-block" data-profile-id="acct:kabniel@microca.st">
+
+		//}
+
+		if ($nick != "")
+			return($nick);
+
+		return(false);
 	}
 
-	// To-Do: look at the page if its really a pumpio site
-	//if (!$nick == "") {
-	//	$pumpio = preg_replace("=https?://(.*)/(.*)/=ism", "$2", $profile."/");
-	//	if ($pumpio != $profile)
-	//		$nick = $pumpio;
-		//      <div class="media" id="profile-block" data-profile-id="acct:kabniel@microca.st">
+	function api_clean_plain_items($Text) {
+		$include_entities = strtolower(x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:"false");
+
+		$Text = bb_CleanPictureLinks($Text);
+
+		$URLSearchString = "^\[\]";
 
-	//}
+		$Text = preg_replace("/([!#@])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",'$1$3',$Text);
 
-	if ($nick != "") {
-		q("UPDATE unique_contacts SET nick = '%s' WHERE url = '%s'",
-			dbesc($nick), dbesc(normalise_link($profile)));
-		return($nick);
+		if ($include_entities == "true") {
+			$Text = preg_replace("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",'[url=$1]$1[/url]',$Text);
+		}
+
+		$Text = preg_replace_callback("((.*?)\[class=(.*?)\](.*?)\[\/class\])ism","api_cleanup_share",$Text);
+		return($Text);
 	}
 
-	return(false);
-}
+	function api_cleanup_share($shared) {
+		if ($shared[2] != "type-link")
+			return($shared[0]);
+
+		if (!preg_match_all("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism",$shared[3], $bookmark))
+			return($shared[0]);
+
+		$title = "";
+		$link = "";
+
+		if (isset($bookmark[2][0]))
+			$title = $bookmark[2][0];
 
-function api_clean_plain_items($Text) {
-	$include_entities = strtolower(x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:"false");
+		if (isset($bookmark[1][0]))
+			$link = $bookmark[1][0];
 
-	$Text = bb_CleanPictureLinks($Text);
+		if (strpos($shared[1],$title) !== false)
+			$title = "";
 
-	$URLSearchString = "^\[\]";
+		if (strpos($shared[1],$link) !== false)
+			$link = "";
 
-	$Text = preg_replace("/([!#@])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",'$1$3',$Text);
+		$text = trim($shared[1]);
 
-	if ($include_entities == "true") {
-		$Text = preg_replace("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",'[url=$1]$1[/url]',$Text);
+		//if (strlen($text) < strlen($title))
+		if (($text == "") AND ($title != ""))
+			$text .= "\n\n".trim($title);
+
+		if ($link != "")
+			$text .= "\n".trim($link);
+
+		return(trim($text));
 	}
 
-	$Text = preg_replace_callback("((.*?)\[class=(.*?)\](.*?)\[\/class\])ism","api_cleanup_share",$Text);
-	return($Text);
-}
+	function api_best_nickname(&$contacts) {
+		$best_contact = array();
 
-function api_cleanup_share($shared) {
-	if ($shared[2] != "type-link")
-		return($shared[0]);
+		if (count($contact) == 0)
+			return;
 
-	if (!preg_match_all("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism",$shared[3], $bookmark))
-		return($shared[0]);
+		foreach ($contacts AS $contact)
+			if ($contact["network"] == "") {
+				$contact["network"] = "dfrn";
+				$best_contact = array($contact);
+			}
 
-	$title = "";
-	$link = "";
+		if (sizeof($best_contact) == 0)
+			foreach ($contacts AS $contact)
+				if ($contact["network"] == "dfrn")
+					$best_contact = array($contact);
+
+		if (sizeof($best_contact) == 0)
+			foreach ($contacts AS $contact)
+				if ($contact["network"] == "dspr")
+					$best_contact = array($contact);
+
+		if (sizeof($best_contact) == 0)
+			foreach ($contacts AS $contact)
+				if ($contact["network"] == "stat")
+					$best_contact = array($contact);
+
+		if (sizeof($best_contact) == 0)
+			foreach ($contacts AS $contact)
+				if ($contact["network"] == "pump")
+					$best_contact = array($contact);
+
+		if (sizeof($best_contact) == 0)
+			foreach ($contacts AS $contact)
+				if ($contact["network"] == "twit")
+					$best_contact = array($contact);
+
+		if (sizeof($best_contact) == 1)
+			$contacts = $best_contact;
+		else
+			$contacts = array($contacts[0]);
+	}
 
-	if (isset($bookmark[2][0]))
-		$title = $bookmark[2][0];
+	// return all or a specified group of the user with the containing contacts
+	function api_friendica_group_show(&$a, $type) {
+		if (api_user()===false) throw new ForbiddenException();
 
-	if (isset($bookmark[1][0]))
-		$link = $bookmark[1][0];
+		// params
+		$user_info = api_get_user($a);
+		$gid = (x($_REQUEST,'gid') ? $_REQUEST['gid'] : 0);
+		$uid = $user_info['uid'];
+
+		// get data of the specified group id or all groups if not specified
+		if ($gid != 0) {
+			$r = q("SELECT * FROM `group` WHERE `deleted` = 0 AND `uid` = %d AND `id` = %d",
+				intval($uid),
+				intval($gid));
+			// error message if specified gid is not in database
+			if (count($r) == 0)
+				throw new BadRequestException("gid not available");
+		}
+		else
+			$r = q("SELECT * FROM `group` WHERE `deleted` = 0 AND `uid` = %d",
+				intval($uid));
+
+		// loop through all groups and retrieve all members for adding data in the user array
+		foreach ($r as $rr) {
+			$members = group_get_members($rr['id']);
+			$users = array();
+			foreach ($members as $member) {
+				$user = api_get_user($a, $member['nurl']);
+				$users[] = $user;
+			}
+			$grps[] = array('name' => $rr['name'], 'gid' => $rr['id'], 'user' => $users);
+		}
+		return api_apply_template("group_show", $type, array('$groups' => $grps));
+	}
+	api_register_func('api/friendica/group_show', 'api_friendica_group_show', true);
 
-	if (strpos($shared[1],$title) !== false)
-		$title = "";
 
-	if (strpos($shared[1],$link) !== false)
-		$link = "";
+	// delete the specified group of the user
+	function api_friendica_group_delete(&$a, $type) {
+		if (api_user()===false) throw new ForbiddenException();
 
-	$text = trim($shared[1]);
+		// params
+		$user_info = api_get_user($a);
+		$gid = (x($_REQUEST,'gid') ? $_REQUEST['gid'] : 0);
+		$name = (x($_REQUEST, 'name') ? $_REQUEST['name'] : "");
+		$uid = $user_info['uid'];
+
+		// error if no gid specified
+		if ($gid == 0 || $name == "")
+			throw new BadRequestException('gid or name not specified');
+
+		// get data of the specified group id
+		$r = q("SELECT * FROM `group` WHERE `uid` = %d AND `id` = %d",
+			intval($uid),
+			intval($gid));
+		// error message if specified gid is not in database
+		if (count($r) == 0)
+			throw new BadRequestException('gid not available');
+
+		// get data of the specified group id and group name
+		$rname = q("SELECT * FROM `group` WHERE `uid` = %d AND `id` = %d AND `name` = '%s'",
+			intval($uid),
+			intval($gid),
+			dbesc($name));
+		// error message if specified gid is not in database
+		if (count($rname) == 0)
+			throw new BadRequestException('wrong group name');
+
+		// delete group
+		$ret = group_rmv($uid, $name);
+		if ($ret) {
+			// return success
+			$success = array('success' => $ret, 'gid' => $gid, 'name' => $name, 'status' => 'deleted', 'wrong users' => array());
+			return api_apply_template("group_delete", $type, array('$result' => $success));
+		}
+		else
+			throw new BadRequestException('other API error');
+	}
+	api_register_func('api/friendica/group_delete', 'api_friendica_group_delete', true, API_METHOD_DELETE);
 
-	//if (strlen($text) < strlen($title))
-	if (($text == "") AND ($title != ""))
-		$text .= "\n\n".trim($title);
 
-	if ($link != "")
-		$text .= "\n".trim($link);
+	// create the specified group with the posted array of contacts
+	function api_friendica_group_create(&$a, $type) {
+		if (api_user()===false) throw new ForbiddenException();
 
-	return(trim($text));
-}
+		// params
+		$user_info = api_get_user($a);
+		$name = (x($_REQUEST, 'name') ? $_REQUEST['name'] : "");
+		$uid = $user_info['uid'];
+		$json = json_decode($_POST['json'], true);
+		$users = $json['user'];
+
+		// error if no name specified
+		if ($name == "")
+			throw new BadRequestException('group name not specified');
+
+		// get data of the specified group name
+		$rname = q("SELECT * FROM `group` WHERE `uid` = %d AND `name` = '%s' AND `deleted` = 0",
+			intval($uid),
+			dbesc($name));
+		// error message if specified group name already exists
+		if (count($rname) != 0)
+			throw new BadRequestException('group name already exists');
+
+		// check if specified group name is a deleted group
+		$rname = q("SELECT * FROM `group` WHERE `uid` = %d AND `name` = '%s' AND `deleted` = 1",
+			intval($uid),
+			dbesc($name));
+		// error message if specified group name already exists
+		if (count($rname) != 0)
+			$reactivate_group = true;
+
+		// create group
+		$ret = group_add($uid, $name);
+		if ($ret)
+			$gid = group_byname($uid, $name);
+		else
+			throw new BadRequestException('other API error');
+
+		// add members
+		$erroraddinguser = false;
+		$errorusers = array();
+		foreach ($users as $user) {
+			$cid = $user['cid'];
+			// check if user really exists as contact
+			$contact = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d",
+				intval($cid),
+				intval($uid));
+			if (count($contact))
+				$result = group_add_member($uid, $name, $cid, $gid);
+			else {
+				$erroraddinguser = true;
+				$errorusers[] = $cid;
+			}
+		}
 
-function api_best_nickname(&$contacts) {
-	$best_contact = array();
+		// return success message incl. missing users in array
+		$status = ($erroraddinguser ? "missing user" : ($reactivate_group ? "reactivated" : "ok"));
+		$success = array('success' => true, 'gid' => $gid, 'name' => $name, 'status' => $status, 'wrong users' => $errorusers);
+		return api_apply_template("group_create", $type, array('result' => $success));
+	}
+	api_register_func('api/friendica/group_create', 'api_friendica_group_create', true, API_METHOD_POST);
 
-	if (count($contact) == 0)
-		return;
 
-	foreach ($contacts AS $contact)
-		if ($contact["network"] == "") {
-			$contact["network"] = "dfrn";
-			$best_contact = array($contact);
+	// update the specified group with the posted array of contacts
+	function api_friendica_group_update(&$a, $type) {
+		if (api_user()===false) throw new ForbiddenException();
+
+		// params
+		$user_info = api_get_user($a);
+		$uid = $user_info['uid'];
+		$gid = (x($_REQUEST, 'gid') ? $_REQUEST['gid'] : 0);
+		$name = (x($_REQUEST, 'name') ? $_REQUEST['name'] : "");
+		$json = json_decode($_POST['json'], true);
+		$users = $json['user'];
+
+		// error if no name specified
+		if ($name == "")
+			throw new BadRequestException('group name not specified');
+
+		// error if no gid specified
+		if ($gid == "")
+			throw new BadRequestException('gid not specified');
+
+		// remove members
+		$members = group_get_members($gid);
+		foreach ($members as $member) {
+			$cid = $member['id'];
+			foreach ($users as $user) {
+				$found = ($user['cid'] == $cid ? true : false);
+			}
+			if (!$found) {
+				$ret = group_rmv_member($uid, $name, $cid);
+			}
+		}
+
+		// add members
+		$erroraddinguser = false;
+		$errorusers = array();
+		foreach ($users as $user) {
+			$cid = $user['cid'];
+			// check if user really exists as contact
+			$contact = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d",
+				intval($cid),
+				intval($uid));
+			if (count($contact))
+				$result = group_add_member($uid, $name, $cid, $gid);
+			else {
+				$erroraddinguser = true;
+				$errorusers[] = $cid;
+			}
 		}
 
-	if (sizeof($best_contact) == 0)
-		foreach ($contacts AS $contact)
-			if ($contact["network"] == "dfrn")
-				$best_contact = array($contact);
+		// return success message incl. missing users in array
+		$status = ($erroraddinguser ? "missing user" : "ok");
+		$success = array('success' => true, 'gid' => $gid, 'name' => $name, 'status' => $status, 'wrong users' => $errorusers);
+		return api_apply_template("group_update", $type, array('result' => $success));
+	}
+	api_register_func('api/friendica/group_update', 'api_friendica_group_update', true, API_METHOD_POST);
 
-	if (sizeof($best_contact) == 0)
-		foreach ($contacts AS $contact)
-			if ($contact["network"] == "dspr")
-				$best_contact = array($contact);
 
-	if (sizeof($best_contact) == 0)
-		foreach ($contacts AS $contact)
-			if ($contact["network"] == "stat")
-				$best_contact = array($contact);
+	function api_friendica_activity(&$a, $type) {
+		if (api_user()===false) throw new ForbiddenException();
+		$verb = strtolower($a->argv[3]);
+		$verb = preg_replace("|\..*$|", "", $verb);
 
-	if (sizeof($best_contact) == 0)
-		foreach ($contacts AS $contact)
-			if ($contact["network"] == "pump")
-				$best_contact = array($contact);
+		$id = (x($_REQUEST, 'id') ? $_REQUEST['id'] : 0);
 
-	if (sizeof($best_contact) == 0)
-		foreach ($contacts AS $contact)
-			if ($contact["network"] == "twit")
-				$best_contact = array($contact);
+		$res = do_like($id, $verb);
 
-	if (sizeof($best_contact) == 1)
-		$contacts = $best_contact;
-	else
-		$contacts = array($contacts[0]);
-}
+		if ($res) {
+			if ($type == 'xml')
+				$ok = "true";
+			else
+				$ok = "ok";
+			return api_apply_template('test', $type, array('ok' => $ok));
+		} else {
+			throw new BadRequestException('Error adding activity');
+		}
 
+	}
+	api_register_func('api/friendica/activity/like', 'api_friendica_activity', true, API_METHOD_POST);
+	api_register_func('api/friendica/activity/dislike', 'api_friendica_activity', true, API_METHOD_POST);
+	api_register_func('api/friendica/activity/attendyes', 'api_friendica_activity', true, API_METHOD_POST);
+	api_register_func('api/friendica/activity/attendno', 'api_friendica_activity', true, API_METHOD_POST);
+	api_register_func('api/friendica/activity/attendmaybe', 'api_friendica_activity', true, API_METHOD_POST);
+	api_register_func('api/friendica/activity/unlike', 'api_friendica_activity', true, API_METHOD_POST);
+	api_register_func('api/friendica/activity/undislike', 'api_friendica_activity', true, API_METHOD_POST);
+	api_register_func('api/friendica/activity/unattendyes', 'api_friendica_activity', true, API_METHOD_POST);
+	api_register_func('api/friendica/activity/unattendno', 'api_friendica_activity', true, API_METHOD_POST);
+	api_register_func('api/friendica/activity/unattendmaybe', 'api_friendica_activity', true, API_METHOD_POST);
+
+	/**
+	 * @brief Returns notifications
+	 *
+	 * @param App $a
+	 * @param string $type Known types are 'atom', 'rss', 'xml' and 'json'
+	 * @return string
+	*/
+	function api_friendica_notification(&$a, $type) {
+		if (api_user()===false) throw new ForbiddenException();
+		if ($a->argc!==3) throw new BadRequestException("Invalid argument count");
+		$nm = new NotificationsManager();
+		
+		$notes = $nm->getAll(array(), "+seen -date", 50);
+		return api_apply_template("<auto>", $type, array('$notes' => $notes));
+	}
+	
+	/**
+	 * @brief Set notification as seen and returns associated item (if possible)
+	 *
+	 * POST request with 'id' param as notification id
+	 * 
+	 * @param App $a
+	 * @param string $type Known types are 'atom', 'rss', 'xml' and 'json'
+	 * @return string
+	 */
+	function api_friendica_notification_seen(&$a, $type){
+		if (api_user()===false) throw new ForbiddenException();
+		if ($a->argc!==4) throw new BadRequestException("Invalid argument count");
+		
+		$id = (x($_REQUEST, 'id') ? intval($_REQUEST['id']) : 0);
+		
+		$nm = new NotificationsManager();		
+		$note = $nm->getByID($id);
+		if (is_null($note)) throw new BadRequestException("Invalid argument");
+		
+		$nm->setSeen($note);
+		if ($note['otype']=='item') {
+			// would be really better with an ItemsManager and $im->getByID() :-P
+			$r = q("SELECT * FROM `item` WHERE `id`=%d AND `uid`=%d",
+				intval($note['iid']),
+				intval(local_user())
+			);
+			if ($r!==false) {
+				// we found the item, return it to the user
+				$user_info = api_get_user($a);
+				$ret = api_format_items($r,$user_info);
+				$data = array('$statuses' => $ret);
+				return api_apply_template("timeline", $type, $data);
+			}
+			// the item can't be found, but we set the note as seen, so we count this as a success
+		} 
+		return api_apply_template('<auto>', $type, array('status' => "success"));
+	}
+	
+	api_register_func('api/friendica/notification/seen', 'api_friendica_notification_seen', true, API_METHOD_POST);
+	api_register_func('api/friendica/notification', 'api_friendica_notification', true, API_METHOD_GET);
+	
 
 /*
 To.Do:
@@ -2989,7 +3485,7 @@ To.Do:
     [include_rts] => 1
     [include_reply_count] => true
     [include_descendent_reply_count] => true
-
+(?)
 
 
 Not implemented by now: