Merged with default branch

boards/models/attachment/downloaders.py

@@ -17,7 +17,7 b" HEADER_CONTENT_TYPE = 'content-type'"
 
 FILE_DOWNLOAD_CHUNK_BYTES = 200000
 
-YOUTUBE_URL = re.compile(r'https?://((www\.)?youtube\.com/watch\?v=|youtu.be/)\w+')
+YOUTUBE_URL = re.compile(r'https?://((www\.)?youtube\.com/watch\?v=|youtu.be/)[-\w]+')
 
 
 class Downloader:

boards/models/post/__init__.py

@@ -1,25 +1,20 b''
-import logging
 import uuid
 
 import re
 from boards import settings
 from boards.abstracts.tripcode import Tripcode
-from boards.mdx_neboard import get_parser
 from boards.models import PostImage, Attachment, KeyPair, GlobalId
 from boards.models.base import Viewable
 from boards.models.post.export import get_exporter, DIFF_TYPE_JSON
 from boards.models.post.manager import PostManager
-from boards.models.user import Notification
+from boards.utils import cached_result
+from boards.utils import datetime_to_epoch
 from django.core.exceptions import ObjectDoesNotExist
 from django.core.urlresolvers import reverse
 from django.db import models
 from django.db.models import TextField, QuerySet
-from django.db.models.signals import pre_save, post_save, pre_delete, \
-    post_delete
-from django.dispatch import receiver
 from django.template.defaultfilters import truncatewords, striptags
 from django.template.loader import render_to_string
-from django.utils import timezone
 
 CSS_CLS_HIDDEN_POST = 'hidden_post'
 CSS_CLS_DEAD_POST = 'dead_post'
@@ -114,11 +109,6 b' class Post(models.Model, Viewable):'
     def __str__(self):
         return 'P#{}/{}'.format(self.id, self.get_title())
 
-    def get_referenced_posts(self):
-        threads = self.get_threads().all()
-        return self.referenced_posts.filter(threads__in=threads)\
-            .order_by('pub_time').distinct().all()
-
     def get_title(self) -> str:
         return self.title
 
@@ -183,6 +173,13 b' class Post(models.Model, Viewable):'
 
         return self.threads
 
+    def _get_cache_key(self):
+        return [datetime_to_epoch(self.last_edit_time)]
+
+    @cached_result(key_method=_get_cache_key)
+    def get_thread_count(self):
+        return self.get_threads().count()
+
     def get_view(self, *args, **kwargs) -> str:
         """
         Renders post's HTML view. Some of the post params can be passed over
@@ -362,12 +359,11 b' class Post(models.Model, Viewable):'
         ID.
         """
 
-        if self.get_threads().count() > 1:
+        if self.get_thread_count() > 1:
             return '{}/{}'.format(self.get_thread().get_opening_post_id(), self.id)
         else:
             return str(self.id)
 
-
     def connect_threads(self, opening_posts):
         for opening_post in opening_posts:
             threads = opening_post.get_threads().all()

boards/models/thread.py

@@ -181,10 +181,10 b' class Thread(models.Model):'
         """
 
         query = self.multi_replies.order_by('pub_time').prefetch_related(
-            'images', 'thread', 'threads', 'attachments')
+            'images', 'thread', 'attachments')
         if view_fields_only:
             query = query.defer('poster_ip')
-        return query.all()
+        return query
 
     def get_top_level_replies(self) -> QuerySet:
         return self.get_replies().exclude(refposts__threads__in=[self])