Merge branch 'master' of github.com:Peng-YM/QuanX

Peng-YM · Peng-YM · commit 17765c77d317 · 2020-11-23T21:29:36.000+08:00
diff --git a/Tasks/caiyun.js b/Tasks/caiyun.js
@@ -118,7 +118,7 @@ if (typeof $request !== "undefined") {
         );
       else $.notify("[彩云天气]", "❌ 出现错误", JSON.stringify(err, Object.getOwnPropertyNames(err)));
     })
-    .finally($.done());
+    .finally(() => $.done());
 }
 
 async function scheduler() {
diff --git a/Tasks/psn.js b/Tasks/psn.js
@@ -21,7 +21,7 @@ $.http.get({
         return parse(data['@graph']);
     })
     .catch((err) => $.error(err))
-    .finally($.done());
+    .finally(() => $.done());
 
 function parse(products) {
     products.forEach(item => {
diff --git a/Tools/RunningMode/running-mode.js b/Tools/RunningMode/running-mode.js
@@ -53,6 +53,8 @@ $done();
 
 function manager() {
   let ssid;
+  let mode;
+
   if (isSurge) {
     const v4_ip = $network.v4.primaryAddress;
     // no network connection
@@ -61,7 +63,7 @@ function manager() {
       return;
     }
     ssid = $network.wifi.ssid;
-    const mode = ssid ? lookupSSID(ssid) : config.cellular;
+    mode = ssid ? lookupSSID(ssid) : config.cellular;
     const target = {
       RULE: "rule",
       PROXY: "global-proxy",
@@ -71,7 +73,7 @@ function manager() {
   } else if (isLoon) {
     const conf = JSON.parse($config.getConfig());
     ssid = conf.ssid;
-    const mode = ssid ? lookupSSID(ssid) : config.cellular;
+    mode = ssid ? lookupSSID(ssid) : config.cellular;
     const target = {
       DIRECT: 0,
       RULE: 1,
@@ -98,16 +100,11 @@ function lookupSSID(ssid) {
 }
 
 function notify(title, subtitle, content) {
-  const TIMESTAMP_KEY = "running_mode_notified_time";
-  const THROTTLE_TIME = 3 * 1000;
-  const lastNotifiedTime = $persistentStore.read(THROTTLE_TIME);
-  if (
-    !lastNotifiedTime ||
-    new Date().getTime() - lastNotifiedTime > THROTTLE_TIME
-  ) {
-    $persistentStore.write(new Date().getTime().toString(), TIMESTAMP_KEY);
+  const SUBTITLE_STORE_KEY = "running_mode_notified_subtitle";
+  const lastNotifiedSubtitle = $persistentStore.read(SUBTITLE_STORE_KEY);
+
+  if (!lastNotifiedSubtitle || lastNotifiedSubtitle !== subtitle) {
+    $persistentStore.write(subtitle.toString(), SUBTITLE_STORE_KEY);
     $notification.post(title, subtitle, content);
   }
-}
-
-notify("title", "subtitle", "content");
+}

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ if (typeof $request !== "undefined") {`
`118`	`118`	`);`
`119`	`119`	`else $.notify("[彩云天气]", "❌ 出现错误", JSON.stringify(err, Object.getOwnPropertyNames(err)));`
`120`	`120`	`})`
`121`		`- .finally($.done());`
	`121`	`+ .finally(() => $.done());`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`async function scheduler() {`