Refactor comment sorting to use 'karma' instead of 'likes' in API and…

… database queries

isso/db/comments.py

@@ -225,7 +225,7 @@ def fetch(self, uri, mode=5, after=0, parent='any',
         """
         Return comments for :param:`uri` with :param:`mode`.
         """
-        sql = ['SELECT comments.* FROM comments INNER JOIN threads ON',
+        sql = ['SELECT comments.*, likes - dislikes AS karma FROM comments INNER JOIN threads ON',
                '    threads.uri=? AND comments.tid=threads.id AND (? | comments.mode) = ?',
                '    AND comments.created>?']
 
@@ -239,7 +239,7 @@ def fetch(self, uri, mode=5, after=0, parent='any',
                 sql_args.append(parent)
 
         # custom sanitization
-        if order_by not in ['id', 'created', 'modified', 'likes', 'dislikes']:
+        if order_by not in ['id', 'created', 'modified', 'likes', 'dislikes', 'karma']:
             order_by = 'id'
         sql.append('ORDER BY ')
         sql.append(order_by)

isso/views/comments.py

@@ -901,7 +901,7 @@ def fetch(self, environ, request, uri):
             args['order_by'] = 'created'
             args['asc'] = 1
         elif sort == 'upvotes':
-            args['order_by'] = 'likes'
+            args['order_by'] = 'karma'
             args['asc'] = 0
 
         try: