Merged with thread autoupdate branch

boards/static/js/thread_update.js

@@ -0,0 +1,116 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);
+            }
+        })
+        .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);
+}

boards/models.py

@@ -1,434 +1,439 b''
 import os
 from random import random
 import time
 import math
 from django.core.cache import cache
 
 from django.db import models
 from django.db.models import Count
 from django.http import Http404
 from django.utils import timezone
 from markupfield.fields import MarkupField
 from boards import settings as board_settings
 
 from neboard import settings
 import thumbs
 
 import re
 
 BAN_REASON_MAX_LENGTH = 200
 
 BAN_REASON_AUTO = 'Auto'
 
 IMAGE_THUMB_SIZE = (200, 150)
 
 TITLE_MAX_LENGTH = 50
 
 DEFAULT_MARKUP_TYPE = 'markdown'
 
 NO_PARENT = -1
 NO_IP = '0.0.0.0'
 UNKNOWN_UA = ''
 ALL_PAGES = -1
 OPENING_POST_POPULARITY_WEIGHT = 2
 IMAGES_DIRECTORY = 'images/'
 FILE_EXTENSION_DELIMITER = '.'
 
 RANK_ADMIN = 0
 RANK_MODERATOR = 10
 RANK_USER = 100
 
 SETTING_MODERATE = "moderate"
 
 REGEX_REPLY = re.compile('>>(\d+)')
 
 
 class PostManager(models.Manager):
 
     def create_post(self, title, text, image=None, thread=None,
                     ip=NO_IP, tags=None, user=None):
+        posting_time = timezone.now()
+
         post = self.create(title=title,
                            text=text,
-                           pub_time=timezone.now(),
+                           pub_time=posting_time,
                            thread=thread,
                            image=image,
                            poster_ip=ip,
                            poster_user_agent=UNKNOWN_UA,
-                           last_edit_time=timezone.now(),
-                           bump_time=timezone.now(),
+                           last_edit_time=posting_time,
+                           bump_time=posting_time,
                            user=user)
 
         if tags:
             map(post.tags.add, tags)
             for tag in tags:
                 tag.threads.add(post)
 
         if thread:
             thread.replies.add(post)
             thread.bump()
-            thread.last_edit_time = timezone.now()
+            thread.last_edit_time = posting_time
             thread.save()
 
             #cache_key = thread.get_cache_key()
             #cache.delete(cache_key)
 
         else:
             self._delete_old_threads()
 
         self.connect_replies(post)
 
         return post
 
     def delete_post(self, post):
         if post.replies.count() > 0:
             map(self.delete_post, post.replies.all())
 
         # Update thread's last edit time (used as cache key)
         thread = post.thread
         if thread:
             thread.last_edit_time = timezone.now()
             thread.save()
 
             #cache_key = thread.get_cache_key()
             #cache.delete(cache_key)
 
         post.delete()
 
     def delete_posts_by_ip(self, ip):
         posts = self.filter(poster_ip=ip)
         map(self.delete_post, posts)
 
     def get_threads(self, tag=None, page=ALL_PAGES,
                     order_by='-bump_time'):
         if tag:
             threads = tag.threads
 
             if threads.count() == 0:
                 raise Http404
         else:
             threads = self.filter(thread=None)
 
         threads = threads.order_by(order_by)
 
         if page != ALL_PAGES:
             thread_count = threads.count()
 
             if page < self._get_page_count(thread_count):
                 start_thread = page * settings.THREADS_PER_PAGE
                 end_thread = min(start_thread + settings.THREADS_PER_PAGE,
                                  thread_count)
                 threads = threads[start_thread:end_thread]
 
         return threads
 
     def get_thread(self, opening_post_id):
         try:
             opening_post = self.get(id=opening_post_id, thread=None)
         except Post.DoesNotExist:
             raise Http404
 
         #cache_key = opening_post.get_cache_key()
         #thread = cache.get(cache_key)
         #if thread:
         #    return thread
 
         if opening_post.replies:
             thread = [opening_post]
             thread.extend(opening_post.replies.all().order_by('pub_time'))
 
             #cache.set(cache_key, thread, board_settings.CACHE_TIMEOUT)
 
             return thread
 
     def exists(self, post_id):
         posts = self.filter(id=post_id)
 
         return posts.count() > 0
 
     def get_thread_page_count(self, tag=None):
         if tag:
             threads = self.filter(thread=None, tags=tag)
         else:
             threads = self.filter(thread=None)
 
         return self._get_page_count(threads.count())
 
     def _delete_old_threads(self):
         """
         Preserves maximum thread count. If there are too many threads,
         delete the old ones.
         """
 
         # TODO Move old threads to the archive instead of deleting them.
         # Maybe make some 'old' field in the model to indicate the thread
         # must not be shown and be able for replying.
 
         threads = self.get_threads()
         thread_count = threads.count()
 
         if thread_count > settings.MAX_THREAD_COUNT:
             num_threads_to_delete = thread_count - settings.MAX_THREAD_COUNT
             old_threads = threads[thread_count - num_threads_to_delete:]
 
             map(self.delete_post, old_threads)
 
     def connect_replies(self, post):
         """Connect replies to a post to show them as a refmap"""
 
         for reply_number in re.finditer(REGEX_REPLY, post.text.raw):
             id = reply_number.group(1)
             ref_post = self.filter(id=id)
             if ref_post.count() > 0:
-                ref_post[0].referenced_posts.add(post)
+                referenced_post = ref_post[0]
+                referenced_post.referenced_posts.add(post)
+                referenced_post.last_edit_time = post.pub_time
+                referenced_post.save()
 
     def _get_page_count(self, thread_count):
         return int(math.ceil(thread_count / float(settings.THREADS_PER_PAGE)))
 
 
 class TagManager(models.Manager):
 
     def get_not_empty_tags(self):
         tags = self.annotate(Count('threads')) \
             .filter(threads__count__gt=0).order_by('name')
 
         return tags
 
 
 class Tag(models.Model):
     """
     A tag is a text node assigned to the post. The tag serves as a board
     section. There can be multiple tags for each message
     """
 
     objects = TagManager()
 
     name = models.CharField(max_length=100)
     threads = models.ManyToManyField('Post', null=True,
                                      blank=True, related_name='tag+')
     linked = models.ForeignKey('Tag', null=True, blank=True)
 
     def __unicode__(self):
         return self.name
 
     def is_empty(self):
         return self.get_post_count() == 0
 
     def get_post_count(self):
         return self.threads.count()
 
     def get_popularity(self):
         posts_with_tag = Post.objects.get_threads(tag=self)
         reply_count = 0
         for post in posts_with_tag:
             reply_count += post.get_reply_count()
             reply_count += OPENING_POST_POPULARITY_WEIGHT
 
         return reply_count
 
     def get_linked_tags(self):
         tag_list = []
         self.get_linked_tags_list(tag_list)
 
         return tag_list
 
     def get_linked_tags_list(self, tag_list=[]):
         """
         Returns the list of tags linked to current. The list can be got
         through returned value or tag_list parameter
         """
 
         linked_tag = self.linked
 
         if linked_tag and not (linked_tag in tag_list):
             tag_list.append(linked_tag)
 
             linked_tag.get_linked_tags_list(tag_list)
 
 
 class Post(models.Model):
     """A post is a message."""
 
     objects = PostManager()
 
     def _update_image_filename(self, filename):
         """Get unique image filename"""
 
         path = IMAGES_DIRECTORY
         new_name = str(int(time.mktime(time.gmtime())))
         new_name += str(int(random() * 1000))
         new_name += FILE_EXTENSION_DELIMITER
         new_name += filename.split(FILE_EXTENSION_DELIMITER)[-1:][0]
 
         return os.path.join(path, new_name)
 
     title = models.CharField(max_length=TITLE_MAX_LENGTH)
     pub_time = models.DateTimeField()
     text = MarkupField(default_markup_type=DEFAULT_MARKUP_TYPE,
                        escape_html=False)
 
     image_width = models.IntegerField(default=0)
     image_height = models.IntegerField(default=0)
 
     image = thumbs.ImageWithThumbsField(upload_to=_update_image_filename,
                                         blank=True, sizes=(IMAGE_THUMB_SIZE,),
                                         width_field='image_width',
                                         height_field='image_height')
 
     poster_ip = models.GenericIPAddressField()
     poster_user_agent = models.TextField()
 
     thread = models.ForeignKey('Post', null=True, default=None)
     tags = models.ManyToManyField(Tag)
     last_edit_time = models.DateTimeField()
     bump_time = models.DateTimeField()
     user = models.ForeignKey('User', null=True, default=None)
 
     replies = models.ManyToManyField('Post', symmetrical=False, null=True,
                                      blank=True, related_name='re+')
     referenced_posts = models.ManyToManyField('Post', symmetrical=False,
                                               null=True,
                                               blank=True, related_name='rfp+')
 
     def __unicode__(self):
         return '#' + str(self.id) + ' ' + self.title + ' (' + \
                self.text.raw[:50] + ')'
 
     def get_title(self):
         title = self.title
         if len(title) == 0:
             title = self.text.raw[:20]
 
         return title
 
     def get_reply_count(self):
         return self.replies.count()
 
     def get_images_count(self):
         images_count = 1 if self.image else 0
         images_count += self.replies.filter(image_width__gt=0).count()
 
         return images_count
 
     def can_bump(self):
         """Check if the thread can be bumped by replying"""
 
-        post_count = self.get_reply_count() + 1
+        post_count = self.get_reply_count()
 
         return post_count <= settings.MAX_POSTS_PER_THREAD
 
     def bump(self):
         """Bump (move to up) thread"""
 
         if self.can_bump():
             self.bump_time = timezone.now()
 
     def get_last_replies(self):
         if settings.LAST_REPLIES_COUNT > 0:
             reply_count = self.get_reply_count()
 
             if reply_count > 0:
                 reply_count_to_show = min(settings.LAST_REPLIES_COUNT,
                                           reply_count)
                 last_replies = self.replies.all().order_by('pub_time')[
                             reply_count - reply_count_to_show:]
 
                 return last_replies
 
     def get_tags(self):
         """Get a sorted tag list"""
 
         return self.tags.order_by('name')
 
     def get_cache_key(self):
         return str(self.id) + str(self.last_edit_time.microsecond)
 
     def get_sorted_referenced_posts(self):
         return self.referenced_posts.order_by('id')
 
     def is_referenced(self):
         return self.referenced_posts.count() > 0
 
 
 class User(models.Model):
 
     user_id = models.CharField(max_length=50)
     rank = models.IntegerField()
 
     registration_time = models.DateTimeField()
 
     fav_tags = models.ManyToManyField(Tag, null=True, blank=True)
     fav_threads = models.ManyToManyField(Post, related_name='+', null=True,
                                          blank=True)
 
     def save_setting(self, name, value):
         setting, created = Setting.objects.get_or_create(name=name, user=self)
         setting.value = str(value)
         setting.save()
 
         return setting
 
     def get_setting(self, name):
         if Setting.objects.filter(name=name, user=self).exists():
             setting = Setting.objects.get(name=name, user=self)
             setting_value = setting.value
         else:
             setting_value = None
 
         return setting_value
 
     def is_moderator(self):
         return RANK_MODERATOR >= self.rank
 
     def get_sorted_fav_tags(self):
         cache_key = self._get_tag_cache_key()
         fav_tags = cache.get(cache_key)
         if fav_tags:
             return fav_tags
 
         tags = self.fav_tags.annotate(Count('threads'))\
             .filter(threads__count__gt=0).order_by('name')
 
         if tags:
             cache.set(cache_key, tags, board_settings.CACHE_TIMEOUT)
 
         return tags
 
     def get_post_count(self):
         return Post.objects.filter(user=self).count()
 
     def __unicode__(self):
         return self.user_id + '(' + str(self.rank) + ')'
 
     def get_last_access_time(self):
         posts = Post.objects.filter(user=self)
         if posts.count() > 0:
             return posts.latest('pub_time').pub_time
 
     def add_tag(self, tag):
         self.fav_tags.add(tag)
         cache.delete(self._get_tag_cache_key())
 
     def remove_tag(self, tag):
         self.fav_tags.remove(tag)
         cache.delete(self._get_tag_cache_key())
 
     def _get_tag_cache_key(self):
         return self.user_id + '_tags'
 
 
 class Setting(models.Model):
 
     name = models.CharField(max_length=50)
     value = models.CharField(max_length=50)
     user = models.ForeignKey(User)
 
 
 class Ban(models.Model):
 
     ip = models.GenericIPAddressField()
     reason = models.CharField(default=BAN_REASON_AUTO,
                               max_length=BAN_REASON_MAX_LENGTH)
     can_read = models.BooleanField(default=True)
 
     def __unicode__(self):
         return self.ip

boards/static/js/refpopup.js

@@ -1,108 +1,109 b''
 function $X(path, root) {
     return document.evaluate(path, root || document, null, 6, null);
 }
 function $x(path, root) {
     return document.evaluate(path, root || document, null, 8, null).singleNodeValue;
 }
 
 function $del(el) {
     if(el) el.parentNode.removeChild(el);
 }
 
 function $each(list, fn) {
     if(!list) return;
     var i = list.snapshotLength;
     if(i > 0) while(i--) fn(list.snapshotItem(i), i);
 }
 
 function addRefLinkPreview(node) {
     $each($X('.//a[starts-with(text(),">>")]', node || document), function(link) {
         link.addEventListener('mouseover', showPostPreview, false);
         link.addEventListener('mouseout', delPostPreview, false);
     });
 }
 
 function showPostPreview(e) {
     var doc = document;
     //ref id
     var pNum = $(this).text().match(/\d+/);
 
     if (pNum.length == 0) {
-	return;
+        return;
     }
 
     //position
     //var x = e.clientX + (doc.documentElement.scrollLeft || doc.body.scrollLeft) - doc.documentElement.clientLeft + 1;
     //var y = e.clientY + (doc.documentElement.scrollTop || doc.body.scrollTop) - doc.documentElement.clientTop;
 
     var x = e.clientX + (doc.documentElement.scrollLeft || doc.body.scrollLeft) + 2;
     var y = e.clientY + (doc.documentElement.scrollTop || doc.body.scrollTop);
 
     var cln = doc.createElement('div');
     cln.id = 'pstprev_' + pNum;
     cln.className = 'post_preview';
 
     cln.style.cssText = 'top:' + y + 'px;' + (x < doc.body.clientWidth/2 ? 'left:' + x + 'px' : 'right:' + parseInt(doc.body.clientWidth - x + 1) + 'px');
 
     cln.addEventListener('mouseout', delPostPreview, false);
 
 
     var mkPreview = function(cln, html) {
 
         cln.innerHTML = html;
 
         addRefLinkPreview(cln);
 
         //if(!$x('.//small', cln)) showRefMap(post, p_num, refMap)
     };
 
 
-    cln.innerHTML = gettext('Loading...');
+    cln.innerHTML = "<div class=\"post\">" + gettext('Loading...') + "</div>";
 
     //если пост найден в дереве.
     if($('div[id='+pNum+']').length > 0) {
         var postdata = $('div[id='+pNum+']').wrap("<div/>").parent().html();
 
         //TODO: временно
         //funcInit(postdata);
 
         //make preview
         mkPreview(cln, postdata);
     }
     //ajax api
     else {
         $.ajax({
-	    url: '/api/post/' + pNum
-	})
-	.success(function(data) {
-	    // TODO get a json, not post itself
-	    var postdata = $(data).wrap("<div/>").parent().html();
+            url: '/api/post/' + pNum + '/?truncated'
+        })
+            .success(function(data) {
+                // TODO get a json, not post itself
+                var postdata = $(data).wrap("<div/>").parent().html();
 
-	    //make preview
-	    mkPreview(cln, postdata);
+                //make preview
+                mkPreview(cln, postdata);
 
-	})
-	.error(function() {
-	    cln.innerHTML = gettext('Post not found');
-	});
+            })
+            .error(function() {
+                cln.innerHTML = "<div class=\"post\">"
+                    + gettext('Post not found') + "</div>";
+            });
     }
 
     $del(doc.getElementById(cln.id));
 
     //add preview
     $('body').append(cln);
 }
 
 function delPostPreview(e) {
     var el = $x('ancestor-or-self::*[starts-with(@id,"pstprev")]', e.relatedTarget);
     if(!el) $each($X('.//div[starts-with(@id,"pstprev")]'), function(clone) {
         $del(clone)
     });
     else while(el.nextSibling) $del(el.nextSibling);
 }
 
 function addPreview() {
     $('.post').find('a').each(function() {
         showPostPreview($(this));
     });
 }

boards/static/js/thread.js

@@ -1,80 +1,81 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.
  */
 
 function addGalleryPanel() {
     var gallery = $('a[class="thumb"]').clone(true),
         normal = $('.post').clone(true);
 
     $('.navigation_panel').filter(':first').after(
         '<div class="image-mode-tab" role="radiogroup" aria-label="Image mode2">' +
         '<label><input type="radio" class="image-mode-normal" name="image-mode" value="0" checked="checked"/>'+ gettext('Normal') +'</label>' +
         '<label><input type="radio" class="image-mode-table" name="image-mode" value="1"/>'+ gettext('Gallery') +'</label>' +
         '</div>'
     );
 
     $('input[name="image-mode"]').change(function() {
         //gallery mode
         if($(this).val() === '1') {
             $('.thread').replaceWith(
                 $('<div id="posts-table"></div>').append(gallery)
             );
         }
         //normal mode
         else {
             $('#posts-table').replaceWith(
                 $('<div class="thread"></div>').append(normal)
             );
         }
     });
 }
 
 function moveCaretToEnd(el) {
         if (typeof el.selectionStart == "number") {
             el.selectionStart = el.selectionEnd = el.value.length;
         } else if (typeof el.createTextRange != "undefined") {
             el.focus();
             var range = el.createTextRange();
             range.collapse(false);
             range.select();
         }
 }
 
 function addQuickReply(postId) {
     var textToAdd = '>>' + postId + '\n\n';
     var textAreaId = '#id_text';
     $(textAreaId).val($(textAreaId).val()+ textToAdd);
 
     var textarea = document.getElementById('id_text');
     $(textAreaId).focus();
     moveCaretToEnd(textarea);
 
     $("html, body").animate({ scrollTop: $(textAreaId).offset().top }, "slow");
 }
 
 
 
 $(document).ready(function(){
     addGalleryPanel();
+    initAutoupdate();
 });

boards/templates/boards/post.html

@@ -1,55 +1,68 b''
 {% load i18n %}
 {% load board %}
 
-<div class="post" id="{{ post.id }}">
+{% if can_bump %}
+    <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="{% trans 'Post image' %}"v
+                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.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 }}
+        {% if truncated %}
+            {{ post.text.rendered|truncatewords_html:50 }}
+        {% else %}
+            {{ post.text.rendered }}
+        {% endif %}
     {% endautoescape %}
-    <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>
+    {% 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 post.tags.exists %}
     <div class="metadata">
-                    <span class="tags">{% trans 'Tags' %}:
-                        {% for tag in post.tags.all %}
-                            <a class="tag" href="{% url 'tag' tag.name %}">
-                                {{ tag.name }}</a>
-                        {% endfor %}
-                    </span>
+        <span class="tags">{% trans 'Tags' %}:
+            {% for tag in post.tags.all %}
+                <a class="tag" href="{% url 'tag' tag.name %}">
+                    {{ tag.name }}</a>
+            {% endfor %}
+        </span>
     </div>
 {% endif %}
 </div>
  No newline at end of file

boards/templates/boards/thread.html

@@ -1,163 +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 %}
+    {% 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 %}
+        {% 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 %}
+        {% 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 %}
+        {% endfor %}
         </div>
         {% endcache %}
-	{% endif %}
+    {% 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="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">
+    <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' %}.
             {% trans 'Last update: ' %}{{ posts.0.last_edit_time }}
             [<a href="rss/">RSS</a>]
         {% endcache %}
     </span>
 
 {% endblock %}

boards/urls.py

@@ -1,56 +1,58 b''
 from django.conf.urls import patterns, url, include
 from boards import views
 from boards.rss import AllThreadsFeed, TagThreadsFeed, ThreadPostsFeed
 
 js_info_dict = {
     'packages': ('boards',),
 }
 
 urlpatterns = patterns('',
 
     # /boards/
     url(r'^$', views.index, name='index'),
     # /boards/page/
     url(r'^page/(?P<page>\w+)/$', views.index, name='index'),
 
     # login page
     url(r'^login/$', views.login, name='login'),
 
     # /boards/tag/tag_name/
     url(r'^tag/(?P<tag_name>\w+)/$', views.tag, name='tag'),
     # /boards/tag/tag_id/page/
     url(r'^tag/(?P<tag_name>\w+)/page/(?P<page>\w+)/$', views.tag, name='tag'),
 
     # /boards/tag/tag_name/unsubscribe/
     url(r'^tag/(?P<tag_name>\w+)/subscribe/$', views.tag_subscribe,
         name='tag_subscribe'),
     # /boards/tag/tag_name/unsubscribe/
     url(r'^tag/(?P<tag_name>\w+)/unsubscribe/$', views.tag_unsubscribe,
         name='tag_unsubscribe'),
 
     # /boards/thread/
     url(r'^thread/(?P<post_id>\w+)/$', views.thread, name='thread'),
     url(r'^settings/$', views.settings, name='settings'),
     url(r'^tags/$', views.all_tags, name='tags'),
     url(r'^captcha/', include('captcha.urls')),
     url(r'^jump/(?P<post_id>\w+)/$', views.jump_to_post, name='jumper'),
     url(r'^authors/$', views.authors, name='authors'),
     url(r'^delete/(?P<post_id>\w+)/$', views.delete, name='delete'),
     url(r'^ban/(?P<post_id>\w+)/$', views.ban, name='ban'),
 
     url(r'^banned/$', views.you_are_banned, name='banned'),
     url(r'^staticpage/(?P<name>\w+)/$', views.static_page, name='staticpage'),
 
     # RSS feeds
     url(r'^rss/$', AllThreadsFeed()),
     url(r'^page/(?P<page>\w+)/rss/$', AllThreadsFeed()),
     url(r'^tag/(?P<tag_name>\w+)/rss/$', TagThreadsFeed()),
     url(r'^tag/(?P<tag_name>\w+)/page/(?P<page>\w+)/rss/$', TagThreadsFeed()),
     url(r'^thread/(?P<post_id>\w+)/rss/$', ThreadPostsFeed()),
 
     # i18n
     url(r'^jsi18n/$', 'django.views.i18n.javascript_catalog', js_info_dict),
 
     # API
     url(r'^api/post/(?P<post_id>\w+)/$', views.get_post, name="get_post"),
+    url(r'^api/diff_thread/(?P<thread_id>\w+)/(?P<last_update_time>\w+)/$',
+        views.api_get_threaddiff, name="get_thread_diff"),
 )

boards/views.py

@@ -1,520 +1,564 b''
 import hashlib
+import json
 import string
+import time
+import calendar
+
+from datetime import datetime
+
 from django.core import serializers
 from django.core.urlresolvers import reverse
 from django.http import HttpResponseRedirect
 from django.http.response import HttpResponse
 from django.template import RequestContext
 from django.shortcuts import render, redirect, get_object_or_404
 from django.utils import timezone
 from django.db import transaction
+import math
 
 from boards import forms
 import boards
 from boards import utils
 from boards.forms import ThreadForm, PostForm, SettingsForm, PlainErrorList, \
     ThreadCaptchaForm, PostCaptchaForm, LoginForm, ModeratorSettingsForm
 
 from boards.models import Post, Tag, Ban, User, RANK_USER, SETTING_MODERATE, \
     REGEX_REPLY
 from boards import authors
 from boards.utils import get_client_ip
 import neboard
 import re
 
 BAN_REASON_SPAM = 'Autoban: spam bot'
 
 
 def index(request, page=0):
     context = _init_default_context(request)
 
     if utils.need_include_captcha(request):
         threadFormClass = ThreadCaptchaForm
         kwargs = {'request': request}
     else:
         threadFormClass = ThreadForm
         kwargs = {}
 
     if request.method == 'POST':
         form = threadFormClass(request.POST, request.FILES,
                                error_class=PlainErrorList, **kwargs)
         form.session = request.session
 
         if form.is_valid():
             return _new_post(request, form)
         if form.need_to_ban:
             # Ban user because he is suspected to be a bot
             _ban_current_user(request)
     else:
         form = threadFormClass(error_class=PlainErrorList, **kwargs)
 
     threads = []
     for thread in Post.objects.get_threads(page=int(page)):
         threads.append({
             'thread': thread,
             'bumpable': thread.can_bump(),
             'last_replies': thread.get_last_replies(),
         })
 
     # TODO Make this generic for tag and threads list pages
     context['threads'] = None if len(threads) == 0 else threads
     context['form'] = form
 
     page_count = Post.objects.get_thread_page_count()
     context['pages'] = range(page_count)
     page = int(page)
     if page < page_count - 1:
         context['next_page'] = str(page + 1)
     if page > 0:
         context['prev_page'] = str(page - 1)
 
     return render(request, 'boards/posting_general.html',
                   context)
 
 
 @transaction.commit_on_success
 def _new_post(request, form, thread_id=boards.models.NO_PARENT):
     """Add a new post (in thread or as a reply)."""
 
     ip = get_client_ip(request)
     is_banned = Ban.objects.filter(ip=ip).exists()
 
     if is_banned:
         return redirect(you_are_banned)
 
     data = form.cleaned_data
 
     title = data['title']
     text = data['text']
 
     text = _remove_invalid_links(text)
 
     if 'image' in data.keys():
         image = data['image']
     else:
         image = None
 
     tags = []
 
     new_thread = thread_id == boards.models.NO_PARENT
     if new_thread:
         tag_strings = data['tags']
 
         if tag_strings:
             tag_strings = tag_strings.split(' ')
             for tag_name in tag_strings:
                 tag_name = string.lower(tag_name.strip())
                 if len(tag_name) > 0:
                     tag, created = Tag.objects.get_or_create(name=tag_name)
                     tags.append(tag)
 
                     linked_tags = tag.get_linked_tags()
                     if len(linked_tags) > 0:
                         tags.extend(linked_tags)
 
     op = None if thread_id == boards.models.NO_PARENT else \
         get_object_or_404(Post, id=thread_id)
     post = Post.objects.create_post(title=title, text=text, ip=ip,
                                     thread=op, image=image,
                                     tags=tags, user=_get_user(request))
 
     thread_to_show = (post.id if new_thread else thread_id)
 
     if new_thread:
         return redirect(thread, post_id=thread_to_show)
     else:
         return redirect(reverse(thread, kwargs={'post_id': thread_to_show}) +
                         '#' + str(post.id))
 
 
 def tag(request, tag_name, page=0):
     """
     Get all tag threads. Threads are split in pages, so some page is
     requested. Default page is 0.
     """
 
     tag = get_object_or_404(Tag, name=tag_name)
     threads = []
     for thread in Post.objects.get_threads(tag=tag, page=int(page)):
         threads.append({
             'thread': thread,
             'bumpable': thread.can_bump(),
             'last_replies': thread.get_last_replies(),
         })
 
     if request.method == 'POST':
         form = ThreadForm(request.POST, request.FILES,
                           error_class=PlainErrorList)
         form.session = request.session
 
         if form.is_valid():
             return _new_post(request, form)
         if form.need_to_ban:
             # Ban user because he is suspected to be a bot
             _ban_current_user(request)
     else:
         form = forms.ThreadForm(initial={'tags': tag_name},
                                 error_class=PlainErrorList)
 
     context = _init_default_context(request)
     context['threads'] = None if len(threads) == 0 else threads
     context['tag'] = tag
 
     page_count = Post.objects.get_thread_page_count(tag=tag)
     context['pages'] = range(page_count)
     page = int(page)
     if page < page_count - 1:
         context['next_page'] = str(page + 1)
     if page > 0:
         context['prev_page'] = str(page - 1)
 
     context['form'] = form
 
     return render(request, 'boards/posting_general.html',
                   context)
 
 
 def thread(request, post_id):
     """Get all thread posts"""
 
     if utils.need_include_captcha(request):
         postFormClass = PostCaptchaForm
         kwargs = {'request': request}
     else:
         postFormClass = PostForm
         kwargs = {}
 
     if request.method == 'POST':
         form = postFormClass(request.POST, request.FILES,
                              error_class=PlainErrorList, **kwargs)
         form.session = request.session
 
         if form.is_valid():
             return _new_post(request, form, post_id)
         if form.need_to_ban:
             # Ban user because he is suspected to be a bot
             _ban_current_user(request)
     else:
         form = postFormClass(error_class=PlainErrorList, **kwargs)
 
     posts = Post.objects.get_thread(post_id)
 
     context = _init_default_context(request)
 
     context['posts'] = posts
     context['form'] = form
     context['bumpable'] = posts[0].can_bump()
     if context['bumpable']:
         context['posts_left'] = neboard.settings.MAX_POSTS_PER_THREAD - len(
             posts)
         context['bumplimit_progress'] = str(
             float(context['posts_left']) /
             neboard.settings.MAX_POSTS_PER_THREAD * 100)
+    context["last_update"] = _datetime_to_epoch(posts[0].last_edit_time)
 
     return render(request, 'boards/thread.html', context)
 
 
 def login(request):
     """Log in with user id"""
 
     context = _init_default_context(request)
 
     if request.method == 'POST':
         form = LoginForm(request.POST, request.FILES,
                          error_class=PlainErrorList)
         form.session = request.session
 
         if form.is_valid():
             user = User.objects.get(user_id=form.cleaned_data['user_id'])
             request.session['user_id'] = user.id
             return redirect(index)
 
     else:
         form = LoginForm()
 
     context['form'] = form
 
     return render(request, 'boards/login.html', context)
 
 
 def settings(request):
     """User's settings"""
 
     context = _init_default_context(request)
     user = _get_user(request)
     is_moderator = user.is_moderator()
 
     if request.method == 'POST':
-	with transaction.commit_on_success():
-	    if is_moderator:
-		form = ModeratorSettingsForm(request.POST,
-					     error_class=PlainErrorList)
-	    else:
-		form = SettingsForm(request.POST, error_class=PlainErrorList)
+        with transaction.commit_on_success():
+            if is_moderator:
+                form = ModeratorSettingsForm(request.POST,
+                                             error_class=PlainErrorList)
+            else:
+                form = SettingsForm(request.POST, error_class=PlainErrorList)
 
-	    if form.is_valid():
-		selected_theme = form.cleaned_data['theme']
+            if form.is_valid():
+                selected_theme = form.cleaned_data['theme']
 
-		user.save_setting('theme', selected_theme)
+                user.save_setting('theme', selected_theme)
 
-		if is_moderator:
-		    moderate = form.cleaned_data['moderate']
-		    user.save_setting(SETTING_MODERATE, moderate)
+                if is_moderator:
+                    moderate = form.cleaned_data['moderate']
+                    user.save_setting(SETTING_MODERATE, moderate)
 
-		return redirect(settings)
+            return redirect(settings)
     else:
         selected_theme = _get_theme(request)
 
         if is_moderator:
             form = ModeratorSettingsForm(initial={'theme': selected_theme,
                                          'moderate': context['moderator']},
                                          error_class=PlainErrorList)
         else:
             form = SettingsForm(initial={'theme': selected_theme},
                                 error_class=PlainErrorList)
 
     context['form'] = form
 
     return render(request, 'boards/settings.html', context)
 
 
 def all_tags(request):
     """All tags list"""
 
     context = _init_default_context(request)
     context['all_tags'] = Tag.objects.get_not_empty_tags()
 
     return render(request, 'boards/tags.html', context)
 
 
 def jump_to_post(request, post_id):
     """Determine thread in which the requested post is and open it's page"""
 
     post = get_object_or_404(Post, id=post_id)
 
     if not post.thread:
         return redirect(thread, post_id=post.id)
     else:
         return redirect(reverse(thread, kwargs={'post_id': post.thread.id})
                         + '#' + str(post.id))
 
 
 def authors(request):
     """Show authors list"""
 
     context = _init_default_context(request)
     context['authors'] = boards.authors.authors
 
     return render(request, 'boards/authors.html', context)
 
 
 @transaction.commit_on_success
 def delete(request, post_id):
     """Delete post"""
 
     user = _get_user(request)
     post = get_object_or_404(Post, id=post_id)
 
     if user.is_moderator():
         # TODO Show confirmation page before deletion
         Post.objects.delete_post(post)
-    
+
     if not post.thread:
         return _redirect_to_next(request)
     else:
         return redirect(thread, post_id=post.thread.id)
 
 
 @transaction.commit_on_success
 def ban(request, post_id):
     """Ban user"""
 
     user = _get_user(request)
     post = get_object_or_404(Post, id=post_id)
 
     if user.is_moderator():
         # TODO Show confirmation page before ban
         ban, created = Ban.objects.get_or_create(ip=post.poster_ip)
         if created:
             ban.reason = 'Banned for post ' + str(post_id)
             ban.save()
 
     return _redirect_to_next(request)
 
 
 def you_are_banned(request):
     """Show the page that notifies that user is banned"""
 
     context = _init_default_context(request)
 
     ban = get_object_or_404(Ban, ip=utils.get_client_ip(request))
     context['ban_reason'] = ban.reason
     return render(request, 'boards/staticpages/banned.html', context)
 
 
 def page_404(request):
     """Show page 404 (not found error)"""
 
     context = _init_default_context(request)
     return render(request, 'boards/404.html', context)
 
 
 @transaction.commit_on_success
 def tag_subscribe(request, tag_name):
     """Add tag to favorites"""
 
     user = _get_user(request)
     tag = get_object_or_404(Tag, name=tag_name)
 
     if not tag in user.fav_tags.all():
         user.add_tag(tag)
 
     return _redirect_to_next(request)
 
 
 @transaction.commit_on_success
 def tag_unsubscribe(request, tag_name):
     """Remove tag from favorites"""
 
     user = _get_user(request)
     tag = get_object_or_404(Tag, name=tag_name)
 
     if tag in user.fav_tags.all():
         user.remove_tag(tag)
 
     return _redirect_to_next(request)
 
 
 def static_page(request, name):
     """Show a static page that needs only tags list and a CSS"""
 
     context = _init_default_context(request)
     return render(request, 'boards/staticpages/' + name + '.html', context)
 
 
 def api_get_post(request, post_id):
     """
     Get the JSON of a post. This can be
     used as and API for external clients.
     """
 
     post = get_object_or_404(Post, id=post_id)
 
     json = serializers.serialize("json", [post], fields=(
         "pub_time", "_text_rendered", "title", "text", "image",
         "image_width", "image_height", "replies", "tags"
     ))
 
     return HttpResponse(content=json)
 
 
+def api_get_threaddiff(request, thread_id, last_update_time):
+    """Get posts that were changed or added since time"""
+
+    thread = get_object_or_404(Post, id=thread_id)
+
+    filter_time = datetime.fromtimestamp(float(last_update_time) / 1000000,
+                                         timezone.get_current_timezone())
+
+    json_data = {
+        'added': [],
+        'updated': [],
+        'last_update': None,
+    }
+    added_posts = Post.objects.filter(thread=thread, pub_time__gt=filter_time)
+    updated_posts = Post.objects.filter(thread=thread,
+                                        pub_time__lt=filter_time,
+                                        last_edit_time__gt=filter_time)
+    for post in added_posts:
+        json_data['added'].append(get_post(request, post.id).content.strip())
+    for post in updated_posts:
+        json_data['updated'].append(get_post(request, post.id).content.strip())
+    json_data['last_update'] = _datetime_to_epoch(thread.last_edit_time)
+
+    return HttpResponse(content=json.dumps(json_data))
+
+
 def get_post(request, post_id):
     """Get the html of a post. Used for popups."""
 
     post = get_object_or_404(Post, id=post_id)
+    thread = post.thread
 
     context = RequestContext(request)
     context["post"] = post
+    context["can_bump"] = thread.can_bump()
+    if "truncated" in request.GET:
+        context["truncated"] = True
 
     return render(request, 'boards/post.html', context)
 
 
 def _get_theme(request, user=None):
     """Get user's CSS theme"""
 
     if not user:
         user = _get_user(request)
     theme = user.get_setting('theme')
     if not theme:
         theme = neboard.settings.DEFAULT_THEME
 
     return theme
 
 
 def _init_default_context(request):
     """Create context with default values that are used in most views"""
 
     context = RequestContext(request)
 
     user = _get_user(request)
     context['user'] = user
     context['tags'] = user.get_sorted_fav_tags()
 
     theme = _get_theme(request, user)
     context['theme'] = theme
     context['theme_css'] = 'css/' + theme + '/base_page.css'
 
     # This shows the moderator panel
     moderate = user.get_setting(SETTING_MODERATE)
     if moderate == 'True':
         context['moderator'] = user.is_moderator()
     else:
         context['moderator'] = False
 
     return context
 
 
 def _get_user(request):
     """
     Get current user from the session. If the user does not exist, create
     a new one.
     """
 
     session = request.session
     if not 'user_id' in session:
         request.session.save()
 
         md5 = hashlib.md5()
         md5.update(session.session_key)
         new_id = md5.hexdigest()
 
         time_now = timezone.now()
         user = User.objects.create(user_id=new_id, rank=RANK_USER,
                                    registration_time=time_now)
 
         session['user_id'] = user.id
     else:
         user = User.objects.get(id=session['user_id'])
 
     return user
 
 
 def _redirect_to_next(request):
     """
     If a 'next' parameter was specified, redirect to the next page. This is
     used when the user is required to return to some page after the current
     view has finished its work.
     """
 
     if 'next' in request.GET:
         next_page = request.GET['next']
         return HttpResponseRedirect(next_page)
     else:
         return redirect(index)
 
 
 @transaction.commit_on_success
 def _ban_current_user(request):
     """Add current user to the IP ban list"""
 
     ip = utils.get_client_ip(request)
     ban, created = Ban.objects.get_or_create(ip=ip)
     if created:
         ban.can_read = False
         ban.reason = BAN_REASON_SPAM
     ban.save()
 
 
 def _remove_invalid_links(text):
     """
     Replace invalid links in posts so that they won't be parsed.
     Invalid links are links to non-existent posts
     """
 
     for reply_number in re.finditer(REGEX_REPLY, text):
         post_id = reply_number.group(1)
         post = Post.objects.filter(id=post_id)
         if not post.exists():
             text = string.replace(text, '>>' + id, id)
 
     return text
+
+
+def _datetime_to_epoch(datetime):
+    return int(time.mktime(timezone.localtime(
+        datetime,timezone.get_current_timezone()).timetuple())
+               * 1000000 + datetime.microsecond)
  No newline at end of file

neboard/settings.py

@@ -1,240 +1,240 b''
 # Django settings for neboard project.
 import os
 from boards.mdx_neboard import markdown_extended
 
 DEBUG = True
 TEMPLATE_DEBUG = DEBUG
 
 ADMINS = (
     # ('Your Name', '[e-mail]'),
     ('admin', '[e-mail]')
 )
 
 MANAGERS = ADMINS
 
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
         'NAME': 'database.db',                      # Or path to database file if using sqlite3.
         'USER': '',                      # Not used with sqlite3.
         'PASSWORD': '',                  # Not used with sqlite3.
         'HOST': '',                      # Set to empty string for localhost. Not used with sqlite3.
         'PORT': '',                      # Set to empty string for default. Not used with sqlite3.
 	'CONN_MAX_AGE': None,
     }
 }
 
 # Local time zone for this installation. Choices can be found here:
 # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
 # although not all choices may be available on all operating systems.
 # In a Windows environment this must be set to your system time zone.
 TIME_ZONE = 'Europe/Kiev'
 
 # Language code for this installation. All choices can be found here:
 # http://www.i18nguy.com/unicode/language-identifiers.html
 LANGUAGE_CODE = 'en'
 
 SITE_ID = 1
 
 # If you set this to False, Django will make some optimizations so as not
 # to load the internationalization machinery.
 USE_I18N = True
 
 # If you set this to False, Django will not format dates, numbers and
 # calendars according to the current locale.
 USE_L10N = True
 
 # If you set this to False, Django will not use timezone-aware datetimes.
 USE_TZ = True
 
 # Absolute filesystem path to the directory that will hold user-uploaded files.
 # Example: "/home/media/media.lawrence.com/media/"
 MEDIA_ROOT = './media/' 
 
 # URL that handles the media served from MEDIA_ROOT. Make sure to use a
 # trailing slash.
 # Examples: "http://media.lawrence.com/media/", "http://example.com/media/"
 MEDIA_URL = '/media/'
 
 # Absolute path to the directory static files should be collected to.
 # Don't put anything in this directory yourself; store your static files
 # in apps' "static/" subdirectories and in STATICFILES_DIRS.
 # Example: "/home/media/media.lawrence.com/static/"
 STATIC_ROOT = ''
 
 # URL prefix for static files.
 # Example: "http://media.lawrence.com/static/"
 STATIC_URL = '/static/'
 
 # Additional locations of static files
 # It is really a hack, put real paths, not related
 STATICFILES_DIRS = (
     os.path.dirname(__file__) + '/boards/static',
 
 #    '/d/work/python/django/neboard/neboard/boards/static',
     # Put strings here, like "/home/html/static" or "C:/www/django/static".
     # Always use forward slashes, even on Windows.
     # Don't forget to use absolute paths, not relative paths.
 )
 
 # List of finder classes that know how to find static files in
 # various locations.
 STATICFILES_FINDERS = (
     'django.contrib.staticfiles.finders.FileSystemFinder',
     'django.contrib.staticfiles.finders.AppDirectoriesFinder',
 )
 
 if DEBUG:
     STATICFILES_STORAGE = \
         'django.contrib.staticfiles.storage.StaticFilesStorage'
 else:
     STATICFILES_STORAGE = \
         'django.contrib.staticfiles.storage.CachedStaticFilesStorage'
 
 # Make this unique, and don't share it with anybody.
 SECRET_KEY = '@1rc$o(7=tt#kd+4s$u6wchm**z^)4x90)7f6z(i&55@o11*8o'
 
 # List of callables that know how to import templates from various sources.
 TEMPLATE_LOADERS = (
     'django.template.loaders.filesystem.Loader',
     'django.template.loaders.app_directories.Loader',
 )
 
 TEMPLATE_CONTEXT_PROCESSORS = (
     'django.core.context_processors.media',
     'django.core.context_processors.static',
     'django.core.context_processors.request',
     'django.contrib.auth.context_processors.auth',
 )
 
 MIDDLEWARE_CLASSES = (
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.locale.LocaleMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'boards.middlewares.BanMiddleware',
 )
 
 ROOT_URLCONF = 'neboard.urls'
 
 # Python dotted path to the WSGI application used by Django's runserver.
 WSGI_APPLICATION = 'neboard.wsgi.application'
 
 TEMPLATE_DIRS = (
     # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
     # Always use forward slashes, even on Windows.
     # Don't forget to use absolute paths, not relative paths.
     'templates',
 )
 
 INSTALLED_APPS = (
     'django.contrib.auth',
     'django.contrib.contenttypes',
     'django.contrib.sessions',
     # 'django.contrib.sites',
     'django.contrib.messages',
     'django.contrib.staticfiles',
     # Uncomment the next line to enable the admin:
      'django.contrib.admin',
     # Uncomment the next line to enable admin documentation:
     # 'django.contrib.admindocs',
     'django.contrib.markup',
     'django.contrib.humanize',
     'django_cleanup',
     'boards',
     'captcha',
     'south',
     'debug_toolbar',
 )
 
 DEBUG_TOOLBAR_PANELS = (
     'debug_toolbar.panels.version.VersionDebugPanel',
     'debug_toolbar.panels.timer.TimerDebugPanel',
     'debug_toolbar.panels.settings_vars.SettingsVarsDebugPanel',
     'debug_toolbar.panels.headers.HeaderDebugPanel',
     'debug_toolbar.panels.request_vars.RequestVarsDebugPanel',
     'debug_toolbar.panels.template.TemplateDebugPanel',
     'debug_toolbar.panels.sql.SQLDebugPanel',
     'debug_toolbar.panels.signals.SignalDebugPanel',
     'debug_toolbar.panels.logger.LoggingPanel',
 )
 
 # TODO: NEED DESIGN FIXES
 CAPTCHA_OUTPUT_FORMAT = (u' %(hidden_field)s '
                          u'<div class="form-label">%(image)s</div>'
                          u'<div class="form-text">%(text_field)s</div>')
 
 # A sample logging configuration. The only tangible logging
 # performed by this configuration is to send an email to
 # the site admins on every HTTP 500 error when DEBUG=False.
 # See http://docs.djangoproject.com/en/dev/topics/logging for
 # more details on how to customize your logging configuration.
 LOGGING = {
     'version': 1,
     'disable_existing_loggers': False,
     'filters': {
         'require_debug_false': {
             '()': 'django.utils.log.RequireDebugFalse'
         }
     },
     'handlers': {
         'mail_admins': {
             'level': 'ERROR',
             'filters': ['require_debug_false'],
             'class': 'django.utils.log.AdminEmailHandler'
         }
     },
     'loggers': {
         'django.request': {
             'handlers': ['mail_admins'],
             'level': 'ERROR',
             'propagate': True,
         },
     }
 }
 
 MARKUP_FIELD_TYPES = (
     ('markdown', markdown_extended),
 )
 # Custom imageboard settings
 # TODO These should me moved to
 MAX_POSTS_PER_THREAD = 10  # Thread bumplimit
 MAX_THREAD_COUNT = 500  # Old threads will be deleted to preserve this count
 THREADS_PER_PAGE = 3
 SITE_NAME = 'Neboard'
 
 THEMES = [
     ('md', 'Mystic Dark'),
     ('md_centered', 'Mystic Dark (centered)'),
     ('sw', 'Snow White'),
     ('pg', 'Photon Gray'),
 ]
 
 DEFAULT_THEME = 'md'
 
 POPULAR_TAGS = 10
 LAST_REPLIES_COUNT = 3
 
 ENABLE_CAPTCHA = False
 # if user tries to post before CAPTCHA_DEFAULT_SAFE_TIME. Captcha will be shown
 CAPTCHA_DEFAULT_SAFE_TIME = 30  # seconds
-POSTING_DELAY = 30  # seconds
+POSTING_DELAY = 20  # seconds
 
 
 def custom_show_toolbar(request):
     return DEBUG
 
 DEBUG_TOOLBAR_CONFIG = {
     'INTERCEPT_REDIRECTS': False,
     'SHOW_TOOLBAR_CALLBACK': custom_show_toolbar,
     'HIDE_DJANGO_SQL': False,
     'ENABLE_STACKTRACES': True,
 }
 
 # Debug mode middlewares
 if DEBUG:
     MIDDLEWARE_CLASSES += (
         'boards.profiler.ProfilerMiddleware',
         'debug_toolbar.middleware.DebugToolbarMiddleware',
     )

todo.txt

@@ -1,41 +1,43 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
 
+[IN PROGRESS] 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] Thread autoupdate (JS + API)
 [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
 
 = Bugs =
 [DONE] Fix bug with creating threads from tag view
 [DONE] Quote characters within quote causes quote parsing to fail
 
 = Testing =
 [NOT STARTED] Make tests for every view
 [NOT STARTED] Make tests for every model
 [NOT STARTED] Make tests for every form