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

Merge pull request #8020 from annando/network-protocol

Browse source 
Additionally display the protocol together with the network
This commit is contained in:
Hypolite Petovan 2019-12-27 22:00:48 -05:00 committed by GitHub
commit e6fdd07c3c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
include/api.php
View file

@ -613,7 +613,7 @@ function api_get_user(App $a, $contact_id = null)
'id_str' => (string) $contact["id"], 'id_str' => (string) $contact["id"],
'name' => $contact["name"], 'name' => $contact["name"],
'screen_name' => (($contact['nick']) ? $contact['nick'] : $contact['name']), 'screen_name' => (($contact['nick']) ? $contact['nick'] : $contact['name']),
'location' => ($contact["location"] != "") ? $contact["location"] : ContactSelector::networkToName($contact['network'], $contact['url']), 'location' => ($contact["location"] != "") ? $contact["location"] : ContactSelector::networkToName($contact['network'], $contact['url'], $contact['protocol']),
'description' => BBCode::toPlaintext($contact["about"]), 'description' => BBCode::toPlaintext($contact["about"]),
'profile_image_url' => $contact["micro"], 'profile_image_url' => $contact["micro"],
'profile_image_url_https' => $contact["micro"], 'profile_image_url_https' => $contact["micro"],
@ -679,7 +679,7 @@ function api_get_user(App $a, $contact_id = null)
} elseif (!empty($uinfo[0]["location"])) { } elseif (!empty($uinfo[0]["location"])) {
$location = $uinfo[0]["location"]; $location = $uinfo[0]["location"];
} else { } else {
$location = ContactSelector::networkToName($uinfo[0]['network'], $uinfo[0]['url']); $location = ContactSelector::networkToName($uinfo[0]['network'], $uinfo[0]['url'], $uinfo[0]['protocol']);
} }
$ret = [ $ret = [
@ -3056,9 +3056,9 @@ function api_format_item($item, $type = "json", $status_user = null, $author_use
} }
if ($status["source"] == 'web') { if ($status["source"] == 'web') {
$status["source"] = ContactSelector::networkToName($item['network'], $item['author-link']); $status["source"] = ContactSelector::networkToName($item['author-network'], $item['author-link'], $item['network']);
} elseif (ContactSelector::networkToName($item['network'], $item['author-link']) != $status["source"]) { } elseif (ContactSelector::networkToName($item['author-network'], $item['author-link'], $item['network']) != $status["source"]) {
$status["source"] = trim($status["source"].' ('.ContactSelector::networkToName($item['network'], $item['author-link']).')'); $status["source"] = trim($status["source"].' ('.ContactSelector::networkToName($item['author-network'], $item['author-link'], $item['network']).')');
} }
$retweeted_item = []; $retweeted_item = [];

2
include/conversation.php
View file

@ -684,7 +684,7 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
'id' => ($preview ? 'P0' : $item['id']), 'id' => ($preview ? 'P0' : $item['id']),
'guid' => ($preview ? 'Q0' : $item['guid']), 'guid' => ($preview ? 'Q0' : $item['guid']),
'network' => $item['network'], 'network' => $item['network'],
'network_name' => ContactSelector::networkToName($item['network'], $item['author-link']), 'network_name' => ContactSelector::networkToName($item['author-network'], $item['author-link'], $item['network']),
'network_icon' => ContactSelector::networkToIcon($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']), 'linktitle' => L10n::t('View %s\'s profile @ %s', $profile_name, $item['author-link']),
'profile_url' => $profile_link, 'profile_url' => $profile_link,

9
src/Content/ContactSelector.php
View file

@ -105,12 +105,13 @@ class ContactSelector
} }
/** /**
* @param string $network network * @param string $network network of the contact
* @param string $profile optional, default empty * @param string $profile optional, default empty
* @param string $protocol (Optional) Protocol that is used for the transmission
* @return string * @return string
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/ */
public static function networkToName($network, $profile = "") public static function networkToName($network, $profile = '', $protocol = '')
{ {
$nets = [ $nets = [
Protocol::DFRN => L10n::t('DFRN'), Protocol::DFRN => L10n::t('DFRN'),
@ -162,6 +163,10 @@ class ContactSelector
} }
} }
if (!empty($protocol) && ($protocol != $network)) {
$networkname = L10n::t('%s (via %s)', $networkname, self::networkToName($protocol));
}
return $networkname; return $networkname;
} }

4
src/Module/Contact.php
View file

@ -528,7 +528,7 @@ class Contact extends BaseModule
$poll_enabled = in_array($contact['network'], [Protocol::DFRN, Protocol::OSTATUS, Protocol::FEED, Protocol::MAIL]); $poll_enabled = in_array($contact['network'], [Protocol::DFRN, Protocol::OSTATUS, Protocol::FEED, Protocol::MAIL]);
$nettype = L10n::t('Network type: %s', ContactSelector::networkToName($contact['network'], $contact['url'])); $nettype = L10n::t('Network type: %s', ContactSelector::networkToName($contact['network'], $contact['url'], $contact['protocol']));
// tabs // tabs
$tab_str = self::getTabsHTML($a, $contact, 3); $tab_str = self::getTabsHTML($a, $contact, 3);
@ -1043,7 +1043,7 @@ class Contact extends BaseModule
'sparkle' => $sparkle, 'sparkle' => $sparkle,
'itemurl' => ($rr['addr'] ?? '') ?: $rr['url'], 'itemurl' => ($rr['addr'] ?? '') ?: $rr['url'],
'url' => $url, 'url' => $url,
'network' => ContactSelector::networkToName($rr['network'], $rr['url']), 'network' => ContactSelector::networkToName($rr['network'], $rr['url'], $rr['protocol']),
'nick' => $rr['nick'], 'nick' => $rr['nick'],
]; ];
} }

2
src/Module/Profile/Contacts.php
View file

@ -102,7 +102,7 @@ class Contacts extends BaseModule
'url' => Contact::magicLink($contact['url']), 'url' => Contact::magicLink($contact['url']),
'sparkle' => '', 'sparkle' => '',
'itemurl' => $contact_details['addr'] ? : $contact['url'], 'itemurl' => $contact_details['addr'] ? : $contact['url'],
'network' => ContactSelector::networkToName($contact['network'], $contact['url']), 'network' => ContactSelector::networkToName($contact['network'], $contact['url'], $contact['protocol']),
]; ];
} }

2
src/Object/Post.php
View file

@ -452,7 +452,7 @@ class Post extends BaseObject
'thread_level' => $thread_level, 'thread_level' => $thread_level,
'edited' => $edited, 'edited' => $edited,
'network' => $item["network"], 'network' => $item["network"],
'network_name' => ContactSelector::networkToName($item['network'], $item['author-link']), 'network_name' => ContactSelector::networkToName($item['author-network'], $item['author-link'], $item['network']),
'network_icon' => ContactSelector::networkToIcon($item['network'], $item['author-link']), 'network_icon' => ContactSelector::networkToIcon($item['network'], $item['author-link']),
'received' => $item['received'], 'received' => $item['received'],
'commented' => $item['commented'], 'commented' => $item['commented'],