From cf4102373b0b5612ff75c2335ae80e638879e1f6 Mon Sep 17 00:00:00 2001
From: James Ketrenos <james_git@ketrenos.com>
Date: Wed, 12 Sep 2018 15:27:16 -0700
Subject: [PATCH] Checking to see if memories is returning replicated entries

Signed-off-by: James Ketrenos <james_git@ketrenos.com>
---
 server/routes/photos.js | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/server/routes/photos.js b/server/routes/photos.js
index 890e8a4..2954b39 100755
--- a/server/routes/photos.js
+++ b/server/routes/photos.js
@@ -40,17 +40,14 @@ router.get("/memories/*", function(req, res/*, next*/) {
   if (id == -1) {
     index = "";
   } else {
-    if (id != -1) {
-      index = " AND ((taken=DATE(:cursor) AND id<"+id+ ") OR taken<DATE(:cursor))";
-    } else {
-      index = " AND (taken<=DATE(:cursor))";
-    }
+    index = " AND ((taken=DATE(:cursor) AND id<"+id+ ") OR taken<DATE(:cursor))";
   }
 
   let date = new Date(decodeURI(req.url).replace(/\?.*$/, ""));
   let query = "SELECT * FROM photos WHERE strftime('%m%d',taken)=strftime('%m%d',:date) " + index + " ORDER BY taken DESC,id DESC LIMIT " + (limit * 2 + 1);
 
   console.log("Memories for " + date.toISOString().replace(/T.*/, ""));
+  console.log(query);
 
   return photoDB.sequelize.query(query, {
     replacements: {
@@ -112,11 +109,7 @@ router.get("/*", function(req, res/*, next*/) {
   if (id == -1) {
     index = "";
   } else {
-    if (id != -1) {
-      index = " AND ((taken=DATE(:cursor) AND id<"+id+ ") OR taken<DATE(:cursor))";
-    } else {
-      index = " AND (taken<=DATE(:cursor))";
-    }
+    index = " AND ((taken=DATE(:cursor) AND id<"+id+ ") OR taken<DATE(:cursor))";
   }
 
   let path = decodeURI(req.url).replace(/\?.*$/, ""),