Unified getting post title or text part if there is no title

boards/models/post/__init__.py

@@ -8,6 +8,7 b' from django.core.exceptions import Objec'
 from django.core.urlresolvers import reverse
 from django.db import models, transaction
 from django.db.models import TextField, QuerySet
+from django.template.defaultfilters import striptags, truncatewords
 from django.template.loader import render_to_string
 from django.utils import timezone
 
@@ -21,6 +22,8 b' from boards.models.post.export import ge'
 from boards.models.user import Notification, Ban
 import boards.models.thread
 
+TITLE_MAX_WORDS = 10
+
 APP_LABEL_BOARDS = 'boards'
 
 POSTS_PER_DAY_RANGE = 7
@@ -165,6 +168,7 b' class PostManager(models.Manager):'
 
         return ppd
 
+
 class Post(models.Model, Viewable):
     """A post is a message."""
 
@@ -182,7 +186,7 b' class Post(models.Model, Viewable):'
     images = models.ManyToManyField(PostImage, null=True, blank=True,
                                     related_name='post_images', db_index=True)
     attachments = models.ManyToManyField(Attachment, null=True, blank=True,
-            related_name='attachment_posts')
+                                         related_name='attachment_posts')
 
     poster_ip = models.GenericIPAddressField()
 
@@ -205,21 +209,20 b' class Post(models.Model, Viewable):'
     opening = models.BooleanField()
 
     def __str__(self):
-        return 'P#{}/{}'.format(self.id, self.title)
+        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()
+            .order_by('pub_time').distinct().all()
 
     def get_title(self) -> str:
-        """
-        Gets original post title or part of its text.
-        """
+        return self.title
 
-        title = self.title
+    def get_title_or_text(self):
+        title = self.get_title()
         if not title:
-            title = self.get_text()
+            title = truncatewords(striptags(self.get_text()), TITLE_MAX_WORDS)
 
         return title
 

boards/templates/boards/post.html

@@ -36,7 +36,7 b''
         {% else %}
             {% if need_op_data %}
                 {% with thread.get_opening_post as op %}
-                    {% trans " in " %}{{ op.get_link_view|safe }} <span class="title">{{ op.get_title|striptags|truncatewords:5 }}</span>
+                    {% trans " in " %}{{ op.get_link_view|safe }} <span class="title">{{ op.get_title_or_text }}</span>
                 {% endwith %}
             {% endif %}
         {% endif %}

boards/templates/boards/thread.html

@@ -6,8 +6,7 b''
 {% load tz %}
 
 {% block head %}
-    <title>{{ opening_post.get_title|striptags|truncatewords:10 }}
-        - {{ site_name }}</title>
+    <title>{{ opening_post.get_title_or_text }} - {{ site_name }}</title>
 {% endblock %}
 
 {% block content %}

boards/templates/boards/thread_normal.html

@@ -18,7 +18,7 b''
                     <button name="method" value="subscribe" class="not_fav">★</button>
                 {% endif %}
             </form>
-            {{ opening_post.get_title|striptags|truncatewords:10 }}
+            {{ opening_post.get_title_or_text }}
         </h2>
     </div>