Merge pull request #12562 from MrPetovan/bug/notices

[friendica.git] / src / Module / NoScrape.php

diff --git a/src/Module/NoScrape.php b/src/Module/NoScrape.php
index a139d85a6a255ef792a51267b1dd89271e87be9d..f5c5c725e0344928cca6bbd0f745f94025f0faed 100644 (file)
--- a/src/Module/NoScrape.php
+++ b/src/Module/NoScrape.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -22,9 +22,7 @@
 namespace Friendica\Module;
 
 use Friendica\BaseModule;
-use Friendica\Core\Session;
 use Friendica\Core\System;
-use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\APContact;
 use Friendica\Model\User;
@@ -43,7 +41,7 @@ class NoScrape extends BaseModule
                if (isset($this->parameters['nick'])) {
                        // Get infos about a specific nick (public)
                        $which = $this->parameters['nick'];
-               } elseif (Session::getLocalUser() && isset($this->parameters['profile']) && DI::args()->get(2) == 'view') {
+               } elseif (DI::userSession()->getLocalUserId() && isset($this->parameters['profile']) && DI::args()->get(2) == 'view') {
                        // view infos about a known profile (needs a login)
                        $which = $a->getLoggedInUserNickname();
                } else {
@@ -95,19 +93,9 @@ class NoScrape extends BaseModule
                }
 
                // We display the last activity (post or login), reduced to year and week number
-               $last_active = 0;
-               $condition   = ['uid' => $owner['uid'], 'self' => true];
-               $contact     = DBA::selectFirst('contact', ['last-item'], $condition);
-               if (DBA::isResult($contact)) {
-                       $last_active = strtotime($contact['last-item']);
-               }
-
-               $condition = ['uid' => $owner['uid']];
-               $user      = DBA::selectFirst('user', ['login_date'], $condition);
-               if (DBA::isResult($user)) {
-                       if ($last_active < strtotime($user['login_date'])) {
-                               $last_active = strtotime($user['login_date']);
-                       }
+               $last_active = strtotime($owner['last-item']);
+               if ($owner['last-activity'] && $last_active < strtotime($owner['last-activity'])) {
+                       $last_active = strtotime($owner['last-activity']);
                }
                $json_info['last-activity'] = date('o-W', $last_active);