]> git.mxchange.org Git - friendica.git/blobdiff - include/api.php
Test fix: Add expected author-network field to api_get_item() result
[friendica.git] / include / api.php
index 329b49f609c474554701e87c9a359bd67aafb79a..841ed1a7192a633e8ff587114141b84548e5f1fb 100644 (file)
@@ -326,69 +326,7 @@ function api_call(App $a)
 
                                Logger::info(API_LOG_PREFIX . 'username {username}', ['module' => 'api', 'action' => 'call', 'username' => $a->user['username'], 'duration' => round($duration, 2)]);
 
-                               if (Config::get("system", "profiler")) {
-                                       $duration = microtime(true)-$a->performance["start"];
-
-                                       /// @TODO round() really everywhere?
-                                       Logger::debug(
-                                               API_LOG_PREFIX . 'performance',
-                                               [
-                                                       'module' => 'api',
-                                                       'action' => 'call',
-                                                       'database_read' => round($a->performance["database"] - $a->performance["database_write"], 3),
-                                                       'database_write' => round($a->performance["database_write"], 3),
-                                                       'cache_read' => round($a->performance["cache"], 3),
-                                                       'cache_write' => round($a->performance["cache_write"], 3),
-                                                       'network_io' => round($a->performance["network"], 2),
-                                                       'file_io' => round($a->performance["file"], 2),
-                                                       'other_io' => round($duration - ($a->performance["database"]
-                                                                       + $a->performance["cache"] + $a->performance["cache_write"]
-                                                                       + $a->performance["network"] + $a->performance["file"]), 2),
-                                                       'total' => round($duration, 2)
-                                               ]
-                                       );
-
-                                       if (Config::get("rendertime", "callstack")) {
-                                               $o = "Database Read:\n";
-                                               foreach ($a->callstack["database"] as $func => $time) {
-                                                       $time = round($time, 3);
-                                                       if ($time > 0) {
-                                                               $o .= $func . ": " . $time . "\n";
-                                                       }
-                                               }
-                                               $o .= "\nDatabase Write:\n";
-                                               foreach ($a->callstack["database_write"] as $func => $time) {
-                                                       $time = round($time, 3);
-                                                       if ($time > 0) {
-                                                               $o .= $func . ": " . $time . "\n";
-                                                       }
-                                               }
-
-                                               $o = "Cache Read:\n";
-                                               foreach ($a->callstack["cache"] as $func => $time) {
-                                                       $time = round($time, 3);
-                                                       if ($time > 0) {
-                                                               $o .= $func . ": " . $time . "\n";
-                                                       }
-                                               }
-                                               $o .= "\nCache Write:\n";
-                                               foreach ($a->callstack["cache_write"] as $func => $time) {
-                                                       $time = round($time, 3);
-                                                       if ($time > 0) {
-                                                               $o .= $func . ": " . $time . "\n";
-                                                       }
-                                               }
-
-                                               $o .= "\nNetwork:\n";
-                                               foreach ($a->callstack["network"] as $func => $time) {
-                                                       $time = round($time, 3);
-                                                       if ($time > 0) {
-                                                               $o .= $func . ": " . $time . "\n";
-                                                       }
-                                               }
-                                               Logger::debug(API_LOG_PREFIX . $o, ['module' => 'api', 'action' => 'call']);
-                                       }
-                               }
+                               $a->getProfiler()->saveLog($a->getLogger(), API_LOG_PREFIX . 'performance');
 
                                if (false === $return) {
                                        /*
@@ -528,7 +466,7 @@ function api_unique_id_to_nurl($id)
  *
  * @param App        $a          App
  * @param int|string $contact_id Contact ID or URL
- * @return array
+ * @return array|bool
  * @throws BadRequestException
  * @throws ImagickException
  * @throws InternalServerErrorException
@@ -837,15 +775,17 @@ function api_item_get_user(App $a, $item)
 {
        $status_user = api_get_user($a, defaults($item, 'author-id', null));
 
+       $author_user = $status_user;
+
        $status_user["protected"] = defaults($item, 'private', 0);
 
        if (defaults($item, 'thr-parent', '') == defaults($item, 'uri', '')) {
                $owner_user = api_get_user($a, defaults($item, 'owner-id', null));
        } else {
-               $owner_user = $status_user;
+               $owner_user = $author_user;
        }
 
-       return ([$status_user, $owner_user]);
+       return ([$status_user, $author_user, $owner_user]);
 }
 
 /**
@@ -992,7 +932,6 @@ function api_format_data($root_element, $type, $data)
  */
 function api_account_verify_credentials($type)
 {
-
        $a = \get_app();
 
        if (api_user() === false) {
@@ -1014,11 +953,9 @@ function api_account_verify_credentials($type)
 
        // - Adding last status
        if (!$skip_status) {
-               $user_info["status"] = api_status_show("raw");
-               if (!count($user_info["status"])) {
-                       unset($user_info["status"]);
-               } else {
-                       unset($user_info["status"]["user"]);
+               $last_status = api_get_last_status($user_info['pid'], $user_info['uid'], $type);
+               if ($last_status) {
+                       $user_info['status'] = $last_status;
                }
        }
 
@@ -1302,106 +1239,64 @@ function api_media_upload()
 api_register_func('api/media/upload', 'api_media_upload', true, API_METHOD_POST);
 
 /**
- *
- * @param string $type Return type (atom, rss, xml, json)
- *
+ * @param string $type    Return format (atom, rss, xml, json)
  * @param int    $item_id
- * @return array|string
- * @throws BadRequestException
- * @throws ImagickException
- * @throws InternalServerErrorException
- * @throws UnauthorizedException
+ * @return string
+ * @throws Exception
  */
-function api_status_show($type, $item_id = 0)
+function api_status_show($type, $item_id)
 {
-       $a = \get_app();
-
-       $user_info = api_get_user($a);
-
-       Logger::log('api_status_show: user_info: '.print_r($user_info, true), Logger::DEBUG);
+       Logger::info(API_LOG_PREFIX . 'Start', ['action' => 'status_show', 'type' => $type, 'item_id' => $item_id]);
 
-       if ($type == "raw") {
-               $privacy_sql = "AND NOT `private`";
-       } else {
-               $privacy_sql = "";
-       }
+       $status_info = [];
 
-       if (!empty($item_id)) {
-               // Get the item with the given id
-               $condition = ['id' => $item_id];
-       } else {
-               // get last public wall message
-               $condition = ['owner-id' => $user_info['pid'], 'uid' => api_user(),
-                       'gravity' => [GRAVITY_PARENT, GRAVITY_COMMENT]];
+       $item = api_get_item(['id' => $item_id]);
+       if ($item) {
+               $status_info = api_format_item($item, $type);
        }
-       $lastwall = Item::selectFirst(Item::ITEM_FIELDLIST, $condition, ['order' => ['id' => true]]);
-
-       if (DBA::isResult($lastwall)) {
-               $in_reply_to = api_in_reply_to($lastwall);
 
-               $converted = api_convert_item($lastwall);
+       Logger::info(API_LOG_PREFIX . 'End', ['action' => 'get_status', 'status_info' => $status_info]);
 
-               if ($type == "xml") {
-                       $geo = "georss:point";
-               } else {
-                       $geo = "geo";
-               }
-
-               $status_info = [
-                       'created_at' => api_date($lastwall['created']),
-                       'id' => intval($lastwall['id']),
-                       'id_str' => (string) $lastwall['id'],
-                       'text' => $converted["text"],
-                       'source' => (($lastwall['app']) ? $lastwall['app'] : 'web'),
-                       'truncated' => false,
-                       'in_reply_to_status_id' => $in_reply_to['status_id'],
-                       'in_reply_to_status_id_str' => $in_reply_to['status_id_str'],
-                       'in_reply_to_user_id' => $in_reply_to['user_id'],
-                       'in_reply_to_user_id_str' => $in_reply_to['user_id_str'],
-                       'in_reply_to_screen_name' => $in_reply_to['screen_name'],
-                       'user' => $user_info,
-                       $geo => null,
-                       'coordinates' => '',
-                       'place' => '',
-                       'contributors' => '',
-                       'is_quote_status' => false,
-                       'retweet_count' => 0,
-                       'favorite_count' => 0,
-                       'favorited' => $lastwall['starred'] ? true : false,
-                       'retweeted' => false,
-                       'possibly_sensitive' => false,
-                       'lang' => '',
-                       'statusnet_html' => $converted["html"],
-                       'statusnet_conversation_id' => $lastwall['parent'],
-                       'external_url' => System::baseUrl() . '/display/' . $lastwall['guid'],
-               ];
-
-               if (count($converted["attachments"]) > 0) {
-                       $status_info["attachments"] = $converted["attachments"];
-               }
+       return api_format_data('statuses', $type, ['status' => $status_info]);
+}
 
-               if (count($converted["entities"]) > 0) {
-                       $status_info["entities"] = $converted["entities"];
-               }
+/**
+ * Retrieves the last public status of the provided user info
+ *
+ * @param int    $ownerId Public contact Id
+ * @param int    $uid     User Id
+ * @param string $type    Return format (atom, rss, xml, json)
+ * @return array
+ * @throws Exception
+ */
+function api_get_last_status($ownerId, $uid, $type = 'json')
+{
+       $condition = [
+               'owner-id' => $ownerId,
+               'uid'      => $uid,
+               'gravity'  => [GRAVITY_PARENT, GRAVITY_COMMENT],
+               'private'  => false
+       ];
 
-               if ($status_info["source"] == 'web') {
-                       $status_info["source"] = ContactSelector::networkToName($lastwall['network'], $lastwall['author-link']);
-               } elseif (ContactSelector::networkToName($lastwall['network'], $lastwall['author-link']) != $status_info["source"]) {
-                       $status_info["source"] = trim($status_info["source"].' ('.ContactSelector::networkToName($lastwall['network'], $lastwall['author-link']).')');
-               }
+       $item = api_get_item($condition);
 
-               // "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"]);
+       $status_info = api_format_item($item, $type);
 
-               Logger::log('status_info: '.print_r($status_info, true), Logger::DEBUG);
+       return $status_info;
+}
 
-               if ($type == "raw") {
-                       return $status_info;
-               }
+/**
+ * Retrieves a single item record based on the provided condition and converts it for API use.
+ *
+ * @param array $condition Item table condition array
+ * @return array
+ * @throws Exception
+ */
+function api_get_item(array $condition)
+{
+       $item = Item::selectFirst(Item::DISPLAY_FIELDLIST, $condition, ['order' => ['id' => true]]);
 
-               return api_format_data("statuses", $type, ['status' => $status_info]);
-       }
+       return $item;
 }
 
 /**
@@ -1418,66 +1313,20 @@ function api_status_show($type, $item_id = 0)
  */
 function api_users_show($type)
 {
-       $a = \get_app();
+       $a = \Friendica\BaseObject::getApp();
 
        $user_info = api_get_user($a);
 
-       $condition = ['owner-id' => $user_info['pid'], 'uid' => api_user(),
-               'gravity' => [GRAVITY_PARENT, GRAVITY_COMMENT], 'private' => false];
-       $lastwall = Item::selectFirst(Item::ITEM_FIELDLIST, $condition, ['order' => ['id' => true]]);
-
-       if (DBA::isResult($lastwall)) {
-               $in_reply_to = api_in_reply_to($lastwall);
-
-               $converted = api_convert_item($lastwall);
-
-               if ($type == "xml") {
-                       $geo = "georss:point";
-               } else {
-                       $geo = "geo";
-               }
-
-               $user_info['status'] = [
-                       'text' => $converted["text"],
-                       'truncated' => false,
-                       'created_at' => api_date($lastwall['created']),
-                       'in_reply_to_status_id' => $in_reply_to['status_id'],
-                       'in_reply_to_status_id_str' => $in_reply_to['status_id_str'],
-                       'source' => (($lastwall['app']) ? $lastwall['app'] : 'web'),
-                       'id' => intval($lastwall['contact-id']),
-                       'id_str' => (string) $lastwall['contact-id'],
-                       'in_reply_to_user_id' => $in_reply_to['user_id'],
-                       'in_reply_to_user_id_str' => $in_reply_to['user_id_str'],
-                       'in_reply_to_screen_name' => $in_reply_to['screen_name'],
-                       $geo => null,
-                       'favorited' => $lastwall['starred'] ? true : false,
-                       'statusnet_html' => $converted["html"],
-                       'statusnet_conversation_id' => $lastwall['parent'],
-                       'external_url' => System::baseUrl() . "/display/" . $lastwall['guid'],
-               ];
-
-               if (count($converted["attachments"]) > 0) {
-                       $user_info["status"]["attachments"] = $converted["attachments"];
-               }
-
-               if (count($converted["entities"]) > 0) {
-                       $user_info["status"]["entities"] = $converted["entities"];
-               }
-
-               if ($user_info["status"]["source"] == 'web') {
-                       $user_info["status"]["source"] = ContactSelector::networkToName($lastwall['network'], $lastwall['author-link']);
-               }
-
-               if (ContactSelector::networkToName($lastwall['network'], $user_info['url']) != $user_info["status"]["source"]) {
-                       $user_info["status"]["source"] = trim($user_info["status"]["source"] . ' (' . ContactSelector::networkToName($lastwall['network'], $lastwall['author-link']) . ')');
-               }
+       $lastStatus = api_get_last_status($user_info['pid'], $user_info['uid'], $type);
+       if ($lastStatus) {
+               $user_info['status'] = $lastStatus;
        }
 
        // "uid" and "self" are only needed for some internal stuff, so remove it from here
-       unset($user_info["uid"]);
-       unset($user_info["self"]);
+       unset($user_info['uid']);
+       unset($user_info['self']);
 
-       return api_format_data("user", $type, ['user' => $user_info]);
+       return api_format_data('user', $type, ['user' => $user_info]);
 }
 
 /// @TODO move to top of file or somewhere better
@@ -1591,8 +1440,10 @@ function api_search($type)
 
        if (api_user() === false || $user_info === false) { throw new ForbiddenException(); }
 
-       if (empty($_REQUEST['q'])) { throw new BadRequestException('q parameter is required.'); }
-       
+       if (empty($_REQUEST['q'])) {
+               throw new BadRequestException('q parameter is required.');
+       }
+
        $searchTerm = trim(rawurldecode($_REQUEST['q']));
 
        $data = [];
@@ -1799,7 +1650,7 @@ function api_statuses_public_timeline($type)
        $start = $page * $count;
 
        if ($exclude_replies && !$conversation_id) {
-               $condition = ["`gravity` IN (?, ?) AND `iid` > ? AND NOT `private` AND `wall` AND NOT `user`.`hidewall`",
+               $condition = ["`gravity` IN (?, ?) AND `iid` > ? AND NOT `private` AND `wall` AND NOT `user`.`hidewall` AND NOT `author`.`hidden`",
                        GRAVITY_PARENT, GRAVITY_COMMENT, $since_id];
 
                if ($max_id > 0) {
@@ -1812,7 +1663,7 @@ function api_statuses_public_timeline($type)
 
                $r = Item::inArray($statuses);
        } else {
-               $condition = ["`gravity` IN (?, ?) AND `id` > ? AND NOT `private` AND `wall` AND NOT `user`.`hidewall` AND `item`.`origin`",
+               $condition = ["`gravity` IN (?, ?) AND `id` > ? AND NOT `private` AND `wall` AND NOT `user`.`hidewall` AND `item`.`origin` AND NOT `author`.`hidden`",
                        GRAVITY_PARENT, GRAVITY_COMMENT, $since_id];
 
                if ($max_id > 0) {
@@ -2834,7 +2685,7 @@ function api_get_entitities(&$text, $bbcode)
 
                                $entities["media"][] = [
                                                        "id" => $start+1,
-                                                       "id_str" => (string)$start+1,
+                                                       "id_str" => (string) ($start + 1),
                                                        "indices" => [$start, $start+strlen($url)],
                                                        "media_url" => Strings::normaliseLink($media_url),
                                                        "media_url_https" => $media_url,
@@ -3029,7 +2880,7 @@ function api_format_items_profiles($profile_row)
 /**
  * @brief format items to be returned by api
  *
- * @param array  $r           array of items
+ * @param array  $items       array of items
  * @param array  $user_info
  * @param bool   $filter_user filter items by $user_info
  * @param string $type        Return type (atom, rss, xml, json)
@@ -3039,111 +2890,139 @@ function api_format_items_profiles($profile_row)
  * @throws InternalServerErrorException
  * @throws UnauthorizedException
  */
-function api_format_items($r, $user_info, $filter_user = false, $type = "json")
+function api_format_items($items, $user_info, $filter_user = false, $type = "json")
 {
-       $a = \get_app();
+       $a = \Friendica\BaseObject::getApp();
 
        $ret = [];
 
-       foreach ((array)$r as $item) {
-               localize_item($item);
-               list($status_user, $owner_user) = api_item_get_user($a, $item);
+       foreach ((array)$items as $item) {
+               list($status_user, $author_user, $owner_user) = api_item_get_user($a, $item);
 
                // Look if the posts are matching if they should be filtered by user id
                if ($filter_user && ($status_user["id"] != $user_info["id"])) {
                        continue;
                }
 
-               $in_reply_to = api_in_reply_to($item);
+               $status = api_format_item($item, $type, $status_user, $owner_user);
 
-               $converted = api_convert_item($item);
+               $ret[] = $status;
+       }
 
-               if ($type == "xml") {
-                       $geo = "georss:point";
-               } else {
-                       $geo = "geo";
-               }
+       return $ret;
+}
 
-               $status = [
-                       'text'          => $converted["text"],
-                       'truncated' => false,
-                       'created_at'=> api_date($item['created']),
-                       'in_reply_to_status_id' => $in_reply_to['status_id'],
-                       'in_reply_to_status_id_str' => $in_reply_to['status_id_str'],
-                       'source'    => (($item['app']) ? $item['app'] : 'web'),
-                       'id'            => intval($item['id']),
-                       'id_str'        => (string) intval($item['id']),
-                       'in_reply_to_user_id' => $in_reply_to['user_id'],
-                       'in_reply_to_user_id_str' => $in_reply_to['user_id_str'],
-                       'in_reply_to_screen_name' => $in_reply_to['screen_name'],
-                       $geo => null,
-                       'favorited' => $item['starred'] ? true : false,
-                       'user' =>  $status_user,
-                       'friendica_owner' => $owner_user,
-                       'friendica_private' => $item['private'] == 1,
-                       //'entities' => NULL,
-                       'statusnet_html' => $converted["html"],
-                       'statusnet_conversation_id' => $item['parent'],
-                       'external_url' => System::baseUrl() . "/display/" . $item['guid'],
-                       'friendica_activities' => api_format_items_activities($item, $type),
-               ];
+/**
+ * @param array  $item       Item record
+ * @param string $type       Return format (atom, rss, xml, json)
+ * @param array $status_user User record of the item author, can be provided by api_item_get_user()
+ * @param array $owner_user  User record of the item owner, can be provided by api_item_get_user()
+ * @return array API-formatted status
+ * @throws BadRequestException
+ * @throws ImagickException
+ * @throws InternalServerErrorException
+ * @throws UnauthorizedException
+ */
+function api_format_item($item, $type = "json", $status_user = null, $owner_user = null)
+{
+       $a = \Friendica\BaseObject::getApp();
 
-               if (count($converted["attachments"]) > 0) {
-                       $status["attachments"] = $converted["attachments"];
-               }
+       if (empty($status_user) || empty($owner_user)) {
+               list($status_user, $owner_user) = api_item_get_user($a, $item);
+       }
 
-               if (count($converted["entities"]) > 0) {
-                       $status["entities"] = $converted["entities"];
-               }
+       localize_item($item);
 
-               if ($status["source"] == 'web') {
-                       $status["source"] = ContactSelector::networkToName($item['network'], $item['author-link']);
-               } elseif (ContactSelector::networkToName($item['network'], $item['author-link']) != $status["source"]) {
-                       $status["source"] = trim($status["source"].' ('.ContactSelector::networkToName($item['network'], $item['author-link']).')');
-               }
+       $in_reply_to = api_in_reply_to($item);
 
-               if ($item["id"] == $item["parent"]) {
-                       $retweeted_item = api_share_as_retweet($item);
-                       if ($retweeted_item !== false) {
-                               $retweeted_status = $status;
-                               $status['user'] = $status['friendica_owner'];
-                               try {
-                                       $retweeted_status["user"] = api_get_user($a, $retweeted_item["author-id"]);
-                               } catch (BadRequestException $e) {
-                                       // user not found. should be found?
-                                       /// @todo check if the user should be always found
-                                       $retweeted_status["user"] = [];
-                               }
+       $converted = api_convert_item($item);
+
+       if ($type == "xml") {
+               $geo = "georss:point";
+       } else {
+               $geo = "geo";
+       }
+
+       $status = [
+               'text'          => $converted["text"],
+               'truncated' => false,
+               'created_at'=> api_date($item['created']),
+               'in_reply_to_status_id' => $in_reply_to['status_id'],
+               'in_reply_to_status_id_str' => $in_reply_to['status_id_str'],
+               'source'    => (($item['app']) ? $item['app'] : 'web'),
+               'id'            => intval($item['id']),
+               'id_str'        => (string) intval($item['id']),
+               'in_reply_to_user_id' => $in_reply_to['user_id'],
+               'in_reply_to_user_id_str' => $in_reply_to['user_id_str'],
+               'in_reply_to_screen_name' => $in_reply_to['screen_name'],
+               $geo => null,
+               'favorited' => $item['starred'] ? true : false,
+               'user' =>  $status_user,
+               'friendica_author' => $author_user,
+                       'friendica_owner' => $owner_user,
+               'friendica_private' => $item['private'] == 1,
+               //'entities' => NULL,
+               'statusnet_html' => $converted["html"],
+               'statusnet_conversation_id' => $item['parent'],
+               'external_url' => System::baseUrl() . "/display/" . $item['guid'],
+               'friendica_activities' => api_format_items_activities($item, $type),
+       ];
+
+       if (count($converted["attachments"]) > 0) {
+               $status["attachments"] = $converted["attachments"];
+       }
+
+       if (count($converted["entities"]) > 0) {
+               $status["entities"] = $converted["entities"];
+       }
 
-                               $rt_converted = api_convert_item($retweeted_item);
+       if ($status["source"] == 'web') {
+               $status["source"] = ContactSelector::networkToName($item['network'], $item['author-link']);
+       } elseif (ContactSelector::networkToName($item['network'], $item['author-link']) != $status["source"]) {
+               $status["source"] = trim($status["source"].' ('.ContactSelector::networkToName($item['network'], $item['author-link']).')');
+       }
 
-                               $retweeted_status['text'] = $rt_converted["text"];
-                               $retweeted_status['statusnet_html'] = $rt_converted["html"];
-                               $retweeted_status['friendica_activities'] = api_format_items_activities($retweeted_item, $type);
-                               $retweeted_status['created_at'] =  api_date($retweeted_item['created']);
-                               $status['retweeted_status'] = $retweeted_status;
+       if ($item["id"] == $item["parent"]) {
+               $retweeted_item = api_share_as_retweet($item);
+               if ($retweeted_item !== false) {
+                       $retweeted_status = $status;
+                       $status['user'] = $status['friendica_owner'];
+                       try {
+                               $retweeted_status["user"] = api_get_user($a, $retweeted_item["author-id"]);
+                       } catch (BadRequestException $e) {
+                               // user not found. should be found?
+                               /// @todo check if the user should be always found
+                               $retweeted_status["user"] = [];
                        }
-               }
 
-               // "uid" and "self" are only needed for some internal stuff, so remove it from here
-               unset($status["user"]["uid"]);
-               unset($status["user"]["self"]);
-
-               if ($item["coord"] != "") {
-                       $coords = explode(' ', $item["coord"]);
-                       if (count($coords) == 2) {
-                               if ($type == "json") {
-                                       $status["geo"] = ['type' => 'Point',
-                                                       'coordinates' => [(float) $coords[0],
-                                                                               (float) $coords[1]]];
-                               } else {// Not sure if this is the official format - if someone founds a documentation we can check
-                                       $status["georss:point"] = $item["coord"];
-                               }
+                       $rt_converted = api_convert_item($retweeted_item);
+
+                       $retweeted_status['text'] = $rt_converted["text"];
+                       $retweeted_status['statusnet_html'] = $rt_converted["html"];
+                       $retweeted_status['friendica_activities'] = api_format_items_activities($retweeted_item, $type);
+                       $retweeted_status['created_at'] =  api_date($retweeted_item['created']);
+                       $status['retweeted_status'] = $retweeted_status;
+               $status['friendica_author'] = $retweeted_status['friendica_author'];}
+       }
+
+       // "uid" and "self" are only needed for some internal stuff, so remove it from here
+       unset($status["user"]["uid"]);
+       unset($status["user"]["self"]);
+
+       if ($item["coord"] != "") {
+               $coords = explode(' ', $item["coord"]);
+               if (count($coords) == 2) {
+                       if ($type == "json") {
+                               $status["geo"] = ['type' => 'Point',
+                                       'coordinates' => [(float) $coords[0],
+                                               (float) $coords[1]]];
+                       } else {// Not sure if this is the official format - if someone founds a documentation we can check
+                               $status["georss:point"] = $item["coord"];
                        }
                }
-               $ret[] = $status;
-       };
-       return $ret;
+       }
+
+       return $status;
 }
 
 /**
@@ -3558,7 +3437,7 @@ function api_statusnet_config($type)
        $server    = $a->getHostName();
        $logo      = System::baseUrl() . '/images/friendica-64.png';
        $email     = Config::get('config', 'admin_email');
-       $closed    = intval(Config::get('config', 'register_policy')) === REGISTER_CLOSED ? 'true' : 'false';
+       $closed    = intval(Config::get('config', 'register_policy')) === \Friendica\Module\Register::CLOSED ? 'true' : 'false';
        $private   = Config::get('system', 'block_public') ? 'true' : 'false';
        $textlimit = (string) Config::get('config', 'api_import_size', Config::get('config', 'max_import_size', 200000));
        $ssl       = Config::get('system', 'have_ssl') ? 'true' : 'false';
@@ -3735,7 +3614,6 @@ function api_direct_messages_new($type)
        }
 
        $replyto = '';
-       $sub     = '';
        if (!empty($_REQUEST['replyto'])) {
                $r = q(
                        'SELECT `parent-uri`, `title` FROM `mail` WHERE `uid`=%d AND `id`=%d',
@@ -4463,6 +4341,7 @@ function api_fr_photo_delete($type)
        if (api_user() === false) {
                throw new ForbiddenException();
        }
+
        // input params
        $photo_id = defaults($_REQUEST, 'photo_id', null);
 
@@ -4471,11 +4350,12 @@ function api_fr_photo_delete($type)
        if ($photo_id == null) {
                throw new BadRequestException("no photo_id specified");
        }
+
        // check if photo is existing in database
-       $r = Photo::exists(['resource-id' => $photo_id, 'uid' => api_user()]);
-       if (!$r) {
+       if (!Photo::exists(['resource-id' => $photo_id, 'uid' => api_user()])) {
                throw new BadRequestException("photo not available");
        }
+
        // now we can perform on the deletion of the photo
        $result = Photo::delete(['uid' => api_user(), 'resource-id' => $photo_id]);
 
@@ -4598,8 +4478,8 @@ function api_account_update_profile_image($type)
                $condition = ["`profile` AND `resource-id` != ? AND `uid` = ?", $data['photo']['id'], api_user()];
                Photo::update(['profile' => false], $condition);
        } else {
-               $fields = ['photo' => System::baseUrl() . '/photo/' . $data['photo']['id'] . '-4.' . $filetype,
-                       'thumb' => System::baseUrl() . '/photo/' . $data['photo']['id'] . '-5.' . $filetype];
+               $fields = ['photo' => System::baseUrl() . '/photo/' . $data['photo']['id'] . '-4.' . $fileext,
+                       'thumb' => System::baseUrl() . '/photo/' . $data['photo']['id'] . '-5.' . $fileext];
                DBA::update('profile', $fields, ['id' => $_REQUEST['profile'], 'uid' => api_user()]);
        }
 
@@ -6011,7 +5891,7 @@ function api_friendica_notification($type)
        }
        $nm = new NotificationsManager();
 
-       $notes = $nm->getAll([], "+seen -date", 50);
+       $notes = $nm->getAll([], ['seen' => 'ASC', 'date' => 'DESC'], 50);
 
        if ($type == "xml") {
                $xmlnotes = [];