Show recent forum threads on the front page. Sucks, but.

[zzz-spline-forum.git] / splinext / forum / frontpage_sources.py

diff --git a/splinext/forum/frontpage_sources.py b/splinext/forum/frontpage_sources.py
index f101871..61982c5 100644 (file)
--- a/splinext/forum/frontpage_sources.py
+++ b/splinext/forum/frontpage_sources.py
@@ -1,15 +1,15 @@
 from collections import namedtuple
+import datetime
 
-from pylons import url
+from sqlalchemy.orm import contains_eager, joinedload
+from sqlalchemy.sql import func
+from pylons import tmpl_context as c, url
 
 from spline.model import meta
 
 from splinext.forum import model as forum_model
 from splinext.frontpage.sources import Source
 
-def frontpage_hook(limit, max_age, forum_id):
-    """Hook to return recent news for the front page."""
-
 FrontPageThread = namedtuple('FrontPageThread', ['source', 'time', 'post'])
 class ForumSource(Source):
     """Represents a forum whose threads are put on the front page.
@@ -45,7 +45,12 @@ class ForumSource(Source):
 
         thread_q = meta.Session.query(forum_model.Thread) \
             .filter_by(forum_id=self.forum_id) \
-            .join(forum_model.Thread.first_post)
+            .join((forum_model.Post, forum_model.Thread.first_post)) \
+            .options(
+                contains_eager(forum_model.Thread.first_post, alias=forum_model.Post),
+                contains_eager(forum_model.Thread.first_post, forum_model.Post.thread, alias=forum_model.Thread),
+                joinedload(forum_model.Thread.first_post, forum_model.Post.author),
+            )
 
         if max_age:
             thread_q = thread_q.filter(forum_model.Post.posted_time >= max_age)
@@ -64,3 +69,33 @@ class ForumSource(Source):
             updates.append(update)
 
         return updates
+
+FrontPageActivity = namedtuple('FrontPageActivity', ['template', 'threads'])
+def forum_activity(*args, **kwargs):
+    """Show recently-active threads on the front page.
+
+    Note that this isn't the most recent X threads; it's threads that are more
+    recent than X, sorted by their activity since X.
+    """
+    # XXX this should be configurable probably
+    cutoff = datetime.datetime.now() - datetime.timedelta(days=7)
+
+    # TODO some sort of dropoff here idk
+    active_threads_subq = meta.Session.query(
+        forum_model.Post.thread_id.label('thread_id'),
+        func.count('*').label('ranking'),
+    ) \
+        .filter(forum_model.Post.posted_time >= cutoff) \
+        .group_by(forum_model.Post.thread_id) \
+        .subquery()
+
+    threads_q = meta.Session.query(forum_model.Thread) \
+        .join((active_threads_subq,
+            active_threads_subq.c.thread_id == forum_model.Thread.id)) \
+        .order_by(active_threads_subq.c.ranking.desc()) \
+        .limit(10)
+
+    return FrontPageActivity(
+        template='/forum/front_page_activity.mako',
+        threads=threads_q.all(),
+    )