Threads ranking configurability. #183

misago/apps/index.py

@@ -1,91 +1,99 @@
-from datetime import timedelta
-from django.core.cache import cache
-from django.template import RequestContext
-from django.utils import timezone
-from misago.conf import settings
-from misago.shortcuts import render_to_response
-from misago.models import Forum, Post, Rank, Session, Thread
-from misago.readstrackers import ForumsTracker
-
-def index(request):
-    # Threads ranking
-    popular_threads = []
-    if settings.thread_ranking_size > 0:
-        popular_threads = cache.get('thread_ranking_%s' % request.user.make_acl_key(), 'nada')
-        if popular_threads == 'nada':
-            popular_threads = []
-            for thread in Thread.objects.filter(moderated=False).filter(deleted=False).filter(forum__in=Forum.objects.readable_forums(request.acl)).prefetch_related('forum').order_by('-score', '-last')[:settings.thread_ranking_size]:
-                thread.forum_name = thread.forum.name
-                thread.forum_slug = thread.forum.slug
-                popular_threads.append(thread)
-            cache.set('thread_ranking_%s' % request.user.make_acl_key(), popular_threads, 60 * settings.thread_ranking_refresh)
-
-    # Users online
-    users_online = request.onlines.stats(request)
-
-    # Ranks online
-    ranks_list = cache.get('ranks_online', 'nada')
-    if ranks_list == 'nada':
-        ranks_dict = {}
-        ranks_list = []
-        users_list = []
-        for rank in Rank.objects.filter(on_index=True).order_by('order'):
-            rank_entry = {
-                          'id':rank.id,
-                          'name': rank.name,
-                          'slug': rank.slug if rank.as_tab else '',
-                          'style': rank.style,
-                          'title': rank.title,
-                          'online': [],
-                          'pks': [],
-                         }
-            ranks_list.append(rank_entry)
-            ranks_dict[rank.pk] = rank_entry
-        if ranks_dict:
-            for session in Session.objects.select_related('user').filter(rank__in=ranks_dict.keys()).filter(last__gte=timezone.now() - timedelta(seconds=settings.online_counting_frequency)).filter(user__isnull=False):
-                if not session.user_id in users_list:
-                    ranks_dict[session.user.rank_id]['online'].append(session.user)
-                    ranks_dict[session.user.rank_id]['pks'].append(session.user.pk)
-                    users_list.append(session.user_id)
-            # Assert we are on list
-            if (request.user.is_authenticated() and request.user.rank_id in ranks_dict.keys()
-                and not request.user.pk in users_list):
-                    ranks_dict[request.user.rank_id]['online'].append(request.user)
-                    ranks_dict[request.user.rank_id]['pks'].append(request.user.pk)
-                    users_list.append(request.user.pk)
-            cache.set('team_users_online', users_list, settings.online_counting_frequency)
-            del ranks_dict
-            del users_list
-        cache.set('ranks_online', ranks_list, settings.online_counting_frequency)
-    elif request.user.is_authenticated():
-        for rank in ranks_list:
-            if rank['id'] == request.user.rank_id and not request.user.pk in rank['pks']:
-                rank['online'].append(request.user)
-                rank['pks'].append(request.user.pk)
-                break
-
-    # Load reads tracker and build forums list
-    reads_tracker = ForumsTracker(request.user)
-    forums_list = Forum.objects.treelist(request.acl.forums, tracker=reads_tracker)
-    
-    # Whitelist ignored members
-    Forum.objects.ignored_users(request.user, forums_list)
-    
-    # Render page
-    return render_to_response('index.html',
-                              {
-                               'forums_list': forums_list,
-                               'ranks_online': ranks_list,
-                               'users_online': users_online,
-                               'popular_threads': popular_threads,
-                               'hook_above_forum_home': u'',
-                               'hook_below_forum_home': u'',
-                               'hook_above_home_forums_list': u'',
-                               'hook_below_home_forums_list': u'',
-                               'hook_above_home_sidepanel': u'',
-                               'hook_after_home_sidepanel_ranks_online': u'',
-                               'hook_after_home_sidepanel_popular_threads': u'',
-                               'hook_after_home_sidepanel_forum_stats': u'',
-                               'hook_below_home_sidepanel': u'',
-                               },
-                              context_instance=RequestContext(request));
+from datetime import timedelta
+from django.core.cache import cache
+from django.template import RequestContext
+from django.utils import timezone
+from misago.conf import settings
+from misago.shortcuts import render_to_response
+from misago.models import Forum, Post, Rank, Session, Thread
+from misago.readstrackers import ForumsTracker
+
+def index(request):
+    # Threads ranking
+    threads_ranking = []
+    if settings.thread_ranking_type != 'none':
+        cache_token = 'thread_ranking_%s_%s' % (settings.thread_ranking_type, request.user.make_acl_key())
+        threads_ranking = cache.get(cache_token, 'nada')
+        if threads_ranking == 'nada':
+            threads_ranking = []
+            ranking_queryset = Thread.objects.filter(moderated=False).filter(deleted=False).filter(forum__in=Forum.objects.readable_forums(request.acl)).prefetch_related('forum')
+            if settings.thread_ranking_type == 'popular':
+                ranking_queryset = ranking_queryset.order_by('-score', '-last')
+            if settings.thread_ranking_type == 'last':
+                ranking_queryset = ranking_queryset.order_by('-last')
+            if settings.thread_ranking_type == 'start':
+                ranking_queryset = ranking_queryset.order_by('-start')
+            for thread in ranking_queryset[:settings.thread_ranking_size]:
+                thread.forum_name = thread.forum.name
+                thread.forum_slug = thread.forum.slug
+                threads_ranking.append(thread)
+            cache.set(cache_token, threads_ranking, 60 * settings.thread_ranking_refresh)
+
+    # Users online
+    users_online = request.onlines.stats(request)
+
+    # Ranks online
+    ranks_list = cache.get('ranks_online', 'nada')
+    if ranks_list == 'nada':
+        ranks_dict = {}
+        ranks_list = []
+        users_list = []
+        for rank in Rank.objects.filter(on_index=True).order_by('order'):
+            rank_entry = {
+                          'id':rank.id,
+                          'name': rank.name,
+                          'slug': rank.slug if rank.as_tab else '',
+                          'style': rank.style,
+                          'title': rank.title,
+                          'online': [],
+                          'pks': [],
+                         }
+            ranks_list.append(rank_entry)
+            ranks_dict[rank.pk] = rank_entry
+        if ranks_dict:
+            for session in Session.objects.select_related('user').filter(rank__in=ranks_dict.keys()).filter(last__gte=timezone.now() - timedelta(seconds=settings.online_counting_frequency)).filter(user__isnull=False):
+                if not session.user_id in users_list:
+                    ranks_dict[session.user.rank_id]['online'].append(session.user)
+                    ranks_dict[session.user.rank_id]['pks'].append(session.user.pk)
+                    users_list.append(session.user_id)
+            # Assert we are on list
+            if (request.user.is_authenticated() and request.user.rank_id in ranks_dict.keys()
+                and not request.user.pk in users_list):
+                    ranks_dict[request.user.rank_id]['online'].append(request.user)
+                    ranks_dict[request.user.rank_id]['pks'].append(request.user.pk)
+                    users_list.append(request.user.pk)
+            cache.set('team_users_online', users_list, settings.online_counting_frequency)
+            del ranks_dict
+            del users_list
+        cache.set('ranks_online', ranks_list, settings.online_counting_frequency)
+    elif request.user.is_authenticated():
+        for rank in ranks_list:
+            if rank['id'] == request.user.rank_id and not request.user.pk in rank['pks']:
+                rank['online'].append(request.user)
+                rank['pks'].append(request.user.pk)
+                break
+
+    # Load reads tracker and build forums list
+    reads_tracker = ForumsTracker(request.user)
+    forums_list = Forum.objects.treelist(request.acl.forums, tracker=reads_tracker)
+
+    # Whitelist ignored members
+    Forum.objects.ignored_users(request.user, forums_list)
+
+    # Render page
+    return render_to_response('index.html',
+                              {
+                               'forums_list': forums_list,
+                               'ranks_online': ranks_list,
+                               'users_online': users_online,
+                               'threads_ranking': threads_ranking,
+                               'hook_above_forum_home': u'',
+                               'hook_below_forum_home': u'',
+                               'hook_above_home_forums_list': u'',
+                               'hook_below_home_forums_list': u'',
+                               'hook_above_home_sidepanel': u'',
+                               'hook_after_home_sidepanel_ranks_online': u'',
+                               'hook_after_home_sidepanel_popular_threads': u'',
+                               'hook_after_home_sidepanel_forum_stats': u'',
+                               'hook_below_home_sidepanel': u'',
+                               },
+                              context_instance=RequestContext(request));

misago/fixtures/threadssettings.py

@@ -39,14 +39,22 @@ settings_fixture = (
                 'name':         _("Display avatars on threads list"),
                 'description':  _("Unlike basic user data, avatars are not cached - turning this option on will cause one extra query on threads lists."),
             }),
+            ('thread_ranking_type', {
+                'value':        "last",
+                'type':         "string",
+                'input':        "choice",
+                'extra':        {'choices': [('none', _("Disabled")), ('popular', _("Popularity")), ('last', _("Last Reply")), ('start', _("Start Date"))]},
+                'separator':    _("Thread List on Board Index"),
+                'name':         _('List Type'),
+                'description':  _('Different types are useful by different boards. If your board is extremly active, use "Popularity", otherwhise select either "Last Reply" or "Start Date"'),
+            }),
             ('thread_ranking_size', {
                 'value':        6,
                 'type':         "integer",
                 'input':        "text",
-                'extra':        {'min': 0, 'max': 30},
-                'separator':    _("Thread Popularity Ranking"),
-                'name':         _('Threads on "Popular Threads" list'),
-                'description':  _('Enter number of threads to be displayed on "Popular Threads" list on board index or 0 to don\'t display any threads there.'),
+                'extra':        {'min': 1, 'max': 30},
+                'name':         _('Number of threads on list'),
+                'description':  _('Enter number of threads to be displayed on threads list on board index.'),
             }),
             ('thread_ranking_refresh', {
                 'value':        60,

templates/cranefly/index.html

@@ -118,11 +118,19 @@
 
     {{ hook_after_home_sidepanel_ranks_online|safe }}
 
-    {% if popular_threads %}
+    {% if threads_ranking %}
     <div class="index-popular-threads">
-      <h4>{% trans %}Popular Threads{% endtrans %}</h4>
+      <h4>
+        {% if settings.thread_ranking_type == 'popular' %}
+        {% trans %}Popular Threads{% endtrans %}
+        {% elif settings.thread_ranking_type == 'last' %}
+        {% trans %}Latest Replies{% endtrans %}
+        {% elif settings.thread_ranking_type == 'start' %}
+        {% trans %}Newest Threads{% endtrans %}
+        {% endif %}
+      </h4>
       <ul class="unstyled">
-        {% for thread in popular_threads %}
+        {% for thread in threads_ranking %}
         <li>
           <a href="{{ url('thread', thread=thread.pk, slug=thread.slug) }}" class="index-popular-thread{% if thread.name|length > 42 %} tooltip-top{% endif %}"{% if thread.name|length > 42 %} title="{{ thread.name }}"{% endif %}>{{ thread.name|short_string(42) }}</a>
           <div class="muted"><a href="{{ url('forum', forum=thread.forum_id, slug=thread.forum_slug) }}">{{ thread.forum_name }}</a> - {{ thread.last|reltimesince }}</div>