Merged with default branch

boards/migrations/0026_post_opening.py

@@ -0,0 +1,20 b''
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('boards', '0025_auto_20150825_2049'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='post',
+            name='opening',
+            field=models.BooleanField(default=False),
+            preserve_default=False,
+        ),
+    ]

boards/migrations/0027_auto_20150912_1632.py

@@ -0,0 +1,22 b''
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    def build_opening_flag(apps, schema_editor):
+        Post = apps.get_model('boards', 'Post')
+        for post in Post.objects.all():
+            op = Post.objects.filter(threads__in=[post.thread]).order_by('pub_time').first()
+            post.opening = op.id == post.id
+            post.save(update_fields=['opening'])
+
+    dependencies = [
+        ('boards', '0026_post_opening'),
+    ]
+
+    operations = [
+        migrations.RunPython(build_opening_flag),
+    ]

boards/migrations/0028_auto_20150928_2211.py

@@ -0,0 +1,19 b''
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('boards', '0027_auto_20150912_1632'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='post',
+            name='threads',
+            field=models.ManyToManyField(to='boards.Thread', related_name='multi_replies', db_index=True),
+        ),
+    ]

boards/migrations/0029_tag_parent.py

@@ -0,0 +1,19 b''
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('boards', '0028_auto_20150928_2211'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='tag',
+            name='parent',
+            field=models.ForeignKey(to='boards.Tag', null=True),
+        ),
+    ]

boards/migrations/0030_auto_20150929_1816.py

@@ -0,0 +1,19 b''
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('boards', '0029_tag_parent'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='tag',
+            name='parent',
+            field=models.ForeignKey(related_name='children', null=True, to='boards.Tag'),
+        ),
+    ]

boards/migrations/0031_merge.py

@@ -0,0 +1,15 b''
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('boards', '0030_auto_20150929_1816'),
+        ('boards', '0026_auto_20150830_2006'),
+    ]
+
+    operations = [
+    ]

boards/models/attachment/downloaders.py

@@ -0,0 +1,66 b''
+import os
+import re
+
+from django.core.files.uploadedfile import SimpleUploadedFile
+from pytube import YouTube
+import requests
+
+from boards.utils import validate_file_size
+
+YOUTUBE_VIDEO_FORMAT = 'webm'
+
+HTTP_RESULT_OK = 200
+
+HEADER_CONTENT_LENGTH = 'content-length'
+HEADER_CONTENT_TYPE = 'content-type'
+
+FILE_DOWNLOAD_CHUNK_BYTES = 100000
+
+YOUTUBE_URL = re.compile(r'https?://www\.youtube\.com/watch\?v=\w+')
+
+
+class Downloader:
+    @staticmethod
+    def handles(url: str) -> bool:
+        return False
+
+    @staticmethod
+    def download(url: str):
+        # Verify content headers
+        response_head = requests.head(url, verify=False)
+        content_type = response_head.headers[HEADER_CONTENT_TYPE].split(';')[0]
+        length_header = response_head.headers.get(HEADER_CONTENT_LENGTH)
+        if length_header:
+            length = int(length_header)
+            validate_file_size(length)
+        # Get the actual content into memory
+        response = requests.get(url, verify=False, stream=True)
+
+        # Download file, stop if the size exceeds limit
+        size = 0
+        content = b''
+        for chunk in response.iter_content(FILE_DOWNLOAD_CHUNK_BYTES):
+            size += len(chunk)
+            validate_file_size(size)
+            content += chunk
+
+        if response.status_code == HTTP_RESULT_OK and content:
+            # Set a dummy file name that will be replaced
+            # anyway, just keep the valid extension
+            filename = 'file.' + content_type.split('/')[1]
+            return SimpleUploadedFile(filename, content, content_type)
+
+
+class YouTubeDownloader(Downloader):
+    @staticmethod
+    def download(url: str):
+        yt = YouTube()
+        yt.from_url(url)
+        videos = yt.filter(YOUTUBE_VIDEO_FORMAT)
+        if len(videos) > 0:
+            video = videos[0]
+            return Downloader.download(video.url)
+
+    @staticmethod
+    def handles(url: str) -> bool:
+        return YOUTUBE_URL.match(url)

.hgtags

@@ -34,3 +34,4 b' dfb6c481b1a2c33705de9a9b5304bc924c46b202'
 4a5bec08ccfb47a27f9e98698f12dd5b7246623b 2.8.2
 604935b98f5b5e4a5e903594f048046e1fbb3519 2.8.3
 c48ffdc671566069ed0f33644da1229277f3cd18 2.9.0
+d66dc192d4e089ba85325afeef5229b73cb0fde4 2.10.0

boards/abstracts/settingsmanager.py

@@ -1,4 +1,5 b''
 from boards.models import Tag
+from boards.models.thread import FAV_THREAD_NO_UPDATES
 
 MAX_TRIPCODE_COLLISIONS = 50
 
@@ -11,6 +12,7 b" PERMISSION_MODERATE = 'moderator'"
 
 SETTING_THEME = 'theme'
 SETTING_FAVORITE_TAGS = 'favorite_tags'
+SETTING_FAVORITE_THREADS = 'favorite_threads'
 SETTING_HIDDEN_TAGS = 'hidden_tags'
 SETTING_PERMISSIONS = 'permissions'
 SETTING_USERNAME = 'username'
@@ -118,6 +120,28 b' class SettingsManager:'
             tags.remove(tag.name)
             self.set_setting(SETTING_HIDDEN_TAGS, tags)
 
+    def get_fav_threads(self) -> dict:
+        return self.get_setting(SETTING_FAVORITE_THREADS, default=dict())
+
+    def add_or_read_fav_thread(self, opening_post):
+        threads = self.get_fav_threads()
+        thread = opening_post.get_thread()
+        # Don't check for new posts if the thread is archived already
+        if thread.is_archived():
+            last_id = FAV_THREAD_NO_UPDATES
+        else:
+            last_id = thread.get_replies().last().id
+        threads[str(opening_post.id)] = last_id
+        self.set_setting(SETTING_FAVORITE_THREADS, threads)
+
+    def del_fav_thread(self, opening_post):
+        threads = self.get_fav_threads()
+        if self.thread_is_fav(opening_post):
+            del threads[str(opening_post.id)]
+            self.set_setting(SETTING_FAVORITE_THREADS, threads)
+
+    def thread_is_fav(self, opening_post):
+        return str(opening_post.id) in self.get_fav_threads()
 
 class SessionSettingsManager(SettingsManager):
     """

boards/admin.py

@@ -30,7 +30,10 b' class TagAdmin(admin.ModelAdmin):'
     def thread_count(self, obj: Tag) -> int:
         return obj.get_thread_count()
 
-    list_display = ('name', 'thread_count')
+    def display_children(self, obj: Tag):
+        return ', '.join([str(child) for child in obj.get_children().all()])
+
+    list_display = ('name', 'thread_count', 'display_children')
     search_fields = ('name',)
 
 
@@ -46,7 +49,14 b' class ThreadAdmin(admin.ModelAdmin):'
     def ip(self, obj: Thread):
         return obj.get_opening_post().poster_ip
 
-    list_display = ('id', 'title', 'reply_count', 'archived', 'ip')
+    def display_tags(self, obj: Thread):
+        return ', '.join([str(tag) for tag in obj.get_tags().all()])
+
+    def op(self, obj: Thread):
+        return obj.get_opening_post_id()
+
+    list_display = ('id', 'op', 'title', 'reply_count', 'archived', 'ip',
+            'display_tags')
     list_filter = ('bump_time', 'archived', 'bumpable')
     search_fields = ('id', 'title')
     filter_horizontal = ('tags',)

boards/config/default_settings.ini

@@ -1,5 +1,5 b''
 [Version]
-Version = 2.9.0 Claire
+Version = 2.10.0 BT
 SiteName = Neboard DEV
 
 [Cache]

boards/context_processors.py

@@ -19,6 +19,7 b" CONTEXT_NEW_NOTIFICATIONS_COUNT = 'new_n"
 CONTEXT_USERNAME = 'username'
 CONTEXT_TAGS_STR = 'tags_str'
 CONTEXT_IMAGE_VIEWER = 'image_viewer'
+CONTEXT_HAS_FAV_THREADS = 'has_fav_threads'
 
 
 def get_notifications(context, request):
@@ -43,6 +44,7 b' def user_and_ui_processor(request):'
     settings_manager = get_settings_manager(request)
     fav_tags = settings_manager.get_fav_tags()
     context[CONTEXT_TAGS] = fav_tags
+
     context[CONTEXT_TAGS_STR] = Tag.objects.get_tag_url_list(fav_tags)
     theme = settings_manager.get_theme()
     context[CONTEXT_THEME] = theme
@@ -58,6 +60,9 b' def user_and_ui_processor(request):'
         SETTING_IMAGE_VIEWER,
         default=settings.get('View', 'DefaultImageViewer'))
 
+    context[CONTEXT_HAS_FAV_THREADS] =\
+        len(settings_manager.get_fav_threads()) > 0
+
     get_notifications(context, request)
 
     return context

boards/forms.py

@@ -7,19 +7,17 b' 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 django.utils.translation import ugettext_lazy as _, ungettext_lazy
 
 from boards.mdx_neboard import formatters
+from boards.models.attachment.downloaders import Downloader
 from boards.models.post import TITLE_MAX_LENGTH
 from boards.models import Tag, Post
+from boards.utils import validate_file_size
 from neboard import settings
 import boards.settings as board_settings
 import neboard
 
-HEADER_CONTENT_LENGTH = 'content-length'
-HEADER_CONTENT_TYPE = 'content-type'
-
 REGEX_TAGS = re.compile(r'^[\w\s\d]+$', re.UNICODE)
 
 VETERAN_POSTING_DELAY = 5
@@ -37,14 +35,11 b" LABEL_TEXT = _('Text')"
 LABEL_TAG = _('Tag')
 LABEL_SEARCH = _('Search')
 
-ERROR_SPEED = _('Please wait %s seconds before sending message')
+ERROR_SPEED = 'Please wait %(delay)d second before sending message'
+ERROR_SPEED_PLURAL = 'Please wait %(delay)d seconds before sending message'
 
 TAG_MAX_LENGTH = 20
 
-FILE_DOWNLOAD_CHUNK_BYTES = 100000
-
-HTTP_RESULT_OK = 200
-
 TEXTAREA_ROWS = 4
 
 
@@ -182,7 +177,7 b' class PostForm(NeboardForm):'
         file = self.cleaned_data['file']
 
         if file:
-            self.validate_file_size(file.size)
+            validate_file_size(file.size)
 
         return file
 
@@ -196,7 +191,7 b' class PostForm(NeboardForm):'
             if not file:
                 raise forms.ValidationError(_('Invalid URL'))
             else:
-                self.validate_file_size(file.size)
+                validate_file_size(file.size)
 
         return file
 
@@ -272,9 +267,8 b' class PostForm(NeboardForm):'
             now = time.time()
 
             current_delay = 0
-            need_delay = False
 
-            if not LAST_POST_TIME in self.session:
+            if LAST_POST_TIME not in self.session:
                 self.session[LAST_POST_TIME] = now
 
                 need_delay = True
@@ -285,8 +279,9 b' class PostForm(NeboardForm):'
                 need_delay = current_delay < posting_delay
 
             if need_delay:
-                error_message = ERROR_SPEED % str(posting_delay
-                        - current_delay)
+                delay = posting_delay - current_delay
+                error_message = ungettext_lazy(ERROR_SPEED, ERROR_SPEED_PLURAL,
+                                               delay) % {'delay': delay}
                 self._errors['text'] = self.error_class([error_message])
 
                 can_post = False
@@ -294,13 +289,6 b' class PostForm(NeboardForm):'
             if can_post:
                 self.session[LAST_POST_TIME] = now
 
-    def validate_file_size(self, size: int):
-        max_size = board_settings.get_int('Forms', 'MaxFileSize')
-        if size > max_size:
-            raise forms.ValidationError(
-                _('File must be less than %s bytes')
-                % str(max_size))
-
     def _get_file_from_url(self, url: str) -> SimpleUploadedFile:
         """
         Gets an file file from URL.
@@ -309,36 +297,18 b' class PostForm(NeboardForm):'
         img_temp = None
 
         try:
-            # Verify content headers
-            response_head = requests.head(url, verify=False)
-            content_type = response_head.headers[HEADER_CONTENT_TYPE].split(';')[0]
-            length_header = response_head.headers.get(HEADER_CONTENT_LENGTH)
-            if length_header:
-                length = int(length_header)
-                self.validate_file_size(length)
-            # Get the actual content into memory
-            response = requests.get(url, verify=False, stream=True)
-
-            # Download file, stop if the size exceeds limit
-            size = 0
-            content = b''
-            for chunk in response.iter_content(FILE_DOWNLOAD_CHUNK_BYTES):
-                size += len(chunk)
-                self.validate_file_size(size)
-                content += chunk
-
-            if response.status_code == HTTP_RESULT_OK and content:
-                # Set a dummy file name that will be replaced
-                # anyway, just keep the valid extension
-                filename = 'file.' + content_type.split('/')[1]
-                img_temp = SimpleUploadedFile(filename, content,
-                                              content_type)
+            for downloader in Downloader.__subclasses__():
+                if downloader.handles(url):
+                    return downloader.download(url)
+            # If nobody of the specific downloaders handles this, use generic
+            # one
+            return Downloader.download(url)
+        except forms.ValidationError as e:
+            raise e
         except Exception as e:
             # Just return no file
             pass
 
-        return img_temp
-
 
 class ThreadForm(PostForm):
 
@@ -354,20 +324,27 b' class ThreadForm(PostForm):'
                 _('Inappropriate characters in tags.'))
 
         required_tag_exists = False
-        for tag in tags.split():
-            try:
-                Tag.objects.get(name=tag.strip().lower(), required=True)
+        tag_set = set()
+        for tag_string in tags.split():
+            tag, created = Tag.objects.get_or_create(name=tag_string.strip().lower())
+            tag_set.add(tag)
+
+            # If this is a new tag, don't check for its parents because nobody
+            # added them yet
+            if not created:
+                tag_set |= tag.get_all_parents()
+
+        for tag in tag_set:
+            if tag.required:
                 required_tag_exists = True
                 break
-            except ObjectDoesNotExist:
-                pass
 
         if not required_tag_exists:
             all_tags = Tag.objects.filter(required=True)
             raise forms.ValidationError(
                 _('Need at least one section.'))
 
-        return tags
+        return tag_set
 
     def clean(self):
         cleaned_data = super(ThreadForm, 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-08-22 15:07+0300\n"
+"POT-Creation-Date: 2015-09-12 12:48+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,114 +38,99 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:31
+#: forms.py:30
 msgid "Type message here. Use formatting panel for more advanced usage."
 msgstr ""
 "Вводите сообщение сюда. Используйте панель для более сложного форматирования."
 
-#: forms.py:32
+#: forms.py:31
 msgid "music images i_dont_like_tags"
 msgstr "музыка картинки теги_не_нужны"
 
-#: forms.py:34
+#: forms.py:33
 msgid "Title"
 msgstr "Заголовок"
 
-#: forms.py:35
+#: forms.py:34
 msgid "Text"
 msgstr "Текст"
 
-#: forms.py:36
+#: forms.py:35
 msgid "Tag"
 msgstr "Метка"
 
-#: forms.py:37 templates/boards/base.html:40 templates/search/search.html:7
+#: forms.py:36 templates/boards/base.html:40 templates/search/search.html:7
 msgid "Search"
 msgstr "Поиск"
 
-#: forms.py:39
-#, python-format
-msgid "Please wait %s seconds before sending message"
-msgstr "Пожалуйста подождите %s секунд перед отправкой сообщения"
-
-#: forms.py:140
+#: forms.py:139
 msgid "File"
 msgstr "Файл"
 
-#: forms.py:143
+#: forms.py:142
 msgid "File URL"
 msgstr "URL файла"
 
-#: forms.py:149
+#: forms.py:148
 msgid "e-mail"
 msgstr ""
 
-#: forms.py:152
+#: forms.py:151
 msgid "Additional threads"
 msgstr "Дополнительные темы"
 
-#: forms.py:155
-msgid "Tripcode"
-msgstr "Трипкод"
-
-#: forms.py:164
+#: forms.py:162
 #, python-format
 msgid "Title must have less than %s characters"
 msgstr "Заголовок должен иметь меньше %s символов"
 
-#: forms.py:174
+#: forms.py:172
 #, python-format
 msgid "Text must have less than %s characters"
 msgstr "Текст должен быть короче %s символов"
 
-#: forms.py:194
+#: forms.py:192
 msgid "Invalid URL"
 msgstr "Неверный URL"
 
-#: forms.py:215
+#: forms.py:213
 msgid "Invalid additional thread list"
 msgstr "Неверный список дополнительных тем"
 
-#: forms.py:251
+#: forms.py:258
 msgid "Either text or file must be entered."
 msgstr "Текст или файл должны быть введены."
 
-#: forms.py:289
-#, python-format
-msgid "File must be less than %s bytes"
-msgstr "Файл должен быть менее %s байт"
-
-#: forms.py:335 templates/boards/all_threads.html:154
+#: forms.py:317 templates/boards/all_threads.html:148
 #: templates/boards/rss/post.html:10 templates/boards/tags.html:6
 msgid "Tags"
 msgstr "Метки"
 
-#: forms.py:342
+#: forms.py:324
 msgid "Inappropriate characters in tags."
 msgstr "Недопустимые символы в метках."
 
-#: forms.py:356
+#: forms.py:338
 msgid "Need at least one section."
 msgstr "Нужен хотя бы один раздел."
 
-#: forms.py:368
+#: forms.py:350
 msgid "Theme"
 msgstr "Тема"
 
-#: forms.py:369
-#| msgid "Image view mode"
+#: forms.py:351
 msgid "Image view mode"
 msgstr "Режим просмотра изображений"
 
-#: forms.py:370
+#: forms.py:352
 msgid "User name"
 msgstr "Имя пользователя"
 
-#: forms.py:371
+#: forms.py:353
 msgid "Time zone"
 msgstr "Часовой пояс"
 
-#: forms.py:377
+#: forms.py:359
 msgid "Inappropriate characters."
 msgstr "Недопустимые символы."
 
@@ -161,11 +146,11 b' msgstr "\xd0\xad\xd1\x82\xd0\xbe\xd0\xb9 \xd1\x81\xd1\x82\xd1\x80\xd0\xb0\xd0\xbd\xd0\xb8\xd1\x86\xd1\x8b \xd0\xbd\xd0\xb5 \xd1\x81\xd1\x83\xd1\x89\xd0\xb5\xd1\x81\xd1\x82\xd0\xb2\xd1\x83\xd0\xb5\xd1\x82"'
 msgid "Related message"
 msgstr "Связанное сообщение"
 
-#: templates/boards/all_threads.html:71
+#: templates/boards/all_threads.html:69
 msgid "Edit tag"
 msgstr "Изменить метку"
 
-#: templates/boards/all_threads.html:79
+#: templates/boards/all_threads.html:75
 #, python-format
 msgid ""
 "This tag has %(thread_count)s threads (%(active_thread_count)s active) and "
@@ -174,54 +159,61 b' msgstr ""'
 "С этой меткой есть %(thread_count)s тем (%(active_thread_count)s активных) и "
 "%(post_count)s сообщений."
 
-#: templates/boards/all_threads.html:81
+#: templates/boards/all_threads.html:77
 msgid "Related tags:"
 msgstr "Похожие метки:"
 
-#: templates/boards/all_threads.html:96 templates/boards/feed.html:30
+#: templates/boards/all_threads.html:90 templates/boards/feed.html:30
 #: templates/boards/notifications.html:17 templates/search/search.html:26
 msgid "Previous page"
 msgstr "Предыдущая страница"
 
-#: templates/boards/all_threads.html:110
+#: templates/boards/all_threads.html:104
 #, python-format
-msgid "Skipped %(count)s replies. Open thread to see all replies."
-msgstr "Пропущено %(count)s ответов. Откройте тред, чтобы увидеть все ответы."
+#| msgid "Skipped %(count)s replies. Open thread to see all replies."
+msgid "Skipped %(count)s reply. Open thread to see all replies."
+msgid_plural "Skipped %(count)s replies. Open thread to see all replies."
+msgstr[0] ""
+"Пропущен %(count)s ответ. Откройте тред, чтобы увидеть все ответы."
+msgstr[1] ""
+"Пропущено %(count)s ответа. Откройте тред, чтобы увидеть все ответы."
+msgstr[2] ""
+"Пропущено %(count)s ответов. Откройте тред, чтобы увидеть все ответы."
 
-#: templates/boards/all_threads.html:128 templates/boards/feed.html:40
+#: templates/boards/all_threads.html:122 templates/boards/feed.html:40
 #: templates/boards/notifications.html:27 templates/search/search.html:37
 msgid "Next page"
 msgstr "Следующая страница"
 
-#: templates/boards/all_threads.html:133
+#: templates/boards/all_threads.html:127
 msgid "No threads exist. Create the first one!"
 msgstr "Нет тем. Создайте первую!"
 
-#: templates/boards/all_threads.html:139
+#: templates/boards/all_threads.html:133
 msgid "Create new thread"
 msgstr "Создать новую тему"
 
-#: templates/boards/all_threads.html:144 templates/boards/preview.html:16
-#: templates/boards/thread_normal.html:38
+#: templates/boards/all_threads.html:138 templates/boards/preview.html:16
+#: templates/boards/thread_normal.html:51
 msgid "Post"
 msgstr "Отправить"
 
-#: templates/boards/all_threads.html:149
+#: templates/boards/all_threads.html:139 templates/boards/preview.html:6
+#: templates/boards/staticpages/help.html:21
+#: templates/boards/thread_normal.html:52
+msgid "Preview"
+msgstr "Предпросмотр"
+
+#: templates/boards/all_threads.html:144
 msgid "Tags must be delimited by spaces. Text or image is required."
 msgstr ""
 "Метки должны быть разделены пробелами. Текст или изображение обязательны."
 
-#: templates/boards/all_threads.html:151 templates/boards/preview.html:6
-#: templates/boards/staticpages/help.html:21
-#: templates/boards/thread_normal.html:42
-msgid "Preview"
-msgstr "Предпросмотр"
-
-#: templates/boards/all_threads.html:153 templates/boards/thread_normal.html:45
+#: templates/boards/all_threads.html:147 templates/boards/thread_normal.html:58
 msgid "Text syntax"
 msgstr "Синтаксис текста"
 
-#: templates/boards/all_threads.html:167 templates/boards/feed.html:53
+#: templates/boards/all_threads.html:161 templates/boards/feed.html:53
 msgid "Pages:"
 msgstr "Страницы: "
 
@@ -286,16 +278,16 b' msgstr "\xd0\xa3\xd0\xb2\xd0\xb5\xd0\xb4\xd0\xbe\xd0\xbc\xd0\xbb\xd0\xb5\xd0\xbd\xd0\xb8\xd1\x8f"'
 msgid "Settings"
 msgstr "Настройки"
 
-#: templates/boards/base.html:66
+#: templates/boards/base.html:79
 msgid "Admin"
 msgstr "Администрирование"
 
-#: templates/boards/base.html:68
+#: templates/boards/base.html:81
 #, python-format
 msgid "Speed: %(ppd)s posts per day"
 msgstr "Скорость: %(ppd)s сообщений в день"
 
-#: templates/boards/base.html:70
+#: templates/boards/base.html:83
 msgid "Up"
 msgstr "Вверх"
 
@@ -303,37 +295,52 b' msgstr "\xd0\x92\xd0\xb2\xd0\xb5\xd1\x80\xd1\x85"'
 msgid "No posts exist. Create the first one!"
 msgstr "Нет сообщений. Создайте первое!"
 
-#: templates/boards/post.html:30
+#: templates/boards/post.html:32
 msgid "Open"
 msgstr "Открыть"
 
-#: templates/boards/post.html:32 templates/boards/post.html.py:43
+#: templates/boards/post.html:34 templates/boards/post.html.py:45
 msgid "Reply"
 msgstr "Ответить"
 
-#: templates/boards/post.html:38
+#: templates/boards/post.html:40
 msgid " in "
 msgstr " в "
 
-#: templates/boards/post.html:48
+#: templates/boards/post.html:50
 msgid "Edit"
 msgstr "Изменить"
 
-#: templates/boards/post.html:50
+#: templates/boards/post.html:52
 msgid "Edit thread"
 msgstr "Изменить тему"
 
-#: templates/boards/post.html:97
+#: templates/boards/post.html:94
 msgid "Replies"
 msgstr "Ответы"
 
-#: templates/boards/post.html:109 templates/boards/thread.html:34
-msgid "messages"
-msgstr "сообщений"
+#: templates/boards/post.html:105
+#, python-format
+msgid "%(count)s message"
+msgid_plural "%(count)s messages"
+msgstr[0] "%(count)s сообщение"
+msgstr[1] "%(count)s сообщения"
+msgstr[2] "%(count)s сообщений"
 
-#: templates/boards/post.html:110 templates/boards/thread.html:35
-msgid "images"
-msgstr "изображений"
+#, python-format
+msgid "Please wait %(delay)d second before sending message"
+msgid_plural "Please wait %(delay)d seconds before sending message"
+msgstr[0] "Пожалуйста подождите %(delay)d секунду перед отправкой сообщения"
+msgstr[1] "Пожалуйста подождите %(delay)d секунды перед отправкой сообщения"
+msgstr[2] "Пожалуйста подождите %(delay)d секунд перед отправкой сообщения"
+
+#: templates/boards/post.html:106
+#, python-format
+msgid "%(count)s image"
+msgid_plural "%(count)s images"
+msgstr[0] "%(count)s изображение"
+msgstr[1] "%(count)s изображения"
+msgstr[2] "%(count)s изображений"
 
 #: templates/boards/rss/post.html:5
 msgid "Post image"
@@ -347,19 +354,11 b' msgstr "\xd0\x92\xd1\x8b \xd0\xbc\xd0\xbe\xd0\xb4\xd0\xb5\xd1\x80\xd0\xb0\xd1\x82\xd0\xbe\xd1\x80."'
 msgid "Hidden tags:"
 msgstr "Скрытые метки:"
 
-#: templates/boards/settings.html:27
+#: templates/boards/settings.html:25
 msgid "No hidden tags."
 msgstr "Нет скрытых меток."
 
-#: templates/boards/settings.html:29
-msgid "Tripcode:"
-msgstr "Трипкод:"
-
-#: templates/boards/settings.html:29
-msgid "reset"
-msgstr "сбросить"
-
-#: templates/boards/settings.html:37
+#: templates/boards/settings.html:34
 msgid "Save"
 msgstr "Сохранить"
 
@@ -434,6 +433,20 b' msgid "Tree"'
 msgstr "Дерево"
 
 #: templates/boards/thread.html:36
+msgid "message"
+msgid_plural "messages"
+msgstr[0] "сообщение"
+msgstr[1] "сообщения"
+msgstr[2] "сообщений"
+
+#: templates/boards/thread.html:39
+msgid "image"
+msgid_plural "images"
+msgstr[0] "изображение"
+msgstr[1] "изображения"
+msgstr[2] "изображений"
+
+#: templates/boards/thread.html:41
 msgid "Last update: "
 msgstr "Последнее обновление: "
 
@@ -441,22 +454,39 b' msgstr "\xd0\x9f\xd0\xbe\xd1\x81\xd0\xbb\xd0\xb5\xd0\xb4\xd0\xbd\xd0\xb5\xd0\xb5 \xd0\xbe\xd0\xb1\xd0\xbd\xd0\xbe\xd0\xb2\xd0\xbb\xd0\xb5\xd0\xbd\xd0\xb8\xd0\xb5: "'
 msgid "No images."
 msgstr "Нет изображений."
 
-#: templates/boards/thread_normal.html:17
+#: templates/boards/thread_normal.html:30
 msgid "posts to bumplimit"
 msgstr "сообщений до бамплимита"
 
-#: templates/boards/thread_normal.html:31
+#: templates/boards/thread_normal.html:44
 msgid "Reply to thread"
 msgstr "Ответить в тему"
 
-#: templates/boards/thread_normal.html:31
+#: templates/boards/thread_normal.html:44
 msgid "to message "
 msgstr "на сообщение"
 
-#: templates/boards/thread_normal.html:46
+#: templates/boards/thread_normal.html:59
 msgid "Close form"
 msgstr "Закрыть форму"
 
 #: templates/search/search.html:17
 msgid "Ok"
 msgstr "Ок"
+
+#: utils.py:102
+#, python-format
+msgid "File must be less than %s bytes"
+msgstr "Файл должен быть менее %s байт"
+
+msgid "favorites"
+msgstr "избранное"
+
+msgid "Loading..."
+msgstr "Загрузка..."
+
+msgid "Category:"
+msgstr "Категория:"
+
+msgid "Subcategories:"
+msgstr "Подкатегории:"

boards/locale/ru/LC_MESSAGES/djangojs.po

@@ -8,7 +8,7 b' msgid ""'
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-02 13:26+0300\n"
+"POT-Creation-Date: 2015-09-04 18:47+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"
@@ -19,14 +19,37 b' msgstr ""'
 "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:58
+#: static/js/3party/jquery-ui.min.js:8
+msgid "'"
+msgstr ""
+
+#: static/js/refpopup.js:72
 msgid "Loading..."
 msgstr "Загрузка..."
 
-#: static/js/refpopup.js:77
+#: static/js/refpopup.js:91
 msgid "Post not found"
 msgstr "Сообщение не найдено"
 
-#: static/js/thread_update.js:279
+#: static/js/thread_update.js:261
+msgid "message"
+msgid_plural "messages"
+msgstr[0] "сообщение"
+msgstr[1] "сообщения"
+msgstr[2] "сообщений"
+
+#: static/js/thread_update.js:262
+msgid "image"
+msgid_plural "images"
+msgstr[0] "изображение"
+msgstr[1] "изображения"
+msgstr[2] "изображений"
+
+#: static/js/thread_update.js:445
 msgid "Sending message..."
-msgstr "Отправка сообщения..."
  No newline at end of file
+msgstr "Отправка сообщения..."
+
+#: static/js/thread_update.js:449
+msgid "Server error!"
+msgstr "Ошибка сервера!"
+

boards/migrations/0025_auto_20150825_2049.py

@@ -6,10 +6,17 b' from django.db import migrations'
 
 class Migration(migrations.Migration):
 
-    def refuild_refmap(apps, schema_editor):
+    def rebuild_refmap(apps, schema_editor):
         Post = apps.get_model('boards', 'Post')
         for post in Post.objects.all():
-            post.build_refmap()
+            refposts = list()
+            for refpost in post.referenced_posts.all():
+                result = '<a href="{}">&gt;&gt;{}</a>'.format(refpost.get_absolute_url(),
+                        self.id)
+                if refpost.is_opening():
+                    result = '<b>{}</b>'.format(result)
+                refposts += result
+            post.refmap = ', '.join(refposts)
             post.save(update_fields=['refmap'])
 
     dependencies = [
@@ -17,5 +24,5 b' class Migration(migrations.Migration):'
     ]
 
     operations = [
-        migrations.RunPython(refuild_refmap),
+        migrations.RunPython(rebuild_refmap),
     ]

boards/models/attachment/viewers.py

@@ -6,13 +6,21 b" FILE_STUB_IMAGE = 'images/file.png'"
 FILE_TYPES_VIDEO = (
     'webm',
     'mp4',
+    'mpeg',
 )
 FILE_TYPE_SVG = 'svg'
 FILE_TYPES_AUDIO = (
     'ogg',
     'mp3',
+    'opus',
 )
 
+PLAIN_FILE_FORMATS = {
+    'pdf': 'pdf',
+    'djvu': 'djvu',
+    'txt': 'txt',
+}
+
 
 def get_viewers():
     return AbstractViewer.__subclasses__()
@@ -35,9 +43,15 b' class AbstractViewer:'
                                self.file_type, filesizeformat(self.file.size))
 
     def get_format_view(self):
+        if self.file_type in PLAIN_FILE_FORMATS:
+            image = 'images/fileformats/{}.png'.format(
+                    PLAIN_FILE_FORMATS[self.file_type])
+        else:
+            image = FILE_STUB_IMAGE
+
         return '<a href="{}">'\
                '<img src="{}" width="200" height="150"/>'\
-               '</a>'.format(self.file.url, static(FILE_STUB_IMAGE))
+               '</a>'.format(self.file.url, static(image))
 
 
 class VideoViewer(AbstractViewer):

boards/models/post/__init__.py

@@ -1,5 +1,3 b''
-from datetime import datetime, timedelta, date
-from datetime import time as dtime
 import logging
 import re
 import uuid
@@ -11,21 +9,15 b' 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.abstracts.tripcode import Tripcode
 from boards.mdx_neboard import Parser
-from boards.models import KeyPair, GlobalId
-from boards import settings
-from boards.models import PostImage, Attachment
+from boards.models import PostImage, Attachment, KeyPair, GlobalId
 from boards.models.base import Viewable
 from boards.models.post.export import get_exporter, DIFF_TYPE_JSON
 from boards.models.post.manager import PostManager
 from boards.models.user import Notification
 
-WS_NOTIFICATION_TYPE_NEW_POST = 'new_post'
-WS_NOTIFICATION_TYPE = 'notification_type'
-
-WS_CHANNEL_THREAD = "thread:"
-
 APP_LABEL_BOARDS = 'boards'
 
 BAN_REASON_AUTO = 'Auto'
@@ -80,7 +72,7 b' class Post(models.Model, Viewable):'
     images = models.ManyToManyField(PostImage, null=True, blank=True,
                                     related_name='post_images', db_index=True)
     attachments = models.ManyToManyField(Attachment, null=True, blank=True,
-            related_name='attachment_posts')
+                                         related_name='attachment_posts')
 
     poster_ip = models.GenericIPAddressField()
 
@@ -92,7 +84,8 b' class Post(models.Model, Viewable):'
                                               blank=True, related_name='refposts',
                                               db_index=True)
     refmap = models.TextField(null=True, blank=True)
-    threads = models.ManyToManyField('Thread', db_index=True)
+    threads = models.ManyToManyField('Thread', db_index=True,
+                                     related_name='multi_replies')
     thread = models.ForeignKey('Thread', db_index=True, related_name='pt+')
 
     url = models.TextField()
@@ -103,23 +96,23 b' class Post(models.Model, Viewable):'
     global_id = models.OneToOneField('GlobalId', null=True, blank=True)
 
     tripcode = models.CharField(max_length=50, null=True)
+    opening = models.BooleanField()
 
     def __str__(self):
-        return 'P#{}/{}'.format(self.id, self.title)
+        return 'P#{}/{}'.format(self.id, self.get_title())
 
     def get_referenced_posts(self):
         threads = self.get_threads().all()
-        return self.referenced_posts.filter(threads__in=threads) \
+        return self.referenced_posts.filter(threads__in=threads)\
             .order_by('pub_time').distinct().all()
 
     def get_title(self) -> str:
-        """
-        Gets original post title or part of its text.
-        """
+        return self.title
 
-        title = self.title
+    def get_title_or_text(self):
+        title = self.get_title()
         if not title:
-            title = self.get_text()
+            title = truncatewords(striptags(self.get_text()), TITLE_MAX_WORDS)
 
         return title
 
@@ -142,7 +135,7 b' class Post(models.Model, Viewable):'
         Checks if this is an opening post or just a reply.
         """
 
-        return self.get_thread().get_opening_post_id() == self.id
+        return self.opening
 
     def get_absolute_url(self):
         if self.url:
@@ -172,12 +165,6 b' class Post(models.Model, Viewable):'
         """
 
         thread = self.get_thread()
-        is_opening = kwargs.get(PARAMETER_IS_OPENING, self.is_opening())
-
-        if is_opening:
-            opening_post_id = self.id
-        else:
-            opening_post_id = thread.get_opening_post_id()
 
         css_class = 'post'
         if thread.archived:
@@ -192,10 +179,9 b' class Post(models.Model, Viewable):'
 
         params.update({
             PARAMETER_POST: self,
-            PARAMETER_IS_OPENING: is_opening,
+            PARAMETER_IS_OPENING: self.is_opening(),
             PARAMETER_THREAD: thread,
             PARAMETER_CSS_CLASS: css_class,
-            PARAMETER_OP_ID: opening_post_id,
         })
 
         return render_to_string('boards/post.html', params)
@@ -336,7 +322,7 b' class Post(models.Model, Viewable):'
             for thread in self.get_threads().all():
                 thread.last_edit_time = self.last_edit_time
 
-                thread.save(update_fields=['last_edit_time'])
+                thread.save(update_fields=['last_edit_time', 'bumpable'])
 
         super().save(force_insert, force_update, using, update_fields)
 
@@ -418,7 +404,7 b' class Post(models.Model, Viewable):'
         """
 
         result = '<a href="{}">&gt;&gt;{}</a>'.format(self.get_absolute_url(),
-                self.id)
+                                                      self.id)
         if self.is_opening():
             result = '<b>{}</b>'.format(result)
 

boards/models/post/manager.py

@@ -6,6 +6,7 b' from django.utils import timezone'
 from boards import utils
 from boards.mdx_neboard import Parser
 from boards.models import PostImage, Attachment
+from boards.models.user import Ban
 import boards.models
 
 __author__ = 'vurdalak'
@@ -31,7 +32,7 b' class PostManager(models.Manager):'
         Creates new post
         """
 
-        is_banned = boards.models.Ban.objects.filter(ip=ip).exists()
+        is_banned = Ban.objects.filter(ip=ip).exists()
 
         # TODO Raise specific exception and catch it in the views
         if is_banned:
@@ -59,7 +60,8 b' class PostManager(models.Manager):'
                            poster_ip=ip,
                            thread=thread,
                            last_edit_time=posting_time,
-                           tripcode=tripcode)
+                           tripcode=tripcode,
+                           opening=new_thread)
         post.threads.add(thread)
 
         logger = logging.getLogger('boards.post.create')
@@ -122,7 +124,8 b' class PostManager(models.Manager):'
     @transaction.atomic
     def import_post(self, title: str, text: str, pub_time: str, global_id,
                     opening_post=None, tags=list()):
-        if opening_post is None:
+        is_opening = opening_post is None
+        if is_opening:
             thread = boards.models.thread.Thread.objects.create(
                 bump_time=pub_time, last_edit_time=pub_time)
             list(map(thread.tags.add, tags))
@@ -133,7 +136,9 b' class PostManager(models.Manager):'
                            pub_time=pub_time,
                            poster_ip=NO_IP,
                            last_edit_time=pub_time,
-                           thread_id=thread.id, global_id=global_id)
+                           thread_id=thread.id,
+                           global_id=global_id,
+                           opening=is_opening)
 
         post.build_url()
         post.connect_replies()

boards/models/tag.py

@@ -1,3 +1,4 b''
+import hashlib
 from django.template.loader import render_to_string
 from django.db import models
 from django.db.models import Count
@@ -47,6 +48,8 b' class Tag(models.Model, Viewable):'
     required = models.BooleanField(default=False, db_index=True)
     description = models.TextField(blank=True)
 
+    parent = models.ForeignKey('Tag', null=True, related_name='children')
+
     def __str__(self):
         return self.name
 
@@ -89,7 +92,7 b' class Tag(models.Model, Viewable):'
 
     @cached_result()
     def get_post_count(self):
-        return self.get_threads().aggregate(num_posts=Count('post'))['num_posts']
+        return self.get_threads().aggregate(num_posts=Count('multi_replies'))['num_posts']
 
     def get_description(self):
         return self.description
@@ -106,4 +109,26 b' class Tag(models.Model, Viewable):'
 
     def get_related_tags(self):
         return set(Tag.objects.filter(thread_tags__in=self.get_threads()).exclude(
-                id=self.id).order_by('?')[:RELATED_TAGS_COUNT])
+            id=self.id).order_by('?')[:RELATED_TAGS_COUNT])
+
+    @cached_result()
+    def get_color(self):
+        """
+        Gets color hashed from the tag name.
+        """
+        return hashlib.md5(self.name.encode()).hexdigest()[:6]
+
+    def get_parent(self):
+        return self.parent
+
+    def get_all_parents(self):
+        parents = set()
+        parent = self.get_parent()
+        if parent and parent not in parents:
+            parents.add(parent)
+            parents |= parent.get_all_parents()
+
+        return parents
+
+    def get_children(self):
+        return self.children

boards/models/thread.py

@@ -1,7 +1,7 b''
 import logging
 from adjacent import Client
 
-from django.db.models import Count, Sum, QuerySet
+from django.db.models import Count, Sum, QuerySet, Q
 from django.utils import timezone
 from django.db import models
 
@@ -11,6 +11,8 b' from boards.utils import cached_result, '
 from boards.models.post import Post
 from boards.models.tag import Tag
 
+FAV_THREAD_NO_UPDATES = -1
+
 
 __author__ = 'neko259'
 
@@ -54,6 +56,26 b' class ThreadManager(models.Manager):'
         thread.update_posts_time()
         thread.save(update_fields=['archived', 'last_edit_time', 'bumpable'])
 
+    def get_new_posts(self, datas):
+        query = None
+        # TODO Use classes instead of dicts
+        for data in datas:
+            if data['last_id'] != FAV_THREAD_NO_UPDATES:
+                q = (Q(id=data['op'].get_thread().id)
+                     & Q(multi_replies__id__gt=data['last_id']))
+                if query is None:
+                    query = q
+                else:
+                    query = query | q
+        if query is not None:
+            return self.filter(query).annotate(
+                new_post_count=Count('multi_replies'))
+
+    def get_new_post_count(self, datas):
+        new_posts = self.get_new_posts(datas)
+        return new_posts.aggregate(total_count=Count('multi_replies'))\
+                ['total_count'] if new_posts else 0
+
 
 def get_thread_max_posts():
     return settings.get_int('Messages', 'MaxPostsPerThread')
@@ -116,7 +138,7 b' class Thread(models.Model):'
         Checks if the thread can be bumped by replying to it.
         """
 
-        return self.bumpable and not self.archived
+        return self.bumpable and not self.is_archived()
 
     def get_last_replies(self) -> QuerySet:
         """
@@ -150,8 +172,8 b' class Thread(models.Model):'
         Gets sorted thread posts
         """
 
-        query = Post.objects.filter(threads__in=[self])
-        query = query.order_by('pub_time').prefetch_related('images', 'thread', 'threads')
+        query = self.multi_replies.order_by('pub_time').prefetch_related(
+            'images', 'thread', 'threads', 'attachments')
         if view_fields_only:
             query = query.defer('poster_ip')
         return query.all()
@@ -203,7 +225,7 b' class Thread(models.Model):'
     def update_posts_time(self, exclude_posts=None):
         last_edit_time = self.last_edit_time
 
-        for post in self.post_set.all():
+        for post in self.multi_replies.all():
             if exclude_posts is None or post not in exclude_posts:
                 # Manual update is required because uids are generated on save
                 post.last_edit_time = last_edit_time
@@ -228,3 +250,9 b' class Thread(models.Model):'
 
     def get_required_tags(self):
         return self.get_tags().filter(required=True)
+
+    def get_replies_newer(self, post_id):
+        return self.get_replies().filter(id__gt=post_id)
+
+    def is_archived(self):
+        return self.archived

boards/static/css/base.css

@@ -133,4 +133,13 b' textarea, input {'
 
 .tripcode {
     padding: 2px;
+}
+
+#fav-panel {
+    display: none;
+    margin: 1ex;
+}
+
+#new-fav-post-count {
+    display: none;
 }
  No newline at end of file

boards/static/css/md/base_page.css

@@ -115,6 +115,14 b' body {'
     visibility: hidden;
 }
 
+.tag_info {
+    text-align: center;
+}
+
+.tag_info > .tag-text-data {
+    text-align: left;
+}
+
 .header {
     border-bottom: solid 2px #ccc;
     margin-bottom: 5px;
@@ -416,6 +424,8 b' li {'
     padding: 5px;
     color: #eee;
     font-size: 2ex;
+    margin-top: .5ex;
+    margin-bottom: .5ex;
 }
 
 .skipped_replies {
@@ -442,6 +452,7 b' li {'
     border: solid 1px;
     margin: 0.5ex;
     text-align: center;
+    padding: 1ex;
 }
 
 code {
@@ -520,6 +531,11 b' ul {'
     border: 1px solid #777;
     background: #000;
     padding: 4px;
+    opacity: 0.3;
+}
+
+#up:hover {
+    opacity: 1;
 }
 
 .user-cast {
@@ -557,3 +573,7 b' ul {'
 .tripcode {
     color: white;
 }
+
+#fav-panel {
+    border: 1px solid white;
+}

boards/static/js/image.js

@@ -23,6 +23,8 b''
  for the JavaScript code in this page.
  */
 
+var IMAGE_POPUP_MARGIN = 10;
+
 
 var IMAGE_VIEWERS = [
     ['simple', new SimpleImageViewer()],
@@ -31,6 +33,8 b' var IMAGE_VIEWERS = ['
 
 var FULL_IMG_CLASS = 'post-image-full';
 
+var ATTR_SCALE = 'scale';
+
 
 function ImageViewer() {}
 ImageViewer.prototype.view = function (post) {};
@@ -67,38 +71,48 b' SimpleImageViewer.prototype.view = funct'
 
 function PopupImageViewer() {}
 PopupImageViewer.prototype.view = function (post) {
-    var margin = 20; //..change
-
     var el = post;
     var thumb_id = 'full' + el.find('img').attr('alt');
 
     var existingPopups = $('#' + thumb_id);
-    if(!existingPopups.length) {
+    if (!existingPopups.length) {
         var imgElement= el.find('img');
 
-        var img_w = imgElement.attr('data-width');
-        var img_h = imgElement.attr('data-height');
+        var full_img_w = imgElement.attr('data-width');
+        var full_img_h = imgElement.attr('data-height');
 
         var win = $(window);
 
         var win_w = win.width();
         var win_h = win.height();
-        //new image size
-        if (img_w > win_w) {
-            img_h = img_h * (win_w/img_w) - margin;
-            img_w = win_w - margin;
+
+        // New image size
+        var w_scale = 1;
+        var h_scale = 1;
+
+        var freeWidth = win_w - 2 * IMAGE_POPUP_MARGIN;
+        var freeHeight = win_h - 2 * IMAGE_POPUP_MARGIN;
+
+        if (full_img_w > freeWidth) {
+            w_scale = full_img_w / freeWidth;
         }
-        if (img_h > win_h) {
-            img_w = img_w * (win_h/img_h) - margin;
-            img_h = win_h - margin;
+        if (full_img_h > freeHeight) {
+            h_scale = full_img_h / freeHeight;
         }
 
+        var scale = Math.max(w_scale, h_scale)
+        var img_w = full_img_w / scale;
+        var img_h = full_img_h / scale;
+
+        var postNode = $(el);
+
         var img_pv = new Image();
         var newImage = $(img_pv);
         newImage.addClass('img-full')
             .attr('id', thumb_id)
-            .attr('src', $(el).attr('href'))
-            .appendTo($(el))
+            .attr('src', postNode.attr('href'))
+            .attr(ATTR_SCALE, scale)
+            .appendTo(postNode)
             .css({
                 'width': img_w,
                 'height': img_h,
@@ -107,19 +121,26 b' PopupImageViewer.prototype.view = functi'
             })
         //scaling preview
         .mousewheel(function(event, delta) {
-            var cx = event.originalEvent.clientX,
-            cy = event.originalEvent.clientY,
-            i_w = parseFloat(newImage.width()),
-            i_h = parseFloat(newImage.height()),
-            newIW = i_w * (delta > 0 ? 1.25 : 0.8),
-            newIH = i_h * (delta > 0 ? 1.25 : 0.8);
+            var cx = event.originalEvent.clientX;
+            var cy = event.originalEvent.clientY;
+
+            var scale = newImage.attr(ATTR_SCALE) / (delta > 0 ? 1.25 : 0.8);
+
+            var oldWidth = newImage.width();
+            var oldHeight = newImage.height();
+
+            var newIW = full_img_w / scale;
+            var newIH = full_img_h / scale;
 
             newImage.width(newIW);
             newImage.height(newIH);
-            //set position
+            newImage.attr(ATTR_SCALE, scale);
+
+            // Set position
+            var oldPosition = newImage.position();
             newImage.css({
-                left: parseInt(cx - (newIW/i_w) * (cx - parseInt($(img_pv).position().left, 10)), 10),
-                top:  parseInt(cy - (newIH/i_h) * (cy - parseInt($(img_pv).position().top, 10)), 10)
+                left: parseInt(cx - (newIW/oldWidth) * (cx - parseInt(oldPosition.left, 10)), 10),
+                top:  parseInt(cy - (newIH/oldHeight) * (cy - parseInt(oldPosition.top, 10)), 10)
             });
 
             return false;

boards/static/js/main.js

@@ -23,6 +23,8 b''
  for the JavaScript code in this page.
  */
 
+var FAV_POST_UPDATE_PERIOD = 10000;
+
 /**
  * An email is a hidden file to prevent spam bots from posting. It has to be
  * hidden.
@@ -40,6 +42,72 b' function highlightCode(node) {'
     });
 }
 
+function updateFavPosts() {
+    var includePostBody = $('#fav-panel').is(":visible");
+    var url = '/api/new_posts/';
+    if (includePostBody) {
+        url += '?include_posts'
+    }
+    $.getJSON(url,
+        function(data) {
+            var allNewPostCount = 0;
+
+            if (includePostBody) {
+                var favoriteThreadPanel = $('#fav-panel');
+                favoriteThreadPanel.empty();
+            }
+
+            $.each(data, function (_, dict) {
+                var newPostCount = dict.new_post_count;
+                allNewPostCount += newPostCount;
+
+                if (includePostBody) {
+                    var favThreadNode = $('<div class="post"></div>');
+                    favThreadNode.append($(dict.post_url));
+                    favThreadNode.append(' ');
+                    favThreadNode.append($('<span class="title">' + dict.title + '</span>'));
+
+                    if (newPostCount > 0) {
+                        favThreadNode.append(' (<a href="' + dict.newest_post_link + '">+' + newPostCount + "</a>)");
+                    }
+
+                    favoriteThreadPanel.append(favThreadNode);
+
+                    addRefLinkPreview(favThreadNode[0]);
+                }
+            });
+
+            var newPostCountNode = $('#new-fav-post-count');
+            if (allNewPostCount > 0) {
+                newPostCountNode.text('(+' + allNewPostCount + ')');
+                newPostCountNode.show();
+            } else {
+                newPostCountNode.hide();
+            }
+        }
+    );
+}
+
+function initFavPanel() {
+    updateFavPosts();
+
+    if ($('#fav-panel-btn').length > 0) {
+        setInterval(updateFavPosts, FAV_POST_UPDATE_PERIOD);
+        $('#fav-panel-btn').click(function() {
+            $('#fav-panel').toggle();
+            updateFavPosts();
+
+            return false;
+        });
+
+        $(document).on('keyup.removepic', function(e) {
+            if(e.which === 27) {
+                $('#fav-panel').hide();
+            }
+        });
+    }
+}
+
 $( document ).ready(function() {
     hideEmailFromForm();
 
@@ -53,4 +121,6 b' function highlightCode(node) {'
     addRefLinkPreview();
 
     highlightCode($(document));
+
+    initFavPanel();
 });

boards/static/js/thread_update.js

@@ -102,11 +102,10 b' function connectWebsocket() {'
  * missed.
  */
 function getThreadDiff() {
-    var lastUpdateTime = $('.metapanel').attr('data-last-update');
-    var lastPostId = $('.post').last().attr('id');
+    var all_posts = $('.post');
 
     var uids = '';
-    var posts = $('.post');
+    var posts = all_posts;
     for (var i = 0; i < posts.length; i++) {
         uids += posts[i].getAttribute('data-uid') + ' ';
     }
@@ -114,7 +113,7 b' function getThreadDiff() {'
     var data = {
         uids: uids,
         thread: threadId
-    }
+    };
 
     var diffUrl = '/api/diff_thread/';
 
@@ -244,8 +243,10 b' function updateMetadataPanel() {'
     var replyCountField = $('#reply-count');
     var imageCountField = $('#image-count');
 
-    replyCountField.text(getReplyCount());
-    imageCountField.text(getImageCount());
+    var replyCount = getReplyCount();
+    replyCountField.text(replyCount);
+    var imageCount = getImageCount();
+    imageCountField.text(imageCount);
 
     var lastUpdate = $('.post:last').children('.post-info').first()
         .children('.pub_time').first().html();
@@ -257,6 +258,9 b' function updateMetadataPanel() {'
 
     blink(replyCountField);
     blink(imageCountField);
+
+    $('#message-count-text').text(ngettext('message', 'messages', replyCount));
+    $('#image-count-text').text(ngettext('image', 'images', imageCount));
 }
 
 /**
@@ -380,9 +384,6 b' function replacePartial(oldNode, newNode'
         // Replace children
         var children = oldNode.children();
         if (children.length == 0) {
-            console.log(oldContent);
-            console.log(newContent)
-
             oldNode.replaceWith(newNode);
         } else {
             var newChildren = newNode.children();
@@ -426,7 +427,7 b' function updateNodeAttr(oldNode, newNode'
     var newAttr = newNode.attr(attrName);
     if (oldAttr != newAttr) {
         oldNode.attr(attrName, newAttr);
-    };
+    }
 }
 
 $(document).ready(function(){
@@ -439,11 +440,11 b' function updateNodeAttr(oldNode, newNode'
         if (form.length > 0) {
             var options = {
                 beforeSubmit: function(arr, $form, options) {
-                    showAsErrors($('form'), gettext('Sending message...'));
+                    showAsErrors($('#form'), gettext('Sending message...'));
                 },
                 success: updateOnPost,
                 error: function() {
-                    showAsErrors($('form'), gettext('Server error!'));
+                    showAsErrors($('#form'), gettext('Server error!'));
                 },
                 url: '/api/add_post/' + threadId + '/'
             };

boards/templates/boards/all_threads.html

@@ -37,7 +37,7 b''
     {% endfor %}
 
 {% if tag %}
-    <div class="tag_info">
+    <div class="tag_info" style="border-bottom: solid .5ex #{{ tag.get_color }}">
         {% if random_image_post %}
             <div class="tag-image">
                 {% with image=random_image_post.images.first %}
@@ -73,11 +73,12 b''
                 <p>{{ tag.get_description|safe }}</p>
             {% endif %}
             <p>{% blocktrans with active_thread_count=tag.get_active_thread_count thread_count=tag.get_thread_count post_count=tag.get_post_count %}This tag has {{ thread_count }} threads ({{ active_thread_count}} active) and {{ post_count }} posts.{% endblocktrans %}</p>
-            {% if related_tags %}
-                <p>{% trans 'Related tags:' %}
-                {% for rel_tag in related_tags %}
-                    {{ rel_tag.get_view|safe }}{% if not forloop.last %}, {% else %}.{% endif %}
-                {% endfor %}
+            {% if tag.get_parent %}
+                <p>
+                    {% if tag.get_parent %}
+                        {{ tag.get_parent.get_view|safe }} /
+                    {% endif %}
+                    {{ tag.get_view|safe }}
                 </p>
             {% endif %}
         </div>
@@ -93,7 +94,7 b''
 
         {% for thread in threads %}
             <div class="thread">
-                {% post_view thread.get_opening_post moderator=moderator is_opening=True thread=thread truncated=True need_open_link=True %}
+                {% post_view thread.get_opening_post moderator=moderator thread=thread truncated=True need_open_link=True %}
                 {% if not thread.archived %}
                     {% with last_replies=thread.get_last_replies %}
                         {% if last_replies %}
@@ -101,14 +102,14 b''
                                 {% if skipped_replies_count %}
                                     <div class="skipped_replies">
                                         <a href="{% url 'thread' thread.get_opening_post_id %}">
-                                            {% blocktrans with count=skipped_replies_count %}Skipped {{ count }} replies. Open thread to see all replies.{% endblocktrans %}
+                                            {% blocktrans count count=skipped_replies_count %}Skipped {{ count }} reply. Open thread to see all replies.{% plural %}Skipped {{ count }} replies. Open thread to see all replies.{% endblocktrans %}
                                         </a>
                                     </div>
                                 {% endif %}
                             {% endwith %}
                             <div class="last-replies">
                                 {% for post in last_replies %}
-                                    {% post_view post is_opening=False moderator=moderator truncated=True %}
+                                    {% post_view post moderator=moderator truncated=True %}
                                 {% endfor %}
                             </div>
                         {% endif %}

boards/templates/boards/base.html

@@ -39,7 +39,10 b''
         <a href="{% url 'tags' 'required'%}" title="{% trans 'Tag management' %}">{% trans "tags" %}</a>,
         <a href="{% url 'search' %}" title="{% trans 'Search' %}">{% trans 'search' %}</a>,
         <a href="{% url 'feed' %}" title="{% trans 'Feed' %}">{% trans 'feed' %}</a>,
-        <a href="{% url 'random' %}" title="{% trans 'Random images' %}">{% trans 'random' %}</a>
+        <a href="{% url 'random' %}" title="{% trans 'Random images' %}">{% trans 'random' %}</a>{% if has_fav_threads %},
+
+            <a href="#" id="fav-panel-btn">{% trans 'favorites' %} <span id="new-fav-post-count"></span></a>
+        {% endif %}
 
         {% if username %}
             <a class="right-link link" href="{% url 'notifications' username %}" title="{% trans 'Notifications' %}">
@@ -53,6 +56,8 b''
         <a class="right-link link" href="{% url 'settings' %}">{% trans 'Settings' %}</a>
     </div>
 
+    <div id="fav-panel"><div class="post">{% trans "Loading..." %}</div></div>
+
     {% block content %}{% endblock %}
 
     <script src="{% static 'js/3party/highlight.min.js' %}"></script>

boards/templates/boards/post.html

@@ -36,7 +36,7 b''
         {% else %}
             {% if need_op_data %}
                 {% with thread.get_opening_post as op %}
-                    {% trans " in " %}{{ op.get_link_view|safe }} <span class="title">{{ op.get_title|striptags|truncatewords:5 }}</span>
+                    {% trans " in " %}{{ op.get_link_view|safe }} <span class="title">{{ op.get_title_or_text }}</span>
                 {% endwith %}
             {% endif %}
         {% endif %}
@@ -61,16 +61,12 b''
         Post images. Currently only 1 image can be posted and shown, but post model
         supports multiple.
     {%  endcomment %}
-    {% if post.images.exists %}
-        {% with post.images.first as image %}
-            {{ image.get_view|safe }}
-        {% endwith %}
-    {% endif %}
-    {% if post.attachments.exists %}
-        {% with post.attachments.first as file %}
-            {{ file.get_view|safe }}
-        {% endwith %}
-    {% endif %}
+    {% for image in post.images.all %}
+        {{ image.get_view|safe }}
+    {% endfor %}
+    {% for file in post.attachments.all %}
+        {{ file.get_view|safe }}
+    {% endfor %}
     {% comment %}
         Post message (text)
     {% endcomment %}
@@ -102,8 +98,8 b''
     {% if is_opening %}
         <div class="metadata">
             {% if is_opening and need_open_link %}
-                {{ thread.get_reply_count }} {% trans 'messages' %},
-                {{ thread.get_images_count }} {% trans 'images' %}.
+                {% blocktrans count count=thread.get_reply_count %}{{ count }} message{% plural %}{{ count }} messages{% endblocktrans %},
+                {% blocktrans count count=thread.get_images_count %}{{ count }} image{% plural %}{{ count }} images{% endblocktrans %}.
             {% endif %}
             <span class="tags">
                 {{ thread.get_tag_url_list|safe }}

boards/templates/boards/thread.html

@@ -6,8 +6,7 b''
 {% load tz %}
 
 {% block head %}
-    <title>{{ opening_post.get_title|striptags|truncatewords:10 }}
-        - {{ site_name }}</title>
+    <title>{{ opening_post.get_title_or_text }} - {{ site_name }}</title>
 {% endblock %}
 
 {% block content %}
@@ -31,8 +30,13 b''
           data-ws-host="{{ ws_host }}"
           data-ws-port="{{ ws_port }}">
 
-        <span id="reply-count">{{ thread.get_reply_count }}</span>{% if thread.has_post_limit %}/{{ thread.max_posts }}{% endif %} {% trans 'messages' %},
-            <span id="image-count">{{ thread.get_images_count }}</span> {% trans 'images' %}.
+        {% with replies_count=thread.get_reply_count%}
+            <span id="reply-count">{{ thread.get_reply_count }}</span>{% if thread.has_post_limit %}/{{ thread.max_posts }}{% endif %}
+            <span id="message-count-text">{% blocktrans count repliess_count=replies_count %}message{% plural %}messages{% endblocktrans %}</span>,
+        {% endwith %}
+        {% with images_count=thread.get_images_count%}
+            <span id="image-count">{{ images_count }}</span> <span id="image-count-text">{% blocktrans count count=images_count %}image{% plural %}images{% endblocktrans %}</span>.
+        {% endwith %}
             {% trans 'Last update: ' %}<span id="last-update"><time datetime="{{ thread.last_edit_time|date:'c' }}">{{ thread.last_edit_time }}</time></span>
             [<a href="rss/">RSS</a>]
     </span>

boards/templates/boards/thread_normal.html

@@ -9,6 +9,19 b''
     {% get_current_language as LANGUAGE_CODE %}
     {% get_current_timezone as TIME_ZONE %}
 
+    <div class="tag_info">
+        <h2>
+            <form action="{% url 'thread' opening_post.id %}" method="post" class="post-button-form">
+                {% if is_favorite %}
+                    <button name="method" value="unsubscribe" class="fav">★</button>
+                {% else %}
+                    <button name="method" value="subscribe" class="not_fav">★</button>
+                {% endif %}
+            </form>
+            {{ opening_post.get_title_or_text }}
+        </h2>
+    </div>
+
     {% if bumpable and thread.has_post_limit %}
         <div class="bar-bg">
             <div class="bar-value" style="width:{{ bumplimit_progress }}%" id="bumplimit_progress">

boards/urls.py

@@ -70,6 +70,7 b" urlpatterns = patterns('',"
     url(r'^api/notifications/(?P<username>\w+)/$', api.api_get_notifications,
             name='api_notifications'),
     url(r'^api/preview/$', api.api_get_preview, name='preview'),
+    url(r'^api/new_posts/$', api.api_get_new_posts, name='new_posts'),
 
     # Sync protocol API
     url(r'^api/sync/pull/$', response_pull, name='api_sync_pull'),

boards/utils.py

@@ -7,8 +7,11 b' import hmac'
 
 from django.core.cache import cache
 from django.db.models import Model
+from django import forms
 
 from django.utils import timezone
+from django.utils.translation import ugettext_lazy as _
+import boards
 
 from neboard import settings
 
@@ -90,3 +93,11 b' def get_file_hash(file) -> str:'
     for chunk in file.chunks():
         md5.update(chunk)
     return md5.hexdigest()
+
+
+def validate_file_size(size: int):
+    max_size = boards.settings.get_int('Forms', 'MaxFileSize')
+    if size > max_size:
+        raise forms.ValidationError(
+            _('File must be less than %s bytes')
+            % str(max_size))

boards/views/all_threads.py

@@ -104,24 +104,6 b' class AllThreadsView(PostMixin, BaseBoar'
         return reverse('index') + '?page=' \
                 + str(current_page.next_page_number())
 
-    @staticmethod
-    def parse_tags_string(tag_strings):
-        """
-        Parses tag list string and returns tag object list.
-        """
-
-        tags = []
-
-        if tag_strings:
-            tag_strings = tag_strings.split(TAG_DELIMITER)
-            for tag_name in tag_strings:
-                tag_name = tag_name.strip().lower()
-                if len(tag_name) > 0:
-                    tag, created = Tag.objects.get_or_create(name=tag_name)
-                    tags.append(tag)
-
-        return tags
-
     @transaction.atomic
     def create_thread(self, request, form: ThreadForm, html_response=True):
         """
@@ -146,9 +128,7 b' class AllThreadsView(PostMixin, BaseBoar'
 
         text = self._remove_invalid_links(text)
 
-        tag_strings = data[FORM_TAGS]
-
-        tags = self.parse_tags_string(tag_strings)
+        tags = data[FORM_TAGS]
 
         post = Post.objects.create_post(title=title, text=text, file=file,
                                         ip=ip, tags=tags, opening_posts=threads,

boards/views/api.py

@@ -1,12 +1,16 b''
+from collections import OrderedDict
 import json
 import logging
 
 import xml.etree.ElementTree as ET
 
 from django.db import transaction
+from django.db.models import Count
 from django.http import HttpResponse
 from django.shortcuts import get_object_or_404
 from django.core import serializers
+from boards.abstracts.settingsmanager import get_settings_manager,\
+        FAV_THREAD_NO_UPDATES
 
 from boards.forms import PostForm, PlainErrorList
 from boards.models import Post, Thread, Tag, GlobalId
@@ -48,7 +52,8 b' def api_get_threaddiff(request):'
     uids_str = request.POST.get(PARAMETER_UIDS).strip()
     uids = uids_str.split(' ')
 
-    thread = get_object_or_404(Post, id=thread_id).get_thread()
+    opening_post = get_object_or_404(Post, id=thread_id)
+    thread = opening_post.get_thread()
 
     json_data = {
         PARAMETER_UPDATED: [],
@@ -59,10 +64,16 b' def api_get_threaddiff(request):'
     diff_type = request.GET.get(PARAMETER_DIFF_TYPE, DIFF_TYPE_HTML)
 
     for post in posts:
-        json_data[PARAMETER_UPDATED].append(get_post_data(post.id, diff_type,
-            request))
+        json_data[PARAMETER_UPDATED].append(post.get_post_data(
+            format_type=diff_type, request=request))
     json_data[PARAMETER_LAST_UPDATE] = str(thread.last_edit_time)
 
+    # If the tag is favorite, update the counter
+    settings_manager = get_settings_manager(request)
+    favorite = settings_manager.thread_is_fav(opening_post)
+    if favorite:
+        settings_manager.add_or_read_fav_thread(opening_post)
+
     return HttpResponse(content=json.dumps(json_data))
 
 
@@ -146,7 +157,7 b' def api_get_threads(request, count):'
         opening_post = thread.get_opening_post()
 
         # TODO Add tags, replies and images count
-        post_data = get_post_data(opening_post.id, include_last_update=True)
+        post_data = opening_post.get_post_data(include_last_update=True)
         post_data['bumpable'] = thread.can_bump()
         post_data['archived'] = thread.archived
 
@@ -192,7 +203,7 b' def api_get_thread_posts(request, openin'
     json_post_list = []
 
     for post in posts:
-        json_post_list.append(get_post_data(post.id))
+        json_post_list.append(post.get_post_data())
     json_data['last_update'] = datetime_to_epoch(thread.last_edit_time)
     json_data['posts'] = json_post_list
 
@@ -208,7 +219,7 b' def api_get_notifications(request, usern'
 
     json_post_list = []
     for post in posts:
-        json_post_list.append(get_post_data(post.id))
+        json_post_list.append(post.get_post_data())
     return HttpResponse(content=json.dumps(json_post_list))
 
 
@@ -228,16 +239,58 b' def api_get_post(request, post_id):'
     return HttpResponse(content=json)
 
 
-# TODO Remove this method and use post method directly
-def get_post_data(post_id, format_type=DIFF_TYPE_JSON, request=None,
-                  include_last_update=False):
-    post = get_object_or_404(Post, id=post_id)
-    return post.get_post_data(format_type=format_type, request=request,
-                              include_last_update=include_last_update)
-
-
 def api_get_preview(request):
     raw_text = request.POST['raw_text']
 
     parser = Parser()
     return HttpResponse(content=parser.parse(parser.preparse(raw_text)))
+
+
+def api_get_new_posts(request):
+    """
+    Gets favorite threads and unread posts count.
+    """
+    posts = list()
+
+    include_posts = 'include_posts' in request.GET
+
+    settings_manager = get_settings_manager(request)
+    fav_threads = settings_manager.get_fav_threads()
+    fav_thread_ops = Post.objects.filter(id__in=fav_threads.keys())\
+        .order_by('-pub_time').prefetch_related('thread')
+
+    ops = [{'op': op, 'last_id': fav_threads[str(op.id)]} for op in fav_thread_ops]
+    if include_posts:
+        new_post_threads = Thread.objects.get_new_posts(ops)
+        if new_post_threads:
+            thread_ids = {thread.id: thread for thread in new_post_threads}
+        else:
+            thread_ids = dict()
+
+        for op in fav_thread_ops:
+            fav_thread_dict = dict()
+
+            op_thread = op.get_thread()
+            if op_thread.id in thread_ids:
+                thread = thread_ids[op_thread.id]
+                new_post_count = thread.new_post_count
+                fav_thread_dict['newest_post_link'] = thread.get_replies()\
+                        .filter(id__gt=fav_threads[str(op.id)])\
+                        .first().get_absolute_url()
+            else:
+                new_post_count = 0
+            fav_thread_dict['new_post_count'] = new_post_count
+
+            fav_thread_dict['id'] = op.id
+
+            fav_thread_dict['post_url'] = op.get_link_view()
+            fav_thread_dict['title'] = op.title
+
+            posts.append(fav_thread_dict)
+    else:
+        fav_thread_dict = dict()
+        fav_thread_dict['new_post_count'] = \
+            Thread.objects.get_new_post_count(ops)
+        posts.append(fav_thread_dict)
+
+    return HttpResponse(content=json.dumps(posts))

boards/views/thread/thread.py

@@ -7,9 +7,11 b' from django.utils import timezone'
 from django.utils.dateformat import format
 
 from boards import utils, settings
+from boards.abstracts.settingsmanager import get_settings_manager
 from boards.forms import PostForm, PlainErrorList
 from boards.models import Post
 from boards.views.base import BaseBoardView, CONTEXT_FORM
+from boards.views.mixins import DispatcherMixin
 from boards.views.posting_mixin import PostMixin
 
 import neboard
@@ -24,6 +26,7 b" CONTEXT_WS_PORT = 'ws_port'"
 CONTEXT_WS_TIME = 'ws_token_time'
 CONTEXT_MODE = 'mode'
 CONTEXT_OP = 'opening_post'
+CONTEXT_FAVORITE = 'is_favorite'
 
 FORM_TITLE = 'title'
 FORM_TEXT = 'text'
@@ -31,7 +34,7 b" FORM_IMAGE = 'image'"
 FORM_THREADS = 'threads'
 
 
-class ThreadView(BaseBoardView, PostMixin, FormMixin):
+class ThreadView(BaseBoardView, PostMixin, FormMixin, DispatcherMixin):
 
     def get(self, request, post_id, form: PostForm=None):
         try:
@@ -39,10 +42,16 b' class ThreadView(BaseBoardView, PostMixi'
         except ObjectDoesNotExist:
             raise Http404
 
+        # If the tag is favorite, update the counter
+        settings_manager = get_settings_manager(request)
+        favorite = settings_manager.thread_is_fav(opening_post)
+        if favorite:
+            settings_manager.add_or_read_fav_thread(opening_post)
+
         # If this is not OP, don't show it as it is
         if not opening_post.is_opening():
             return redirect(opening_post.get_thread().get_opening_post()
-                .get_absolute_url())
+                            .get_absolute_url())
 
         if not form:
             form = PostForm(error_class=PlainErrorList)
@@ -56,6 +65,7 b' class ThreadView(BaseBoardView, PostMixi'
         params[CONTEXT_THREAD] = thread_to_show
         params[CONTEXT_MODE] = self.get_mode()
         params[CONTEXT_OP] = opening_post
+        params[CONTEXT_FAVORITE] = favorite
 
         if settings.get_bool('External', 'WebsocketsEnabled'):
             token_time = format(timezone.now(), u'U')
@@ -78,6 +88,11 b' class ThreadView(BaseBoardView, PostMixi'
         if not opening_post.is_opening():
             raise Http404
 
+        if 'method' in request.POST:
+            self.dispatch_method(request, opening_post)
+
+            return redirect('thread', post_id)  # FIXME Different for different modes
+
         if not opening_post.get_thread().archived:
             form = PostForm(request.POST, request.FILES,
                             error_class=PlainErrorList)
@@ -138,3 +153,11 b' class ThreadView(BaseBoardView, PostMixi'
 
     def get_mode(self) -> str:
         pass
+
+    def subscribe(self, request, opening_post):
+        settings_manager = get_settings_manager(request)
+        settings_manager.add_or_read_fav_thread(opening_post)
+
+    def unsubscribe(self, request, opening_post):
+        settings_manager = get_settings_manager(request)
+        settings_manager.del_fav_thread(opening_post)

requirements.txt

@@ -1,5 +1,6 b''
 httplib2
 simplejson
+pytube
 requests
 adjacent
 django-haystack