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

@@ -18,7 +18,8 b' class SessionStickerFactory(StickerFacto'
 
 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):

boards/admin.py

@@ -1,5 +1,6 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
@@ -166,6 +167,11 b' class AttachmentStickerAdmin(admin.Model'
     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):

boards/forms/__init__.py

@@ -2,7 +2,6 b' import hashlib'
 import logging
 import re
 import time
-import traceback
 
 import pytz
 
@@ -18,12 +17,14 b' 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, \
@@ -36,7 +37,6 b" 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)
 
@@ -485,6 +485,7 b' class ThreadForm(PostForm):'
         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()
@@ -534,6 +535,36 b' class ThreadForm(PostForm):'
     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):
 

boards/locale/ru/LC_MESSAGES/django.po

@@ -619,3 +619,24 b' msgstr "\xd0\x93\xd0\xbb\xd0\xbe\xd0\xb1\xd0\xb0\xd0\xbb\xd1\x8c\xd0\xbd\xd1\x8b\xd0\xb5 \xd1\x81\xd1\x82\xd0\xb8\xd0\xba\xd0\xb5\xd1\x80\xd1\x8b"'
 
 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

@@ -619,3 +619,24 b' msgstr "\xd0\x93\xd0\xbb\xd0\xbe\xd0\xb1\xd0\xb0\xd0\xbb\xd1\x8c\xd0\xbd\xd1\x96 \xd1\x81\xd1\x82\xd1\x96\xd0\xba\xd0\xb5\xd1\x80\xd0\xb8"'
 
 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

@@ -55,8 +55,9 b' class AttachmentManager(models.Manager):'
         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
 
@@ -163,9 +164,22 b' class Attachment(models.Model):'
         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,20 +1,20 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'
 
@@ -30,7 +30,7 b' class PostManager(models.Manager):'
     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
         """
@@ -54,7 +54,7 b' class PostManager(models.Manager):'
         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
 
@@ -89,6 +89,8 b' class PostManager(models.Manager):'
             thread.bump()
             thread.save()
 
+        self._create_stickers(post)
+
         return post
 
     def delete_posts_by_ip(self, ip):
@@ -190,3 +192,37 b' class PostManager(models.Manager):'
 
     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

@@ -97,6 +97,7 b' class Thread(models.Model):'
     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:
         """
@@ -262,6 +263,9 b' class Thread(models.Model):'
     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):

boards/signals.py

@@ -1,5 +1,6 b''
 import re
 import os
+import logging
 
 from django.db.models.signals import post_save, pre_save, pre_delete, \
     post_delete
@@ -9,7 +10,8 b' 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

boards/templates/boards/aliases.html

@@ -15,7 +15,7 b''
             {% 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 %}
@@ -25,7 +25,7 b''
             {% for sticker in global_stickers %}
                 <div class="gallery_image">
                     {{ sticker.attachment.get_view|safe }}
-                    <div>{{ sticker.name }}</div>
+                    <div>{{ sticker }}</div>
                 </div>
             {% endfor %}
         {% endif %}

boards/templates/boards/post.html

@@ -6,6 +6,9 b''
 <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 }}">

boards/templates/boards/staticpages/help.html

@@ -9,6 +9,7 b''
 {% 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>

boards/views/all_threads.py

@@ -142,12 +142,13 b' class AllThreadsView(PostMixin, FileUplo'
 
         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)

boards/views/api.py

@@ -3,6 +3,7 b' 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
@@ -194,12 +195,12 b' def api_get_stickers(request):'
     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))