Merge pull request #1035 from ggtylerr/master

server: Set reply sorting to 'oldest'

Author: jelmer

CHANGES.rst

@@ -57,6 +57,7 @@ Bugfixes & Improvements
 - Python 3.12 support (`#1015`_, ix5)
 - Disable Postbox submit button on click, enable after response (`#993`_, pkvach)
 - Document title parameter and improve error handling for /new API (`#1058`_, pkvach)
+- Set reply sorting to always be oldest (`#1035`_, ggtylerr)
 
 .. _#951: https://github.com/posativ/isso/pull/951
 .. _#967: https://github.com/posativ/isso/pull/967
@@ -71,6 +72,7 @@ Bugfixes & Improvements
 .. _#1019: https://github.com/isso-comments/isso/pull/1019
 .. _#1015: https://github.com/isso-comments/isso/pull/1015
 .. _#993: https://github.com/isso-comments/isso/pull/993
+.. _#1035: https://github.com/isso-comments/isso/pull/1035
 .. _#1058: https://github.com/isso-comments/isso/pull/1058
 
 0.13.1.dev0 (2023-02-05)

docs/docs/reference/client-config.rst

@@ -267,7 +267,8 @@ data-isso-sorting
     - ``oldest``: Bring oldest comments to the top
     - ``upvotes``: Bring most liked comments to the top
 
-    Default sorting is ``oldest``.
+    Default sorting is ``oldest``. As of 0.13.1, replies are always sorted as
+    ``oldest``.
 
     .. versionadded:: 0.13.1
 

isso/db/comments.py

@@ -217,16 +217,16 @@ def fetchall(self, mode=5, after=0, parent='any', order_by='id',
 
         # custom sanitization
         if order_by not in ['id', 'created', 'modified', 'likes', 'dislikes', 'tid']:
-            sql.append('ORDER BY ')
-            sql.append("comments.created")
+            sql.append('ORDER BY CASE WHEN comments.parent IS NOT NULL THEN comments.created END, ')
+            sql.append('comments.created')
             if not asc:
                 sql.append(' DESC')
         else:
-            sql.append('ORDER BY ')
+            sql.append('ORDER BY CASE WHEN comments.parent IS NOT NULL THEN comments.created END, ')
             sql.append('comments.' + order_by)
             if not asc:
                 sql.append(' DESC')
-            sql.append(", comments.created")
+            sql.append(', comments.created')
 
         if limit:
             sql.append('LIMIT ?,?')
@@ -257,8 +257,8 @@ def fetch(self, uri, mode=5, after=0, parent='any',
 
         # custom sanitization
         if order_by not in ['id', 'created', 'modified', 'likes', 'dislikes', 'karma']:
-            order_by = 'id'
-        sql.append('ORDER BY ')
+            order_by = 'created'
+        sql.append('ORDER BY CASE WHEN comments.parent IS NOT NULL THEN comments.created END, ')
         sql.append(order_by)
         if not asc:
             sql.append(' DESC')

isso/tests/test_comments.py

@@ -347,10 +347,10 @@ def testGetSortedByNewestWithNested(self):
 
         rv = loads(r.data)
         self.assertEqual(len(rv['replies']), 1)
-        # assert order of nested comments is newest first
+        # assert order of nested comments is oldest first
         self.assertEqual(
             [comment['id'] for comment in rv['replies'][0]['replies']],
-            [6, 5, 4, 3, 2]
+            [2, 3, 4, 5, 6]
         )
 
     def testGetSortedByUpvotesWithNested(self):
@@ -369,10 +369,10 @@ def testGetSortedByUpvotesWithNested(self):
 
         rv = loads(r.data)
         self.assertEqual(len(rv['replies']), 1)
-        # assert order of nested comments is newest first
+        # assert order of nested comments is oldest first
         self.assertEqual(
             [comment['id'] for comment in rv['replies'][0]['replies']],
-            [6, 3, 2, 4, 5]
+            [2, 3, 4, 5, 6]
         )
 
     def testUpdate(self):
@@ -559,15 +559,15 @@ def testFeed(self):
 
         rv = self.get('/feed?uri=%2Fpath%2F')
         self.assertEqual(rv.status_code, 200)
-        self.assertEqual(rv.headers['ETag'], '"1-2"')
+        self.assertEqual(rv.headers['ETag'], '"1-1"')
         data = rv.data.decode('utf-8')
         data = re.sub('[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}\\.[0-9]+Z',
                       '2018-04-01T10:00:00Z', data)
         self.maxDiff = None
         # Two accepted outputs, since different versions of Python sort attributes in different order.
         self.assertIn(data, ["""<?xml version=\'1.0\' encoding=\'utf-8\'?>
-<feed xmlns="http://www.w3.org/2005/Atom" xmlns:thr="http://purl.org/syndication/thread/1.0"><updated>2018-04-01T10:00:00Z</updated><id>tag:example.org,2018:/isso/thread/path/</id><title>Comments for example.org/path/</title><entry><id>tag:example.org,2018:/isso/1/2</id><title>Comment #2</title><updated>2018-04-01T10:00:00Z</updated><author><name /></author><link href="https://example.org/path/#isso-2" /><content type="html">&lt;p&gt;&lt;em&gt;Second&lt;/em&gt;&lt;/p&gt;</content><thr:in-reply-to href="https://example.org/path/#isso-1" ref="tag:example.org,2018:/isso/1/1" /></entry><entry><id>tag:example.org,2018:/isso/1/1</id><title>Comment #1</title><updated>2018-04-01T10:00:00Z</updated><author><name /></author><link href="https://example.org/path/#isso-1" /><content type="html">&lt;p&gt;First&lt;/p&gt;</content></entry></feed>""", """<?xml version=\'1.0\' encoding=\'utf-8\'?>
-<feed xmlns="http://www.w3.org/2005/Atom" xmlns:thr="http://purl.org/syndication/thread/1.0"><updated>2018-04-01T10:00:00Z</updated><id>tag:example.org,2018:/isso/thread/path/</id><title>Comments for example.org/path/</title><entry><id>tag:example.org,2018:/isso/1/2</id><title>Comment #2</title><updated>2018-04-01T10:00:00Z</updated><author><name /></author><link href="https://example.org/path/#isso-2" /><content type="html">&lt;p&gt;&lt;em&gt;Second&lt;/em&gt;&lt;/p&gt;</content><thr:in-reply-to ref="tag:example.org,2018:/isso/1/1" href="https://example.org/path/#isso-1" /></entry><entry><id>tag:example.org,2018:/isso/1/1</id><title>Comment #1</title><updated>2018-04-01T10:00:00Z</updated><author><name /></author><link href="https://example.org/path/#isso-1" /><content type="html">&lt;p&gt;First&lt;/p&gt;</content></entry></feed>"""])
+<feed xmlns="http://www.w3.org/2005/Atom" xmlns:thr="http://purl.org/syndication/thread/1.0"><updated>2018-04-01T10:00:00Z</updated><id>tag:example.org,2018:/isso/thread/path/</id><title>Comments for example.org/path/</title><entry><id>tag:example.org,2018:/isso/1/1</id><title>Comment #1</title><updated>2018-04-01T10:00:00Z</updated><author><name /></author><link href="https://example.org/path/#isso-1" /><content type="html">&lt;p&gt;First&lt;/p&gt;</content></entry><entry><id>tag:example.org,2018:/isso/1/2</id><title>Comment #2</title><updated>2018-04-01T10:00:00Z</updated><author><name /></author><link href="https://example.org/path/#isso-2" /><content type="html">&lt;p&gt;&lt;em&gt;Second&lt;/em&gt;&lt;/p&gt;</content><thr:in-reply-to href="https://example.org/path/#isso-1" ref="tag:example.org,2018:/isso/1/1" /></entry></feed>""", """<?xml version=\'1.0\' encoding=\'utf-8\'?>
+<feed xmlns="http://www.w3.org/2005/Atom" xmlns:thr="http://purl.org/syndication/thread/1.0"><updated>2018-04-01T10:00:00Z</updated><id>tag:example.org,2018:/isso/thread/path/</id><title>Comments for example.org/path/</title><entry><id>tag:example.org,2018:/isso/1/1</id><title>Comment #1</title><updated>2018-04-01T10:00:00Z</updated><author><name /></author><link href="https://example.org/path/#isso-1" /><content type="html">&lt;p&gt;First&lt;/p&gt;</content></entry><entry><id>tag:example.org,2018:/isso/1/2</id><title>Comment #2</title><updated>2018-04-01T10:00:00Z</updated><author><name /></author><link href="https://example.org/path/#isso-2" /><content type="html">&lt;p&gt;&lt;em&gt;Second&lt;/em&gt;&lt;/p&gt;</content><thr:in-reply-to ref="tag:example.org,2018:/isso/1/1" href="https://example.org/path/#isso-1" /></entry></feed>"""])
 
     def testCounts(self):