Merge pull request #9440 from annando/one-click-follow

[friendica.git] / include / api.php

diff --git a/include/api.php b/include/api.php
index 53d00b27de67245d421d177d406254729dc0a359..86fdeead2fb3d88acc367d4e72b907532cf55690 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;
@@ -311,22 +313,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();
                                }
@@ -654,8 +656,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 +681,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 +733,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'],
        ];
@@ -5052,7 +5054,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 +5273,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 +5598,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 +5712,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") {