ctrlcvs/xiaoyao-cvs-plugin
2
0
Fork 0
mirror of https://github.com/ctrlcvs/xiaoyao-cvs-plugin.git synced 2024-12-23 11:40:51 +08:00
Code

去除data-format依赖

Browse Source
This commit is contained in:
leiyilu 2022-07-25 19:19:39 +08:00
parent 5545ae8ec4
commit d94e847843
2 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -1,6 +1,7 @@
# 1.1.1 # 1.1.1
* 初步兼容V3版本 * 初步兼容V3版本
* V3版本请在cmd命令窗口追加`date-format`包 指令pnpm i date-format * 版本兼容问题V2报错的话请导入`yaml`包 指令 `cnpm i yaml`
* V3版本请在cmd命令窗口追加`date-format`包 指令`pnpm i date-format`
# 1.1.0 # 1.1.0
* 增加`#图鉴帮助`用于查看帮助命令 * 增加`#图鉴帮助`用于查看帮助命令

31
apps/Note.js
View File

@ -4,7 +4,6 @@ import {
import fetch from "node-fetch"; import fetch from "node-fetch";
import Common from "../components/Common.js"; import Common from "../components/Common.js";
import fs from "fs"; import fs from "fs";
import format from "date-format";
import { isV3 } from '../components/Changelog.js' import { isV3 } from '../components/Changelog.js'
import MysInfo from '../model/mys/mysInfo.js' import MysInfo from '../model/mys/mysInfo.js'
// import { MysUser } from "../../../lib/components/Models.js"; // import { MysUser } from "../../../lib/components/Models.js";
@ -44,6 +43,7 @@ export async function Note(e, {
if(isV3){ if(isV3){
res = await MysInfo.get(e, 'dailyNote') res = await MysInfo.get(e, 'dailyNote')
if (!res || res.retcode !== 0) return true if (!res || res.retcode !== 0) return true
uid=e.uid;
}else{ }else{
if (NoteCookie[e.user_id]) { if (NoteCookie[e.user_id]) {
cookie = NoteCookie[e.user_id].cookie; cookie = NoteCookie[e.user_id].cookie;
@ -110,18 +110,18 @@ export async function Note(e, {
Bot.logger.mark(`体力推送:${e.user_id}`); Bot.logger.mark(`体力推送:${e.user_id}`);
} }
let nowDay = format("dd", new Date()); let nowDay = moment(new Date()).format("DD");
let resinMaxTime; let resinMaxTime;
let resinMaxTime_mb2; let resinMaxTime_mb2;
let resinMaxTime_mb2Day; let resinMaxTime_mb2Day;
if (data.resin_recovery_time > 0) { if (data.resin_recovery_time > 0) {
resinMaxTime = new Date().getTime() + data.resin_recovery_time * 1000; resinMaxTime = new Date().getTime() + data.resin_recovery_time * 1000;
let maxDate = new Date(resinMaxTime); let maxDate = new Date(resinMaxTime);
resinMaxTime = format("hh:mm", maxDate); resinMaxTime =moment(maxDate).format("hh:mm");
let Time_day = await dateTime_(maxDate) let Time_day = await dateTime_(maxDate)
resinMaxTime_mb2 = Time_day + moment(maxDate).format("hh:mm"); resinMaxTime_mb2 = Time_day + moment(maxDate).format("hh:mm");
// console.log(format("dd", maxDate)) // console.log(format("dd", maxDate))
if (format("dd", maxDate) != nowDay) { if (moment(maxDate).format("DD") != nowDay) {
resinMaxTime_mb2Day = `明天`; resinMaxTime_mb2Day = `明天`;
resinMaxTime = `明天 ${resinMaxTime}`; resinMaxTime = `明天 ${resinMaxTime}`;
} else { } else {
@ -149,9 +149,9 @@ export async function Note(e, {
} }
val.percentage = ((val.dq_time / 60 / 60 * 1 / time_cha) * 100 / 10).toFixed(0) * 10; val.percentage = ((val.dq_time / 60 / 60 * 1 / time_cha) * 100 / 10).toFixed(0) * 10;
let remainedDate = new Date(val.remained_time); let remainedDate = new Date(val.remained_time);
val.remained_time = format("hh:mm", remainedDate); val.remained_time = moment(remainedDate).format("hh:mm");
let Time_day = await dateTime_(remainedDate) let Time_day = await dateTime_(remainedDate)
if (format("dd", remainedDate) != nowDay) { if (moment(remainedDate).format("DD") != nowDay) {
val.remained_mb2 = "明天" + Time_day + moment(remainedDate).format("hh:mm"); val.remained_mb2 = "明天" + Time_day + moment(remainedDate).format("hh:mm");
val.remained_time = `明天 ${val.remained_time}`; val.remained_time = `明天 ${val.remained_time}`;
} else { } else {
@ -170,8 +170,8 @@ export async function Note(e, {
if (remained_time > 0) { if (remained_time > 0) {
remained_time = new Date().getTime() + remained_time * 1000; remained_time = new Date().getTime() + remained_time * 1000;
let remainedDate = new Date(remained_time); let remainedDate = new Date(remained_time);
remained_time = format("hh:mm", remainedDate); remained_time = moment(remainedDate).format("hh:mm");
if (format("dd", remainedDate) != nowDay) { if (moment(remainedDate).format("DD") != nowDay) {
remained_time = `明天 ${remained_time}`; remained_time = `明天 ${remained_time}`;
} else { } else {
remained_time = ` ${remained_time}`; remained_time = ` ${remained_time}`;
@ -195,20 +195,20 @@ export async function Note(e, {
coinTime_mb2 = Time_day + moment(coinDate).format("hh:mm"); coinTime_mb2 = Time_day + moment(coinDate).format("hh:mm");
} else { } else {
coinTime_mb2 = moment(coinDate).format("hh:mm"); coinTime_mb2 = moment(coinDate).format("hh:mm");
if (format("dd", coinDate) != nowDay) { if ( moment(coinDate).format("DD") != nowDay) {
coinTime_mb2Day = "明天"; coinTime_mb2Day = "明天";
coinTime = `明天 ${format("hh:mm", coinDate)}`; coinTime = `明天 ${ moment(coinDate).format("hh:mm")}`;
} else { } else {
coinTime_mb2Day = "今天"; coinTime_mb2Day = "今天";
coinTime = format("hh:mm", coinDate); coinTime = moment(coinDate).format("hh:mm", coinDate);
} }
} }
} }
let day = format("MM-dd hh:mm", new Date()); let day = moment(new Date()).format("MM-DD HH:mm");
let week = ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"]; let week = ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"];
day += " " + week[new Date().getDay()]; day += " " + week[new Date().getDay()];
let day_mb2 = format("yyyy年MM月dd日 hh:mm", new Date()) + " " + week[new Date().getDay()]; let day_mb2 = moment(new Date()).format("yyyy年MM月DD日 HH:mm") + " " + week[new Date().getDay()];
//参量质变仪 //参量质变仪
if (data?.transformer?.obtained) { if (data?.transformer?.obtained) {
data.transformer.reached = data.transformer.recovery_time.reached; data.transformer.reached = data.transformer.recovery_time.reached;
@ -279,10 +279,7 @@ export async function Note(e, {
} }
async function dateTime_(time) { async function dateTime_(time) {
return format("hh", time) < 6 ? "凌晨" : format("hh", time) < 12 ? "上午" : format("hh", return moment(time).format("hh") < 6 ? "凌晨" : moment(time).format("hh") < 12 ? "上午" : moment(time).format("hh") < 17.5 ? "下午" : moment(time).format("hh") < 19.5 ? "傍晚" : moment(time).format("hh") < 22 ? "晚上" : "深夜";
time) < 17.5 ? "下午" : format("hh",
time) < 19.5 ? "傍晚" : format("hh",
time) < 22 ? "晚上" : "深夜";
} }
async function getDailyNote(uid, cookie) { async function getDailyNote(uid, cookie) {
let mysApi = new MysApi(uid, cookie) let mysApi = new MysApi(uid, cookie)