Fix the 'empty news bug'

[vchess.git] / server / routes / news.js

diff --git a/server/routes/news.js b/server/routes/news.js
index 4c2a74e..af7f6ac 100644 (file)
--- a/server/routes/news.js
+++ b/server/routes/news.js
@@ -15,7 +15,7 @@ router.post("/news", access.logged, access.ajax, (req,res) => {
 
 router.get("/news", access.ajax, (req,res) => {
   const cursor = req.query["cursor"];
-  if (!!cursor.match(/^[0-9]+$/)) {
+  if (!!cursor && !!cursor.match(/^[0-9]+$/)) {
     NewsModel.getNext(cursor, (err, newsList) => {
       res.json(err || { newsList: newsList });
     });
@@ -24,8 +24,8 @@ router.get("/news", access.ajax, (req,res) => {
 
 router.get("/newsts", access.ajax, (req,res) => {
   // Special query for footer: just return timestamp of last news
-  NewsModel.getTimestamp((err,ts) => {
-    res.json(err || { timestamp: ts.added });
+  NewsModel.getTimestamp((err, ts) => {
+    res.json(err || { timestamp: !!ts ? ts.added : 0 });
   });
 });