+{% if can_bump %} +

+{% else %} +

+{% endif %} + {% if post.image %}

@@ -18,8 +23,10 @@

{{ post.title }} - (#{{ post.id }}) + ({{ post.id }}) [{{ post.pub_time }}] + [>>] {% if moderator %} @@ -32,24 +39,30 @@ {% endif %}

{% autoescape off %} - {{ post.text.rendered }} + {% if truncated %} + {{ post.text.rendered|truncatewords_html:50 }} + {% else %} + {{ post.text.rendered }} + {% endif %} {% endautoescape %} -

- {% trans "Replies" %}: - {% for ref_post in post.get_sorted_referenced_posts %} - >>{{ ref_post.id }}{% if not forloop.last %},{% endif %} - {% endfor %} -

+ {% if post.is_referenced %} +

+ {% trans "Replies" %}: + {% for ref_post in post.get_sorted_referenced_posts %} + >>{{ ref_post.id }}{% if not forloop.last %},{% endif %} + {% endfor %} +

+ {% endif %}

{% if post.tags.exists %}

- {% trans 'Tags' %}: - {% for tag in post.tags.all %} - - {{ tag.name }} - {% endfor %} - + {% trans 'Tags' %}: + {% for tag in post.tags.all %} + + {{ tag.name }} + {% endfor %} +

{% endif %}

\ No newline at end of file diff --git a/boards/templates/boards/thread.html b/boards/templates/boards/thread.html --- a/boards/templates/boards/thread.html +++ b/boards/templates/boards/thread.html @@ -13,9 +13,10 @@ {% block content %} {% get_current_language as LANGUAGE_CODE %} + - {% if posts %} + {% if posts %} {% cache 600 thread_view posts.0.last_edit_time moderator LANGUAGE_CODE %} {% if bumpable %}

@@ -27,7 +28,7 @@

{% endif %}

- {% for post in posts %} + {% for post in posts %} {% if bumpable %}

{% else %} @@ -67,7 +68,7 @@ {% autoescape off %} {{ post.text.rendered }} {% endautoescape %} - {% if post.is_referenced %} + {% if post.is_referenced %}

{% trans "Replies" %}: {% for ref_post in post.get_sorted_referenced_posts %} @@ -89,15 +90,15 @@

{% endif %}

- {% endfor %} + {% endfor %}

{% endcache %} - {% endif %} + {% endif %}

{% csrf_token %}

{% trans "Reply to thread" %} #{{ posts.0.id }}

{% trans 'Title' %}

@@ -151,7 +152,7 @@ {% get_current_language as LANGUAGE_CODE %} - + {% 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' %}. diff --git a/boards/urls.py b/boards/urls.py --- a/boards/urls.py +++ b/boards/urls.py @@ -53,4 +53,6 @@ urlpatterns = patterns('', # API url(r'^api/post/(?P\w+)/$', views.get_post, name="get_post"), + url(r'^api/diff_thread/(?P\w+)/(?P\w+)/$', + views.api_get_threaddiff, name="get_thread_diff"), ) diff --git a/boards/views.py b/boards/views.py --- a/boards/views.py +++ b/boards/views.py @@ -1,5 +1,11 @@ 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 @@ -8,6 +14,7 @@ from django.template import RequestConte 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 @@ -210,6 +217,7 @@ def thread(request, post_id): 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) @@ -245,23 +253,23 @@ def settings(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) @@ -318,7 +326,7 @@ def delete(request, 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: @@ -408,13 +416,43 @@ def api_get_post(request, post_id): 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) @@ -518,3 +556,9 @@ def _remove_invalid_links(text): 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 diff --git a/neboard/settings.py b/neboard/settings.py --- a/neboard/settings.py +++ b/neboard/settings.py @@ -219,7 +219,7 @@ 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): diff --git a/todo.txt b/todo.txt --- a/todo.txt +++ b/todo.txt @@ -9,6 +9,8 @@ denied". Use second only for autoban for [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 @@ -16,7 +18,6 @@ denied". Use second only for autoban for [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 @@ -30,6 +31,7 @@ and move everything that is used only in 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