From 37adea83053856a8f73a8d1f7aa30865a5b181d5 Mon Sep 17 00:00:00 2001
From: winway <winway1988@163.com>
Date: Tue, 27 Aug 2019 20:23:07 +0800
Subject: [PATCH] =?UTF-8?q?bug=20fix:=E9=81=BF=E6=9F=A5=E8=AF=A2=E6=97=A0?=
 =?UTF-8?q?=E7=94=A8=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 handlers.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/handlers.js b/handlers.js
index 36847bd..9346eec 100644
--- a/handlers.js
+++ b/handlers.js
@@ -27,6 +27,12 @@ function fix_query_time(q, reg, count, unit) {
     if (match) {
         const time = moment(parseInt(match[2], 10));
         time.subtract(count, unit);
+        if (reg == from) {
+            if (q.match(to) || q.match(to_rel))
+                return q.replace(reg, match[1] + time.valueOf() + match[3]);
+            else
+                return q.replace(reg, match[1] + time.valueOf() + match[3] + " AND time < now() - 0h");
+        }
         return q.replace(reg, match[1] + time.valueOf() + match[3]);
     }
     return q;
@@ -35,6 +41,12 @@ function fix_query_time(q, reg, count, unit) {
 function fix_query_time_relative(q, reg, count, unit) {
     const match = q.match(reg);
     if (match) {
+        if (reg == from_rel) {
+            if (q.match(to) || q.match(to_rel))
+                return q.replace(match[0], match[0] + " - " + moment.duration(count, unit).valueOf() + "ms");
+            else
+                return q.replace(match[0], match[0] + " - " + moment.duration(count, unit).valueOf() + "ms AND time < now() - 0h");
+        }
         return q.replace(match[0], match[0] + " - " + moment.duration(count, unit).valueOf() + "ms");
     }
     return q;