]> 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
Merge pull request #9655 from MrPetovan/bug/fatal-errors
[friendica.git] / include / api.php
diff --git a/include/api.php b/include/api.php
index 85a34d275322688e27df2e28cc7b64bee704ab47..92d35c001ec1b1236e436fa761cfb8b76e73eed5 100644 (file)
--- a/include/api.php
+++ b/include/api.php
@@ -44,7 +44,7 @@ use Friendica\Model\Photo;
 use Friendica\Model\User;
 use Friendica\Model\UserItem;
 use Friendica\Model\Verb;
-use Friendica\Network\FKOAuth1;
+use Friendica\Security\FKOAuth1;
 use Friendica\Network\HTTPException;
 use Friendica\Network\HTTPException\BadRequestException;
 use Friendica\Network\HTTPException\ExpectationFailedException;
@@ -58,6 +58,8 @@ use Friendica\Network\HTTPException\UnauthorizedException;
 use Friendica\Object\Image;
 use Friendica\Protocol\Activity;
 use Friendica\Protocol\Diaspora;
+use Friendica\Security\OAuth1\OAuthRequest;
+use Friendica\Security\OAuth1\OAuthUtil;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Images;
 use Friendica\Util\Network;
@@ -65,7 +67,6 @@ use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Util\Strings;
 use Friendica\Util\XML;
 
-require_once __DIR__ . '/../mod/share.php';
 require_once __DIR__ . '/../mod/item.php';
 require_once __DIR__ . '/../mod/wall_upload.php';
 
@@ -311,22 +312,22 @@ function api_call(App $a, App\Arguments $args = null)
        }
 
        $type = "json";
-       if (strpos($args->getQueryString(), ".xml") > 0) {
+       if (strpos($args->getCommand(), ".xml") > 0) {
                $type = "xml";
        }
-       if (strpos($args->getQueryString(), ".json") > 0) {
+       if (strpos($args->getCommand(), ".json") > 0) {
                $type = "json";
        }
-       if (strpos($args->getQueryString(), ".rss") > 0) {
+       if (strpos($args->getCommand(), ".rss") > 0) {
                $type = "rss";
        }
-       if (strpos($args->getQueryString(), ".atom") > 0) {
+       if (strpos($args->getCommand(), ".atom") > 0) {
                $type = "atom";
        }
 
        try {
                foreach ($API as $p => $info) {
-                       if (strpos($args->getQueryString(), $p) === 0) {
+                       if (strpos($args->getCommand(), $p) === 0) {
                                if (!api_check_method($info['method'])) {
                                        throw new MethodNotAllowedException();
                                }
@@ -335,16 +336,16 @@ function api_call(App $a, App\Arguments $args = null)
 
                                if (!empty($info['auth']) && api_user() === false) {
                                        api_login($a);
+                                       Logger::info(API_LOG_PREFIX . 'username {username}', ['module' => 'api', 'action' => 'call', 'username' => $a->user['username']]);
                                }
 
-                               Logger::info(API_LOG_PREFIX . 'username {username}', ['module' => 'api', 'action' => 'call', 'username' => $a->user['username']]);
                                Logger::debug(API_LOG_PREFIX . 'parameters', ['module' => 'api', 'action' => 'call', 'parameters' => $_REQUEST]);
 
                                $stamp =  microtime(true);
                                $return = call_user_func($info['func'], $type);
                                $duration = floatval(microtime(true) - $stamp);
 
-                               Logger::info(API_LOG_PREFIX . 'username {username}', ['module' => 'api', 'action' => 'call', 'username' => $a->user['username'], 'duration' => round($duration, 2)]);
+                               Logger::info(API_LOG_PREFIX . 'duration {duration}', ['module' => 'api', 'action' => 'call', 'duration' => round($duration, 2)]);
 
                                DI::profiler()->saveLog(DI::logger(), API_LOG_PREFIX . 'performance');
 
@@ -384,7 +385,7 @@ function api_call(App $a, App\Arguments $args = null)
                }
 
                Logger::warning(API_LOG_PREFIX . 'not implemented', ['module' => 'api', 'action' => 'call', 'query' => DI::args()->getQueryString()]);
-               throw new NotImplementedException();
+               throw new NotFoundException();
        } catch (HTTPException $e) {
                header("HTTP/1.1 {$e->getCode()} {$e->httpdesc}");
                return api_error($type, $e, $args);
@@ -654,8 +655,8 @@ function api_get_user(App $a, $contact_id = null)
                                'notifications' => false,
                                'statusnet_profile_url' => $contact["url"],
                                'uid' => 0,
-                               'cid' => Contact::getIdForURL($contact["url"], api_user(), true),
-                               'pid' => Contact::getIdForURL($contact["url"], 0, true),
+                               'cid' => Contact::getIdForURL($contact["url"], api_user(), false),
+                               'pid' => Contact::getIdForURL($contact["url"], 0, false),
                                'self' => 0,
                                'network' => $contact["network"],
                        ];
@@ -679,7 +680,7 @@ function api_get_user(App $a, $contact_id = null)
        $countfollowers = 0;
        $starred = 0;
 
-       $pcontact_id  = Contact::getIdForURL($uinfo[0]['url'], 0, true);
+       $pcontact_id  = Contact::getIdForURL($uinfo[0]['url'], 0, false);
 
        if (!empty($profile['about'])) {
                $description = $profile['about'];
@@ -731,7 +732,7 @@ function api_get_user(App $a, $contact_id = null)
                'statusnet_profile_url' => $uinfo[0]['url'],
                'uid' => intval($uinfo[0]['uid']),
                'cid' => intval($uinfo[0]['cid']),
-               'pid' => Contact::getIdForURL($uinfo[0]["url"], 0, true),
+               'pid' => Contact::getIdForURL($uinfo[0]["url"], 0, false),
                'self' => $uinfo[0]['self'],
                'network' => $uinfo[0]['network'],
        ];
@@ -2038,35 +2039,40 @@ function api_statuses_repeat($type)
 
        Logger::log('API: api_statuses_repeat: '.$id);
 
-       $fields = ['uri-id', 'body', 'title', 'attach', 'author-name', 'author-link', 'author-avatar', 'guid', 'created', 'plink'];
+       $fields = ['uri-id', 'network', 'body', 'title', 'author-name', 'author-link', 'author-avatar', 'guid', 'created', 'plink'];
        $item = Item::selectFirst($fields, ['id' => $id, 'private' => [Item::PUBLIC, Item::UNLISTED]]);
 
        if (DBA::isResult($item) && $item['body'] != "") {
-               if (strpos($item['body'], "[/share]") !== false) {
-                       $pos = strpos($item['body'], "[share");
-                       $post = substr($item['body'], $pos);
+               if (in_array($item['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::TWITTER])) {
+                       if (!Item::performActivity($id, 'announce', local_user())) {
+                               throw new InternalServerErrorException();
+                       }
+               
+                       $item_id = $id;
                } else {
-                       $post = BBCode::getShareOpeningTag($item['author-name'], $item['author-link'], $item['author-avatar'], $item['plink'], $item['created'], $item['guid']);
+                       if (strpos($item['body'], "[/share]") !== false) {
+                               $pos = strpos($item['body'], "[share");
+                               $post = substr($item['body'], $pos);
+                       } else {
+                               $post = BBCode::getShareOpeningTag($item['author-name'], $item['author-link'], $item['author-avatar'], $item['plink'], $item['created'], $item['guid']);
 
-                       if (!empty($item['title'])) {
-                               $post .= '[h3]' . $item['title'] . "[/h3]\n";
+                               if (!empty($item['title'])) {
+                                       $post .= '[h3]' . $item['title'] . "[/h3]\n";
+                               }
+
+                               $post .= $item['body'];
+                               $post .= "[/share]";
                        }
+                       $_REQUEST['body'] = $post;
+                       $_REQUEST['profile_uid'] = api_user();
+                       $_REQUEST['api_source'] = true;
 
-                       $post .= $item['body'];
-                       $post .= "[/share]";
-               }
-               $_REQUEST['body'] = $post;
-               $_REQUEST['attach'] = $item['attach'];
-               $_REQUEST['profile_uid'] = api_user();
-               $_REQUEST['api_source'] = true;
+                       if (empty($_REQUEST['source'])) {
+                               $_REQUEST["source"] = api_source();
+                       }
 
-               if (empty($_REQUEST['source'])) {
-                       $_REQUEST["source"] = api_source();
+                       $item_id = item_post($a);
                }
-
-               $item_id = item_post($a);
-
-               /// @todo Copy tags from the original post to the new one
        } else {
                throw new ForbiddenException();
        }
@@ -2157,10 +2163,10 @@ function api_statuses_mentions($type)
        // get last network messages
 
        // params
-       $since_id = $_REQUEST['since_id'] ?? 0;
-       $max_id   = $_REQUEST['max_id']   ?? 0;
-       $count    = $_REQUEST['count']    ?? 20;
-       $page     = $_REQUEST['page']     ?? 1;
+       $since_id = intval($_REQUEST['since_id'] ?? 0);
+       $max_id   = intval($_REQUEST['max_id']   ?? 0);
+       $count    = intval($_REQUEST['count']    ?? 20);
+       $page     = intval($_REQUEST['page']     ?? 1);
 
        $start = max(0, ($page - 1) * $count);
 
@@ -4759,7 +4765,6 @@ function post_photo_item($hash, $allow_cid, $deny_cid, $allow_gid, $deny_gid, $f
        $arr['guid']          = System::createUUID();
        $arr['uid']           = intval(api_user());
        $arr['uri']           = $uri;
-       $arr['parent-uri']    = $uri;
        $arr['type']          = 'photo';
        $arr['wall']          = 1;
        $arr['resource-id']   = $hash;
@@ -5052,7 +5057,7 @@ function api_share_as_retweet(&$item)
 
        $reshared_item["share-pre-body"] = $reshared['comment'];
        $reshared_item["body"] = $reshared['shared'];
-       $reshared_item["author-id"] = Contact::getIdForURL($reshared['profile'], 0, true);
+       $reshared_item["author-id"] = Contact::getIdForURL($reshared['profile'], 0, false);
        $reshared_item["author-name"] = $reshared['author'];
        $reshared_item["author-link"] = $reshared['profile'];
        $reshared_item["author-avatar"] = $reshared['avatar'];
@@ -5271,7 +5276,7 @@ function api_friendica_group_show($type)
        // loop through all groups and retrieve all members for adding data in the user array
        $grps = [];
        foreach ($r as $rr) {
-               $members = Contact::getByGroupId($rr['id']);
+               $members = Contact\Group::getById($rr['id']);
                $users = [];
 
                if ($type == "xml") {
@@ -5596,7 +5601,7 @@ function api_friendica_group_update($type)
        }
 
        // remove members
-       $members = Contact::getByGroupId($gid);
+       $members = Contact\Group::getById($gid);
        foreach ($members as $member) {
                $cid = $member['id'];
                foreach ($users as $user) {
@@ -5710,7 +5715,7 @@ function api_friendica_activity($type)
 
        $id = $_REQUEST['id'] ?? 0;
 
-       $res = Item::performActivity($id, $verb);
+       $res = Item::performActivity($id, $verb, api_user());
 
        if ($res) {
                if ($type == "xml") {
Unnamed repository; edit this file 'description' to name the repository.