From 61f4de8868cf6dff30903ed0db62fc3b4c47fc66 Mon Sep 17 00:00:00 2001
From: xiaomlove <1939737565@qq.com>
Date: Tue, 28 Oct 2025 11:01:58 +0700
Subject: [PATCH] fix takeupload duplicate tagId

---
 include/constants.php       | 2 +-
 include/functions.php       | 4 +++-
 include/globalfunctions.php | 5 ++++-
 public/announce.php         | 5 +----
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/include/constants.php b/include/constants.php
index 93cf3442..acf60fd8 100644
--- a/include/constants.php
+++ b/include/constants.php
@@ -1,6 +1,6 @@
 <?php
 defined('VERSION_NUMBER') || define('VERSION_NUMBER', '1.9.10');
-defined('RELEASE_DATE') || define('RELEASE_DATE', '2025-10-17');
+defined('RELEASE_DATE') || define('RELEASE_DATE', '2025-10-28');
 defined('IN_TRACKER') || define('IN_TRACKER', false);
 defined('PROJECTNAME') || define("PROJECTNAME","NexusPHP");
 defined('NEXUSPHPURL') || define("NEXUSPHPURL","https://nexusphp.org");
diff --git a/include/functions.php b/include/functions.php
index 7fb9ff33..520f924a 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -6006,7 +6006,9 @@ function insert_torrent_tags($torrentId, $tagIdArr, $sync = false)
             do_log("special tag: $tagId, and user no permission");
             continue;
         }
-        $values[] = sprintf("(%s, %s, '%s', '%s')", $torrentId, $tagId, $dateTimeStringNow, $dateTimeStringNow);
+        if (!isset($values[$tagId])) {
+            $values[$tagId] = sprintf("(%s, %s, '%s', '%s')", $torrentId, $tagId, $dateTimeStringNow, $dateTimeStringNow);
+        }
     }
     $insertTagsSql .= implode(', ', $values);
     do_log("[INSERT_TAGS], torrent: $torrentId with tags: " . nexus_json_encode($tagIdArr));
diff --git a/include/globalfunctions.php b/include/globalfunctions.php
index 603b9f1d..1bec1e64 100644
--- a/include/globalfunctions.php
+++ b/include/globalfunctions.php
@@ -724,7 +724,10 @@ function get_tracker_schema_and_host($trackerUrlId, $combine = false): array|str
     $url = \App\Models\TrackerUrl::getById($trackerUrlId);
     if (empty($url)) {
         $ssl_torrent = isHttps() ? 'https://' : 'http://';
-        $base_announce_url = sprintf("%s/%s", \App\Models\Setting::getBaseUrl(), DEFAULT_TRACKER_URI);
+        $base_announce_url = sprintf(
+            "%s/%s",
+            trim(\App\Models\Setting::getBaseUrl(), '/'), trim(DEFAULT_TRACKER_URI, '/')
+        );
         $log .= ", ById no value";
     } else {
         $ssl_torrent = parse_url($url, PHP_URL_SCHEME) . "://" ;
diff --git a/public/announce.php b/public/announce.php
index b5287dcb..f991485e 100644
--- a/public/announce.php
+++ b/public/announce.php
@@ -135,10 +135,7 @@ $isDonor = is_donor($az);
 $az['__is_donor'] = $isDonor;
 $log = "user: $userid, isDonor: $isDonor, seeder: $seeder, ip: $ip, ipv4: $ipv4, ipv6: $ipv6";
 //check tracker url
-$trackerUrl = \App\Models\TrackerUrl::getById($az['tracker_url_id']);
-if ($trackerUrl === false) {
-    warn("please select tracker url at user control panel");
-}
+$trackerUrl = get_tracker_schema_and_host($az['tracker_url_id'], true);
 $currentUrl = getSchemeAndHttpHost();
 if (!str_contains($trackerUrl, $currentUrl)) {
     do_log("announce check tracker url, trackerUrl: $trackerUrl does not contains: $currentUrl");