Added a form field for additional threads list in multi-thread posts

boards/forms.py

@@ -4,13 +4,14 b' import pytz'
 
 from django import forms
 from django.core.files.uploadedfile import SimpleUploadedFile
+from django.core.exceptions import ObjectDoesNotExist
 from django.forms.util import ErrorList
 from django.utils.translation import ugettext_lazy as _
 import requests
 
 from boards.mdx_neboard import formatters
 from boards.models.post import TITLE_MAX_LENGTH
-from boards.models import Tag
+from boards.models import Tag, Post
 from neboard import settings
 import boards.settings as board_settings
 
@@ -148,6 +149,9 b' class PostForm(NeboardForm):'
     email = forms.CharField(max_length=100, required=False, label=_('e-mail'),
                             widget=forms.TextInput(attrs={
                                 'class': 'form-email'}))
+    threads = forms.CharField(required=False, label=_('Additional threads'),
+            widget=forms.TextInput(attrs={ATTRIBUTE_PLACEHOLDER:
+                '123 456 789'}))
 
     session = None
     need_to_ban = False
@@ -193,6 +197,25 b' class PostForm(NeboardForm):'
 
         return image
 
+    def clean_threads(self):
+        threads_str = self.cleaned_data['threads']
+
+        if len(threads_str) > 0:
+            threads_id_list = threads_str.split(' ')
+
+            threads = list()
+
+            for thread_id in threads_id_list:
+                try:
+                    thread = Post.objects.get(id=int(thread_id))
+                    if not thread.is_opening():
+                        raise ObjectDoesNotExist()
+                    threads.append(thread)
+                except (ObjectDoesNotExist, ValueError):
+                    raise forms.ValidationError(_('Invalid additional thread list'))
+
+            return threads
+
     def clean(self):
         cleaned_data = super(PostForm, self).clean()
 

boards/locale/ru/LC_MESSAGES/django.po

@@ -7,7 +7,7 b' msgid ""'
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-01 18:05+0300\n"
+"POT-Creation-Date: 2015-04-07 15: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"
@@ -38,97 +38,106 b' msgstr "\xd1\x80\xd0\xb0\xd0\xb7\xd1\x80\xd0\xb0\xd0\xb1\xd0\xbe\xd1\x82\xd1\x87\xd0\xb8\xd0\xba javascript"'
 msgid "designer"
 msgstr "дизайнер"
 
-#: forms.py:34
+#: forms.py:35
 msgid "Type message here. Use formatting panel for more advanced usage."
 msgstr ""
 "Вводите сообщение сюда. Используйте панель для более сложного форматирования."
 
-#: forms.py:35
+#: forms.py:36
 msgid "tag1 several_words_tag"
 msgstr "метка1 метка_из_нескольких_слов"
 
-#: forms.py:37
+#: forms.py:38
 msgid "Title"
 msgstr "Заголовок"
 
-#: forms.py:38
+#: forms.py:39
 msgid "Text"
 msgstr "Текст"
 
-#: forms.py:39
+#: forms.py:40
 msgid "Tag"
 msgstr "Метка"
 
-#: forms.py:40 templates/boards/base.html:36 templates/search/search.html:13
-#: templates/search/search.html.py:17
+#: forms.py:41 templates/boards/base.html:36 templates/search/search.html:7
 msgid "Search"
 msgstr "Поиск"
 
-#: forms.py:139
+#: forms.py:140
 msgid "Image"
 msgstr "Изображение"
 
-#: forms.py:142
+#: forms.py:143
 msgid "Image URL"
 msgstr "URL изображения"
 
-#: forms.py:148
+#: forms.py:149
 msgid "e-mail"
 msgstr ""
 
-#: forms.py:159
+#: forms.py:152
+#| msgid "All threads"
+msgid "Additional threads"
+msgstr "Дополнительные темы"
+
+#: forms.py:163
 #, python-format
 msgid "Title must have less than %s characters"
 msgstr "Заголовок должен иметь меньше %s символов"
 
-#: forms.py:168
+#: forms.py:172
 #, python-format
 msgid "Text must have less than %s characters"
 msgstr "Текст должен быть короче %s символов"
 
-#: forms.py:190
+#: forms.py:194
 msgid "Invalid URL"
 msgstr "Неверный URL"
 
-#: forms.py:227
+#: forms.py:214
+msgid "Invalid additional thread list"
+msgstr "Неверный список дополнительных тем"
+
+#: forms.py:249
 msgid "Either text or image must be entered."
 msgstr "Текст или картинка должны быть введены."
 
-#: forms.py:243
+#: forms.py:265
 #, python-format
 msgid "Wait %s seconds after last posting"
 msgstr "Подождите %s секунд после последнего постинга"
 
-#: forms.py:255
+#: forms.py:277
 #, python-format
 msgid "Image must be less than %s bytes"
 msgstr "Изображение должно быть менее %s байт"
 
-#: forms.py:302 templates/boards/rss/post.html:10 templates/boards/tags.html:7
+#: forms.py:324 templates/boards/posting_general.html:148
+#: templates/boards/rss/post.html:10 templates/boards/tags.html:7
 msgid "Tags"
 msgstr "Метки"
 
-#: forms.py:309
+#: forms.py:331
 msgid "Inappropriate characters in tags."
 msgstr "Недопустимые символы в метках."
 
-#: forms.py:320
+#: forms.py:342
 msgid "Need at least 1 required tag."
 msgstr "Нужна хотя бы 1 обязательная метка."
 
-#: forms.py:332
+#: forms.py:354
 msgid "Theme"
 msgstr "Тема"
 
-#: forms.py:333
+#: forms.py:355
 msgid "User name"
 msgstr "Имя пользователя"
 
-#: forms.py:334
+#: forms.py:356
 msgid "Time zone"
 msgstr "Часовой пояс"
 
-#: forms.py:340
+#: forms.py:362
 msgid "Inappropriate characters."
 msgstr "Недопустимые символы."
 
@@ -265,11 +274,11 b' msgstr ""'
 msgid "Text syntax"
 msgstr "Синтаксис текста"
 
-#: templates/boards/posting_general.html:157
+#: templates/boards/posting_general.html:161
 msgid "Pages:"
 msgstr "Страницы: "
 
-#: templates/boards/preview.html:6 templates/boards/staticpages/help.html:21
+#: templates/boards/preview.html:6 templates/boards/staticpages/help.html:20
 msgid "Preview"
 msgstr "Предпросмотр"
 
@@ -323,23 +332,19 b' msgid "Link to a post"'
 msgstr "Ссылка на сообщение"
 
 #: templates/boards/staticpages/help.html:15
-msgid "Add post to this thread"
-msgstr "Добавить сообщение в эту тему"
-
-#: templates/boards/staticpages/help.html:16
 msgid "Strikethrough text"
 msgstr "Зачеркнутый текст"
 
-#: templates/boards/staticpages/help.html:17
+#: templates/boards/staticpages/help.html:16
 msgid "Comment"
 msgstr "Комментарий"
 
+#: templates/boards/staticpages/help.html:17
 #: templates/boards/staticpages/help.html:18
-#: templates/boards/staticpages/help.html:19
 msgid "Quote"
 msgstr "Цитата"
 
-#: templates/boards/staticpages/help.html:21
+#: templates/boards/staticpages/help.html:20
 msgid "You can try pasting the text and previewing the result here:"
 msgstr "Вы можете попробовать вставить текст и проверить результат здесь:"
 
@@ -384,3 +389,8 b' msgstr "\xd0\x97\xd0\xb0\xd0\xba\xd1\x80\xd1\x8b\xd1\x82\xd1\x8c \xd1\x84\xd0\xbe\xd1\x80\xd0\xbc\xd1\x83"'
 #: templates/boards/thread_normal.html:68
 msgid "Update"
 msgstr "Обновить"
+
+#: templates/search/search.html:17
+msgid "Ok"
+msgstr ""
+

boards/mdx_neboard.py

@@ -137,23 +137,6 b' def render_reflink(tag_name, value, opti'
     return result
 
 
-def render_multithread(tag_name, value, options, parent, context):
-    result = '>>>%s' % value
-
-    if REFLINK_PATTERN.match(value):
-        post_id = int(value)
-
-        try:
-            post = boards.models.Post.objects.get(id=post_id)
-
-            if post.is_opening():
-                result = '<a href="%s">&gt;&gt;&gt;%s</a>' % (post.get_url(), post_id)
-        except ObjectDoesNotExist:
-            pass
-
-    return result
-
-
 def render_quote(tag_name, value, options, parent, context):
     source = ''
     if 'source' in options:
@@ -189,7 +172,6 b' formatters = ['
 
 
 PREPARSE_PATTERNS = {
-    r'>>>(\d+)': r'[thread]\1[/thread]',  # Multi-thread post ">>>123"
     r'(?<!>)>>(\d+)': r'[post]\1[/post]',  # Reflink ">>123"
     r'^>([^>].+)': r'[quote]\1[/quote]',  # Quote ">text"
     r'^//(.+)': r'[comment]\1[/comment]',  # Comment "//text"
@@ -204,7 +186,6 b' class Parser:'
         self.parser = bbcode.Parser(newline=LINE_BREAK_HTML)
 
         self.parser.add_formatter('post', render_reflink, strip=True)
-        self.parser.add_formatter('thread', render_multithread, strip=True)
         self.parser.add_formatter('quote', render_quote, strip=True)
         self.parser.add_formatter('user', render_notification, strip=True)
         self.parser.add_simple_formatter(

boards/models/post.py

@@ -42,7 +42,6 b" NO_IP = '0.0.0.0'"
 UNKNOWN_UA = ''
 
 REGEX_REPLY = re.compile(r'\[post\](\d+)\[/post\]')
-REGEX_MULTI_THREAD = re.compile(r'\[thread\](\d+)\[/thread\]')
 REGEX_NOTIFICATION = re.compile(r'\[user\](\w+)\[/user\]')
 
 PARAMETER_TRUNCATED = 'truncated'
@@ -65,13 +64,15 b" DIFF_TYPE_JSON = 'json'"
 class PostManager(models.Manager):
     @transaction.atomic
     def create_post(self, title: str, text: str, image=None, thread=None,
-                    ip=NO_IP, tags: list=None):
+            ip=NO_IP, tags: list=None, threads: list=None):
         """
         Creates new post
         """
 
         if not tags:
             tags = []
+        if not threads:
+            threads = []
 
         posting_time = timezone.now()
         if not thread:
@@ -111,7 +112,7 b' class PostManager(models.Manager):'
             thread.save()
 
         post.connect_replies()
-        post.connect_threads()
+        post.connect_threads(threads)
         post.connect_notifications()
 
         return post
@@ -424,27 +425,20 b' class Post(models.Model, Viewable):'
             except ObjectDoesNotExist:
                 pass
 
-    def connect_threads(self):
+    def connect_threads(self, threads):
         """
         If the referenced post is an OP in another thread,
         make this post multi-thread.
         """
 
-        for reply_number in re.finditer(REGEX_MULTI_THREAD, self.get_raw_text()):
-            post_id = reply_number.group(1)
-
-            try:
-                referenced_post = Post.objects.get(id=post_id)
+        for referenced_post in threads:
+            if referenced_post.is_opening():
+                referenced_threads = referenced_post.get_threads().all()
+                for thread in referenced_threads:
+                    if thread.can_bump():
+                        thread.update_bump_status()
 
-                if referenced_post.is_opening():
-                    referenced_threads = referenced_post.get_threads().all()
-                    for thread in referenced_threads:
-                        if thread.can_bump():
-                            thread.update_bump_status()
+                    thread.last_edit_time = self.pub_time
+                    thread.save(update_fields=['last_edit_time', 'bumpable'])
 
-                        thread.last_edit_time = self.pub_time
-                        thread.save(update_fields=['last_edit_time', 'bumpable'])
-
-                        self.threads.add(thread)
-            except ObjectDoesNotExist:
-                pass
+                    self.threads.add(thread)

boards/templates/boards/staticpages/help.html

@@ -12,7 +12,6 b''
     <p>[b]<b>{% trans 'Bold text' %}</b>[/b]</p>
     <p>[spoiler]<span class="spoiler">{% trans 'Spoiler' %}</span>[/spoiler]</p>
     <p>[post]123[/post] — {% trans 'Link to a post' %}</p>
-    <p>[thread]123[/thread] — {% trans 'Add post to this thread' %}</p>
     <p>[s]<span class="strikethrough">{% trans 'Strikethrough text' %}</span>[/s]</p>
     <p>[comment]<span class="comment">{% trans 'Comment' %}</span>[/comment]</p>
     <p>[quote]<span class="quote">&gt;{% trans 'Quote' %}</span>[/quote]</p>

boards/views/all_threads.py

@@ -20,6 +20,7 b" FORM_TAGS = 'tags'"
 FORM_TEXT = 'text'
 FORM_TITLE = 'title'
 FORM_IMAGE = 'image'
+FORM_THREADS = 'threads'
 
 TAG_DELIMITER = ' '
 
@@ -119,6 +120,7 b' class AllThreadsView(PostMixin, BaseBoar'
         title = data[FORM_TITLE]
         text = data[FORM_TEXT]
         image = form.get_image()
+        threads = data[FORM_THREADS]
 
         text = self._remove_invalid_links(text)
 
@@ -127,7 +129,7 b' class AllThreadsView(PostMixin, BaseBoar'
         tags = self.parse_tags_string(tag_strings)
 
         post = Post.objects.create_post(title=title, text=text, image=image,
-                                        ip=ip, tags=tags)
+                                        ip=ip, tags=tags, threads=threads)
 
         # This is required to update the threads to which posts we have replied
         # when creating this one

boards/views/thread/thread.py

@@ -21,6 +21,7 b" CONTEXT_WS_PORT = 'ws_port'"
 FORM_TITLE = 'title'
 FORM_TEXT = 'text'
 FORM_IMAGE = 'image'
+FORM_THREADS = 'threads'
 
 
 class ThreadView(BaseBoardView, PostMixin, FormMixin):
@@ -91,13 +92,14 b' class ThreadView(BaseBoardView, PostMixi'
         title = data[FORM_TITLE]
         text = data[FORM_TEXT]
         image = form.get_image()
+        threads = data[FORM_THREADS]
 
         text = self._remove_invalid_links(text)
 
         post_thread = opening_post.get_thread()
 
         post = Post.objects.create_post(title=title, text=text, image=image,
-                                        thread=post_thread, ip=ip)
+                                        thread=post_thread, ip=ip, threads=threads)
         post.send_to_websocket(request)
 
         if html_response: