Added sticker pack functionality

boards/migrations/0066_auto_20171025_1148.py

@@ -0,0 +1,54 b''
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2017-10-25 08:48
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('boards', '0065_attachmentsticker'),
+    ]
+
+    def stickers_to_pack(apps, schema_editor):
+        AttachmentSticker = apps.get_model('boards', 'AttachmentSticker')
+        StickerPack = apps.get_model('boards', 'StickerPack')
+
+        stickers = AttachmentSticker.objects.all()
+        if len(stickers) > 0:
+            stickerpack = StickerPack.objects.create(name='general')
+            for sticker in stickers:
+                sticker.stickerpack = stickerpack
+                if '/' in sticker.name:
+                    sticker.name = sticker.name.split('/')[1]
+                sticker.save()
+
+    operations = [
+        migrations.CreateModel(
+            name='StickerPack',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.TextField(unique=True)),
+                ('tripcode', models.TextField(blank=True)),
+            ],
+        ),
+        migrations.AddField(
+            model_name='attachmentsticker',
+            name='stickerpack',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='boards.StickerPack', null=True),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='thread',
+            name='stickerpack',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.RunPython(stickers_to_pack),
+        migrations.AlterField(
+            model_name='attachmentsticker',
+            name='stickerpack',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='boards.StickerPack', null=False),
+        ),
+    ]

boards/abstracts/constants.py

@@ -1,1 +1,4 b''
+import re
+
 FILE_DIRECTORY = 'files/'
+REGEX_TAGS = re.compile(r'^[\w\s\d]+$', re.UNICODE)

boards/abstracts/sticker_factory.py

@@ -1,32 +1,33 b''
 from boards.abstracts.settingsmanager import SessionSettingsManager
 from boards.models import Attachment
 
 
 class StickerFactory:
     def get_image(self, alias):
         pass
 
 
 class SessionStickerFactory(StickerFactory):
     def __init__(self, session):
         self.session = session
 
     def get_image(self, alias):
         settings_manager = SessionSettingsManager(self.session)
         return settings_manager.get_attachment_by_alias(alias)
 
 
 class ModelStickerFactory(StickerFactory):
     def get_image(self, alias):
-        return Attachment.objects.get_by_alias(alias)
+        if alias.count('/') == 1:
+            return Attachment.objects.get_by_alias(alias)
 
 
 def get_attachment_by_alias(alias, session):
     """Gets attachment from a source (local or server/global) using an alias."""
     
     factories = [SessionStickerFactory(session), ModelStickerFactory()]
     for factory in factories:
         image = factory.get_image(alias)
 
         if image is not None:
             return image

boards/admin.py

@@ -1,175 +1,181 b''
 from boards.abstracts.sticker_factory import StickerFactory
-from boards.models.attachment import FILE_TYPES_IMAGE, AttachmentSticker
+from boards.models.attachment import FILE_TYPES_IMAGE, AttachmentSticker, \
+    StickerPack
 from django.contrib import admin
 from django.utils.translation import ugettext_lazy as _
 from django.core.urlresolvers import reverse
 from boards.models import Post, Tag, Ban, Thread, Banner, Attachment, \
         KeyPair, GlobalId, TagAlias
 
 
 @admin.register(Post)
 class PostAdmin(admin.ModelAdmin):
 
     list_display = ('id', 'title', 'text', 'poster_ip', 'linked_images',
             'foreign', 'tags')
     list_filter = ('pub_time',)
     search_fields = ('id', 'title', 'text', 'poster_ip')
     exclude = ('referenced_posts', 'refmap', 'images', 'global_id')
     readonly_fields = ('poster_ip', 'thread', 'linked_images',
             'attachments', 'uid', 'url', 'pub_time', 'opening', 'linked_global_id',
             'foreign', 'tags')
 
     def ban_poster(self, request, queryset):
         bans = 0
         for post in queryset:
             poster_ip = post.poster_ip
             ban, created = Ban.objects.get_or_create(ip=poster_ip)
             if created:
                 bans += 1
         self.message_user(request, _('{} posters were banned').format(bans))
 
     def ban_latter_with_delete(self, request, queryset):
         bans = 0
         hidden = 0
         for post in queryset:
             poster_ip = post.poster_ip
             ban, created = Ban.objects.get_or_create(ip=poster_ip)
             if created:
                 bans += 1
             posts = Post.objects.filter(poster_ip=poster_ip, id__gte=post.id)
             hidden += posts.count()
             posts.delete()
         self.message_user(request, _('{} posters were banned, {} messages were removed.').format(bans, hidden))
     ban_latter_with_delete.short_description = _('Ban user and delete posts starting from this one and later')
 
     def linked_images(self, obj: Post):
         images = obj.attachments.filter(mimetype__in=FILE_TYPES_IMAGE)
         image_urls = ['<a href="{}"><img src="{}" /></a>'.format(
             reverse('admin:%s_%s_change' % (image._meta.app_label,
                                             image._meta.model_name),
                     args=[image.id]), image.get_thumb_url()) for image in images]
         return ', '.join(image_urls)
     linked_images.allow_tags = True
 
     def linked_global_id(self, obj: Post):
         global_id = obj.global_id
         if global_id is not None:
             return '<a href="{}">{}</a>'.format(
                 reverse('admin:%s_%s_change' % (global_id._meta.app_label,
                                                 global_id._meta.model_name),
                         args=[global_id.id]), str(global_id))
     linked_global_id.allow_tags = True
 
     def tags(self, obj: Post):
         return ', '.join([tag.get_name() for tag in obj.get_tags()])
 
     def save_model(self, request, obj, form, change):
         obj.save()
         obj.clear_cache()
 
     def foreign(self, obj: Post):
         return obj is not None and obj.global_id is not None and\
                 not obj.global_id.is_local()
 
     actions = ['ban_poster', 'ban_latter_with_delete']
 
 
 @admin.register(Tag)
 class TagAdmin(admin.ModelAdmin):
     def thread_count(self, obj: Tag) -> int:
         return obj.get_thread_count()
 
     def display_children(self, obj: Tag):
         return ', '.join([str(child) for child in obj.get_children().all()])
 
     def name(self, obj: Tag):
         return obj.get_name()
 
     def save_model(self, request, obj, form, change):
         super().save_model(request, obj, form, change)
         for thread in obj.get_threads().all():
             thread.refresh_tags()
 
     list_display = ('name', 'thread_count', 'display_children')
     search_fields = ('id',)
     readonly_fields = ('name',)
 
 
 @admin.register(TagAlias)
 class TagAliasAdmin(admin.ModelAdmin):
     list_display = ('locale', 'name', 'parent')
     list_filter = ('locale',)
     search_fields = ('name',)
 
 
 @admin.register(Thread)
 class ThreadAdmin(admin.ModelAdmin):
 
     def title(self, obj: Thread) -> str:
         return obj.get_opening_post().get_title()
 
     def reply_count(self, obj: Thread) -> int:
         return obj.get_reply_count()
 
     def ip(self, obj: Thread):
         return obj.get_opening_post().poster_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()
 
     # Save parent tags when editing tags
     def save_related(self, request, form, formsets, change):
         super().save_related(request, form, formsets, change)
         form.instance.refresh_tags()
 
     def save_model(self, request, obj, form, change):
         op = obj.get_opening_post()
         obj.save()
         op.clear_cache()
 
     list_display = ('id', 'op', 'title', 'reply_count', 'status', 'ip',
             'display_tags')
     list_filter = ('bump_time', 'status')
     search_fields = ('id', 'title')
     filter_horizontal = ('tags',)
 
 
 @admin.register(KeyPair)
 class KeyPairAdmin(admin.ModelAdmin):
     list_display = ('public_key', 'primary')
     list_filter = ('primary',)
     search_fields = ('public_key',)
 
 
 @admin.register(Ban)
 class BanAdmin(admin.ModelAdmin):
     list_display = ('ip', 'can_read')
     list_filter = ('can_read',)
     search_fields = ('ip',)
 
 
 @admin.register(Banner)
 class BannerAdmin(admin.ModelAdmin):
     list_display = ('title', 'text')
 
 
 @admin.register(Attachment)
 class AttachmentAdmin(admin.ModelAdmin):
     list_display = ('__str__', 'mimetype', 'file', 'url')
 
 
 @admin.register(AttachmentSticker)
 class AttachmentStickerAdmin(admin.ModelAdmin):
     search_fields = ('name',)
 
 
[e-mail](StickerPack)
+class StickerPackAdmin(admin.ModelAdmin):
+    search_fields = ('name',)
+
+
 @admin.register(GlobalId)
 class GlobalIdAdmin(admin.ModelAdmin):
     def is_linked(self, obj):
         return Post.objects.filter(global_id=obj).exists()
 
     list_display = ('__str__', 'is_linked',)
     readonly_fields = ('content',)

boards/forms/__init__.py

@@ -1,559 +1,590 b''
 import hashlib
 import logging
 import re
 import time
-import traceback
 
 import pytz
 
 from PIL import Image
 
 from django import forms
 from django.core.files.uploadedfile import SimpleUploadedFile, UploadedFile
 from django.forms.utils import ErrorList
 from django.utils.translation import ugettext_lazy as _, ungettext_lazy
 from django.core.files.images import get_image_dimensions
 from django.core.cache import cache
 
 import boards.settings as board_settings
 import neboard
 from boards import utils
+from boards.abstracts.constants import REGEX_TAGS
 from boards.abstracts.sticker_factory import get_attachment_by_alias
 from boards.abstracts.settingsmanager import get_settings_manager
 from boards.forms.fields import UrlFileField
 from boards.mdx_neboard import formatters
 from boards.models import Attachment
 from boards.models import Tag
+from boards.models.attachment import StickerPack
 from boards.models.attachment.downloaders import download, REGEX_MAGNET
 from boards.models.post import TITLE_MAX_LENGTH
 from boards.utils import validate_file_size, get_file_mimetype, \
     FILE_EXTENSION_DELIMITER
 from boards.models.attachment.viewers import FILE_TYPES_IMAGE
 from neboard import settings
 
 SECTION_FORMS = 'Forms'
 
 POW_HASH_LENGTH = 16
 POW_LIFE_MINUTES = 5
 
-REGEX_TAGS = re.compile(r'^[\w\s\d]+$', re.UNICODE)
 REGEX_USERNAMES = re.compile(r'^[\w\s\d,]+$', re.UNICODE)
 REGEX_URL = re.compile(r'^(http|https|ftp):\/\/', re.UNICODE)
 
 VETERAN_POSTING_DELAY = 5
 
 ATTRIBUTE_PLACEHOLDER = 'placeholder'
 ATTRIBUTE_ROWS = 'rows'
 
 LAST_POST_TIME = 'last_post_time'
 LAST_LOGIN_TIME = 'last_login_time'
 TEXT_PLACEHOLDER = _('Type message here. Use formatting panel for more advanced usage.')
 TAGS_PLACEHOLDER = _('music images i_dont_like_tags')
 
 LABEL_TITLE = _('Title')
 LABEL_TEXT = _('Text')
 LABEL_TAG = _('Tag')
 LABEL_SEARCH = _('Search')
 LABEL_FILE = _('File')
 LABEL_DUPLICATES = _('Check for duplicates')
 LABEL_URL = _('Do not download URLs')
 
 ERROR_SPEED = 'Please wait %(delay)d second before sending message'
 ERROR_SPEED_PLURAL = 'Please wait %(delay)d seconds before sending message'
 ERROR_MANY_FILES = 'You can post no more than %(files)d file.'
 ERROR_MANY_FILES_PLURAL = 'You can post no more than %(files)d files.'
 ERROR_DUPLICATES = 'Some files are already present on the board.'
 
 TAG_MAX_LENGTH = 20
 
 TEXTAREA_ROWS = 4
 
 TRIPCODE_DELIM = '##'
 
 # TODO Maybe this may be converted into the database table?
 MIMETYPE_EXTENSIONS = {
     'image/jpeg': 'jpeg',
     'image/png': 'png',
     'image/gif': 'gif',
     'video/webm': 'webm',
     'application/pdf': 'pdf',
     'x-diff': 'diff',
     'image/svg+xml': 'svg',
     'application/x-shockwave-flash': 'swf',
     'image/x-ms-bmp': 'bmp',
     'image/bmp': 'bmp',
 }
 
 DOWN_MODE_DOWNLOAD = 'DOWNLOAD'
 DOWN_MODE_URL = 'URL'
 DOWN_MODE_TRY = 'TRY'
 
 
 logger = logging.getLogger('boards.forms')
 
 
 def get_timezones():
     timezones = []
     for tz in pytz.common_timezones:
         timezones.append((tz, tz),)
     return timezones
 
 
 class FormatPanel(forms.Textarea):
     """
     Panel for text formatting. Consists of buttons to add different tags to the
     form text area.
     """
 
     def render(self, name, value, attrs=None):
         output = '<div id="mark-panel">'
         for formatter in formatters:
             output += '<span class="mark_btn"' + \
                       ' onClick="addMarkToMsg(\'' + formatter.format_left + \
                       '\', \'' + formatter.format_right + '\')">' + \
                       formatter.preview_left + formatter.name + \
                       formatter.preview_right + '</span>'
 
         output += '</div>'
         output += super(FormatPanel, self).render(name, value, attrs=attrs)
 
         return output
 
 
 class PlainErrorList(ErrorList):
     def __unicode__(self):
         return self.as_text()
 
     def as_text(self):
         return ''.join(['(!) %s ' % e for e in self])
 
 
 class NeboardForm(forms.Form):
     """
     Form with neboard-specific formatting.
     """
     required_css_class = 'required-field'
 
     def as_div(self):
         """
         Returns this form rendered as HTML <as_div>s.
         """
 
         return self._html_output(
             # TODO Do not show hidden rows in the list here
             normal_row='<div class="form-row">'
                        '<div class="form-label">'
                        '%(label)s'
                        '</div>'
                        '<div class="form-input">'
                        '%(field)s'
                        '</div>'
                        '</div>'
                        '<div class="form-row">'
                        '%(help_text)s'
                        '</div>',
             error_row='<div class="form-row">'
                       '<div class="form-label"></div>'
                       '<div class="form-errors">%s</div>'
                       '</div>',
             row_ender='</div>',
             help_text_html='%s',
             errors_on_separate_row=True)
 
     def as_json_errors(self):
         errors = []
 
         for name, field in list(self.fields.items()):
             if self[name].errors:
                 errors.append({
                     'field': name,
                     'errors': self[name].errors.as_text(),
                 })
 
         return errors
 
 
 class PostForm(NeboardForm):
 
     title = forms.CharField(max_length=TITLE_MAX_LENGTH, required=False,
                             label=LABEL_TITLE,
                             widget=forms.TextInput(
                                 attrs={ATTRIBUTE_PLACEHOLDER: 'Title{}tripcode'.format(TRIPCODE_DELIM)}))
     text = forms.CharField(
         widget=FormatPanel(attrs={
             ATTRIBUTE_PLACEHOLDER: TEXT_PLACEHOLDER,
             ATTRIBUTE_ROWS: TEXTAREA_ROWS,
         }),
         required=False, label=LABEL_TEXT)
     download_mode = forms.ChoiceField(
             choices=(
                 (DOWN_MODE_TRY, _('Download or add URL')),
                 (DOWN_MODE_DOWNLOAD, _('Download or fail')),
                 (DOWN_MODE_URL, _('Insert as URLs')),
             ),
             initial=DOWN_MODE_TRY,
             label=_('URL download mode'))
     file = UrlFileField(required=False, label=LABEL_FILE)
 
     # This field is for spam prevention only
     email = forms.CharField(max_length=100, required=False, label=_('e-mail'),
                             widget=forms.TextInput(attrs={
                                 'class': 'form-email'}))
     subscribe = forms.BooleanField(required=False, label=_('Subscribe to thread'))
     check_duplicates = forms.BooleanField(required=False, label=LABEL_DUPLICATES)
 
     guess = forms.CharField(widget=forms.HiddenInput(), required=False)
     timestamp = forms.CharField(widget=forms.HiddenInput(), required=False)
     iteration = forms.CharField(widget=forms.HiddenInput(), required=False)
 
     session = None
     need_to_ban = False
 
     def clean_title(self):
         title = self.cleaned_data['title']
         if title:
             if len(title) > TITLE_MAX_LENGTH:
                 raise forms.ValidationError(_('Title must have less than %s '
                                               'characters') %
                                             str(TITLE_MAX_LENGTH))
         return title
 
     def clean_text(self):
         text = self.cleaned_data['text'].strip()
         if text:
             max_length = board_settings.get_int(SECTION_FORMS, 'MaxTextLength')
             if len(text) > max_length:
                 raise forms.ValidationError(_('Text must have less than %s '
                                               'characters') % str(max_length))
         return text
 
     def clean_file(self):
         return self._clean_files(self.cleaned_data['file'])
 
     def clean(self):
         cleaned_data = super(PostForm, self).clean()
 
         if cleaned_data['email']:
             if board_settings.get_bool(SECTION_FORMS, 'Autoban'):
                 self.need_to_ban = True
             raise forms.ValidationError('A human cannot enter a hidden field')
 
         if not self.errors:
             self._clean_text_file()
 
         limit_speed = board_settings.get_bool(SECTION_FORMS, 'LimitPostingSpeed')
         limit_first = board_settings.get_bool(SECTION_FORMS, 'LimitFirstPosting')
 
         settings_manager = get_settings_manager(self)
         if not self.errors and limit_speed or (limit_first and not settings_manager.get_setting('confirmed_user')):
             pow_difficulty = board_settings.get_int(SECTION_FORMS, 'PowDifficulty')
             if pow_difficulty > 0:
                 # PoW-based
                 if cleaned_data['timestamp'] \
                         and cleaned_data['iteration'] and cleaned_data['guess'] \
                         and not settings_manager.get_setting('confirmed_user'):
                     self._validate_hash(cleaned_data['timestamp'], cleaned_data['iteration'], cleaned_data['guess'], cleaned_data['text'])
             else:
                 # Time-based
                 self._validate_posting_speed()
             settings_manager.set_setting('confirmed_user', True)
         if self.cleaned_data['check_duplicates']:
             self._check_file_duplicates(self.get_files())
 
         return cleaned_data
 
     def get_files(self):
         """
         Gets file from form or URL.
         """
 
         files = []
         for file in self.cleaned_data['file']:
             if isinstance(file, UploadedFile):
                 files.append(file)
 
         return files
 
     def get_file_urls(self):
         files = []
         for file in self.cleaned_data['file']:
             if type(file) == str:
                 files.append(file)
 
         return files
 
     def get_tripcode(self):
         title = self.cleaned_data['title']
         if title is not None and TRIPCODE_DELIM in title:
             code = title.split(TRIPCODE_DELIM, maxsplit=1)[1] + neboard.settings.SECRET_KEY
             tripcode = hashlib.md5(code.encode()).hexdigest()
         else:
             tripcode = ''
         return tripcode
 
     def get_title(self):
         title = self.cleaned_data['title']
         if title is not None and TRIPCODE_DELIM in title:
             return title.split(TRIPCODE_DELIM, maxsplit=1)[0]
         else:
             return title
 
     def get_images(self):
         return self.cleaned_data.get('stickers', [])
 
     def is_subscribe(self):
         return self.cleaned_data['subscribe']
 
     def _update_file_extension(self, file):
         if file:
             mimetype = get_file_mimetype(file)
             extension = MIMETYPE_EXTENSIONS.get(mimetype)
             if extension:
                 filename = file.name.split(FILE_EXTENSION_DELIMITER, 1)[0]
                 new_filename = filename + FILE_EXTENSION_DELIMITER + extension
 
                 file.name = new_filename
             else:
                 logger.info('Unrecognized file mimetype: {}'.format(mimetype))
 
     def _clean_files(self, inputs):
         files = []
 
         max_file_count = board_settings.get_int(SECTION_FORMS, 'MaxFileCount')
         if len(inputs) > max_file_count:
             raise forms.ValidationError(
                 ungettext_lazy(ERROR_MANY_FILES, ERROR_MANY_FILES,
                                max_file_count) % {'files': max_file_count})
         for file_input in inputs:
             if isinstance(file_input, UploadedFile):
                 files.append(self._clean_file_file(file_input))
             else:
                 files.append(self._clean_file_url(file_input))
 
         for file in files:
             self._validate_image_dimensions(file)
 
         return files
 
     def _validate_image_dimensions(self, file):
         if isinstance(file, UploadedFile):
             mimetype = get_file_mimetype(file)
             if mimetype.split('/')[-1] in FILE_TYPES_IMAGE:
                 Image.warnings.simplefilter('error', Image.DecompressionBombWarning)
                 try:
                     print(get_image_dimensions(file))
                 except Exception:
                     raise forms.ValidationError('Possible decompression bomb or large image.')
 
     def _clean_file_file(self, file):
         validate_file_size(file.size)
         self._update_file_extension(file)
 
         return file
 
     def _clean_file_url(self, url):
         file = None
 
         if url:
             mode = self.cleaned_data['download_mode']
             if mode == DOWN_MODE_URL:
                 return url
 
             try:
                 image = get_attachment_by_alias(url, self.session)
                 if image is not None:
                     if 'stickers' not in self.cleaned_data:
                         self.cleaned_data['stickers'] = []
                     self.cleaned_data['stickers'].append(image)
                     return
 
                 if file is None:
                     file = self._get_file_from_url(url)
                     if not file:
                         raise forms.ValidationError(_('Invalid URL'))
                     else:
                         validate_file_size(file.size)
                 self._update_file_extension(file)
             except forms.ValidationError as e:
                 # Assume we will get the plain URL instead of a file and save it
                 if mode == DOWN_MODE_TRY and (REGEX_URL.match(url) or REGEX_MAGNET.match(url)):
                     logger.info('Error in forms: {}'.format(e))
                     return url
                 else:
                     raise e
 
         return file
 
     def _clean_text_file(self):
         text = self.cleaned_data.get('text')
         file = self.get_files()
         file_url = self.get_file_urls()
         images = self.get_images()
 
         if (not text) and (not file) and (not file_url) and len(images) == 0:
             error_message = _('Either text or file must be entered.')
             self._add_general_error(error_message)
 
     def _get_cache_key(self, key):
         return '{}_{}'.format(self.session.session_key, key)
 
     def _set_session_cache(self, key, value):
         cache.set(self._get_cache_key(key), value)
 
     def _get_session_cache(self, key):
         return cache.get(self._get_cache_key(key))
 
     def _get_last_post_time(self):
         last = self._get_session_cache(LAST_POST_TIME)
         if last is None:
             last = self.session.get(LAST_POST_TIME)
         return last
 
     def _validate_posting_speed(self):
         can_post = True
 
         posting_delay = board_settings.get_int(SECTION_FORMS, 'PostingDelay')
 
         if board_settings.get_bool(SECTION_FORMS, 'LimitPostingSpeed'):
             now = time.time()
 
             current_delay = 0
 
             if LAST_POST_TIME not in self.session:
                 self.session[LAST_POST_TIME] = now
 
                 need_delay = True
             else:
                 last_post_time = self._get_last_post_time()
                 current_delay = int(now - last_post_time)
 
                 need_delay = current_delay < posting_delay
 
             self._set_session_cache(LAST_POST_TIME, now)
 
             if need_delay:
                 delay = posting_delay - current_delay
                 error_message = ungettext_lazy(ERROR_SPEED, ERROR_SPEED_PLURAL,
                                                delay) % {'delay': delay}
                 self._add_general_error(error_message)
 
                 can_post = False
 
             if can_post:
                 self.session[LAST_POST_TIME] = now
             else:
                 # Reset the time since posting failed
                 self._set_session_cache(LAST_POST_TIME, self.session[LAST_POST_TIME])
 
     def _get_file_from_url(self, url: str) -> SimpleUploadedFile:
         """
         Gets an file file from URL.
         """
 
         try:
             return download(url)
         except forms.ValidationError as e:
             raise e
         except Exception as e:
             raise forms.ValidationError(e)
 
     def _validate_hash(self, timestamp: str, iteration: str, guess: str, message: str):
         payload = timestamp + message.replace('\r\n', '\n')
         difficulty = board_settings.get_int(SECTION_FORMS, 'PowDifficulty')
         target = str(int(2 ** (POW_HASH_LENGTH * 3) / difficulty))
         if len(target) < POW_HASH_LENGTH:
             target = '0' * (POW_HASH_LENGTH - len(target)) + target
 
         computed_guess = hashlib.sha256((payload + iteration).encode())\
                              .hexdigest()[0:POW_HASH_LENGTH]
         if guess != computed_guess or guess > target:
             self._add_general_error(_('Invalid PoW.'))
 
     def _check_file_duplicates(self, files):
         for file in files:
             file_hash = utils.get_file_hash(file)
             if Attachment.objects.get_existing_duplicate(file_hash, file):
                 self._add_general_error(_(ERROR_DUPLICATES))
 
     def _add_general_error(self, message):
         self.add_error('text', forms.ValidationError(message))
 
 
 class ThreadForm(PostForm):
 
     tags = forms.CharField(
         widget=forms.TextInput(attrs={ATTRIBUTE_PLACEHOLDER: TAGS_PLACEHOLDER}),
         max_length=100, label=_('Tags'), required=True)
     monochrome = forms.BooleanField(label=_('Monochrome'), required=False)
+    stickerpack = forms.BooleanField(label=_('Sticker Pack'), required=False)
 
     def clean_tags(self):
         tags = self.cleaned_data['tags'].strip()
 
         if not tags or not REGEX_TAGS.match(tags):
             raise forms.ValidationError(
                 _('Inappropriate characters in tags.'))
 
         default_tag_name = board_settings.get(SECTION_FORMS, 'DefaultTag')\
                 .strip().lower()
 
         required_tag_exists = False
         tag_set = set()
         for tag_string in tags.split():
             tag_name = tag_string.strip().lower()
             if tag_name == default_tag_name:
                 required_tag_exists = True
                 tag, created = Tag.objects.get_or_create_with_alias(
                         name=tag_name, required=True)
             else:
                 tag, created = Tag.objects.get_or_create_with_alias(name=tag_name)
             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 |= set(tag.get_all_parents())
 
         for tag in tag_set:
             if tag.required:
                 required_tag_exists = True
                 break
 
         # Use default tag if no section exists
         if not required_tag_exists:
             default_tag, created = Tag.objects.get_or_create_with_alias(
                     name=default_tag_name, required=True)
             tag_set.add(default_tag)
 
         return tag_set
 
     def clean(self):
         cleaned_data = super(ThreadForm, self).clean()
 
         return cleaned_data
 
     def is_monochrome(self):
         return self.cleaned_data['monochrome']
 
+    def clean_stickerpack(self):
+        stickerpack = self.cleaned_data['stickerpack']
+        if stickerpack:
+            tripcode = self.get_tripcode()
+            if not tripcode:
+                raise forms.ValidationError(_(
+                    'Tripcode should be specified to own a stickerpack.'))
+            title = self.get_title()
+            if not title:
+                raise forms.ValidationError(_(
+                    'Title should be specified as a stickerpack name.'))
+            if not REGEX_TAGS.match(title):
+                raise forms.ValidationError(_('Inappropriate sticker pack name.'))
+
+            existing_pack = StickerPack.objects.filter(name=title).first()
+            if existing_pack:
+                if existing_pack.tripcode != tripcode:
+                    raise forms.ValidationError(_(
+                        'A sticker pack with this name already exists and is'
+                        ' owned by another tripcode.'))
+                if not existing_pack.tripcode:
+                    raise forms.ValidationError(_(
+                        'This sticker pack can only be updated by an '
+                        'administrator.'))
+
+        return stickerpack
+
+    def is_stickerpack(self):
+        return self.cleaned_data['stickerpack']
+
 
 class SettingsForm(NeboardForm):
 
     theme = forms.ChoiceField(
             choices=board_settings.get_list_dict('View', 'Themes'),
             label=_('Theme'))
     image_viewer = forms.ChoiceField(
             choices=board_settings.get_list_dict('View', 'ImageViewers'),
             label=_('Image view mode'))
     username = forms.CharField(label=_('User name'), required=False)
     timezone = forms.ChoiceField(choices=get_timezones(), label=_('Time zone'))
 
     def clean_username(self):
         username = self.cleaned_data['username']
 
         if username and not REGEX_USERNAMES.match(username):
             raise forms.ValidationError(_('Inappropriate characters.'))
 
         return username
 
 
 class SearchForm(NeboardForm):
     query = forms.CharField(max_length=500, label=LABEL_SEARCH, required=False)

boards/locale/ru/LC_MESSAGES/django.po

@@ -1,621 +1,642 b''
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-10-09 23:21+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: admin.py:22
 msgid "{} posters were banned"
 msgstr ""
 
 #: authors.py:9
 msgid "author"
 msgstr "автор"
 
 #: authors.py:10
 msgid "developer"
 msgstr "разработчик"
 
 #: authors.py:11
 msgid "javascript developer"
 msgstr "разработчик javascript"
 
 #: authors.py:12
 msgid "designer"
 msgstr "дизайнер"
 
 #: forms.py:30
 msgid "Type message here. Use formatting panel for more advanced usage."
 msgstr ""
 "Вводите сообщение сюда. Используйте панель для более сложного форматирования."
 
 #: forms.py:31
 msgid "music images i_dont_like_tags"
 msgstr "музыка картинки теги_не_нужны"
 
 #: forms.py:33
 msgid "Title"
 msgstr "Заголовок"
 
 #: forms.py:34
 msgid "Text"
 msgstr "Текст"
 
 #: forms.py:35
 msgid "Tag"
 msgstr "Метка"
 
 #: forms.py:36 templates/boards/base.html:40 templates/search/search.html:7
 msgid "Search"
 msgstr "Поиск"
 
 #: forms.py:48
 msgid "File 1"
 msgstr "Файл 1"
 
 #: forms.py:48
 msgid "File 2"
 msgstr "Файл 2"
 
 #: forms.py:142
 msgid "File URL"
 msgstr "URL файла"
 
 #: forms.py:148
 msgid "e-mail"
 msgstr ""
 
 #: forms.py:151
 msgid "Additional threads"
 msgstr "Дополнительные темы"
 
 #: forms.py:162
 #, python-format
 msgid "Title must have less than %s characters"
 msgstr "Заголовок должен иметь меньше %s символов"
 
 #: forms.py:172
 #, python-format
 msgid "Text must have less than %s characters"
 msgstr "Текст должен быть короче %s символов"
 
 #: forms.py:192
 msgid "Invalid URL"
 msgstr "Неверный URL"
 
 #: forms.py:213
 msgid "Invalid additional thread list"
 msgstr "Неверный список дополнительных тем"
 
 #: forms.py:258
 msgid "Either text or file must be entered."
 msgstr "Текст или файл должны быть введены."
 
 #: forms.py:317 templates/boards/all_threads.html:153
 #: templates/boards/rss/post.html:10 templates/boards/tags.html:6
 msgid "Tags"
 msgstr "Метки"
 
 #: forms.py:324
 msgid "Inappropriate characters in tags."
 msgstr "Недопустимые символы в метках."
 
 #: forms.py:344
 msgid "Need at least one section."
 msgstr "Нужен хотя бы один раздел."
 
 #: forms.py:356
 msgid "Theme"
 msgstr "Тема"
 
 #: forms.py:357
 msgid "Image view mode"
 msgstr "Режим просмотра изображений"
 
 #: forms.py:358
 msgid "User name"
 msgstr "Имя пользователя"
 
 #: forms.py:359
 msgid "Time zone"
 msgstr "Часовой пояс"
 
 #: forms.py:365
 msgid "Inappropriate characters."
 msgstr "Недопустимые символы."
 
 #: templates/boards/404.html:6
 msgid "Not found"
 msgstr "Не найдено"
 
 #: templates/boards/404.html:12
 msgid "This page does not exist"
 msgstr "Этой страницы не существует"
 
 #: templates/boards/all_threads.html:35
 msgid "Details"
 msgstr "Подробности"
 
 #: templates/boards/all_threads.html:69
 msgid "Edit tag"
 msgstr "Изменить метку"
 
 #: templates/boards/all_threads.html:76
 #, python-format
 msgid "%(count)s active thread"
 msgid_plural "%(count)s active threads"
 msgstr[0] "%(count)s активная тема"
 msgstr[1] "%(count)s активные темы"
 msgstr[2] "%(count)s активных тем"
 
 #: templates/boards/all_threads.html:76
 #, python-format
 msgid "%(count)s thread in bumplimit"
 msgid_plural "%(count)s threads in bumplimit"
 msgstr[0] "%(count)s тема в бамплимите"
 msgstr[1] "%(count)s темы в бамплимите"
 msgstr[2] "%(count)s тем в бамплимите"
 
 #: templates/boards/all_threads.html:77
 #, python-format
 msgid "%(count)s archived thread"
 msgid_plural "%(count)s archived thread"
 msgstr[0] "%(count)s архивная тема"
 msgstr[1] "%(count)s архивные темы"
 msgstr[2] "%(count)s архивных тем"
 
 #: templates/boards/all_threads.html:78 templates/boards/post.html:102
 #, python-format
 #| msgid "%(count)s message"
 #| msgid_plural "%(count)s messages"
 msgid "%(count)s message"
 msgid_plural "%(count)s messages"
 msgstr[0] "%(count)s сообщение"
 msgstr[1] "%(count)s сообщения"
 msgstr[2] "%(count)s сообщений"
 
 #: templates/boards/all_threads.html:95 templates/boards/feed.html:30
 #: templates/boards/notifications.html:17 templates/search/search.html:26
 msgid "Previous page"
 msgstr "Предыдущая страница"
 
 #: templates/boards/all_threads.html:109
 #, python-format
 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:127 templates/boards/feed.html:40
 #: templates/boards/notifications.html:27 templates/search/search.html:37
 msgid "Next page"
 msgstr "Следующая страница"
 
 #: templates/boards/all_threads.html:132
 msgid "No threads exist. Create the first one!"
 msgstr "Нет тем. Создайте первую!"
 
 #: templates/boards/all_threads.html:138
 msgid "Create new thread"
 msgstr "Создать новую тему"
 
 #: templates/boards/all_threads.html:143 templates/boards/preview.html:16
 #: templates/boards/thread_normal.html:51
 msgid "Post"
 msgstr "Отправить"
 
 #: templates/boards/all_threads.html:144 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:149
 msgid "Tags must be delimited by spaces. Text or image is required."
 msgstr ""
 "Метки должны быть разделены пробелами. Текст или изображение обязательны."
 
 #: templates/boards/all_threads.html:152 templates/boards/thread_normal.html:58
 msgid "Text syntax"
 msgstr "Синтаксис текста"
 
 #: templates/boards/all_threads.html:166 templates/boards/feed.html:53
 msgid "Pages:"
 msgstr "Страницы: "
 
 #: templates/boards/authors.html:6 templates/boards/authors.html.py:12
 msgid "Authors"
 msgstr "Авторы"
 
 #: templates/boards/authors.html:26
 msgid "Distributed under the"
 msgstr "Распространяется под"
 
 #: templates/boards/authors.html:28
 msgid "license"
 msgstr "лицензией"
 
 #: templates/boards/authors.html:30
 msgid "Repository"
 msgstr "Репозиторий"
 
 #: templates/boards/base.html:14 templates/boards/base.html.py:41
 msgid "Feed"
 msgstr "Лента"
 
 #: templates/boards/base.html:31
 msgid "All threads"
 msgstr "Все темы"
 
 #: templates/boards/base.html:37
 msgid "Add tags"
 msgstr "Добавить метки"
 
 #: templates/boards/base.html:39
 msgid "Tag management"
 msgstr "Управление метками"
 
 #: templates/boards/base.html:39
 msgid "tags"
 msgstr "метки"
 
 #: templates/boards/base.html:40
 msgid "search"
 msgstr "поиск"
 
 #: templates/boards/base.html:41 templates/boards/feed.html:11
 msgid "feed"
 msgstr "лента"
 
 #: 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:44
 msgid "favorites"
 msgstr "избранное"
 
 #: templates/boards/base.html:48 templates/boards/base.html.py:49
 #: templates/boards/notifications.html:8
 msgid "Notifications"
 msgstr "Уведомления"
 
 #: templates/boards/base.html:56 templates/boards/settings.html:8
 msgid "Settings"
 msgstr "Настройки"
 
 #: templates/boards/base.html:59
 msgid "Loading..."
 msgstr "Загрузка..."
 
 #: templates/boards/base.html:71
 msgid "Admin"
 msgstr "Администрирование"
 
 #: templates/boards/base.html:73
 #, python-format
 msgid "Speed: %(ppd)s posts per day"
 msgstr "Скорость: %(ppd)s сообщений в день"
 
 #: templates/boards/base.html:75
 msgid "Up"
 msgstr "Вверх"
 
 #: templates/boards/feed.html:45
 msgid "No posts exist. Create the first one!"
 msgstr "Нет сообщений. Создайте первое!"
 
 #: templates/boards/post.html:33
 msgid "Open"
 msgstr "Открыть"
 
 #: templates/boards/post.html:35 templates/boards/post.html.py:46
 msgid "Reply"
 msgstr "Ответить"
 
 #: templates/boards/post.html:41
 msgid " in "
 msgstr " в "
 
 #: templates/boards/post.html:51
 msgid "Edit"
 msgstr "Изменить"
 
 #: templates/boards/post.html:53
 msgid "Edit thread"
 msgstr "Изменить тему"
 
 #: templates/boards/post.html:91
 msgid "Replies"
 msgstr "Ответы"
 
 #: templates/boards/post.html:103
 #, 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"
 msgstr "Изображение сообщения"
 
 #: templates/boards/settings.html:15
 msgid "You are moderator."
 msgstr "Вы модератор."
 
 #: templates/boards/settings.html:19
 msgid "Hidden tags:"
 msgstr "Скрытые метки:"
 
 #: templates/boards/settings.html:25
 msgid "No hidden tags."
 msgstr "Нет скрытых меток."
 
 #: templates/boards/settings.html:34
 msgid "Save"
 msgstr "Сохранить"
 
 #: templates/boards/staticpages/banned.html:6
 msgid "Banned"
 msgstr "Заблокирован"
 
 #: templates/boards/staticpages/banned.html:11
 msgid "Your IP address has been banned. Contact the administrator"
 msgstr "Ваш IP адрес был заблокирован. Свяжитесь с администратором"
 
 #: templates/boards/staticpages/help.html:6
 #: templates/boards/staticpages/help.html:10
 msgid "Syntax"
 msgstr "Синтаксис"
 
 #: templates/boards/staticpages/help.html:11
 msgid "Italic text"
 msgstr "Курсивный текст"
 
 #: templates/boards/staticpages/help.html:12
 msgid "Bold text"
 msgstr "Полужирный текст"
 
 #: templates/boards/staticpages/help.html:13
 msgid "Spoiler"
 msgstr "Спойлер"
 
 #: templates/boards/staticpages/help.html:14
 msgid "Link to a post"
 msgstr "Ссылка на сообщение"
 
 #: templates/boards/staticpages/help.html:15
 msgid "Strikethrough text"
 msgstr "Зачеркнутый текст"
 
 #: templates/boards/staticpages/help.html:16
 msgid "Comment"
 msgstr "Комментарий"
 
 #: templates/boards/staticpages/help.html:17
 #: templates/boards/staticpages/help.html:18
 msgid "Quote"
 msgstr "Цитата"
 
 #: templates/boards/staticpages/help.html:21
 msgid "You can try pasting the text and previewing the result here:"
 msgstr "Вы можете попробовать вставить текст и проверить результат здесь:"
 
 #: templates/boards/thread.html:14
 msgid "Normal"
 msgstr "Нормальный"
 
 #: templates/boards/thread.html:15
 msgid "Gallery"
 msgstr "Галерея"
 
 #: templates/boards/thread.html:16
 msgid "Tree"
 msgstr "Дерево"
 
 #: templates/boards/thread.html:35
 msgid "message"
 msgid_plural "messages"
 msgstr[0] "сообщение"
 msgstr[1] "сообщения"
 msgstr[2] "сообщений"
 
 #: templates/boards/thread.html:38
 msgid "image"
 msgid_plural "images"
 msgstr[0] "изображение"
 msgstr[1] "изображения"
 msgstr[2] "изображений"
 
 #: templates/boards/thread.html:40
 msgid "Last update: "
 msgstr "Последнее обновление: "
 
 #: templates/boards/thread_gallery.html:36
 msgid "No images."
 msgstr "Нет изображений."
 
 #: templates/boards/thread_normal.html:30
 msgid "posts to bumplimit"
 msgstr "сообщений до бамплимита"
 
 #: templates/boards/thread_normal.html:44
 msgid "Reply to thread"
 msgstr "Ответить в тему"
 
 #: templates/boards/thread_normal.html:44
 msgid "to message "
 msgstr "на сообщение"
 
 #: templates/boards/thread_normal.html:59
 msgid "Reset form"
 msgstr "Сбросить форму"
 
 #: templates/search/search.html:17
 msgid "Ok"
 msgstr "Ок"
 
 #: utils.py:120
 #, python-format
 msgid "File must be less than %s but is %s."
 msgstr "Файл должен быть менее %s, но его размер %s."
 
 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 секунд перед отправкой сообщения"
 
 msgid "New threads"
 msgstr "Новые темы"
 
 #, python-format
 msgid "Max file size is %(size)s."
 msgstr "Максимальный размер файла %(size)s."
 
 msgid "Size of media:"
 msgstr "Размер медиа:"
 
 msgid "Statistics"
 msgstr "Статистика"
 
 msgid "Invalid PoW."
 msgstr "Неверный PoW."
 
 msgid "Stale PoW."
 msgstr "PoW устарел."
 
 msgid "Show"
 msgstr "Показывать"
 
 msgid "Hide"
 msgstr "Скрывать"
 
 msgid "Add to favorites"
 msgstr "Добавить в избранное"
 
 msgid "Remove from favorites"
 msgstr "Убрать из избранного"
 
 msgid "Monochrome"
 msgstr "Монохромный"
 
 msgid "Subsections: "
 msgstr "Подразделы: "
 
 msgid "Change file source"
 msgstr "Изменить источник файла"
 
 msgid "interesting"
 msgstr "интересное"
 
 msgid "images"
 msgstr "изображения"
 
 msgid "Delete post"
 msgstr "Удалить пост"
 
 msgid "Delete thread"
 msgstr "Удалить тему"
 
 msgid "Messages per day/week/month:"
 msgstr "Сообщений за день/неделю/месяц:"
 
 msgid "Subscribe to thread"
 msgstr "Подписаться на тему"
 
 msgid "Active threads:"
 msgstr "Активные темы:"
 
 msgid "No active threads today."
 msgstr "Сегодня нет активных тем."
 
 msgid "Insert URLs on separate lines."
 msgstr "Вставляйте ссылки на отдельных строках."
 
 msgid "You can post no more than %(files)d file."
 msgid_plural "You can post no more than %(files)d files."
 msgstr[0] "Вы можете отправить не более %(files)d файла."
 msgstr[1] "Вы можете отправить не более %(files)d файлов."
 msgstr[2] "Вы можете отправить не более %(files)d файлов."
 
 #, python-format
 msgid "Max file number is %(max_files)s."
 msgstr "Максимальное количество файлов %(max_files)s."
 
 msgid "Moderation"
 msgstr "Модерация"
 
 msgid "Check for duplicates"
 msgstr "Проверять на дубликаты"
 
 msgid "Some files are already present on the board."
 msgstr "Некоторые файлы уже присутствуют на борде."
 
 msgid "Do not download URLs"
 msgstr "Не загружать ссылки"
 
 msgid "Ban and delete"
 msgstr "Забанить и удалить"
 
 msgid "Are you sure?"
 msgstr "Вы уверены?"
 
 msgid "Ban"
 msgstr "Забанить"
 
 msgid "URL download mode"
 msgstr "Режим загрузки ссылок"
 
 msgid "Download or add URL"
 msgstr "Загрузить или добавить ссылку"
 
 msgid "Download or fail"
 msgstr "Загрузить или отказать"
 
 msgid "Insert as URLs"
 msgstr "Вставлять как ссылки"
 
 msgid "Help"
 msgstr "Справка"
 
 msgid "View available stickers:"
 msgstr "Просмотреть доступные стикеры:"
 
 msgid "Stickers"
 msgstr "Стикеры"
 
 msgid "Available by addresses:"
 msgstr "Доступно по адресам:"
 
 msgid "Local stickers"
 msgstr "Локальные стикеры"
 
 msgid "Global stickers"
 msgstr "Глобальные стикеры"
 
 msgid "Remove sticker"
 msgstr "Удалить стикер"
+
+msgid "Sticker Pack"
+msgstr "Набор Стикеров"
+
+msgid "Tripcode should be specified to own a stickerpack."
+msgstr "Для владения набором стикеров необходимо указать трипкод."
+
+msgid "Title should be specified as a stickerpack name."
+msgstr "Заголовок должен быть указан в качестве имени набора стикеров."
+
+msgid "A sticker pack with this name already exists and is owned by another tripcode."
+msgstr "Набор стикеров с данным именем уже существует и принадлежит другому трипкоду."
+
+msgid "This sticker pack can only be updated by an administrator."
+msgstr "Этот набор стикеров может быть изменён только администратором."
+
+msgid "To add a sticker, create a stickerpack thread using the title as a pack name, and a tripcode to own the pack. Then, add posts with title as a sticker name, and the same tripcode, to the thread. Their attachments would become stickers."
+msgstr "Чтобы добавить стикер, создайте тему-набор с заголовком в качестве названия набора стикеров, и трипкодом для подтверждения владения набором. Затем, добавляйте сообщения с заголовком в качестве имени стикера, и тем же трипкодомм. Их вложения станут стикерами."
+
+msgid "Inappropriate sticker pack name."
+msgstr "Недопустимое имя набора стикеров."

boards/locale/uk/LC_MESSAGES/django.po

@@ -1,621 +1,642 b''
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-10-09 23:21+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: admin.py:22
 msgid "{} posters were banned"
 msgstr "{} постерів заблоковано"
 
 #: authors.py:9
 msgid "author"
 msgstr "автор"
 
 #: authors.py:10
 msgid "developer"
 msgstr "розробник"
 
 #: authors.py:11
 msgid "javascript developer"
 msgstr "javascript-розробник"
 
 #: authors.py:12
 msgid "designer"
 msgstr "дизайнер"
 
 #: forms.py:30
 msgid "Type message here. Use formatting panel for more advanced usage."
 msgstr ""
 "Введіть сюди повідомлення. Користайте панель для складнішого форматування."
 
 #: forms.py:31
 msgid "music images i_dont_like_tags"
 msgstr "музика зображення мітки_не_потрібні"
 
 #: forms.py:33
 msgid "Title"
 msgstr "Заголовок"
 
 #: forms.py:34
 msgid "Text"
 msgstr "Текст"
 
 #: forms.py:35
 msgid "Tag"
 msgstr "Мітка"
 
 #: forms.py:36 templates/boards/base.html:40 templates/search/search.html:7
 msgid "Search"
 msgstr "Пошук"
 
 #: forms.py:48
 msgid "File 1"
 msgstr "Файл 1"
 
 #: forms.py:48
 msgid "File 2"
 msgstr "Файл 2"
 
 #: forms.py:142
 msgid "File URL"
 msgstr "URL файлу"
 
 #: forms.py:148
 msgid "e-mail"
 msgstr ""
 
 #: forms.py:151
 msgid "Additional threads"
 msgstr "Додаткові нитки"
 
 #: forms.py:162
 #, python-format
 msgid "Title must have less than %s characters"
 msgstr "Заголовок має містити менше %s символів"
 
 #: forms.py:172
 #, python-format
 msgid "Text must have less than %s characters"
 msgstr "Текст має бути коротше %s символів"
 
 #: forms.py:192
 msgid "Invalid URL"
 msgstr "Хибний URL"
 
 #: forms.py:213
 msgid "Invalid additional thread list"
 msgstr "Хибний перелік додаткових ниток"
 
 #: forms.py:258
 msgid "Either text or file must be entered."
 msgstr "Слід додати текст або файл."
 
 #: forms.py:317 templates/boards/all_threads.html:153
 #: templates/boards/rss/post.html:10 templates/boards/tags.html:6
 msgid "Tags"
 msgstr "Мітки"
 
 #: forms.py:324
 msgid "Inappropriate characters in tags."
 msgstr "Неприйнятні символи у мітках."
 
 #: forms.py:344
 msgid "Need at least one section."
 msgstr "Мусить бути хоча б один розділ."
 
 #: forms.py:356
 msgid "Theme"
 msgstr "Тема"
 
 #: forms.py:357
 msgid "Image view mode"
 msgstr "Режим перегляду зображень"
 
 #: forms.py:358
 msgid "User name"
 msgstr "Им'я користувача"
 
 #: forms.py:359
 msgid "Time zone"
 msgstr "Часовий пояс"
 
 #: forms.py:365
 msgid "Inappropriate characters."
 msgstr "Неприйнятні символи."
 
 #: templates/boards/404.html:6
 msgid "Not found"
 msgstr "Загубилося"
 
 #: templates/boards/404.html:12
 msgid "This page does not exist"
 msgstr "Нема правдоньки на світі, ой нема…"
 
 #: templates/boards/all_threads.html:35
 msgid "Details"
 msgstr "Деталі"
 
 #: templates/boards/all_threads.html:69
 msgid "Edit tag"
 msgstr "Змінити мітку"
 
 #: templates/boards/all_threads.html:76
 #, python-format
 msgid "%(count)s active thread"
 msgid_plural "%(count)s active threads"
 msgstr[0] "%(count)s активна нитка"
 msgstr[1] "%(count)s активні нитки"
 msgstr[2] "%(count)s активних ниток"
 
 #: templates/boards/all_threads.html:76
 #, python-format
 msgid "%(count)s thread in bumplimit"
 msgid_plural "%(count)s threads in bumplimit"
 msgstr[0] "%(count)s нитка в бампляматі"
 msgstr[1] "%(count)s нитки в бампляматі"
 msgstr[2] "%(count)s ниток у бампляматі"
 
 #: templates/boards/all_threads.html:77
 #, python-format
 msgid "%(count)s archived thread"
 msgid_plural "%(count)s archived thread"
 msgstr[0] "%(count)s архівна нитка"
 msgstr[1] "%(count)s архівні нитки"
 msgstr[2] "%(count)s архівних ниток"
 
 #: templates/boards/all_threads.html:78 templates/boards/post.html:102
 #, python-format
 #| msgid "%(count)s message"
 #| msgid_plural "%(count)s messages"
 msgid "%(count)s message"
 msgid_plural "%(count)s messages"
 msgstr[0] "%(count)s повідомлення"
 msgstr[1] "%(count)s повідомлення"
 msgstr[2] "%(count)s повідомлень"
 
 #: templates/boards/all_threads.html:95 templates/boards/feed.html:30
 #: templates/boards/notifications.html:17 templates/search/search.html:26
 msgid "Previous page"
 msgstr "Попєрєдня сторінка"
 
 #: templates/boards/all_threads.html:109
 #, python-format
 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:127 templates/boards/feed.html:40
 #: templates/boards/notifications.html:27 templates/search/search.html:37
 msgid "Next page"
 msgstr "Наступна сторінка"
 
 #: templates/boards/all_threads.html:132
 msgid "No threads exist. Create the first one!"
 msgstr "Нема правдоньки на світі. Зачнімо її!"
 
 #: templates/boards/all_threads.html:138
 msgid "Create new thread"
 msgstr "Сплести нову нитку"
 
 #: templates/boards/all_threads.html:143 templates/boards/preview.html:16
 #: templates/boards/thread_normal.html:51
 msgid "Post"
 msgstr "Надіслати"
 
 #: templates/boards/all_threads.html:144 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:149
 msgid "Tags must be delimited by spaces. Text or image is required."
 msgstr ""
 "Мітки розмежувати пробілами. Текст чи зображення є обов'язковими."
 
 #: templates/boards/all_threads.html:152 templates/boards/thread_normal.html:58
 msgid "Text syntax"
 msgstr "Синтаксис тексту"
 
 #: templates/boards/all_threads.html:166 templates/boards/feed.html:53
 msgid "Pages:"
 msgstr "Сторінки:"
 
 #: templates/boards/authors.html:6 templates/boards/authors.html.py:12
 msgid "Authors"
 msgstr "Автори"
 
 #: templates/boards/authors.html:26
 msgid "Distributed under the"
 msgstr "Розповсюджується під ліцензією"
 
 #: templates/boards/authors.html:28
 msgid "license"
 msgstr ""
 
 #: templates/boards/authors.html:30
 msgid "Repository"
 msgstr "Репозиторій"
 
 #: templates/boards/base.html:14 templates/boards/base.html.py:41
 msgid "Feed"
 msgstr "Стрічка"
 
 #: templates/boards/base.html:31
 msgid "All threads"
 msgstr "Усі нитки"
 
 #: templates/boards/base.html:37
 msgid "Add tags"
 msgstr "Додати мітки"
 
 #: templates/boards/base.html:39
 msgid "Tag management"
 msgstr "Керування мітками"
 
 #: templates/boards/base.html:39
 msgid "tags"
 msgstr "мітки"
 
 #: templates/boards/base.html:40
 msgid "search"
 msgstr "пошук"
 
 #: templates/boards/base.html:41 templates/boards/feed.html:11
 msgid "feed"
 msgstr "стрічка"
 
 #: 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:44
 msgid "favorites"
 msgstr "улюблене"
 
 #: templates/boards/base.html:48 templates/boards/base.html.py:49
 #: templates/boards/notifications.html:8
 msgid "Notifications"
 msgstr "Сповіщення"
 
 #: templates/boards/base.html:56 templates/boards/settings.html:8
 msgid "Settings"
 msgstr "Налаштування"
 
 #: templates/boards/base.html:59
 msgid "Loading..."
 msgstr "Завантаження..."
 
 #: templates/boards/base.html:71
 msgid "Admin"
 msgstr "Адміністрування"
 
 #: templates/boards/base.html:73
 #, python-format
 msgid "Speed: %(ppd)s posts per day"
 msgstr "Хуткість: %(ppd)s повідомлень на день"
 
 #: templates/boards/base.html:75
 msgid "Up"
 msgstr "Догори"
 
 #: templates/boards/feed.html:45
 msgid "No posts exist. Create the first one!"
 msgstr "Ще нема повідомлень. Зачнімо!"
 
 #: templates/boards/post.html:33
 msgid "Open"
 msgstr "Відкрити"
 
 #: templates/boards/post.html:35 templates/boards/post.html.py:46
 msgid "Reply"
 msgstr "Відповісти"
 
 #: templates/boards/post.html:41
 msgid " in "
 msgstr " у "
 
 #: templates/boards/post.html:51
 msgid "Edit"
 msgstr "Змінити"
 
 #: templates/boards/post.html:53
 msgid "Edit thread"
 msgstr "Змінити нитку"
 
 #: templates/boards/post.html:91
 msgid "Replies"
 msgstr "Відповіді"
 
 #: templates/boards/post.html:103
 #, 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"
 msgstr "Зображення повідомлення"
 
 #: templates/boards/settings.html:15
 msgid "You are moderator."
 msgstr "Ви модератор."
 
 #: templates/boards/settings.html:19
 msgid "Hidden tags:"
 msgstr "Приховані мітки:"
 
 #: templates/boards/settings.html:25
 msgid "No hidden tags."
 msgstr "Нема прихованих міток."
 
 #: templates/boards/settings.html:34
 msgid "Save"
 msgstr "Зберегти"
 
 #: templates/boards/staticpages/banned.html:6
 msgid "Banned"
 msgstr "Заблоковано"
 
 #: templates/boards/staticpages/banned.html:11
 msgid "Your IP address has been banned. Contact the administrator"
 msgstr "Вашу IP-адресу заблоковано. Зателефонуйте до спортлото"
 
 #: templates/boards/staticpages/help.html:6
 #: templates/boards/staticpages/help.html:10
 msgid "Syntax"
 msgstr "Синтаксис"
 
 #: templates/boards/staticpages/help.html:11
 msgid "Italic text"
 msgstr "Курсивний текст"
 
 #: templates/boards/staticpages/help.html:12
 msgid "Bold text"
 msgstr "Напівогрядний текст"
 
 #: templates/boards/staticpages/help.html:13
 msgid "Spoiler"
 msgstr "Спойлер"
 
 #: templates/boards/staticpages/help.html:14
 msgid "Link to a post"
 msgstr "Посилання на повідомлення"
 
 #: templates/boards/staticpages/help.html:15
 msgid "Strikethrough text"
 msgstr "Закреслений текст"
 
 #: templates/boards/staticpages/help.html:16
 msgid "Comment"
 msgstr "Коментар"
 
 #: templates/boards/staticpages/help.html:17
 #: templates/boards/staticpages/help.html:18
 msgid "Quote"
 msgstr "Цитата"
 
 #: templates/boards/staticpages/help.html:21
 msgid "You can try pasting the text and previewing the result here:"
 msgstr "Можете спробувати вставити текст і перевірити результат тут:"
 
 #: templates/boards/thread.html:14
 msgid "Normal"
 msgstr "Звичайний"
 
 #: templates/boards/thread.html:15
 msgid "Gallery"
 msgstr "Галерея"
 
 #: templates/boards/thread.html:16
 msgid "Tree"
 msgstr "Віник"
 
 #: templates/boards/thread.html:35
 msgid "message"
 msgid_plural "messages"
 msgstr[0] "повідомлення"
 msgstr[1] "повідомлення"
 msgstr[2] "повідомлень"
 
 #: templates/boards/thread.html:38
 msgid "image"
 msgid_plural "images"
 msgstr[0] "зображення"
 msgstr[1] "зображення"
 msgstr[2] "зображень"
 
 #: templates/boards/thread.html:40
 msgid "Last update: "
 msgstr "Останнє оновлення: "
 
 #: templates/boards/thread_gallery.html:36
 msgid "No images."
 msgstr "Нема зображень."
 
 #: templates/boards/thread_normal.html:30
 msgid "posts to bumplimit"
 msgstr "повідомлень до бамплямату"
 
 #: templates/boards/thread_normal.html:44
 msgid "Reply to thread"
 msgstr "Відповісти до нитки"
 
 #: templates/boards/thread_normal.html:44
 msgid "to message "
 msgstr "на повідомлення"
 
 #: templates/boards/thread_normal.html:59
 msgid "Reset form"
 msgstr "Скинути форму"
 
 #: templates/search/search.html:17
 msgid "Ok"
 msgstr "Файно"
 
 #: utils.py:120
 #, python-format
 msgid "File must be less than %s but is %s."
 msgstr "Файл мусить бути менше %s, але його розмір %s."
 
 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 секунд перед надсиланням повідомлення"
 
 msgid "New threads"
 msgstr "Нові нитки"
 
 #, python-format
 msgid "Max file size is %(size)s."
 msgstr "Максимальний розмір файлу %(size)s."
 
 msgid "Size of media:"
 msgstr "Розмір посередника:"
 
 msgid "Statistics"
 msgstr "Статистика"
 
 msgid "Invalid PoW."
 msgstr "Хибний PoW."
 
 msgid "Stale PoW."
 msgstr "PoW застарів."
 
 msgid "Show"
 msgstr "Показувати"
 
 msgid "Hide"
 msgstr "Ховати"
 
 msgid "Add to favorites"
 msgstr "Я це люблю"
 
 msgid "Remove from favorites"
 msgstr "Вже не люблю"
 
 msgid "Monochrome"
 msgstr "Без барв"
 
 msgid "Subsections: "
 msgstr "Підрозділи: "
 
 msgid "Change file source"
 msgstr "Змінити джерело файлу"
 
 msgid "interesting"
 msgstr "цікаве"
 
 msgid "images"
 msgstr "пічкури"
 
 msgid "Delete post"
 msgstr "Видалити повідомлення"
 
 msgid "Delete thread"
 msgstr "Вирвати нитку"
 
 msgid "Messages per day/week/month:"
 msgstr "Повідомлень за день/тиждень/тижмісяць:"
 
 msgid "Subscribe to thread"
 msgstr "Стежити за ниткою"
 
 msgid "Active threads:"
 msgstr "Активні нитки:"
 
 msgid "No active threads today."
 msgstr "Щось усі замовкли."
 
 msgid "Insert URLs on separate lines."
 msgstr "Вставляйте посилання окремими рядками."
 
 msgid "You can post no more than %(files)d file."
 msgid_plural "You can post no more than %(files)d files."
 msgstr[0] "Ви можете надіслати не більше %(files)d файлу."
 msgstr[1] "Вы можете надіслати не більше %(files)d файлів."
 msgstr[2] "Вы можете надіслати не більше %(files)d файлів."
 
 #, python-format
 msgid "Max file number is %(max_files)s."
 msgstr "Максимальна кількість файлів %(max_files)s."
 
 msgid "Moderation"
 msgstr "Модерація"
 
 msgid "Check for duplicates"
 msgstr "Перевіряти на дублікати"
 
 msgid "Some files are already present on the board."
 msgstr "Деякі файли вже є на дошці."
 
 msgid "Do not download URLs"
 msgstr "Не завантажувати посилання"
 
 msgid "Ban and delete"
 msgstr "Заблокувати й видалити"
 
 msgid "Are you sure?"
 msgstr "Чи ви певні?"
 
 msgid "Ban"
 msgstr "Заблокувати"
 
 msgid "URL download mode"
 msgstr "Режим завантаження посилань"
 
 msgid "Download or add URL"
 msgstr "Завантажити або додати посилання"
 
 msgid "Download or fail"
 msgstr "Завантажити або відмовити"
 
 msgid "Insert as URLs"
 msgstr "Вставляти як посилання"
 
 msgid "Help"
 msgstr "Справка"
 
 msgid "View available stickers:"
 msgstr "Передивитися доступні стікери:"
 
 msgid "Stickers"
 msgstr "Стікери"
 
 msgid "Available by addresses:"
 msgstr "Доступно за адресами:"
 
 msgid "Local stickers"
 msgstr "Локальні стікери"
 
 msgid "Global stickers"
 msgstr "Глобальні стікери"
 
 msgid "Remove sticker"
 msgstr "Видалити стікер"
+
+msgid "Sticker Pack"
+msgstr "Набір Стікерів"
+
+msgid "Tripcode should be specified to own a stickerpack."
+msgstr "Для володіння набором стікерів необхідно вказати тріпкод."
+
+msgid "Title should be specified as a stickerpack name."
+msgstr "Заголовок повинен бути вказаний в якості імені набору стікерів."
+
+msgid "A sticker pack with this name already exists and is owned by another tripcode."
+msgstr "Набір стікерів з вказаним іменем вже є в наявності та належить іншому тріпкоду."
+
+msgid "This sticker pack can only be updated by an administrator."
+msgstr "Цей набір стікерів може бути змінений лише адміністратором."
+
+msgid "To add a sticker, create a stickerpack thread using the title as a pack name, and a tripcode to own the pack. Then, add posts with title as a sticker name, and the same tripcode, to the thread. Their attachments would become stickers."
+msgstr "Щоб додати стікер, створіть тему-набір з заголовком у якості набору стікерів, та тріпкодом для підтвердження володіння наборомт. Потім, додавайте повідомлення з заголовком у якості імені стікеру та з тим самим тріпкодом. Їхні вкладення станут стікерами."
+
+msgid "Inappropriate sticker pack name."
+msgstr "Неприпустиме ім'я набору стікерів."

boards/models/attachment/__init__.py

@@ -1,171 +1,185 b''
 from itertools import zip_longest
 
 import boards
 from boards.models import STATUS_ARCHIVE
 from django.core.files.images import get_image_dimensions
 from django.db import models
 
 from boards import utils
 from boards.models.attachment.viewers import get_viewers, AbstractViewer, \
     FILE_TYPES_IMAGE
 from boards.utils import get_upload_filename, get_extension, cached_result, \
         get_file_mimetype
 
 
 class AttachmentManager(models.Manager):
     def create_with_hash(self, file):
         file_hash = utils.get_file_hash(file)
         attachment = self.get_existing_duplicate(file_hash, file)
         if not attachment:
             file_type = get_file_mimetype(file)
             attachment = self.create(file=file, mimetype=file_type,
                                      hash=file_hash)
 
         return attachment
 
     def create_from_url(self, url):
         existing = self.filter(url=url)
         if len(existing) > 0:
             attachment = existing[0]
         else:
             attachment = self.create(url=url)
         return attachment
 
     def get_random_images(self, count, tags=None):
         images = self.filter(mimetype__in=FILE_TYPES_IMAGE).exclude(
             attachment_posts__thread__status=STATUS_ARCHIVE)
         if tags is not None:
             images = images.filter(attachment_posts__threads__tags__in=tags)
         return images.order_by('?')[:count]
 
     def get_existing_duplicate(self, file_hash, file):
         """
         Gets an attachment with the same file if one exists.
         """
         existing = self.filter(hash=file_hash)
         attachment = None
         for existing_attachment in existing:
             existing_file = existing_attachment.file
 
             file_chunks = file.chunks()
             existing_file_chunks = existing_file.chunks()
 
             if self._compare_chunks(file_chunks, existing_file_chunks):
                 attachment = existing_attachment
         return attachment
 
     def get_by_alias(self, name):
+        pack_name, sticker_name = name.split('/')
         try:
-            return AttachmentSticker.objects.get(name=name).attachment
+            return AttachmentSticker.objects.get(name=sticker_name, stickerpack__name=pack_name).attachment
         except AttachmentSticker.DoesNotExist:
             return None
 
     def _compare_chunks(self, chunks1, chunks2):
         """
         Compares 2 chunks of different sizes (e.g. first chunk array contains
         all data in 1 chunk, and other one -- in a multiple of smaller ones.
         """
         equal = True
 
         position1 = 0
         position2 = 0
         chunk1 = None
         chunk2 = None
         chunk1ended = False
         chunk2ended = False
         while True:
             if not chunk1 or len(chunk1) <= position1:
                 try:
                     chunk1 = chunks1.__next__()
                     position1 = 0
                 except StopIteration:
                     chunk1ended = True
             if not chunk2 or len(chunk2) <= position2:
                 try:
                     chunk2 = chunks2.__next__()
                     position2 = 0
                 except StopIteration:
                     chunk2ended = True
 
             if chunk1ended and chunk2ended:
                 # Same size chunksm checked for equality previously
                 break
             elif chunk1ended or chunk2ended:
                 # Different size chunks, not equal
                 equal = False
                 break
             elif chunk1[position1] != chunk2[position2]:
                 # Different bytes, not equal
                 equal = False
                 break
             else:
                 position1 += 1
                 position2 += 1
         return equal
 
 
 class Attachment(models.Model):
     objects = AttachmentManager()
 
     class Meta:
         app_label = 'boards'
         ordering = ('id',)
 
     file = models.FileField(upload_to=get_upload_filename, null=True)
     mimetype = models.CharField(max_length=200, null=True)
     hash = models.CharField(max_length=36, null=True)
     url = models.TextField(blank=True, default='')
 
     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, self.id, self.url).get_view()
 
     def __str__(self):
         return self.url or self.file.url
 
     def get_random_associated_post(self):
         posts = boards.models.Post.objects.filter(attachments__in=[self])
         return posts.order_by('?').first()
 
     @cached_result()
     def get_size(self):
         if self.file:
             if self.mimetype in FILE_TYPES_IMAGE:
                 return get_image_dimensions(self.file)
             else:
                 return 200, 150
 
     def get_thumb_url(self):
         split = self.file.url.rsplit('.', 1)
         w, h = 200, 150
         return '%s.%sx%s.%s' % (split[0], w, h, split[1])
 
     @cached_result()
     def get_preview_size(self):
         size = 200, 150
         if self.mimetype in FILE_TYPES_IMAGE:
             preview_path = self.file.path.replace('.', '.200x150.')
             try:
                 size = get_image_dimensions(preview_path)
             except Exception:
                 pass
 
         return size
 
     def is_internal(self):
         return self.url is None or len(self.url) == 0
 
 
+class StickerPack(models.Model):
+    name = models.TextField(unique=True)
+    tripcode = models.TextField(blank=True)
+
+    def __str__(self):
+        return self.name
+
+
 class AttachmentSticker(models.Model):
     attachment = models.ForeignKey('Attachment')
     name = models.TextField(unique=True)
+    stickerpack = models.ForeignKey('StickerPack')
 
     def __str__(self):
-        return self.name
+        # Local stickers do not have a sticker pack
+        if hasattr(self, 'stickerpack'):
+            return '{}/{}'.format(str(self.stickerpack), self.name)
+        else:
+            return self.name

boards/models/post/manager.py

@@ -1,192 +1,228 b''
 import logging
-
 from datetime import datetime, timedelta, date
 from datetime import time as dtime
 
-from boards.abstracts.exceptions import BannedException, ArchiveException
+from django.core.exceptions import PermissionDenied
 from django.db import models, transaction
+from django.dispatch import Signal
 from django.utils import timezone
-from django.dispatch import Signal
-from django.core.exceptions import PermissionDenied
 
 import boards
-
-from boards.models.user import Ban
+from boards import utils
+from boards.abstracts.exceptions import ArchiveException
+from boards.abstracts.constants import REGEX_TAGS
 from boards.mdx_neboard import Parser
 from boards.models import Attachment
-from boards import utils
+from boards.models.attachment import StickerPack, AttachmentSticker
+from boards.models.user import Ban
 
 __author__ = 'neko259'
 
 POSTS_PER_DAY_RANGE = 7
 NO_IP = '0.0.0.0'
 
 
 post_import_deps = Signal()
 
 
 class PostManager(models.Manager):
     @transaction.atomic
     def create_post(self, title: str, text: str, files=[], thread=None,
                     ip=NO_IP, tags: list=None,
                     tripcode='', monochrome=False, images=[],
-                    file_urls=[]):
+                    file_urls=[], stickerpack=False):
         """
         Creates new post
         """
 
         if thread is not None and thread.is_archived():
             raise ArchiveException('Cannot post into an archived thread')
 
         if not utils.is_anonymous_mode():
             is_banned = Ban.objects.filter(ip=ip).exists()
         else:
             is_banned = False
 
         if is_banned:
             raise PermissionDenied()
 
         if not tags:
             tags = []
 
         posting_time = timezone.now()
         new_thread = False
         if not thread:
             thread = boards.models.thread.Thread.objects.create(
                 bump_time=posting_time, last_edit_time=posting_time,
-                monochrome=monochrome)
+                monochrome=monochrome, stickerpack=stickerpack)
             list(map(thread.tags.add, tags))
             new_thread = True
 
         pre_text = Parser().preparse(text)
 
         post = self.create(title=title,
                            text=pre_text,
                            pub_time=posting_time,
                            poster_ip=ip,
                            thread=thread,
                            last_edit_time=posting_time,
                            tripcode=tripcode,
                            opening=new_thread)
 
         logger = logging.getLogger('boards.post.create')
 
         logger.info('Created post [{}] with text [{}] by {}'.format(post,
             post.get_text(),post.poster_ip))
 
         for file in files:
             self._add_file_to_post(file, post)
         for image in images:
             post.attachments.add(image)
         for file_url in file_urls:
             post.attachments.add(Attachment.objects.create_from_url(file_url))
 
         post.set_global_id()
 
         # 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()
 
+        self._create_stickers(post)
+
         return post
 
     def delete_posts_by_ip(self, ip):
         """
         Deletes all posts of the author with same IP
         """
 
         posts = self.filter(poster_ip=ip)
         for post in posts:
             post.delete()
 
     @utils.cached_result()
     def get_posts_per_day(self) -> float:
         """
         Gets average count of posts per day for the last 7 days
         """
 
         day_end = date.today()
         day_start = day_end - timedelta(POSTS_PER_DAY_RANGE)
 
         day_time_start = timezone.make_aware(datetime.combine(
             day_start, dtime()), timezone.get_current_timezone())
         day_time_end = timezone.make_aware(datetime.combine(
             day_end, dtime()), timezone.get_current_timezone())
 
         posts_per_period = float(self.filter(
             pub_time__lte=day_time_end,
             pub_time__gte=day_time_start).count())
 
         ppd = posts_per_period / POSTS_PER_DAY_RANGE
 
         return ppd
 
     def get_post_per_days(self, days) -> int:
         day_end = date.today() + timedelta(1)
         day_start = day_end - timedelta(days)
 
         day_time_start = timezone.make_aware(datetime.combine(
             day_start, dtime()), timezone.get_current_timezone())
         day_time_end = timezone.make_aware(datetime.combine(
             day_end, dtime()), timezone.get_current_timezone())
 
         return self.filter(
             pub_time__lte=day_time_end,
             pub_time__gte=day_time_start).count()
 
     @transaction.atomic
     def import_post(self, title: str, text: str, pub_time: str, global_id,
                     opening_post=None, tags=list(), files=list(),
                     file_urls=list(), tripcode=None, last_edit_time=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))
         else:
             thread = opening_post.get_thread()
 
         post = self.create(title=title,
                            text=text,
                            pub_time=pub_time,
                            poster_ip=NO_IP,
                            last_edit_time=last_edit_time or pub_time,
                            global_id=global_id,
                            opening=is_opening,
                            thread=thread,
                            tripcode=tripcode)
 
         for file in files:
             self._add_file_to_post(file, post)
         for file_url in file_urls:
             post.attachments.add(Attachment.objects.create_from_url(file_url))
 
         url_to_post = '[post]{}[/post]'.format(str(global_id))
         replies = self.filter(text__contains=url_to_post)
         for reply in replies:
             post_import_deps.send(reply)
 
     @transaction.atomic
     def update_post(self, post, title: str, text: str, pub_time: str,
                     tags=list(), files=list(), file_urls=list(), tripcode=None):
         post.title = title
         post.text = text
         post.pub_time = pub_time
         post.tripcode = tripcode
         post.save()
 
         post.clear_cache()
 
         post.attachments.clear()
         for file in files:
             self._add_file_to_post(file, post)
         for file_url in file_urls:
             post.attachments.add(Attachment.objects.create_from_url(file_url))
 
         thread = post.get_thread()
         thread.tags.clear()
         list(map(thread.tags.add, tags))
 
     def _add_file_to_post(self, file, post):
         post.attachments.add(Attachment.objects.create_with_hash(file))
+
+    def _create_stickers(self, post):
+        thread = post.get_thread()
+        stickerpack_thread = thread.is_stickerpack()
+        if stickerpack_thread:
+            logger = logging.getLogger('boards.stickers')
+            if not post.is_opening():
+                has_title = len(post.title) > 0
+                has_one_attachment = post.attachments.count() == 1
+                opening_post = thread.get_opening_post()
+                valid_name = REGEX_TAGS.match(post.title)
+                if has_title and has_one_attachment and valid_name:
+                    existing_sticker = AttachmentSticker.objects.filter(
+                        name=post.get_title()).first()
+                    attachment = post.attachments.first()
+                    if existing_sticker:
+                        existing_sticker.attachment = attachment
+                        existing_sticker.save()
+                        logger.info('Updated sticker {} with new attachment'.format(existing_sticker))
+                    else:
+                        try:
+                            stickerpack = StickerPack.objects.get(
+                                name=opening_post.get_title(), tripcode=post.tripcode)
+                            sticker = AttachmentSticker.objects.create(
+                                stickerpack=stickerpack, name=post.get_title(),
+                                attachment=attachment)
+                            logger.info('Created sticker {}'.format(sticker))
+                        except StickerPack.DoesNotExist:
+                            pass
+            else:
+                stickerpack, created = StickerPack.objects.get_or_create(
+                    name=post.get_title(), tripcode=post.tripcode)
+                if created:
+                    logger.info('Created stickerpack {}'.format(stickerpack))

boards/models/thread.py

@@ -1,313 +1,317 b''
 import logging
 from datetime import timedelta
 
 from django.db import models, transaction
 from django.db.models import Count, Sum, QuerySet, Q
 from django.utils import timezone
 
 import boards
 from boards import settings
 from boards.models import STATUS_BUMPLIMIT, STATUS_ACTIVE, STATUS_ARCHIVE
 from boards.models.attachment import FILE_TYPES_IMAGE
 from boards.models.post import Post
 from boards.models.tag import Tag, DEFAULT_LOCALE, TagAlias
 from boards.utils import cached_result, datetime_to_epoch
 
 FAV_THREAD_NO_UPDATES = -1
 
 
 __author__ = 'neko259'
 
 
 logger = logging.getLogger(__name__)
 
 
 WS_NOTIFICATION_TYPE_NEW_POST = 'new_post'
 WS_NOTIFICATION_TYPE = 'notification_type'
 
 WS_CHANNEL_THREAD = "thread:"
 
 STATUS_CHOICES = (
         (STATUS_ACTIVE, STATUS_ACTIVE),
         (STATUS_BUMPLIMIT, STATUS_BUMPLIMIT),
         (STATUS_ARCHIVE, STATUS_ARCHIVE),
 )
 
 
 class ThreadManager(models.Manager):
     def process_old_threads(self):
         """
          Preserves maximum thread count. If there are too many threads,
          archive or delete the old ones.
          """
         old_time_delta = settings.get_int('Messages', 'ThreadArchiveDays')
         old_time = timezone.now() - timedelta(days=old_time_delta)
         old_ops = Post.objects.filter(opening=True, pub_time__lte=old_time).exclude(thread__status=STATUS_ARCHIVE)
 
         for op in old_ops:
             thread = op.get_thread()
             if settings.get_bool('Storage', 'ArchiveThreads'):
                 self._archive_thread(thread)
             else:
                 thread.delete()
             logger.info('Processed old thread {}'.format(thread))
 
 
     def _archive_thread(self, thread):
         thread.status = STATUS_ARCHIVE
         thread.last_edit_time = timezone.now()
         thread.update_posts_time()
         thread.save(update_fields=['last_edit_time', 'status'])
 
     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(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('replies'))
 
     def get_new_post_count(self, datas):
         new_posts = self.get_new_posts(datas)
         return new_posts.aggregate(total_count=Count('replies'))\
                 ['total_count'] if new_posts else 0
 
 
 def get_thread_max_posts():
     return settings.get_int('Messages', 'MaxPostsPerThread')
 
 
 class Thread(models.Model):
     objects = ThreadManager()
 
     class Meta:
         app_label = 'boards'
 
     tags = models.ManyToManyField('Tag', related_name='thread_tags')
     bump_time = models.DateTimeField(db_index=True)
     last_edit_time = models.DateTimeField()
     max_posts = models.IntegerField(default=get_thread_max_posts)
     status = models.CharField(max_length=50, default=STATUS_ACTIVE,
             choices=STATUS_CHOICES, db_index=True)
     monochrome = models.BooleanField(default=False)
+    stickerpack = models.BooleanField(default=False)
 
     def get_tags(self) -> QuerySet:
         """
         Gets a sorted tag list.
         """
 
         return self.tags.filter(aliases__in=TagAlias.objects.filter_localized(parent__thread_tags=self)).order_by('aliases__name')
 
     def bump(self):
         """
         Bumps (moves to up) thread if possible.
         """
 
         if self.can_bump():
             self.bump_time = self.last_edit_time
 
             self.update_bump_status()
 
             logger.info('Bumped thread %d' % self.id)
 
     def has_post_limit(self) -> bool:
         return self.max_posts > 0
 
     def update_bump_status(self, exclude_posts=None):
         if self.has_post_limit() and self.get_reply_count() >= self.max_posts:
             self.status = STATUS_BUMPLIMIT
             self.update_posts_time(exclude_posts=exclude_posts)
 
     def _get_cache_key(self):
         return [datetime_to_epoch(self.last_edit_time)]
 
     @cached_result(key_method=_get_cache_key)
     def get_reply_count(self) -> int:
         return self.get_replies().count()
 
     @cached_result(key_method=_get_cache_key)
     def get_images_count(self) -> int:
         return self.get_replies().filter(
             attachments__mimetype__in=FILE_TYPES_IMAGE)\
             .annotate(images_count=Count(
             'attachments')).aggregate(Sum('images_count'))['images_count__sum'] or 0
 
     def can_bump(self) -> bool:
         """
         Checks if the thread can be bumped by replying to it.
         """
 
         return self.get_status() == STATUS_ACTIVE
 
     def get_last_replies(self) -> QuerySet:
         """
         Gets several last replies, not including opening post
         """
 
         last_replies_count = settings.get_int('View', 'LastRepliesCount')
 
         if last_replies_count > 0:
             reply_count = self.get_reply_count()
 
             if reply_count > 0:
                 reply_count_to_show = min(last_replies_count,
                                           reply_count - 1)
                 replies = self.get_replies()
                 last_replies = replies[reply_count - reply_count_to_show:]
 
                 return last_replies
 
     def get_skipped_replies_count(self) -> int:
         """
         Gets number of posts between opening post and last replies.
         """
         reply_count = self.get_reply_count()
         last_replies_count = min(settings.get_int('View', 'LastRepliesCount'),
                                  reply_count - 1)
         return reply_count - last_replies_count - 1
 
     # TODO Remove argument, it is not used
     def get_replies(self, view_fields_only=True) -> QuerySet:
         """
         Gets sorted thread posts
         """
         query = self.replies.order_by('pub_time').prefetch_related(
             'attachments')
         return query
 
     def get_viewable_replies(self) -> QuerySet:
         """
         Gets replies with only fields that are used for viewing.
         """
         return self.get_replies().defer('text', 'last_edit_time')
 
     def get_top_level_replies(self) -> QuerySet:
         return self.get_replies().exclude(refposts__threads__in=[self])
 
     def get_replies_with_images(self, view_fields_only=False) -> QuerySet:
         """
         Gets replies that have at least one image attached
         """
         return self.get_replies(view_fields_only).filter(
             attachments__mimetype__in=FILE_TYPES_IMAGE).annotate(images_count=Count(
             'attachments')).filter(images_count__gt=0)
 
     def get_opening_post(self, only_id=False) -> Post:
         """
         Gets the first post of the thread
         """
 
         query = self.get_replies().filter(opening=True)
         if only_id:
             query = query.only('id')
         opening_post = query.first()
 
         return opening_post
 
     @cached_result()
     def get_opening_post_id(self) -> int:
         """
         Gets ID of the first thread post.
         """
 
         return self.get_opening_post(only_id=True).id
 
     def get_pub_time(self):
         """
         Gets opening post's pub time because thread does not have its own one.
         """
 
         return self.get_opening_post().pub_time
 
     def __str__(self):
         return 'T#{}'.format(self.id)
 
     def get_tag_url_list(self) -> list:
         return boards.models.Tag.objects.get_tag_url_list(self.get_tags().all())
 
     def update_posts_time(self, exclude_posts=None):
         last_edit_time = self.last_edit_time
 
         for post in self.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
                 post.save(update_fields=['last_edit_time'])
 
     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)
 
     def get_sections_str(self):
         return Tag.objects.get_tag_url_list(self.get_required_tags())
 
     def get_replies_newer(self, post_id):
         return self.get_replies().filter(id__gt=post_id)
 
     def is_archived(self):
         return self.get_status() == STATUS_ARCHIVE
 
     def get_status(self):
         return self.status
 
     def is_monochrome(self):
         return self.monochrome
 
+    def is_stickerpack(self):
+        return self.stickerpack
+
     # If tags have parent, add them to the tag list
     @transaction.atomic
     def refresh_tags(self):
         for tag in self.get_tags().all():
             parents = tag.get_all_parents()
             if len(parents) > 0:
                 self.tags.add(*parents)
 
     def get_reply_tree(self):
         replies = self.get_replies().prefetch_related('refposts')
         tree = []
         for reply in replies:
             parents = reply.refposts.all()
 
             found_parent = False
             searching_for_index = False
 
             if len(parents) > 0:
                 index = 0
                 parent_depth = 0
 
                 indexes_to_insert = []
 
                 for depth, element in tree:
                     index += 1
 
                     # If this element is next after parent on the same level,
                     # insert child before it
                     if searching_for_index and depth <= parent_depth:
                         indexes_to_insert.append((index - 1, parent_depth))
                         searching_for_index = False
 
                     if element in parents:
                         found_parent = True
                         searching_for_index = True
                         parent_depth = depth
 
             if not found_parent:
                 tree.append((0, reply))
             else:
                 if searching_for_index:
                     tree.append((parent_depth + 1, reply))
 
                 offset = 0
                 for last_index, parent_depth in indexes_to_insert:
                     tree.insert(last_index + offset, (parent_depth + 1, reply))
                     offset += 1
 
         return tree

boards/signals.py

@@ -1,141 +1,143 b''
 import re
 import os
+import logging
 
 from django.db.models.signals import post_save, pre_save, pre_delete, \
     post_delete
 from django.dispatch import receiver
 from django.utils import timezone
 
 from boards import thumbs
 from boards.mdx_neboard import get_parser
 
-from boards.models import Post, GlobalId, Attachment
+from boards.models import Post, GlobalId, Attachment, Thread
+from boards.models.attachment import StickerPack, AttachmentSticker
 from boards.models.attachment.viewers import FILE_TYPES_IMAGE
 from boards.models.post import REGEX_NOTIFICATION, REGEX_REPLY,\
         REGEX_GLOBAL_REPLY
 from boards.models.post.manager import post_import_deps
 from boards.models.user import Notification
 from neboard.settings import MEDIA_ROOT
 
 
 THUMB_SIZES = ((200, 150),)
 
 
 @receiver(post_save, sender=Post)
 def connect_replies(instance, **kwargs):
     if not kwargs['update_fields']:
         for reply_number in re.finditer(REGEX_REPLY, instance.get_raw_text()):
             post_id = reply_number.group(1)
 
             try:
                 referenced_post = Post.objects.get(id=post_id)
 
                 if not referenced_post.referenced_posts.filter(
                         id=instance.id).exists():
                     referenced_post.referenced_posts.add(instance)
                     referenced_post.last_edit_time = instance.pub_time
                     referenced_post.build_refmap()
                     referenced_post.save(update_fields=['refmap', 'last_edit_time'])
             except Post.DoesNotExist:
                 pass
 
 
 @receiver(post_save, sender=Post)
 @receiver(post_import_deps, sender=Post)
 def connect_global_replies(instance, **kwargs):
     if not kwargs['update_fields']:
         for reply_number in re.finditer(REGEX_GLOBAL_REPLY, instance.get_raw_text()):
             key_type = reply_number.group(1)
             key = reply_number.group(2)
             local_id = reply_number.group(3)
 
             try:
                 global_id = GlobalId.objects.get(key_type=key_type, key=key,
                         local_id=local_id)
                 referenced_post = Post.objects.get(global_id=global_id)
                 referenced_post.referenced_posts.add(instance)
                 referenced_post.last_edit_time = instance.pub_time
                 referenced_post.build_refmap()
                 referenced_post.save(update_fields=['refmap', 'last_edit_time'])
             except (GlobalId.DoesNotExist, Post.DoesNotExist):
                 pass
 
 
 @receiver(post_save, sender=Post)
 def connect_notifications(instance, **kwargs):
     if not kwargs['update_fields']:
         for reply_number in re.finditer(REGEX_NOTIFICATION, instance.get_raw_text()):
             user_name = reply_number.group(1).lower()
             Notification.objects.get_or_create(name=user_name, post=instance)
 
 
 @receiver(pre_save, sender=Post)
 @receiver(post_import_deps, sender=Post)
 def parse_text(instance, **kwargs):
     instance._text_rendered = get_parser().parse(instance.get_raw_text())
 
 
 @receiver(pre_delete, sender=Post)
 def delete_attachments(instance, **kwargs):
     for attachment in instance.attachments.all():
         attachment_refs_count = attachment.attachment_posts.count()
         if attachment_refs_count == 1:
             attachment.delete()
 
 
 @receiver(post_delete, sender=Post)
 def update_thread_on_delete(instance, **kwargs):
     thread = instance.get_thread()
     thread.last_edit_time = timezone.now()
     thread.save()
 
 
 @receiver(post_delete, sender=Post)
 def delete_global_id(instance, **kwargs):
     if instance.global_id and instance.global_id.id:
         instance.global_id.delete()
 
 
 @receiver(post_save, sender=Attachment)
 def generate_thumb(instance, **kwargs):
     if instance.mimetype in FILE_TYPES_IMAGE:
         for size in THUMB_SIZES:
             (w, h) = size
             split = instance.file.name.rsplit('.', 1)
             thumb_name = '%s.%sx%s.%s' % (split[0], w, h, split[1])
 
             if not instance.file.storage.exists(thumb_name):
                 # you can use another thumbnailing function if you like
                 thumb_content = thumbs.generate_thumb(instance.file, size, split[1])
 
                 thumb_name_ = instance.file.storage.save(thumb_name, thumb_content)
 
                 if not thumb_name == thumb_name_:
                     raise ValueError(
                         'There is already a file named %s' % thumb_name_)
 
 
 @receiver(pre_delete, sender=Post)
 def rebuild_refmap(instance, **kwargs):
     for referenced_post in instance.refposts.all():
         referenced_post.build_refmap(excluded_ids=[instance.id])
         referenced_post.save(update_fields=['refmap'])
 
 
 @receiver(post_delete, sender=Attachment)
 def delete_file(instance, **kwargs):
     if instance.is_internal():
         file = MEDIA_ROOT + instance.file.name
         try:
             os.remove(file)
         except FileNotFoundError:
             pass
         if instance.mimetype in FILE_TYPES_IMAGE:
             for size in THUMB_SIZES:
                 file_name_parts = instance.file.name.split('.')
                 thumb_file = MEDIA_ROOT + '{}.{}x{}.{}'.format(file_name_parts[0], size[0], size[1], file_name_parts[1])
                 try:
                     os.remove(thumb_file)
                 except FileNotFoundError:
                     pass
 

boards/templates/boards/aliases.html

@@ -1,33 +1,33 b''
 {% extends "boards/base.html" %}
 
 {% load i18n %}
 {% load tz %}
 
 {% block head %}
     <meta name="robots" content="noindex">
     <title>{% trans "Stickers" %} - {{ site_name }}</title>
 {% endblock %}
 
 {% block content %}
     <div id="posts-table">
         {% if local_stickers %}
             <h1>{% trans "Local stickers" %}</h1>
             {% for sticker in local_stickers %}
                 <div class="gallery_image">
                     {{ sticker.attachment.get_view|safe }}
-                    <div>{{ sticker.name }}</div>
+                    <div>{{ sticker }}</div>
                     <div><a href="?action=remove&name={{ sticker.name }}">{% trans "Remove sticker" %}</a></div>
                 </div>
             {% endfor %}
         {% endif %}
         {% if global_stickers %}
             <h1>{% trans "Global stickers" %}</h1>
             {% for sticker in global_stickers %}
                 <div class="gallery_image">
                     {{ sticker.attachment.get_view|safe }}
-                    <div>{{ sticker.name }}</div>
+                    <div>{{ sticker }}</div>
                 </div>
             {% endfor %}
         {% endif %}
     </div>
 {% endblock %}

boards/templates/boards/post.html

@@ -1,161 +1,164 b''
 {% load i18n %}
 {% load board %}
 
 {% get_current_language as LANGUAGE_CODE %}
 
 <div class="{{ css_class }}" id="{{ post.id }}" data-uid="{{ post.uid }}" {% if tree_depth %}style="margin-left: {{ tree_depth }}em;"{% endif %}>
     <div class="post-info">
         <a class="post_id" href="{{ post.get_absolute_url }}">#{{ post.id }}</a>
+        {% if is_opening and thread.is_stickerpack %}
+            &#128247;
+        {% endif %}
         <span class="title">{{ post.title }}</span>
         {% if perms.boards.change_post and post.has_ip %}
             <span class="pub_time" style="border-bottom: solid 2px #{{ post.get_ip_color }};" title="{{ post.poster_ip }}">
         {% else %}
             <span class="pub_time">
         {% endif %}
         <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
             (we don't see OP here so we show the death time in the post itself).
         {% endcomment %}
         {% if is_opening and thread.is_archived %}
             — <time datetime="{{ thread.bump_time|date:'c' }}">{{ thread.bump_time }}</time>
         {% endif %}
         {% if is_opening %}
             {% if need_open_link %}
                 {% if thread.is_archived %}
                     <a class="link" href="{% url 'thread' post.id %}">{% trans "Open" %}</a>
                 {% else %}
                     <a class="link" href="{% url 'thread' post.id %}#form">{% trans "Reply" %}</a>
                 {% endif %}
             {% endif %}
         {% 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_or_text }}</span>
                 {% endwith %}
             {% endif %}
         {% endif %}
         {% if reply_link and not thread.is_archived %}
             <a href="#form" onclick="addQuickReply('{{ post.id }}'); return false;">{% trans 'Reply' %}</a>
         {% endif %}
 
         {% if perms.boards.change_post or perms.boards.delete_post or perms.boards.change_thread or perms_boards.delete_thread %}
         <a class="moderation-menu" href="#">🔒</a>
             <script>
                 $.contextMenu({
                     selector: '#{{ post.id }} .moderation-menu',
                     trigger: 'left',
                     build: function($trigger, e) {
                         return {
                             items: {
                                 edit: {
                                     name: '{% trans "Edit" %}',
                                     callback: function(key, opt) {
                                         window.location = '{% url 'admin:boards_post_change' post.id %}';
                                     },
                                     visible: {% if perms.boards.change_post %}true{% else %}false{% endif %}
                                 },
                                 deletePost: {
                                     name: '{% trans "Delete post" %}',
                                     callback: function(key, opt) {
                                         window.location = '{% url 'admin:boards_post_delete' post.id %}';
                                     },
                                     visible: {% if not is_opening and perms.boards.delete_post %}true{% else %}false{% endif %}
                                 },
                                 editThread: {
                                     name: '{% trans "Edit thread" %}',
                                     callback: function(key, opt) {
                                         window.location = '{% url 'admin:boards_thread_change' thread.id %}';
                                     },
                                     visible: {% if is_opening and perms.boards.change_thread %}true{% else %}false{% endif %}
                                 },
                                 deleteThread: {
                                     name: '{% trans "Delete thread" %}',
                                     callback: function(key, opt) {
                                         window.location = '{% url 'admin:boards_thread_delete' thread.id %}';
                                     },
                                     visible: {% if is_opening and perms.boards.delete_thread %}true{% else %}false{% endif %}
                                 },
                                 findByIp: {
                                     name: 'IP = {{ post.poster_ip }}',
                                     callback: function(key, opt) {
                                         window.location = '{% url "feed" %}?ip={{ post.poster_ip }}';
                                     },
                                     visible: {% if post.has_ip %}true{% else %}false{% endif %}
                                 },
                                 raw: {
                                     name: 'RAW',
                                     callback: function(key, opt) {
                                         window.location = '{% url 'post_sync_data' post.id %}';
                                     },
                                     visible: {% if post.global_id_id %}true{% else %}false{% endif %}
                                 },
                                 ban: {
                                     name: '{% trans "Ban" %}',
                                     callback: function(key, opt) {
                                         if (confirm('{% trans "Are you sure?" %}')) {
                                             window.location = '{% url 'utils' %}?method=ban&post_id={{ post.id }}';
                                         }
                                     },
                                     visible: {% if post.has_ip %}true{% else %}false{% endif %}
                                 },
                                 banAndDelete: {
                                     name: '{% trans "Ban and delete" %}',
                                     callback: function(key, opt) {
                                         if (confirm('{% trans "Are you sure?" %}')) {
                                             window.location = '{% url 'utils' %}?method=ban_and_delete&post_id={{ post.id }}';
                                         }
                                     },
                                     visible: {% if post.has_ip %}true{% else %}false{% endif %}
                                 }
                             }
                         };
                     }
                 });
             </script>
         {% endif %}
     </div>
     {% for file in post.attachments.all %}
         {{ file.get_view|safe }}
     {% endfor %}
     {% comment %}
         Post message (text)
     {% endcomment %}
     <div class="message">
         {% if truncated %}
             {{ post.get_text|truncatewords_html:50|truncatenewlines_html:3|safe }}
         {% else %}
             {{ post.get_text|safe }}
         {% endif %}
     </div>
     {% if post.is_referenced and not mode_tree %}
         <div class="refmap">
             {% trans "Replies" %}: {{ post.refmap|safe }}
         </div>
     {% endif %}
     {% comment %}
         Thread metadata: counters, tags etc
     {% endcomment %}
     {% if is_opening %}
         <div class="metadata">
             {% if need_open_link %}
                 ♥ {{ thread.get_reply_count }}
                 ❄ {{ thread.get_images_count }}
                 <a href="{% url 'thread_gallery' post.id %}">G</a>
                 <a href="{% url 'thread_tree' post.id %}">T</a>
             {% endif %}
             <span class="tags">
                 {{ thread.get_tag_url_list|safe }}
             </span>
         </div>
     {% endif %}
 </div>

boards/templates/boards/staticpages/help.html

@@ -1,24 +1,25 b''
 {% extends "boards/static_base.html" %}
 
 {% load i18n %}
 
 {% block head %}
     <title>{% trans "Syntax" %}</title>
 {% endblock %}
 
 {% block staticcontent %}
     <h2>{% trans 'Help' %}</h2>
     <p>{% trans 'View available stickers:' %} <a href="{% url 'stickers' %}">{% trans 'Stickers' %}</a></p>
+    <p>{% trans 'To add a sticker, create a stickerpack thread using the title as a pack name, and a tripcode to own the pack. Then, add posts with title as a sticker name, and the same tripcode, to the thread. Their attachments would become stickers.' %}</p>
     <hr />
     <p>[i]<i>{% trans 'Italic text' %}</i>[/i]</p>
     <p>[b]<b>{% trans 'Bold text' %}</b>[/b]</p>
     <p>[spoiler]<span class="spoiler">{% trans 'Spoiler' %}</span>[/spoiler]</p>
     <p>[post]123[/post] — {% trans 'Link to a post' %}</p>
     <p>[s]<span class="strikethrough">{% trans 'Strikethrough text' %}</span>[/s]</p>
     <p>[comment]<span class="comment">{% trans 'Comment' %}</span>[/comment]</p>
     <p>[quote]<span class="quote">&gt;{% trans 'Quote' %}</span>[/quote]</p>
     <p>[quote=src]<div class="multiquote"><div class="quote-header">src</div><div class="quote-text">{% trans 'Quote' %}</div></div><br />[/quote]</p>
     <p>[tag]<a class="tag">tag</a>[/tag]</p>
     <hr/>
     <p>{% trans 'You can try pasting the text and previewing the result here:' %} <a href="{% url 'preview' %}">{% trans 'Preview' %}</a></p>
 {% endblock %}

boards/views/all_threads.py

@@ -1,179 +1,180 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
 from django.utils.decorators import method_decorator
 from django.views.decorators.csrf import csrf_protect
 
 from boards import utils, settings
 from boards.abstracts.paginator import get_paginator
 from boards.abstracts.settingsmanager import get_settings_manager,\
         SETTING_ONLY_FAVORITES
 from boards.forms import ThreadForm, PlainErrorList
 from boards.models import Post, Thread, Ban
 from boards.views.banned import BannedView
 from boards.views.base import BaseBoardView, CONTEXT_FORM
 from boards.views.posting_mixin import PostMixin
 from boards.views.mixins import FileUploadMixin, PaginatedMixin,\
         DispatcherMixin, PARAMETER_METHOD
 
 FORM_TAGS = 'tags'
 FORM_TEXT = 'text'
 FORM_TITLE = 'title'
 FORM_IMAGE = 'image'
 FORM_THREADS = 'threads'
 
 TAG_DELIMITER = ' '
 
 PARAMETER_CURRENT_PAGE = 'current_page'
 PARAMETER_PAGINATOR = 'paginator'
 PARAMETER_THREADS = 'threads'
 PARAMETER_ADDITIONAL = 'additional_params'
 PARAMETER_MAX_FILE_SIZE = 'max_file_size'
 PARAMETER_RSS_URL = 'rss_url'
 PARAMETER_MAX_FILES = 'max_files'
 
 TEMPLATE = 'boards/all_threads.html'
 DEFAULT_PAGE = 1
 
 FORM_TAGS = 'tags'
 
 
 class AllThreadsView(PostMixin, FileUploadMixin, BaseBoardView, PaginatedMixin, DispatcherMixin):
 
     tag_name = ''
 
     def __init__(self):
         self.settings_manager = None
         super(AllThreadsView, self).__init__()
 
     @method_decorator(csrf_protect)
     def get(self, request, form: ThreadForm=None):
         page = request.GET.get('page', DEFAULT_PAGE)
 
         params = self.get_context_data(request=request)
 
         if not form:
             form = ThreadForm(error_class=PlainErrorList,
                     initial={FORM_TAGS: self.tag_name})
 
         self.settings_manager = get_settings_manager(request)
 
         threads = self.get_threads()
 
         order = request.GET.get('order', 'bump')
         if order == 'bump':
             threads = threads.order_by('-bump_time')
         else:
             threads = threads.filter(replies__opening=True)\
                 .order_by('-replies__pub_time')
         filter = request.GET.get('filter')
         threads = threads.distinct()
 
         paginator = get_paginator(threads,
                                   settings.get_int('View', 'ThreadsPerPage'))
         paginator.current_page = int(page)
 
         try:
             threads = paginator.page(page).object_list
         except EmptyPage:
             raise Http404()
 
         params[PARAMETER_THREADS] = threads
         params[CONTEXT_FORM] = form
         params[PARAMETER_MAX_FILE_SIZE] = self.get_max_upload_size()
         params[PARAMETER_RSS_URL] = self.get_rss_url()
         params[PARAMETER_MAX_FILES] = settings.get_int('Forms', 'MaxFileCount')
 
         paginator.set_url(self.get_reverse_url(), request.GET.dict())
         params.update(self.get_page_context(paginator, page))
 
         return render(request, TEMPLATE, params)
 
     @method_decorator(csrf_protect)
     def post(self, request):
         if PARAMETER_METHOD in request.POST:
             self.dispatch_method(request)
 
             return redirect('index')  # FIXME Different for different modes
 
         form = ThreadForm(request.POST, request.FILES,
                           error_class=PlainErrorList)
         form.session = request.session
 
         if form.is_valid():
             return self.create_thread(request, form)
         if form.need_to_ban:
             # Ban user because he is suspected to be a bot
             self._ban_current_user(request)
 
         return self.get(request, form)
 
     def get_reverse_url(self):
         return reverse('index')
 
     @transaction.atomic
     def create_thread(self, request, form: ThreadForm, html_response=True):
         """
         Creates a new thread with an opening post.
         """
 
         ip = utils.get_client_ip(request)
         is_banned = Ban.objects.filter(ip=ip).exists()
 
         if is_banned:
             if html_response:
                 return redirect(BannedView().as_view())
             else:
                 return
 
         data = form.cleaned_data
 
         title = form.get_title()
         text = data[FORM_TEXT]
         files = form.get_files()
         file_urls = form.get_file_urls()
         images = form.get_images()
 
         text = self._remove_invalid_links(text)
 
         tags = data[FORM_TAGS]
         monochrome = form.is_monochrome()
+        stickerpack = form.is_stickerpack()
 
         post = Post.objects.create_post(title=title, text=text, files=files,
                                         ip=ip, tags=tags,
                                         tripcode=form.get_tripcode(),
                                         monochrome=monochrome, images=images,
-                                        file_urls=file_urls)
+                                        file_urls=file_urls, stickerpack=stickerpack)
 
         if form.is_subscribe():
             settings_manager = get_settings_manager(request)
             settings_manager.add_or_read_fav_thread(post)
 
         if html_response:
             return redirect(post.get_absolute_url())
 
     def get_threads(self):
         """
         Gets list of threads that will be shown on a page.
         """
 
         threads = Thread.objects\
             .exclude(tags__in=self.settings_manager.get_hidden_tags())
         if self.settings_manager.get_setting(SETTING_ONLY_FAVORITES):
             fav_tags = self.settings_manager.get_fav_tags()
             if len(fav_tags) > 0:
                 threads = threads.filter(tags__in=fav_tags)
 
         return threads
 
     def get_rss_url(self):
         return self.get_reverse_url() + 'rss/'
 
     def toggle_fav(self, request):
         settings_manager = get_settings_manager(request)
         settings_manager.set_setting(SETTING_ONLY_FAVORITES,
                 not settings_manager.get_setting(SETTING_ONLY_FAVORITES, False))

boards/views/api.py

@@ -1,316 +1,317 b''
 import json
 import logging
 
 from django.core import serializers
 from django.db import transaction
+from django.db.models import Q
 from django.http import HttpResponse, HttpResponseBadRequest
 from django.shortcuts import get_object_or_404
 from django.views.decorators.csrf import csrf_protect
 
 from boards.abstracts.settingsmanager import get_settings_manager
 from boards.forms import PostForm, PlainErrorList
 from boards.mdx_neboard import Parser
 from boards.models import Post, Thread, Tag, TagAlias
 from boards.models.attachment import AttachmentSticker
 from boards.models.thread import STATUS_ARCHIVE
 from boards.models.user import Notification
 from boards.utils import datetime_to_epoch
 from boards.views.thread import ThreadView
 
 __author__ = 'neko259'
 
 PARAMETER_TRUNCATED = 'truncated'
 PARAMETER_TAG = 'tag'
 PARAMETER_OFFSET = 'offset'
 PARAMETER_DIFF_TYPE = 'type'
 PARAMETER_POST = 'post'
 PARAMETER_UPDATED = 'updated'
 PARAMETER_LAST_UPDATE = 'last_update'
 PARAMETER_THREAD = 'thread'
 PARAMETER_UIDS = 'uids'
 PARAMETER_SUBSCRIBED = 'subscribed'
 
 DIFF_TYPE_HTML = 'html'
 DIFF_TYPE_JSON = 'json'
 
 STATUS_OK = 'ok'
 STATUS_ERROR = 'error'
 
 logger = logging.getLogger(__name__)
 
 
 @transaction.atomic
 def api_get_threaddiff(request):
     """
     Gets posts that were changed or added since time
     """
 
     thread_id = request.POST.get(PARAMETER_THREAD)
     uids_str = request.POST.get(PARAMETER_UIDS)
 
     if not thread_id or not uids_str:
         return HttpResponse(content='Invalid request.')
 
     uids = uids_str.strip().split(' ')
 
     opening_post = get_object_or_404(Post, id=thread_id)
     thread = opening_post.get_thread()
 
     json_data = {
         PARAMETER_UPDATED: [],
         PARAMETER_LAST_UPDATE: None,  # TODO Maybe this can be removed already?
     }
     posts = Post.objects.filter(thread=thread).exclude(uid__in=uids)
 
     diff_type = request.GET.get(PARAMETER_DIFF_TYPE, DIFF_TYPE_HTML)
 
     for post in posts:
         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)
 
     settings_manager = get_settings_manager(request)
     json_data[PARAMETER_SUBSCRIBED] = str(settings_manager.thread_is_fav(opening_post))
 
     # 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))
 
 
 @csrf_protect
 def api_add_post(request, opening_post_id):
     """
     Adds a post and return the JSON response for it
     """
 
     opening_post = get_object_or_404(Post, id=opening_post_id)
 
     logger.info('Adding post via api...')
 
     status = STATUS_OK
     errors = []
 
     if request.method == 'POST':
         form = PostForm(request.POST, request.FILES, error_class=PlainErrorList)
         form.session = request.session
 
         if form.need_to_ban:
             # Ban user because he is suspected to be a bot
             # _ban_current_user(request)
             status = STATUS_ERROR
         if form.is_valid():
             post = ThreadView().new_post(request, form, opening_post,
                                          html_response=False)
             if not post:
                 status = STATUS_ERROR
             else:
                 logger.info('Added post #%d via api.' % post.id)
         else:
             status = STATUS_ERROR
             errors = form.as_json_errors()
 
     response = {
         'status': status,
         'errors': errors,
     }
 
     return HttpResponse(content=json.dumps(response))
 
 
 def get_post(request, post_id):
     """
     Gets the html of a post. Used for popups. Post can be truncated if used
     in threads list with 'truncated' get parameter.
     """
 
     post = get_object_or_404(Post, id=post_id)
     truncated = PARAMETER_TRUNCATED in request.GET
 
     return HttpResponse(content=post.get_view(truncated=truncated, need_op_data=True))
 
 
 def api_get_threads(request, count):
     """
     Gets the JSON thread opening posts list.
     Parameters that can be used for filtering:
     tag, offset (from which thread to get results)
     """
 
     if PARAMETER_TAG in request.GET:
         tag_name = request.GET[PARAMETER_TAG]
         if tag_name is not None:
             tag = get_object_or_404(Tag, name=tag_name)
             threads = tag.get_threads().exclude(status=STATUS_ARCHIVE)
     else: 
         threads = Thread.objects.exclude(status=STATUS_ARCHIVE)
 
     if PARAMETER_OFFSET in request.GET:
         offset = request.GET[PARAMETER_OFFSET]
         offset = int(offset) if offset is not None else 0
     else:
         offset = 0
 
     threads = threads.order_by('-bump_time')
     threads = threads[offset:offset + int(count)]
 
     opening_posts = []
     for thread in threads:
         opening_post = thread.get_opening_post()
 
         # TODO Add tags, replies and images count
         post_data = opening_post.get_post_data(include_last_update=True)
         post_data['status'] = thread.get_status()
 
         opening_posts.append(post_data)
 
     return HttpResponse(content=json.dumps(opening_posts))
 
 
 # TODO Test this
 def api_get_tags(request):
     """
     Gets all tags or user tags.
     """
 
     # TODO Get favorite tags for the given user ID
 
     tags = TagAlias.objects.all()
 
     term = request.GET.get('term')
     if term is not None:
         tags = tags.filter(name__contains=term)
 
     tag_names = [tag.name for tag in tags]
 
     return HttpResponse(content=json.dumps(tag_names))
 
 
 def api_get_stickers(request):
     term = request.GET.get('term')
     if not term:
         return HttpResponseBadRequest()
     
-    global_stickers = AttachmentSticker.objects.filter(name__contains=term)
+    global_stickers = AttachmentSticker.objects.filter(Q(name__icontains=term) | Q(stickerpack__name__icontains=term))
     local_stickers = [sticker for sticker in get_settings_manager(request).get_stickers() if term in sticker.name]
     stickers = list(global_stickers) + local_stickers
 
     image_dict = [{'thumb': sticker.attachment.get_thumb_url(),
-                   'alias': sticker.name}
+                   'alias': str(sticker)}
                   for sticker in stickers]
 
     return HttpResponse(content=json.dumps(image_dict))
 
 
 # TODO The result can be cached by the thread last update time
 # TODO Test this
 def api_get_thread_posts(request, opening_post_id):
     """
     Gets the JSON array of thread posts
     """
 
     opening_post = get_object_or_404(Post, id=opening_post_id)
     thread = opening_post.get_thread()
     posts = thread.get_replies()
 
     json_data = {
         'posts': [],
         'last_update': None,
     }
     json_post_list = []
 
     for post in posts:
         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
 
     return HttpResponse(content=json.dumps(json_data))
 
 
 def api_get_notifications(request, username):
     last_notification_id_str = request.GET.get('last', None)
     last_id = int(last_notification_id_str) if last_notification_id_str is not None else None
 
     posts = Notification.objects.get_notification_posts(usernames=[username],
                                                         last=last_id)
 
     json_post_list = []
     for post in posts:
         json_post_list.append(post.get_post_data())
     return HttpResponse(content=json.dumps(json_post_list))
 
 
 def api_get_post(request, post_id):
     """
     Gets the JSON of a post. This can be
     used as and API for external clients.
     """
 
     post = get_object_or_404(Post, id=post_id)
 
     json = serializers.serialize("json", [post], fields=(
         "pub_time", "_text_rendered", "title", "text", "image",
         "image_width", "image_height", "replies", "tags"
     ))
 
     return HttpResponse(content=json)
 
 
 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(thread=thread)
             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))