]> git.mxchange.org Git - friendica.git/blobdiff - include/api.php
projects / friendica.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
adapted 300px image size for default avatar
[friendica.git] / include / api.php
diff --git a/include/api.php b/include/api.php
index bacdd85143213b18c96f6f9028881405f6567f1e..7e54fa382a643ea38c85fff7f7d3a5050a893eba 100644 (file)
--- a/include/api.php
+++ b/include/api.php
@@ -12,6 +12,7 @@ use Friendica\Content\Feature;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
 use Friendica\Core\Addon;
+use Friendica\Core\Authentication;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\NotificationsManager;
@@ -46,7 +47,6 @@ use Friendica\Util\XML;
 require_once 'include/conversation.php';
 require_once 'mod/share.php';
 require_once 'mod/item.php';
-require_once 'include/security.php';
 require_once 'mod/wall_upload.php';
 
 define('API_METHOD_ANY', '*');
@@ -242,7 +242,7 @@ function api_login(App $a)
                throw new UnauthorizedException("This API requires login");
        }
 
-       authenticate_success($record);
+       Authentication::setAuthenticatedSessionForUser($record);
 
        $_SESSION["allow_api"] = true;
 
@@ -761,7 +761,7 @@ function api_get_user(App $a, $contact_id = null)
                'statusnet_blocking' => false,
                'notifications' => false,
                /// @TODO old way?
-               //'statusnet_profile_url' => System::baseUrl()."/contacts/".$uinfo[0]['cid'],
+               //'statusnet_profile_url' => System::baseUrl()."/contact/".$uinfo[0]['cid'],
                'statusnet_profile_url' => $uinfo[0]['url'],
                'uid' => intval($uinfo[0]['uid']),
                'cid' => intval($uinfo[0]['cid']),
@@ -1335,9 +1335,9 @@ function api_status_show($type, $item_id = 0)
                }
 
                if ($status_info["source"] == 'web') {
-                       $status_info["source"] = ContactSelector::networkToName($lastwall['network'], $user_info['url']);
-               } elseif (ContactSelector::networkToName($lastwall['network'], $user_info['url']) != $status_info["source"]) {
-                       $status_info["source"] = trim($status_info["source"].' ('.ContactSelector::networkToName($lastwall['network'], $user_info['url']).')');
+                       $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']).')');
                }
 
                // "uid" and "self" are only needed for some internal stuff, so remove it from here
@@ -1410,11 +1410,11 @@ function api_users_show($type)
                }
 
                if ($user_info["status"]["source"] == 'web') {
-                       $user_info["status"]["source"] = ContactSelector::networkToName($lastwall['network'], $user_info['url']);
+                       $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'], $user_info['url']) . ')');
+                       $user_info["status"]["source"] = trim($user_info["status"]["source"] . ' (' . ContactSelector::networkToName($lastwall['network'], $lastwall['author-link']) . ')');
                }
        }
 
@@ -2732,7 +2732,7 @@ function api_contactlink_to_array($txt)
  *                     likes => int count,
  *                     dislikes => int count
  */
-function api_format_items_activities(&$item, $type = "json")
+function api_format_items_activities($item, $type = "json")
 {
        $a = get_app();
 
@@ -2747,13 +2747,13 @@ function api_format_items_activities(&$item, $type = "json")
        $condition = ['uid' => $item['uid'], 'thr-parent' => $item['uri']];
        $ret = Item::selectForUser($item['uid'], ['author-id', 'verb'], $condition);
 
-       while ($item = Item::fetch($ret)) {
+       while ($parent_item = Item::fetch($ret)) {
                // not used as result should be structured like other user data
                //builtin_activity_puller($i, $activities);
 
                // get user data and add it to the array of the activity
-               $user = api_get_user($a, $item['author-id']);
-               switch ($item['verb']) {
+               $user = api_get_user($a, $parent_item['author-id']);
+               switch ($parent_item['verb']) {
                        case ACTIVITY_LIKE:
                                $activities['like'][] = $user;
                                break;
@@ -2912,9 +2912,9 @@ function api_format_items($r, $user_info, $filter_user = false, $type = "json")
                }
 
                if ($status["source"] == 'web') {
-                       $status["source"] = ContactSelector::networkToName($item['network'], $user_info['url']);
-               } elseif (ContactSelector::networkToName($item['network'], $user_info['url']) != $status["source"]) {
-                       $status["source"] = trim($status["source"].' ('.ContactSelector::networkToName($item['network'], $user_info['url']).')');
+                       $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']).')');
                }
 
                if ($item["id"] == $item["parent"]) {
@@ -3344,7 +3344,7 @@ function api_statusnet_config($type)
        $a = get_app();
 
        $name      = Config::get('config', 'sitename');
-       $server    = $a->get_hostname();
+       $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';
@@ -4612,7 +4612,7 @@ function post_photo_item($hash, $allow_cid, $deny_cid, $allow_gid, $deny_gid, $f
        $owner_record = DBA::selectFirst('contact', [], ['uid' => api_user(), 'self' => true]);
 
        $arr = [];
-       $arr['guid']          = System::createGUID(32);
+       $arr['guid']          = System::createUUID();
        $arr['uid']           = intval(api_user());
        $arr['uri']           = $uri;
        $arr['parent-uri']    = $uri;
@@ -4809,7 +4809,8 @@ function api_friendica_remoteauth()
 
        logger($contact['name'] . ' ' . $sec, LOGGER_DEBUG);
        $dest = ($url ? '&destination_url=' . $url : '');
-       goaway(
+
+       System::externalRedirect(
                $contact['poll'] . '?dfrn_id=' . $dfrn_id
                . '&dfrn_version=' . DFRN_PROTOCOL_VERSION
                . '&type=profile&sec=' . $sec . $dest
@@ -4827,77 +4828,86 @@ function api_share_as_retweet(&$item)
 {
        $body = trim($item["body"]);
 
-       if (Diaspora::isReshare($body, false)===false) {
-               return false;
+       if (Diaspora::isReshare($body, false) === false) {
+               if ($item['author-id'] == $item['owner-id']) {
+                       return false;
+               } else {
+                       // Reshares from OStatus, ActivityPub and Twitter
+                       $reshared_item = $item;
+                       $reshared_item['owner-id'] = $reshared_item['author-id'];
+                       $reshared_item['owner-link'] = $reshared_item['author-link'];
+                       $reshared_item['owner-name'] = $reshared_item['author-name'];
+                       $reshared_item['owner-avatar'] = $reshared_item['author-avatar'];
+                       return $reshared_item;
+               }
        }
 
        /// @TODO "$1" should maybe mean '$1' ?
        $attributes = preg_replace("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism", "$1", $body);
        /*
-               * Skip if there is no shared message in there
-               * we already checked this in diaspora::isReshare()
-               * but better one more than one less...
-               */
-       if ($body == $attributes) {
+        * Skip if there is no shared message in there
+        * we already checked this in diaspora::isReshare()
+        * but better one more than one less...
+        */
+       if (($body == $attributes) || empty($attributes)) {
                return false;
        }
 
-
        // build the fake reshared item
        $reshared_item = $item;
 
        $author = "";
        preg_match("/author='(.*?)'/ism", $attributes, $matches);
-       if ($matches[1] != "") {
+       if (!empty($matches[1])) {
                $author = html_entity_decode($matches[1], ENT_QUOTES, 'UTF-8');
        }
 
        preg_match('/author="(.*?)"/ism', $attributes, $matches);
-       if ($matches[1] != "") {
+       if (!empty($matches[1])) {
                $author = $matches[1];
        }
 
        $profile = "";
        preg_match("/profile='(.*?)'/ism", $attributes, $matches);
-       if ($matches[1] != "") {
+       if (!empty($matches[1])) {
                $profile = $matches[1];
        }
 
        preg_match('/profile="(.*?)"/ism', $attributes, $matches);
-       if ($matches[1] != "") {
+       if (!empty($matches[1])) {
                $profile = $matches[1];
        }
 
        $avatar = "";
        preg_match("/avatar='(.*?)'/ism", $attributes, $matches);
-       if ($matches[1] != "") {
+       if (!empty($matches[1])) {
                $avatar = $matches[1];
        }
 
        preg_match('/avatar="(.*?)"/ism', $attributes, $matches);
-       if ($matches[1] != "") {
+       if (!empty($matches[1])) {
                $avatar = $matches[1];
        }
 
        $link = "";
        preg_match("/link='(.*?)'/ism", $attributes, $matches);
-       if ($matches[1] != "") {
+       if (!empty($matches[1])) {
                $link = $matches[1];
        }
 
        preg_match('/link="(.*?)"/ism', $attributes, $matches);
-       if ($matches[1] != "") {
+       if (!empty($matches[1])) {
                $link = $matches[1];
        }
 
        $posted = "";
        preg_match("/posted='(.*?)'/ism", $attributes, $matches);
-       if ($matches[1] != "") {
+       if (!empty($matches[1])) {
                $posted = $matches[1];
        }
 
        preg_match('/posted="(.*?)"/ism', $attributes, $matches);
-       if ($matches[1] != "") {
+       if (!empty($matches[1])) {
                $posted = $matches[1];
        }
 
Unnamed repository; edit this file 'description' to name the repository.