Post model code refacoring. Added help on the "thread" parser tag

boards/locale/ru/LC_MESSAGES/django.po

@@ -1,373 +1,377 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.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-26 20:40+0200\n"
+"POT-Creation-Date: 2015-03-29 16:19+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: ru\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"
 
 #: admin.py:22
 msgid "{} posters were banned"
 msgstr ""
 
 #: authors.py:9
 msgid "author"
 msgstr "автор"
 
 #: authors.py:10
 msgid "developer"
 msgstr "разработчик"
 
 #: authors.py:11
 msgid "javascript developer"
 msgstr "разработчик javascript"
 
 #: authors.py:12
 msgid "designer"
 msgstr "дизайнер"
 
 #: forms.py:33
 msgid "Type message here. Use formatting panel for more advanced usage."
 msgstr ""
 "Вводите сообщение сюда. Используйте панель для более сложного форматирования."
 
 #: forms.py:34
 msgid "tag1 several_words_tag"
 msgstr "метка1 метка_из_нескольких_слов"
 
 #: forms.py:36
 msgid "Title"
 msgstr "Заголовок"
 
 #: forms.py:37
 msgid "Text"
 msgstr "Текст"
 
 #: forms.py:38
 msgid "Tag"
 msgstr "Метка"
 
 #: forms.py:39 templates/boards/base.html:36 templates/search/search.html:13
 #: templates/search/search.html.py:17
 msgid "Search"
 msgstr "Поиск"
 
 #: forms.py:131
 msgid "Image"
 msgstr "Изображение"
 
 #: forms.py:134
 msgid "Image URL"
 msgstr "URL изображения"
 
 #: forms.py:140
 msgid "e-mail"
 msgstr ""
 
 #: forms.py:151
 #, python-format
 msgid "Title must have less than %s characters"
 msgstr "Заголовок должен иметь меньше %s символов"
 
 #: forms.py:160
 #, python-format
 msgid "Text must have less than %s characters"
 msgstr "Текст должен быть короче %s символов"
 
 #: forms.py:182
 msgid "Invalid URL"
 msgstr "Неверный URL"
 
 #: forms.py:219
 msgid "Either text or image must be entered."
 msgstr "Текст или картинка должны быть введены."
 
 #: forms.py:235
 #, python-format
 msgid "Wait %s seconds after last posting"
 msgstr "Подождите %s секунд после последнего постинга"
 
 #: forms.py:247
 #, python-format
 msgid "Image must be less than %s bytes"
 msgstr "Изображение должно быть менее %s байт"
 
 #: forms.py:294 templates/boards/rss/post.html:10 templates/boards/tags.html:7
 msgid "Tags"
 msgstr "Метки"
 
 #: forms.py:301
 msgid "Inappropriate characters in tags."
 msgstr "Недопустимые символы в метках."
 
 #: forms.py:312
 msgid "Need at least 1 required tag."
 msgstr "Нужна хотя бы 1 обязательная метка."
 
 #: forms.py:325
 msgid "Theme"
 msgstr "Тема"
 
 #: forms.py:326
 msgid "User name"
 msgstr "Имя пользователя"
 
 #: forms.py:332
 msgid "Inappropriate characters."
 msgstr "Недопустимые символы."
 
 #: templates/boards/404.html:6
 msgid "Not found"
 msgstr "Не найдено"
 
 #: templates/boards/404.html:12
 msgid "This page does not exist"
 msgstr "Этой страницы не существует"
 
 #: templates/boards/authors.html:6 templates/boards/authors.html.py:12
 msgid "Authors"
 msgstr "Авторы"
 
 #: templates/boards/authors.html:26
 msgid "Distributed under the"
 msgstr "Распространяется под"
 
 #: templates/boards/authors.html:28
 msgid "license"
 msgstr "лицензией"
 
 #: templates/boards/authors.html:30
 msgid "Repository"
 msgstr "Репозиторий"
 
 #: templates/boards/base.html:13
 msgid "Feed"
 msgstr "Лента"
 
 #: templates/boards/base.html:30
 msgid "All threads"
 msgstr "Все темы"
 
 #: templates/boards/base.html:34
 msgid "Tag management"
 msgstr "Управление метками"
 
 #: templates/boards/base.html:39 templates/boards/base.html.py:40
 #: templates/boards/notifications.html:8
 msgid "Notifications"
 msgstr "Уведомления"
 
 #: templates/boards/base.html:47 templates/boards/settings.html:8
 msgid "Settings"
 msgstr "Настройки"
 
 #: templates/boards/base.html:60
 msgid "Admin"
 msgstr "Администрирование"
 
 #: templates/boards/base.html:62
 #, python-format
 msgid "Speed: %(ppd)s posts per day"
 msgstr "Скорость: %(ppd)s сообщений в день"
 
 #: templates/boards/base.html:64
 msgid "Up"
 msgstr "Вверх"
 
 #: templates/boards/notifications.html:17
 #: templates/boards/posting_general.html:79 templates/search/search.html:26
 msgid "Previous page"
 msgstr "Предыдущая страница"
 
 #: templates/boards/notifications.html:27
 #: templates/boards/posting_general.html:119 templates/search/search.html:37
 msgid "Next page"
 msgstr "Следующая страница"
 
 #: templates/boards/post.html:32
 msgid "Open"
 msgstr "Открыть"
 
 #: templates/boards/post.html:34 templates/boards/post.html.py:38
 msgid "Reply"
 msgstr "Ответ"
 
 #: templates/boards/post.html:43
 msgid "Edit"
 msgstr "Изменить"
 
 #: templates/boards/post.html:45
 msgid "Edit thread"
 msgstr "Изменить тему"
 
 #: templates/boards/post.html:75
 msgid "Replies"
 msgstr "Ответы"
 
 #: templates/boards/post.html:86 templates/boards/thread.html:28
 msgid "messages"
 msgstr "сообщений"
 
 #: templates/boards/post.html:87 templates/boards/thread.html:29
 msgid "images"
 msgstr "изображений"
 
 #: templates/boards/posting_general.html:63
 msgid "Edit tag"
 msgstr "Изменить метку"
 
 #: templates/boards/posting_general.html:66
 #, python-format
 msgid "This tag has %(thread_count)s threads and %(post_count)s posts."
 msgstr "С этой меткой есть %(thread_count)s тем и %(post_count)s сообщений."
 
 #: templates/boards/posting_general.html:94
 #, python-format
 msgid "Skipped %(count)s replies. Open thread to see all replies."
 msgstr "Пропущено %(count)s ответов. Откройте тред, чтобы увидеть все ответы."
 
 #: templates/boards/posting_general.html:124
 msgid "No threads exist. Create the first one!"
 msgstr "Нет тем. Создайте первую!"
 
 #: templates/boards/posting_general.html:130
 msgid "Create new thread"
 msgstr "Создать новую тему"
 
 #: templates/boards/posting_general.html:135 templates/boards/preview.html:16
 #: templates/boards/thread_normal.html:44
 msgid "Post"
 msgstr "Отправить"
 
 #: templates/boards/posting_general.html:141
 msgid "Tags must be delimited by spaces. Text or image is required."
 msgstr ""
 "Метки должны быть разделены пробелами. Текст или изображение обязательны."
 
 #: templates/boards/posting_general.html:144
 #: templates/boards/thread_normal.html:50
 msgid "Text syntax"
 msgstr "Синтаксис текста"
 
 #: templates/boards/posting_general.html:156
 msgid "Pages:"
 msgstr "Страницы: "
 
-#: templates/boards/preview.html:6 templates/boards/staticpages/help.html:19
+#: templates/boards/preview.html:6 templates/boards/staticpages/help.html:20
 msgid "Preview"
 msgstr "Предпросмотр"
 
 #: templates/boards/rss/post.html:5
 msgid "Post image"
 msgstr "Изображение сообщения"
 
 #: templates/boards/settings.html:16
 msgid "You are moderator."
 msgstr "Вы модератор."
 
 #: templates/boards/settings.html:20
 msgid "Hidden tags:"
 msgstr "Скрытые метки:"
 
 #: templates/boards/settings.html:28
 msgid "No hidden tags."
 msgstr "Нет скрытых меток."
 
 #: templates/boards/settings.html:37
 msgid "Save"
 msgstr "Сохранить"
 
 #: templates/boards/staticpages/banned.html:6
 msgid "Banned"
 msgstr "Заблокирован"
 
 #: templates/boards/staticpages/banned.html:11
 msgid "Your IP address has been banned. Contact the administrator"
 msgstr "Ваш IP адрес был заблокирован. Свяжитесь с администратором"
 
 #: templates/boards/staticpages/help.html:6
 #: templates/boards/staticpages/help.html:10
 msgid "Syntax"
 msgstr "Синтаксис"
 
 #: templates/boards/staticpages/help.html:11
 msgid "Italic text"
 msgstr "Курсивный текст"
 
 #: templates/boards/staticpages/help.html:12
 msgid "Bold text"
 msgstr "Полужирный текст"
 
 #: templates/boards/staticpages/help.html:13
 msgid "Spoiler"
 msgstr "Спойлер"
 
 #: templates/boards/staticpages/help.html:14
 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:16
+#: templates/boards/staticpages/help.html:17
 msgid "Comment"
 msgstr "Комментарий"
 
-#: templates/boards/staticpages/help.html:17
+#: templates/boards/staticpages/help.html:18
 msgid "Quote"
 msgstr "Цитата"
 
-#: templates/boards/staticpages/help.html:19
+#: templates/boards/staticpages/help.html:20
 msgid "You can try pasting the text and previewing the result here:"
 msgstr "Вы можете попробовать вставить текст и проверить результат здесь:"
 
 #: templates/boards/tags.html:23
 msgid "No tags found."
 msgstr "Метки не найдены."
 
 #: templates/boards/thread.html:30
 msgid "Last update: "
 msgstr "Последнее обновление: "
 
 #: templates/boards/thread_gallery.html:20
 #: templates/boards/thread_normal.html:14
 msgid "Normal mode"
 msgstr "Нормальный режим"
 
 #: templates/boards/thread_gallery.html:21
 #: templates/boards/thread_normal.html:15
 msgid "Gallery mode"
 msgstr "Режим галереи"
 
 #: templates/boards/thread_gallery.html:51
 msgid "No images."
 msgstr "Нет изображений."
 
 #: templates/boards/thread_normal.html:23
 msgid "posts to bumplimit"
 msgstr "сообщений до бамплимита"
 
 #: templates/boards/thread_normal.html:37
 msgid "Reply to thread"
 msgstr "Ответить в тему"
 
 #: templates/boards/thread_normal.html:51
 msgid "Close form"
 msgstr "Закрыть форму"
 
 #: templates/boards/thread_normal.html:67
 msgid "Update"
 msgstr "Обновить"

boards/models/post.py

@@ -1,489 +1,476 b''
 from datetime import datetime, timedelta, date
 from datetime import time as dtime
 import logging
 import re
 
 from urllib.parse import unquote
 
 from adjacent import Client
 from django.core.exceptions import ObjectDoesNotExist
 from django.core.urlresolvers import reverse
 from django.db import models, transaction
 from django.db.models import TextField
 from django.template.loader import render_to_string
 from django.utils import timezone
 
 from boards import settings
 from boards.mdx_neboard import bbcode_extended
 from boards.models import PostImage
 from boards.models.base import Viewable
 from boards.utils import datetime_to_epoch, cached_result
 from boards.models.user import Notification
 import boards.models.thread
 
 
 WS_NOTIFICATION_TYPE_NEW_POST = 'new_post'
 WS_NOTIFICATION_TYPE = 'notification_type'
 
 WS_CHANNEL_THREAD = "thread:"
 
 APP_LABEL_BOARDS = 'boards'
 
 POSTS_PER_DAY_RANGE = 7
 
 BAN_REASON_AUTO = 'Auto'
 
 IMAGE_THUMB_SIZE = (200, 150)
 
 TITLE_MAX_LENGTH = 200
 
 # TODO This should be removed
 NO_IP = '0.0.0.0'
 
 # TODO Real user agent should be saved instead of this
 UNKNOWN_UA = ''
 
 REGEX_REPLY = re.compile(r'\[post\](\d+)\[/post\]')
 REGEX_MULTI_THREAD = re.compile(r'\[thread\](\d+)\[/thread\]')
 REGEX_URL = re.compile(r'https?\://[a-zA-Z0-9\-\.]+\.[a-zA-Z]{2,3}(/\S*)?')
 REGEX_NOTIFICATION = re.compile(r'\[user\](\w+)\[/user\]')
 
 PARAMETER_TRUNCATED = 'truncated'
 PARAMETER_TAG = 'tag'
 PARAMETER_OFFSET = 'offset'
 PARAMETER_DIFF_TYPE = 'type'
 PARAMETER_BUMPABLE = 'bumpable'
 PARAMETER_THREAD = 'thread'
 PARAMETER_IS_OPENING = 'is_opening'
 PARAMETER_MODERATOR = 'moderator'
 PARAMETER_POST = 'post'
 PARAMETER_OP_ID = 'opening_post_id'
 PARAMETER_NEED_OPEN_LINK = 'need_open_link'
 PARAMETER_REPLY_LINK = 'reply_link'
 
 DIFF_TYPE_HTML = 'html'
 DIFF_TYPE_JSON = 'json'
 
 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"
     r'\B@(\w+)': r'[user]\1[/user]',  # User notification "@user"
 }
 
 
 class PostManager(models.Manager):
     @transaction.atomic
     def create_post(self, title: str, text: str, image=None, thread=None,
                     ip=NO_IP, tags: list=None):
         """
         Creates new post
         """
 
         if not tags:
             tags = []
 
         posting_time = timezone.now()
         if not thread:
             thread = boards.models.thread.Thread.objects.create(
-                    bump_time=posting_time, last_edit_time=posting_time)
+                bump_time=posting_time, last_edit_time=posting_time)
             new_thread = True
         else:
             new_thread = False
 
         pre_text = self._preparse_text(text)
 
         post = self.create(title=title,
                            text=pre_text,
                            pub_time=posting_time,
                            poster_ip=ip,
                            thread=thread,
                            poster_user_agent=UNKNOWN_UA,  # TODO Get UA at
                            # last!
                            last_edit_time=posting_time)
         post.threads.add(thread)
 
         logger = logging.getLogger('boards.post.create')
 
         logger.info('Created post {} by {}'.format(
             post, post.poster_ip))
 
         if image:
             post.images.add(PostImage.objects.create_with_hash(image))
 
         list(map(thread.add_tag, tags))
 
         if new_thread:
             boards.models.thread.Thread.objects.process_oldest_threads()
         else:
             thread.last_edit_time = posting_time
             thread.bump()
             thread.save()
 
         post.connect_replies()
         post.connect_threads()
         post.connect_notifications()
 
         return post
 
     def delete_posts_by_ip(self, ip):
         """
         Deletes all posts of the author with same IP
         """
 
         posts = self.filter(poster_ip=ip)
         for post in posts:
             post.delete()
 
     @cached_result
     def get_posts_per_day(self):
         """
         Gets average count of posts per day for the last 7 days
         """
 
         day_end = date.today()
         day_start = day_end - timedelta(POSTS_PER_DAY_RANGE)
 
         day_time_start = timezone.make_aware(datetime.combine(
             day_start, dtime()), timezone.get_current_timezone())
         day_time_end = timezone.make_aware(datetime.combine(
             day_end, dtime()), timezone.get_current_timezone())
 
         posts_per_period = float(self.filter(
             pub_time__lte=day_time_end,
             pub_time__gte=day_time_start).count())
 
         ppd = posts_per_period / POSTS_PER_DAY_RANGE
 
         return ppd
     
     # TODO Make a separate parser module and move preparser there
     def _preparse_text(self, text: str) -> str:
         """
         Preparses text to change patterns like '>>' to a proper bbcode
         tags.
         """
 
         for key, value in PREPARSE_PATTERNS.items():
             text = re.sub(key, value, text, flags=re.MULTILINE)
 
         for link in REGEX_URL.findall(text):
             text = text.replace(link, unquote(link))
 
         return text
 
 
 class Post(models.Model, Viewable):
     """A post is a message."""
 
     objects = PostManager()
 
     class Meta:
         app_label = APP_LABEL_BOARDS
         ordering = ('id',)
 
     title = models.CharField(max_length=TITLE_MAX_LENGTH)
     pub_time = models.DateTimeField()
     text = TextField(blank=True, null=True)
     _text_rendered = TextField(blank=True, null=True, editable=False)
 
     images = models.ManyToManyField(PostImage, null=True, blank=True,
                                     related_name='ip+', db_index=True)
 
     poster_ip = models.GenericIPAddressField()
     poster_user_agent = models.TextField()
 
     last_edit_time = models.DateTimeField()
 
     referenced_posts = models.ManyToManyField('Post', symmetrical=False,
                                               null=True,
                                               blank=True, related_name='rfp+',
                                               db_index=True)
     refmap = models.TextField(null=True, blank=True)
     threads = models.ManyToManyField('Thread', db_index=True)
     thread = models.ForeignKey('Thread', db_index=True, related_name='pt+')
 
     def __str__(self):
         return 'P#{}/{}'.format(self.id, self.title)
 
     def get_title(self) -> str:
         """
         Gets original post title or part of its text.
         """
 
         title = self.title
         if not title:
             title = self.get_text()
 
         return title
 
     def build_refmap(self) -> None:
         """
         Builds a replies map string from replies list. This is a cache to stop
         the server from recalculating the map on every post show.
         """
-        map_string = ''
 
         post_urls = ['<a href="{}">&gt;&gt;{}</a>'.format(
-                refpost.get_url(), refpost.id) for refpost in self.referenced_posts.all()]
+            refpost.get_url(), refpost.id) for refpost in self.referenced_posts.all()]
 
         self.refmap = ', '.join(post_urls)
 
     def get_sorted_referenced_posts(self):
         return self.refmap
 
     def is_referenced(self) -> bool:
         return self.refmap and len(self.refmap) > 0
 
     def is_opening(self) -> bool:
         """
         Checks if this is an opening post or just a reply.
         """
 
         return self.get_thread().get_opening_post_id() == self.id
 
-    @transaction.atomic
-    def add_tag(self, tag):
-        edit_time = timezone.now()
-
-        thread = self.get_thread()
-        thread.add_tag(tag)
-        self.last_edit_time = edit_time
-        self.save(update_fields=['last_edit_time'])
-
-        thread.last_edit_time = edit_time
-        thread.save(update_fields=['last_edit_time'])
-
     @cached_result
     def get_url(self):
         """
         Gets full url to the post.
         """
 
         thread = self.get_thread()
 
         opening_id = thread.get_opening_post_id()
 
         if self.id != opening_id:
             link = reverse('thread', kwargs={
                 'post_id': opening_id}) + '#' + str(self.id)
         else:
             link = reverse('thread', kwargs={'post_id': self.id})
 
         return link
 
     def get_thread(self):
         return self.thread
 
     def get_threads(self):
         """
         Gets post's thread.
         """
 
         return self.threads
 
     def get_referenced_posts(self):
         return self.referenced_posts.only('id', 'threads')
 
     def get_view(self, moderator=False, need_open_link=False,
                  truncated=False, *args, **kwargs):
         """
         Renders post's HTML view. Some of the post params can be passed over
         kwargs for the means of caching (if we view the thread, some params
         are same for every post and don't need to be computed over and over.
         """
 
         thread = self.get_thread()
         is_opening = kwargs.get(PARAMETER_IS_OPENING, self.is_opening())
         can_bump = kwargs.get(PARAMETER_BUMPABLE, thread.can_bump())
 
         if is_opening:
             opening_post_id = self.id
         else:
             opening_post_id = thread.get_opening_post_id()
 
         return render_to_string('boards/post.html', {
             PARAMETER_POST: self,
             PARAMETER_MODERATOR: moderator,
             PARAMETER_IS_OPENING: is_opening,
             PARAMETER_THREAD: thread,
             PARAMETER_BUMPABLE: can_bump,
             PARAMETER_NEED_OPEN_LINK: need_open_link,
             PARAMETER_TRUNCATED: truncated,
             PARAMETER_OP_ID: opening_post_id,
         })
 
     def get_search_view(self, *args, **kwargs):
         return self.get_view(args, kwargs)
 
     def get_first_image(self) -> PostImage:
         return self.images.earliest('id')
 
     def delete(self, using=None):
         """
         Deletes all post images and the post itself.
         """
 
         for image in self.images.all():
             image_refs_count = Post.objects.filter(images__in=[image]).count()
             if image_refs_count == 1:
                 image.delete()
 
         thread = self.get_thread()
         thread.last_edit_time = timezone.now()
         thread.save()
 
         super(Post, self).delete(using)
 
         logging.getLogger('boards.post.delete').info(
             'Deleted post {}'.format(self))
 
     def get_post_data(self, format_type=DIFF_TYPE_JSON, request=None,
                       include_last_update=False):
         """
         Gets post HTML or JSON data that can be rendered on a page or used by
         API.
         """
 
         if format_type == DIFF_TYPE_HTML:
             params = dict()
             params['post'] = self
             if PARAMETER_TRUNCATED in request.GET:
                 params[PARAMETER_TRUNCATED] = True
             else:
                 params[PARAMETER_REPLY_LINK] = True
 
             return render_to_string('boards/api_post.html', params)
         elif format_type == DIFF_TYPE_JSON:
             post_json = {
                 'id': self.id,
                 'title': self.title,
                 'text': self._text_rendered,
                 }
             if self.images.exists():
                 post_image = self.get_first_image()
                 post_json['image'] = post_image.image.url
                 post_json['image_preview'] = post_image.image.url_200x150
             if include_last_update:
                 post_json['bump_time'] = datetime_to_epoch(
                     self.get_thread().bump_time)
             return post_json
 
     def send_to_websocket(self, request, recursive=True):
         """
         Sends post HTML data to the thread web socket.
         """
 
         if not settings.WEBSOCKETS_ENABLED:
             return
 
         client = Client()
 
         logger = logging.getLogger('boards.post.websocket')
 
         thread_ids = list()
         for thread in self.get_threads().all():
             thread_ids.append(thread.id)
 
             channel_name = WS_CHANNEL_THREAD + str(thread.get_opening_post_id())
             client.publish(channel_name, {
                 WS_NOTIFICATION_TYPE: WS_NOTIFICATION_TYPE_NEW_POST,
             })
             client.send()
 
             logger.info('Sent notification from post #{} to channel {}'.format(
                 self.id, channel_name))
 
         if recursive:
             for reply_number in re.finditer(REGEX_REPLY, self.get_raw_text()):
                 post_id = reply_number.group(1)
 
                 try:
                     ref_post = Post.objects.get(id=post_id)
 
                     if ref_post.get_threads().exclude(id__in=thread_ids).exists():
                         # If post is in this thread, its thread was already notified.
                         # Otherwise, notify its thread separately.
                         ref_post.send_to_websocket(request, recursive=False)
                 except ObjectDoesNotExist:
                     pass
 
     def save(self, force_insert=False, force_update=False, using=None,
              update_fields=None):
         self._text_rendered = bbcode_extended(self.get_raw_text())
 
         super().save(force_insert, force_update, using, update_fields)
 
     def get_text(self) -> str:
         return self._text_rendered
 
     def get_raw_text(self) -> str:
         return self.text
 
     def get_absolute_id(self) -> str:
         """
         If the post has many threads, shows its main thread OP id in the post
         ID.
         """
 
         if self.get_threads().count() > 1:
             return '{}/{}'.format(self.get_thread().get_opening_post_id(), self.id)
         else:
             return str(self.id)
 
     def connect_notifications(self):
         for reply_number in re.finditer(REGEX_NOTIFICATION, self.get_raw_text()):
             user_name = reply_number.group(1).lower()
             Notification.objects.get_or_create(name=user_name, post=self)
 
     def connect_replies(self):
         """
         Connects replies to a post to show them as a reflink map
         """
 
         for reply_number in re.finditer(REGEX_REPLY, self.get_raw_text()):
             post_id = reply_number.group(1)
 
             try:
                 referenced_post = Post.objects.get(id=post_id)
 
                 referenced_post.referenced_posts.add(self)
                 referenced_post.last_edit_time = self.pub_time
                 referenced_post.build_refmap()
                 referenced_post.save(update_fields=['refmap', 'last_edit_time'])
 
                 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'])
             except ObjectDoesNotExist:
                 pass
 
     def connect_threads(self):
         """
         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)
 
                 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'])
 
                         self.threads.add(thread)
             except ObjectDoesNotExist:
                 pass

boards/templates/boards/staticpages/help.html

@@ -1,20 +1,21 b''
 {% extends "boards/static_base.html" %}
 
 {% load i18n %}
 
 {% block head %}
     <title>{% trans "Syntax" %}</title>
 {% endblock %}
 
 {% block staticcontent %}
     <h2>{% trans 'Syntax' %}</h2>
     <p>[i]<i>{% trans 'Italic text' %}</i>[/i]</p>
     <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>[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="multiquote">{% trans 'Quote' %}</span>[/quote]</p>
     <br/>
     <p>{% trans 'You can try pasting the text and previewing the result here:' %} <a href="{% url 'preview' %}">{% trans 'Preview' %}</a></p>
 {% endblock %}