X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FNoScrape.php;h=cef7cdce72010dbbcaba891a05fc70e2e2ce0e9c;hb=a1947d2bb106e932cb72616e6c4cf809d249a1f6;hp=84130bd9161578dbfda4704598cf6405b7c68587;hpb=f609386ca11d805838f5526261068a69b489eab0;p=friendica.git

diff --git a/src/Module/NoScrape.php b/src/Module/NoScrape.php
index 84130bd916..cef7cdce72 100644
--- 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
  *
@@ -23,7 +23,6 @@ namespace Friendica\Module;
 
 use Friendica\BaseModule;
 use Friendica\Core\System;
-use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\APContact;
 use Friendica\Model\User;
@@ -46,13 +45,13 @@ class NoScrape extends BaseModule
 			// view infos about a known profile (needs a login)
 			$which = $a->getLoggedInUserNickname();
 		} else {
-			System::jsonError(403, 'Authentication required');
+			$this->jsonError(403, 'Authentication required');
 		}
 
 		$owner = User::getOwnerDataByNick($which);
 
 		if (empty($owner['uid'])) {
-			System::jsonError(404, 'Profile not found');
+			$this->jsonError(404, 'Profile not found');
 		}
 
 		$json_info = [
@@ -72,7 +71,7 @@ class NoScrape extends BaseModule
 
 		if (!$owner['net-publish']) {
 			$json_info['hide'] = true;
-			System::jsonExit($json_info);
+			$this->jsonExit($json_info);
 		}
 
 		$keywords = $owner['pub_keywords'] ?? '';
@@ -94,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);
 
@@ -118,6 +107,6 @@ class NoScrape extends BaseModule
 			}
 		}
 
-		System::jsonExit($json_info);
+		$this->jsonExit($json_info);
 	}
 }