From: Nick Downing <nick@ndcode.org>
Date: Thu, 27 Jan 2022 12:00:42 +0000 (+1100)
Subject: Finish changing XDate.now() to env.now, new XDate() to new XDate(env.now)
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?p=ndcode_site.git;a=commitdiff_plain;h=8a0a6220fa7da5248b35af323043fce4c1ff08b0

Finish changing XDate.now() to env.now, new XDate() to new XDate(env.now)
---

diff --git a/api/account/change_details/set_draft.json.jst b/api/account/change_details/set_draft.json.jst
index 6bb9f32..cf72d73 100644
--- a/api/account/change_details/set_draft.json.jst
+++ b/api/account/change_details/set_draft.json.jst
@@ -24,7 +24,7 @@ return async env => {
         let session = await get_session(env, root)
 
         if (details) {
-          let expires = new XDate()
+          let expires = new XDate(env.now)
           expires.addDays(1)
           session.set_json(
             'change_details_draft',
diff --git a/api/account/password_reset.json.jst b/api/account/password_reset.json.jst
index ec15432..7a6dba9 100644
--- a/api/account/password_reset.json.jst
+++ b/api/account/password_reset.json.jst
@@ -38,7 +38,7 @@ return async env => {
           )
 
         link_code = crypto.randomBytes(16).toString('hex')
-        let expires = new XDate()
+        let expires = new XDate(env.now)
         expires.addDays(1)
         account.set_json(
           'verify_password',
diff --git a/api/account/send_email_verification_link.json.jst b/api/account/send_email_verification_link.json.jst
index 5b45149..f039e0d 100644
--- a/api/account/send_email_verification_link.json.jst
+++ b/api/account/send_email_verification_link.json.jst
@@ -44,7 +44,7 @@ return async env => {
           )
 
         link_code = crypto.randomBytes(16).toString('hex')
-        let expires = new XDate()
+        let expires = new XDate(env.now)
         expires.addDays(1)
         account.set_json(
           'verify_email',
diff --git a/api/account/sign_up/create_account.json.jst b/api/account/sign_up/create_account.json.jst
index 42c0b92..c00faf4 100644
--- a/api/account/sign_up/create_account.json.jst
+++ b/api/account/sign_up/create_account.json.jst
@@ -1,5 +1,4 @@
 let jst_server = (await import('@ndcode/jst_server')).default
-let XDate = require('xdate')
 
 return async env => {
   let post_request = await _require('/_lib/post_request.jst')
@@ -38,7 +37,7 @@ return async env => {
         let captcha = await session.get('captcha')
         if (
           captcha === undefined ||
-            XDate.now() >= await captcha.get_json('expires')
+            env.now >= await captcha.get_json('expires')
         )
           throw new jst_server.Problem(
             'No verification image in session',
diff --git a/api/account/sign_up/set_draft.json.jst b/api/account/sign_up/set_draft.json.jst
index c09cdd5..4bd2271 100644
--- a/api/account/sign_up/set_draft.json.jst
+++ b/api/account/sign_up/set_draft.json.jst
@@ -25,7 +25,7 @@ return async env => {
         let session = await get_session(env, root)
 
         if (details) {
-          let expires = new XDate()
+          let expires = new XDate(env.now)
           expires.addDays(1)
           session.set_json(
             'sign_up_draft',
diff --git a/api/account/verify_email.json.jst b/api/account/verify_email.json.jst
index c0f2fc3..a90d900 100644
--- a/api/account/verify_email.json.jst
+++ b/api/account/verify_email.json.jst
@@ -1,6 +1,5 @@
 let crypto = require('crypto')
 let jst_server = (await import('@ndcode/jst_server')).default
-let XDate = require('xdate')
 
 return async env => {
   let post_request = await _require('/_lib/post_request.jst')
@@ -42,7 +41,7 @@ return async env => {
         let verify_email = await account.get('verify_email')
         if (
           verify_email === undefined ||
-            XDate.now() >= await verify_email.get_json('expires')
+            env.now >= await verify_email.get_json('expires')
         )
           throw new jst_server.Problem(
             'Link code missing',
diff --git a/api/account/verify_password.json.jst b/api/account/verify_password.json.jst
index 7b7ea25..c396b56 100644
--- a/api/account/verify_password.json.jst
+++ b/api/account/verify_password.json.jst
@@ -1,6 +1,5 @@
 let crypto = require('crypto')
 let jst_server = (await import('@ndcode/jst_server')).default
-let XDate = require('xdate')
 
 return async env => {
   let post_request = await _require('/_lib/post_request.jst')
@@ -35,7 +34,7 @@ return async env => {
         let verify_password = await account.get('verify_password')
         if (
           verify_password === undefined ||
-            XDate.now() >= await verify_password.get_json('expires')
+            env.now >= await verify_password.get_json('expires')
         )
           throw new jst_server.Problem(
             'Link code missing',
diff --git a/api/contact/set_draft.json.jst b/api/contact/set_draft.json.jst
index 2261f28..a596d4a 100644
--- a/api/contact/set_draft.json.jst
+++ b/api/contact/set_draft.json.jst
@@ -26,7 +26,7 @@ return async env => {
         let session = await get_session(env, root)
 
         if (details) {
-          let expires = new XDate()
+          let expires = new XDate(env.now)
           expires.addDays(1)
           session.set_json(
             'contact_draft',
diff --git a/api/feedback/set_draft.json.jst b/api/feedback/set_draft.json.jst
index cd93d13..26ebddf 100644
--- a/api/feedback/set_draft.json.jst
+++ b/api/feedback/set_draft.json.jst
@@ -22,7 +22,7 @@ return async env => {
         let session = await get_session(env, root)
 
         if (details) {
-          let expires = new XDate()
+          let expires = new XDate(env.now)
           expires.addDays(1)
           session.set_json(
             'feedback_draft',