Procházet zdrojové kódy

:arrow_up: upgrade dependency

LI JIAHAO před 6 roky
rodič
revize
ce129da9a6
5 změnil soubory, kde provedl 14 přidání a 12 odebrání
  1. 1 3
      README.md
  2. 4 2
      dist/datetime.js
  3. 2 2
      package.json
  4. 4 2
      src/datetime.js
  5. 3 3
      yarn.lock

+ 1 - 3
README.md

@@ -3,7 +3,6 @@
 [![npm](https://img.shields.io/npm/v/cqhttp-twitter-bot.svg)](https://www.npmjs.com/package/cqhttp-twitter-bot)
 [![npm](https://img.shields.io/npm/dt/cqhttp-twitter-bot.svg)](https://www.npmjs.com/package/cqhttp-twitter-bot)
 [![GitHub issues](https://img.shields.io/github/issues/rikakomoe/cqhttp-twitter-bot.svg)](https://github.com/rikakomoe/cqhttp-twitter-bot/issues)
-[![GitHub top language](https://img.shields.io/github/languages/top/rikakomoe/cqhttp-twitter-bot.svg)](https://github.com/rikakomoe/cqhttp-twitter-bot)
 [![npm](https://img.shields.io/npm/l/cqhttp-twitter-bot.svg)](https://www.npmjs.com/package/cqhttp-twitter-bot)
 
 是一个可以订阅 Twitter 并转发到 QQ 的 Bot。
@@ -11,8 +10,7 @@
 ## 安装
 
 ```bash
-npm install -g cqhttp-twitter-bot
-yarn global add cqhttp-twitter-bot
+npm i -g cqhttp-twitter-bot
 ```
 
 当然还需要配合 [coolq-http-api](https://github.com/richardchien/coolq-http-api) 和 [酷Q](https://cqp.cc/) 才能工作。  

+ 4 - 2
dist/datetime.js

@@ -5,7 +5,8 @@ function relativeDate(dtstr) {
         return '暂无数据';
     const dt = new Date(dtstr);
     const dateTimeStamp = dt.getTime();
-    const minute = 1000 * 60;
+    const second = 1000;
+    const minute = second * 60;
     const hour = minute * 60;
     const day = hour * 24;
     const month = day * 30;
@@ -19,6 +20,7 @@ function relativeDate(dtstr) {
     const dayC = diffValue / day;
     const hourC = diffValue / hour;
     const minC = diffValue / minute;
+    const secC = diffValue / second;
     let result;
     if (monthC > 12) {
         const y = dt.getFullYear() + ' 年';
@@ -42,7 +44,7 @@ function relativeDate(dtstr) {
         result = '' + Math.floor(minC) + ' 分钟前';
     }
     else
-        result = '刚刚';
+        result = '' + Math.floor(secC) + ' 秒前';
     return result;
 }
 exports.relativeDate = relativeDate;

+ 2 - 2
package.json

@@ -18,12 +18,12 @@
   },
   "homepage": "https://github.com/rikakomoe/cqhttp-twitter-bot",
   "scripts": {
-    "build": "tsc --outDir dist",
+    "build": "rm -r dist && tsc --outDir dist",
     "lint": "tslint --fix -c tslint.json --project ./"
   },
   "dependencies": {
     "command-line-usage": "^5.0.5",
-    "cq-websocket": "^1.2.5",
+    "cq-websocket": "^1.2.6",
     "log4js": "^2.10.0",
     "pngjs": "^3.3.3",
     "read-all-stream": "^3.1.0",

+ 4 - 2
src/datetime.js

@@ -2,7 +2,8 @@ function relativeDate(dtstr) {
   if (!dtstr) return '暂无数据';
   const dt = new Date(dtstr);
   const dateTimeStamp = dt.getTime();
-  const minute = 1000 * 60;
+  const second = 1000;
+  const minute = second * 60;
   const hour = minute * 60;
   const day = hour * 24;
   const month = day * 30;
@@ -16,6 +17,7 @@ function relativeDate(dtstr) {
   const dayC = diffValue / day;
   const hourC = diffValue / hour;
   const minC = diffValue / minute;
+  const secC = diffValue / second;
   let result;
   if (monthC > 12) {
     const y = dt.getFullYear() + ' 年';
@@ -32,7 +34,7 @@ function relativeDate(dtstr) {
     result = '' + Math.floor(hourC) + ' 小时前';
   } else if (minC >= 1) {
     result = '' + Math.floor(minC) + ' 分钟前';
-  } else result = '刚刚';
+  } else result = '' + Math.floor(secC) + ' 秒前';
   return result;
 }
 

+ 3 - 3
yarn.lock

@@ -266,9 +266,9 @@ core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
 
-cq-websocket@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/cq-websocket/-/cq-websocket-1.2.5.tgz#3258796cb1e4445e220a8891f2c02ec5d4410148"
+cq-websocket@^1.2.6:
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/cq-websocket/-/cq-websocket-1.2.6.tgz#87e75f30a1fb1f25dbf1e4e9d93af6aa8e287b5e"
   dependencies:
     lodash.get "^4.4.2"
     websocket "^1.0.25"