From abef6e5c35bcabab3586310ee7333c0c891d119b Mon Sep 17 00:00:00 2001
From: rr- <rr-@sakuya.pl>
Date: Sun, 29 May 2016 12:38:47 +0200
Subject: [PATCH] server/info: return who featured the post and when

---
 API.md                                   |  8 ++++++--
 server/szurubooru/api/info_api.py        | 10 +++++++---
 server/szurubooru/func/posts.py          |  7 +++++--
 server/szurubooru/tests/api/test_info.py |  6 ++++++
 4 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/API.md b/API.md
index 79c67ab3..ab7a9b41 100644
--- a/API.md
+++ b/API.md
@@ -858,7 +858,9 @@ data.
 
     Retrieves the post that is currently featured on the main page in web
     client. If no post is featured, `<post>` is null and `snapshots` array is
-    empty.
+    empty. Note that this method exists mostly for compatibility with setting
+    featured post - most of times, you'd want to use query global info which
+    contains more information.
 
 ## Featuring post
 - **Request**
@@ -1351,7 +1353,9 @@ data.
     {
         "postCount": <post-count>,
         "diskUsage": <disk-usage>,  // in bytes
-        "featuredPost": <featured-post>
+        "featuredPost": <featured-post>,
+        "featuringTime": <time>,
+        "featuringUser": <user>
     }
     ```
 
diff --git a/server/szurubooru/api/info_api.py b/server/szurubooru/api/info_api.py
index 29043b75..0dad5f8b 100644
--- a/server/szurubooru/api/info_api.py
+++ b/server/szurubooru/api/info_api.py
@@ -2,7 +2,7 @@ import datetime
 import os
 from szurubooru import config
 from szurubooru.api.base_api import BaseApi
-from szurubooru.func import posts
+from szurubooru.func import posts, users
 
 class InfoApi(BaseApi):
     def __init__(self):
@@ -11,11 +11,15 @@ class InfoApi(BaseApi):
         self._cache_result = None
 
     def get(self, ctx):
-        featured_post = posts.try_get_featured_post()
+        post_feature = posts.try_get_current_post_feature()
         return {
             'postCount': posts.get_post_count(),
             'diskUsage': self._get_disk_usage(),
-            'featuredPost': posts.serialize_post(featured_post, ctx.user),
+            'featuredPost': posts.serialize_post(post_feature.post, ctx.user) \
+                if post_feature else None,
+            'featuringTime': post_feature.time if post_feature else None,
+            'featuringUser': users.serialize_user(post_feature.user, ctx.user) \
+                if post_feature else None,
         }
 
     def _get_disk_usage(self):
diff --git a/server/szurubooru/func/posts.py b/server/szurubooru/func/posts.py
index 04622fdb..51d99523 100644
--- a/server/szurubooru/func/posts.py
+++ b/server/szurubooru/func/posts.py
@@ -126,11 +126,14 @@ def get_post_by_id(post_id):
         raise PostNotFoundError('Post %r not found.' % post_id)
     return post
 
-def try_get_featured_post():
-    post_feature = db.session \
+def try_get_current_post_feature():
+    return db.session \
         .query(db.PostFeature) \
         .order_by(db.PostFeature.time.desc()) \
         .first()
+
+def try_get_featured_post():
+    post_feature = try_get_current_post_feature()
     return post_feature.post if post_feature else None
 
 def create_post(content, tag_names, user):
diff --git a/server/szurubooru/tests/api/test_info.py b/server/szurubooru/tests/api/test_info.py
index 561f2123..3a9ce4b7 100644
--- a/server/szurubooru/tests/api/test_info.py
+++ b/server/szurubooru/tests/api/test_info.py
@@ -12,6 +12,8 @@ def test_info_api(
             'postCount': 2,
             'diskUsage': 3,
             'featuredPost': None,
+            'featuringTime': None,
+            'featuringUser': None,
         }
     directory.join('test2.txt').write('abc')
     with fake_datetime('13:59'):
@@ -19,10 +21,14 @@ def test_info_api(
             'postCount': 2,
             'diskUsage': 3, # still 3 - it's cached
             'featuredPost': None,
+            'featuringTime': None,
+            'featuringUser': None,
         }
     with fake_datetime('14:01'):
         assert info_api.get(context_factory()) == {
             'postCount': 2,
             'diskUsage': 6, # cache expired
             'featuredPost': None,
+            'featuringTime': None,
+            'featuringUser': None,
         }