strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Add new Model\Contact::canReceivePrivateMessages method

Browse source
This commit is contained in:
Hypolite Petovan 2019-06-10 21:29:11 -04:00
parent 0fbfb7c970
commit 61c79ce9ee
1 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/Model/Contact.php
View file

@ -894,7 +894,7 @@ class Contact extends BaseObject
// If there is more than one entry we filter out the connector networks // If there is more than one entry we filter out the connector networks
if (count($r) > 1) { if (count($r) > 1) {
foreach ($r as $id => $result) { foreach ($r as $id => $result) {
if ($result["network"] == Protocol::STATUSNET) { if (!in_array($result["network"], Protocol::NATIVE_SUPPORT)) {
unset($r[$id]); unset($r[$id]);
} }
} }
@ -1078,7 +1078,7 @@ class Contact extends BaseObject
$profile_link = $profile_link . '?tab=profile'; $profile_link = $profile_link . '?tab=profile';
} }
if (in_array($contact['network'], [Protocol::DFRN, Protocol::DIASPORA]) && !$contact['self']) { if (self::canReceivePrivateMessages($contact)) {
$pm_url = System::baseUrl() . '/message/new/' . $contact['id']; $pm_url = System::baseUrl() . '/message/new/' . $contact['id'];
} }
@ -2447,4 +2447,18 @@ class Contact extends BaseObject
// Is it a forum? // Is it a forum?
return ($contact['forum'] || $contact['prv']); return ($contact['forum'] || $contact['prv']);
} }
/**
* Can the remote contact receive private messages?
*
* @param array $contact
* @return bool
*/
public static function canReceivePrivateMessages(array $contact)
{
$protocol = $contact['network'] ?? $contact['protocol'] ?? Protocol::PHANTOM;
$self = $contact['self'] ?? false;
return in_array($protocol, [Protocol::DFRN, Protocol::DIASPORA, Protocol::ACTIVITYPUB]) && !$self;
}
} }