Preparation für multiple icon styles / improved code

This commit is contained in:
Michael 2024-11-09 14:39:32 +00:00
parent c8a4b67414
commit a4c5d7539c
368 changed files with 1949 additions and 1009 deletions

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;

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

View file

@ -606,9 +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_svg' => ContactSelector::networkToSVG($item['network'], $item['author-link'], $item['author-gsid'], '', DI::userSession()->getLocalUserId()),
'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'],