Merge branch 'master' of https://github.com/asoltys/coinos-server

2 files changed, 11 insertions, 3 deletions

diff --git a/lib/rates.js b/lib/rates.js
index fdb7f5ac..80c22bf0 100644
--- a/lib/rates.js
+++ b/lib/rates.js
@@ -27,7 +27,9 @@ let fetchRates;
       try {
         let {
           data: { rates: fx }
-        } = await axios.get(`http://data.fixer.io/api/latest?access_key=${config.fixer}`);
+        } = await axios.get(
+          `http://data.fixer.io/api/latest?access_key=${config.fixer}`
+        );
         let USD = fx["USD"];
         Object.keys(fx).map(k => {
           fx[k] = parseFloat((fx[k] / fx["USD"]).toFixed(6));
@@ -44,6 +46,13 @@ let fetchRates;
   setTimeout(fetchRates, 7200000);
 })();
 
+app.get(
+  "/rates",
+  ah(async (req, res, next) => {
+    res.send(app.get("rates"));
+  })
+);
+
 setInterval(() => {
   broadcast("rate", app.get("last"));
 }, 1000);
diff --git a/lib/sockets.js b/lib/sockets.js
index b6a806ff..931a9d23 100644
--- a/lib/sockets.js
+++ b/lib/sockets.js
@@ -92,10 +92,9 @@ wss.on("connection", function(ws, req) {
       case "login":
         let token = data;
 
-        if (differenceInSeconds(new Date(), subSeconds(lastSeen[token], 5)) < 2) return;
+        if (differenceInSeconds(new Date(), lastSeen[token]) < 5) return;
         lastSeen[token] = new Date();
 
-
         try {
           if (!token || token === "null") return ws.close();
           const username = jwt.decode(token).username;