]> git.mxchange.org Git - friendica.git/commitdiff
API: We now support two more timeline api endpoints
authorMichael <heluecht@pirati.ca>
Fri, 7 May 2021 21:28:48 +0000 (21:28 +0000)
committerMichael <heluecht@pirati.ca>
Fri, 7 May 2021 21:28:48 +0000 (21:28 +0000)
src/Factory/Api/Mastodon/Status.php
src/Model/Post.php
src/Module/Api/Mastodon/Accounts.php
src/Module/Api/Mastodon/Accounts/Statuses.php
src/Module/Api/Mastodon/Timelines/Home.php [new file with mode: 0644]
src/Module/Api/Mastodon/Timelines/Tag.php [new file with mode: 0644]
static/routes.config.php

index b157d809acb70f637d764185f9ee172d9cb5074e..310fa26bbea354f0c900bc892885aa7a030e6a7a 100644 (file)
@@ -23,6 +23,7 @@ namespace Friendica\Factory\Api\Mastodon;
 
 use Friendica\App\BaseURL;
 use Friendica\BaseFactory;
+use Friendica\Content\ContactSelector;
 use Friendica\Content\Text\BBCode;
 use Friendica\Database\DBA;
 use Friendica\DI;
@@ -60,9 +61,9 @@ class Status extends BaseFactory
         */
        public function createFromUriId(int $uriId, $uid = 0)
        {
-               $fields = ['uri-id', 'uid', 'author-id', 'starred', 'app', 'title', 'body', 'raw-body', 'created',
+               $fields = ['uri-id', 'uid', 'author-id', 'author-link', 'starred', 'app', 'title', 'body', 'raw-body', 'created', 'network',
                        'thr-parent-id', 'parent-author-id', 'language', 'uri', 'plink', 'private', 'vid', 'gravity'];
-               $item = Post::selectFirst($fields, ['uri-id' => $uriId, 'uid' => $uid]);
+               $item = Post::selectFirst($fields, ['uri-id' => $uriId, 'uid' => [0, $uid]], ['order' => ['uid' => true]]);
                if (!$item) {
                        throw new HTTPException\NotFoundException('Item with URI ID ' . $uriId . 'not found' . ($uid ? ' for user ' . $uid : '.'));
                }
@@ -70,21 +71,21 @@ class Status extends BaseFactory
                $account = DI::mstdnAccount()->createFromContactId($item['author-id']);
 
                $counts = new \Friendica\Object\Api\Mastodon\Status\Counts(
-                       Post::count(['thr-parent-id' => $uriId, 'uid' => $uid, 'gravity' => GRAVITY_COMMENT]),
-                       Post::count(['thr-parent-id' => $uriId, 'uid' => $uid, 'gravity' => GRAVITY_ACTIVITY, 'vid' => Verb::getID(Activity::ANNOUNCE)]),
-                       Post::count(['thr-parent-id' => $uriId, 'uid' => $uid, 'gravity' => GRAVITY_ACTIVITY, 'vid' => Verb::getID(Activity::LIKE)])
+                       Post::count(['thr-parent-id' => $uriId, 'gravity' => GRAVITY_COMMENT], [], false),
+                       Post::count(['thr-parent-id' => $uriId, 'gravity' => GRAVITY_ACTIVITY, 'vid' => Verb::getID(Activity::ANNOUNCE)], [], false),
+                       Post::count(['thr-parent-id' => $uriId, 'gravity' => GRAVITY_ACTIVITY, 'vid' => Verb::getID(Activity::LIKE)], [], false)
                );
 
                $userAttributes = new \Friendica\Object\Api\Mastodon\Status\UserAttributes(
                        Post::exists(['thr-parent-id' => $uriId, 'uid' => $uid, 'origin' => true, 'gravity' => GRAVITY_ACTIVITY, 'vid' => Verb::getID(Activity::LIKE)]),
                        Post::exists(['thr-parent-id' => $uriId, 'uid' => $uid, 'origin' => true, 'gravity' => GRAVITY_ACTIVITY, 'vid' => Verb::getID(Activity::ANNOUNCE)]),
-                       Post\ThreadUser::getIgnored($uriId, $item['uid']),
+                       Post\ThreadUser::getIgnored($uriId, $uid),
                        (bool)$item['starred'],
-                       Post\ThreadUser::getPinned($uriId, $item['uid'])
+                       Post\ThreadUser::getPinned($uriId, $uid)
                );
 
                $sensitive = DBA::exists('tag-view', ['uri-id' => $uriId, 'name' => 'nsfw']);
-               $application = new \Friendica\Object\Api\Mastodon\Application($item['app'] ?? '');
+               $application = new \Friendica\Object\Api\Mastodon\Application($item['app'] ?: ContactSelector::networkToName($item['network'], $item['author-link']));
                $mentions = DI::mstdnMention()->createFromUriId($uriId);
                $tags = DI::mstdnTag()->createFromUriId($uriId);
 
@@ -95,7 +96,7 @@ class Status extends BaseFactory
 
                if ($item['vid'] == Verb::getID(Activity::ANNOUNCE)) {
                        $reshare = $this->createFromUriId($item['thr-parent-id'], $uid)->toArray();
-                       $reshared_item = Post::selectFirst(['title', 'body'], ['uri-id' => $item['thr-parent-id'], 'uid' => $uid]);
+                       $reshared_item = Post::selectFirst(['title', 'body'], ['uri-id' => $item['thr-parent-id'], 'uid' => [0, $uid]]);
                        $item['title'] = $reshared_item['title'] ?? $item['title'];
                        $item['body'] = $reshared_item['body'] ?? $item['body'];
                } else {
index 864e2a5742e0e08f2d3ce02aff55e36811f207e5..9ce301ade0c4540dfb06470a8d0ebb8c9e9f4d0d 100644 (file)
@@ -127,12 +127,13 @@ class Post
         * Check if post data exists
         *
         * @param array $condition array of fields for condition
+        * @param bool  $user_mode true = post-user-view, false = post-view
         *
         * @return boolean Are there rows for that condition?
         * @throws \Exception
         */
-       public static function exists($condition) {
-               return DBA::exists('post-user-view', $condition);
+       public static function exists($condition, bool $user_mode = true) {
+               return DBA::exists($user_mode ? 'post-user-view' : 'post-view', $condition);
        }
 
        /**
@@ -140,6 +141,7 @@ class Post
         *
         * @param array        $condition array of fields for condition
         * @param array        $params    Array of several parameters
+        * @param bool         $user_mode true = post-user-view, false = post-view
         *
         * @return int
         *
@@ -151,9 +153,9 @@ class Post
         * $count = Post::count($condition);
         * @throws \Exception
         */
-       public static function count(array $condition = [], array $params = [])
+       public static function count(array $condition = [], array $params = [], bool $user_mode = true)
        {
-               return DBA::count('post-user-view', $condition, $params);
+               return DBA::count($user_mode ? 'post-user-view' : 'post-view', $condition, $params);
        }
 
        /**
index 6e868d1319acfea547eceb29fc161e24e92b210c..0d48744a40afd258a65a8f4488ba762df94ff3f9 100644 (file)
@@ -46,7 +46,7 @@ class Accounts extends BaseApi
                        DI::mstdnError()->RecordNotFound();
                }
 
-               $account = DI::mstdnAccount()->createFromContactId($id);
+               $account = DI::mstdnAccount()->createFromContactId($id, self::getCurrentUserID());
                System::jsonExit($account);
        }
 }
index d21a1f535d3aeacaff57211a24faf4da47d96903..f6da2aebe2cb7c1f553812c31002cf31829488ab 100644 (file)
@@ -64,8 +64,14 @@ class Statuses extends BaseApi
 
                $params = ['order' => ['uri-id' => true], 'limit' => $limit];
 
-               $condition = ['author-id' => $id, 'private' => [Item::PUBLIC, Item::UNLISTED],
-                       'uid' => 0, 'network' => Protocol::FEDERATED];
+               $uid = self::getCurrentUserID();
+
+               if (!$uid) {
+                       $condition = ['author-id' => $id, 'private' => [Item::PUBLIC, Item::UNLISTED],
+                               'uid' => 0, 'network' => Protocol::FEDERATED];
+               } else {
+                       $condition = ["`author-id` = ? AND (`uid` = 0 OR (`uid` = ? AND NOT `global`))", $id, $uid];
+               }
 
                $condition = DBA::mergeConditions($condition, ["(`gravity` IN (?, ?) OR (`gravity` = ? AND `vid` = ?))",
                        GRAVITY_PARENT, GRAVITY_COMMENT, GRAVITY_ACTIVITY, Verb::getID(Activity::ANNOUNCE)]);
@@ -83,11 +89,11 @@ class Statuses extends BaseApi
                        $params['order'] = ['uri-id'];
                }
 
-               $items = Post::selectForUser(0, ['uri-id', 'uid'], $condition, $params);
+               $items = Post::selectForUser($uid, ['uri-id'], $condition, $params);
 
                $statuses = [];
                while ($item = Post::fetch($items)) {
-                       $statuses[] = DI::mstdnStatus()->createFromUriId($item['uri-id'], $item['uid']);
+                       $statuses[] = DI::mstdnStatus()->createFromUriId($item['uri-id'], $uid);
                }
                DBA::close($items);
 
diff --git a/src/Module/Api/Mastodon/Timelines/Home.php b/src/Module/Api/Mastodon/Timelines/Home.php
new file mode 100644 (file)
index 0000000..dc1b7e0
--- /dev/null
@@ -0,0 +1,91 @@
+<?php
+/**
+ * @copyright Copyright (C) 2010-2021, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace Friendica\Module\Api\Mastodon\Timelines;
+
+use Friendica\Core\System;
+use Friendica\Database\DBA;
+use Friendica\DI;
+use Friendica\Model\Post;
+use Friendica\Module\BaseApi;
+use Friendica\Network\HTTPException;
+
+/**
+ * @see https://docs.joinmastodon.org/methods/timelines/
+ */
+class Home extends BaseApi
+{
+       /**
+        * @param array $parameters
+        * @throws HTTPException\InternalServerErrorException
+        */
+       public static function rawContent(array $parameters = [])
+       {
+               self::login();
+               $uid = self::getCurrentUserID();
+
+               // Return results older than id
+               $max_id = (int)!isset($_REQUEST['max_id']) ? 0 : $_REQUEST['max_id'];
+               // Return results newer than id
+               $since_id = (int)!isset($_REQUEST['since_id']) ? 0 : $_REQUEST['since_id'];
+               // Return results immediately newer than id
+               $min_id = (int)!isset($_REQUEST['min_id']) ? 0 : $_REQUEST['min_id'];
+               // Maximum number of results to return. Defaults to 20.
+               $limit = (int)!isset($_REQUEST['limit']) ? 20 : $_REQUEST['limit'];
+               // Return only local statuses? Defaults to false.
+               $local = (bool)!isset($_REQUEST['local']) ? false : ($_REQUEST['local'] == 'true');
+
+               $params = ['order' => ['uri-id' => true], 'limit' => $limit];
+
+               $condition = ['gravity' => [GRAVITY_PARENT, GRAVITY_COMMENT], 'uid' => $uid];
+
+               if ($local) {
+                       $condition = DBA::mergeConditions($condition, ["`uri-id` IN (SELECT `uri-id` FROM `post-user` WHERE `origin`)"]);
+               }
+
+               if (!empty($max_id)) {
+                       $condition = DBA::mergeConditions($condition, ["`uri-id` < ?", $max_id]);
+               }
+
+               if (!empty($since_id)) {
+                       $condition = DBA::mergeConditions($condition, ["`uri-id` > ?", $since_id]);
+               }
+
+               if (!empty($min_id)) {
+                       $condition = DBA::mergeConditions($condition, ["`uri-id` > ?", $min_id]);
+                       $params['order'] = ['uri-id'];
+               }
+
+               $items = Post::selectForUser($uid, ['uri-id'], $condition, $params);
+
+               $statuses = [];
+               while ($item = Post::fetch($items)) {
+                       $statuses[] = DI::mstdnStatus()->createFromUriId($item['uri-id'], $uid);
+               }
+               DBA::close($items);
+
+               if (!empty($min_id)) {
+                       array_reverse($statuses);
+               }
+
+               System::jsonExit($statuses);
+       }
+}
diff --git a/src/Module/Api/Mastodon/Timelines/Tag.php b/src/Module/Api/Mastodon/Timelines/Tag.php
new file mode 100644 (file)
index 0000000..28b6255
--- /dev/null
@@ -0,0 +1,100 @@
+<?php
+/**
+ * @copyright Copyright (C) 2010-2021, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace Friendica\Module\Api\Mastodon\Timelines;
+
+use Friendica\Core\Protocol;
+use Friendica\Core\System;
+use Friendica\Database\DBA;
+use Friendica\DI;
+use Friendica\Model\Post;
+use Friendica\Module\BaseApi;
+use Friendica\Network\HTTPException;
+
+/**
+ * @see https://docs.joinmastodon.org/methods/timelines/
+ */
+class Tag extends BaseApi
+{
+       /**
+        * @param array $parameters
+        * @throws HTTPException\InternalServerErrorException
+        */
+       public static function rawContent(array $parameters = [])
+       {
+               self::login();
+               $uid = self::getCurrentUserID();
+
+               if (empty($parameters['hashtag'])) {
+                       DI::mstdnError()->RecordNotFound();
+               }
+
+               // If true, return only local statuses. Defaults to false.
+               $local = (bool)!isset($_REQUEST['local']) ? false : ($_REQUEST['local'] == 'true');
+               // If true, return only statuses with media attachments. Defaults to false.
+               $only_media = (bool)!isset($_REQUEST['only_media']) ? false : ($_REQUEST['only_media'] == 'true'); // Currently not supported
+               // Return results older than this ID.
+               $max_id = (int)!isset($_REQUEST['max_id']) ? 0 : $_REQUEST['max_id'];
+               // Return results newer than this ID.
+               $since_id = (int)!isset($_REQUEST['since_id']) ? 0 : $_REQUEST['since_id'];
+               // Return results immediately newer than this ID.
+               $min_id = (int)!isset($_REQUEST['min_id']) ? 0 : $_REQUEST['min_id'];
+               // Maximum number of results to return. Defaults to 20.
+               $limit = (int)!isset($_REQUEST['limit']) ? 20 : $_REQUEST['limit'];
+
+               $params = ['order' => ['uri-id' => true], 'limit' => $limit];
+
+               $condition = ["`name` = ? AND (`uid` = ? OR (`uid` = ? AND NOT `global`))
+                       AND (`network` IN (?, ?, ?, ?) OR (`uid` = ? AND `uid` != ?))",
+                       $parameters['hashtag'], 0, $uid, Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, $uid, 0];
+
+               if ($local) {
+                       $condition = DBA::mergeConditions($condition, ["`uri-id` IN (SELECT `uri-id` FROM `post-user` WHERE `origin`)"]);
+               }
+
+               if (!empty($max_id)) {
+                       $condition = DBA::mergeConditions($condition, ["`uri-id` < ?", $max_id]);
+               }
+
+               if (!empty($since_id)) {
+                       $condition = DBA::mergeConditions($condition, ["`uri-id` > ?", $since_id]);
+               }
+
+               if (!empty($min_id)) {
+                       $condition = DBA::mergeConditions($condition, ["`uri-id` > ?", $min_id]);
+                       $params['order'] = ['uri-id'];
+               }
+
+               $items = DBA::select('tag-search-view', ['uri-id'], $condition, $params);
+
+               $statuses = [];
+               while ($item = Post::fetch($items)) {
+                       $statuses[] = DI::mstdnStatus()->createFromUriId($item['uri-id'], $uid);
+               }
+               DBA::close($items);
+
+               if (!empty($min_id)) {
+                       array_reverse($statuses);
+               }
+
+               System::jsonExit($statuses);
+       }
+}
index ec92b37adb1aa74056923142244ce4fcaf6d3b04..dd09a99dfce8b8b432bb3f4f4136ba34f99b2738 100644 (file)
@@ -142,10 +142,10 @@ return [
                        '/statuses/{id:\d+}/unpin'           => [Module\Api\Mastodon\Unimplemented::class,            [        R::POST]],
                        '/suggestions'                       => [Module\Api\Mastodon\Unimplemented::class,            [R::GET         ]],
                        '/suggestions/{id:\d+}'              => [Module\Api\Mastodon\Unimplemented::class,            [R::DELETE      ]],
-                       '/timelines/home'                    => [Module\Api\Mastodon\Unimplemented::class,            [R::GET         ]],
+                       '/timelines/home'                    => [Module\Api\Mastodon\Timelines\Home::class,           [R::GET         ]],
                        '/timelines/list/{id:\d+}'           => [Module\Api\Mastodon\Unimplemented::class,            [R::GET         ]],
                        '/timelines/public'                  => [Module\Api\Mastodon\Timelines\PublicTimeline::class, [R::GET         ]],
-                       '/timelines/tag/{hashtag}'           => [Module\Api\Mastodon\Unimplemented::class,            [R::GET         ]],
+                       '/timelines/tag/{hashtag}'           => [Module\Api\Mastodon\Timelines\Tag::class,            [R::GET         ]],
                        '/trends'                            => [Module\Api\Mastodon\Trends::class,                   [R::GET         ]],
                ],
                '/v2' => [