Added sticker as a separate entity for the attachment aliases

boards/migrations/0065_attachmentsticker.py

@@ -0,0 +1,39 b''
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2017-10-14 13:25
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+from django.db.models import Q
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('boards', '0064_remove_post_version'),
+    ]
+
+    def attachment_alias_to_sticker(apps, schema_editor):
+        Attachment = apps.get_model('boards', 'Attachment')
+        AttachmentSticker = apps.get_model('boards', 'AttachmentSticker')
+
+        attachments = Attachment.objects.exclude(Q(alias=None) | Q(alias=''))
+        for attachment in attachments:
+            AttachmentSticker.objects.create(attachment=attachment,
+                                             name=attachment.alias)
+
+    operations = [
+        migrations.CreateModel(
+            name='AttachmentSticker',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.TextField(unique=True)),
+                ('attachment', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='boards.Attachment')),
+            ],
+        ),
+        migrations.RunPython(attachment_alias_to_sticker),
+        migrations.RemoveField(
+            model_name='Attachment',
+            name='alias',
+        )
+    ]

boards/abstracts/attachment_alias.py

@@ -3,7 +3,7 b' from boards.models import Attachment'
 
 
 class AttachmentAlias:
-    def get_image(alias):
+    def get_image(self, alias):
         pass
 
 
@@ -18,11 +18,12 b' class SessionAttachmentAlias(AttachmentA'
 
 class ModelAttachmentAlias(AttachmentAlias):
     def get_image(self, alias):
-        return Attachment.objects.filter(alias=alias).first()
+        return Attachment.objects.get_by_alias(alias)
 
 
 def get_image_by_alias(alias, session):
-    image = SessionAttachmentAlias(session).get_image(alias) or ModelAttachmentAlias().get_image(alias)
+    image = SessionAttachmentAlias(session).get_image(alias)\
+            or ModelAttachmentAlias().get_image(alias)
 
     if image is not None:
         return image

boards/admin.py

@@ -1,4 +1,5 b''
-from boards.models.attachment import FILE_TYPES_IMAGE
+from boards.abstracts.attachment_alias import AttachmentAlias
+from boards.models.attachment import FILE_TYPES_IMAGE, AttachmentSticker
 from django.contrib import admin
 from django.utils.translation import ugettext_lazy as _
 from django.core.urlresolvers import reverse
@@ -157,16 +158,12 b' class BannerAdmin(admin.ModelAdmin):'
 
 @admin.register(Attachment)
 class AttachmentAdmin(admin.ModelAdmin):
-    list_display = ('__str__', 'mimetype', 'file', 'url', 'alias')
-    search_fields = ('alias',)
+    list_display = ('__str__', 'mimetype', 'file', 'url')
+
 
-    def delete_alias(self, request, queryset):
-        for attachment in queryset:
-            attachment.alias = None
-            attachment.save(update_fields=['alias'])
-        self.message_user(request, _('Aliases removed'))
-
-    actions = ['delete_alias']
[e-mail](AttachmentSticker)
+class AttachmentStickerAdmin(admin.ModelAdmin):
+    search_fields = ('name',)
 
 
 @admin.register(GlobalId)

boards/locale/ru/LC_MESSAGES/django.po

@@ -610,3 +610,12 b' msgstr "\xd0\x97\xd0\xb0\xd0\xb3\xd1\x80\xd1\x83\xd0\xb7\xd0\xb8\xd1\x82\xd1\x8c \xd0\xb8\xd0\xbb\xd0\xb8 \xd0\xbe\xd1\x82\xd0\xba\xd0\xb0\xd0\xb7\xd0\xb0\xd1\x82\xd1\x8c"'
 
 msgid "Insert as URLs"
 msgstr "Вставлять как ссылки"
+
+msgid "Help"
+msgstr "Справка"
+
+msgid "View available stickers:"
+msgstr "Просмотреть доступные стикеры:"
+
+msgid "Stickers"
+msgstr "Стикеры"

boards/locale/uk/LC_MESSAGES/django.po

@@ -610,3 +610,12 b' msgstr "\xd0\x97\xd0\xb0\xd0\xb2\xd0\xb0\xd0\xbd\xd1\x82\xd0\xb0\xd0\xb6\xd0\xb8\xd1\x82\xd0\xb8 \xd0\xb0\xd0\xb1\xd0\xbe \xd0\xb2\xd1\x96\xd0\xb4\xd0\xbc\xd0\xbe\xd0\xb2\xd0\xb8\xd1\x82\xd0\xb8"'
 
 msgid "Insert as URLs"
 msgstr "Вставляти як посилання"
+
+msgid "Help"
+msgstr "Справка"
+
+msgid "View available stickers:"
+msgstr "Передивитися доступні стікери:"
+
+msgid "Stickers"
+msgstr "Стікери"

boards/models/attachment/__init__.py

@@ -54,6 +54,9 b' class AttachmentManager(models.Manager):'
                 attachment = existing_attachment
         return attachment
 
+    def get_by_alias(self, name):
+        return AttachmentSticker.objects.get(name=name).attachment
+
     def _compare_chunks(self, chunks1, chunks2):
         """
         Compares 2 chunks of different sizes (e.g. first chunk array contains
@@ -108,7 +111,6 b' class Attachment(models.Model):'
     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)
-    alias = models.TextField(unique=True, null=True)
     url = models.TextField(blank=True, default='')
 
     def get_view(self):
@@ -120,8 +122,7 b' class Attachment(models.Model):'
         if file_viewer is None:
             file_viewer = AbstractViewer
 
-        return file_viewer(self.file, self.mimetype, self.hash, self.url,
-                self.alias).get_view()
+        return file_viewer(self.file, self.mimetype, self.hash, self.url).get_view()
 
     def __str__(self):
         return self.url or self.file.url
@@ -157,3 +158,11 b' class Attachment(models.Model):'
 
     def is_internal(self):
         return self.url is None or len(self.url) == 0
+
+
+class AttachmentSticker(models.Model):
+    attachment = models.ForeignKey('Attachment')
+    name = models.TextField(unique=True)
+
+    def __str__(self):
+        return self.name

boards/models/attachment/viewers.py

@@ -56,7 +56,7 b" CSS_CLASS_THUMB = 'thumb'"
 
 ABSTRACT_VIEW = '<div class="image">'\
         '{}'\
-        '<div class="image-metadata">{}<a href="{}" download >{}, {}</a>'\
+        '<div class="image-metadata"><a href="{}" download >{}, {}</a>'\
         ' <a class="file-menu" href="#" data-type="{}" data-search-url="{}" data-filename="{}">🔍 </a></div>'\
         '</div>'
 URL_VIEW = '<div class="image">' \
@@ -100,13 +100,12 b' def file_exists(filename):'
 
 
 class AbstractViewer:
-    def __init__(self, file, file_type, hash, url, alias):
+    def __init__(self, file, file_type, hash, url):
         self.file = file
         self.file_type = file_type
         self.hash = hash
         self.url = url
         self.extension = get_extension(self.file.name)
-        self.alias = alias
 
     @staticmethod
     def supports(file_type):
@@ -121,9 +120,7 b' class AbstractViewer:'
         else:
             search_url = ''
 
-        alias = self.alias + '<br />' if self.alias else ''
-
-        return ABSTRACT_VIEW.format(self.get_format_view(), alias, self.file.url,
+        return ABSTRACT_VIEW.format(self.get_format_view(), self.file.url,
                 self.file_type, filesizeformat(self.file.size),
                 self.file_type, search_url, self.file.name)
 

boards/templates/boards/aliases.html

@@ -5,13 +5,16 b''
 
 {% block head %}
     <meta name="robots" content="noindex">
-    <title>{% trans 'Aliases' %} - {{ site_name }}</title>
+    <title>{% trans "Stickers" %} - {{ site_name }}</title>
 {% endblock %}
 
 {% block content %}
-    <div class="post">
-        {% for image in image_aliases %}
-        <div>{{ image.alias }}: {{ image.get_view|safe }}</div>
+    <div id="posts-table">
+        {% for sticker in stickers %}
+            <div class="gallery_image">
+                {{ sticker.attachment.get_view|safe }}
+                <div>{{ sticker.name }}</div>
+            </div>
         {% endfor %}
     </div>
 {% endblock %}

boards/templates/boards/all_threads.html

@@ -177,7 +177,7 b''
                 {% blocktrans %}Max file number is {{ max_files }}.{% endblocktrans %}
             </div>
             <div id="preview-text"></div>
-            <div><a href="{% url "staticpage" name="help" %}">{% trans 'Text syntax' %}</a></div>
+            <div><a href="{% url "staticpage" name="help" %}">{% trans 'Help' %}</a></div>
         </div>
     </div>
 

boards/templates/boards/post.html

@@ -124,13 +124,6 b''
             </script>
         {% endif %}
     </div>
-    {% comment %}
-        Post images. Currently only 1 image can be posted and shown, but post model
-        supports multiple.
-    {%  endcomment %}
-    {% for image in post.images.all %}
-        {{ image.get_view|safe }}
-    {% endfor %}
     {% for file in post.attachments.all %}
         {{ file.get_view|safe }}
     {% endfor %}

boards/templates/boards/staticpages/help.html

@@ -7,7 +7,9 b''
 {% endblock %}
 
 {% block staticcontent %}
-    <h2>{% trans 'Syntax' %}</h2>
+    <h2>{% trans 'Help' %}</h2>
+    <p>{% trans 'View available stickers:' %} <a href="{% url 'stickers' %}">{% trans 'Stickers' %}</a></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>
@@ -17,6 +19,6 b''
     <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>
-    <br/>
+    <hr/>
     <p>{% trans 'You can try pasting the text and previewing the result here:' %} <a href="{% url 'preview' %}">{% trans 'Preview' %}</a></p>
 {% endblock %}

boards/templates/boards/tag_gallery.html

@@ -74,9 +74,7 b''
     <div id="posts-table">
     {% for image in images %}
         <div class="gallery_image">
-            {% autoescape off %}
-                {{ image.get_view }}
-            {% endautoescape %}
+            {{ image.get_view|safe }}
             <div class="gallery_image_metadata">
                 {{ image.get_size.0 }}x{{ image.get_size.1 }}
             </div>

boards/templates/boards/thread_normal.html

@@ -65,7 +65,7 b''
                     {% blocktrans %}Max file number is {{ max_files }}.{% endblocktrans %}
                 </div>
                 <div><a href="{% url "staticpage" name="help" %}">
-                    {% trans 'Text syntax' %}</a></div>
+                    {% trans 'Help' %}</a></div>
                 <div><a href="#" onClick="resetForm(); return false;">{% trans 'Reset form' %}</a></div>
             </div>
         </div>

boards/urls.py

@@ -5,7 +5,7 b' import neboard'
 from boards import views
 from boards.rss import AllThreadsFeed, TagThreadsFeed, ThreadPostsFeed
 from boards.views import api, tag_threads, all_threads, \
-    settings, all_tags, feed, alias
+    settings, all_tags, feed, stickers
 from boards.views.authors import AuthorsView
 from boards.views.notifications import NotificationView
 from boards.views.static import StaticPageView
@@ -42,7 +42,8 b' urlpatterns = ['
     url(r'^feed/$', views.feed.FeedView.as_view(), name='feed'),
 
     url(r'^settings/$', settings.SettingsView.as_view(), name='settings'),
-    url(r'^aliases/(?P<category>\w+)/$', alias.AliasesView.as_view(), name='aliases'),
+    url(r'^stickers/$', stickers.AliasesView.as_view(), name='stickers'),
+    url(r'^stickers/(?P<category>\w+)/$', stickers.AliasesView.as_view(), name='stickers'),
     url(r'^tags/$', all_tags.AllTagsView.as_view(), name='tags'),
     url(r'^authors/$', AuthorsView.as_view(), name='authors'),
 

boards/views/api.py

@@ -3,7 +3,7 b' import logging'
 
 from django.core import serializers
 from django.db import transaction
-from django.http import HttpResponse
+from django.http import HttpResponse, HttpResponseBadRequest
 from django.shortcuts import get_object_or_404
 from django.views.decorators.csrf import csrf_protect
 
@@ -11,6 +11,7 b' from boards.abstracts.settingsmanager im'
 from boards.forms import PostForm, PlainErrorList
 from boards.mdx_neboard import Parser
 from boards.models import Post, Thread, Tag, Attachment, 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
@@ -190,16 +191,15 b' def api_get_tags(request):'
 
 
 def api_get_stickers(request):
-    attachments = Attachment.objects.filter(mimetype__in=FILE_TYPES_IMAGE)\
-        .exclude(alias='').exclude(alias=None)
+    term = request.GET.get('term')
+    if not term:
+        return HttpResponseBadRequest()
+    
+    stickers = AttachmentSticker.objects.filter(name__contains=term)
 
-    term = request.GET.get('term')
-    if term:
-        attachments = attachments.filter(alias__contains=term)
-
-    image_dict = [{'thumb': attachment.get_thumb_url(),
-                   'alias': attachment.alias}
-                  for attachment in attachments]
+    image_dict = [{'thumb': sticker.attachment.get_thumb_url(),
+                   'alias': sticker.name}
+                  for sticker in stickers]
 
     return HttpResponse(content=json.dumps(image_dict))
 

boards/views/stickers.py

@@ -1,32 +1,25 b''
-from django.db import transaction
-from django.shortcuts import render, redirect
-from django.utils import timezone
+from django.shortcuts import render
 from django.utils.decorators import method_decorator
 from django.views.decorators.csrf import csrf_protect
 
-from boards.abstracts.settingsmanager import get_settings_manager, \
-    SETTING_USERNAME, SETTING_LAST_NOTIFICATION_ID, SETTING_IMAGE_VIEWER
-from boards.middlewares import SESSION_TIMEZONE
-from boards.views.base import BaseBoardView, CONTEXT_FORM
-from boards.forms import SettingsForm, PlainErrorList
-from boards import settings
-from boards.models import Attachment
+from boards.models.attachment import AttachmentSticker
+from boards.views.base import BaseBoardView
 
-CONTEXT_IMAGE_ALIASES = 'image_aliases'
+CONTEXT_STICKERS = 'stickers'
 
 TEMPLATE = 'boards/aliases.html'
 
 
 class AliasesView(BaseBoardView):
     @method_decorator(csrf_protect)
-    def get(self, request, category):
+    def get(self, request, category=None):
         params = dict()
-        settings_manager = get_settings_manager(request)
 
-        selected_theme = settings_manager.get_theme()
-
-        params[CONTEXT_IMAGE_ALIASES] = Attachment.objects.exclude(alias='')\
-                .exclude(alias=None).filter(alias__startswith=(category + '/'))
+        if category:
+            params[CONTEXT_STICKERS] = AttachmentSticker.objects.filter(
+                name__startswith=(category + '/'))
+        else:
+            params[CONTEXT_STICKERS] = AttachmentSticker.objects.all()
 
         return render(request, TEMPLATE, params)