]> git.mxchange.org Git - friendica.git/blobdiff - mod/ping.php
Fixed max value check, improved request value fetching
[friendica.git] / mod / ping.php
index 8efddb757d5b671da4f24d316f498f2c5d5e4fdf..5399129d43e8cc2b2a8bc76f276ffa78ddcd31eb 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -22,7 +22,7 @@
 use Friendica\App;
 use Friendica\Content\ForumManager;
 use Friendica\Content\Text\BBCode;
-use Friendica\Core\Cache\Duration;
+use Friendica\Core\Cache\Enum\Duration;
 use Friendica\Core\Hook;
 use Friendica\Database\DBA;
 use Friendica\DI;
@@ -138,7 +138,7 @@ function ping_init(App $a)
 
                $condition = ["`unseen` AND `uid` = ? AND NOT `origin` AND (`vid` != ? OR `vid` IS NULL)",
                        local_user(), Verb::getID(Activity::FOLLOW)];
-               $items = Post::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 = Post::toArray($items, false);
                        $arr = ['items' => $items_unseen];
@@ -175,34 +175,28 @@ 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` INNER JOIN `fcontact` ON `intro`.`fid` = `fcontact`.`id`
-                       WHERE `intro`.`uid` = %d AND NOT `intro`.`blocked` AND NOT `intro`.`ignore` AND `intro`.`fid` != 0",
-                       intval(local_user())
-               );
-               $intros2 = q(
+                       `contact`.`name`, `contact`.`url`, `contact`.`photo`
+                       FROM `intro` INNER JOIN `contact` ON `intro`.`suggest-cid` = `contact`.`id`
+                       WHERE `intro`.`uid` = ? AND NOT `intro`.`blocked` AND NOT `intro`.`ignore` AND `intro`.`suggest-cid` != 0",
+                       local_user()
+               ));
+               $intros2 = DBA::toArray(DBA::p(
                        "SELECT `intro`.`id`, `intro`.`datetime`,
                        `contact`.`name`, `contact`.`url`, `contact`.`photo`
                        FROM `intro` INNER JOIN `contact` ON `intro`.`contact-id` = `contact`.`id`
-                       WHERE `intro`.`uid` = %d AND NOT `intro`.`blocked` AND NOT `intro`.`ignore` AND `intro`.`contact-id` != 0 AND (`intro`.`fid` = 0 OR `intro`.`fid` IS NULL)",
-                       intval(local_user())
-               );
+                       WHERE `intro`.`uid` = ? AND NOT `intro`.`blocked` AND NOT `intro`.`ignore` AND `intro`.`contact-id` != 0 AND (`intro`.`suggest-cid` = 0 OR `intro`.`suggest-cid` 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()) {
+               if (intval(DI::config()->get('config', 'register_policy')) === \Friendica\Module\Register::APPROVE && $a->isSiteAdmin()) {
                        $regs = Friendica\Model\Register::getPending();
 
                        if (DBA::isResult($regs)) {
@@ -213,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);
                        }
@@ -230,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') {
@@ -239,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 ++;
@@ -253,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;
@@ -408,17 +397,17 @@ function ping_get_notifications($uid)
        $quit    = false;
 
        do {
-               $r = q(
+               $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` = %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(Notification\Type::INTRO),
-                       intval(Notification\Type::MAIL),
-                       intval($offset)
-               );
+                       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"] = Notification::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;
                                }
                        }
                }