Skip to content

Commit b7e8807

Browse files
committed
Merge branch 'master' of https://github.com/chavyleung/scripts
2 parents 0bf80ed + 637bd8a commit b7e8807

2 files changed

Lines changed: 76 additions & 63 deletions

File tree

‎midu/miduRead.js‎

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ function initial() {
8585
}
8686
}
8787

88+
;
8889
(sign = () => {
8990
senku.log(`🔔 ${cookieName}`)
9091
senku.getdata('tokenMidu_read') ? '' : senku.msg('米读阅读', '', '不存在Cookie')
@@ -112,7 +113,7 @@ async function all() {
112113
await readTime(headerVal, token, urlVal)
113114
await userInfo(key)
114115
await prizeInfo(key)
115-
if (signinfo.prizeInfo.data.total_num) {
116+
if (signinfo.prizeInfo && signinfo.prizeInfo.data && signinfo.prizeInfo.data.total_num) {
116117
await prizeTask(key)
117118
await drawPrize(key)
118119
}
@@ -150,7 +151,9 @@ function drawPrize(bodyVal) {
150151
senku.post(url, (error, response, data) => {
151152
try {
152153
senku.log(`🐍🐢 ${cookieName} drawPrize - response: ${JSON.stringify(response)}`)
153-
data ? signinfo.drawPrize = JSON.parse(data) : signinfo.drawPrize = null
154+
if (data) {
155+
signinfo.drawPrize = JSON.parse(data)
156+
}
154157
resolve()
155158
} catch (e) {
156159
// senku.msg(cookieName, `抽奖: 失败`, `说明: ${e}`)
@@ -176,7 +179,9 @@ function prizeTask(bodyVal) {
176179
senku.post(url, (error, response, data) => {
177180
try {
178181
senku.log(`🐍🐢 ${cookieName} prizeTask - response: ${JSON.stringify(response)}`)
179-
data ? signinfo.prizeTask = JSON.parse(data) : signinfo.prizeTask = null
182+
if (data) {
183+
signinfo.prizeTask = JSON.parse(data)
184+
}
180185
resolve()
181186
} catch (e) {
182187
// senku.msg(cookieName, `观看视频抽奖: 失败`, `说明: ${e}`)
@@ -202,7 +207,9 @@ function prizeInfo(bodyVal) {
202207
senku.post(url, (error, response, data) => {
203208
try {
204209
senku.log(`🐍🐢 ${cookieName} prizeInfo - response: ${JSON.stringify(response)}`)
205-
data ? signinfo.prizeInfo = JSON.parse(data) : signinfo.prizeInfo = null
210+
if (data) {
211+
signinfo.prizeInfo = JSON.parse(data)
212+
}
206213
resolve()
207214
} catch (e) {
208215
// senku.msg(cookieName, `抽奖信息: 失败`, `说明: ${e}`)
@@ -220,7 +227,7 @@ function readTime(header, token, urlVal) {
220227
url: 'https://apiwz.midukanshu.com/user/readTimeBase/readTime?' + urlVal,
221228
headers: {
222229
'host': 'apiwz.midukanshu.com',
223-
'versionName': '1.7.1.0430.1512',
230+
'versionName': '1.7.2.0501.1930',
224231
"User-Agent": "MRSpeedNovel/0430.1512 CFNetwork/1125.2 Darwin/19.5.0",
225232
"Content-Type": "application/x-www-form-urlencoded; charset=utf-8",
226233
'token': token,
@@ -231,7 +238,9 @@ function readTime(header, token, urlVal) {
231238
senku.post(url, (error, response, data) => {
232239
try {
233240
senku.log(`🐍🐢 ${cookieName} readTime - response: ${JSON.stringify(response)}`)
234-
data ? signinfo.readTime = JSON.parse(data) : signinfo.readTime = null
241+
if (data) {
242+
signinfo.readTime = JSON.parse(data)
243+
}
235244
resolve()
236245
} catch (e) {
237246
// senku.msg(cookieName, `阅读时长: 失败`, `说明: ${e}`)
@@ -257,7 +266,9 @@ function userInfo(bodyVal) {
257266
senku.post(url, (error, response, data) => {
258267
try {
259268
senku.log(`🐍🐢 ${cookieName} userInfo - response: ${JSON.stringify(response)}`)
260-
data ? signinfo.userInfo = JSON.parse(data) : signinfo.userInfo = null
269+
if (data) {
270+
signinfo.userInfo = JSON.parse(data)
271+
}
261272
resolve()
262273
} catch (e) {
263274
// senku.msg(cookieName, `用户信息: 失败`, `说明: ${e}`)
@@ -273,31 +284,28 @@ function showmsg() {
273284
return new Promise((resolve, reject) => {
274285
let subTitle = ''
275286
let detail = ''
276-
const name = signinfo.userInfo.data.nickname ? signinfo.userInfo.data.nickname : `未设置昵称`
287+
const name = signinfo.userInfo && signinfo.userInfo.data && signinfo.userInfo.data.nickname ? signinfo.userInfo.data.nickname : `账户已退出`
277288
if (signinfo.readTime && signinfo.readTime.code == 0) {
278289
const coin = signinfo.readTime.data.coin
279290
const readTotalMinute = signinfo.readTime.data.readTotalMinute
280291
const total_coin = signinfo.readTime.data.total_coin
281292
coin == 0 ? detail += `` : detail += `【阅读时长】获得${coin}💰`
282293
readTotalMinute ? detail += ` 阅读时长${readTotalMinute / 2}分钟,该账户:${total_coin}💰` : detail += `该账户:${total_coin}💰`
283-
} else if (signinfo.readTime.code != 0) {
294+
} else if (signinfo.readTime && signinfo.readTime.code != 0) {
284295
detail += `【阅读时长】错误代码${signinfo.readTime.code},错误信息${signinfo.readTime.message}`
285296
senku.msg(cookieName + ` 用户:${name}`, subTitle, detail)
286-
} else {
287-
detail += '【阅读时长】失败'
288-
senku.msg(cookieName + ` 用户:${name}`, subTitle, detail)
289297
}
290298

291-
if (senku.getdata('debug') == 'true' || detail && signinfo.readTime.data.readTotalMinute % 60 == 0) {
299+
if (senku.getdata('debug') == 'true' || detail && signinfo.readTime && signinfo.readTime.data && signinfo.readTime.data.readTotalMinute % 60 == 0) {
292300
senku.msg(cookieName + ` 用户:${name}`, subTitle, detail)
293-
} else if (senku.getdata('debug') == 'true' || signinfo.readTime.data.readTotalMinute % 60 == 0) {
301+
} else if (senku.getdata('debug') == 'true' || signinfo.readTime && signinfo.readTime.data && signinfo.readTime.data.readTotalMinute % 60 == 0) {
294302
senku.msg(cookieName + ` 用户:${name}`, '阅读结果', '时间未到')
295303
}
296304

297305
// 大转盘抽手机
298306
if (signinfo.drawPrize) {
299307
if (signinfo.drawPrize.code == 0) {
300-
drawPrize.data.index >= 0 ? detail += `【转盘奖励】本次${drawPrize.data.title}\n` : detail += ``
308+
detail += `【转盘奖励】本次${drawPrize.data.title}\n`
301309
} else {
302310
detail += `【转盘奖励】无次数抽奖`
303311
}

‎midu/miduSign.js‎

Lines changed: 53 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,54 @@ const bind = true // 绑定作者邀请码,默认true,可更改为false
2323
const cookieName = '米读'
2424
const senku = init()
2525

26+
if (DeleteCookie) {
27+
const one = senku.getdata('tokenMidu_read')
28+
const two = senku.getdata('tokenMidu_sign')
29+
const three = senku.getdata('tokenMidu_read2')
30+
const four = senku.getdata('tokenMidu_sign2')
31+
if (DeleteCookieAll) {
32+
if (one || two || three || four) {
33+
senku.setdata("", 'senku_signbody_midu')
34+
senku.setdata("", 'senku_signbody_midu2')
35+
senku.setdata("", 'senku_readTimebody_midu')
36+
senku.setdata("", 'senku_readTimebody_midu2')
37+
senku.setdata("", 'senku_readTimeheader_midu')
38+
senku.setdata("", 'senku_readTimeheader_midu2')
39+
senku.setdata("", "tokenMidu_read")
40+
senku.setdata("", "tokenMidu_read2")
41+
senku.setdata("", "tokenMidu_sign")
42+
senku.setdata("", "tokenMidu_sign2")
43+
senku.msg("米读 Cookie清除成功 !", "", '请手动关闭脚本内"DeleteCookie"选项')
44+
} else {
45+
senku.msg("米读 无可清除的Cookie !", "", '请手动关闭脚本内"DeleteCookie"选项')
46+
}
47+
} else if (DeleteCookieOne) {
48+
if (one || two) {
49+
senku.setdata("", 'senku_signbody_midu')
50+
senku.setdata("", 'senku_readTimebody_midu')
51+
senku.setdata("", 'senku_readTimeheader_midu')
52+
senku.setdata("", "tokenMidu_read")
53+
senku.setdata("", "tokenMidu_sign")
54+
senku.msg("米读 Cookie清除成功 !", "清除账户一选项", '请手动关闭脚本内"DeleteCookie"选项')
55+
} else {
56+
senku.msg("米读 无可清除的Cookie !", "清除账户一选项", '请手动关闭脚本内"DeleteCookie"选项')
57+
}
58+
} else if (DeleteCookieTwo) {
59+
if (three || four) {
60+
senku.setdata("", 'senku_signbody_midu2')
61+
senku.setdata("", 'senku_readTimebody_midu2')
62+
senku.setdata("", 'senku_readTimeheader_midu2')
63+
senku.setdata("", "tokenMidu_read2")
64+
senku.setdata("", "tokenMidu_sign2")
65+
senku.msg("米读 Cookie清除成功 !", "清除账户二选项", '请手动关闭脚本内"DeleteCookie"选项')
66+
} else {
67+
senku.msg("米读 无可清除的Cookie !", "清除账户二选项", '请手动关闭脚本内"DeleteCookie"选项')
68+
}
69+
} else {
70+
senku.msg("米读 清除Cookie !", "未选取任何选项", '请手动关闭脚本内"DeleteCookie"选项')
71+
}
72+
}
73+
2674
function initial() {
2775
signinfo = {
2876
addnumList: [],
@@ -31,7 +79,10 @@ function initial() {
3179
}
3280
}
3381

34-
bind ? '' : senku.setdata('', 'bind');;
82+
bind ? '' : senku.setdata('', 'bind')
83+
84+
85+
;
3586
(sign = () => {
3687
senku.log(`🔔 ${cookieName}`)
3788
senku.getdata('tokenMidu_sign') ? '' : senku.msg('米读签到', '', '不存在Cookie')
@@ -345,53 +396,7 @@ function showmsg() {
345396
})
346397
}
347398

348-
if (DeleteCookie) {
349-
const one = senku.getdata('tokenMidu_read')
350-
const two = senku.getdata('tokenMidu_sign')
351-
const three = senku.getdata('tokenMidu_read2')
352-
const four = senku.getdata('tokenMidu_sign2')
353-
if (DeleteCookieAll) {
354-
if (one || two || three || four) {
355-
senku.setdata("", 'senku_signbody_midu')
356-
senku.setdata("", 'senku_signbody_midu2')
357-
senku.setdata("", 'senku_readTimebody_midu')
358-
senku.setdata("", 'senku_readTimebody_midu2')
359-
senku.setdata("", 'senku_readTimeheader_midu')
360-
senku.setdata("", 'senku_readTimeheader_midu2')
361-
senku.setdata("", "tokenMidu_read")
362-
senku.setdata("", "tokenMidu_read2")
363-
senku.setdata("", "tokenMidu_sign")
364-
senku.setdata("", "tokenMidu_sign2")
365-
senku.msg("米读 Cookie清除成功 !", "", '请手动关闭脚本内"DeleteCookie"选项')
366-
} else {
367-
senku.msg("米读 无可清除的Cookie !", "", '请手动关闭脚本内"DeleteCookie"选项')
368-
}
369-
} else if (DeleteCookieOne) {
370-
if (one || two) {
371-
senku.setdata("", 'senku_signbody_midu')
372-
senku.setdata("", 'senku_readTimebody_midu')
373-
senku.setdata("", 'senku_readTimeheader_midu')
374-
senku.setdata("", "tokenMidu_read")
375-
senku.setdata("", "tokenMidu_sign")
376-
senku.msg("米读 Cookie清除成功 !", "清除账户一选项", '请手动关闭脚本内"DeleteCookie"选项')
377-
} else {
378-
senku.msg("米读 无可清除的Cookie !", "清除账户一选项", '请手动关闭脚本内"DeleteCookie"选项')
379-
}
380-
} else if (DeleteCookieTwo) {
381-
if (three || four) {
382-
senku.setdata("", 'senku_signbody_midu2')
383-
senku.setdata("", 'senku_readTimebody_midu2')
384-
senku.setdata("", 'senku_readTimeheader_midu2')
385-
senku.setdata("", "tokenMidu_read2")
386-
senku.setdata("", "tokenMidu_sign2")
387-
senku.msg("米读 Cookie清除成功 !", "清除账户二选项", '请手动关闭脚本内"DeleteCookie"选项')
388-
} else {
389-
senku.msg("米读 无可清除的Cookie !", "清除账户二选项", '请手动关闭脚本内"DeleteCookie"选项')
390-
}
391-
} else {
392-
senku.msg("米读 清除Cookie !", "未选取任何选项", '请手动关闭脚本内"DeleteCookie"选项')
393-
}
394-
}
399+
395400

396401
function init() {
397402
isSurge = () => {

0 commit comments

Comments
 (0)