X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fping.php;h=64c947e2c63aa760108e3a1ccfc0a25a8cea1887;hb=7789ea25079801ee1425368e9bf2f7ce80d16d88;hp=7d8b6c3537042fe95b9a9ff1b29d3d2956c3fe28;hpb=f5f8ea87153dad42c36340878fa5df18f361687a;p=friendica.git

diff --git a/mod/ping.php b/mod/ping.php
index 7d8b6c3537..64c947e2c6 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,7 +28,7 @@ use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Group;
-use Friendica\Model\Notify\Type;
+use Friendica\Model\Notification;
 use Friendica\Model\Post;
 use Friendica\Model\Verb;
 use Friendica\Protocol\Activity;
@@ -139,7 +139,7 @@ function ping_init(App $a)
 			local_user(), Verb::getID(Activity::FOLLOW)];
 		$items = Post::selectForUser(local_user(), ['wall', 'uid', 'uri-id'], $condition);
 		if (DBA::isResult($items)) {
-			$items_unseen = Post::toArray($items);
+			$items_unseen = Post::toArray($items, false);
 			$arr = ['items' => $items_unseen];
 			Hook::callAll('network_ping', $arr);
 
@@ -412,14 +412,14 @@ function ping_get_notifications($uid)
 
 	do {
 		$r = q(
-			"SELECT `notify`.*, `item`.`visible`, `item`.`deleted`
-			FROM `notify` LEFT JOIN `item` ON `item`.`id` = `notify`.`iid`
+			"SELECT `notify`.*, `post`.`visible`, `post`.`deleted`
+			FROM `notify` LEFT JOIN `post` ON `post`.`uri-id` = `notify`.`uri-id`
 			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(Notification\Type::INTRO),
+			intval(Notification\Type::MAIL),
 			intval($offset)
 		);
 
@@ -448,7 +448,7 @@ 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"])));
+				$notification["message"] = Notification::formatMessage($notification["name"], strip_tags(BBCode::convert($notification["msg"])));
 
 				q(
 					"UPDATE `notify` SET `name_cache` = '%s', `msg_cache` = '%s' WHERE `id` = %d",