From 5a820ec40ac008fdb7403568f2044de8450269e4 Mon Sep 17 00:00:00 2001
From: Max Goodman <max@reddit.com>
Date: Fri, 21 Dec 2012 00:18:28 -0800
Subject: [PATCH] Add "random" comment sort.

---
 r2/r2/lib/db/operators.py          |  1 +
 r2/r2/lib/menus.py                 | 17 ++++++++++++++---
 r2/r2/models/_builder.pyx          |  5 +++++
 r2/r2/public/static/css/reddit.css |  4 ++++
 4 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/r2/r2/lib/db/operators.py b/r2/r2/lib/db/operators.py
index ccc15c246..36811cda2 100644
--- a/r2/r2/lib/db/operators.py
+++ b/r2/r2/lib/db/operators.py
@@ -125,3 +125,4 @@ class sort(object):
 
 class asc(sort): pass
 class desc(sort):pass
+class shuffled(desc): pass
diff --git a/r2/r2/lib/menus.py b/r2/r2/lib/menus.py
index 758435d1c..1e95a02ba 100644
--- a/r2/r2/lib/menus.py
+++ b/r2/r2/lib/menus.py
@@ -64,6 +64,7 @@ menu =   MenuHandler(hot          = _('hot'),
                      relevance    = _('relevance'),
                      controversial  = _('controversial'),
                      confidence   = _('best'),
+                     random       = _('random'),
                      saved        = _('saved {toolbar}'),
                      recommended  = _('recommended'),
                      rising       = _('rising'), 
@@ -414,14 +415,20 @@ class SimplePostMenu(NavMenu):
     of NavButtons contained in this Menu instance.  The goal here is
     to have a menu object which 'out of the box' is self validating."""
     options   = []
+    hidden_options = []
     name      = ''
     title     = ''
     default = None
     type = 'lightdrop'
 
     def __init__(self, **kw):
-        buttons = [NavButton(self.make_title(n), n, opt=self.name, style='post')
-                   for n in self.options]
+        buttons = []
+        for name in self.options:
+            css_class = 'hidden' if name in self.hidden_options else ''
+            button = NavButton(self.make_title(name), name, opt=self.name,
+                               style='post', css_class=css_class)
+            buttons.append(button)
+
         kw['default'] = kw.get('default', self.default)
         kw['base_path'] = kw.get('base_path') or request.path
         NavMenu.__init__(self, buttons, type = self.type, **kw)
@@ -458,6 +465,8 @@ class SortMenu(SimplePostMenu):
             return operators.desc('_controversy')
         elif sort == 'confidence':
             return operators.desc('_confidence')
+        elif sort == 'random':
+            return operators.shuffled('_confidence')
 
 class ProfileSortMenu(SortMenu):
     default   = 'new'
@@ -466,7 +475,9 @@ class ProfileSortMenu(SortMenu):
 class CommentSortMenu(SortMenu):
     """Sort menu for comments pages"""
     default   = 'confidence'
-    options   = ('confidence', 'top', 'new', 'hot', 'controversial', 'old')
+    options   = ('confidence', 'top', 'new', 'hot', 'controversial', 'old',
+                 'random')
+    hidden_options = ('random',)
     use_post  = True
 
 class SearchSortMenu(SortMenu):
diff --git a/r2/r2/models/_builder.pyx b/r2/r2/models/_builder.pyx
index 318ea281d..8c01b863f 100644
--- a/r2/r2/models/_builder.pyx
+++ b/r2/r2/models/_builder.pyx
@@ -20,6 +20,8 @@
 # Inc. All Rights Reserved.
 ###############################################################################
 
+from random import shuffle
+
 from builder import Builder, MAX_RECURSION, empty_listing
 from r2.lib.wrapped import Wrapped
 from r2.lib.comment_tree import link_comments_and_sort, tree_sort_fn, MAX_ITERATIONS
@@ -273,6 +275,9 @@ class _CommentBuilder(Builder):
             mc2.count += 1
             iteration_count += 1
 
+        if isinstance(self.sort, operators.shuffled):
+            shuffle(final)
+
         return final
 
 class _MessageBuilder(Builder):
diff --git a/r2/r2/public/static/css/reddit.css b/r2/r2/public/static/css/reddit.css
index e8b400132..def896976 100755
--- a/r2/r2/public/static/css/reddit.css
+++ b/r2/r2/public/static/css/reddit.css
@@ -338,6 +338,10 @@ ul.flat-vert {text-align: left;}
 .drop-choices.tabdrop {margin-top: 2px;}
 .dropdown-title.tabdrop { display: none }
 
+.drop-choices .choice.hidden {
+    display: none;
+}
+
 .tabmenu {
     list-style-type: none;
     white-space: nowrap;