From 1280bb56dfb4d1ff3cdba57a5dc39dd2c3185a95 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 26 Aug 2018 05:27:50 +0000
Subject: [PATCH] Removed notices in notifications

---
 src/Core/NotificationsManager.php | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/Core/NotificationsManager.php b/src/Core/NotificationsManager.php
index d256b9adc1..f8c4ee3f86 100644
--- a/src/Core/NotificationsManager.php
+++ b/src/Core/NotificationsManager.php
@@ -345,8 +345,20 @@ class NotificationsManager extends BaseObject
 
 					case ACTIVITY_FRIEND:
 						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' ?" . ">";
 						$obj = XML::parseString($xmlhead . $it['object']);
@@ -645,6 +657,10 @@ class NotificationsManager extends BaseObject
 			} else {
 				$it = $this->getMissingIntroData($it);
 
+				if (empty($it['url'])) {
+					continue;
+				}
+
 				// Don't show these data until you are connected. Diaspora is doing the same.
 				if ($it['gnetwork'] === Protocol::DIASPORA) {
 					$it['glocation'] = "";
@@ -693,22 +709,22 @@ class NotificationsManager extends BaseObject
 	{
 		// If the network and the addr isn't available from the gcontact
 		// table entry, take the one of the contact table entry
-		if ($arr['gnetwork'] == "") {
+		if (empty($arr['gnetwork']) && !empty($arr['network'])) {
 			$arr['gnetwork'] = $arr['network'];
 		}
-		if ($arr['gaddr'] == "") {
+		if (empty($arr['gaddr']) && !empty($arr['addr'])) {
 			$arr['gaddr'] = $arr['addr'];
 		}
 
 		// If the network and addr is still not available
 		// 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']);
 
-			if ($arr['gnetwork'] == "" && $ret['network'] != "") {
+			if (empty($arr['gnetwork']) && !empty($ret['network'])) {
 				$arr['gnetwork'] = $ret['network'];
 			}
-			if ($arr['gaddr'] == "" && $ret['addr'] != "") {
+			if (empty($arr['gaddr']) && !empty($ret['addr'])) {
 				$arr['gaddr'] = $ret['addr'];
 			}
 		}
-- 
2.39.5