From 825b7e71ec0bee31566382098ea850185f835b95 Mon Sep 17 00:00:00 2001 From: Sebb Date: Tue, 4 Oct 2016 21:06:18 +0100 Subject: [PATCH] Also return first/last months --- site/api/stats.lua | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/site/api/stats.lua b/site/api/stats.lua index 078885ca..6d3a7f3d 100644 --- a/site/api/stats.lua +++ b/site/api/stats.lua @@ -439,6 +439,7 @@ function handle(r) -- Get years active local nowish = math.floor(os.time()/600) local firstYear = r:ivm_get("firstYear:" .. nowish .. ":" ..get.list .. "@" .. get.domain) + local firstMonth = r:ivm_get("firstMonth:" .. nowish .. ":" ..get.list .. "@" .. get.domain) if (not firstYear or firstYear == "") and not statsOnly then local doc = elastic.raw { query = { @@ -464,11 +465,14 @@ function handle(r) size = 1 } firstYear = tonumber(os.date("%Y", doc.hits.hits[1] and doc.hits.hits[1]._source.epoch or os.time())) + firstMonth = tonumber(os.date("%m", doc.hits.hits[1] and doc.hits.hits[1]._source.epoch or os.time())) r:ivm_set("firstYear:" .. nowish .. ":" .. get.list .. "@" .. get.domain, firstYear) + r:ivm_set("firstMonth:" .. nowish .. ":" .. get.list .. "@" .. get.domain, firstMonth) end -- Get years active local lastYear = r:ivm_get("lastYear:" .. nowish .. ":" ..get.list .. "@" .. get.domain) + local lastMonth = r:ivm_get("lastMonth:" .. nowish .. ":" ..get.list .. "@" .. get.domain) if (not lastYear or lastYear == "") and not statsOnly then local doc = elastic.raw { @@ -495,7 +499,9 @@ function handle(r) size = 1 } lastYear = tonumber(os.date("%Y", doc.hits.hits[1] and doc.hits.hits[1]._source.epoch or os.time())) + lastMonth = tonumber(os.date("%m", doc.hits.hits[1] and doc.hits.hits[1]._source.epoch or os.time())) r:ivm_set("lastYear:" .. nowish .. ":" ..get.list .. "@" .. get.domain, lastYear) + r:ivm_set("lastMonth:" .. nowish .. ":" ..get.list .. "@" .. get.domain, lastMonth) end @@ -770,6 +776,8 @@ function handle(r) end listdata.firstYear = firstYear listdata.lastYear = lastYear + listdata.firstMonth = firstMonth + listdata.lastMonth = lastMonth listdata.list = listraw:gsub("^([^.]+)%.", "%1@"):gsub("[<>]+", "") listdata.emails = emls listdata.hits = h