Merge pull request #12813 from HankG/mastodon-status-post-with-title
Add Friendica Title Extension to Mastodon Statuses POST API
This commit is contained in:
commit
6106b8b75e
|
@ -107,6 +107,7 @@ class Statuses extends BaseApi
|
||||||
'visibility' => '', // Visibility of the posted status. One of: "public", "unlisted", "private" or "direct".
|
'visibility' => '', // Visibility of the posted status. One of: "public", "unlisted", "private" or "direct".
|
||||||
'scheduled_at' => '', // ISO 8601 Datetime at which to schedule a status. Providing this paramter will cause ScheduledStatus to be returned instead of Status. Must be at least 5 minutes in the future.
|
'scheduled_at' => '', // ISO 8601 Datetime at which to schedule a status. Providing this paramter will cause ScheduledStatus to be returned instead of Status. Must be at least 5 minutes in the future.
|
||||||
'language' => '', // ISO 639 language code for this status.
|
'language' => '', // ISO 639 language code for this status.
|
||||||
|
'friendica' => [], // Friendica extensions to the standard Mastodon API spec
|
||||||
], $request);
|
], $request);
|
||||||
|
|
||||||
$owner = User::getOwnerDataById($uid);
|
$owner = User::getOwnerDataById($uid);
|
||||||
|
@ -208,8 +209,10 @@ class Statuses extends BaseApi
|
||||||
$item['quote-uri-id'] = $request['quote_id'];
|
$item['quote-uri-id'] = $request['quote_id'];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$item['title'] = $request['friendica']['title'] ?? '';
|
||||||
|
|
||||||
if (!empty($request['spoiler_text'])) {
|
if (!empty($request['spoiler_text'])) {
|
||||||
if (!$request['in_reply_to_id'] && DI::pConfig()->get($uid, 'system', 'api_spoiler_title', true)) {
|
if (!isset($request['friendica']['title']) && !$request['in_reply_to_id'] && DI::pConfig()->get($uid, 'system', 'api_spoiler_title', true)) {
|
||||||
$item['title'] = $request['spoiler_text'];
|
$item['title'] = $request['spoiler_text'];
|
||||||
} else {
|
} else {
|
||||||
$item['body'] = '[abstract=' . Protocol::ACTIVITYPUB . ']' . $request['spoiler_text'] . "[/abstract]\n" . $item['body'];
|
$item['body'] = '[abstract=' . Protocol::ACTIVITYPUB . ']' . $request['spoiler_text'] . "[/abstract]\n" . $item['body'];
|
||||||
|
|
|
@ -25,6 +25,7 @@ use Friendica\BaseDataTransferObject;
|
||||||
use Friendica\Content\Text\BBCode;
|
use Friendica\Content\Text\BBCode;
|
||||||
use Friendica\Model\Item;
|
use Friendica\Model\Item;
|
||||||
use Friendica\Object\Api\Mastodon\Status\Counts;
|
use Friendica\Object\Api\Mastodon\Status\Counts;
|
||||||
|
use Friendica\Object\Api\Mastodon\Status\FriendicaExtension;
|
||||||
use Friendica\Object\Api\Mastodon\Status\UserAttributes;
|
use Friendica\Object\Api\Mastodon\Status\UserAttributes;
|
||||||
use Friendica\Util\DateTimeFormat;
|
use Friendica\Util\DateTimeFormat;
|
||||||
|
|
||||||
|
@ -95,6 +96,8 @@ class Status extends BaseDataTransferObject
|
||||||
protected $card = null;
|
protected $card = null;
|
||||||
/** @var Poll|null */
|
/** @var Poll|null */
|
||||||
protected $poll = null;
|
protected $poll = null;
|
||||||
|
/** @var FriendicaExtension */
|
||||||
|
protected $friendica;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates a status record from an item record.
|
* Creates a status record from an item record.
|
||||||
|
@ -148,6 +151,7 @@ class Status extends BaseDataTransferObject
|
||||||
$this->emojis = [];
|
$this->emojis = [];
|
||||||
$this->card = $card->toArray() ?: null;
|
$this->card = $card->toArray() ?: null;
|
||||||
$this->poll = $poll;
|
$this->poll = $poll;
|
||||||
|
$this->friendica = new FriendicaExtension($item['title']);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -0,0 +1,48 @@
|
||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* @copyright Copyright (C) 2010-2023, 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\Status;
|
||||||
|
|
||||||
|
use Friendica\BaseDataTransferObject;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Class FriendicaExtension
|
||||||
|
*
|
||||||
|
* Additional fields on Mastodon Statuses for storing Friendica specific data
|
||||||
|
*
|
||||||
|
* @see https://docs.joinmastodon.org/entities/status
|
||||||
|
*/
|
||||||
|
class FriendicaExtension extends BaseDataTransferObject
|
||||||
|
{
|
||||||
|
/** @var string */
|
||||||
|
protected $title;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Creates a status count object
|
||||||
|
*
|
||||||
|
* @param string $title
|
||||||
|
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
|
||||||
|
*/
|
||||||
|
public function __construct(string $title)
|
||||||
|
{
|
||||||
|
$this->title = $title;
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user