From 22e6bf3139945cd84c298d04c4e595c54af75544 Mon Sep 17 00:00:00 2001
From: HF <pixelplanetdev@gmail.com>
Date: Thu, 3 Jun 2021 16:16:12 +0200
Subject: [PATCH] fix admintools rollback

---
 .gitignore                 | 1 +
 src/core/adminfunctions.js | 2 +-
 src/core/rollback.js       | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index db7c0bc..c26114f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,6 +28,7 @@ pids
 *.pid
 *.seed
 *.pid.lock
+*.kate-swp
 
 # Directory for instrumented libs generated by jscoverage/JSCover
 lib-cov
diff --git a/src/core/adminfunctions.js b/src/core/adminfunctions.js
index 886ed26..6c4ff73 100644
--- a/src/core/adminfunctions.js
+++ b/src/core/adminfunctions.js
@@ -299,7 +299,7 @@ export async function executeRollback(
     error = 'Corner coordinates are alligned wrong';
   } else if (!date) {
     error = 'No date given';
-  } else if (Number.isNaN(Number(date))) {
+  } else if (Number.isNaN(Number(date)) || date.length !== 8) {
     error = 'Invalid date';
   } else if (!canvas) {
     error = 'Invalid canvas selected';
diff --git a/src/core/rollback.js b/src/core/rollback.js
index 82b1628..3736d7d 100644
--- a/src/core/rollback.js
+++ b/src/core/rollback.js
@@ -32,7 +32,8 @@ export default async function rollbackToDate(
     return 0;
   }
   const dir = path.resolve(__dirname, BACKUP_DIR);
-  const backupDir = `${dir}/${date}/${canvasId}/tiles`;
+  // eslint-disable-next-line max-len
+  const backupDir = `${dir}/${date.slice(0, 4)}/${date.slice(4, 6)}/${date.slice(6)}/${canvasId}/tiles`;
   if (!fs.existsSync(backupDir)) {
     return 0;
   }