From 353c472984a8c4953ac2a13f17d8a08c7c70f5e0 Mon Sep 17 00:00:00 2001
From: mrfry <mr.fry@tutanota.com>
Date: Sun, 2 Apr 2023 08:36:26 +0200
Subject: [PATCH] comment cleanup

---
 src/modules/api/submodules/p2p.ts | 30 ++++++++++++------------------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/src/modules/api/submodules/p2p.ts b/src/modules/api/submodules/p2p.ts
index a730288..9b6b526 100644
--- a/src/modules/api/submodules/p2p.ts
+++ b/src/modules/api/submodules/p2p.ts
@@ -61,8 +61,6 @@ import {
 } from '../../../types/typeSchemas'
 import { paths } from '../../../utils/files'
 
-// TODO: remove FINALIZE-s and TOTEST-s
-
 interface MergeResult {
     newData: Subject[]
     newSubjects: Subject[]
@@ -541,7 +539,7 @@ function setup(data: SubmoduleData): Submodule {
             }${logger.C()} peers`
         )
 
-        const lastSync = new Date('2012-03-12').getTime() // FINALIZE date: this is only for testing // selfInfo.lastSync
+        const lastSync = selfInfo.lastSync
         logger.Log(
             `\tLast sync date: ${logger.C('blue')}${new Date(
                 lastSync
@@ -561,7 +559,7 @@ function setup(data: SubmoduleData): Submodule {
         })
 
         const requests = peers.map((peer) => {
-            const lastSyncWithPeer = new Date('2012-03-12').getTime() // FINALIZE same as above // peer.lastSync || 0
+            const lastSyncWithPeer = peer.lastSync || 0
 
             return new Promise<RequestResult<SyncDataRes & { peer: PeerInfo }>>(
                 (resolve) => {
@@ -680,7 +678,7 @@ function setup(data: SubmoduleData): Submodule {
         } = {}
 
         // -------------------------------------------------------------------------------------------------------
-        // new users handlin TOTEST: test
+        // new users handlin
         // -------------------------------------------------------------------------------------------------------
         const oldUserCount = dbtools.SelectAll(userDB, 'users').length
         try {
@@ -736,7 +734,6 @@ function setup(data: SubmoduleData): Submodule {
         const { subjCount: oldSubjCount, questionCount: oldQuestionCount } =
             countOfQdbs(getQuestionDbs())
         const oldQuestionDbCount = getQuestionDbs().length
-        // TOTEST: test if backup wrks
         backupData(getQuestionDbs())
         logger.Log('\tOld data backed up!')
 
@@ -765,7 +762,6 @@ function setup(data: SubmoduleData): Submodule {
                 getQuestionDbs(),
                 mergeResults
             )
-            // TOTEST: test muliple new question dbs from multiple sources
             // setting new index & path
             writeNewData(
                 newQuestionDbs,
@@ -895,8 +891,7 @@ function setup(data: SubmoduleData): Submodule {
     // ---------------------------------------------------------------------------------------
     // APP SETUP
     // ---------------------------------------------------------------------------------------
-    app.get('/p2pinfo', (req: Request, res: Response<RemotePeerInfo>) => {
-        logger.LogReq(req)
+    app.get('/p2pinfo', (_req: Request, res: Response<RemotePeerInfo>) => {
         res.json(getSelfInfo(true))
     })
 
@@ -989,15 +984,14 @@ function setup(data: SubmoduleData): Submodule {
 
     app.get('/syncp2pdata', (req: Request, res: Response) => {
         logger.LogReq(req)
-        // FINALIZE: uncomment
-        // const user = req.session.user
-        // if (user.id !== 1) {
-        //     res.json({
-        //         status: 'error',
-        //         msg: 'only user 1 can call this EP',
-        //     })
-        //     return
-        // }
+        const user = req.session.user
+        if (user.id !== 1) {
+            res.json({
+                status: 'error',
+                msg: 'only user 1 can call this EP',
+            })
+            return
+        }
 
         // FIXME: /syncResult EP if this EP times out, but we still need the result
         if (syncInProgress) {