Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-05-06 11:04:12 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into refactoring-of-app-class

Browse source
This commit is contained in:
Art4 2024-11-16 19:29:56 +00:00
commit a24a65de2f
561 changed files with 64963 additions and 61342 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/Object/Api/Mastodon/Status/FriendicaExtension.php
View file

@ -57,6 +57,9 @@ class FriendicaExtension extends BaseDataTransferObject
*/
protected $visibility;
/** @var string|null */
protected $content;
/**
* Creates a FriendicaExtension object
*
@ -86,7 +89,8 @@ class FriendicaExtension extends BaseDataTransferObject
?string $version,
?string $sitename,
?FriendicaDeliveryData $delivery_data,
?FriendicaVisibility $visibility
?FriendicaVisibility $visibility,
?string $content
) {
$this->title = $title;
$this->changed_at = $changed_at ? DateTimeFormat::utc($changed_at, DateTimeFormat::JSON) : null;
@ -100,6 +104,7 @@ class FriendicaExtension extends BaseDataTransferObject
$this->version = $version;
$this->sitename = $sitename;
$this->visibility = $visibility;
$this->content = $content;
}
/**

2
src/Object/Api/Twitter/Status.php
View file

@ -121,7 +121,7 @@ class Status extends BaseDataTransferObject
$this->entities = $entities;
$this->extended_entities = $entities;
$origin = ContactSelector::networkToName($item['author-network'], $item['author-link'], $item['network']);
$origin = ContactSelector::networkToName($item['author-network'], $item['network'], $item['author-gsid']);
if (empty($this->source)) {
$this->source = $origin;

2
src/Object/Api/Twitter/User.php
View file

@ -131,7 +131,7 @@ class User extends BaseDataTransferObject
$this->name = $publicContact['name'] ?: $publicContact['nick'];
$this->screen_name = $publicContact['nick'] ?: $publicContact['name'];
$this->location = $publicContact['location'] ?:
ContactSelector::networkToName($publicContact['network'], $publicContact['url'], $publicContact['protocol']);
ContactSelector::networkToName($publicContact['network'], $publicContact['protocol'], $publicContact['gsid']);
$this->derived = [];
$this->url = $publicContact['url'];
// No entities needed since we don't perform any shortening in the URL or description

4
src/Object/Post.php
View file

@ -606,8 +606,8 @@ class Post
'edited' => $edited,
'author_gsid' => $item['author-gsid'],
'network' => $item['network'],
'network_name' => ContactSelector::networkToName($item['author-network'], $item['author-link'], $item['network'], $item['author-gsid']),
'network_icon' => ContactSelector::networkToIcon($item['network'], $item['author-link'], $item['author-gsid']),
'network_name' => ContactSelector::networkToName($item['author-network'], $item['network'], $item['author-gsid']),
'network_svg' => ContactSelector::networkToSVG($item['network'], $item['author-gsid'], '', DI::userSession()->getLocalUserId()),
'received' => $item['received'],
'commented' => $item['commented'],
'created_date' => $item['created'],