Always show main thread for post in post link. Prefetch thread replies' thread and threads

boards/models/post.py

@@ -286,13 +286,12 b' class Post(models.Model, Viewable):'
         thread.save(update_fields=['last_edit_time'])
 
     @cached_result
-    def get_url(self, thread=None):
+    def get_url(self):
         """
         Gets full url to the post.
         """
 
-        if not thread:
-            thread = self.get_thread()
+        thread = self.get_thread()
 
         opening_id = thread.get_opening_post_id()
 
@@ -445,6 +444,11 b' class Post(models.Model, Viewable):'
         return self.text
 
     def get_absolute_id(self) -> str:
+        """
+        If the post has many threads, shows its main thread OP id in the post
+        ID.
+        """
+
         if self.get_threads().count() > 1:
             return '{}/{}'.format(self.get_thread().get_opening_post_id(), self.id)
         else:

boards/models/thread.py

@@ -121,7 +121,7 b' class Thread(models.Model):'
         """
 
         query = Post.objects.filter(threads__in=[self])
-        query = query.order_by('pub_time').prefetch_related('images')
+        query = query.order_by('pub_time').prefetch_related('images', 'thread', 'threads')
         if view_fields_only:
             query = query.defer('poster_user_agent')
         return query.all()

boards/templates/boards/post.html

@@ -13,7 +13,7 b''
 {% endif %}
 
 <div class="post-info">
-    <a class="post_id" href="{% post_object_url post thread=thread %}"
+    <a class="post_id" href="{{ post.get_url }}"
             {% if not truncated and not thread.archived %}
        onclick="javascript:addQuickReply('{{ post.id }}'); return false;"
        title="{% trans 'Quote' %}" {% endif %}>({{ post.get_absolute_id }})</a>

boards/templatetags/board.py

@@ -25,18 +25,6 b' def post_url(*args, **kwargs):'
     return post.get_url()
 
 
[e-mail]_tag(name='post_object_url')
-def post_object_url(*args, **kwargs):
-    post = args[0]
-
-    if 'thread' in kwargs:
-        post_thread = kwargs['thread']
-    else:
-        post_thread = None
-
-    return post.get_url(thread=post_thread)
-
-
 @register.simple_tag(name='image_actions')
 def image_actions(*args, **kwargs):
     image_link = args[0]