chg: [forum] sort threads by last post date

Author: Terrtia

bin/lib/forums_viewer.py

@@ -22,6 +22,7 @@
 from lib.objects import ail_objects
 from lib import crawlers
 from lib import Language
+from packages import Date
 from lib.crawlers import Cookiejar
 
 # config_loader = ConfigLoader()
@@ -299,10 +300,43 @@ def _children_meta(parent, child_type):
             children.append(_subforum_meta(obj))
         elif obj_type == 'forum-thread':
             children.append(_thread_meta(obj))
-    # TODO CHANGE SORT
     return sorted(children, key=lambda m: ((m.get('name') or m.get('title') or m.get('id')).lower(), m.get('id')))
 
 
+def _subforum_threads_meta(subforum):
+    threads = []
+    thread_ids = set()
+
+    for thread_id, last_post_timestamp in subforum.get_threads_by_last_post():
+        thread = ForumThreads.ForumThread(thread_id, subforum.subtype)
+        if not thread.exists():
+            continue
+        meta = _thread_meta(thread)
+        meta['last_post_timestamp'] = int(last_post_timestamp)
+        meta['last_post_date'] = Date.get_utc_datetime_from_timestamp(last_post_timestamp)
+        threads.append(meta)
+        thread_ids.add(thread_id)
+
+    # Threads without posts are not present in the last-post zset. Keep them visible
+    # after active threads, using the same stable alphabetical ordering as before.
+    inactive_threads = []
+    for thread_id in subforum.get_threads():
+        if thread_id in thread_ids:
+            continue
+        thread = ForumThreads.ForumThread(thread_id, subforum.subtype)
+        if not thread.exists():
+            continue
+        meta = _thread_meta(thread)
+        meta['last_post_timestamp'] = 0
+        meta['last_post_date'] = None
+        inactive_threads.append(meta)
+
+    return threads + sorted(
+        inactive_threads,
+        key=lambda m: ((m.get('name') or m.get('title') or m.get('id')).lower(), m.get('id')),
+    )
+
+
 def get_forums():
     """Return metadata for all imported Forum objects."""
     forums = []
@@ -456,7 +490,7 @@ def api_get_subforum(subtype, subforum_id):
         'subforum': _subforum_meta(subforum),
         'breadcrumb': get_breadcrumb_for_object(subforum),
         'subforums': _children_meta(subforum, 'subforum'),
-        'threads': _children_meta(subforum, 'forum-thread'),
+        'threads': _subforum_threads_meta(subforum),
     }, 200
 
 def api_get_forum_thread(subtype, thread_id, page=1, nb=50, translation_target=None):

bin/lib/objects/Subforums.py

@@ -59,6 +59,9 @@ def get_threads(self):
     def get_nb_threads(self):
         return len(self.get_threads())
 
+    def get_threads_by_last_post(self):
+        return r_object.zrevrange(f'last:subforum:{self.subtype}:{self.id}', 0, -1, withscores=True)
+
     def get_thread_last_post_timestamp(self, thread_id):
         return r_object.zscore(f'last:subforum:{self.subtype}:{self.id}', thread_id)
 

bin/packages/Date.py

@@ -114,6 +114,10 @@ def get_current_utc_full_time():
     timestamp = datetime.datetime.now(datetime.timezone.utc)
     return timestamp.strftime('%Y-%m-%d %H:%M:%S')
 
+def get_utc_datetime_from_timestamp(timestamp):
+    timestamp = datetime.datetime.fromtimestamp(float(timestamp), datetime.timezone.utc)
+    return timestamp.strftime('%Y-%m-%d %H:%M:%S')
+
 def get_date_from_timestamp(timestamp):
     return datetime.datetime.fromtimestamp(timestamp).strftime('%Y%m%d')
 

var/www/blueprints/forums_explorer.py

@@ -250,7 +250,7 @@ def objects_post_detect_language():
         return redirect(request.referrer)
     return redirect(url_for('forums_explorer.forum_explorer_forums'))
 
-@forums_explorer.route("/chats/explorer/forum/subforum", methods=['GET'])
+@forums_explorer.route("/forums/explorer/subforum", methods=['GET'])
 @login_required
 @login_read_only
 def forum_explorer_subforum():

var/www/templates/forums_explorer/forums_explorer_subforum.html

@@ -75,7 +75,11 @@ <h5 class="mb-1">{{ thread.get('name') or thread['id'] }}</h5>
               </div>
               <div class="forum-stats">
                 <div><strong>{{ thread.get('nb_posts') or 0 }}</strong> posts</div>
-                <div class="small">{{ thread.get('last_seen') or '' }}</div>
+                <div class="small">
+                  {% if thread.get('last_post_date') %}
+                    Last: {{ thread['last_post_date'] }} UTC
+                  {% endif %}
+                </div>
               </div>
             </a>
           {% endfor %}