From 39a579486583641f176fcc83f54441e6c31ae3d0 Mon Sep 17 00:00:00 2001
From: schneefux <schneefux+commit@schneefux.xyz>
Date: Sat, 4 Jun 2016 17:27:14 +0200
Subject: sort by freshness

---
 app.py               | 5 +++--
 templates/index.html | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app.py b/app.py
index 26d93dc..0a3f4ec 100644
--- a/app.py
+++ b/app.py
@@ -138,7 +138,7 @@ class dbProxy(object):
 
     def getJokes(self, perpage=None, page=None, user=None):
         ret_jokes = []
-        jokes = self.c.execute("SELECT * FROM " + self.prefix + "_jokes").fetchall()
+        jokes = self.c.execute("SELECT * FROM " + self.prefix + "_jokes ORDER BY id ASC").fetchall()
         votewhere = "SELECT COUNT(*) FROM " + self.prefix + "_votes WHERE "
         users = self.c.execute("SELECT id FROM " + self.prefix + "_users WHERE role='user'").fetchall()
         users = [u['id'] for u in users]
@@ -176,9 +176,10 @@ class dbProxy(object):
                 score -= self.c.execute(votewhere + "joke=? AND type='report' AND user=?", (joke['id'], u)).fetchone()['COUNT(*)'] * 50
 
             ret_joke['score'] = score
+            ret_joke['freshness'] = jokes[-1]['id'] - joke['id']
             ret_jokes.append(ret_joke)
 
-        ret_jokes = sorted(ret_jokes, key=lambda j: j['score'], reverse=True)
+        ret_jokes = sorted(ret_jokes, key=lambda j: (j['score']+1)/pow(j['freshness']+1, 2), reverse=True)
         if page != None and perpage != None:
             return ret_jokes[page*perpage:(page+1)*perpage]
         return ret_jokes
diff --git a/templates/index.html b/templates/index.html
index 44dfe87..08a9c39 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -117,7 +117,7 @@
     </div>
     <script type="text/javascript">
         $(document).ready(function() {
-            $('#main').smoothState({prefetch: true, cacheLength: 2});
+            $('#main').smoothState({prefetch: true});
         });
     </script>
 </body>
-- 
cgit v1.3.1