Merge pull request #5862 from nupplaphil/rename_App_Methods

[friendica.git] / include / api.php

diff --git a/include/api.php b/include/api.php
index bacdd85143213b18c96f6f9028881405f6567f1e..01cb93a3b8226f5f7940733a6502ac74e6470b8a 100644 (file)
--- a/include/api.php
+++ b/include/api.php
@@ -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;
@@ -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;
@@ -4827,77 +4827,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];
        }