Merge pull request #7580 from annando/issue-7563
Issue 7563: Use icons instead of names on posts
This commit is contained in:
Hypolite Petovan
GitHub
commit
7340f366d7
|
|
@ -677,6 +677,7 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
|
|||
'guid' => ($preview ? 'Q0' : $item['guid']),
|
||||
'network' => $item['network'],
|
||||
'network_name' => ContactSelector::networkToName($item['network'], $item['author-link']),
|
||||
'network_icon' => ContactSelector::networkToIcon($item['network'], $item['author-link']),
|
||||
'linktitle' => L10n::t('View %s\'s profile @ %s', $profile_name, $item['author-link']),
|
||||
'profile_url' => $profile_link,
|
||||
'item_photo_menu' => item_photo_menu($item),
|
||||
|
|
|
|||
|
|
@ -71,6 +71,39 @@ class ContactSelector
|
|||
return $o;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param string $profile Profile URL
|
||||
* @return string Server URL
|
||||
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
|
||||
*/
|
||||
private static function getServerURLForProfile($profile)
|
||||
{
|
||||
$server_url = '';
|
||||
|
||||
// Fetch the server url from the contact table
|
||||
$contact = DBA::selectFirst('contact', ['baseurl'], ['uid' => 0, 'nurl' => Strings::normaliseLink($profile)]);
|
||||
if (DBA::isResult($contact) && !empty($contact['baseurl'])) {
|
||||
$server_url = Strings::normaliseLink($contact['baseurl']);
|
||||
}
|
||||
|
||||
if (empty($server_url)) {
|
||||
// Fetch the server url from the gcontact table
|
||||
$gcontact = DBA::selectFirst('gcontact', ['server_url'], ['nurl' => Strings::normaliseLink($profile)]);
|
||||
if (!empty($gcontact) && !empty($gcontact['server_url'])) {
|
||||
$server_url = Strings::normaliseLink($gcontact['server_url']);
|
||||
}
|
||||
}
|
||||
|
||||
if (empty($server_url)) {
|
||||
// Create the server url out of the profile url
|
||||
$parts = parse_url($profile);
|
||||
unset($parts['path']);
|
||||
$server_url = Strings::normaliseLink(Network::unparseURL($parts));
|
||||
}
|
||||
|
||||
return $server_url;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param string $network network
|
||||
* @param string $profile optional, default empty
|
||||
|
|
@ -106,16 +139,7 @@ class ContactSelector
|
|||
$networkname = str_replace($search, $replace, $network);
|
||||
|
||||
if ((in_array($network, Protocol::FEDERATED)) && ($profile != "")) {
|
||||
// Create the server url out of the profile url
|
||||
$parts = parse_url($profile);
|
||||
unset($parts['path']);
|
||||
$server_url = [Strings::normaliseLink(Network::unparseURL($parts))];
|
||||
|
||||
// Fetch the server url
|
||||
$gcontact = DBA::selectFirst('gcontact', ['server_url'], ['nurl' => Strings::normaliseLink($profile)]);
|
||||
if (!empty($gcontact) && !empty($gcontact['server_url'])) {
|
||||
$server_url[] = Strings::normaliseLink($gcontact['server_url']);
|
||||
}
|
||||
$server_url = self::getServerURLForProfile($profile);
|
||||
|
||||
// Now query the GServer for the platform name
|
||||
$gserver = DBA::selectFirst('gserver', ['platform', 'network'], ['nurl' => $server_url]);
|
||||
|
|
@ -140,6 +164,58 @@ class ContactSelector
|
|||
return $networkname;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param string $network network
|
||||
* @param string $profile optional, default empty
|
||||
* @return string
|
||||
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
|
||||
*/
|
||||
public static function networkToIcon($network, $profile = "")
|
||||
{
|
||||
$nets = [
|
||||
Protocol::DFRN => 'friendica',
|
||||
Protocol::OSTATUS => 'gnu-social', // There is no generic OStatus icon
|
||||
Protocol::FEED => 'rss',
|
||||
Protocol::MAIL => 'file-text-o', /// @todo
|
||||
Protocol::DIASPORA => 'diaspora',
|
||||
Protocol::ZOT => 'hubzilla',
|
||||
Protocol::LINKEDIN => 'linkedin',
|
||||
Protocol::XMPP => 'xmpp',
|
||||
Protocol::MYSPACE => 'file-text-o', /// @todo
|
||||
Protocol::GPLUS => 'google-plus',
|
||||
Protocol::PUMPIO => 'file-text-o', /// @todo
|
||||
Protocol::TWITTER => 'twitter',
|
||||
Protocol::DIASPORA2 => 'diaspora',
|
||||
Protocol::STATUSNET => 'gnu-social',
|
||||
Protocol::ACTIVITYPUB => 'activitypub',
|
||||
Protocol::PNUT => 'file-text-o', /// @todo
|
||||
];
|
||||
|
||||
$platform_icons = ['diaspora' => 'diaspora', 'friendica' => 'friendica', 'friendika' => 'friendica',
|
||||
'GNU Social' => 'gnu-social', 'gnusocial' => 'gnu-social', 'hubzilla' => 'hubzilla',
|
||||
'mastodon' => 'mastodon', 'peertube' => 'peertube', 'pixelfed' => 'pixelfed',
|
||||
'pleroma' => 'pleroma', 'red' => 'hubzilla', 'redmatrix' => 'hubzilla',
|
||||
'socialhome' => 'social-home', 'wordpress' => 'wordpress'];
|
||||
|
||||
$search = array_keys($nets);
|
||||
$replace = array_values($nets);
|
||||
|
||||
$network_icon = str_replace($search, $replace, $network);
|
||||
|
||||
if ((in_array($network, Protocol::FEDERATED)) && ($profile != "")) {
|
||||
$server_url = self::getServerURLForProfile($profile);
|
||||
|
||||
// Now query the GServer for the platform name
|
||||
$gserver = DBA::selectFirst('gserver', ['platform'], ['nurl' => $server_url]);
|
||||
|
||||
if (DBA::isResult($gserver) && !empty($gserver['platform'])) {
|
||||
$network_icon = $platform_icons[strtolower($gserver['platform'])] ?? $network_icon;
|
||||
}
|
||||
}
|
||||
|
||||
return $network_icon;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param string $current optional, default empty
|
||||
* @param string $suffix optionsl, default empty
|
||||
|
|
|
|||
|
|
@ -426,6 +426,7 @@ class Post extends BaseObject
|
|||
'edited' => $edited,
|
||||
'network' => $item["network"],
|
||||
'network_name' => ContactSelector::networkToName($item['network'], $item['author-link']),
|
||||
'network_icon' => ContactSelector::networkToIcon($item['network'], $item['author-link']),
|
||||
'received' => $item['received'],
|
||||
'commented' => $item['commented'],
|
||||
'created_date' => $item['created'],
|
||||
|
|
|
|||
|
|
@ -12,7 +12,11 @@
|
|||
{{* Put additional actions in a top-right dropdown menu *}}
|
||||
|
||||
<ul class="nav nav-pills preferences">
|
||||
{{if $item.network_icon != ""}}
|
||||
<li><span class="wall-item-network"><i class="fa fa-{{$item.network_icon}}" title="{{$item.network_name}}" aria-hidden="true"></i></span></li>
|
||||
{{else}}
|
||||
<li><span class="wall-item-network" title="{{$item.app}}">{{$item.network_name}}</span></li>
|
||||
{{/if}}
|
||||
|
||||
{{if $item.plink || $item.star || $item.drop.dropping || $item.edpost || $item.subthread}}
|
||||
<li class="dropdown">
|
||||
|
|
|
|||
|
|
@ -84,8 +84,11 @@ as the value of $top_child_total (this is done at the end of this file)
|
|||
{{* Put addional actions in a top-right dropdown menu *}}
|
||||
|
||||
<ul class="nav nav-pills preferences">
|
||||
{{if $item.network_icon != ""}}
|
||||
<li><span class="wall-item-network"><i class="fa fa-{{$item.network_icon}}" title="{{$item.network_name}}" aria-hidden="true"></i></span></li>
|
||||
{{else}}
|
||||
<li><span class="wall-item-network" title="{{$item.app}}">{{$item.network_name}}</span></li>
|
||||
|
||||
{{/if}}
|
||||
{{if $item.plink || $item.drop.dropping || $item.edpost || $item.ignore || $item.tagger || $item.star || $item.filer || $item.subthread}}
|
||||
<li class="dropdown">
|
||||
<button type="button" class="btn-link dropdown-toggle" data-toggle="dropdown" id="dropdownMenuTools-{{$item.id}}" aria-haspopup="true" aria-expanded="false"><i class="fa fa-angle-down" aria-hidden="true"></i></button>
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user