Truncate line breaks

boards/templates/boards/post.html

@@ -1,112 +1,112 b''
 {% load i18n %}
 {% load board %}
 
 {% get_current_language as LANGUAGE_CODE %}
 
 <div class="{{ css_class }}" id="{{ post.id }}" data-uid="{{ post.uid }}" {% if tree_depth %}style="margin-left: {{ tree_depth }}em;"{% endif %}>
     <div class="post-info">
         <a class="post_id" href="{{ post.get_absolute_url }}">#{{ post.id }}</a>
         <span class="title">{{ post.title }}</span>
         {% if perms.boards.change_post and post.has_ip %}
             <a href="{% url 'feed' %}?ip={{ post.poster_ip }}">*</a>
             <span class="pub_time" style="border-bottom: solid 2px #{{ post.get_ip_color }};" title="{{ post.poster_ip }}">
         {% else %}
             <span class="pub_time">
         {% endif %}
         <time datetime="{{ post.pub_time|date:'c' }}">{{ post.pub_time }}</time></span>
         {% if post.tripcode %}
             /
             {% with tripcode=post.get_tripcode %}
                 <a href="{% url 'feed' %}?tripcode={{ tripcode.get_full_text }}"
                    class="tripcode" title="{{ tripcode.get_full_text }}"
                    style="border: solid 2px #{{ tripcode.get_color }}; border-left: solid 1ex #{{ tripcode.get_color }};">{{ tripcode.get_short_text }}</a>
             {% endwith %}
         {% endif %}
         {% comment %}
             Thread death time needs to be shown only if the thread is alredy archived
             and this is an opening post (thread death time) or a post for popup
             (we don't see OP here so we show the death time in the post itself).
         {% endcomment %}
         {% if is_opening and thread.is_archived %}
             — <time datetime="{{ thread.bump_time|date:'c' }}">{{ thread.bump_time }}</time>
         {% endif %}
         {% if is_opening %}
             {% if need_open_link %}
                 {% if thread.is_archived %}
                     <a class="link" href="{% url 'thread' post.id %}">{% trans "Open" %}</a>
                 {% else %}
                     <a class="link" href="{% url 'thread' post.id %}#form">{% trans "Reply" %}</a>
                 {% endif %}
             {% endif %}
         {% 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_or_text }}</span>
                 {% endwith %}
             {% endif %}
         {% endif %}
         {% if reply_link and not thread.is_archived %}
             <a href="#form" onclick="addQuickReply('{{ post.id }}'); return false;">{% trans 'Reply' %}</a>
         {% endif %}
 
         {% if perms.boards.change_post or perms.boards.delete_post or perms.boards.change_thread or perms_boards.delete_thread %}
             <span class="moderator_info">
                 {% if perms.boards.change_post or perms.boards.delete_post %}
                     | <a href="{% url 'admin:boards_post_change' post.id %}">{% trans 'Edit' %}</a>
                 {% endif %}
                 {% if perms.boards.change_thread or perms_boards.delete_thread %}
                     {% if is_opening %}
                        | <a href="{% url 'admin:boards_thread_change' thread.id %}">{% trans 'Edit thread' %}</a>
                        | <a href="{% url 'admin:boards_thread_delete' thread.id %}">{% trans 'Delete thread' %}</a>
                     {% else %}
                        | <a href="{% url 'admin:boards_post_delete' post.id %}">{% trans 'Delete post' %}</a>
                     {% endif %}
                 {% endif %}
                 {% if post.global_id_id %}
                     | <a href="{% url 'post_sync_data' post.id %}">RAW</a>
                 {% endif %}
             </span>
         {% endif %}
     </div>
     {% comment %}
         Post images. Currently only 1 image can be posted and shown, but post model
         supports multiple.
     {%  endcomment %}
     {% for image in post.images.all %}
         {{ image.get_view|safe }}
     {% endfor %}
     {% for file in post.attachments.all %}
         {{ file.get_view|safe }}
     {% endfor %}
     {% comment %}
         Post message (text)
     {% endcomment %}
     <div class="message">
         {% if truncated %}
-            {{ post.get_text|truncatewords_html:50|safe }}
+            {{ post.get_text|truncatewords_html:50|truncatenewlines_html:3|safe }}
         {% else %}
             {{ post.get_text|safe }}
         {% endif %}
     </div>
     {% if post.is_referenced and not mode_tree %}
         <div class="refmap">
             {% trans "Replies" %}: {{ post.refmap|safe }}
         </div>
     {% endif %}
     {% comment %}
         Thread metadata: counters, tags etc
     {% endcomment %}
     {% if is_opening %}
         <div class="metadata">
             {% if need_open_link %}
                 ♥ {{ thread.get_reply_count }}
                 ❄ {{ thread.get_images_count }}
                 <a href="{% url 'thread_gallery' post.id %}">G</a>
                 <a href="{% url 'thread_tree' post.id %}">T</a>
             {% endif %}
             <span class="tags">
                 {{ thread.get_tag_url_list|safe }}
             </span>
         </div>
     {% endif %}
 </div>

boards/templatetags/board.py

@@ -1,51 +1,116 b''
 import re
+
 from django.shortcuts import get_object_or_404
 from django import template
+from django.utils.text import re_tag
+
+from boards.mdx_neboard import LINE_BREAK_HTML
 
 
 IMG_ACTION_URL = '[<a href="{}">{}</a>]'
+REGEX_NEWLINE = re.compile(LINE_BREAK_HTML)
+TRUNCATOR = '...'
+HTML4_SINGLETS =(
+    'br', 'col', 'link', 'base', 'img', 'param', 'area', 'hr', 'input'
+)
 
 
 register = template.Library()
 
 actions = [
     {
         'name': 'google',
         'link': 'http://google.com/searchbyimage?image_url=%s',
     },
     {
         'name': 'iqdb',
         'link': 'http://iqdb.org/?url=%s',
     },
 ]
 
 
 @register.simple_tag(name='post_url')
 def post_url(*args, **kwargs):
     post_id = args[0]
 
     post = get_object_or_404('Post', id=post_id)
 
     return post.get_absolute_url()
 
 
 @register.simple_tag(name='image_actions')
 def image_actions(*args, **kwargs):
     image_link = args[0]
     if len(args) > 1:
         image_link = 'http://' + args[1] + image_link  # TODO https?
 
     return ', '.join([IMG_ACTION_URL.format(
         action['link'] % image_link, action['name']) for action in actions])
 
 
 @register.inclusion_tag('boards/post.html', name='post_view', takes_context=True)
 def post_view(context, post, *args, **kwargs):
     kwargs['perms'] = context['perms']
     return post.get_view_params(*args, **kwargs)
 
 
 @register.simple_tag(name='page_url')
 def page_url(paginator, page_number, *args, **kwargs):
     if paginator.supports_urls():
         return paginator.get_page_url(page_number)
+
+
[e-mail](name='truncatenewlines_html')
+def truncatenewlines_html(value, arg):
+    current_pos = 0
+    match_count = 0
+
+    # Collect places for truncation
+    while match_count <= arg:
+        m = REGEX_NEWLINE.search(value, current_pos)
+        if m is None:
+            break
+        else:
+            match_count += 1
+            current_pos = m.end()
+
+    # Find and close open tags
+    if match_count > arg:
+        truncate_pos = current_pos
+
+        open_tags = []
+        text = value[:truncate_pos]
+        current_pos = 0
+        while True:
+            tag = re_tag.search(text, current_pos)
+            if tag is None:
+                break
+            else:
+                closing_tag, tagname, self_closing = tag.groups()
+                tagname = tagname.lower()
+                if self_closing or tagname in HTML4_SINGLETS:
+                    pass
+                elif closing_tag:
+                    # Check for match in open tags list
+                    try:
+                        i = open_tags.index(tagname)
+                    except ValueError:
+                        pass
+                    else:
+                        # SGML: An end tag closes, back to the matching start tag,
+                        # all unclosed intervening start tags with omitted end tags
+                        open_tags = open_tags[i + 1:]
+                else:
+                    # Add it to the start of the open tags list
+                    open_tags.insert(0, tagname)
+
+                current_pos = tag.end()
+
+        for tag in open_tags:
+            text += '</%s>'.format(tag)
+        text += TRUNCATOR
+    else:
+        text = value
+
+    return text
+