Update reply and image count after thread update

boards/static/js/thread_update.js

@@ -1,116 +1,127 b''
 /*
  @licstart  The following is the entire license notice for the
  JavaScript code in this page.
 
 
  Copyright (C) 2013  neko259
 
  The JavaScript code in this page is free software: you can
  redistribute it and/or modify it under the terms of the GNU
  General Public License (GNU GPL) as published by the Free Software
  Foundation, either version 3 of the License, or (at your option)
  any later version.  The code is distributed WITHOUT ANY WARRANTY;
  without even the implied warranty of MERCHANTABILITY or FITNESS
  FOR A PARTICULAR PURPOSE.  See the GNU GPL for more details.
 
  As additional permission under GNU GPL version 3 section 7, you
  may distribute non-source (e.g., minimized or compacted) forms of
  that code without the copy of the GNU GPL normally required by
  section 4, provided you include this license notice and a URL
  through which recipients can access the Corresponding Source.
 
  @licend  The above is the entire license notice
  for the JavaScript code in this page.
  */
 
 var THREAD_UPDATE_DELAY = 10000;
 
 var loading = false;
 var lastUpdateTime = null;
 
 function blink(node) {
     var blinkCount = 2;
     var blinkDelay = 250;
 
     var nodeToAnimate = node;
     for (var i = 0; i < blinkCount; i++) {
         nodeToAnimate = nodeToAnimate.fadeOut(blinkDelay).fadeIn(blinkDelay);
     }
 }
 
 function updateThread() {
     if (loading) {
         return;
     }
 
     loading = true;
 
     var threadPosts = $('div.thread').children('.post');
 
     var lastPost = threadPosts.last();
     var threadId = threadPosts.first().attr('id');
 
     var diffUrl = '/api/diff_thread/' + threadId + '/' + lastUpdateTime + '/';
     $.getJSON(diffUrl)
         .success(function(data) {
             var bottom = isPageBottom();
 
             var addedPosts = data.added;
 
             for (var i = 0; i < addedPosts.length; i++) {
                 var postText = addedPosts[i];
 
                 var post = $(postText);
                 post.appendTo(lastPost.parent());
                 addRefLinkPreview(post[0]);
 
                 lastPost = post;
                 blink(post);
             }
 
             var updatedPosts = data.updated;
             for (var i = 0; i < updatedPosts.length; i++) {
                 var postText = updatedPosts[i];
 
                 var post = $(postText);
                 var postId = post.attr('id');
 
                 var oldPost = $('div.thread').children('.post[id=' + postId + ']');
                 
                 oldPost.replaceWith(post);
                 addRefLinkPreview(post[0]);
 
                 blink(post);
             }
             
             // TODO Process deleted posts
 
             lastUpdateTime = data.last_update;
             loading = false;
 
             if (bottom) {
                 var $target = $('html,body');
                 $target.animate({scrollTop: $target.height()}, 1000);
             }
+
+            $('#reply-count').text(getReplyCount());
+            $('#image-count').text(getImageCount());
         })
         .error(function(data) {
             // TODO Show error message that server is unavailable?
 
             loading = false;
         });
 }
 
 function isPageBottom() {
     var scroll = $(window).scrollTop() / ($(document).height()
         - $(window).height())
 
     return scroll == 1
 }
 
 function initAutoupdate() {
     loading = false;
 
     lastUpdateTime = $('.metapanel').attr('data-last-update');
 
     setInterval(updateThread, THREAD_UPDATE_DELAY);
 }
+
+function getReplyCount() {
+    return $('.thread').children('.post').length - 1 
+}
+
+function getImageCount() {
+    return $('.thread').find('img').length
+}

boards/templates/boards/thread.html

@@ -1,164 +1,164 b''
 {% extends "boards/base.html" %}
 
 {% load i18n %}
 {% load markup %}
 {% load cache %}
 {% load static from staticfiles %}
 {% load board %}
 
 {% block head %}
     <title>Neboard - {{ posts.0.get_title }}</title>
 {% endblock %}
 
 {% block content %}
     {% get_current_language as LANGUAGE_CODE %}
 
     <script src="{% static 'js/thread_update.js' %}"></script>
     <script src="{% static 'js/thread.js' %}"></script>
 
     {% if posts %}
         {% cache 600 thread_view posts.0.last_edit_time moderator LANGUAGE_CODE %}
             {% if bumpable %}
                 <div class="bar-bg">
                     <div class="bar-value" style="width:{{ bumplimit_progress }}%">
                     </div>
                     <div class="bar-text">
                         {{ posts_left }} {% trans 'posts to bumplimit' %}
                     </div>
                 </div>
             {% endif %}
         <div class="thread">
         {% for post in posts %}
             {% if bumpable %}
                 <div class="post" id="{{ post.id }}">
             {% else %}
                 <div class="post dead_post" id="{{ post.id }}">
             {% endif %}
             {% if post.image %}
                 <div class="image">
                     <a
                             class="thumb"
                             href="{{ post.image.url }}"><img
                             src="{{ post.image.url_200x150 }}"
                             alt="{{ post.id }}"
                             data-width="{{ post.image_width }}"
                             data-height="{{ post.image_height }}"/>
                     </a>
                 </div>
             {% endif %}
             <div class="message">
                 <div class="post-info">
                     <span class="title">{{ post.title }}</span>
                     <a class="post_id" href="#{{ post.id }}">
                         ({{ post.id }})</a>
                     [{{ post.pub_time }}]
                 [<a href="#" onclick="javascript:addQuickReply('{{ post.id }}')
                     ; return false;">&gt;&gt;</a>]
 
                     {% if moderator %}
                         <span class="moderator_info">
                             [<a href="{% url 'delete' post_id=post.id %}"
                                 >{% trans 'Delete' %}</a>]
                             ({{ post.poster_ip }})
                             [<a href="{% url 'ban' post_id=post.id %}?next={{ request.path }}"
                                 >{% trans 'Ban IP' %}</a>]
                         </span>
                     {% endif %}
                 </div>
                 {% autoescape off %}
                 {{ post.text.rendered }}
                 {% endautoescape %}
         {% if post.is_referenced %}
             <div class="refmap">
             {% trans "Replies" %}:
             {% for ref_post in post.get_sorted_referenced_posts %}
             <a href="{% post_url ref_post.id %}">&gt;&gt;{{ ref_post.id }}</a
                     >{% if not forloop.last %},{% endif %}
             {% endfor %}
             </div>
         {% endif %}
             </div>
             {% if forloop.first %}
                 <div class="metadata">
                     <span class="tags">
                         {% for tag in post.get_tags %}
                             <a class="tag" href="{% url 'tag' tag.name %}">
                                 #{{ tag.name }}</a
                                     >{% if not forloop.last %},{% endif %}
                         {% endfor %}
                     </span>
                 </div>
             {% endif %}
             </div>
         {% endfor %}
         </div>
         {% endcache %}
     {% endif %}
 
     <form id="form" enctype="multipart/form-data" method="post"
             >{% csrf_token %}
         <div class="post-form-w">
         <div class="form-title">{% trans "Reply to thread" %} #{{ posts.0.id }}</div>
             <div class="post-form">
                 <div class="form-row">
                     <div class="form-label">{% trans 'Title' %}</div>
                     <div class="form-input">{{ form.title }}</div>
                     <div class="form-errors">{{ form.title.errors }}</div>
                 </div>
                 <div class="form-row">
                     <div class="form-label">{% trans 'Formatting' %}</div>
                     <div class="form-input" id="mark_panel">
                         <span class="mark_btn" id="quote"><span class="quote">&gt;{% trans 'quote' %}</span></span>
                         <span class="mark_btn" id="italic"><i>{% trans 'italic' %}</i></span>
                         <span class="mark_btn" id="bold"><b>{% trans 'bold' %}</b></span>
                         <span class="mark_btn" id="spoiler"><span class="spoiler">{% trans 'spoiler' %}</span></span>
                         <span class="mark_btn" id="comment"><span class="comment">// {% trans 'comment' %}</span></span>
                     </div>
                 </div>
                 <div class="form-row">
                     <div class="form-label">{% trans 'Text' %}</div>
                     <div class="form-input">{{ form.text }}</div>
                     <div class="form-errors">{{ form.text.errors }}</div>
                 </div>
                 <div class="form-row">
                     <div class="form-label">{% trans 'Image' %}</div>
                     <div class="form-input">{{ form.image }}</div>
                     <div class="form-errors">{{ form.image.errors }}</div>
                 </div>
                 <div class="form-row form-email">
                     <div class="form-label">{% trans 'e-mail' %}</div>
                     <div class="form-input">{{ form.email }}</div>
                     <div class="form-errors">{{ form.email.errors }}</div>
                 </div>
                 <div class="form-row">
                     {{ form.captcha }}
                     <div class="form-errors">{{ form.captcha.errors }}</div>
                 </div>
                 <div class="form-row">
                     <div class="form-errors">{{ form.other.errors }}</div>
                 </div>
             </div>
 
             <div class="form-submit"><input type="submit"
                                             value="{% trans "Post" %}"/></div>
             <div><a href="{% url "staticpage" name="help" %}">
                 {% trans 'Text syntax' %}</a></div>
         </div>
     </form>
 
 {% endblock %}
 
 {% block metapanel %}
 
     {% get_current_language as LANGUAGE_CODE %}
 
     <span class="metapanel" data-last-update="{{ last_update }}">
         {% cache 600 thread_meta posts.0.last_edit_time moderator LANGUAGE_CODE %}
-            {{ posts.0.get_reply_count }} {% trans 'replies' %},
-            {{ posts.0.get_images_count }} {% trans 'images' %}.
+            <span id="reply-count">{{ posts.0.get_reply_count }}</span> {% trans 'replies' %},
+            <span id="image-count">{{ posts.0.get_images_count }}</span> {% trans 'images' %}.
             {% trans 'Last update: ' %}{{ posts.0.last_edit_time }}
             [<a href="rss/">RSS</a>]
         {% endcache %}
     </span>
 
 {% endblock %}

todo.txt

@@ -1,48 +1,48 b''
 = Features =
 [DONE] Connecting tags to each other
 [DONE] Connect posts to the replies (in messages), get rid of the JS reply map
 [DONE] Better django admin pages to simplify admin operations
 [DONE] Regen script to update all posts
 [DONE] Remove jump links from refmaps
 [DONE] Ban reasons. Split bans into 2 types "read-only" and "read
 denied". Use second only for autoban for spam
 [DONE] Clean up tests and make them run ALWAYS
 [DONE] Use transactions in tests
 [DONE] Thread autoupdate (JS + API)
 
 [NOT STARTED] Tree view (JS)
 [NOT STARTED] Adding tags to images filename
 [NOT STARTED] Federative network for s2s communication
 [NOT STARTED] XMPP gate
 [NOT STARTED] Bitmessage gate
 [NOT STARTED] Notification engine
 [NOT STARTED] Javascript disabling engine
 [NOT STARTED] Group tags by first letter in all tags list
 [NOT STARTED] Show board speed in the lower panel (posts per day)
 [NOT STARTED] Character counter in the post field
 [NOT STARTED] Save image thumbnails size to the separate field
 [NOT STARTED] Whitelist functionality. Permin autoban of an address
 [NOT STARTED] Split up post model into post and thread,
 and move everything that is used only in 1st post to thread model.
 [NOT STARTED] Statistics module. Count views (optional, may result in bad
  performance), posts per day/week/month, users (or IPs)
 [NOT STARTED] Quote button next to "reply" for posts in thread to include full
 post or its part (delimited by N characters) into quote of the new post.
 [NOT STARTED] Ban confirmation page with reason
 [NOT STARTED] Post deletion confirmation page
 [NOT STARTED] Moderating page. Tags editing and adding
 [NOT STARTED] Get thread graph image using pygraphviz
 [NOT STARTED] Creating post via AJAX without reloading page
 [NOT STARTED] Subscribing to tag via AJAX
 
 = Bugs =
 [DONE] Fix bug with creating threads from tag view
 [DONE] Quote characters within quote causes quote parsing to fail
 
-[NOT STARTED] Replies, images, last update time in bottom panel doesn't change when
+[IN PROGRESS] Replies, images, last update time in bottom panel doesn't change when
 thread updates
 
 = Testing =
 [NOT STARTED] Make tests for every view
 [NOT STARTED] Make tests for every model
 [NOT STARTED] Make tests for every form