From 64435a917ef7734cde1013bb1d715d021cf5a3ae Mon Sep 17 00:00:00 2001 From: Ben van Hartingsveldt Date: Sat, 28 Jun 2025 14:11:42 +0200 Subject: [PATCH] Improve index --- app/Http/Controllers/MainController.php | 19 ++++++++++--------- public/favicon.ico | Bin 0 -> 15086 bytes 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/app/Http/Controllers/MainController.php b/app/Http/Controllers/MainController.php index 3ea9de0..16d9c08 100644 --- a/app/Http/Controllers/MainController.php +++ b/app/Http/Controllers/MainController.php @@ -31,11 +31,12 @@ use Illuminate\Support\Facades\Cache; use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Redirect; -use Illuminate\Support\Facades\Redis; +use Illuminate\Support\Facades\Redis as RedisFacade; use Illuminate\Support\Str; use Illuminate\View\View; use PDO; +use Redis; use RedisException; use stdClass; @@ -55,12 +56,12 @@ class MainController extends Controller{ const blockedListUrl = 'https://api.odysee.com/file/list_blocked?with_claim_id=true'; - protected $redis; - protected $rpcurl; + protected ?Redis $redis; + protected string $rpcUrl; public function __construct(){ - $this->redis = Redis::connection()->client(); - $this->rpcurl = config('lbry.rpc_url'); + $this->redis = RedisFacade::connection()->client(); + $this->rpcUrl = config('lbry.rpc_url'); try { $this->redis->info('mem'); } catch (RedisException) { @@ -127,8 +128,8 @@ class MainController extends Controller{ */ public function index(): JsonResponse|Response|View{ $lbcUsdPrice = $this->_getLatestPrice(); - $blocks = Block::query()->select(['chainwork', 'confirmations', 'difficulty', 'hash', 'height', 'block_time', 'block_size','tx_count'])->orderByDesc('height')->limit(6)->get(); - $claims = Claim::query()->leftJoin('claim AS c','c.claim_id','=','claim.publisher_id')->orderByDesc('claim.created_at')->limit(5)->get(); + $blocks = Block::query()->select(['chainwork','confirmations','difficulty','hash','height','block_time','block_size','tx_count'])->orderByDesc('height')->limit(6)->get(); + $claims = Claim::query()->leftJoin('claim AS c','c.claim_id','=','claim.publisher_id')->addSelect('claim.*')->addSelect('c.name AS publisher')->orderByDesc('claim.created_at')->limit(5)->get(); $hashRate = $this->_formatHashRate($this->_gethashrate()); return self::generateResponse('main.index',[ @@ -1003,7 +1004,7 @@ class MainController extends Controller{ private function _gethashrate(): mixed{ $req = ['method' => 'getnetworkhashps', 'params' => [],'id'=>rand()]; try { - $res = json_decode(self::curl_json_post($this->rpcurl, json_encode($req))); + $res = json_decode(self::curl_json_post($this->rpcUrl, json_encode($req))); if (!isset($res->result)) { return 0; } @@ -1078,7 +1079,7 @@ class MainController extends Controller{ $req = ['method' => 'gettxoutsetinfo', 'params' => [],'id'=>rand()]; try { - $response = self::curl_json_post($this->rpcurl, json_encode($req)); + $response = self::curl_json_post($this->rpcUrl, json_encode($req)); $res = json_decode($response); if (!isset($res->result)) { return null; diff --git a/public/favicon.ico b/public/favicon.ico index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..ab2cfef7277e8e03fd7ec9abfd0525050a45f6bc 100644 GIT binary patch literal 15086 zcmeHO&ube;6dvP*T#6G(uCZ3GBY9VGdJ7bK$-((kdhEdg%a+|Xc4{5cP{^qi%Seh- z;zC;rg*v$OM+k9CA$G_Q)6|wkY)MT*E}?cVhQx$S-;+G{XuR6p*k z@6CSl3^Qv&+DJP&b&7zElJDY#yiW*;Mt9oB2r0q6V_@<5hldEc2pvvBA8;WbK*9T7 zUzrR!JU!hL85`_WQYiwg{y$gdOXXy4TA9pFDf#4Z@Ii7oG@eLwXsw<>Ces#@cX$p?>MroNtgBo)yaZgU^NthFysumQnXZzF&|;(c zFPjdRd2Bc8F7wBCQTF-QuMv#ilRy5|^&kKD$k&gs#`N{GPb0iu#JaB^Uq7NIWZJ%d zeErDiMeOVA$AW&o$}05NYrXXAD+(R|xKkWMC+((<|K(|gUd=`5wIAN0f8SMUxe%|G zdy6renF`ZS$2;lRh}2xAmuFM>&(1{XFEHNAOMSGIukmL5(c-;ZzenjTypPnx+j_jL z-gA{d)5*#`m9DSu=gsGU^|cj^F5m8RqASPz8|g&kYSy-?D@XjzbYjL?d~QQmw)o5H zMC57Kme7@D{%+~SjJx>UL|2yhyR8$EqgmTPSBCtXtrIie;&UBcHRS)}_dSa+@4OUa zv`YK#t-kH_7u`#Z_J7t^RIO4_$4dq6L91})c;w4PZL(B|^*7>=_bEMds8HxvN=0?B zT#P^B{CC#_9^ZQkTtU3|8-rgl{d@e8Fw{4sF$Qdir6_XMynRaV~( zi@appkcXGLs_LX%Jb_2pu3aAJ%C=5qlXOv6uIj`_9!_-C6rITCU_)1)=|nac16{pQ zo!H2O*HugCL^cPeD?9U!3>KxY1}MdO_r>v=tsJRYya(kqA(Lod5ON&t0wL{aQ}A68 zSa=K_2zie7C?OTJM-HxKd9u9OIP8uK8z(kyI9Aod#+8k8ZQOB^i$XaArCHx;Wz*dQ zqeFqy0O9F{xNs(X6VF%h94?s%UiX3rkIT+>_;bK!@zBH7!)ILF;$ehqgzuDx6-=$flKf7E{Ku*fMrxC@?4fVBs5uXEL~~uM95h3*V?c^YQCPz#o5Kf9y9U zW7%&?#vYX4-?y_7`uS&FR?jzf`#H@YahLvx!P$#eEjNDdmEvI+pT`yVs*sCS9x8u8G>|MNz44mBkDx!p#LpXPez>u0}O>z{&px|CP1 zyN$UQPrF%us14|0^Y`56VGWn(fOY3Q?BP1+;SR1mkLKW-^Y8{&kB1dKi++5YzMiaY z(cm^hs;#;$gIf(1*lk&WEg3fo#=@A@tqZ`Qh=tn~fQ|bU@GoZ7y$U<~6q!umDEyDl zWO68Y{_NRc2ZXY8F~8iDvWe@h+WINDVHQX9V{5hg^_PAeSmRGHJm$x2y+8XFCAcw~ z2%KXHf&UikFIs(nh?59y9d!RI8HIi_#>Pyr2Kl4kZ}Yvh_?Jpo@2m8it2%LX{CU5< zxuy1v%f2|A|4b&l#qdNwvArATqrLaHazA#ioYywQzKz@3=JM^>1bhEz|9z-+lnUy3 u<2c$To~f>{_rcDq{-qzs+)s?Q8^;9i70lYtfz3iYA*nWN1^c28`u+!eS