use Friendica\BaseFactory;
use Friendica\Database\Database;
+use Friendica\Model\Subscription;
use Friendica\Network\HTTPException\UnprocessableEntityException;
use Psr\Log\LoggerInterface;
$application['client_secret'],
$application['id'],
$application['redirect_uri'],
- $application['website']);
+ $application['website'],
+ Subscription::getPublicVapidKey(),
+ );
}
}
namespace Friendica\Module\Api\Mastodon\Apps;
-use Friendica\Core\System;
use Friendica\DI;
use Friendica\Module\BaseApi;
use Psr\Log\LoggerInterface;
/**
- * @see https://docs.joinmastodon.org/api/rest/instances/
+ * @see https://docs.joinmastodon.org/methods/instance/
*/
class Instance extends BaseApi
{
--- /dev/null
+<?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')));
+ }
+}
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;
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;
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);
$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]);
}
protected $redirect_uri;
/** @var string */
protected $website;
+ /** @var string */
+ protected $vapid_key;
/**
* Creates an application entry
* @param array $item
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
- public function __construct(string $name, string $client_id = null, string $client_secret = null, int $id = null, string $redirect_uri = null, string $website = null)
+ public function __construct(string $name, string $client_id = null, string $client_secret = null, int $id = null, string $redirect_uri = null, string $website = null, string $vapid_key = null)
{
$this->client_id = $client_id;
$this->client_secret = $client_secret;
$this->name = $name;
$this->redirect_uri = $redirect_uri;
$this->website = $website;
+ $this->vapid_key = $vapid_key;
}
/**
protected $provider_name;
/** @var string */
protected $provider_url;
+ /** @var string */
+ protected $html;
/** @var int */
protected $width;
/** @var int */
/** @var string */
protected $image;
/** @var string */
+ protected $embed_url;
+ /** @var string */
protected $blurhash;
/** @var array */
protected $history;
$this->author_url = $attachment['author_url'] ?? '';
$this->provider_name = $attachment['provider_name'] ?? '';
$this->provider_url = $attachment['provider_url'] ?? '';
+ $this->html = '';
$this->width = $attachment['width'] ?? 0;
$this->height = $attachment['height'] ?? 0;
$this->image = $attachment['image'] ?? '';
+ $this->embed_url = '';
$this->blurhash = $attachment['blurhash'] ?? '';
$this->history = $history;
}
--- /dev/null
+<?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\Object\Api\Mastodon;
+
+use Friendica\BaseDataTransferObject;
+use Friendica\Util\DateTimeFormat;
+
+/**
+ * Class ExtendedDescription
+ *
+ * @see https://docs.joinmastodon.org/entities/ExtendedDescription/
+ */
+class ExtendedDescription extends BaseDataTransferObject
+{
+ /** @var string (Datetime) */
+ protected $updated_at;
+ /** @var string */
+ protected $content;
+
+ public function __construct(\DateTime $updated_at, string $content)
+ {
+ $this->updated_at = $updated_at->format(DateTimeFormat::JSON);
+ $this->content = $content;
+ }
+}
'/instance' => [Module\Api\Mastodon\Instance::class, [R::GET ]],
'/instance/activity' => [Module\Api\Mastodon\Unimplemented::class, [R::GET ]], // @todo
'/instance/domain_blocks' => [Module\Api\Mastodon\Unimplemented::class, [R::GET ]], // @todo
- '/instance/extended_description' => [Module\Api\Mastodon\Unimplemented::class, [R::GET ]], // @todo
+ '/instance/extended_description' => [Module\Api\Mastodon\Instance\Extended::class, [R::GET ]],
'/instance/peers' => [Module\Api\Mastodon\Instance\Peers::class, [R::GET ]],
'/instance/rules' => [Module\Api\Mastodon\Instance\Rules::class, [R::GET ]],
'/lists' => [Module\Api\Mastodon\Lists::class, [R::GET, R::POST]],
https://reisub.nsupdate.info/git / friendica.git / .git / commitdiff