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

Merge pull request #5669 from annando/notices-in-notifications

Browse source 
Removed notices in notifications
This commit is contained in:
Tobias Diekershoff 2018-08-26 07:47:10 +02:00 committed by GitHub
commit c1933fcb13
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/Core/NotificationsManager.php
View file

@ -345,8 +345,20 @@ class NotificationsManager extends BaseObject
case ACTIVITY_FRIEND: case ACTIVITY_FRIEND:
if (!isset($it['object'])) { if (!isset($it['object'])) {
logger('Incomplete data: ' . json_encode($it) . ' - ' . System::callstack(20), LOGGER_DEBUG); $notif = [
'label' => 'friend',
'link' => $default_item_link,
'image' => $default_item_image,
'url' => $default_item_url,
'text' => $default_item_text,
'when' => $default_item_when,
'ago' => $default_item_ago,
'seen' => $it['seen']
];
break;
} }
/// @todo Check if this part here is used at all
logger('Complete data: ' . json_encode($it) . ' - ' . System::callstack(20), LOGGER_DEBUG);
$xmlhead = "<" . "?xml version='1.0' encoding='UTF-8' ?" . ">"; $xmlhead = "<" . "?xml version='1.0' encoding='UTF-8' ?" . ">";
$obj = XML::parseString($xmlhead . $it['object']); $obj = XML::parseString($xmlhead . $it['object']);
@ -645,6 +657,10 @@ class NotificationsManager extends BaseObject
} else { } else {
$it = $this->getMissingIntroData($it); $it = $this->getMissingIntroData($it);
if (empty($it['url'])) {
continue;
}
// Don't show these data until you are connected. Diaspora is doing the same. // Don't show these data until you are connected. Diaspora is doing the same.
if ($it['gnetwork'] === Protocol::DIASPORA) { if ($it['gnetwork'] === Protocol::DIASPORA) {
$it['glocation'] = ""; $it['glocation'] = "";
@ -693,22 +709,22 @@ class NotificationsManager extends BaseObject
{ {
// If the network and the addr isn't available from the gcontact // If the network and the addr isn't available from the gcontact
// table entry, take the one of the contact table entry // table entry, take the one of the contact table entry
if ($arr['gnetwork'] == "") { if (empty($arr['gnetwork']) && !empty($arr['network'])) {
$arr['gnetwork'] = $arr['network']; $arr['gnetwork'] = $arr['network'];
} }
if ($arr['gaddr'] == "") { if (empty($arr['gaddr']) && !empty($arr['addr'])) {
$arr['gaddr'] = $arr['addr']; $arr['gaddr'] = $arr['addr'];
} }
// If the network and addr is still not available // If the network and addr is still not available
// get the missing data data from other sources // get the missing data data from other sources
if ($arr['gnetwork'] == "" || $arr['gaddr'] == "") { if (empty($arr['gnetwork']) || empty($arr['gaddr'])) {
$ret = Contact::getDetailsByURL($arr['url']); $ret = Contact::getDetailsByURL($arr['url']);
if ($arr['gnetwork'] == "" && $ret['network'] != "") { if (empty($arr['gnetwork']) && !empty($ret['network'])) {
$arr['gnetwork'] = $ret['network']; $arr['gnetwork'] = $ret['network'];
} }
if ($arr['gaddr'] == "" && $ret['addr'] != "") { if (empty($arr['gaddr']) && !empty($ret['addr'])) {
$arr['gaddr'] = $ret['addr']; $arr['gaddr'] = $ret['addr'];
} }
} }