X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fping.php;h=1b4cfb3332a8c29151b3d866bfe50834aa9b8d5b;hb=3972fe62fe8afb3791e9d6526e7665501a577b81;hp=7c8d6c846d6c917113ccaef4c6dcab7d970db133;hpb=dca1fa06bfed2928fff2a222aa7ceb12038ee230;p=friendica.git

diff --git a/mod/ping.php b/mod/ping.php
index 7c8d6c846d..1b4cfb3332 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -28,11 +28,12 @@ use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Group;
-use Friendica\Model\Item;
-use Friendica\Model\Notify\Type;
+use Friendica\Model\Notification;
+use Friendica\Model\Post;
 use Friendica\Model\Verb;
 use Friendica\Protocol\Activity;
 use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Proxy;
 use Friendica\Util\Temporal;
 use Friendica\Util\XML;
 
@@ -133,13 +134,13 @@ function ping_init(App $a)
 			exit();
 		}
 
-		$notifs = ping_get_notifications(local_user());
+		$notifications = ping_get_notifications(local_user());
 
 		$condition = ["`unseen` AND `uid` = ? AND NOT `origin` AND (`vid` != ? OR `vid` IS NULL)",
 			local_user(), Verb::getID(Activity::FOLLOW)];
-		$items = Item::selectForUser(local_user(), ['wall', 'uid', 'uri-id'], $condition);
+		$items = Post::selectForUser(local_user(), ['wall', 'uid', 'uri-id'], $condition, ['limit' => 1000]);
 		if (DBA::isResult($items)) {
-			$items_unseen = Item::inArray($items);
+			$items_unseen = Post::toArray($items, false);
 			$arr = ['items' => $items_unseen];
 			Hook::callAll('network_ping', $arr);
 
@@ -174,32 +175,26 @@ function ping_init(App $a)
 			}
 		}
 
-		$intros1 = q(
+		$intros1 = DBA::toArray(DBA::p(
 			"SELECT  `intro`.`id`, `intro`.`datetime`,
 			`fcontact`.`name`, `fcontact`.`url`, `fcontact`.`photo`
-			FROM `intro` LEFT JOIN `fcontact` ON `intro`.`fid` = `fcontact`.`id`
-			WHERE `intro`.`uid` = %d  AND `intro`.`blocked` = 0 AND `intro`.`ignore` = 0 AND `intro`.`fid` != 0",
-			intval(local_user())
-		);
-		$intros2 = q(
+			FROM `intro` INNER JOIN `fcontact` ON `intro`.`fid` = `fcontact`.`id`
+			WHERE `intro`.`uid` = ? AND NOT `intro`.`blocked` AND NOT `intro`.`ignore` AND `intro`.`fid` != 0",
+			local_user()
+		));
+		$intros2 = DBA::toArray(DBA::p(
 			"SELECT `intro`.`id`, `intro`.`datetime`,
 			`contact`.`name`, `contact`.`url`, `contact`.`photo`
-			FROM `intro` LEFT JOIN `contact` ON `intro`.`contact-id` = `contact`.`id`
-			WHERE `intro`.`uid` = %d  AND `intro`.`blocked` = 0 AND `intro`.`ignore` = 0 AND `intro`.`contact-id` != 0",
-			intval(local_user())
-		);
+			FROM `intro` INNER JOIN `contact` ON `intro`.`contact-id` = `contact`.`id`
+			WHERE `intro`.`uid` = ? AND NOT `intro`.`blocked` AND NOT `intro`.`ignore` AND `intro`.`contact-id` != 0 AND (`intro`.`fid` = 0 OR `intro`.`fid` IS NULL)",
+			local_user()
+		));
 
 		$intro_count = count($intros1) + count($intros2);
 		$intros = $intros1 + $intros2;
 
-		$myurl = DI::baseUrl() . '/profile/' . $a->user['nickname'];
-		$mails = q(
-			"SELECT `id`, `from-name`, `from-url`, `from-photo`, `created` FROM `mail`
-			WHERE `uid` = %d AND `seen` = 0 AND `from-url` != '%s' ",
-			intval(local_user()),
-			DBA::escape($myurl)
-		);
-		$mail_count = count($mails);
+		$myurl = DI::baseUrl() . '/profile/' . $a->getLoggedInUserNickname();
+		$mail_count = DBA::count('mail', ["`uid` = ? AND NOT `seen` AND `from-url` != ?", local_user(), $myurl]);
 
 		if (intval(DI::config()->get('config', 'register_policy')) === \Friendica\Module\Register::APPROVE && is_site_admin()) {
 			$regs = Friendica\Model\Register::getPending();
@@ -212,14 +207,9 @@ function ping_init(App $a)
 		$cachekey = "ping_init:".local_user();
 		$ev = DI::cache()->get($cachekey);
 		if (is_null($ev)) {
-			$ev = q(
-				"SELECT type, start, adjust FROM `event`
-				WHERE `event`.`uid` = %d AND `start` < '%s' AND `finish` > '%s' and `ignore` = 0
-				ORDER BY `start` ASC ",
-				intval(local_user()),
-				DBA::escape(DateTimeFormat::utc('now + 7 days')),
-				DBA::escape(DateTimeFormat::utcNow())
-			);
+			$ev = DBA::selectToArray('event', ['type', 'start'],
+				["`uid` = ? AND `start` < ? AND `finish` > ? AND NOT `ignore`",
+				local_user(), DateTimeFormat::utc('now + 7 days'), DateTimeFormat::utcNow()]);
 			if (DBA::isResult($ev)) {
 				DI::cache()->set($cachekey, $ev, Duration::HOUR);
 			}
@@ -229,7 +219,7 @@ function ping_init(App $a)
 			$all_events = count($ev);
 
 			if ($all_events) {
-				$str_now = DateTimeFormat::timezoneNow($a->timezone, 'Y-m-d');
+				$str_now = DateTimeFormat::localNow('Y-m-d');
 				foreach ($ev as $x) {
 					$bd = false;
 					if ($x['type'] === 'birthday') {
@@ -238,7 +228,7 @@ function ping_init(App $a)
 					} else {
 						$events ++;
 					}
-					if (DateTimeFormat::convert($x['start'], ((intval($x['adjust'])) ? $a->timezone : 'UTC'), 'UTC', 'Y-m-d') === $str_now) {
+					if (DateTimeFormat::local($x['start'], 'Y-m-d') === $str_now) {
 						$all_events_today ++;
 						if ($bd) {
 							$birthdays_today ++;
@@ -252,8 +242,8 @@ function ping_init(App $a)
 
 		$data['intro']    = $intro_count;
 		$data['mail']     = $mail_count;
-		$data['net']      = $network_count;
-		$data['home']     = $home_count;
+		$data['net']      = ($network_count < 1000) ? $network_count : '999+';
+		$data['home']     = ($home_count < 1000) ? $home_count : '999+';
 		$data['register'] = $register_count;
 
 		$data['all-events']       = $all_events;
@@ -263,8 +253,8 @@ function ping_init(App $a)
 		$data['birthdays']        = $birthdays;
 		$data['birthdays-today']  = $birthdays_today;
 
-		if (DBA::isResult($notifs)) {
-			foreach ($notifs as $notif) {
+		if (DBA::isResult($notifications)) {
+			foreach ($notifications as $notif) {
 				if ($notif['seen'] == 0) {
 					$sysnotify_count ++;
 				}
@@ -277,30 +267,44 @@ function ping_init(App $a)
 				$notif = [
 					'id'      => 0,
 					'href'    => DI::baseUrl() . '/notifications/intros/' . $intro['id'],
-					'name'    => $intro['name'],
+					'name'    => BBCode::convert($intro['name']),
 					'url'     => $intro['url'],
 					'photo'   => $intro['photo'],
 					'date'    => $intro['datetime'],
 					'seen'    => false,
 					'message' => DI::l10n()->t('{0} wants to be your friend'),
 				];
-				$notifs[] = $notif;
+				$notifications[] = $notif;
 			}
 		}
 
 		if (DBA::isResult($regs)) {
-			foreach ($regs as $reg) {
+			if (count($regs) <= 1 || DI::pConfig()->get(local_user(), 'system', 'detailed_notif')) {
+				foreach ($regs as $reg) {
+					$notif = [
+						'id'      => 0,
+						'href'    => DI::baseUrl() . '/admin/users/pending',
+						'name'    => $reg['name'],
+						'url'     => $reg['url'],
+						'photo'   => $reg['micro'],
+						'date'    => $reg['created'],
+						'seen'    => false,
+						'message' => DI::l10n()->t('{0} requested registration'),
+					];
+					$notifications[] = $notif;
+				}
+			} else {
 				$notif = [
 					'id'      => 0,
-					'href'    => DI::baseUrl() . '/admin/users/',
-					'name'    => $reg['name'],
-					'url'     => $reg['url'],
-					'photo'   => $reg['micro'],
-					'date'    => $reg['created'],
+					'href'    => DI::baseUrl() . '/admin/users/pending',
+					'name'    => $regs[0]['name'],
+					'url'     => $regs[0]['url'],
+					'photo'   => $regs[0]['micro'],
+					'date'    => $regs[0]['created'],
 					'seen'    => false,
-					'message' => DI::l10n()->t('{0} requested registration'),
+					'message' => DI::l10n()->t('{0} and %d others requested registration', count($regs) - 1),
 				];
-				$notifs[] = $notif;
+				$notifications[] = $notif;
 			}
 		}
 
@@ -323,28 +327,13 @@ function ping_init(App $a)
 			}
 			return ($adate < $bdate) ? 1 : -1;
 		};
-		usort($notifs, $sort_function);
-
-		if (DBA::isResult($notifs)) {
-			foreach ($notifs as $notif) {
-				$contact = Contact::getByURL($notif['url'], false, ['micro', 'id', 'avatar']);
-				$notif['photo'] = Contact::getMicro($contact, $notif['photo']);
-
-				$local_time = DateTimeFormat::local($notif['date']);
-
-				$notifications[] = [
-					'id'        => $notif['id'],
-					'href'      => $notif['href'],
-					'name'      => $notif['name'],
-					'url'       => $notif['url'],
-					'photo'     => $notif['photo'],
-					'date'      => Temporal::getRelativeDate($notif['date']),
-					'message'   => $notif['message'],
-					'seen'      => $notif['seen'],
-					'timestamp' => strtotime($local_time)
-				];
-			}
-		}
+		usort($notifications, $sort_function);
+
+		array_walk($notifications, function (&$notification) {
+			$notification['photo']     = Contact::getAvatarUrlForUrl($notification['url'], local_user(), Proxy::SIZE_MICRO);
+			$notification['timestamp'] = DateTimeFormat::local($notification['date']);
+			$notification['date']      = Temporal::getRelativeDate($notification['date']);
+		});
 	}
 
 	$sysmsgs = [];
@@ -408,17 +397,17 @@ function ping_get_notifications($uid)
 	$quit    = false;
 
 	do {
-		$r = q(
-			"SELECT `notify`.*, `item`.`visible`, `item`.`deleted`
-			FROM `notify` LEFT JOIN `item` ON `item`.`id` = `notify`.`iid`
-			WHERE `notify`.`uid` = %d AND `notify`.`msg` != ''
-			AND NOT (`notify`.`type` IN (%d, %d))
-			AND $seensql `notify`.`seen` ORDER BY `notify`.`date` $order LIMIT %d, 50",
-			intval($uid),
-			intval(Type::INTRO),
-			intval(Type::MAIL),
-			intval($offset)
-		);
+		$r = DBA::toArray(DBA::p(
+			"SELECT `notify`.*, `post`.`visible`, `post`.`deleted`
+			FROM `notify` LEFT JOIN `post` ON `post`.`uri-id` = `notify`.`uri-id`
+			WHERE `notify`.`uid` = ? AND `notify`.`msg` != ''
+			AND NOT (`notify`.`type` IN (?, ?))
+			AND $seensql `notify`.`seen` ORDER BY `notify`.`date` $order LIMIT ?, 50",
+			$uid,
+			Notification\Type::INTRO,
+			Notification\Type::MAIL,
+			$offset
+		));
 
 		if (!$r && !$seen) {
 			$seen = true;
@@ -445,27 +434,23 @@ function ping_get_notifications($uid)
 				$notification["message"] = $notification["msg_cache"];
 			} else {
 				$notification["name"] = strip_tags(BBCode::convert($notification["name"]));
-				$notification["message"] = Friendica\Model\Notify::formatMessage($notification["name"], strip_tags(BBCode::convert($notification["msg"])));
-
-				q(
-					"UPDATE `notify` SET `name_cache` = '%s', `msg_cache` = '%s' WHERE `id` = %d",
-					DBA::escape($notification["name"]),
-					DBA::escape($notification["message"]),
-					intval($notification["id"])
-				);
+				$notification["message"] = \Friendica\Navigation\Notifications\Entity\Notify::formatMessage($notification["name"], BBCode::toPlaintext($notification["msg"]));
+
+				// @todo Replace this with a call of the Notify model class
+				DBA::update('notify', ['name_cache' => $notification["name"], 'msg_cache' => $notification["message"]], ['id' => $notification["id"]]);
 			}
 
 			$notification["href"] = DI::baseUrl() . "/notification/" . $notification["id"];
 
 			if ($notification["visible"]
 				&& !$notification["deleted"]
-				&& empty($result[$notification['parent']])
+				&& empty($result['p:' . $notification['parent']])
 			) {
 				// Should we condense the notifications or show them all?
-				if (DI::pConfig()->get(local_user(), 'system', 'detailed_notif')) {
-					$result[$notification["id"]] = $notification;
+				if (($notification['verb'] != Activity::POST) || DI::pConfig()->get(local_user(), 'system', 'detailed_notif')) {
+					$result[] = $notification;
 				} else {
-					$result[$notification['parent']] = $notification;
+					$result['p:' . $notification['parent']] = $notification;
 				}
 			}
 		}