Fixed last post link in new favorite posts api

boards/abstracts/settingsmanager.py

@@ -1,4 +1,5 b''
 from boards.models import Tag
+from boards.models.thread import FAV_THREAD_NO_UPDATES
 
 MAX_TRIPCODE_COLLISIONS = 50
 
@@ -19,8 +20,6 b" SETTING_LAST_NOTIFICATION_ID = 'last_not"
 SETTING_IMAGE_VIEWER = 'image_viewer'
 SETTING_TRIPCODE = 'tripcode'
 
-FAV_THREAD_NO_UPDATES = -1
-
 DEFAULT_THEME = 'md'
 
 

boards/models/thread.py

@@ -11,6 +11,8 b' from boards.utils import cached_result, '
 from boards.models.post import Post
 from boards.models.tag import Tag
 
+FAV_THREAD_NO_UPDATES = -1
+
 
 __author__ = 'neko259'
 
@@ -58,14 +60,16 b' class ThreadManager(models.Manager):'
         query = None
         # TODO Use classes instead of dicts
         for data in datas:
-            q = (Q(id=data['op'].get_thread().id)
-                 & Q(multi_replies__id__gt=data['last_id']))
-            if query is None:
-                query = q
-            else:
-                query = query | q
-        return self.filter(query).annotate(
-            new_post_count=Count('multi_replies'))
+            if data['last_id'] != FAV_THREAD_NO_UPDATES:
+                q = (Q(id=data['op'].get_thread().id)
+                     & Q(multi_replies__id__gt=data['last_id']))
+                if query is None:
+                    query = q
+                else:
+                    query = query | q
+        if query is not None:
+            return self.filter(query).annotate(
+                new_post_count=Count('multi_replies'))
 
     def get_new_post_count(self, datas):
         return self.get_new_posts(datas).aggregate(

boards/views/api.py

@@ -259,16 +259,21 b' def api_get_new_posts(request):'
     ops = [{'op': op, 'last_id': fav_threads[str(op.id)]} for op in fav_thread_ops]
     if include_posts:
         new_post_threads = Thread.objects.get_new_posts(ops)
-        thread_ids = {thread.id: thread for thread in new_post_threads}
+        if new_post_threads:
+            thread_ids = {thread.id: thread for thread in new_post_threads}
+        else:
+            thread_ids = dict()
 
         for op in fav_thread_ops:
             fav_thread_dict = dict()
 
-            if op.get_thread().id in thread_ids:
-                thread = thread_ids[op.get_thread().id]
+            op_thread = op.get_thread()
+            if op_thread.id in thread_ids:
+                thread = thread_ids[op_thread.id]
                 new_post_count = thread.new_post_count
-                fav_thread_dict['newest_post_link'] = thread.multi_replies\
-                    .first().get_absolute_url()
+                fav_thread_dict['newest_post_link'] = thread.get_replies()\
+                        .filter(id__gt=fav_threads[str(op.id)])\
+                        .first().get_absolute_url()
             else:
                 new_post_count = 0
             fav_thread_dict['new_post_count'] = new_post_count