增加排行榜指定日期查看

apps/pixiv.js

@@ -8,7 +8,7 @@ import common from '../model/common.js'
 let ranktype = new Pixiv().RankReg
 let Numreg = "[一壹二两三四五六七八九十百千万亿\\d]+"
 //正则
-let listreg = new RegExp(`^#?看看(${Object.keys(ranktype).join("|")})(r18)?榜\\s?(第(${Numreg})页)?$`,"i")
+let listreg = new RegExp(`^#?看看((\\d{4}-\\d{1,2}-\\d{1,2})的)?(${Object.keys(ranktype).join("|")})(r18)?榜\\s?(第(${Numreg})页)?$`, "i")
 let tagreg = new RegExp('^#?tag搜图(.*)$', "i")
 let pidreg = new RegExp('^#?pid搜图\\s?(\\d+)$', "i")
 let uidreg = new RegExp('^#?uid搜图(.*)$', "i")
@@ -80,14 +80,16 @@ export class example extends plugin {
         await e.reply("你先别急，马上去给你找哦ε(*´･ω･)з")
 
         let regRet = listreg.exec(e.msg)
-        
+
         let day = moment().hour() >= 12 ? 1 : 2
 
         let date = moment().subtract(day, "days").format("YYYY-MM-DD")
 
-        let page = common.translateChinaNum(regRet[4] || "1")
-        
-        let res = await new Pixiv(e).Rank(page, date, regRet[1], !!regRet[2])
+        if (regRet[2]) date = regRet[2]
+
+        let page = common.translateChinaNum(regRet[6] || "1")
+
+        let res = await new Pixiv(e).Rank(page, date, regRet[3], !!regRet[5], !!regRet[2])
 
         if (!res) return
 

model/Pixiv.js

@@ -118,7 +118,7 @@ export default class Pixiv {
      * @param {String} mode 榜单类型
      * @return {Array} 
      */
-    async Rank(page, date, mode = "周", r18 = false) {
+    async Rank(page, date, mode = "周", r18 = false, Specifydate = false) {
         // let api = `https://api.bbmang.me/ranks?page=${page}&date=${date}&mode=${this.ranktype[mode]}&pageSize=30`
         //转为大写
         mode = lodash.toUpper(mode)
@@ -155,7 +155,7 @@ export default class Pixiv {
         if (!res) return false
 
         if (lodash.isEmpty(res.illusts)) {
-            this.e.reply("暂无数据，请稍后重试哦(。-ω-)zzz")
+            this.e.reply("暂无数据，请等待榜单更新哦(。-ω-)zzz")
             return false
         };
         let proxy = await redis.get(this.proxy)
@@ -178,7 +178,7 @@ export default class Pixiv {
             `当前为第${page}页，共${pageAll}页，本页共${illusts.length}张，总共${pageSize}张`,
         ];
         if (page < pageAll) {
-            list.push(`可使用 "#看看${mode}${r18 ? "R18" : ""}榜第${page - 0 + 1}页" 翻页`)
+            list.push(`可使用 "#看看${Specifydate ? `${date}的` : ""}${mode}${r18 ? "R18" : ""}榜第${page - 0 + 1}页" 翻页`)
         }
 
         list.push(...illusts)