diff --git a/CHANGELOG.md b/CHANGELOG.md index e55f64a..e0a780f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ * 新增`#查看代理设置`ⁿᵉʷ * 优化pixiv和bika开启或关闭图片直连 * 优化回复撤回是文件时删除文件 +* 适配`segment`全局变量 # 1.1.2 diff --git a/guoba.support.js b/guoba.support.js index aea97f0..4d3192a 100644 --- a/guoba.support.js +++ b/guoba.support.js @@ -358,7 +358,7 @@ export function supportGuoba () { label: 'ascii2d结果数量', bottomHelpMessage: 'ascii2d搜图返回结果的最大数量', component: 'InputNumber' - }, + } ], // 获取配置数据方法(用于前端填充显示数据) @@ -367,7 +367,7 @@ export function supportGuoba () { whole: Config.Notice, pixiv: Config.pixiv, bika: Config.bika, - picSearch: Config.picSearch, + picSearch: Config.picSearch } }, diff --git a/model/Pixiv/api.js b/model/Pixiv/api.js index 361c5a9..4e2bb0f 100644 --- a/model/Pixiv/api.js +++ b/model/Pixiv/api.js @@ -231,8 +231,9 @@ function getNoonTomorrow () { const now = moment() // 获取当前时间 const noonToday = moment().startOf('day').add(12, 'hours') // 获取今天中午12点的时间 const noonTomorrow = moment().add(1, 'day').startOf('day').add(12, 'hours') // 获取明天中午12点的时间 - - return (now < noonToday + let time = now < noonToday ? noonToday.diff(now, 'hours') - : noonTomorrow.diff(now, 'hours')) + 'h' + : noonTomorrow.diff(now, 'hours') + if (time > 12) time = 12 + return time + 'h' }