Added local stickers feature

boards/abstracts/attachment_alias.py

@@ -13,7 +13,7 b' class SessionAttachmentAlias(AttachmentA'
 
     def get_image(self, alias):
         settings_manager = SessionSettingsManager(self.session)
-        return settings_manager.get_image_by_alias(alias)
+        return settings_manager.get_attachment_by_alias(alias)
 
 
 class ModelAttachmentAlias(AttachmentAlias):

boards/abstracts/settingsmanager.py

@@ -1,5 +1,6 b''
 from boards import settings
-from boards.models import Tag, TagAlias
+from boards.models import Tag, TagAlias, Attachment
+from boards.models.attachment import AttachmentSticker
 from boards.models.thread import FAV_THREAD_NO_UPDATES
 from boards.models.tag import DEFAULT_LOCALE
 
@@ -164,16 +165,29 b' class SettingsManager:'
                 names = set(name.strip() for name in names)
         return names
 
-    def get_image_by_alias(self, alias):
+    def get_attachment_by_alias(self, alias):
         images = self.get_setting(SETTING_IMAGES)
-        if images is not None and len(images) > 0:
-            return images.get(alias)
+        if images and alias in images:
+            return Attachment.objects.get(id=images.get(alias))
 
-    def add_image_alias(self, alias, image):
+    def add_attachment_alias(self, alias, attachment):
         images = self.get_setting(SETTING_IMAGES)
         if images is None:
             images = dict()
-        images.put(alias, image)
+        images[alias] = attachment.id
+        self.set_setting(SETTING_IMAGES, images)
+
+    def remove_attachment_alias(self, alias):
+        images = self.get_setting(SETTING_IMAGES)
+        del images[alias]
+        self.set_setting(SETTING_IMAGES, images)
+
+    def get_stickers(self):
+        images = self.get_setting(SETTING_IMAGES)
+        if images:
+            return [AttachmentSticker(name=key,
+                                      attachment=Attachment.objects.get(id=value))
+                    for key, value in images.items()]
 
 
 class SessionSettingsManager(SettingsManager):

boards/locale/ru/LC_MESSAGES/django.po

@@ -622,3 +622,12 b' msgstr "\xd0\xa1\xd1\x82\xd0\xb8\xd0\xba\xd0\xb5\xd1\x80\xd1\x8b"'
 
 msgid "Available by addresses:"
 msgstr "Доступно по адресам:"
+
+msgid "Local stickers"
+msgstr "Локальные стикеры"
+
+msgid "Global stickers"
+msgstr "Глобальные стикеры"
+
+msgid "Remove sticker"
+msgstr "Удалить стикер"

boards/locale/ru/LC_MESSAGES/djangojs.po

@@ -59,3 +59,5 b' msgstr "\xd0\xa0\xd0\xb0\xd1\x81\xd1\x87\xd1\x91\xd1\x82 PoW..."'
 msgid "Duplicates search"
 msgstr "Поиск дубликатов"
 
+msgid "Add local sticker"
+msgstr "Добавить локальный стикер"

boards/locale/uk/LC_MESSAGES/django.po

@@ -622,3 +622,12 b' msgstr "\xd0\xa1\xd1\x82\xd1\x96\xd0\xba\xd0\xb5\xd1\x80\xd0\xb8"'
 
 msgid "Available by addresses:"
 msgstr "Доступно за адресами:"
+
+msgid "Local stickers"
+msgstr "Локальні стікери"
+
+msgid "Global stickers"
+msgstr "Глобальні стікери"
+
+msgid "Remove sticker"
+msgstr "Видалити стікер"

boards/locale/uk/LC_MESSAGES/djangojs.po

@@ -59,3 +59,5 b' msgstr "\xd0\xa0\xd0\xbe\xd0\xb7\xd1\x80\xd0\xb0\xd1\x85\xd0\xbe\xd0\xb2\xd1\x83\xd1\x94\xd1\x82\xd1\x8c\xd1\x81\xd1\x8f PoW..."'
 msgid "Duplicates search"
 msgstr "Пошук дублікатів"
 
+msgid "Add local sticker"
+msgstr "Додати локальний стікер"

boards/models/attachment/__init__.py

@@ -125,7 +125,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).get_view()
+        return file_viewer(self.file, self.mimetype, self.id, self.url).get_view()
 
     def __str__(self):
         return self.url or self.file.url

boards/models/attachment/viewers.py

@@ -57,7 +57,7 b" CSS_CLASS_THUMB = 'thumb'"
 ABSTRACT_VIEW = '<div class="image">'\
         '{}'\
         '<div class="image-metadata"><a href="{}" download >{}, {}</a>'\
-        ' <a class="file-menu" href="#" data-type="{}" data-search-url="{}" data-filename="{}">🔍 </a></div>'\
+        ' <a class="file-menu" href="#" data-type="{}" data-search-url="{}" data-filename="{}" data-id="{}">🔍 </a></div>'\
         '</div>'
 URL_VIEW = '<div class="image">' \
         '{}' \
@@ -100,10 +100,10 b' def file_exists(filename):'
 
 
 class AbstractViewer:
-    def __init__(self, file, file_type, hash, url):
+    def __init__(self, file, file_type, id, url):
         self.file = file
         self.file_type = file_type
-        self.hash = hash
+        self.id = id
         self.url = url
         self.extension = get_extension(self.file.name)
 
@@ -122,7 +122,7 b' class AbstractViewer:'
 
         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)
+                self.file_type, search_url, self.file.name, self.id)
 
     def get_format_view(self):
         image_name = PLAIN_FILE_FORMATS.get(self.extension, self.extension)
@@ -193,7 +193,7 b' class ImageViewer(AbstractViewer):'
 
         return IMAGE_FORMAT_VIEW.format(CSS_CLASS_THUMB,
                 thumb_url,
-                self.hash,
+                self.id,
                 str(pre_width),
                 str(pre_height), str(width), str(height),
                 full=self.file.url, image_meta=metadata)

boards/static/js/main.js

@@ -160,6 +160,7 b' function addContextMenu() {'
             var fileSearchUrl = $trigger.data('search-url');
             var isImage = IMAGE_TYPES.indexOf($trigger.data('type')) > -1;
             var hasUrl = fileSearchUrl.length > 0;
+            var id = $trigger.data('id');
             return {
                 items: {
                     duplicates: {
@@ -188,8 +189,17 b' function addContextMenu() {'
                         callback: function(key, opts) {
                             window.location = 'http://tineye.com/search?url=' + fileSearchUrl;
                         }
+                    },
+                    addAlias: {
+                        name: gettext('Add local sticker'),
+                        callback: function(key, opts) {
+                            var alias = prompt(gettext('Input sticker name'));
+                            if (alias) {
+                                window.location = '/stickers/?action=add&name=' + alias + '&id=' + id;
+                            }
+                        }
                     }
-                },
+                }
             };
         }
     });

boards/templates/boards/aliases.html

@@ -10,11 +10,24 b''
 
 {% block content %}
     <div id="posts-table">
-        {% for sticker in stickers %}
-            <div class="gallery_image">
-                {{ sticker.attachment.get_view|safe }}
-                <div>{{ sticker.name }}</div>
-            </div>
-        {% endfor %}
+        {% 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><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>
+            {% endfor %}
+        {% endif %}
     </div>
 {% endblock %}

boards/templates/boards/settings.html

@@ -24,6 +24,7 b''
         {% else %}
             <p>{% trans 'No hidden tags.' %}</p>
         {% endif %}
+        <p><a href="{% url 'stickers' %}">{% trans 'Stickers' %}</a></p>
     </div>
 
     <div class="post-form-w">

boards/views/api.py

@@ -195,7 +195,9 b' def api_get_stickers(request):'
     if not term:
         return HttpResponseBadRequest()
     
-    stickers = AttachmentSticker.objects.filter(name__contains=term)
+    global_stickers = AttachmentSticker.objects.filter(name__contains=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}

boards/views/stickers.py

@@ -1,11 +1,13 b''
-from django.shortcuts import render
+from django.shortcuts import render, redirect
 from django.utils.decorators import method_decorator
 from django.views.decorators.csrf import csrf_protect
 
-from boards.models.attachment import AttachmentSticker
+from boards.abstracts.settingsmanager import get_settings_manager
+from boards.models.attachment import AttachmentSticker, Attachment
 from boards.views.base import BaseBoardView
 
-CONTEXT_STICKERS = 'stickers'
+CONTEXT_GLOBAL_STICKERS = 'global_stickers'
+CONTEXT_LOCAL_STICKERS = 'local_stickers'
 
 TEMPLATE = 'boards/aliases.html'
 
@@ -13,13 +15,31 b" TEMPLATE = 'boards/aliases.html'"
 class AliasesView(BaseBoardView):
     @method_decorator(csrf_protect)
     def get(self, request, category=None):
+        result = self._process_creation(request)
+        if result:
+            return result
+
         params = dict()
 
         if category:
-            params[CONTEXT_STICKERS] = AttachmentSticker.objects.filter(
+            params[CONTEXT_GLOBAL_STICKERS] = AttachmentSticker.objects.filter(
                 name__startswith=(category + '/'))
         else:
-            params[CONTEXT_STICKERS] = AttachmentSticker.objects.all()
+            params[CONTEXT_GLOBAL_STICKERS] = AttachmentSticker.objects.all()
+        params[CONTEXT_LOCAL_STICKERS] = get_settings_manager(request).get_stickers()
 
         return render(request, TEMPLATE, params)
 
+    def _process_creation(self, request):
+        action = request.GET.get('action')
+        if action == 'add' and 'name' in request.GET and 'id' in request.GET:
+            name = request.GET['name']
+            id = request.GET['id']
+            attachment = Attachment.objects.get(id=id)
+            get_settings_manager(request).add_attachment_alias(name, attachment)
+
+            return redirect('stickers')
+        if action == 'remove' and 'name' in request.GET:
+            name = request.GET['name']
+            get_settings_manager(request).remove_attachment_alias(name)
+            return redirect('stickers')