From e59cb7911c08d9322d6dfa646ff723accfc4ac4b Mon Sep 17 00:00:00 2001
From: xiaomlove <i353856593@163.com>
Date: Sun, 5 Mar 2023 18:15:31 +0800
Subject: [PATCH] number format dashboard + improve scrape cache

---
 .../Resources/User/TorrentBuyLogResource.php  |  1 +
 app/Repositories/DashboardRepository.php      | 40 +++++++++----------
 include/constants.php                         |  2 +-
 include/functions_announce.php                |  2 +-
 public/scrape.php                             | 16 ++++----
 5 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/app/Filament/Resources/User/TorrentBuyLogResource.php b/app/Filament/Resources/User/TorrentBuyLogResource.php
index d4ffcaf0..a9e5c85a 100644
--- a/app/Filament/Resources/User/TorrentBuyLogResource.php
+++ b/app/Filament/Resources/User/TorrentBuyLogResource.php
@@ -63,6 +63,7 @@ class TorrentBuyLogResource extends Resource
                     ->label(__('label.created_at'))
                 ,
             ])
+            ->defaultSort('id','desc')
             ->filters([
                 Tables\Filters\Filter::make('uid')
                     ->form([
diff --git a/app/Repositories/DashboardRepository.php b/app/Repositories/DashboardRepository.php
index 40018689..7616d7bb 100644
--- a/app/Repositories/DashboardRepository.php
+++ b/app/Repositories/DashboardRepository.php
@@ -109,7 +109,7 @@ class DashboardRepository extends BaseRepository
             $result[$class] = [
                 'name' => $class,
                 'text' => $value['text'],
-                'value' => $userClasses->has($class) ? $userClasses->get($class) : 0,
+                'value' => $userClasses->has($class) ? number_format($userClasses->get($class)) : 0,
             ];
         }
         return $result;
@@ -124,55 +124,55 @@ class DashboardRepository extends BaseRepository
         $result[$name] = [
             'name' => $name,
             'text' => nexus_trans("dashboard.user.$name"),
-            'value' => sprintf('%s / %s', User::query()->count(), Setting::get('main.maxusers')),
+            'value' => sprintf('%s / %s', number_format(User::query()->count()), number_format(Setting::get('main.maxusers'))),
         ];
         $name = 'unconfirmed';
         $result[$name] = [
             'name' => $name,
             'text' => nexus_trans("dashboard.user.$name"),
-            'value' => User::query()->where('status', User::STATUS_PENDING)->count(),
+            'value' => number_format(User::query()->where('status', User::STATUS_PENDING)->count()),
         ];
         $name = 'visit_last_one_day';
         $result[$name] = [
             'name' => $name,
             'text' => nexus_trans("dashboard.user.$name"),
-            'value' => User::query()->where('last_access', '>', $now->subDays(1))->count(),
+            'value' => number_format(User::query()->where('last_access', '>', $now->subDays(1))->count()),
         ];
         $name = 'visit_last_one_week';
         $result[$name] = [
             'name' => $name,
             'text' => nexus_trans("dashboard.user.$name"),
-            'value' => User::query()->where('last_access', '>', $now->subDays(7))->count(),
+            'value' => number_format(User::query()->where('last_access', '>', $now->subDays(7))->count()),
         ];
         $name = 'visit_last_30_days';
         $result[$name] = [
             'name' => $name,
             'text' => nexus_trans("dashboard.user.$name"),
-            'value' => User::query()->where('last_access', '>', $now->subDays(30))->count(),
+            'value' => number_format(User::query()->where('last_access', '>', $now->subDays(30))->count()),
         ];
         $name = 'vip';
         $result[$name] = [
             'name' => $name,
             'text' => nexus_trans("dashboard.user.$name"),
-            'value' => User::query()->where('class', User::CLASS_VIP)->count(),
+            'value' => number_format(User::query()->where('class', User::CLASS_VIP)->count()),
         ];
         $name = 'donated';
         $result[$name] = [
             'name' => $name,
             'text' => nexus_trans("dashboard.user.$name"),
-            'value' => User::query()->where('donor', 'yes')->count(),
+            'value' => number_format(User::query()->where('donor', 'yes')->count()),
         ];
         $name = 'warned';
         $result[$name] = [
             'name' => $name,
             'text' => nexus_trans("dashboard.user.$name"),
-            'value' => User::query()->where('warned', 'yes')->count(),
+            'value' => number_format(User::query()->where('warned', 'yes')->count()),
         ];
         $name = 'disabled';
         $result[$name] = [
             'name' => $name,
             'text' => nexus_trans("dashboard.user.$name"),
-            'value' => User::query()->where('enabled', 'no')->count(),
+            'value' => number_format(User::query()->where('enabled', 'no')->count()),
         ];
 
         $statGender = User::query()->groupBy('gender')->selectRaw('gender, count(*) as counts')->get()->pluck('counts','gender');
@@ -184,7 +184,7 @@ class DashboardRepository extends BaseRepository
             $result[$name] = [
                 'name' => $name,
                 'text' => nexus_trans("dashboard.user.$name"),
-                'value' => $statGender->has($gender) ? $statGender->get($gender) : 0,
+                'value' => $statGender->has($gender) ? number_format($statGender->get($gender)) : 0,
             ];
         }
         return $result;
@@ -197,13 +197,13 @@ class DashboardRepository extends BaseRepository
         $result[$name] = [
             'name' => $name,
             'text' => nexus_trans("dashboard.torrent.$name"),
-            'value' => Torrent::query()->count(),
+            'value' => number_format(Torrent::query()->count()),
         ];
         $name = 'dead';
         $result[$name] = [
             'name' => $name,
             'text' => nexus_trans("dashboard.torrent.$name"),
-            'value' => Torrent::query()->where('visible', '=', Torrent::VISIBLE_NO)->count(),
+            'value' => number_format(Torrent::query()->where('visible', '=', Torrent::VISIBLE_NO)->count()),
         ];
 
         $seeders = Peer::query()->where('seeder', 'yes')->count();
@@ -211,7 +211,7 @@ class DashboardRepository extends BaseRepository
         $result[$name] = [
             'name' => $name,
             'text' => nexus_trans("dashboard.torrent.$name"),
-            'value' => $seeders,
+            'value' => number_format($seeders),
         ];
 
         $leechers = Peer::query()->where('seeder', 'no')->count();
@@ -219,13 +219,13 @@ class DashboardRepository extends BaseRepository
         $result[$name] = [
             'name' => $name,
             'text' => nexus_trans("dashboard.torrent.$name"),
-            'value' => $leechers,
+            'value' => number_format($leechers),
         ];
         $name = 'seeders_leechers';
         $result[$name] = [
             'name' => $name,
             'text' => nexus_trans("dashboard.torrent.$name"),
-            'value' => $seeders + $leechers,
+            'value' => number_format($seeders + $leechers),
         ];
         $name = 'seeders_leechers_ratio';
         $result[$name] = [
@@ -237,13 +237,13 @@ class DashboardRepository extends BaseRepository
         $result[$name] = [
             'name' => $name,
             'text' => nexus_trans("dashboard.torrent.$name"),
-            'value' => User::query()->where('last_access', '>', $now->subSeconds(900))->count(),
+            'value' => number_format(User::query()->where('last_access', '>', $now->subSeconds(900))->count()),
         ];
         $name = 'active_tracker_users';
         $result[$name] = [
             'name' => $name,
             'text' => nexus_trans("dashboard.torrent.$name"),
-            'value' => Peer::query()->selectRaw('count(distinct(userid)) as counts')->first()->counts,
+            'value' => number_format(Peer::query()->selectRaw('count(distinct(userid)) as counts')->first()->counts),
         ];
 
         $name = 'total_torrent_size';
@@ -281,12 +281,12 @@ class DashboardRepository extends BaseRepository
 
     public function latestUser()
     {
-        return User::query()->orderBy('id', 'desc')->limit(10)->select(User::$commonFields)->get();
+        return User::query()->orderBy('id', 'desc')->limit(10)->get(User::$commonFields);
     }
 
     public function latestTorrent()
     {
-        return Torrent::query()->with(['user'])->orderBy('id', 'desc')->limit(5)->get();
+        return Torrent::query()->with(['user'])->orderBy('id', 'desc')->limit(5)->get(Torrent::$commentFields);
     }
 
 
diff --git a/include/constants.php b/include/constants.php
index 9a3f5585..23acde31 100644
--- a/include/constants.php
+++ b/include/constants.php
@@ -1,6 +1,6 @@
 <?php
 defined('VERSION_NUMBER') || define('VERSION_NUMBER', '1.8.0');
-defined('RELEASE_DATE') || define('RELEASE_DATE', '2023-03-04');
+defined('RELEASE_DATE') || define('RELEASE_DATE', '2023-03-05');
 defined('IN_TRACKER') || define('IN_TRACKER', false);
 defined('PROJECTNAME') || define("PROJECTNAME","NexusPHP");
 defined('NEXUSPHPURL') || define("NEXUSPHPURL","https://nexusphp.org");
diff --git a/include/functions_announce.php b/include/functions_announce.php
index 2ecf16c0..e6c9ef60 100644
--- a/include/functions_announce.php
+++ b/include/functions_announce.php
@@ -45,10 +45,10 @@ function block_browser()
 
 function benc_resp($d)
 {
+    do_log(nexus_json_encode($d));
     benc_resp_raw(\Rhilip\Bencode\Bencode::encode($d));
 }
 function benc_resp_raw($x) {
-	do_log($x);
 	header("Content-Type: text/plain; charset=utf-8");
 	header("Pragma: no-cache");
 
diff --git a/public/scrape.php b/public/scrape.php
index 547abcdd..9f3fe9e8 100644
--- a/public/scrape.php
+++ b/public/scrape.php
@@ -7,14 +7,6 @@ dbconn_announce();
 // BLOCK ACCESS WITH WEB BROWSERS AND CHEATS!
 block_browser();
 
-$cacheKey = md5($_SERVER["QUERY_STRING"]);
-$cacheData = \Nexus\Database\NexusDB::cache_get($cacheKey);
-if ($cacheData) {
-    do_log("[SCRAPE_FROM_CACHE]: " . $_SERVER["QUERY_STRING"]);
-    benc_resp($cacheData);
-    exit(0);
-}
-
 preg_match_all('/info_hash=([^&]*)/i', $_SERVER["QUERY_STRING"], $info_hash_array);
 $fields = "info_hash, times_completed, seeders, leechers";
 
@@ -26,6 +18,14 @@ else {
 	$query = "SELECT $fields FROM torrents WHERE " . hash_where_arr('info_hash', $info_hash_array[1]);
 }
 
+$cacheKey = md5(http_build_query($info_hash_array[1]));
+$cacheData = \Nexus\Database\NexusDB::cache_get($cacheKey);
+if ($cacheData) {
+    do_log("[SCRAPE_FROM_CACHE]: " . $_SERVER["QUERY_STRING"]);
+    benc_resp($cacheData);
+    exit(0);
+}
+
 $res = sql_query($query);
 
 if (mysql_num_rows($res) < 1){