From 162904bfc308124d33f45c51a0e5c8c7ca038e6e Mon Sep 17 00:00:00 2001
From: rr- <rr-@sakuya.pl>
Date: Sun, 12 Jun 2016 14:26:52 +0200
Subject: [PATCH] server/info: add serverTime field

---
 API.md                                   |  6 ++++--
 server/szurubooru/api/info_api.py        |  1 +
 server/szurubooru/tests/api/test_info.py | 10 +++++++---
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/API.md b/API.md
index e1f1ae77..2f9e0a92 100644
--- a/API.md
+++ b/API.md
@@ -1373,14 +1373,16 @@ data.
         "diskUsage": <disk-usage>,  // in bytes
         "featuredPost": <featured-post>,
         "featuringTime": <time>,
-        "featuringUser": <user>
+        "featuringUser": <user>,
+        "serverTime": <server-time>
     }
     ```
 
 - **Description**
 
     Retrieves simple statistics. `<featured-post>` is null if there is no
-    featured post yet.
+    featured post yet. `<server-time>` is pretty much the same as the `Date`
+    HTTP field, only formatted in a manner consistent with other dates.
 
 
 
diff --git a/server/szurubooru/api/info_api.py b/server/szurubooru/api/info_api.py
index 0dad5f8b..4d670e51 100644
--- a/server/szurubooru/api/info_api.py
+++ b/server/szurubooru/api/info_api.py
@@ -20,6 +20,7 @@ class InfoApi(BaseApi):
             'featuringTime': post_feature.time if post_feature else None,
             'featuringUser': users.serialize_user(post_feature.user, ctx.user) \
                 if post_feature else None,
+            'serverTime': datetime.datetime.now(),
         }
 
     def _get_disk_usage(self):
diff --git a/server/szurubooru/tests/api/test_info.py b/server/szurubooru/tests/api/test_info.py
index 3a9ce4b7..1b52c719 100644
--- a/server/szurubooru/tests/api/test_info.py
+++ b/server/szurubooru/tests/api/test_info.py
@@ -1,3 +1,4 @@
+from datetime import datetime
 from szurubooru import api, db
 
 def test_info_api(
@@ -7,28 +8,31 @@ def test_info_api(
     config_injector({'data_dir': str(directory)})
     db.session.add_all([post_factory(), post_factory()])
     info_api = api.InfoApi()
-    with fake_datetime('13:00'):
+    with fake_datetime('2016-01-01 13:00'):
         assert info_api.get(context_factory()) == {
             'postCount': 2,
             'diskUsage': 3,
             'featuredPost': None,
             'featuringTime': None,
             'featuringUser': None,
+            'serverTime': datetime(2016, 1, 1, 13, 0),
         }
     directory.join('test2.txt').write('abc')
-    with fake_datetime('13:59'):
+    with fake_datetime('2016-01-01 13:59'):
         assert info_api.get(context_factory()) == {
             'postCount': 2,
             'diskUsage': 3, # still 3 - it's cached
             'featuredPost': None,
             'featuringTime': None,
             'featuringUser': None,
+            'serverTime': datetime(2016, 1, 1, 13, 59),
         }
-    with fake_datetime('14:01'):
+    with fake_datetime('2016-01-01 14:01'):
         assert info_api.get(context_factory()) == {
             'postCount': 2,
             'diskUsage': 6, # cache expired
             'featuredPost': None,
             'featuringTime': None,
             'featuringUser': None,
+            'serverTime': datetime(2016, 1, 1, 14, 1),
         }