From 9a545f66a9657435b6ee2a45a6cbc8b59defde13 Mon Sep 17 00:00:00 2001
From: zhiyu1998 <542716863@qq.com>
Date: Fri, 12 Jul 2024 13:28:57 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix:=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E7=94=A8=E6=88=B7=E4=BD=BF=E7=94=A8=20TikTok?=
 =?UTF-8?q?=20=E8=A7=A3=E6=9E=90=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/tools.js   |  2 +-
 utils/tiktok.js | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/apps/tools.js b/apps/tools.js
index 2d833af..d390606 100644
--- a/apps/tools.js
+++ b/apps/tools.js
@@ -342,7 +342,7 @@ export class tools extends plugin {
             return false;
         }
         // 处理链接
-        let url = await processTikTokUrl(e.msg.trim(), isOversea);
+        let url = await processTikTokUrl(e.msg.trim(), isOversea, this.myProxy);
         // 去除多余参数
         const parsedUrl = new URL(url);
         parsedUrl.search = '';
diff --git a/utils/tiktok.js b/utils/tiktok.js
index 0ccdb08..63b55c9 100644
--- a/utils/tiktok.js
+++ b/utils/tiktok.js
@@ -4,9 +4,10 @@ import HttpProxyAgent from "https-proxy-agent";
  * Tiktok专属解析链接的Fetch
  * @param url 地址
  * @param isOversea 是否是海外
+ * @param proxy 梯子
  */
-const fetchTiktokUrl = async (url, isOversea) => {
-    const proxyAgent = isOversea ? '' : new HttpProxyAgent(this.myProxy);
+const fetchTiktokUrl = async (url, isOversea, proxy) => {
+    const proxyAgent = isOversea ? '' : new HttpProxyAgent(proxy);
     // 处理特殊情况 & 非特殊情况的header
     const headers = url.includes("vm.tiktok") || url.includes("tiktok.com/t")
         ? { "User-Agent": "facebookexternalhit/1.1" }
@@ -25,8 +26,9 @@ const fetchTiktokUrl = async (url, isOversea) => {
  * 处理Tiktok链接
  * @param url 用户发送的链接，可能存在一些问题，需要正则匹配处理
  * @param isOversea 是否是海外
+ * @param proxy 梯子
  */
-export const processTikTokUrl = async (url, isOversea) => {
+export const processTikTokUrl = async (url, isOversea, proxy) => {
     // 合并正则表达式
     // const urlShortRex = /(http:|https:)\/\/vt.tiktok.com\/[A-Za-z\d._?%&+\-=\/#]*/g;
     // const urlShortRex2 = /(http:|https:)\/\/vm.tiktok.com\/[A-Za-z\d._?%&+\-=\/#]*/g;
@@ -35,7 +37,7 @@ export const processTikTokUrl = async (url, isOversea) => {
     const match = tikTokRegex.exec(url);
 
     if (match) {// 如果URL匹配任何TikTok相关的模式，则进行处理
-        url = await fetchTiktokUrl(match[0], isOversea);
+        url = await fetchTiktokUrl(match[0], isOversea, proxy);
     }
 
     // 这里可以处理其他逻辑，例如更新URL、记录日志等