Added settings to limit posting speed. Added message when the form data is sent and response not yet received

boards/forms.py

@@ -1,356 +1,357 b''
 import re
 import time
 import hashlib
 
 from captcha.fields import CaptchaField
 from django import forms
 from django.forms.util import ErrorList
 from django.utils.translation import ugettext_lazy as _
 
 from boards.mdx_neboard import formatters
 from boards.models.post import TITLE_MAX_LENGTH
 from boards.models import User, PostImage
 from neboard import settings
 from boards import utils
 import boards.settings as board_settings
 
 VETERAN_POSTING_DELAY = 5
 
 ATTRIBUTE_PLACEHOLDER = 'placeholder'
 
 LAST_POST_TIME = 'last_post_time'
 LAST_LOGIN_TIME = 'last_login_time'
 TEXT_PLACEHOLDER = _('''Type message here. You can reply to message >>123 like
  this. 2 new lines are required to start new paragraph.''')
 TAGS_PLACEHOLDER = _('tag1 several_words_tag')
 
 ERROR_IMAGE_DUPLICATE = _('Such image was already posted')
 
 LABEL_TITLE = _('Title')
 LABEL_TEXT = _('Text')
 LABEL_TAG = _('Tag')
 LABEL_SEARCH = _('Search')
 
 TAG_MAX_LENGTH = 20
 
 REGEX_TAG = ur'^[\w\d]+$'
 
 
 class FormatPanel(forms.Textarea):
     def render(self, name, value, attrs=None):
         output = '<div id="mark-panel">'
         for formatter in formatters:
             output += u'<span class="mark_btn"' + \
                       u' onClick="addMarkToMsg(\'' + formatter.format_left + \
                       '\', \'' + formatter.format_right + '\')">' + \
                       formatter.preview_left + formatter.name + \
                       formatter.preview_right + u'</span>'
 
         output += '</div>'
         output += super(FormatPanel, self).render(name, value, attrs=None)
 
         return output
 
 
 class PlainErrorList(ErrorList):
     def __unicode__(self):
         return self.as_text()
 
     def as_text(self):
         return ''.join([u'(!) %s ' % e for e in self])
 
 
 class NeboardForm(forms.Form):
 
     def as_div(self):
         """
         Returns this form rendered as HTML <as_div>s.
         """
 
         return self._html_output(
             # TODO Do not show hidden rows in the list here
             normal_row='<div class="form-row"><div class="form-label">'
                        '%(label)s'
                        '</div></div>'
                        '<div class="form-row"><div class="form-input">'
                        '%(field)s'
                        '</div></div>'
                        '<div class="form-row">'
                        '%(help_text)s'
                        '</div>',
             error_row='<div class="form-row">'
                       '<div class="form-label"></div>'
                       '<div class="form-errors">%s</div>'
                       '</div>',
             row_ender='</div>',
             help_text_html='%s',
             errors_on_separate_row=True)
 
     def as_json_errors(self):
         errors = []
 
         for name, field in self.fields.items():
             if self[name].errors:
                 errors.append({
                     'field': name,
                     'errors': self[name].errors.as_text(),
                 })
 
         return errors
 
 
 class PostForm(NeboardForm):
 
     title = forms.CharField(max_length=TITLE_MAX_LENGTH, required=False,
                             label=LABEL_TITLE)
     text = forms.CharField(
         widget=FormatPanel(attrs={ATTRIBUTE_PLACEHOLDER: TEXT_PLACEHOLDER}),
         required=False, label=LABEL_TEXT)
     image = forms.ImageField(required=False, label=_('Image'),
                              widget=forms.ClearableFileInput(
                                  attrs={'accept': 'image/*'}))
 
     # This field is for spam prevention only
     email = forms.CharField(max_length=100, required=False, label=_('e-mail'),
                             widget=forms.TextInput(attrs={
                                 'class': 'form-email'}))
 
     session = None
     need_to_ban = False
 
     def clean_title(self):
         title = self.cleaned_data['title']
         if title:
             if len(title) > TITLE_MAX_LENGTH:
                 raise forms.ValidationError(_('Title must have less than %s '
                                               'characters') %
                                             str(TITLE_MAX_LENGTH))
         return title
 
     def clean_text(self):
         text = self.cleaned_data['text'].strip()
         if text:
             if len(text) > board_settings.MAX_TEXT_LENGTH:
                 raise forms.ValidationError(_('Text must have less than %s '
                                               'characters') %
                                             str(board_settings
                                             .MAX_TEXT_LENGTH))
         return text
 
     def clean_image(self):
         image = self.cleaned_data['image']
         if image:
             if image.size > board_settings.MAX_IMAGE_SIZE:
                 raise forms.ValidationError(
                     _('Image must be less than %s bytes')
                     % str(board_settings.MAX_IMAGE_SIZE))
 
             md5 = hashlib.md5()
             for chunk in image.chunks():
                 md5.update(chunk)
             image_hash = md5.hexdigest()
             if PostImage.objects.filter(hash=image_hash).exists():
                 raise forms.ValidationError(ERROR_IMAGE_DUPLICATE)
 
         return image
 
     def clean(self):
         cleaned_data = super(PostForm, self).clean()
 
         if not self.session:
             raise forms.ValidationError('Humans have sessions')
 
         if cleaned_data['email']:
             self.need_to_ban = True
             raise forms.ValidationError('A human cannot enter a hidden field')
 
         if not self.errors:
             self._clean_text_image()
 
         if not self.errors and self.session:
             self._validate_posting_speed()
 
         return cleaned_data
 
     def _clean_text_image(self):
         text = self.cleaned_data.get('text')
         image = self.cleaned_data.get('image')
 
         if (not text) and (not image):
             error_message = _('Either text or image must be entered.')
             self._errors['text'] = self.error_class([error_message])
 
     def _validate_posting_speed(self):
         can_post = True
 
         # TODO Remove this, it's only for test
         if not 'user_id' in self.session:
             return
 
         user = User.objects.get(id=self.session['user_id'])
         if user.is_veteran():
             posting_delay = VETERAN_POSTING_DELAY
         else:
             posting_delay = settings.POSTING_DELAY
 
-        if LAST_POST_TIME in self.session:
+        if board_settings.LIMIT_POSTING_SPEED and LAST_POST_TIME in \
+                self.session:
             now = time.time()
             last_post_time = self.session[LAST_POST_TIME]
 
             current_delay = int(now - last_post_time)
 
             if current_delay < posting_delay:
                 error_message = _('Wait %s seconds after last posting') % str(
                     posting_delay - current_delay)
                 self._errors['text'] = self.error_class([error_message])
 
                 can_post = False
 
         if can_post:
             self.session[LAST_POST_TIME] = time.time()
 
 
 class ThreadForm(PostForm):
 
     regex_tags = re.compile(ur'^[\w\s\d]+$', re.UNICODE)
 
     tags = forms.CharField(
         widget=forms.TextInput(attrs={ATTRIBUTE_PLACEHOLDER: TAGS_PLACEHOLDER}),
         max_length=100, label=_('Tags'), required=True)
 
     def clean_tags(self):
         tags = self.cleaned_data['tags'].strip()
 
         if not tags or not self.regex_tags.match(tags):
             raise forms.ValidationError(
                 _('Inappropriate characters in tags.'))
 
         return tags
 
     def clean(self):
         cleaned_data = super(ThreadForm, self).clean()
 
         return cleaned_data
 
 
 class PostCaptchaForm(PostForm):
     captcha = CaptchaField()
 
     def __init__(self, *args, **kwargs):
         self.request = kwargs['request']
         del kwargs['request']
 
         super(PostCaptchaForm, self).__init__(*args, **kwargs)
 
     def clean(self):
         cleaned_data = super(PostCaptchaForm, self).clean()
 
         success = self.is_valid()
         utils.update_captcha_access(self.request, success)
 
         if success:
             return cleaned_data
         else:
             raise forms.ValidationError(_("Captcha validation failed"))
 
 
 class ThreadCaptchaForm(ThreadForm):
     captcha = CaptchaField()
 
     def __init__(self, *args, **kwargs):
         self.request = kwargs['request']
         del kwargs['request']
 
         super(ThreadCaptchaForm, self).__init__(*args, **kwargs)
 
     def clean(self):
         cleaned_data = super(ThreadCaptchaForm, self).clean()
 
         success = self.is_valid()
         utils.update_captcha_access(self.request, success)
 
         if success:
             return cleaned_data
         else:
             raise forms.ValidationError(_("Captcha validation failed"))
 
 
 class SettingsForm(NeboardForm):
 
     theme = forms.ChoiceField(choices=settings.THEMES,
                               label=_('Theme'))
 
 
 class ModeratorSettingsForm(SettingsForm):
 
     moderate = forms.BooleanField(required=False, label=_('Enable moderation '
                                                           'panel'))
 
 
 class LoginForm(NeboardForm):
 
     user_id = forms.CharField()
 
     session = None
 
     def clean_user_id(self):
         user_id = self.cleaned_data['user_id']
         if user_id:
             users = User.objects.filter(user_id=user_id)
             if len(users) == 0:
                 raise forms.ValidationError(_('No such user found'))
 
         return user_id
 
     def _validate_login_speed(self):
         can_post = True
 
         if LAST_LOGIN_TIME in self.session:
             now = time.time()
             last_login_time = self.session[LAST_LOGIN_TIME]
 
             current_delay = int(now - last_login_time)
 
             if current_delay < board_settings.LOGIN_TIMEOUT:
                 error_message = _('Wait %s minutes after last login') % str(
                     (board_settings.LOGIN_TIMEOUT - current_delay) / 60)
                 self._errors['user_id'] = self.error_class([error_message])
 
                 can_post = False
 
         if can_post:
             self.session[LAST_LOGIN_TIME] = time.time()
 
     def clean(self):
         if not self.session:
             raise forms.ValidationError('Humans have sessions')
 
         self._validate_login_speed()
 
         cleaned_data = super(LoginForm, self).clean()
 
         return cleaned_data
 
 
 class AddTagForm(NeboardForm):
 
     tag = forms.CharField(max_length=TAG_MAX_LENGTH, label=LABEL_TAG)
     method = forms.CharField(widget=forms.HiddenInput(), initial='add_tag')
 
     def clean_tag(self):
         tag = self.cleaned_data['tag']
 
         regex_tag = re.compile(REGEX_TAG, re.UNICODE)
         if not regex_tag.match(tag):
             raise forms.ValidationError(_('Inappropriate characters in tags.'))
 
         return tag
 
     def clean(self):
         cleaned_data = super(AddTagForm, self).clean()
 
         return cleaned_data
 
 
 class SearchForm(NeboardForm):
     query = forms.CharField(max_length=500, label=LABEL_SEARCH, required=False)
  No newline at end of file

boards/locale/ru/LC_MESSAGES/djangojs.po

@@ -1,43 +1,32 b''
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-21 21:45+0200\n"
+"POT-Creation-Date: 2014-07-02 13:26+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: static/js/refpopup.js:57
+#: static/js/refpopup.js:58
 msgid "Loading..."
 msgstr "Загрузка..."
 
-#: static/js/refpopup.js:76
+#: static/js/refpopup.js:77
 msgid "Post not found"
 msgstr "Сообщение не найдено"
 
-#: static/js/thread.js:32
-msgid "Normal"
-msgstr "Нормальный"
-
-#: static/js/thread.js:33
-msgid "Gallery"
-msgstr "Галерея"
-
-#: static/js/thread_update.js:177
-msgid "[new posts]"
-msgstr "[новые посты]"
-
-#~ msgid "Replies"
-#~ msgstr "Ответы"
+#: static/js/thread_update.js:279
+msgid "Sending message..."
+msgstr "Отправка сообщения..."
  No newline at end of file

boards/settings.py

@@ -1,18 +1,20 b''
 VERSION = '1.8.1 Kara'
 SITE_NAME = 'Neboard'
 
 CACHE_TIMEOUT = 600  # Timeout for caching, if cache is used
 LOGIN_TIMEOUT = 3600  # Timeout between login tries
 MAX_TEXT_LENGTH = 30000  # Max post length in characters
 MAX_IMAGE_SIZE = 8 * 1024 * 1024  # Max image size
 
 # Thread bumplimit
 MAX_POSTS_PER_THREAD = 10
 # Old posts will be archived or deleted if this value is reached
 MAX_THREAD_COUNT = 5
 THREADS_PER_PAGE = 3
 DEFAULT_THEME = 'md'
 LAST_REPLIES_COUNT = 3
 
 # Enable archiving threads instead of deletion when the thread limit is reached
-ARCHIVE_THREADS = True
  No newline at end of file
+ARCHIVE_THREADS = True
+# Limit posting speed
+LIMIT_POSTING_SPEED = False
  No newline at end of file

boards/static/js/thread_update.js

@@ -1,272 +1,288 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;
-var unreadPosts = 0
+var unreadPosts = 0;
 
 function blink(node) {
     var blinkCount = 2;
 
     var nodeToAnimate = node;
     for (var i = 0; i < blinkCount; i++) {
         nodeToAnimate = nodeToAnimate.fadeTo('fast', 0.5).fadeTo('fast', 1.0);
     }
 }
 
 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 lastUpdate = '';
 
             var addedPosts = data.added;
             for (var i = 0; i < addedPosts.length; i++) {
                 var postText = addedPosts[i];
 
                 var post = $(postText);
 
                 if (lastUpdate === '') {
                     lastUpdate = post.find('.pub_time').text();
                 }
 
                 post.appendTo(lastPost.parent());
                 processNewPost(post);
 
                 lastPost = post;
                 blink(post);
             }
 
             var updatedPosts = data.updated;
             for (var i = 0; i < updatedPosts.length; i++) {
                 var postText = updatedPosts[i];
 
                 var post = $(postText);
 
                 if (lastUpdate === '') {
                     lastUpdate = post.find('.pub_time').text();
                 }
 
                 var postId = post.attr('id');
 
                 var oldPost = $('div.thread').children('.post[id=' + postId + ']');
                 
                 oldPost.replaceWith(post);
                 processNewPost(post);
 
                 blink(post);
             }
 
             // TODO Process deleted posts
 
             lastUpdateTime = data.last_update;
             loading = false;
 
             if (bottom) {
                 scrollToBottom();
             }
 
             var hasPostChanges = (updatedPosts.length > 0)
                 || (addedPosts.length > 0);
             if (hasPostChanges) {
                 updateMetadataPanel(lastUpdate);
             }
 
             updateBumplimitProgress(data.added.length);
 
             if (data.added.length + data.updated.length > 0) {
                 showNewPostsTitle(data.added.length);
             }
         })
         .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
 }
 
 function getImageCount() {
     return $('.thread').find('img').length
 }
 
 function updateMetadataPanel(lastUpdate) {
     var replyCountField = $('#reply-count');
     var imageCountField = $('#image-count');
 
     replyCountField.text(getReplyCount());
     imageCountField.text(getImageCount());
 
     if (lastUpdate !== '') {
         var lastUpdateField = $('#last-update');
         lastUpdateField.text(lastUpdate);
         blink(lastUpdateField);
     }
 
     blink(replyCountField);
     blink(imageCountField);
 }
 
 /**
  * Update bumplimit progress bar
  */
 function updateBumplimitProgress(postDelta) {
     var progressBar = $('#bumplimit_progress');
     if (progressBar) {
         var postsToLimitElement = $('#left_to_limit');
 
         var oldPostsToLimit = parseInt(postsToLimitElement.text());
         var postCount = getReplyCount();
         var bumplimit = postCount - postDelta + oldPostsToLimit;
 
         var newPostsToLimit = bumplimit - postCount;
         if (newPostsToLimit <= 0) {
             $('.bar-bg').remove();
             $('.thread').children('.post').addClass('dead_post');
         } else {
             postsToLimitElement.text(newPostsToLimit);
             progressBar.width((100 - postCount / bumplimit * 100.0) + '%');
         }
     }
 }
 
 var documentOriginalTitle = '';
 /**
  * Show 'new posts' text in the title if the document is not visible to a user
  */
 function showNewPostsTitle(newPostCount) {
     if (document.hidden) {
         if (documentOriginalTitle === '') {
             documentOriginalTitle = document.title;
         }
         unreadPosts = unreadPosts + newPostCount;
         document.title = '[' + unreadPosts + '] ' + documentOriginalTitle;
 
         document.addEventListener('visibilitychange', function() {
             if (documentOriginalTitle !== '') {
                 document.title = documentOriginalTitle;
                 documentOriginalTitle = '';
                 unreadPosts = 0;
             }
 
             document.removeEventListener('visibilitychange', null);
         });
     }
 }
 
 /**
  * Clear all entered values in the form fields
  */
 function resetForm(form) {
     form.find('input:text, input:password, input:file, select, textarea').val('');
     form.find('input:radio, input:checkbox')
              .removeAttr('checked').removeAttr('selected');
     $('.file_wrap').find('.file-thumb').remove();
 }
 
 /**
  * When the form is posted, this method will be run as a callback
  */
 function updateOnPost(response, statusText, xhr, form) {
     var json = $.parseJSON(response);
     var status = json.status;
 
-    form.children('.form-errors').remove();
+    showAsErrors(form, '');
 
     if (status === 'ok') {
         resetForm(form);
         updateThread();
     } else {
         var errors = json.errors;
         for (var i = 0; i < errors.length; i++) {
             var fieldErrors = errors[i];
 
             var error = fieldErrors.errors;
 
-            var errorList = $('<div class="form-errors">' + error
-                    + '<div>');
-            errorList.appendTo(form);
+            showAsErrors(form, error);
         }
     }
 }
 
 /**
+ * Show text in the errors row of the form.
+ * @param form
+ * @param text
+ */
+function showAsErrors(form, text) {
+    form.children('.form-errors').remove();
+
+    if (text.length > 0) {
+        var errorList = $('<div class="form-errors">' + text
+            + '<div>');
+        errorList.appendTo(form);
+    }
+}
+
+/**
  * Run js methods that are usually run on the document, on the new post
  */
 function processNewPost(post) {
     addRefLinkPreview(post[0]);
     highlightCode(post);
 }
 
 $(document).ready(function(){
     initAutoupdate();
 
     // Post form data over AJAX
-    var threadId = $('div.thread').children('.post').first().attr('id');;
+    var threadId = $('div.thread').children('.post').first().attr('id');
 
     var form = $('#form');
 
     var options = {
+        beforeSubmit: function(arr, $form, options) {
+            showAsErrors($('form'), gettext('Sending message...'));
+        },
         success: updateOnPost,
         url: '/api/add_post/' + threadId + '/'
     };
 
     form.ajaxForm(options);
 
     resetForm(form);
 });