Merged with default

boards/abstracts/tripcode.py

@@ -0,0 +1,26 b''
+class Tripcode:
+    def __init__(self, code_str):
+        self.tripcode = code_str
+
+    def get_color(self):
+        return self.tripcode[:6]
+
+    def get_background(self):
+        code = self.get_color()
+        result = ''
+
+        for i in range(0, len(code), 2):
+            p = code[i:i+2]
+            background = hex(255 - int(p, 16))[2:]
+            if len(background) < 2:
+                background = '0' + background
+            result += background
+
+        return result
+
+    def get_short_text(self):
+        return self.tripcode[:8]
+
+    def get_full_text(self):
+        return self.tripcode
+

boards/migrations/0020_auto_20150731_1738.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', '0019_auto_20150519_1323'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='post',
+            name='images',
+            field=models.ManyToManyField(to='boards.PostImage', blank=True, null=True, db_index=True, related_name='post_images'),
+        ),
+    ]

boards/migrations/0021_tag_description.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', '0020_auto_20150731_1738'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='tag',
+            name='description',
+            field=models.TextField(blank=True),
+        ),
+    ]

boards/migrations/0022_auto_20150812_1819.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', '0021_tag_description'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='thread',
+            name='tags',
+            field=models.ManyToManyField(related_name='thread_tags', to='boards.Tag'),
+        ),
+    ]

boards/migrations/0023_auto_20150818_1026.py

@@ -0,0 +1,29 b''
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+import boards.models.attachment
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('boards', '0022_auto_20150812_1819'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Attachment',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', primary_key=True, serialize=False, auto_created=True)),
+                ('file', models.FileField(upload_to=boards.models.attachment.Attachment._update_filename)),
+                ('mimetype', models.CharField(max_length=50)),
+                ('hash', models.CharField(max_length=36)),
+            ],
+        ),
+        migrations.AddField(
+            model_name='post',
+            name='attachments',
+            field=models.ManyToManyField(blank=True, null=True, related_name='attachment_posts', to='boards.Attachment'),
+        ),
+    ]

boards/migrations/0024_post_tripcode.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', '0023_auto_20150818_1026'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='post',
+            name='tripcode',
+            field=models.CharField(max_length=50, null=True),
+        ),
+    ]

boards/migrations/0025_auto_20150825_2049.py

@@ -0,0 +1,21 b''
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    def refuild_refmap(apps, schema_editor):
+        Post = apps.get_model('boards', 'Post')
+        for post in Post.objects.all():
+            post.build_refmap()
+            post.save(update_fields=['refmap'])
+
+    dependencies = [
+        ('boards', '0024_post_tripcode'),
+    ]
+
+    operations = [
+        migrations.RunPython(refuild_refmap),
+    ]

boards/migrations/0026_auto_20150830_2006.py

@@ -0,0 +1,48 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.CreateModel(
+            name='GlobalId',
+            fields=[
+                ('id', models.AutoField(serialize=False, verbose_name='ID', primary_key=True, auto_created=True)),
+                ('key', models.TextField()),
+                ('key_type', models.TextField()),
+                ('local_id', models.IntegerField()),
+            ],
+        ),
+        migrations.CreateModel(
+            name='KeyPair',
+            fields=[
+                ('id', models.AutoField(serialize=False, verbose_name='ID', primary_key=True, auto_created=True)),
+                ('public_key', models.TextField()),
+                ('private_key', models.TextField()),
+                ('key_type', models.TextField()),
+                ('primary', models.BooleanField(default=False)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Signature',
+            fields=[
+                ('id', models.AutoField(serialize=False, verbose_name='ID', primary_key=True, auto_created=True)),
+                ('key_type', models.TextField()),
+                ('key', models.TextField()),
+                ('signature', models.TextField()),
+                ('global_id', models.ForeignKey(to='boards.GlobalId')),
+            ],
+        ),
+        migrations.AddField(
+            model_name='post',
+            name='global_id',
+            field=models.OneToOneField(to='boards.GlobalId', null=True, blank=True),
+        ),
+    ]

boards/models/attachment/__init__.py

@@ -0,0 +1,60 b''
+import os
+import time
+from random import random
+
+from django.db import models
+
+from boards import utils
+from boards.models.attachment.viewers import get_viewers, AbstractViewer
+
+FILES_DIRECTORY = 'files/'
+FILE_EXTENSION_DELIMITER = '.'
+
+
+class AttachmentManager(models.Manager):
+    def create_with_hash(self, file):
+        file_hash = utils.get_file_hash(file)
+        existing = self.filter(hash=file_hash)
+        if len(existing) > 0:
+            attachment = existing[0]
+        else:
+            file_type = file.name.split(FILE_EXTENSION_DELIMITER)[-1].lower()
+            attachment = Attachment.objects.create(
+                file=file, mimetype=file_type, hash=file_hash)
+
+        return attachment
+
+
+class Attachment(models.Model):
+    objects = AttachmentManager()
+
+    # TODO Dedup the method
+    def _update_filename(self, filename):
+        """
+        Gets unique filename
+        """
+
+        # TODO Use something other than random number in file name
+        new_name = '{}{}.{}'.format(
+            str(int(time.mktime(time.gmtime()))),
+            str(int(random() * 1000)),
+            filename.split(FILE_EXTENSION_DELIMITER)[-1:][0])
+
+        return os.path.join(FILES_DIRECTORY, new_name)
+
+    file = models.FileField(upload_to=_update_filename)
+    mimetype = models.CharField(max_length=50)
+    hash = models.CharField(max_length=36)
+
+    def get_view(self):
+        file_viewer = None
+        for viewer in get_viewers():
+            if viewer.supports(self.mimetype):
+                file_viewer = viewer
+                break
+        if file_viewer is None:
+            file_viewer = AbstractViewer
+
+        return file_viewer(self.file, self.mimetype).get_view()
+
+

boards/models/attachment/viewers.py

@@ -0,0 +1,70 b''
+from django.template.defaultfilters import filesizeformat
+from django.contrib.staticfiles.templatetags.staticfiles import static
+
+FILE_STUB_IMAGE = 'images/file.png'
+
+FILE_TYPES_VIDEO = (
+    'webm',
+    'mp4',
+)
+FILE_TYPE_SVG = 'svg'
+FILE_TYPES_AUDIO = (
+    'ogg',
+    'mp3',
+)
+
+
+def get_viewers():
+    return AbstractViewer.__subclasses__()
+
+
+class AbstractViewer:
+    def __init__(self, file, file_type):
+        self.file = file
+        self.file_type = file_type
+
+    @staticmethod
+    def supports(file_type):
+        return True
+
+    def get_view(self):
+        return '<div class="image">'\
+               '{}'\
+               '<div class="image-metadata"><a href="{}" download >{}, {}</a></div>'\
+               '</div>'.format(self.get_format_view(), self.file.url,
+                               self.file_type, filesizeformat(self.file.size))
+
+    def get_format_view(self):
+        return '<a href="{}">'\
+               '<img src="{}" width="200" height="150"/>'\
+               '</a>'.format(self.file.url, static(FILE_STUB_IMAGE))
+
+
+class VideoViewer(AbstractViewer):
+    @staticmethod
+    def supports(file_type):
+        return file_type in FILE_TYPES_VIDEO
+
+    def get_format_view(self):
+        return '<video width="200" height="150" controls src="{}"></video>'\
+               .format(self.file.url)
+
+
+class AudioViewer(AbstractViewer):
+    @staticmethod
+    def supports(file_type):
+        return file_type in FILE_TYPES_AUDIO
+
+    def get_format_view(self):
+        return '<audio controls src="{}"></audio>'.format(self.file.url)
+
+
+class SvgViewer(AbstractViewer):
+    @staticmethod
+    def supports(file_type):
+        return file_type == FILE_TYPE_SVG
+
+    def get_format_view(self):
+        return '<a class="thumb" href="{}">'\
+               '<img class="post-image-preview" width="200" height="150" src="{}" />'\
+               '</a>'.format(self.file.url, self.file.url)

boards/templates/boards/random.html

@@ -0,0 +1,37 b''
+{% extends "boards/base.html" %}
+
+{% load i18n %}
+
+{% block head %}
+    <title>{% trans 'Random images' %} - {{ site_name }}</title>
+{% endblock %}
+
+{% block content %}
+
+    {% if images %}
+        <div class="random-images-table">
+            <div>
+            {% for image in images %}
+                <div class="gallery_image">
+                    {% autoescape off %}
+                        {{ image.get_view }}
+                    {% endautoescape %}
+                    {% with image.get_random_associated_post as post %}
+                        {{ post.get_link_view|safe }}
+                        <div>
+                        {% for tag in post.get_thread.get_required_tags.all %}
+                            {{ tag.get_view|safe }}{% if not forloop.last %},{% endif %}
+                        {% endfor %}
+                        </div>
+                    {% endwith %}
+                </div>
+                {% if forloop.counter|divisibleby:"3" %}
+                </div>
+                <div>
+                {% endif %}
+            {% endfor %}
+            </div>
+        </div>
+    {% endif %}
+
+{% endblock %}

boards/views/random.py

@@ -0,0 +1,22 b''
+from django.shortcuts import render
+from django.views.generic import View
+
+from boards.models import PostImage
+
+__author__ = 'neko259'
+
+TEMPLATE = 'boards/random.html'
+
+CONTEXT_IMAGES = 'images'
+
+RANDOM_POST_COUNT = 9
+
+
+class RandomImageView(View):
+    def get(self, request):
+        params = dict()
+
+        params[CONTEXT_IMAGES] = PostImage.objects.get_random_images(
+            RANDOM_POST_COUNT)
+
+        return render(request, TEMPLATE, params)

.hgtags

@@ -33,3 +33,4 b' 836d8bb9fcd930b952b9a02029442c71c2441983'
 dfb6c481b1a2c33705de9a9b5304bc924c46b202 2.8.1
 4a5bec08ccfb47a27f9e98698f12dd5b7246623b 2.8.2
 604935b98f5b5e4a5e903594f048046e1fbb3519 2.8.3
+c48ffdc671566069ed0f33644da1229277f3cd18 2.9.0

boards/abstracts/settingsmanager.py

@@ -1,6 +1,7 b''
-from django.shortcuts import get_object_or_404
 from boards.models import Tag
 
+MAX_TRIPCODE_COLLISIONS = 50
+
 __author__ = 'neko259'
 
 SESSION_SETTING = 'setting'
@@ -15,6 +16,7 b" SETTING_PERMISSIONS = 'permissions'"
 SETTING_USERNAME = 'username'
 SETTING_LAST_NOTIFICATION_ID = 'last_notification'
 SETTING_IMAGE_VIEWER = 'image_viewer'
+SETTING_TRIPCODE = 'tripcode'
 
 DEFAULT_THEME = 'md'
 
@@ -130,6 +132,7 b' class SessionSettingsManager(SettingsMan'
         if setting in self.session:
             return self.session[setting]
         else:
+            self.set_setting(setting, default)
             return default
 
     def set_setting(self, setting, value):

boards/config/default_settings.ini

@@ -1,5 +1,5 b''
 [Version]
-Version = 2.8.3 Charlie
+Version = 2.9.0 Claire
 SiteName = Neboard DEV
 
 [Cache]
@@ -9,7 +9,7 b' CacheTimeout = 600'
 [Forms]
 # Max post length in characters
 MaxTextLength = 30000
-MaxImageSize = 8000000
+MaxFileSize = 8000000
 LimitPostingSpeed = false
 
 [Messages]

boards/forms.py

@@ -1,7 +1,8 b''
+import hashlib
 import re
 import time
+
 import pytz
-
 from django import forms
 from django.core.files.uploadedfile import SimpleUploadedFile
 from django.core.exceptions import ObjectDoesNotExist
@@ -14,18 +15,11 b' from boards.models.post import TITLE_MAX'
 from boards.models import Tag, Post
 from neboard import settings
 import boards.settings as board_settings
+import neboard
 
 HEADER_CONTENT_LENGTH = 'content-length'
 HEADER_CONTENT_TYPE = 'content-type'
 
-CONTENT_TYPE_IMAGE = (
-    'image/jpeg',
-    'image/jpg',
-    'image/png',
-    'image/gif',
-    'image/bmp',
-)
-
 REGEX_TAGS = re.compile(r'^[\w\s\d]+$', re.UNICODE)
 
 VETERAN_POSTING_DELAY = 5
@@ -47,7 +41,7 b" ERROR_SPEED = _('Please wait %s seconds "
 
 TAG_MAX_LENGTH = 20
 
-IMAGE_DOWNLOAD_CHUNK_BYTES = 100000
+FILE_DOWNLOAD_CHUNK_BYTES = 100000
 
 HTTP_RESULT_OK = 200
 
@@ -137,17 +131,20 b' class NeboardForm(forms.Form):'
 class PostForm(NeboardForm):
 
     title = forms.CharField(max_length=TITLE_MAX_LENGTH, required=False,
-                            label=LABEL_TITLE)
+                            label=LABEL_TITLE,
+                            widget=forms.TextInput(
+                                attrs={ATTRIBUTE_PLACEHOLDER:
+                                           'test#tripcode'}))
     text = forms.CharField(
         widget=FormatPanel(attrs={
             ATTRIBUTE_PLACEHOLDER: TEXT_PLACEHOLDER,
             ATTRIBUTE_ROWS: TEXTAREA_ROWS,
         }),
         required=False, label=LABEL_TEXT)
-    image = forms.ImageField(required=False, label=_('Image'),
+    file = forms.FileField(required=False, label=_('File'),
                              widget=forms.ClearableFileInput(
-                                 attrs={'accept': 'image/*'}))
-    image_url = forms.CharField(required=False, label=_('Image URL'),
+                                 attrs={'accept': 'file/*'}))
+    file_url = forms.CharField(required=False, label=_('File URL'),
                                 widget=forms.TextInput(
                                     attrs={ATTRIBUTE_PLACEHOLDER:
                                                'http://example.com/image.png'}))
@@ -181,27 +178,27 b' class PostForm(NeboardForm):'
                                               'characters') % str(max_length))
         return text
 
-    def clean_image(self):
-        image = self.cleaned_data['image']
+    def clean_file(self):
+        file = self.cleaned_data['file']
 
-        if image:
-            self.validate_image_size(image.size)
+        if file:
+            self.validate_file_size(file.size)
 
-        return image
+        return file
 
-    def clean_image_url(self):
-        url = self.cleaned_data['image_url']
+    def clean_file_url(self):
+        url = self.cleaned_data['file_url']
 
-        image = None
+        file = None
         if url:
-            image = self._get_image_from_url(url)
+            file = self._get_file_from_url(url)
 
-            if not image:
+            if not file:
                 raise forms.ValidationError(_('Invalid URL'))
             else:
-                self.validate_image_size(image.size)
+                self.validate_file_size(file.size)
 
-        return image
+        return file
 
     def clean_threads(self):
         threads_str = self.cleaned_data['threads']
@@ -230,27 +227,40 b' class PostForm(NeboardForm):'
             raise forms.ValidationError('A human cannot enter a hidden field')
 
         if not self.errors:
-            self._clean_text_image()
+            self._clean_text_file()
 
         if not self.errors and self.session:
             self._validate_posting_speed()
 
         return cleaned_data
 
-    def get_image(self):
+    def get_file(self):
         """
-        Gets image from file or URL.
+        Gets file from form or URL.
         """
 
-        image = self.cleaned_data['image']
-        return image if image else self.cleaned_data['image_url']
+        file = self.cleaned_data['file']
+        return file or self.cleaned_data['file_url']
+
+    def get_tripcode(self):
+        title = self.cleaned_data['title']
+        if title is not None and '#' in title:
+            code = title.split('#', maxsplit=1)[1] + neboard.settings.SECRET_KEY
+            return hashlib.md5(code.encode()).hexdigest()
 
-    def _clean_text_image(self):
+    def get_title(self):
+        title = self.cleaned_data['title']
+        if title is not None and '#' in title:
+            return title.split('#', maxsplit=1)[0]
+        else:
+            return title
+
+    def _clean_text_file(self):
         text = self.cleaned_data.get('text')
-        image = self.get_image()
+        file = self.get_file()
 
-        if (not text) and (not image):
-            error_message = _('Either text or image must be entered.')
+        if (not text) and (not file):
+            error_message = _('Either text or file must be entered.')
             self._errors['text'] = self.error_class([error_message])
 
     def _validate_posting_speed(self):
@@ -284,16 +294,16 b' class PostForm(NeboardForm):'
             if can_post:
                 self.session[LAST_POST_TIME] = now
 
-    def validate_image_size(self, size: int):
-        max_size = board_settings.get_int('Forms', 'MaxImageSize')
+    def validate_file_size(self, size: int):
+        max_size = board_settings.get_int('Forms', 'MaxFileSize')
         if size > max_size:
             raise forms.ValidationError(
-                _('Image must be less than %s bytes')
+                _('File must be less than %s bytes')
                 % str(max_size))
 
-    def _get_image_from_url(self, url: str) -> SimpleUploadedFile:
+    def _get_file_from_url(self, url: str) -> SimpleUploadedFile:
         """
-        Gets an image file from URL.
+        Gets an file file from URL.
         """
 
         img_temp = None
@@ -302,30 +312,29 b' class PostForm(NeboardForm):'
             # Verify content headers
             response_head = requests.head(url, verify=False)
             content_type = response_head.headers[HEADER_CONTENT_TYPE].split(';')[0]
-            if content_type in CONTENT_TYPE_IMAGE:
-                length_header = response_head.headers.get(HEADER_CONTENT_LENGTH)
-                if length_header:
-                    length = int(length_header)
-                    self.validate_image_size(length)
-                # Get the actual content into memory
-                response = requests.get(url, verify=False, stream=True)
+            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 image, stop if the size exceeds limit
-                size = 0
-                content = b''
-                for chunk in response.iter_content(IMAGE_DOWNLOAD_CHUNK_BYTES):
-                    size += len(chunk)
-                    self.validate_image_size(size)
-                    content += chunk
+            # 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 = 'image.' + content_type.split('/')[1]
-                    img_temp = SimpleUploadedFile(filename, content,
-                                                  content_type)
-        except Exception:
-            # Just return no image
+            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)
+        except Exception as e:
+            # Just return no file
             pass
 
         return img_temp
@@ -356,8 +365,7 b' class ThreadForm(PostForm):'
         if not required_tag_exists:
             all_tags = Tag.objects.filter(required=True)
             raise forms.ValidationError(
-                _('Need at least one of the tags: ')
-                + ', '.join([tag.name for tag in all_tags]))
+                _('Need at least one section.'))
 
         return tags
 

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-05-19 17:51+0300\n"
+"POT-Creation-Date: 2015-08-22 15:07+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,80 +38,84 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:35
+#: forms.py:31
 msgid "Type message here. Use formatting panel for more advanced usage."
 msgstr ""
 "Вводите сообщение сюда. Используйте панель для более сложного форматирования."
 
-#: forms.py:36
+#: forms.py:32
 msgid "music images i_dont_like_tags"
 msgstr "музыка картинки теги_не_нужны"
 
-#: forms.py:38
+#: forms.py:34
 msgid "Title"
 msgstr "Заголовок"
 
-#: forms.py:39
+#: forms.py:35
 msgid "Text"
 msgstr "Текст"
 
-#: forms.py:40
+#: forms.py:36
 msgid "Tag"
 msgstr "Метка"
 
-#: forms.py:41 templates/boards/base.html:40 templates/search/search.html:7
+#: forms.py:37 templates/boards/base.html:40 templates/search/search.html:7
 msgid "Search"
 msgstr "Поиск"
 
-#: forms.py:43
+#: forms.py:39
 #, python-format
 msgid "Please wait %s seconds before sending message"
 msgstr "Пожалуйста подождите %s секунд перед отправкой сообщения"
 
-#: forms.py:144
-msgid "Image"
-msgstr "Изображение"
+#: forms.py:140
+msgid "File"
+msgstr "Файл"
 
-#: forms.py:147
-msgid "Image URL"
-msgstr "URL изображения"
+#: forms.py:143
+msgid "File URL"
+msgstr "URL файла"
 
-#: forms.py:153
+#: forms.py:149
 msgid "e-mail"
 msgstr ""
 
-#: forms.py:156
+#: forms.py:152
 msgid "Additional threads"
 msgstr "Дополнительные темы"
 
-#: forms.py:167
+#: forms.py:155
+msgid "Tripcode"
+msgstr "Трипкод"
+
+#: forms.py:164
 #, python-format
 msgid "Title must have less than %s characters"
 msgstr "Заголовок должен иметь меньше %s символов"
 
-#: forms.py:177
+#: forms.py:174
 #, python-format
 msgid "Text must have less than %s characters"
 msgstr "Текст должен быть короче %s символов"
 
-#: forms.py:197
+#: forms.py:194
 msgid "Invalid URL"
 msgstr "Неверный URL"
 
-#: forms.py:218
+#: forms.py:215
 msgid "Invalid additional thread list"
 msgstr "Неверный список дополнительных тем"
 
-#: forms.py:250
-msgid "Either text or image must be entered."
-msgstr "Текст или картинка должны быть введены."
+#: forms.py:251
+msgid "Either text or file must be entered."
+msgstr "Текст или файл должны быть введены."
 
-#: forms.py:288
+#: forms.py:289
 #, python-format
-msgid "Image must be less than %s bytes"
-msgstr "Изображение должно быть менее %s байт"
+msgid "File must be less than %s bytes"
+msgstr "Файл должен быть менее %s байт"
 
-#: forms.py:335 templates/boards/all_threads.html:129
+#: forms.py:335 templates/boards/all_threads.html:154
 #: templates/boards/rss/post.html:10 templates/boards/tags.html:6
 msgid "Tags"
 msgstr "Метки"
@@ -121,26 +125,27 b' msgid "Inappropriate characters in tags.'
 msgstr "Недопустимые символы в метках."
 
 #: forms.py:356
-msgid "Need at least one of the tags: "
-msgstr "Нужна хотя бы одна из меток: "
+msgid "Need at least one section."
+msgstr "Нужен хотя бы один раздел."
 
-#: forms.py:369
+#: forms.py:368
 msgid "Theme"
 msgstr "Тема"
 
-#: forms.py:370
+#: forms.py:369
+#| msgid "Image view mode"
 msgid "Image view mode"
 msgstr "Режим просмотра изображений"
 
-#: forms.py:371
+#: forms.py:370
 msgid "User name"
 msgstr "Имя пользователя"
 
-#: forms.py:372
+#: forms.py:371
 msgid "Time zone"
 msgstr "Часовой пояс"
 
-#: forms.py:378
+#: forms.py:377
 msgid "Inappropriate characters."
 msgstr "Недопустимые символы."
 
@@ -156,54 +161,67 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:60
+#: templates/boards/all_threads.html:71
 msgid "Edit tag"
 msgstr "Изменить метку"
 
-#: templates/boards/all_threads.html:63
+#: templates/boards/all_threads.html:79
 #, python-format
-msgid "This tag has %(thread_count)s threads and %(post_count)s posts."
-msgstr "С этой меткой есть %(thread_count)s тем и %(post_count)s сообщений."
+msgid ""
+"This tag has %(thread_count)s threads (%(active_thread_count)s active) and "
+"%(post_count)s posts."
+msgstr ""
+"С этой меткой есть %(thread_count)s тем (%(active_thread_count)s активных) и "
+"%(post_count)s сообщений."
 
-#: templates/boards/all_threads.html:70 templates/boards/feed.html:30
+#: templates/boards/all_threads.html:81
+msgid "Related tags:"
+msgstr "Похожие метки:"
+
+#: templates/boards/all_threads.html:96 templates/boards/feed.html:30
 #: templates/boards/notifications.html:17 templates/search/search.html:26
 msgid "Previous page"
 msgstr "Предыдущая страница"
 
-#: templates/boards/all_threads.html:84
+#: templates/boards/all_threads.html:110
 #, python-format
 msgid "Skipped %(count)s replies. Open thread to see all replies."
 msgstr "Пропущено %(count)s ответов. Откройте тред, чтобы увидеть все ответы."
 
-#: templates/boards/all_threads.html:102 templates/boards/feed.html:40
+#: templates/boards/all_threads.html:128 templates/boards/feed.html:40
 #: templates/boards/notifications.html:27 templates/search/search.html:37
 msgid "Next page"
 msgstr "Следующая страница"
 
-#: templates/boards/all_threads.html:107
+#: templates/boards/all_threads.html:133
 msgid "No threads exist. Create the first one!"
 msgstr "Нет тем. Создайте первую!"
 
-#: templates/boards/all_threads.html:113
+#: templates/boards/all_threads.html:139
 msgid "Create new thread"
 msgstr "Создать новую тему"
 
-#: templates/boards/all_threads.html:118 templates/boards/preview.html:16
+#: templates/boards/all_threads.html:144 templates/boards/preview.html:16
 #: templates/boards/thread_normal.html:38
 msgid "Post"
 msgstr "Отправить"
 
-#: templates/boards/all_threads.html:123
+#: templates/boards/all_threads.html:149
 msgid "Tags must be delimited by spaces. Text or image is required."
 msgstr ""
 "Метки должны быть разделены пробелами. Текст или изображение обязательны."
 
-#: templates/boards/all_threads.html:126
-#: templates/boards/thread_normal.html:43
+#: 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
 msgid "Text syntax"
 msgstr "Синтаксис текста"
 
-#: templates/boards/all_threads.html:143 templates/boards/feed.html:53
+#: templates/boards/all_threads.html:167 templates/boards/feed.html:53
 msgid "Pages:"
 msgstr "Страницы: "
 
@@ -251,25 +269,33 b' msgstr "\xd0\xbf\xd0\xbe\xd0\xb8\xd1\x81\xd0\xba"'
 msgid "feed"
 msgstr "лента"
 
-#: templates/boards/base.html:44 templates/boards/base.html.py:45
+#: templates/boards/base.html:42 templates/boards/random.html:6
+msgid "Random images"
+msgstr "Случайные изображения"
+
+#: templates/boards/base.html:42
+msgid "random"
+msgstr "случайные"
+
+#: templates/boards/base.html:45 templates/boards/base.html.py:46
 #: templates/boards/notifications.html:8
 msgid "Notifications"
 msgstr "Уведомления"
 
-#: templates/boards/base.html:52 templates/boards/settings.html:8
+#: templates/boards/base.html:53 templates/boards/settings.html:8
 msgid "Settings"
 msgstr "Настройки"
 
-#: templates/boards/base.html:65
+#: templates/boards/base.html:66
 msgid "Admin"
 msgstr "Администрирование"
 
-#: templates/boards/base.html:67
+#: templates/boards/base.html:68
 #, python-format
 msgid "Speed: %(ppd)s posts per day"
 msgstr "Скорость: %(ppd)s сообщений в день"
 
-#: templates/boards/base.html:69
+#: templates/boards/base.html:70
 msgid "Up"
 msgstr "Вверх"
 
@@ -277,58 +303,62 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:25
+#: templates/boards/post.html:30
 msgid "Open"
 msgstr "Открыть"
 
-#: templates/boards/post.html:27 templates/boards/post.html.py:38
+#: templates/boards/post.html:32 templates/boards/post.html.py:43
 msgid "Reply"
 msgstr "Ответить"
 
-#: templates/boards/post.html:33
+#: templates/boards/post.html:38
 msgid " in "
 msgstr " в "
 
-#: templates/boards/post.html:43
+#: templates/boards/post.html:48
 msgid "Edit"
 msgstr "Изменить"
 
-#: templates/boards/post.html:45
+#: templates/boards/post.html:50
 msgid "Edit thread"
 msgstr "Изменить тему"
 
-#: templates/boards/post.html:84
+#: templates/boards/post.html:97
 msgid "Replies"
 msgstr "Ответы"
 
-#: templates/boards/post.html:97 templates/boards/thread.html:37
+#: templates/boards/post.html:109 templates/boards/thread.html:34
 msgid "messages"
 msgstr "сообщений"
 
-#: templates/boards/post.html:98 templates/boards/thread.html:38
+#: templates/boards/post.html:110 templates/boards/thread.html:35
 msgid "images"
 msgstr "изображений"
 
-#: 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
+#: templates/boards/settings.html:15
 msgid "You are moderator."
 msgstr "Вы модератор."
 
-#: templates/boards/settings.html:20
+#: templates/boards/settings.html:19
 msgid "Hidden tags:"
 msgstr "Скрытые метки:"
 
-#: templates/boards/settings.html:28
+#: templates/boards/settings.html:27
 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
 msgid "Save"
 msgstr "Сохранить"
@@ -375,34 +405,35 b' msgstr "\xd0\x9a\xd0\xbe\xd0\xbc\xd0\xbc\xd0\xb5\xd0\xbd\xd1\x82\xd0\xb0\xd1\x80\xd0\xb8\xd0\xb9"'
 msgid "Quote"
 msgstr "Цитата"
 
-#: templates/boards/staticpages/help.html:20
+#: templates/boards/staticpages/help.html:21
 msgid "You can try pasting the text and previewing the result here:"
 msgstr "Вы можете попробовать вставить текст и проверить результат здесь:"
 
-#: templates/boards/tags.html:21
-msgid "No tags found."
-msgstr "Метки не найдены."
+#: templates/boards/tags.html:17
+msgid "Sections:"
+msgstr "Разделы:"
 
-#: templates/boards/tags.html:24
-msgid "All tags"
-msgstr "Все метки"
+#: templates/boards/tags.html:30
+msgid "Other tags:"
+msgstr "Другие метки:"
+
+#: templates/boards/tags.html:43
+msgid "All tags..."
+msgstr "Все метки..."
 
 #: templates/boards/thread.html:15
-#| msgid "Normal mode"
 msgid "Normal"
 msgstr "Нормальный"
 
 #: templates/boards/thread.html:16
-#| msgid "Gallery mode"
 msgid "Gallery"
 msgstr "Галерея"
 
 #: templates/boards/thread.html:17
-#| msgid "Tree mode"
 msgid "Tree"
 msgstr "Дерево"
 
-#: templates/boards/thread.html:39
+#: templates/boards/thread.html:36
 msgid "Last update: "
 msgstr "Последнее обновление: "
 
@@ -418,14 +449,14 b' msgstr "\xd1\x81\xd0\xbe\xd0\xbe\xd0\xb1\xd1\x89\xd0\xb5\xd0\xbd\xd0\xb8\xd0\xb9 \xd0\xb4\xd0\xbe \xd0\xb1\xd0\xb0\xd0\xbc\xd0\xbf\xd0\xbb\xd0\xb8\xd0\xbc\xd0\xb8\xd1\x82\xd0\xb0"'
 msgid "Reply to thread"
 msgstr "Ответить в тему"
 
-#: templates/boards/thread_normal.html:44
+#: templates/boards/thread_normal.html:31
+msgid "to message "
+msgstr "на сообщение"
+
+#: templates/boards/thread_normal.html:46
 msgid "Close form"
 msgstr "Закрыть форму"
 
-#: templates/boards/thread_normal.html:58
-msgid "Update"
-msgstr "Обновить"
-
 #: templates/search/search.html:17
 msgid "Ok"
 msgstr "Ок"

boards/management/commands/cleanfiles.py

@@ -2,6 +2,8 b' import os'
 
 from django.core.management import BaseCommand
 from django.db import transaction
+from boards.models import Attachment
+from boards.models.attachment import FILES_DIRECTORY
 
 from boards.models.image import IMAGES_DIRECTORY, PostImage, IMAGE_THUMB_SIZE
 from neboard.settings import MEDIA_ROOT
@@ -11,7 +13,7 b' from neboard.settings import MEDIA_ROOT'
 
 
 class Command(BaseCommand):
-    help = 'Remove image files whose models were deleted'
+    help = 'Remove files whose models were deleted'
 
     @transaction.atomic
     def handle(self, *args, **options):
@@ -21,10 +23,24 b' class Command(BaseCommand):'
         model_files = os.listdir(MEDIA_ROOT + IMAGES_DIRECTORY)
         for file in model_files:
             image_name = file if thumb_prefix not in file else file.replace(thumb_prefix, '')
-            found = PostImage.objects.filter(image=IMAGES_DIRECTORY + image_name).exists()
+            found = PostImage.objects.filter(
+                image=IMAGES_DIRECTORY + image_name).exists()
 
             if not found:
                 print('Missing {}'.format(image_name))
                 os.remove(MEDIA_ROOT + IMAGES_DIRECTORY + file)
                 count += 1
-        print('Deleted {} image files.'.format(count))
  No newline at end of file
+        print('Deleted {} image files.'.format(count))
+
+        count = 0
+        model_files = os.listdir(MEDIA_ROOT + FILES_DIRECTORY)
+        for file in model_files:
+            found = Attachment.objects.filter(file=FILES_DIRECTORY + file)\
+                .exists()
+
+            if not found:
+                print('Missing {}'.format(file))
+                os.remove(MEDIA_ROOT + FILES_DIRECTORY + file)
+                count += 1
+
+        print('Deleted {} attachment files.'.format(count))

boards/mdx_neboard.py

@@ -130,7 +130,7 b' def render_reflink(tag_name, value, opti'
         try:
             post = boards.models.Post.objects.get(id=post_id)
 
-            result = '<a href="%s">&gt;&gt;%s</a>' % (post.get_absolute_url(), post_id)
+            result = post.get_link_view()
         except ObjectDoesNotExist:
             pass
 

boards/models/__init__.py

@@ -3,6 +3,7 b''
 from boards.models.signature import GlobalId, Signature
 from boards.models.sync_key import KeyPair
 from boards.models.image import PostImage
+from boards.models.attachment import Attachment
 from boards.models.thread import Thread
 from boards.models.post import Post
 from boards.models.tag import Tag

boards/models/image.py

@@ -2,8 +2,12 b' import hashlib'
 import os
 from random import random
 import time
+
 from django.db import models
-from boards import thumbs
+from django.template.defaultfilters import filesizeformat
+
+from boards import thumbs, utils
+import boards
 from boards.models.base import Viewable
 
 __author__ = 'neko259'
@@ -20,7 +24,7 b" CSS_CLASS_THUMB = 'thumb'"
 
 class PostImageManager(models.Manager):
     def create_with_hash(self, image):
-        image_hash = self.get_hash(image)
+        image_hash = utils.get_file_hash(image)
         existing = self.filter(hash=image_hash)
         if len(existing) > 0:
             post_image = existing[0]
@@ -29,14 +33,11 b' class PostImageManager(models.Manager):'
 
         return post_image
 
-    def get_hash(self, image):
-        """
-        Gets hash of an image.
-        """
-        md5 = hashlib.md5()
-        for chunk in image.chunks():
-            md5.update(chunk)
-        return md5.hexdigest()
+    def get_random_images(self, count, include_archived=False, tags=None):
+        images = self.filter(post_images__thread__archived=include_archived)
+        if tags is not None:
+            images = images.filter(post_images__threads__tags__in=tags)
+        return images.order_by('?')[:count]
 
 
 class PostImage(models.Model, Viewable):
@@ -51,15 +52,13 b' class PostImage(models.Model, Viewable):'
         Gets unique image filename
         """
 
-        path = IMAGES_DIRECTORY
-
         # TODO Use something other than random number in file name
         new_name = '{}{}.{}'.format(
             str(int(time.mktime(time.gmtime()))),
             str(int(random() * 1000)),
             filename.split(FILE_EXTENSION_DELIMITER)[-1:][0])
 
-        return os.path.join(path, new_name)
+        return os.path.join(IMAGES_DIRECTORY, new_name)
 
     width = models.IntegerField(default=0)
     height = models.IntegerField(default=0)
@@ -81,13 +80,15 b' class PostImage(models.Model, Viewable):'
         """
 
         if not self.pk and self.image:
-            self.hash = PostImage.objects.get_hash(self.image)
+            self.hash = utils.get_file_hash(self.image)
         super(PostImage, self).save(*args, **kwargs)
 
     def __str__(self):
         return self.image.url
 
     def get_view(self):
+        metadata = '{}, {}'.format(self.image.name.split('.')[-1],
+                                   filesizeformat(self.image.size))
         return '<div class="{}">' \
                '<a class="{}" href="{full}">' \
                '<img class="post-image-preview"' \
@@ -98,8 +99,16 b' class PostImage(models.Model, Viewable):'
                ' data-width="{}"' \
                ' data-height="{}" />' \
                '</a>' \
+               '<div class="image-metadata">'\
+               '<a href="{full}" download>{image_meta}</a>'\
+               '</div>' \
                '</div>'\
             .format(CSS_CLASS_IMAGE, CSS_CLASS_THUMB,
                     self.image.url_200x150,
                     str(self.hash), str(self.pre_width),
-                    str(self.pre_height), str(self.width), str(self.height), full=self.image.url)
+                    str(self.pre_height), str(self.width), str(self.height),
+                    full=self.image.url, image_meta=metadata)
+
+    def get_random_associated_post(self):
+        posts = boards.models.Post.objects.filter(images__in=[self])
+        return posts.order_by('?').first()

boards/models/post/__init__.py

@@ -1,3 +1,5 b''
+from datetime import datetime, timedelta, date
+from datetime import time as dtime
 import logging
 import re
 import uuid
@@ -6,15 +8,14 b' from django.core.exceptions import Objec'
 from django.core.urlresolvers import reverse
 from django.db import models
 from django.db.models import TextField, QuerySet
-
 from django.template.loader import render_to_string
-
 from django.utils import timezone
 
+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
+from boards.models import PostImage, Attachment
 from boards.models.base import Viewable
 from boards.models.post.export import get_exporter, DIFF_TYPE_JSON
 from boards.models.post.manager import PostManager
@@ -61,8 +62,6 b' POST_VIEW_PARAMS = ('
     'mode_tree',
 )
 
-REFMAP_STR = '<a href="{}">&gt;&gt;{}</a>'
-
 
 class Post(models.Model, Viewable):
     """A post is a message."""
@@ -79,7 +78,9 b' class Post(models.Model, Viewable):'
     _text_rendered = TextField(blank=True, null=True, editable=False)
 
     images = models.ManyToManyField(PostImage, null=True, blank=True,
-                                    related_name='ip+', db_index=True)
+                                    related_name='post_images', db_index=True)
+    attachments = models.ManyToManyField(Attachment, null=True, blank=True,
+            related_name='attachment_posts')
 
     poster_ip = models.GenericIPAddressField()
 
@@ -101,6 +102,8 b' class Post(models.Model, Viewable):'
     # server, this indicates the server.
     global_id = models.OneToOneField('GlobalId', null=True, blank=True)
 
+    tripcode = models.CharField(max_length=50, null=True)
+
     def __str__(self):
         return 'P#{}/{}'.format(self.id, self.title)
 
@@ -126,7 +129,7 b' class Post(models.Model, Viewable):'
         the server from recalculating the map on every post show.
         """
 
-        post_urls = [REFMAP_STR.format(refpost.get_absolute_url(), refpost.id)
+        post_urls = [refpost.get_link_view()
                      for refpost in self.referenced_posts.all()]
 
         self.refmap = ', '.join(post_urls)
@@ -209,10 +212,15 b' class Post(models.Model, Viewable):'
         """
 
         for image in self.images.all():
-            image_refs_count = Post.objects.filter(images__in=[image]).count()
+            image_refs_count = image.post_images.count()
             if image_refs_count == 1:
                 image.delete()
 
+        for attachment in self.attachments.all():
+            attachment_refs_count = attachment.attachment_posts.count()
+            if attachment_refs_count == 1:
+                attachment.delete()
+
         if self.global_id:
             self.global_id.delete()
 
@@ -399,3 +407,19 b' class Post(models.Model, Viewable):'
                 thread.last_edit_time = self.last_edit_time
                 thread.save(update_fields=['last_edit_time', 'bumpable'])
             self.threads.add(opening_post.get_thread())
+
+    def get_tripcode(self):
+        if self.tripcode:
+            return Tripcode(self.tripcode)
+
+    def get_link_view(self):
+        """
+        Gets view of a reflink to the post.
+        """
+
+        result = '<a href="{}">&gt;&gt;{}</a>'.format(self.get_absolute_url(),
+                self.id)
+        if self.is_opening():
+            result = '<b>{}</b>'.format(result)
+
+        return result

boards/models/post/manager.py

@@ -5,7 +5,7 b' from django.db import models, transactio'
 from django.utils import timezone
 from boards import utils
 from boards.mdx_neboard import Parser
-from boards.models import PostImage
+from boards.models import PostImage, Attachment
 import boards.models
 
 __author__ = 'vurdalak'
@@ -14,11 +14,19 b' import boards.models'
 NO_IP = '0.0.0.0'
 POSTS_PER_DAY_RANGE = 7
 
+IMAGE_TYPES = (
+    'jpeg',
+    'jpg',
+    'png',
+    'bmp',
+    'gif',
+)
+
 
 class PostManager(models.Manager):
     @transaction.atomic
-    def create_post(self, title: str, text: str, image=None, thread=None,
-                    ip=NO_IP, tags: list=None, opening_posts: list=None):
+    def create_post(self, title: str, text: str, file=None, thread=None,
+                    ip=NO_IP, tags: list=None, opening_posts: list=None, tripcode=None):
         """
         Creates new post
         """
@@ -50,49 +58,33 b' class PostManager(models.Manager):'
                            pub_time=posting_time,
                            poster_ip=ip,
                            thread=thread,
-                           last_edit_time=posting_time)
+                           last_edit_time=posting_time,
+                           tripcode=tripcode)
         post.threads.add(thread)
 
-        post.set_global_id()
-
         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))
-
-        if not new_thread:
-            thread.last_edit_time = posting_time
-            thread.bump()
-            thread.save()
+        # TODO Move this to other place
+        if file:
+            file_type = file.name.split('.')[-1].lower()
+            if file_type in IMAGE_TYPES:
+                post.images.add(PostImage.objects.create_with_hash(file))
+            else:
+                post.attachments.add(Attachment.objects.create_with_hash(file))
 
         post.build_url()
         post.connect_replies()
         post.connect_threads(opening_posts)
         post.connect_notifications()
-
-        return post
+        post.set_global_id()
 
-    @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:
-            thread = boards.models.thread.Thread.objects.create(
-                bump_time=pub_time, last_edit_time=pub_time)
-            list(map(thread.tags.add, tags))
-        else:
-            thread = opening_post.get_thread()
-
-        post = self.create(title=title, text=text,
-                           pub_time=pub_time,
-                           poster_ip=NO_IP,
-                           last_edit_time=pub_time,
-                           thread_id=thread.id, global_id=global_id)
-
-        post.build_url()
-        post.connect_replies()
-        post.connect_notifications()
+        # Thread needs to be bumped only when the post is already created
+        if not new_thread:
+            thread.last_edit_time = posting_time
+            thread.bump()
+            thread.save()
 
         return post
 
@@ -126,3 +118,23 b' class PostManager(models.Manager):'
         ppd = posts_per_period / POSTS_PER_DAY_RANGE
 
         return ppd
+
+    @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:
+            thread = boards.models.thread.Thread.objects.create(
+                bump_time=pub_time, last_edit_time=pub_time)
+            list(map(thread.tags.add, tags))
+        else:
+            thread = opening_post.get_thread()
+
+        post = self.create(title=title, text=text,
+                           pub_time=pub_time,
+                           poster_ip=NO_IP,
+                           last_edit_time=pub_time,
+                           thread_id=thread.id, global_id=global_id)
+
+        post.build_url()
+        post.connect_replies()
+        post.connect_notifications()

boards/models/tag.py

@@ -5,9 +5,12 b' from django.core.urlresolvers import rev'
 
 from boards.models.base import Viewable
 from boards.utils import cached_result
+import boards
+
+__author__ = 'neko259'
 
 
-__author__ = 'neko259'
+RELATED_TAGS_COUNT = 5
 
 
 class TagManager(models.Manager):
@@ -17,7 +20,7 b' class TagManager(models.Manager):'
         Gets tags that have non-archived threads.
         """
 
-        return self.annotate(num_threads=Count('thread')).filter(num_threads__gt=0)\
+        return self.annotate(num_threads=Count('thread_tags')).filter(num_threads__gt=0)\
             .order_by('-required', 'name')
 
     def get_tag_url_list(self, tags: list) -> str:
@@ -42,6 +45,7 b' class Tag(models.Model, Viewable):'
 
     name = models.CharField(max_length=100, db_index=True, unique=True)
     required = models.BooleanField(default=False, db_index=True)
+    description = models.TextField(blank=True)
 
     def __str__(self):
         return self.name
@@ -53,14 +57,20 b' class Tag(models.Model, Viewable):'
 
         return self.get_thread_count() == 0
 
-    def get_thread_count(self) -> int:
-        return self.get_threads().count()
+    def get_thread_count(self, archived=None) -> int:
+        threads = self.get_threads()
+        if archived is not None:
+            threads = threads.filter(archived=archived)
+        return threads.count()
+
+    def get_active_thread_count(self) -> int:
+        return self.get_thread_count(archived=False)
 
     def get_absolute_url(self):
         return reverse('tag', kwargs={'tag_name': self.name})
 
     def get_threads(self):
-        return self.thread_set.order_by('-bump_time')
+        return self.thread_tags.order_by('-bump_time')
 
     def is_required(self):
         return self.required
@@ -80,3 +90,20 b' class Tag(models.Model, Viewable):'
     @cached_result()
     def get_post_count(self):
         return self.get_threads().aggregate(num_posts=Count('post'))['num_posts']
+
+    def get_description(self):
+        return self.description
+
+    def get_random_image_post(self, archived=False):
+        posts = boards.models.Post.objects.annotate(images_count=Count(
+            'images')).filter(images_count__gt=0, threads__tags__in=[self])
+        if archived is not None:
+            posts = posts.filter(thread__archived=archived)
+        return posts.order_by('?').first()
+
+    def get_first_letter(self):
+        return self.name and self.name[0] or ''
+
+    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])

boards/models/thread.py

@@ -65,7 +65,7 b' class Thread(models.Model):'
     class Meta:
         app_label = 'boards'
 
-    tags = models.ManyToManyField('Tag')
+    tags = models.ManyToManyField('Tag', related_name='thread_tags')
     bump_time = models.DateTimeField(db_index=True)
     last_edit_time = models.DateTimeField()
     archived = models.BooleanField(default=False)
@@ -225,3 +225,6 b' class Thread(models.Model):'
 
     def get_absolute_url(self):
         return self.get_opening_post().get_absolute_url()
+
+    def get_required_tags(self):
+        return self.get_tags().filter(required=True)

boards/static/css/base.css

@@ -98,8 +98,39 b' textarea, input {'
 
 .post-image-full {
     width: 100%;
+    height: auto;
 }
 
 #preview-text {
     display: none;
 }
+
+.random-images-table {
+    text-align: center;
+    width: 100%;
+}
+
+.random-images-table > div {
+    margin-left: auto;
+    margin-right: auto;
+}
+
+.tag-image, .tag-text-data {
+    display: inline-block;
+}
+
+.tag-text-data > h2 {
+    margin: 0;
+}
+
+.tag-image {
+    margin-right: 5px;
+}
+
+.reply-to-message {
+    display: none;
+}
+
+.tripcode {
+    padding: 2px;
+}
  No newline at end of file

boards/static/css/md/base_page.css

@@ -167,7 +167,7 b' p, .br {'
     display: table-cell;
 }
 
-.post-form input:not([name="image"]), .post-form textarea, .post-form select {
+.post-form input:not([name="image"]):not([type="checkbox"]):not([type="submit"]), .post-form textarea, .post-form select {
     background: #333;
     color: #fff;
     border: solid 1px;
@@ -192,17 +192,22 b' p, .br {'
     margin-bottom: 0.5ex;
 }
 
-.post-form input[type="submit"], input[type="submit"] {
+input[type="submit"], button {
     background: #222;
     border: solid 2px #fff;
     color: #fff;
     padding: 0.5ex;
+    margin-right: 0.5ex;
 }
 
 input[type="submit"]:hover {
     background: #060;
 }
 
+.form-submit > button:hover {
+    background: #006;
+}
+
 blockquote {
     border-left: solid 2px;
     padding-left: 5px;
@@ -231,12 +236,12 b' blockquote {'
     text-decoration: none;
 }
 
-.dead_post {
-    border-left: solid 5px #982C2C;
+.dead_post > .post-info {
+    font-style: italic;
 }
 
-.archive_post {
-    border-left: solid 5px #B7B7B7;
+.archive_post > .post-info {
+    text-decoration: line-through;
 }
 
 .mark_btn {
@@ -354,8 +359,6 b' li {'
 
 .moderator_info {
     color: #e99d41;
-    float: right;
-    font-weight: bold;
     opacity: 0.4;
 }
 
@@ -437,7 +440,6 b' li {'
 
 .gallery_image {
     border: solid 1px;
-    padding: 0.5ex;
     margin: 0.5ex;
     text-align: center;
 }
@@ -528,7 +530,7 b' ul {'
 }
 
 .highlight {
-    background-color: #222;
+    background: #222;
 }
 
 .post-button-form > button:hover {
@@ -536,10 +538,9 b' ul {'
 }
 
 .tree_reply > .post {
-    margin-left: 1ex;
     margin-top: 1ex;
     border-left: solid 1px #777;
-    border-right: solid 1px #777;
+    padding-right: 0;
 }
 
 #preview-text {
@@ -548,8 +549,11 b' ul {'
     padding: 1ex;
 }
 
-button {
-    border: 1px solid white;
-    margin-bottom: .5ex;
-    margin-top: .5ex;
+.image-metadata {
+    font-style: italic;
+    font-size: 0.9em;
 }
+
+.tripcode {
+    color: white;
+}

boards/static/css/pg/base_page.css

@@ -376,3 +376,8 b' input[type="submit"]:hover {'
     margin: 1ex 0 1ex 0;
     padding: 1ex;
 }
+
+.image-metadata {
+    font-style: italic;
+    font-size: 0.9em;
+}
  No newline at end of file

boards/static/css/sw/base_page.css

@@ -407,3 +407,12 b' li {'
     margin: 1ex 0 1ex 0;
     padding: 1ex;
 }
+
+.image-metadata {
+    font-style: italic;
+    font-size: 0.9em;
+}
+
+audio {
+    margin-top: 1em;
+}

boards/static/js/image.js

@@ -42,12 +42,24 b' SimpleImageViewer.prototype.view = funct'
 
     // When we first enlarge an image, a full image needs to be created
     if (images.length == 1) {
+        var thumb = images.first();
+
+        var width = thumb.attr('data-width');
+        var height = thumb.attr('data-height');
+
+        if (width == null || height == null) {
+            width = '100%';
+            height = '100%';
+        }
+
         var parent = images.first().parent();
         var link = parent.attr('href');
 
         var fullImg = $('<img />')
             .addClass(FULL_IMG_CLASS)
-            .attr('src', link);
+            .attr('src', link)
+            .attr('width', width)
+            .attr('height', height);
 
         parent.append(fullImg);
     }

boards/static/js/thread.js

@@ -24,6 +24,9 b''
  */
 
 var CLOSE_BUTTON = '#form-close-button';
+var REPLY_TO_MSG = '.reply-to-message';
+var REPLY_TO_MSG_ID = '#reply-to-message-id';
+
 var $html = $("html, body");
 
 function moveCaretToEnd(el) {
@@ -46,6 +49,7 b' function resetFormPosition() {'
     form.insertAfter($('.thread'));
 
     $(CLOSE_BUTTON).hide();
+    $(REPLY_TO_MSG).hide();
 }
 
 function showFormAfter(blockToInsertAfter) {
@@ -54,6 +58,8 b' function showFormAfter(blockToInsertAfte'
 
     $(CLOSE_BUTTON).show();
     form.show();
+    $(REPLY_TO_MSG_ID).text(blockToInsertAfter.attr('id'));
+    $(REPLY_TO_MSG).show();
 }
 
 function addQuickReply(postId) {

boards/static/js/thread_update.js

@@ -30,6 +30,14 b' var POST_UPDATED = 1;'
 
 var JS_AUTOUPDATE_PERIOD = 20000;
 
+var ALLOWED_FOR_PARTIAL_UPDATE = [
+    'refmap',
+    'post-info'
+];
+
+var ATTR_CLASS = 'class';
+var ATTR_UID = 'data-uid';
+
 var wsUser = '';
 
 var unreadPosts = 0;
@@ -165,7 +173,8 b' function updatePost(postHtml) {'
     var type;
 
     if (existingPosts.size() > 0) {
-        existingPosts.replaceWith(post);
+        replacePartial(existingPosts.first(), post, false);
+        post = existingPosts.first();
 
         type = POST_UPDATED;
     } else {
@@ -362,6 +371,64 b' function processNewPost(post) {'
     blink(post);
 }
 
+function replacePartial(oldNode, newNode, recursive) {
+    if (!equalNodes(oldNode, newNode)) {
+        // Update parent node attributes
+        updateNodeAttr(oldNode, newNode, ATTR_CLASS);
+        updateNodeAttr(oldNode, newNode, ATTR_UID);
+
+        // Replace children
+        var children = oldNode.children();
+        if (children.length == 0) {
+            console.log(oldContent);
+            console.log(newContent)
+
+            oldNode.replaceWith(newNode);
+        } else {
+            var newChildren = newNode.children();
+            newChildren.each(function(i) {
+                var newChild = newChildren.eq(i);
+                var newChildClass = newChild.attr(ATTR_CLASS);
+
+                // Update only certain allowed blocks (e.g. not images)
+                if (ALLOWED_FOR_PARTIAL_UPDATE.indexOf(newChildClass) > -1) {
+                    var oldChild = oldNode.children('.' + newChildClass);
+
+                    if (oldChild.length == 0) {
+                        oldNode.append(newChild);
+                    } else {
+                        if (!equalNodes(oldChild, newChild)) {
+                            if (recursive) {
+                                replacePartial(oldChild, newChild, false);
+                            } else {
+                                oldChild.replaceWith(newChild);
+                            }
+                        }
+                    }
+                }
+            });
+        }
+    }
+}
+
+/**
+ * Compare nodes by content
+ */
+function equalNodes(node1, node2) {
+    return node1[0].outerHTML == node2[0].outerHTML;
+}
+
+/**
+ * Update attribute of a node if it has changed
+ */
+function updateNodeAttr(oldNode, newNode, attrName) {
+    var oldAttr = oldNode.attr(attrName);
+    var newAttr = newNode.attr(attrName);
+    if (oldAttr != newAttr) {
+        oldNode.attr(attrName, newAttr);
+    };
+}
+
 $(document).ready(function(){
     if (initAutoupdate()) {
         // Post form data over AJAX
@@ -386,6 +453,4 b' function processNewPost(post) {'
             resetForm(form);
         }
     }
-
-    $('#autoupdate').click(getThreadDiff);
 });

boards/templates/boards/all_threads.html

@@ -38,29 +38,49 b''
 
 {% if tag %}
     <div class="tag_info">
-        <h2>
-            <form action="{% url 'tag' tag.name %}" 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>
+        {% if random_image_post %}
+            <div class="tag-image">
+                {% with image=random_image_post.images.first %}
+                    <a href="{{ random_image_post.get_absolute_url }}"><img 
+                        src="{{ image.image.url_200x150 }}"
+                        width="{{ image.pre_width }}"
+                        height="{{ image.pre_height }}"/></a>
+                {% endwith %}
+            </div>
+        {% endif %}
+        <div class="tag-text-data">
+            <h2>
+                <form action="{% url 'tag' tag.name %}" 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>
+                <form action="{% url 'tag' tag.name %}" method="post" class="post-button-form">
+                    {% if is_hidden %}
+                        <button name="method" value="unhide" class="fav">H</button>
+                    {% else %}
+                        <button name="method" value="hide" class="not_fav">H</button>
+                    {% endif %}
+                </form>
+                {{ tag.get_view|safe }}
+                {% if moderator %}
+                <span class="moderator_info">| <a href="{% url 'admin:boards_tag_change' tag.id %}">{% trans 'Edit tag' %}</a></span>
                 {% endif %}
-            </form>
-            <form action="{% url 'tag' tag.name %}" method="post" class="post-button-form">
-                {% if is_hidden %}
-                    <button name="method" value="unhide" class="fav">H</button>
-                {% else %}
-                    <button name="method" value="hide" class="not_fav">H</button>
-                {% endif %}
-            </form>
-            {% autoescape off %}
-                {{ tag.get_view }}
-            {% endautoescape %}
-            {% if moderator %}
-            <span class="moderator_info">[<a href="{% url 'admin:boards_tag_change' tag.id %}">{% trans 'Edit tag' %}</a>]</span>
+            </h2>
+            {% if tag.get_description %}
+                <p>{{ tag.get_description|safe }}</p>
             {% endif %}
-        </h2>
-        <p>{% blocktrans with thread_count=tag.get_thread_count post_count=tag.get_post_count %}This tag has {{ thread_count }} threads and {{ post_count }} posts.{% endblocktrans %}</p>
+            <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 %}
+                </p>
+            {% endif %}
+        </div>
     </div>
 {% endif %}
 
@@ -116,13 +136,13 b''
                 {{ form.as_div }}
                 <div class="form-submit">
                     <input type="submit" value="{% trans "Post" %}"/>
+                    <button id="preview-button" onclick="return false;">{% trans 'Preview' %}</button>
                 </div>
             </form>
             </div>
             <div>
                 {% trans 'Tags must be delimited by spaces. Text or image is required.' %}
             </div>
-            <div><button id="preview-button">{% trans 'Preview' %}</button></div>
             <div id="preview-text"></div>
             <div><a href="{% url "staticpage" name="help" %}">{% trans 'Text syntax' %}</a></div>
             <div><a href="{% url "tags" "required" %}">{% trans 'Tags' %}</a></div>

boards/templates/boards/base.html

@@ -37,8 +37,9 b''
             {% trans 'Add tags' %} → 
         {% endif %}
         <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 '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>
 
         {% if username %}
             <a class="right-link link" href="{% url 'notifications' username %}" title="{% trans 'Notifications' %}">

boards/templates/boards/feed.html

@@ -61,7 +61,7 b''
                     {% ifequal page current_page.number %}
                         class="current_page"
                     {% endifequal %}
-                    href="{% url "feed" %}?page={{ page }}">{{ page }}</a>
+                    href="{% url "feed" %}?page={{ page }}{{ additional_attrs }}">{{ page }}</a>
                 {% if not forloop.last %},{% endif %}
             {% endfor %}
         {% endwith %}

boards/templates/boards/post.html

@@ -5,9 +5,16 b''
 
 <div class="{{ css_class }}" id="{{ post.id }}" data-uid="{{ post.uid }}">
     <div class="post-info">
-        <a class="post_id" href="{{ post.get_absolute_url }}">({{ post.get_absolute_id }})</a>
+        <a class="post_id" href="{{ post.get_absolute_url }}">#{{ post.get_absolute_id }}</a>
         <span class="title">{{ post.title }}</span>
         <span class="pub_time"><time datetime="{{ post.pub_time|date:'c' }}">{{ post.pub_time }}</time></span>
+        {% if post.tripcode %}
+            {% with tripcode=post.get_tripcode %}
+            <a href="{% url 'feed' %}?tripcode={{ tripcode.get_full_text }}"
+               class="tripcode" title="{{ tripcode.get_full_text }}"
+               style="border: solid 2px #{{ tripcode.get_color }}; border-left: solid 1ex #{{ tripcode.get_color }};">{{ tripcode.get_short_text }}</a>
+            {% endwith %}
+        {% endif %}
         {% comment %}
             Thread death time needs to be shown only if the thread is alredy archived
             and this is an opening post (thread death time) or a post for popup
@@ -29,7 +36,7 b''
         {% else %}
             {% if need_op_data %}
                 {% with thread.get_opening_post as op %}
-                    {% trans " in " %}<a href="{{ op.get_absolute_url }}">&gt;&gt;{{ op.id }}</a> <span class="title">{{ op.get_title|striptags|truncatewords:5 }}</span>
+                    {% trans " in " %}{{ op.get_link_view|safe }} <span class="title">{{ op.get_title|striptags|truncatewords:5 }}</span>
                 {% endwith %}
             {% endif %}
         {% endif %}
@@ -43,9 +50,9 b''
 
         {% if moderator %}
             <span class="moderator_info">
-                <a href="{% url 'admin:boards_post_change' post.id %}">{% trans 'Edit' %}</a>
+                | <a href="{% url 'admin:boards_post_change' post.id %}">{% trans 'Edit' %}</a>
                 {% if is_opening %}
-                    | <a href="{% url 'admin:boards_thread_change' thread.id %}">{% trans 'Edit thread' %}</a>
+                   | <a href="{% url 'admin:boards_thread_change' thread.id %}">{% trans 'Edit thread' %}</a>
                 {% endif %}
             </span>
         {% endif %}
@@ -55,10 +62,13 b''
         supports multiple.
     {%  endcomment %}
     {% if post.images.exists %}
-        {% with post.images.all.0 as image %}
-            {% autoescape off %}
-                {{ image.get_view }}
-            {% endautoescape %}
+        {% 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 %}
     {% comment %}
@@ -72,22 +82,20 b''
                 {{ post.get_text }}
             {% endif %}
         {% endautoescape %}
-        {% if post.is_referenced %}
-            {% if mode_tree %}
-                <div class="tree_reply">
-                    {% for refpost in post.get_referenced_posts %}
-                        {% post_view refpost mode_tree=True %}
-                    {% endfor %}
-                </div>
-            {% else %}
-                <div class="refmap">
-                    {% autoescape off %}
-                        {% trans "Replies" %}: {{ post.refmap }}
-                    {% endautoescape %}
-                </div>
-            {% endif %}
+    </div>
+    {% if post.is_referenced %}
+        {% if mode_tree %}
+            <div class="tree_reply">
+                {% for refpost in post.get_referenced_posts %}
+                    {% post_view refpost mode_tree=True %}
+                {% endfor %}
+            </div>
+        {% else %}
+            <div class="refmap">
+                {% trans "Replies" %}: {{ post.refmap|safe }}
+            </div>
         {% endif %}
-    </div>
+    {% endif %}
     {% comment %}
         Thread metadata: counters, tags etc
     {% endcomment %}
@@ -98,9 +106,7 b''
                 {{ thread.get_images_count }} {% trans 'images' %}.
             {% endif %}
             <span class="tags">
-                {% autoescape off %}
-                    {{ thread.get_tag_url_list }}
-                {% endautoescape %}
+                {{ thread.get_tag_url_list|safe }}
             </span>
         </div>
     {% endif %}

boards/templates/boards/settings.html

@@ -9,7 +9,6 b''
 {% endblock %}
 
 {% block content %}
-
     <div class="post">
         <p>
             {% if moderator %}
@@ -19,9 +18,7 b''
         {% if hidden_tags %}
             <p>{% trans 'Hidden tags:' %}
                 {% for tag in hidden_tags %}
-                    {% autoescape off %}
-                        {{ tag.get_view }}
-                    {% endautoescape %}
+                    {{ tag.get_view|safe }}
                 {% endfor %}
             </p>
         {% else %}

boards/templates/boards/tag.html

@@ -1,5 +1,3 b''
 <div class="post">
-    {% autoescape off %}
-        {{ tag.get_view }}
-    {% endautoescape %}
+    {{ tag.get_view|safe }}
 </div>

boards/templates/boards/tags.html

@@ -8,20 +8,39 b''
 
 {% block content %}
 
+{% regroup section_tags by get_first_letter as section_tag_list %}
+{% regroup all_tags by get_first_letter as other_tag_list %}
+
 <div class="post">
-    {% if all_tags %}
-        {% for tag in all_tags %}
-            <div class="tag_item">
+    {% if section_tags %}
+        <div>
+        {% trans 'Sections:' %}
+        {% for letter in section_tag_list %}
+            <br />({{ letter.grouper|upper }})
+            {% for tag in letter.list %}
                 {% autoescape off %}
-                    {{ tag.get_view }}
+                    {{ tag.get_view }}{% if not forloop.last %},{% endif %}
                 {% endautoescape %}
-            </div>
+            {% endfor %}
         {% endfor %}
-    {% else %}
-        {% trans 'No tags found.' %}
+        </div>
     {% endif %}
+    {% if all_tags %}
+        <div>
+        {% trans 'Other tags:' %}
+        {% for letter in other_tag_list %}
+            <br />({{ letter.grouper|upper }})
+            {% for tag in letter.list %}
+                {% autoescape off %}
+                    {{ tag.get_view }}{% if not forloop.last %},{% endif %}
+                {% endautoescape %}
+            {% endfor %}
+        {% endfor %}
+        </div>
+    {% endif %}
+
     {% if query %}
-        <div><a href="{% url 'tags' %}">{% trans 'All tags' %}</a></div>
+        <div><a href="{% url 'tags' %}">{% trans 'All tags...' %}</a></div>
     {% endif %}
 </div>
 

boards/templates/boards/thread.html

@@ -31,9 +31,6 b''
           data-ws-host="{{ ws_host }}"
           data-ws-port="{{ ws_port }}">
 
-        {% block thread_meta_panel %}
-        {% endblock %}
-
         <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' %}.
             {% trans 'Last update: ' %}<span id="last-update"><time datetime="{{ thread.last_edit_time|date:'c' }}">{{ thread.last_edit_time }}</time></span>

boards/templates/boards/thread_normal.html

@@ -28,7 +28,7 b''
     {% if not thread.archived %}
         <div class="post-form-w">
             <script src="{% static 'js/panel.js' %}"></script>
-            <div class="form-title">{% trans "Reply to thread" %} #{{ opening_post.id }}</div>
+            <div class="form-title">{% trans "Reply to thread" %} #{{ opening_post.id }}<span class="reply-to-message"> {% trans "to message " %} #<span id="reply-to-message-id"></span></span></div>
             <div class="post-form" id="compact-form">
                 <div class="swappable-form-full">
                     <form enctype="multipart/form-data" method="post" id="form">{% csrf_token %}
@@ -36,10 +36,10 b''
                         {{ form.as_div }}
                         <div class="form-submit">
                             <input type="submit" value="{% trans "Post" %}"/>
+                            <button id="preview-button" onclick="return false;">{% trans 'Preview' %}</button>
                         </div>
                     </form>
                 </div>
-                <div><button id="preview-button">{% trans 'Preview' %}</button></div>
                 <div id="preview-text"></div>
                 <div><a href="{% url "staticpage" name="help" %}">
                     {% trans 'Text syntax' %}</a></div>
@@ -55,7 +55,3 b''
     <script src="{% static 'js/thread_update.js' %}"></script>
     <script src="{% static 'js/3party/centrifuge.js' %}"></script>
 {% endblock %}
-
-{% block thread_meta_panel %}
-    <button id="autoupdate">{% trans 'Update' %}</button>
-{% endblock %}

boards/urls.py

@@ -11,6 +11,7 b' from boards.views.search import BoardSea'
 from boards.views.static import StaticPageView
 from boards.views.preview import PostPreviewView
 from boards.views.sync import get_post_sync_data, response_get
+from boards.views.random import RandomImageView
 
 
 js_info_dict = {
@@ -43,6 +44,8 b" urlpatterns = patterns('',"
     url(r'^staticpage/(?P<name>\w+)/$', StaticPageView.as_view(),
         name='staticpage'),
 
+    url(r'^random/$', RandomImageView.as_view(), name='random'),
+
     # RSS feeds
     url(r'^rss/$', AllThreadsFeed()),
     url(r'^page/(?P<page>\d+)/rss/$', AllThreadsFeed()),

boards/utils.py

@@ -1,6 +1,7 b''
 """
 This module contains helper functions and helper classes.
 """
+import hashlib
 import time
 import hmac
 
@@ -81,4 +82,11 b' def is_moderator(request):'
     except AttributeError:
         moderate = False
 
-    return moderate
  No newline at end of file
+    return moderate
+
+
+def get_file_hash(file) -> str:
+    md5 = hashlib.md5()
+    for chunk in file.chunks():
+        md5.update(chunk)
+    return md5.hexdigest()

boards/views/all_tags.py

@@ -4,6 +4,7 b' from boards.views.base import BaseBoardV'
 from boards.models.tag import Tag
 
 
+PARAM_SECTION_TAGS = 'section_tags'
 PARAM_TAGS = 'all_tags'
 PARAM_QUERY = 'query'
 
@@ -13,10 +14,10 b' class AllTagsView(BaseBoardView):'
     def get(self, request, query=None):
         params = dict()
 
-        if query == 'required':
-            params[PARAM_TAGS] = Tag.objects.filter(required=True)
-        else:
-            params[PARAM_TAGS] = Tag.objects.get_not_empty_tags()
+        params[PARAM_SECTION_TAGS] = Tag.objects.filter(required=True)
+        if query != 'required':
+            params[PARAM_TAGS] = Tag.objects.get_not_empty_tags().filter(
+                    required=False)
         params[PARAM_QUERY] = query
 
         return render(request, 'boards/tags.html', params)

boards/views/all_threads.py

@@ -139,9 +139,9 b' class AllThreadsView(PostMixin, BaseBoar'
 
         data = form.cleaned_data
 
-        title = data[FORM_TITLE]
+        title = form.get_title()
         text = data[FORM_TEXT]
-        image = form.get_image()
+        file = form.get_file()
         threads = data[FORM_THREADS]
 
         text = self._remove_invalid_links(text)
@@ -150,8 +150,9 b' class AllThreadsView(PostMixin, BaseBoar'
 
         tags = self.parse_tags_string(tag_strings)
 
-        post = Post.objects.create_post(title=title, text=text, image=image,
-                                        ip=ip, tags=tags, opening_posts=threads)
+        post = Post.objects.create_post(title=title, text=text, file=file,
+                                        ip=ip, tags=tags, opening_posts=threads,
+                                        tripcode=form.get_tripcode())
 
         # This is required to update the threads to which posts we have replied
         # when creating this one

boards/views/feed.py

@@ -1,23 +1,18 b''
 from django.core.urlresolvers import reverse
-from django.core.files import File
-from django.core.files.temp import NamedTemporaryFile
-from django.core.paginator import EmptyPage
-from django.db import transaction
-from django.http import Http404
-from django.shortcuts import render, redirect
-import requests
+from django.shortcuts import render
 
-from boards import utils, settings
 from boards.abstracts.paginator import get_paginator
 from boards.abstracts.settingsmanager import get_settings_manager
-from boards.models import Post, Thread, Ban, Tag, PostImage, Banner
+from boards.models import Post
 from boards.views.base import BaseBoardView
 from boards.views.posting_mixin import PostMixin
 
+POSTS_PER_PAGE = 10
 
 PARAMETER_CURRENT_PAGE = 'current_page'
 PARAMETER_PAGINATOR = 'paginator'
 PARAMETER_POSTS = 'posts'
+PARAMETER_ADDITONAL_ATTRS = 'additional_attrs'
 
 PARAMETER_PREV_LINK = 'prev_page_link'
 PARAMETER_NEXT_LINK = 'next_page_link'
@@ -30,25 +25,34 b' class FeedView(PostMixin, BaseBoardView)'
 
     def get(self, request):
         page = request.GET.get('page', DEFAULT_PAGE)
+        tripcode = request.GET.get('tripcode', None)
 
         params = self.get_context_data(request=request)
 
         settings_manager = get_settings_manager(request)
 
-        paginator = get_paginator(Post.objects
-                .exclude(threads__tags__in=settings_manager.get_hidden_tags())
-                .order_by('-pub_time')
-                .prefetch_related('images', 'thread', 'threads'), 10)
+        posts = Post.objects.exclude(
+            threads__tags__in=settings_manager.get_hidden_tags()).order_by(
+            '-pub_time').prefetch_related('images', 'thread', 'threads')
+        if tripcode:
+            posts = posts.filter(tripcode=tripcode)
+
+        paginator = get_paginator(posts, POSTS_PER_PAGE)
         paginator.current_page = int(page)
 
         params[PARAMETER_POSTS] = paginator.page(page).object_list
 
-        self.get_page_context(paginator, params, page)
+        additional_params = dict()
+        if tripcode:
+            additional_params['tripcode'] = tripcode
+            params[PARAMETER_ADDITONAL_ATTRS] = '&tripcode=' + tripcode
+
+        self.get_page_context(paginator, params, page, additional_params)
 
         return render(request, TEMPLATE, params)
 
     # TODO Dedup this into PagedMixin
-    def get_page_context(self, paginator, params, page):
+    def get_page_context(self, paginator, params, page, additional_params):
         """
         Get pagination context variables
         """
@@ -59,8 +63,14 b' class FeedView(PostMixin, BaseBoardView)'
         if current_page.has_previous():
             params[PARAMETER_PREV_LINK] = self.get_previous_page_link(
                     current_page)
+            for param in additional_params.keys():
+                params[PARAMETER_PREV_LINK] += '&{}={}'.format(
+                    param, additional_params[param])
         if current_page.has_next():
             params[PARAMETER_NEXT_LINK] = self.get_next_page_link(current_page)
+            for param in additional_params.keys():
+                params[PARAMETER_NEXT_LINK] += '&{}={}'.format(
+                    param, additional_params[param])
 
     def get_previous_page_link(self, current_page):
         return reverse('feed') + '?page={}'.format(

boards/views/settings.py

@@ -9,7 +9,6 b' from boards.views.base import BaseBoardV'
 from boards.forms import SettingsForm, PlainErrorList
 from boards import settings
 
-
 FORM_THEME = 'theme'
 FORM_USERNAME = 'username'
 FORM_TIMEZONE = 'timezone'

boards/views/tag_threads.py

@@ -3,7 +3,7 b' from django.core.urlresolvers import rev'
 
 from boards.abstracts.settingsmanager import get_settings_manager, \
         SETTING_FAVORITE_TAGS, SETTING_HIDDEN_TAGS
-from boards.models import Tag
+from boards.models import Tag, PostImage
 from boards.views.all_threads import AllThreadsView, DEFAULT_PAGE
 from boards.views.mixins import DispatcherMixin
 from boards.forms import ThreadForm, PlainErrorList
@@ -12,6 +12,9 b" PARAM_HIDDEN_TAGS = 'hidden_tags'"
 PARAM_TAG = 'tag'
 PARAM_IS_FAVORITE = 'is_favorite'
 PARAM_IS_HIDDEN = 'is_hidden'
+PARAM_RANDOM_IMAGE_POST = 'random_image_post'
+PARAM_RELATED_TAGS = 'related_tags'
+
 
 __author__ = 'neko259'
 
@@ -47,6 +50,9 b' class TagView(AllThreadsView, Dispatcher'
         params[PARAM_IS_FAVORITE] = fav_tag_names is not None and tag.name in fav_tag_names
         params[PARAM_IS_HIDDEN] = hidden_tag_names is not None and tag.name in hidden_tag_names
 
+        params[PARAM_RANDOM_IMAGE_POST] = tag.get_random_image_post()
+        params[PARAM_RELATED_TAGS] = tag.get_related_tags()
+
         return params
 
     def get_previous_page_link(self, current_page):
@@ -84,7 +90,7 b' class TagView(AllThreadsView, Dispatcher'
                 # Ban user because he is suspected to be a bot
                 self._ban_current_user(request)
 
-            return self.get(request, tag_name, page, form)
+            return self.get(request, tag_name, form)
 
     def subscribe(self, request):
         tag = get_object_or_404(Tag, name=self.tag_name)

boards/views/thread/thread.py

@@ -1,3 +1,4 b''
+import hashlib
 from django.core.exceptions import ObjectDoesNotExist
 from django.http import Http404
 from django.shortcuts import get_object_or_404, render, redirect
@@ -100,18 +101,19 b' class ThreadView(BaseBoardView, PostMixi'
 
         data = form.cleaned_data
 
-        title = data[FORM_TITLE]
+        title = form.get_title()
         text = data[FORM_TEXT]
-        image = form.get_image()
+        file = form.get_file()
         threads = data[FORM_THREADS]
 
         text = self._remove_invalid_links(text)
 
         post_thread = opening_post.get_thread()
 
-        post = Post.objects.create_post(title=title, text=text, image=image,
+        post = Post.objects.create_post(title=title, text=text, file=file,
                                         thread=post_thread, ip=ip,
-                                        opening_posts=threads)
+                                        opening_posts=threads,
+                                        tripcode=form.get_tripcode())
         post.notify_clients()
 
         if html_response: