release: v2.4.6 🦜

Co-authored-by: Yury Pikhtarev <exileum@icloud.com>

.github/workflows/ci.yml

@@ -3,7 +3,7 @@ name: Continuous Integration
 on:
   push:
     branches:
-      - master
+      - v2.4
 
 jobs:
   nightly:
@@ -44,37 +44,5 @@ jobs:
       - name: Upload Archive 📤
         uses: actions/upload-artifact@v4
         with:
-          name: TorrentPier-master
+          name: TorrentPier-v2.4
           path: ${{ steps.create-zip.outputs.ZIP_NAME }}
-
-  deploy:
-    name: 🎉 Deploy
-    runs-on: ubuntu-22.04
-    steps:
-      - name: 🚚 Get latest code
-        uses: actions/checkout@v4
-
-      - name: 🔩 Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: '8.1'
-
-      - name: Update composer.lock file
-        run: composer update --no-install
-
-      - name: 🖇 Install Composer dependencies
-        run: composer install --no-progress --prefer-dist --optimize-autoloader
-
-      - name: 📂 Sync files
-        uses: SamKirkland/FTP-Deploy-Action@v4.3.5
-        with:
-          server: ${{ secrets.FTP_SERVER }}
-          username: ${{ secrets.FTP_USERNAME }}
-          password: ${{ secrets.FTP_PASSWORD }}
-          server-dir: ${{ secrets.FTP_DIR }}
-          protocol: ${{ secrets.FTP_PROTOCOL }}
-          port: ${{ secrets.FTP_PORT }}
-          exclude: |
-            **/.git*
-            **/.git*/**
-            .env

.github/workflows/phpmd.yml

@@ -17,10 +17,10 @@ name: PHPMD
 
 on:
   push:
-    branches: [ "master" ]
+    branches: [ "v2.4" ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ "master" ]
+    branches: [ "v2.4" ]
   schedule:
     - cron: '40 0 * * 3'
 

.github/workflows/schedule.yml

@@ -14,7 +14,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-          ref: master
+          ref: v2.4
           token: ${{ secrets.REPO_TOKEN }}
 
       - name: Generate a changelog
@@ -32,10 +32,10 @@ jobs:
 
       - name: Commit changelog
         run: |
-          git checkout master
+          git checkout v2.4
           git config --local user.name 'belomaxorka'
           git config --local user.email 'roman25052006.kelesh@gmail.com'
           set +e
           git add CHANGELOG.md
-          git commit -m "Update CHANGELOG.md 📖"
-          git push https://${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git master
+          git commit -m "changelog: Update CHANGELOG.md 📖"
+          git push https://${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git v2.4

CHANGELOG.md

@@ -2,7 +2,14 @@
 
 # 📖 Change Log
 
-## [nightly](https://nightly.link/torrentpier/torrentpier/workflows/ci/master/TorrentPier-master)
+## [v2.4.6](https://github.com/torrentpier/torrentpier/compare/v2.4.6-alpha.4..v2.4.6) (2025-06-19)
+
+### 🐛 Bug Fixes
+
+- *(installer)* Strip protocol from TP_HOST to keep only hostname ([#1969](https://github.com/torrentpier/torrentpier/pull/1969)) - ([15f9948](https://github.com/torrentpier/torrentpier/commit/15f994840331b135cd64c0cd61de95fecfc29db8))
+- *(sql)* Resolve `only_full_group_by` compatibility issues in tracker cleanup - ([faf3d79](https://github.com/torrentpier/torrentpier/commit/faf3d7919249d869d8ca8d41617dd4356dc0ac48))
+- Duplicate column SQL query issues in `viewtopic.php` ([#1973](https://github.com/torrentpier/torrentpier/pull/1973)) - ([6a1d682](https://github.com/torrentpier/torrentpier/commit/6a1d6823856dd7c3cef45bea2681828526d1b9f8))
+- SQL queries in online_userlist.php to use MAX() for session data and adjusted GROUP BY clause for better accuracy ([#1971](https://github.com/torrentpier/torrentpier/pull/1971)) - ([2a8b6da](https://github.com/torrentpier/torrentpier/commit/2a8b6daecf63752b8a852c950e9a7fd08e17f57c))
 
 ### 📦 Dependencies
 
@@ -11,7 +18,14 @@
 ### ⚙️ Miscellaneous
 
 - *(_release.php)* Finally! Removed some useless params ([#1947](https://github.com/torrentpier/torrentpier/pull/1947)) - ([9c7d270](https://github.com/torrentpier/torrentpier/commit/9c7d270598c0153fb82f4b7ad96f5b59399b2159))
+- *(cliff)* Add conventional commit prefix to changelog message ([#1970](https://github.com/torrentpier/torrentpier/pull/1970)) - ([7d9594e](https://github.com/torrentpier/torrentpier/commit/7d9594eedab1b2c81d888dfba68ded1b8a142282))
+- Changed active branch name in `_release.php` ([#1972](https://github.com/torrentpier/torrentpier/pull/1972)) - ([7dc69ba](https://github.com/torrentpier/torrentpier/commit/7dc69ba699c75d87c709a799291c4b544b3e92aa))
+- Changed branch name from `master` to `v2.4` ([#1968](https://github.com/torrentpier/torrentpier/pull/1968)) - ([a8e252f](https://github.com/torrentpier/torrentpier/commit/a8e252f64f7205b7bb24739ab637144c6fb022d6))
 
+## New Contributors ❤️
+
+* @belomaxorka made their first contribution
+* @dependabot[bot] made their first contribution in [#1948](https://github.com/torrentpier/torrentpier/pull/1948)
 
 ## [v2.4.6-alpha.4](https://github.com/torrentpier/torrentpier/compare/v2.4.6-alpha.3..v2.4.6-alpha.4) (2025-06-13)
 

_release.php

@@ -124,7 +124,8 @@ runProcess("git tag -a \"$version\" -m \"Release $version\"");
 runProcess("git tag -v \"$version\"");
 
 // Git push
-runProcess("git push origin master");
+runProcess("git checkout v2.4");
+runProcess("git push origin v2.4");
 runProcess("git push origin $version");
 
 out("\n- Release $version has been successfully prepared, committed and pushed!", 'success');

cliff.toml

@@ -23,7 +23,7 @@ body = """
 {%- endmacro -%}
 
 {%- macro nightly_url() -%}
-  https://nightly.link/{{ remote.github.owner }}/{{ remote.github.repo }}/workflows/ci/master/TorrentPier-master
+  https://nightly.link/{{ remote.github.owner }}/{{ remote.github.repo }}/workflows/ci/v2.4/TorrentPier-v2.4
 {%- endmacro -%}
 
 {% macro print_commit(commit) -%}
@@ -105,7 +105,7 @@ commit_parsers = [
   { message = "^refactor", group = "<!-- 2 -->🚜 Refactor" },
   { message = "^style", group = "<!-- 5 -->🎨 Styling" },
   { message = "^test", group = "<!-- 6 -->🧪 Testing" },
-  { message = "^ignore|^release", skip = true },
+  { message = "^ignore|^release|^changelog", skip = true },
   { message = "^chore|^ci|^misc", group = "<!-- 7 -->⚙️ Miscellaneous" },
   { body = ".*security", group = "<!-- 8 -->🛡️ Security" },
   { message = "^revert", group = "<!-- 9 -->◀️ Revert" },

install.php

@@ -206,6 +206,12 @@ if (is_file(BB_ROOT . '.env')) {
             $newValue = trim(readline());
 
             if (!empty($newValue) || $key === 'DB_PASSWORD') {
+                if ($key === 'TP_HOST') {
+                    if (!preg_match('/^https?:\/\//', $newValue)) {
+                        $newValue = 'https://' . $newValue;
+                    }
+                    $newValue = parse_url($newValue, PHP_URL_HOST);
+                }
                 $line = "$key=$newValue";
                 $$key = $newValue;
             } else {

library/config.php

@@ -18,8 +18,8 @@ $reserved_port = env('TP_PORT', 80);
 $bb_cfg = [];
 
 // Version info
-$bb_cfg['tp_version'] = 'v2.4.6-alpha.4';
-$bb_cfg['tp_release_date'] = '13-06-2025';
+$bb_cfg['tp_version'] = 'v2.4.6';
+$bb_cfg['tp_release_date'] = '19-06-2025';
 $bb_cfg['tp_release_codename'] = 'Cattle';
 
 // Increase version number after changing JS or CSS

library/includes/cron/jobs/tr_cleanup_and_dlstat.php

@@ -39,7 +39,7 @@ if ($bb_cfg['tracker']['update_dlstat']) {
 		INSERT INTO " . NEW_BB_BT_LAST_TORSTAT . "
 			(topic_id, user_id, dl_status, up_add, down_add, release_add, speed_up, speed_down)
 		SELECT
-			topic_id, user_id, IF(releaser, $releaser, seeder), SUM(up_add), SUM(down_add), IF(releaser, SUM(up_add), 0), SUM(speed_up), SUM(speed_down)
+			topic_id, user_id, IF(MAX(releaser), $releaser, MAX(seeder)), SUM(up_add), SUM(down_add), IF(MAX(releaser), SUM(up_add), 0), SUM(speed_up), SUM(speed_down)
 		FROM " . BB_BT_TRACKER . "
 		WHERE (up_add != 0 OR down_add != 0)
 		GROUP BY topic_id, user_id
@@ -61,7 +61,6 @@ DB()->query("
     FROM " . BB_BT_TRACKER . "
     WHERE seeder = 1
     GROUP BY topic_id, user_id
-    ORDER BY update_time DESC
 ");
 
 // Clean peers table

library/includes/online_userlist.php

@@ -36,11 +36,11 @@ $online = $online_short = ['userlist' => ''];
 $sql = "
 	SELECT
 		u.username, u.user_id, u.user_opt, u.user_rank, u.user_level,
-		s.session_logged_in, s.session_ip, (s.session_time - s.session_start) AS ses_len, COUNT(s.session_id) AS sessions, COUNT(DISTINCT s.session_ip) AS ips
+		MAX(s.session_logged_in) AS session_logged_in, MAX(s.session_ip) AS session_ip, MAX(s.session_time - s.session_start) AS ses_len, COUNT(s.session_id) AS sessions, COUNT(DISTINCT s.session_ip) AS ips
 	FROM " . BB_SESSIONS . " s, " . BB_USERS . " u
 	WHERE s.session_time > $time_online
 		AND u.user_id = s.session_user_id
-	GROUP BY s.session_user_id
+	GROUP BY s.session_user_id, u.username, u.user_id, u.user_opt, u.user_rank, u.user_level
 	ORDER BY u.username
 ";
 

viewtopic.php

@@ -85,17 +85,17 @@ if ($topic_id && isset($_GET['view']) && ($_GET['view'] == 'next' || $_GET['view
 
 // Get forum/topic data
 if ($topic_id) {
-    $sql = "SELECT t.*, f.*, tw.notify_status
+    $sql = "SELECT t.*, f.cat_id, f.forum_name, f.forum_desc, f.forum_status, f.forum_order, f.forum_posts, f.forum_topics, f.forum_last_post_id, f.forum_tpl_id, f.prune_days, f.auth_view, f.auth_read, f.auth_post, f.auth_reply, f.auth_edit, f.auth_delete, f.auth_sticky, f.auth_announce, f.auth_vote, f.auth_pollcreate, f.auth_attachments, f.auth_download, f.allow_reg_tracker, f.allow_porno_topic, f.self_moderated, f.forum_parent, f.show_on_index, f.forum_display_sort, f.forum_display_order, tw.notify_status
 		FROM " . BB_TOPICS . " t
-		LEFT JOIN " . BB_FORUMS . " f USING(forum_id)
+		LEFT JOIN " . BB_FORUMS . " f ON t.forum_id = f.forum_id
 		LEFT JOIN " . BB_TOPICS_WATCH . " tw ON(tw.topic_id = t.topic_id AND tw.user_id = {$userdata['user_id']})
 		WHERE t.topic_id = $topic_id
 	";
 } elseif ($post_id) {
-    $sql = "SELECT t.*, f.*, p.post_time, tw.notify_status
+    $sql = "SELECT t.*, f.cat_id, f.forum_name, f.forum_desc, f.forum_status, f.forum_order, f.forum_posts, f.forum_topics, f.forum_last_post_id, f.forum_tpl_id, f.prune_days, f.auth_view, f.auth_read, f.auth_post, f.auth_reply, f.auth_edit, f.auth_delete, f.auth_sticky, f.auth_announce, f.auth_vote, f.auth_pollcreate, f.auth_attachments, f.auth_download, f.allow_reg_tracker, f.allow_porno_topic, f.self_moderated, f.forum_parent, f.show_on_index, f.forum_display_sort, f.forum_display_order, p.post_time, tw.notify_status
 		FROM " . BB_TOPICS . " t
-		LEFT JOIN " . BB_FORUMS . " f  USING(forum_id)
-		LEFT JOIN " . BB_POSTS . " p  USING(topic_id)
+		LEFT JOIN " . BB_FORUMS . " f ON t.forum_id = f.forum_id
+		LEFT JOIN " . BB_POSTS . " p ON t.topic_id = p.topic_id
 		LEFT JOIN " . BB_TOPICS_WATCH . " tw ON(tw.topic_id = t.topic_id AND tw.user_id = {$userdata['user_id']})
 		WHERE p.post_id = $post_id
 	";