From 0ef1b8130f5469a172c095a21aa9a9e8e3dd5ec7 Mon Sep 17 00:00:00 2001
From: Hex <hex@codeigniter.org.cn>
Date: Tue, 7 Mar 2023 17:18:16 +0800
Subject: [PATCH] update

---
 bot.js           | 22 +++++++++++++++++++++-
 smzdm_checkin.js | 19 +++----------------
 smzdm_lottery.js | 19 +++----------------
 smzdm_task.js    | 19 +++----------------
 4 files changed, 30 insertions(+), 49 deletions(-)

diff --git a/bot.js b/bot.js
index 673fa89..0c6b986 100644
--- a/bot.js
+++ b/bot.js
@@ -109,6 +109,25 @@ const updateCookie = (cookie, name, value) => {
   return cookie.replace(re, `$1${name}=${encodeURIComponent(value)};`);
 };
 
+const getEnvCookies = () => {
+  let cookies = [];
+
+  // 判断环境变量里面是否有 cookie
+  if (process.env.SMZDM_COOKIE) {
+    if (process.env.SMZDM_COOKIE.indexOf('&') > -1) {
+      cookies = process.env.SMZDM_COOKIE.split('&');
+    }
+    else if (process.env.SMZDM_COOKIE.indexOf('\n') > -1) {
+      cookies = process.env.SMZDM_COOKIE.split('\n');
+    }
+    else {
+      cookies = [process.env.SMZDM_COOKIE];
+    }
+  }
+
+  return cookies[0] ? cookies : false;
+};
+
 // ------------------------------------
 
 class SmzdmBot {
@@ -158,5 +177,6 @@ module.exports = {
   SmzdmBot,
   requestApi,
   removeTags,
-  parseJSON
+  parseJSON,
+  getEnvCookies
 };
diff --git a/smzdm_checkin.js b/smzdm_checkin.js
index 41fcce7..172e109 100644
--- a/smzdm_checkin.js
+++ b/smzdm_checkin.js
@@ -6,7 +6,7 @@ cron: 10 8 * * *
 */
 
 const Env = require('./env');
-const { SmzdmBot, requestApi, removeTags } = require('./bot');
+const { SmzdmBot, requestApi, removeTags, getEnvCookies } = require('./bot');
 const notify = require('./sendNotify');
 
 // ------------------------------------
@@ -133,22 +133,9 @@ class SmzdmCheckinBot extends SmzdmBot {
 }
 
 !(async () => {
-  let cookies = [];
+  const cookies = getEnvCookies();
 
-  // 判断环境变量里面是否有 cookie
-  if (process.env.SMZDM_COOKIE) {
-    if (process.env.SMZDM_COOKIE.indexOf('&') > -1) {
-      cookies = process.env.SMZDM_COOKIE.split('&');
-    }
-    else if (process.env.SMZDM_COOKIE.indexOf('\n') > -1) {
-      cookies = process.env.SMZDM_COOKIE.split('\n');
-    }
-    else {
-      cookies = [process.env.SMZDM_COOKIE];
-    }
-  }
-
-  if (!cookies[0]) {
+  if (cookies === false) {
     $.log('\n请先设置 SMZDM_COOKIE 环境变量');
 
     return;
diff --git a/smzdm_lottery.js b/smzdm_lottery.js
index f1b9dc9..3e9c5b7 100644
--- a/smzdm_lottery.js
+++ b/smzdm_lottery.js
@@ -6,7 +6,7 @@ cron: 20 8 * * *
 */
 
 const Env = require('./env');
-const { SmzdmBot, requestApi, parseJSON } = require('./bot');
+const { SmzdmBot, requestApi, parseJSON, getEnvCookies } = require('./bot');
 const notify = require('./sendNotify');
 
 // ------------------------------------
@@ -99,22 +99,9 @@ class SmzdmLotteryBot extends SmzdmBot {
 }
 
 !(async () => {
-  let cookies = [];
+  const cookies = getEnvCookies();
 
-  // 判断环境变量里面是否有 cookie
-  if (process.env.SMZDM_COOKIE) {
-    if (process.env.SMZDM_COOKIE.indexOf('&') > -1) {
-      cookies = process.env.SMZDM_COOKIE.split('&');
-    }
-    else if (process.env.SMZDM_COOKIE.indexOf('\n') > -1) {
-      cookies = process.env.SMZDM_COOKIE.split('\n');
-    }
-    else {
-      cookies = [process.env.SMZDM_COOKIE];
-    }
-  }
-
-  if (!cookies[0]) {
+  if (cookies === false) {
     $.log('\n请先设置 SMZDM_COOKIE 环境变量');
 
     return;
diff --git a/smzdm_task.js b/smzdm_task.js
index cca1748..d47b2d2 100644
--- a/smzdm_task.js
+++ b/smzdm_task.js
@@ -6,7 +6,7 @@ cron: 20 14 * * *
 */
 
 const Env = require('./env');
-const { SmzdmBot, requestApi, removeTags } = require('./bot');
+const { SmzdmBot, requestApi, removeTags, getEnvCookies } = require('./bot');
 const notify = require('./sendNotify');
 
 // ------------------------------------
@@ -699,22 +699,9 @@ class SmzdmTaskBot extends SmzdmBot {
 }
 
 !(async () => {
-  let cookies = [];
+  const cookies = getEnvCookies();
 
-  // 判断环境变量里面是否有 cookie
-  if (process.env.SMZDM_COOKIE) {
-    if (process.env.SMZDM_COOKIE.indexOf('&') > -1) {
-      cookies = process.env.SMZDM_COOKIE.split('&');
-    }
-    else if (process.env.SMZDM_COOKIE.indexOf('\n') > -1) {
-      cookies = process.env.SMZDM_COOKIE.split('\n');
-    }
-    else {
-      cookies = [process.env.SMZDM_COOKIE];
-    }
-  }
-
-  if (!cookies[0]) {
+  if (cookies === false) {
     $.log('\n请先设置 SMZDM_COOKIE 环境变量');
 
     return;