keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #8010 from MrPetovan/task/7968-mastodon-api-account-fields

Browse source 
Task/7968 mastodon api account fields
This commit is contained in:
Philipp 2019-12-30 13:28:15 +01:00 committed by GitHub
commit 6c2d13403e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 67 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
src/Api/Mastodon/Account.php
View file

@ -2,6 +2,7 @@
namespace Friendica\Api\Mastodon; namespace Friendica\Api\Mastodon;
use Friendica\App\BaseURL;
use Friendica\Content\Text\BBCode; use Friendica\Content\Text\BBCode;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\Model\Contact; use Friendica\Model\Contact;
@ -10,7 +11,7 @@ use Friendica\Util\DateTimeFormat;
/** /**
* Class Account * Class Account
* *
* @see https://docs.joinmastodon.org/api/entities/#account * @see https://docs.joinmastodon.org/entities/account
*/ */
class Account class Account
{ {
@ -52,37 +53,58 @@ class Account
var $fields = null; var $fields = null;
/** @var bool|null */ /** @var bool|null */
var $bot = null; var $bot = null;
/** @var bool */
var $group;
/** @var bool */
var $discoverable;
/** @var string|null (Datetime) */
var $last_status_at = null;
/** /**
* Creates an account record from a contact record. Expects all contact table fields to be set * Creates an account record from a public contact record. Expects all contact table fields to be set.
* *
* @param array $contact Full contact table record * @param BaseURL $baseUrl
* @param array $apcontact Full apcontact table record * @param array $publicContact Full contact table record with uid = 0
* @param array $apcontact Optional full apcontact table record
* @param array $userContact Optional full contact table record with uid = local_user()
* @return Account * @return Account
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/ */
public static function createFromContact(array $contact, array $apcontact = []) public static function create(BaseURL $baseUrl, array $publicContact, array $apcontact = [], array $userContact = [])
{ {
$account = new Account(); $account = new Account();
$account->id = $contact['id']; $account->id = $publicContact['id'];
$account->username = $contact['nick']; $account->username = $publicContact['nick'];
$account->acct = $contact['nick']; $account->acct =
$account->display_name = $contact['name']; strpos($publicContact['url'], $baseUrl->get() . '/') === 0 ?
$publicContact['nick'] :
$publicContact['addr'];
$account->display_name = $publicContact['name'];
$account->locked = !empty($apcontact['manually-approve']); $account->locked = !empty($apcontact['manually-approve']);
$account->created_at = DateTimeFormat::utc($contact['created'], DateTimeFormat::ATOM); $account->created_at = DateTimeFormat::utc($publicContact['created'], DateTimeFormat::ATOM);
$account->followers_count = $apcontact['followers_count'] ?? 0; $account->followers_count = $apcontact['followers_count'] ?? 0;
$account->following_count = $apcontact['following_count'] ?? 0; $account->following_count = $apcontact['following_count'] ?? 0;
$account->statuses_count = $apcontact['statuses_count'] ?? 0; $account->statuses_count = $apcontact['statuses_count'] ?? 0;
$account->note = BBCode::convert($contact['about'], false); $account->note = BBCode::convert($publicContact['about'], false);
$account->url = $contact['url']; $account->url = $publicContact['url'];
$account->avatar = $contact['avatar']; $account->avatar = $userContact['avatar'] ?? $publicContact['avatar'];
$account->avatar_static = $contact['avatar']; $account->avatar_static = $userContact['avatar'] ?? $publicContact['avatar'];
// No header picture in Friendica // No header picture in Friendica
$account->header = ''; $account->header = '';
$account->header_static = ''; $account->header_static = '';
// No custom emojis per account in Friendica // No custom emojis per account in Friendica
$account->emojis = []; $account->emojis = [];
$account->bot = ($contact['contact-type'] == Contact::TYPE_NEWS); // No metadata fields in Friendica
$account->fields = [];
$account->bot = ($publicContact['contact-type'] == Contact::TYPE_NEWS);
$account->group = ($publicContact['contact-type'] == Contact::TYPE_COMMUNITY);
$account->discoverable = !$publicContact['unsearchable'];
$publicContactLastItem = $publicContact['last-item'] ?: DBA::NULL_DATETIME;
$userContactLastItem = $userContact['last-item'] ?? DBA::NULL_DATETIME;
$lastItem = $userContactLastItem > $publicContactLastItem ? $userContactLastItem : $publicContactLastItem;
$account->last_status_at = $lastItem != DBA::NULL_DATETIME ? DateTimeFormat::utc($lastItem, DateTimeFormat::ATOM) : null;
return $account; return $account;
} }

10
src/Api/Mastodon/Instance.php
View file

@ -3,8 +3,6 @@
namespace Friendica\Api\Mastodon; namespace Friendica\Api\Mastodon;
use Friendica\App; use Friendica\App;
use Friendica\Api\Mastodon\Account;
use Friendica\Api\Mastodon\Stats;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\DI; use Friendica\DI;
@ -58,15 +56,17 @@ class Instance
{ {
$register_policy = intval(Config::get('config', 'register_policy')); $register_policy = intval(Config::get('config', 'register_policy'));
$baseUrl = DI::baseUrl();
$instance = new Instance(); $instance = new Instance();
$instance->uri = DI::baseUrl()->get(); $instance->uri = $baseUrl->get();
$instance->title = Config::get('config', 'sitename'); $instance->title = Config::get('config', 'sitename');
$instance->description = Config::get('config', 'info'); $instance->description = Config::get('config', 'info');
$instance->email = Config::get('config', 'admin_email'); $instance->email = Config::get('config', 'admin_email');
$instance->version = FRIENDICA_VERSION; $instance->version = FRIENDICA_VERSION;
$instance->urls = []; // Not supported $instance->urls = []; // Not supported
$instance->stats = Stats::get(); $instance->stats = Stats::get();
$instance->thumbnail = DI::baseUrl()->get() . (Config::get('system', 'shortcut_icon') ?? 'images/friendica-32.png'); $instance->thumbnail = $baseUrl->get() . (Config::get('system', 'shortcut_icon') ?? 'images/friendica-32.png');
$instance->languages = [Config::get('system', 'language')]; $instance->languages = [Config::get('system', 'language')];
$instance->max_toot_chars = (int)Config::get('config', 'api_import_size', Config::get('config', 'max_import_size')); $instance->max_toot_chars = (int)Config::get('config', 'api_import_size', Config::get('config', 'max_import_size'));
$instance->registrations = ($register_policy != Register::CLOSED); $instance->registrations = ($register_policy != Register::CLOSED);
@ -79,7 +79,7 @@ class Instance
if (!empty($administrator)) { if (!empty($administrator)) {
$adminContact = DBA::selectFirst('contact', [], ['nick' => $administrator['nickname'], 'self' => true]); $adminContact = DBA::selectFirst('contact', [], ['nick' => $administrator['nickname'], 'self' => true]);
$apcontact = APContact::getByURL($adminContact['url'], false); $apcontact = APContact::getByURL($adminContact['url'], false);
$instance->contact_account = Account::createFromContact($adminContact, $apcontact); $instance->contact_account = Account::create($baseUrl, $adminContact, $apcontact);
} }
} }

32
src/Module/Api/Mastodon/FollowRequests.php
View file

@ -26,6 +26,15 @@ class FollowRequests extends Api
} }
} }
/**
* @param array $parameters
* @throws HTTPException\BadRequestException
* @throws HTTPException\ForbiddenException
* @throws HTTPException\NotFoundException
* @throws HTTPException\UnauthorizedException
* @see https://docs.joinmastodon.org/methods/accounts/follow_requests#accept-follow
* @see https://docs.joinmastodon.org/methods/accounts/follow_requests#reject-follow
*/
public static function post(array $parameters = []) public static function post(array $parameters = [])
{ {
parent::post($parameters); parent::post($parameters);
@ -58,7 +67,8 @@ class FollowRequests extends Api
/** /**
* @param array $parameters * @param array $parameters
* @throws HTTPException\InternalServerErrorException * @throws HTTPException\InternalServerErrorException
* @see https://docs.joinmastodon.org/api/rest/follow-requests/#get-api-v1-follow-requests * @throws \ImagickException
* @see https://docs.joinmastodon.org/methods/accounts/follow_requests#pending-follows
*/ */
public static function rawContent(array $parameters = []) public static function rawContent(array $parameters = [])
{ {
@ -66,6 +76,8 @@ class FollowRequests extends Api
$max_id = $_GET['max_id'] ?? null; $max_id = $_GET['max_id'] ?? null;
$limit = intval($_GET['limit'] ?? 40); $limit = intval($_GET['limit'] ?? 40);
$baseUrl = DI::baseUrl();
if (isset($since_id) && isset($max_id)) { if (isset($since_id) && isset($max_id)) {
$condition = ['`uid` = ? AND NOT `ignore` AND `id` > ? AND `id` < ?', self::$current_user_id, $since_id, $max_id]; $condition = ['`uid` = ? AND NOT `ignore` AND `id` > ? AND `id` < ?', self::$current_user_id, $since_id, $max_id];
} elseif (isset($since_id)) { } elseif (isset($since_id)) {
@ -87,9 +99,15 @@ class FollowRequests extends Api
$return = []; $return = [];
foreach ($intros as $intro) { foreach ($intros as $intro) {
$contact = Contact::getById($intro['contact-id']); $cdata = Contact::getPublicAndUserContacID($intro['contact-id'], $intro['uid']);
$apcontact = APContact::getByURL($contact['url'], false); if (empty($cdata['public'])) {
$account = Mastodon\Account::createFromContact($contact, $apcontact); continue;
}
$publicContact = Contact::getById($cdata['public']);
$userContact = Contact::getById($cdata['user']);
$apcontact = APContact::getByURL($publicContact['url'], false);
$account = Mastodon\Account::create($baseUrl, $publicContact, $apcontact, $userContact);
// Not ideal, the same "account" can have multiple ids depending on the context // Not ideal, the same "account" can have multiple ids depending on the context
$account->id = $intro['id']; $account->id = $intro['id'];
@ -102,13 +120,11 @@ class FollowRequests extends Api
$base_query['limit'] = $limit; $base_query['limit'] = $limit;
} }
$BaseURL = DI::baseUrl();
$links = []; $links = [];
if ($count > $limit) { if ($count > $limit) {
$links[] = '<' . $BaseURL->get() . '/api/v1/follow_requests?' . http_build_query($base_query + ['max_id' => $intros[count($intros) - 1]['id']]) . '>; rel="next"'; $links[] = '<' . $baseUrl->get() . '/api/v1/follow_requests?' . http_build_query($base_query + ['max_id' => $intros[count($intros) - 1]['id']]) . '>; rel="next"';
} }
$links[] = '<' . $BaseURL->get() . '/api/v1/follow_requests?' . http_build_query($base_query + ['since_id' => $intros[0]['id']]) . '>; rel="prev"'; $links[] = '<' . $baseUrl->get() . '/api/v1/follow_requests?' . http_build_query($base_query + ['since_id' => $intros[0]['id']]) . '>; rel="prev"';
header('Link: ' . implode(', ', $links)); header('Link: ' . implode(', ', $links));

2
src/Module/Api/Mastodon/Instance.php
View file

@ -13,7 +13,7 @@ class Instance extends Api
{ {
/** /**
* @param array $parameters * @param array $parameters
* @throws HTTPException\InternalServerErrorException * @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/ */
public static function rawContent(array $parameters = []) public static function rawContent(array $parameters = [])
{ {