arno/isso
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bug in API: Reply count should also filter by the after value passed

Browse Source
This commit is contained in:
Srijan Choudhary 2014-04-23 00:56:40 +05:30
parent 8fdceeaafb
commit 3c3e83b05c
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
isso/db/comments.py
View File

@ -197,16 +197,16 @@ class Comments:
return {'likes': likes + 1, 'dislikes': dislikes} return {'likes': likes + 1, 'dislikes': dislikes}
return {'likes': likes, 'dislikes': dislikes + 1} return {'likes': likes, 'dislikes': dislikes + 1}
def reply_count(self, url): def reply_count(self, url, after=0):
""" """
Return comment count for main thread and all reply threads for one url. Return comment count for main thread and all reply threads for one url.
""" """
sql = [ 'SELECT comments.parent,count(*) FROM comments INNER JOIN threads ON', sql = [ 'SELECT comments.parent,count(*) FROM comments INNER JOIN threads ON',
' threads.uri=? AND comments.tid=threads.id', ' threads.uri=? AND comments.tid=threads.id',
' AND comments.mode = 1 group by comments.parent;'] ' AND comments.mode = 1 AND comments.created>? GROUP BY comments.parent;']
return dict(self.db.execute(sql, [url]).fetchall()) return dict(self.db.execute(sql, [url, after]).fetchall())
def count(self, *urls): def count(self, *urls):
""" """

5
isso/views/comments.py
View File

@ -323,6 +323,9 @@ class API(object):
fetch_args={'uri': uri} fetch_args={'uri': uri}
if request.args.get('after'): if request.args.get('after'):
fetch_args['after'] = request.args.get('after') fetch_args['after'] = request.args.get('after')
after = request.args.get('after')
else:
after = 0
if request.args.get('limit'): if request.args.get('limit'):
try: try:
fetch_args['limit'] = int(request.args.get('limit')) fetch_args['limit'] = int(request.args.get('limit'))
@ -342,7 +345,7 @@ class API(object):
else: else:
plain = False plain = False
reply_counts = self.comments.reply_count(uri) reply_counts = self.comments.reply_count(uri, after)
full_list = list(self.comments.fetch(**fetch_args)) full_list = list(self.comments.fetch(**fetch_args))
root_list = [i for i in full_list if i['parent'] == root_id] root_list = [i for i in full_list if i['parent'] == root_id]