From 45aaba883fed4a797d5312754ad35ff46763ddab Mon Sep 17 00:00:00 2001 From: Roman Kelesidis Date: Wed, 7 Aug 2024 00:27:23 +0700 Subject: [PATCH] Minor improvements (#1575) * Minor improvements * Update CHANGELOG.md * Update composer.json * Update composer.json * Update composer.json * Update composer.json * Update composer.lock * Update composer.json * Update composer.lock * Updated * Revert "Updated" This reverts commit 74eca59ceaa51742e046da55474b0adff65ed339. --- CHANGELOG.md | 2 +- composer.json | 13 ++++++---- composer.lock | 47 ++++++++++++++++++++----------------- library/ajax/index_data.php | 4 ++-- 4 files changed, 37 insertions(+), 29 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ede85fb89..b293875a5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,7 @@ - Added showing releaser stats in profile [\#1568](https://github.com/torrentpier/torrentpier/pull/1568) ([belomaxorka](https://github.com/belomaxorka)) - Fixed `md5()` deprecated in PHP 8.4 [\#1561](https://github.com/torrentpier/torrentpier/pull/1561) ([belomaxorka](https://github.com/belomaxorka)) - Increased `USEREMAIL_MAX_LENGTH` [\#1566](https://github.com/torrentpier/torrentpier/pull/1566) ([belomaxorka](https://github.com/belomaxorka)) -- Minor improvements [\#1570](https://github.com/torrentpier/torrentpier/pull/1570), [\#1571](https://github.com/torrentpier/torrentpier/pull/1571) ([belomaxorka](https://github.com/belomaxorka)) +- Minor improvements [\#1570](https://github.com/torrentpier/torrentpier/pull/1570), [\#1571](https://github.com/torrentpier/torrentpier/pull/1571), [\#1575](https://github.com/torrentpier/torrentpier/pull/1575) ([belomaxorka](https://github.com/belomaxorka)) - New Crowdin updates [\#1569](https://github.com/torrentpier/torrentpier/pull/1569), [\#1572](https://github.com/torrentpier/torrentpier/pull/1572), [\#1573](https://github.com/torrentpier/torrentpier/pull/1573), [\#1574](https://github.com/torrentpier/torrentpier/pull/1574) ([Exileum](https://github.com/Exileum)) ## [v2.4.4](https://github.com/torrentpier/torrentpier/tree/v2.4.4) (2024-07-22) diff --git a/composer.json b/composer.json index ffb9a8d76..41c8312aa 100644 --- a/composer.json +++ b/composer.json @@ -36,9 +36,10 @@ "forum": "https://torrentpier.com" }, "require": { - "php": "^8.1", + "php": "^8.1 | ^8.2 | ^8.3 | ^8.4", + "arokettu/random-polyfill": "1.0.2", "arokettu/bencode": "^4.1.0", - "arokettu/monsterid": "^4.0", + "arokettu/monsterid": "dev-master", "arokettu/torrent-file": "^5.2.1", "bugsnag/bugsnag": "^v3.29.1", "claviska/simpleimage": "^4.0", @@ -53,7 +54,11 @@ "matthiasmullie/scrapbook": "^1.5", "monolog/monolog": "^3.4", "samdark/sitemap": "2.4.1", - "symfony/mailer": "^6.3", + "symfony/finder": "^6.4", + "symfony/filesystem": "^6.4", + "symfony/event-dispatcher": "^6.4", + "symfony/mime": "^6.4", + "symfony/mailer": "^6.4", "vlucas/phpdotenv": "^5.5" }, "require-dev": { @@ -71,6 +76,6 @@ "php-http/discovery": true } }, - "minimum-stability": "stable", + "minimum-stability": "dev", "prefer-stable": true } diff --git a/composer.lock b/composer.lock index a504617ae..f01854dad 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "5bf770ec31048776ac6470189024cb19", + "content-hash": "c0d21cdb591458dce2d6cebef725cf75", "packages": [ { "name": "arokettu/bencode", @@ -138,16 +138,16 @@ }, { "name": "arokettu/monsterid", - "version": "4.0.0", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/arokettu/monsterid.git", - "reference": "f9c59ae43b8b5a3e4361b65eb240f1a62562f5e1" + "reference": "f470c30dfd9fce7708f1d42689955c5759debd5a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/arokettu/monsterid/zipball/f9c59ae43b8b5a3e4361b65eb240f1a62562f5e1", - "reference": "f9c59ae43b8b5a3e4361b65eb240f1a62562f5e1", + "url": "https://api.github.com/repos/arokettu/monsterid/zipball/f470c30dfd9fce7708f1d42689955c5759debd5a", + "reference": "f470c30dfd9fce7708f1d42689955c5759debd5a", "shasum": "" }, "require": { @@ -163,10 +163,11 @@ "httpsoft/http-message": "^1.1", "phpunit/phpunit": ">= 7.0 < 10", "psy/psysh": "*", - "sandfox.dev/code-standard": "^1.2023.12.09", + "sandfox.dev/code-standard": "^1.2024.07.05", "squizlabs/php_codesniffer": "*", "vimeo/psalm": "^5.4" }, + "default-branch": true, "type": "library", "autoload": { "files": [ @@ -204,7 +205,7 @@ "issues": "https://gitlab.com/sandfox/monsterid/-/issues", "source": "https://gitlab.com/sandfox/monsterid" }, - "time": "2024-01-03T01:03:52+00:00" + "time": "2024-07-20T08:30:37+00:00" }, { "name": "arokettu/random-polyfill", @@ -975,16 +976,16 @@ }, { "name": "guzzlehttp/guzzle", - "version": "7.9.1", + "version": "7.9.2", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "a629e5b69db96eb4939c1b34114130077dd4c6fc" + "reference": "d281ed313b989f213357e3be1a179f02196ac99b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/a629e5b69db96eb4939c1b34114130077dd4c6fc", - "reference": "a629e5b69db96eb4939c1b34114130077dd4c6fc", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/d281ed313b989f213357e3be1a179f02196ac99b", + "reference": "d281ed313b989f213357e3be1a179f02196ac99b", "shasum": "" }, "require": { @@ -1081,7 +1082,7 @@ ], "support": { "issues": "https://github.com/guzzle/guzzle/issues", - "source": "https://github.com/guzzle/guzzle/tree/7.9.1" + "source": "https://github.com/guzzle/guzzle/tree/7.9.2" }, "funding": [ { @@ -1097,7 +1098,7 @@ "type": "tidelift" } ], - "time": "2024-07-19T16:19:57+00:00" + "time": "2024-07-24T11:22:20+00:00" }, { "name": "guzzlehttp/promises", @@ -3973,16 +3974,16 @@ "packages-dev": [ { "name": "symfony/var-dumper", - "version": "v6.4.9", + "version": "v6.4.10", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "c31566e4ca944271cc8d8ac6887cbf31b8c6a172" + "reference": "a71cc3374f5fb9759da1961d28c452373b343dd4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/c31566e4ca944271cc8d8ac6887cbf31b8c6a172", - "reference": "c31566e4ca944271cc8d8ac6887cbf31b8c6a172", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/a71cc3374f5fb9759da1961d28c452373b343dd4", + "reference": "a71cc3374f5fb9759da1961d28c452373b343dd4", "shasum": "" }, "require": { @@ -4038,7 +4039,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v6.4.9" + "source": "https://github.com/symfony/var-dumper/tree/v6.4.10" }, "funding": [ { @@ -4054,16 +4055,18 @@ "type": "tidelift" } ], - "time": "2024-06-27T13:23:14+00:00" + "time": "2024-07-26T12:30:32+00:00" } ], "aliases": [], - "minimum-stability": "stable", - "stability-flags": [], + "minimum-stability": "dev", + "stability-flags": { + "arokettu/monsterid": 20 + }, "prefer-stable": true, "prefer-lowest": false, "platform": { - "php": "^8.1" + "php": "^8.1 | ^8.2 | ^8.3 | ^8.4" }, "platform-dev": [], "plugin-api-version": "2.6.0" diff --git a/library/ajax/index_data.php b/library/ajax/index_data.php index ab1e9397b..9508e58c1 100644 --- a/library/ajax/index_data.php +++ b/library/ajax/index_data.php @@ -139,14 +139,14 @@ switch ($mode) { $total_releases_size = $total_releases = $total_releases_completed = $total_releases_downloaded = 0; if ($row = DB()->fetch_row($sql)) { $total_releases = $row['total_releases']; - $total_releases_size = humn_size($row['total_size']); + $total_releases_size = $row['total_size']; $total_releases_downloaded = $row['total_dl_count']; $total_releases_completed = $row['total_complete']; } $html = '[ ' . $lang['RELEASES'] . ': ' . $total_releases . ' | - ' . $lang['RELEASER_STAT_SIZE'] . ' ' . $total_releases_size . ' | + ' . $lang['RELEASER_STAT_SIZE'] . ' ' . humn_size($total_releases_size) . ' | ' . $lang['DOWNLOADED'] . ': ' . declension((int)$total_releases_downloaded, 'times') . ' ]'; break;