Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions handlers.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down