From e176e250b6055b72cb590db0630a02a2c698aad4 Mon Sep 17 00:00:00 2001
From: Shawn <45581750+KOP-XIAO@users.noreply.github.com>
Date: Sat, 9 Oct 2021 21:24:40 +0800
Subject: [PATCH] remove disney+

---
 Scripts/geo_location.js       | 10 +++++-----
 Scripts/streaming-ui-check.js | 20 ++++++++++----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Scripts/geo_location.js b/Scripts/geo_location.js
index ad89fb8..beaf4a7 100644
--- a/Scripts/geo_location.js
+++ b/Scripts/geo_location.js
@@ -21,7 +21,7 @@
   const paran = ["IP","ISP","地区","城市"]
   $task.fetch(myRequest).then(response => {
     message = response? json2info(response.body,paras) : ""
-      $done({"title":"🔎 IP.SB 查询结果","message":message});
+      $done({"title": "    🔎 IP.SB 查询结果", "message": message});
   }, reason => {
     message = "\n\n🛑 查询超时"
       $done({"title": "🔎 IP.SB 查询结果", "message": message});
@@ -29,13 +29,13 @@
 
 
 function json2info(cnt,paras) {
-  var res = "----------------------\n\n"
+  var res = "\n"
   cnt =JSON.parse(cnt)
   for (i=0;i<paras.length;i++) {
-    res = cnt[paras[i]]? res + paran[i] + " : " + cnt[paras[i]] : res
-    res = paras[i] == "country_code"? res+" "+flags.get(cnt[paras[i]].toUpperCase())+"\n\n":res+"\n\n"
+    cnt[paras[i]] = paras[i] == "country_code"? cnt[paras[i]]+" ⟦"+flags.get(cnt[paras[i]].toUpperCase())+"⟧":cnt[paras[i]]
+    res = cnt[paras[i]]? res + paran[i] + " : " + cnt[paras[i]] +"\n\n" : res
   }
-  res =res+ "----------------------\n"+$environment.params
+  res =res+ "------------------------------------\n\n节点 ➟ "+$environment.params
   return res
 }
 
diff --git a/Scripts/streaming-ui-check.js b/Scripts/streaming-ui-check.js
index c11d200..224cd92 100644
--- a/Scripts/streaming-ui-check.js
+++ b/Scripts/streaming-ui-check.js
@@ -6,7 +6,7 @@ Thanks to & modified from
 3. https://github.com/CoiaPrant/MediaUnlock_Test/blob/main/check.sh
 
 
-For Quantumult-X 598+ ONLY!!!
+For Quantumult-X 598+ ONLY!!
 
 [task_local]
 
@@ -60,11 +60,11 @@ function randomString(e)
 var flags = new Map([[ "AC" , "🇦🇨" ] , [ "AF" , "🇦🇫" ] , [ "AI" , "🇦🇮" ] , [ "AL" , "🇦🇱" ] , [ "AM" , "🇦🇲" ] , [ "AQ" , "🇦🇶" ] , [ "AR" , "🇦🇷" ] , [ "AS" , "🇦🇸" ] , [ "AT" , "🇦🇹" ] , [ "AU" , "🇦🇺" ] , [ "AW" , "🇦🇼" ] , [ "AX" , "🇦🇽" ] , [ "AZ" , "🇦🇿" ] , [ "BB" , "🇧🇧" ] , [ "BD" , "🇧🇩" ] , [ "BE" , "🇧🇪" ] , [ "BF" , "🇧🇫" ] , [ "BG" , "🇧🇬" ] , [ "BH" , "🇧🇭" ] , [ "BI" , "🇧🇮" ] , [ "BJ" , "🇧🇯" ] , [ "BM" , "🇧🇲" ] , [ "BN" , "🇧🇳" ] , [ "BO" , "🇧🇴" ] , [ "BR" , "🇧🇷" ] , [ "BS" , "🇧🇸" ] , [ "BT" , "🇧🇹" ] , [ "BV" , "🇧🇻" ] , [ "BW" , "🇧🇼" ] , [ "BY" , "🇧🇾" ] , [ "BZ" , "🇧🇿" ] , [ "CA" , "🇨🇦" ] , [ "CF" , "🇨🇫" ] , [ "CH" , "🇨🇭" ] , [ "CK" , "🇨🇰" ] , [ "CL" , "🇨🇱" ] , [ "CM" , "🇨🇲" ] , [ "CN" , "🇨🇳" ] , [ "CO" , "🇨🇴" ] , [ "CP" , "🇨🇵" ] , [ "CR" , "🇨🇷" ] , [ "CU" , "🇨🇺" ] , [ "CV" , "🇨🇻" ] , [ "CW" , "🇨🇼" ] , [ "CX" , "🇨🇽" ] , [ "CY" , "🇨🇾" ] , [ "CZ" , "🇨🇿" ] , [ "DE" , "🇩🇪" ] , [ "DG" , "🇩🇬" ] , [ "DJ" , "🇩🇯" ] , [ "DK" , "🇩🇰" ] , [ "DM" , "🇩🇲" ] , [ "DO" , "🇩🇴" ] , [ "DZ" , "🇩🇿" ] , [ "EA" , "🇪🇦" ] , [ "EC" , "🇪🇨" ] , [ "EE" , "🇪🇪" ] , [ "EG" , "🇪🇬" ] , [ "EH" , "🇪🇭" ] , [ "ER" , "🇪🇷" ] , [ "ES" , "🇪🇸" ] , [ "ET" , "🇪🇹" ] , [ "EU" , "🇪🇺" ] , [ "FI" , "🇫🇮" ] , [ "FJ" , "🇫🇯" ] , [ "FK" , "🇫🇰" ] , [ "FM" , "🇫🇲" ] , [ "FO" , "🇫🇴" ] , [ "FR" , "🇫🇷" ] , [ "GA" , "🇬🇦" ] , [ "GB" , "🇬🇧" ] , [ "HK" , "🇭🇰" ] ,["HU","🇭🇺"], [ "ID" , "🇮🇩" ] , [ "IE" , "🇮🇪" ] , [ "IL" , "🇮🇱" ] , [ "IM" , "🇮🇲" ] , [ "IN" , "🇮🇳" ] , [ "IS" , "🇮🇸" ] , [ "IT" , "🇮🇹" ] , [ "JP" , "🇯🇵" ] , [ "KR" , "🇰🇷" ] , [ "LU" , "🇱🇺" ] , [ "MO" , "🇲🇴" ] , [ "MX" , "🇲🇽" ] , [ "MY" , "🇲🇾" ] , [ "NL" , "🇳🇱" ] , [ "PH" , "🇵🇭" ] , [ "RO" , "🇷🇴" ] , [ "RS" , "🇷🇸" ] , [ "RU" , "🇷🇺" ] , [ "RW" , "🇷🇼" ] , [ "SA" , "🇸🇦" ] , [ "SB" , "🇸🇧" ] , [ "SC" , "🇸🇨" ] , [ "SD" , "🇸🇩" ] , [ "SE" , "🇸🇪" ] , [ "SG" , "🇸🇬" ] , [ "TH" , "🇹🇭" ] , [ "TN" , "🇹🇳" ] , [ "TO" , "🇹🇴" ] , [ "TR" , "🇹🇷" ] , [ "TV" , "🇹🇻" ] , [ "TW" , "🇨🇳" ] , [ "UK" , "🇬🇧" ] , [ "UM" , "🇺🇲" ] , [ "US" , "🇺🇸" ] , [ "UY" , "🇺🇾" ] , [ "UZ" , "🇺🇿" ] , [ "VA" , "🇻🇦" ] , [ "VE" , "🇻🇪" ] , [ "VG" , "🇻🇬" ] , [ "VI" , "🇻🇮" ] , [ "VN" , "🇻🇳" ] , [ "ZA" , "🇿🇦"]])
 
 let result = {
-  "title": '📺 流媒体服务查询',
+  "title": '    📺  流媒体服务查询',
   "YouTube": 'YouTube: 检测失败，请重试',
   "Netflix": 'Netflix: 检测失败，请重试',
   "Dazn": "Dazn: 检测失败，请重试",
-  "Disney": "Disney+: 检测失败，请重试",
+  "Disney": "Disney: 检测失败，请重试",
   //"Google": "Google 定位: 检测失败，请重试"
 
 }
@@ -74,18 +74,18 @@ StreamingCheck()
 function StreamingCheck(){
   testYTB()
   test(FILM_ID)
-  testDisney()
+  //testDisney()
   testDazn()
   setTimeout(function(){
-    $done({"title": result["title"],"message": "----------------------\n"+([result["YouTube"],result["Netflix"],result["Disney"],result["Dazn"]]).join("\n\n") +'\n----------------------\n'+ $environment.params})
-  },3600)
+    $done({"title": result["title"],"message": "\n            "+([result["YouTube"],result["Netflix"],result["Dazn"]]).join("\n\n            ") +'\n\n            -----------------------------\n\n'+ "            节点" + arrow + $environment.params})
+  },3000)
 }
 
 function test(filmId) {
     let option = {
       url: BASE_URL + filmId,
       opts: opts,
-      timeout: 3500,
+      timeout: 2800,
       headers: {
         'User-Agent':
           'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.61 Safari/537.36',
@@ -123,7 +123,7 @@ function testYTB() {
     let option = {
       url: BASE_URL_YTB,
       opts: opts,
-      timeout: 3500,
+      timeout: 2800,
       headers: {
         'User-Agent':
         'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.61 Safari/537.36'
@@ -164,7 +164,7 @@ function testDisney(){
     let option = {
       url: BASE_URL_DISNEY,
       opts: opts,
-      timeout: 3500,
+      timeout: 2800,
       headers: {
         'User-Agent':
         'Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.198 Safari/537.36'
@@ -218,7 +218,7 @@ function testDazn() {
     url: BASE_URL_Dazn,
     method: "POST",
     opts: opts,
-    timeout: 3500,
+    timeout: 2800,
     headers: {
       'User-Agent':
       'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.87 Safari/537.36',