Backed out changeset a37f5ca1da43

boards/models/post.py

@@ -5,7 +5,6 b' import re'
 
 from adjacent import Client
 from django.core.cache import cache
-from django.utils.functional import cached_property
 from django.core.urlresolvers import reverse
 from django.db import models, transaction
 from django.db.models import TextField
@@ -154,7 +153,7 b' class PostManager(models.Manager):'
                 referenced_post.build_refmap()
                 referenced_post.save(update_fields=['refmap', 'last_edit_time'])
 
-                referenced_thread = referenced_post.thread
+                referenced_thread = referenced_post.get_thread()
                 referenced_thread.last_edit_time = post.pub_time
                 referenced_thread.save(update_fields=['last_edit_time'])
 
@@ -272,13 +271,13 b' class Post(models.Model, Viewable):'
         Checks if this is an opening post or just a reply.
         """
 
-        return self.thread.get_opening_post_id() == self.id
+        return self.get_thread().get_opening_post_id() == self.id
 
     @transaction.atomic
     def add_tag(self, tag):
         edit_time = timezone.now()
 
-        thread = get_thread
+        thread = self.get_thread()
         thread.add_tag(tag)
         self.last_edit_time = edit_time
         self.save(update_fields=['last_edit_time'])
@@ -296,7 +295,7 b' class Post(models.Model, Viewable):'
 
         if not link:
             if not thread:
-                thread = self.thread
+                thread = self.get_thread()
 
             opening_id = thread.get_opening_post_id()
 
@@ -310,11 +309,6 b' class Post(models.Model, Viewable):'
 
         return link
 
-    @cached_property
-    def thread(self):
-        return self.thread_new
-
-    # TODO Deprecated, remove this and use cached property
     def get_thread(self) -> Thread:
         """
         Gets post's thread.
@@ -334,7 +328,7 b' class Post(models.Model, Viewable):'
         """
 
         is_opening = kwargs.get(PARAMETER_IS_OPENING, self.is_opening())
-        thread = kwargs.get(PARAMETER_THREAD, self.thread)
+        thread = kwargs.get(PARAMETER_THREAD, self.get_thread())
         can_bump = kwargs.get(PARAMETER_BUMPABLE, thread.can_bump())
 
         if is_opening:
@@ -371,9 +365,9 b' class Post(models.Model, Viewable):'
                 image.delete()
 
         if self.is_opening():
-            self.thread.delete()
+            self.get_thread().delete()
         else:
-            thread = self.thread
+            thread = self.get_thread()
             thread.last_edit_time = timezone.now()
             thread.save()
 
@@ -421,7 +415,7 b' class Post(models.Model, Viewable):'
 
         client = Client()
 
-        thread = self.thread
+        thread = self.get_thread()
         thread_id = thread.id
         channel_name = WS_CHANNEL_THREAD + str(thread.get_opening_post_id())
         client.publish(channel_name, {

boards/models/thread.py

@@ -1,8 +1,8 b''
 import logging
 from django.db.models import Count, Sum
 from django.utils import timezone
+from django.core.cache import cache
 from django.db import models
-from django.utils.functional import cached_property
 from boards import settings
 
 __author__ = 'neko259'
@@ -11,6 +11,9 b' from boards import settings'
 logger = logging.getLogger(__name__)
 
 
+CACHE_KEY_OPENING_POST = 'opening_post_id'
+
+
 class ThreadManager(models.Manager):
     def process_oldest_threads(self):
         """
@@ -134,24 +137,30 b' class Thread(models.Model):'
 
         self.tags.add(tag)
 
-    @cached_property
-    def opening_post(self):
-        return self.get_opening_post()
-
-    # TODO Remove this and use cached property
-    def get_opening_post(self):
+    def get_opening_post(self, only_id=False):
         """
         Gets the first post of the thread
         """
 
-        return self.replies.order_by('pub_time').first()
+        query = self.replies.order_by('pub_time')
+        if only_id:
+            query = query.only('id')
+        opening_post = query.first()
+
+        return opening_post
 
     def get_opening_post_id(self):
         """
         Gets ID of the first thread post.
         """
 
-        return self.opening_post.id
+        cache_key = CACHE_KEY_OPENING_POST + str(self.id)
+        opening_post_id = cache.get(cache_key)
+        if not opening_post_id:
+            opening_post_id = self.get_opening_post(only_id=True).id
+            cache.set(cache_key, opening_post_id)
+
+        return opening_post_id
 
     def __unicode__(self):
         return str(self.id)
@@ -161,7 +170,7 b' class Thread(models.Model):'
         Gets opening post's pub time because thread does not have its own one.
         """
 
-        return self.opening_post.pub_time
+        return self.get_opening_post().pub_time
 
     def delete(self, using=None):
         if self.replies.exists():
@@ -170,4 +179,4 b' class Thread(models.Model):'
         super(Thread, self).delete(using)
 
     def __str__(self):
-        return 'T#{}/{}'.format(self.id, self.get_opening_post_id())
+        return 'T#{}/{}'.format(self.id, self.get_opening_post_id())
  No newline at end of file

boards/templatetags/board.py

@@ -70,7 +70,10 b' def post_view(post, moderator=False, nee'
     else:
         thread = post.get_thread()
 
-    can_bump = thread.can_bump()
+    if 'can_bump' in kwargs:
+        can_bump = kwargs['can_bump']
+    else:
+        can_bump = thread.can_bump()
 
     opening_post_id = thread.get_opening_post_id()