Fix API issues #13887, #13886, #13863, #13809, #13897 (#13911)

src/Module/Api/Mastodon/Apps/VerifyCredentials.php

@@ -21,7 +21,6 @@
 
 namespace Friendica\Module\Api\Mastodon\Apps;
 
-use Friendica\Core\System;
 use Friendica\DI;
 use Friendica\Module\BaseApi;
 

src/Module/Api/Mastodon/Instance.php

@@ -38,7 +38,7 @@ use Friendica\Util\Strings;
 use Psr\Log\LoggerInterface;
 
 /**
- * @see https://docs.joinmastodon.org/api/rest/instances/
+ * @see https://docs.joinmastodon.org/methods/instance/
  */
 class Instance extends BaseApi
 {

src/Module/Api/Mastodon/Instance/Extended.php

@@ -0,0 +1,60 @@
+<?php
+/**
+ * @copyright Copyright (C) 2010-2024, 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\Instance;
+
+use DateTime;
+use Friendica\App;
+use Friendica\Core\Config\Capability\IManageConfigValues;
+use Friendica\Core\L10n;
+use Friendica\Database\Database;
+use Friendica\Model\User;
+use Friendica\Module\Api\ApiResponse;
+use Friendica\Module\BaseApi;
+use Friendica\Object\Api\Mastodon\ExtendedDescription;
+use Friendica\Util\Profiler;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Undocumented API endpoint that is implemented by both Mastodon and Pleroma
+ */
+class Extended extends BaseApi
+{
+	/** @var IManageConfigValues */
+	private $config;
+
+	public function __construct(\Friendica\Factory\Api\Mastodon\Error $errorFactory, App $app, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, ApiResponse $response, Database $database, IManageConfigValues $config, array $server, array $parameters = [])
+	{
+		parent::__construct($errorFactory, $app, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+
+		$this->config = $config;
+	}
+
+	/**
+	 * @throws HTTPException\InternalServerErrorException
+	 */
+	protected function rawContent(array $request = [])
+	{
+		$account = User::getSystemAccount();
+
+		$this->jsonExit(new ExtendedDescription(new DateTime($account['updated']), $this->config->get('config', 'info')));
+	}
+}

src/Module/Api/Mastodon/Instance/Peers.php

@@ -22,7 +22,6 @@
 namespace Friendica\Module\Api\Mastodon\Instance;
 
 use Friendica\Core\Protocol;
-use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\GServer;
 use Friendica\Module\BaseApi;

src/Module/Api/Mastodon/Instance/Rules.php

@@ -21,10 +21,7 @@
 
 namespace Friendica\Module\Api\Mastodon\Instance;
 
-use Friendica\Content\Text\BBCode;
-use Friendica\Content\Text\HTML;
 use Friendica\Core\System;
-use Friendica\DI;
 use Friendica\Module\BaseApi;
 use Friendica\Network\HTTPException;
 

src/Module/Api/Mastodon/Search.php

@@ -137,6 +137,9 @@ class Search extends BaseApi
 	private static function searchStatuses(int $uid, string $q, string $account_id, int $max_id, int $min_id, int $limit, int $offset)
 	{
 		if (Network::isValidHttpUrl($q)) {
+			if ($offset != 0) {
+				return [];
+			}
 			$q = Network::convertToIdn($q);
 			// If the user-specific search failed, we search and probe a public post
 			$item_id = Item::fetchByLink($q, $uid) ?: Item::fetchByLink($q);
@@ -158,6 +161,10 @@ class Search extends BaseApi
 			$table = 'post-searchindex';
 		}
 
+		if (!empty($account_id)) {
+			$condition = DBA::mergeConditions($condition, ["`author-id` = ?", $account_id]);
+		}
+
 		if (!empty($max_id)) {
 			$condition = DBA::mergeConditions($condition, ["`uri-id` < ?", $max_id]);
 		}