Added local stickers feature

boards/abstracts/attachment_alias.py

@@ -1,29 +1,29 b''
 from boards.abstracts.settingsmanager import SessionSettingsManager
 from boards.models import Attachment
 
 
 class AttachmentAlias:
     def get_image(self, alias):
         pass
 
 
 class SessionAttachmentAlias(AttachmentAlias):
     def __init__(self, session):
         self.session = session
 
     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):
     def get_image(self, alias):
         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)
 
     if image is not None:
         return image

boards/abstracts/settingsmanager.py

@@ -1,205 +1,219 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
 
 MAX_TRIPCODE_COLLISIONS = 50
 
 __author__ = 'neko259'
 
 SESSION_SETTING = 'setting'
 
 # Remove this, it is not used any more cause there is a user's permission
 PERMISSION_MODERATE = 'moderator'
 
 SETTING_THEME = 'theme'
 SETTING_FAVORITE_TAGS = 'favorite_tags'
 SETTING_FAVORITE_THREADS = 'favorite_threads'
 SETTING_HIDDEN_TAGS = 'hidden_tags'
 SETTING_PERMISSIONS = 'permissions'
 SETTING_USERNAME = 'username'
 SETTING_LAST_NOTIFICATION_ID = 'last_notification'
 SETTING_IMAGE_VIEWER = 'image_viewer'
 SETTING_TRIPCODE = 'tripcode'
 SETTING_IMAGES = 'images_aliases'
 SETTING_ONLY_FAVORITES = 'only_favorites'
 
 DEFAULT_THEME = 'md'
 
 
 class SettingsManager:
     """
     Base settings manager class. get_setting and set_setting methods should
     be overriden.
     """
     def __init__(self):
         pass
 
     def get_theme(self) -> str:
         theme = self.get_setting(SETTING_THEME)
         if not theme:
             theme = DEFAULT_THEME
             self.set_setting(SETTING_THEME, theme)
 
         return theme
 
     def set_theme(self, theme):
         self.set_setting(SETTING_THEME, theme)
 
     def has_permission(self, permission):
         permissions = self.get_setting(SETTING_PERMISSIONS)
         if permissions:
             return permission in permissions
         else:
             return False
 
     def get_setting(self, setting, default=None):
         pass
 
     def set_setting(self, setting, value):
         pass
 
     def add_permission(self, permission):
         permissions = self.get_setting(SETTING_PERMISSIONS)
         if not permissions:
             permissions = [permission]
         else:
             permissions.append(permission)
         self.set_setting(SETTING_PERMISSIONS, permissions)
 
     def del_permission(self, permission):
         permissions = self.get_setting(SETTING_PERMISSIONS)
         if not permissions:
             permissions = []
         else:
             permissions.remove(permission)
         self.set_setting(SETTING_PERMISSIONS, permissions)
 
     def get_fav_tags(self) -> list:
         tag_names = self.get_setting(SETTING_FAVORITE_TAGS)
         tags = []
         if tag_names:
             tags = list(Tag.objects.filter(aliases__in=TagAlias.objects
                 .filter_localized(parent__aliases__name__in=tag_names))
                 .order_by('aliases__name'))
         return tags
 
     def add_fav_tag(self, tag):
         tags = self.get_setting(SETTING_FAVORITE_TAGS)
         if not tags:
             tags = [tag.get_name()]
         else:
             if not tag.get_name() in tags:
                 tags.append(tag.get_name())
 
         tags.sort()
         self.set_setting(SETTING_FAVORITE_TAGS, tags)
 
     def del_fav_tag(self, tag):
         tags = self.get_setting(SETTING_FAVORITE_TAGS)
         if tag.get_name() in tags:
             tags.remove(tag.get_name())
             self.set_setting(SETTING_FAVORITE_TAGS, tags)
 
     def get_hidden_tags(self) -> list:
         tag_names = self.get_setting(SETTING_HIDDEN_TAGS)
         tags = []
         if tag_names:
             tags = list(Tag.objects.filter(aliases__in=TagAlias.objects
                 .filter_localized(parent__aliases__name__in=tag_names))
                 .order_by('aliases__name'))
 
         return tags
 
     def add_hidden_tag(self, tag):
         tags = self.get_setting(SETTING_HIDDEN_TAGS)
         if not tags:
             tags = [tag.get_name()]
         else:
             if not tag.get_name() in tags:
                 tags.append(tag.get_name())
 
         tags.sort()
         self.set_setting(SETTING_HIDDEN_TAGS, tags)
 
     def del_hidden_tag(self, tag):
         tags = self.get_setting(SETTING_HIDDEN_TAGS)
         if tag.get_name() in tags:
             tags.remove(tag.get_name())
             self.set_setting(SETTING_HIDDEN_TAGS, tags)
 
     def get_fav_threads(self) -> dict:
         return self.get_setting(SETTING_FAVORITE_THREADS, default=dict())
 
     def add_or_read_fav_thread(self, opening_post):
         threads = self.get_fav_threads()
 
         max_fav_threads = settings.get_int('View', 'MaxFavoriteThreads')
         if (str(opening_post.id) in threads) or (len(threads) < max_fav_threads):
             thread = opening_post.get_thread()
             # Don't check for new posts if the thread is archived already
             if thread.is_archived():
                 last_id = FAV_THREAD_NO_UPDATES
             else:
                 last_id = thread.get_replies().last().id
             threads[str(opening_post.id)] = last_id
             self.set_setting(SETTING_FAVORITE_THREADS, threads)
 
     def del_fav_thread(self, opening_post):
         threads = self.get_fav_threads()
         if self.thread_is_fav(opening_post):
             del threads[str(opening_post.id)]
             self.set_setting(SETTING_FAVORITE_THREADS, threads)
 
     def thread_is_fav(self, opening_post):
         return str(opening_post.id) in self.get_fav_threads()
 
     def get_notification_usernames(self):
         names = set()
         name_list = self.get_setting(SETTING_USERNAME)
         if name_list is not None:
             name_list = name_list.strip()
             if len(name_list) > 0:
                 names = name_list.lower().split(',')
                 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):
     """
     Session-based settings manager. All settings are saved to the user's
     session.
     """
     def __init__(self, session):
         SettingsManager.__init__(self)
         self.session = session
 
     def get_setting(self, setting, default=None):
         if setting in self.session:
             return self.session[setting]
         else:
             self.set_setting(setting, default)
             return default
 
     def set_setting(self, setting, value):
         self.session[setting] = value
 
 
 def get_settings_manager(request) -> SettingsManager:
     """
     Get settings manager based on the request object. Currently only
     session-based manager is supported. In the future, cookie-based or
     database-based managers could be implemented.
     """
     return SessionSettingsManager(request.session)

boards/locale/ru/LC_MESSAGES/django.po

@@ -1,624 +1,633 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/tags.html:17
 msgid "Sections:"
 msgstr "Разделы:"
 
 #: templates/boards/tags.html:30
 msgid "Other tags:"
 msgstr "Другие метки:"
 
 #: templates/boards/tags.html:43
 msgid "All tags..."
 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 "Удалить стикер"

boards/locale/ru/LC_MESSAGES/djangojs.po

@@ -1,61 +1,63 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.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-09-04 18:47+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: \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"
 
 #: static/js/3party/jquery-ui.min.js:8
 msgid "'"
 msgstr ""
 
 #: static/js/refpopup.js:72
 msgid "Loading..."
 msgstr "Загрузка..."
 
 #: static/js/refpopup.js:91
 msgid "Post not found"
 msgstr "Сообщение не найдено"
 
 #: static/js/thread_update.js:261
 msgid "message"
 msgid_plural "messages"
 msgstr[0] "сообщение"
 msgstr[1] "сообщения"
 msgstr[2] "сообщений"
 
 #: static/js/thread_update.js:262
 msgid "image"
 msgid_plural "images"
 msgstr[0] "изображение"
 msgstr[1] "изображения"
 msgstr[2] "изображений"
 
 #: static/js/thread_update.js:445
 msgid "Sending message..."
 msgstr "Отправка сообщения..."
 
 #: static/js/thread_update.js:449
 msgid "Server error!"
 msgstr "Ошибка сервера!"
 
 msgid "Computing PoW..."
 msgstr "Расчёт PoW..."
 
 msgid "Duplicates search"
 msgstr "Поиск дубликатов"
 
+msgid "Add local sticker"
+msgstr "Добавить локальный стикер"

boards/locale/uk/LC_MESSAGES/django.po

@@ -1,624 +1,633 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/tags.html:17
 msgid "Sections:"
 msgstr "Розділи:"
 
 #: templates/boards/tags.html:30
 msgid "Other tags:"
 msgstr "Інші мітки:"
 
 #: templates/boards/tags.html:43
 msgid "All tags..."
 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 "Видалити стікер"

boards/locale/uk/LC_MESSAGES/djangojs.po

@@ -1,61 +1,63 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.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-09-04 18:47+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: \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"
 
 #: static/js/3party/jquery-ui.min.js:8
 msgid "'"
 msgstr ""
 
 #: static/js/refpopup.js:72
 msgid "Loading..."
 msgstr "Завантаження..."
 
 #: static/js/refpopup.js:91
 msgid "Post not found"
 msgstr "Повідомлення не знайдене"
 
 #: static/js/thread_update.js:261
 msgid "message"
 msgid_plural "messages"
 msgstr[0] "повідомлення"
 msgstr[1] "повідомлення"
 msgstr[2] "повідомлень"
 
 #: static/js/thread_update.js:262
 msgid "image"
 msgid_plural "images"
 msgstr[0] "зображення"
 msgstr[1] "зображення"
 msgstr[2] "зображень"
 
 #: static/js/thread_update.js:445
 msgid "Sending message..."
 msgstr "Повідомлення надсилається..."
 
 #: static/js/thread_update.js:449
 msgid "Server error!"
 msgstr "Сервер нездужає! Заходьте пізніше!"
 
 msgid "Computing PoW..."
 msgstr "Розраховується PoW..."
 
 msgid "Duplicates search"
 msgstr "Пошук дублікатів"
 
+msgid "Add local sticker"
+msgstr "Додати локальний стікер"

boards/models/attachment/__init__.py

@@ -1,171 +1,171 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):
         try:
             return AttachmentSticker.objects.get(name=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.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
 
     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 AttachmentSticker(models.Model):
     attachment = models.ForeignKey('Attachment')
     name = models.TextField(unique=True)
 
     def __str__(self):
         return self.name

boards/models/attachment/viewers.py

@@ -1,244 +1,244 b''
 import re
 
 from PIL import Image
 
 from django.contrib.staticfiles import finders
 from django.contrib.staticfiles.templatetags.staticfiles import static
 from django.core.files.images import get_image_dimensions
 from django.template.defaultfilters import filesizeformat
 from django.core.urlresolvers import reverse
 from django.utils.translation import ugettext_lazy as _, ungettext_lazy
 
 from boards.utils import get_domain, cached_result, get_extension
 from boards import settings
 
 
 FILE_STUB_IMAGE = 'images/file.png'
 FILE_STUB_URL = 'url'
 FILE_FILEFORMAT = 'images/fileformats/{}.png'
 
 
 FILE_TYPES_VIDEO = (
     'video/webm',
     'video/mp4',
     'video/mpeg',
     'video/ogv',
 )
 FILE_TYPE_SVG = 'image/svg+xml'
 FILE_TYPES_AUDIO = (
     'audio/ogg',
     'audio/mpeg',
     'audio/opus',
     'audio/x-flac',
     'audio/mpeg',
 )
 FILE_TYPES_IMAGE = (
     'image/jpeg',
     'image/jpg',
     'image/png',
     'image/bmp',
     'image/gif',
 )
 
 PLAIN_FILE_FORMATS = {
     'zip': 'archive',
     'tar': 'archive',
     'gz': 'archive',
     'mid' : 'midi',
 }
 
 URL_PROTOCOLS = {
     'magnet': 'magnet',
 }
 
 CSS_CLASS_IMAGE = 'image'
 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">' \
         '{}' \
         '<div class="image-metadata">{}</div>' \
         '</div>'
 ABSTRACT_FORMAT_VIEW = '<a href="{}">'\
         '<img class="url-image" src="{}" width="{}" height="{}"/>'\
         '</a>'
 VIDEO_FORMAT_VIEW = '<video width="200" height="150" controls src="{}"></video>'
 AUDIO_FORMAT_VIEW = '<audio controls src="{}"></audio>'
 IMAGE_FORMAT_VIEW = '<a class="{}" href="{full}">' \
         '<img class="post-image-preview"' \
         ' src="{}"' \
         ' alt="{}"' \
         ' width="{}"' \
         ' height="{}"' \
         ' data-width="{}"' \
         ' data-height="{}" />' \
         '</a>'
 SVG_FORMAT_VIEW = '<a class="thumb" href="{}">'\
         '<img class="post-image-preview" width="200" height="150" src="{}" />'\
         '</a>'
 URL_FORMAT_VIEW = '<a href="{}">' \
         '<img class="url-image" src="{}" width="{}" height="{}"/>' \
         '</a>'
 
 
 def get_viewers():
     return AbstractViewer.__subclasses__()
 
 
 def get_static_dimensions(filename):
     file_path = finders.find(filename)
     return get_image_dimensions(file_path)
 
 
 # TODO Move this to utils
 def file_exists(filename):
     return finders.find(filename) is not None
 
 
 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)
 
     @staticmethod
     def supports(file_type):
         return True
 
     def get_view(self):
         search_host = settings.get('External', 'ImageSearchHost')
         if search_host:
             if search_host.endswith('/'):
                 search_host = search_host[:-1]
             search_url = search_host + self.file.url
         else:
             search_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)
+                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)
         file_name = FILE_FILEFORMAT.format(image_name)
 
         if file_exists(file_name):
             image = file_name
         else:
             image = FILE_STUB_IMAGE
 
         w, h = get_static_dimensions(image)
 
         return ABSTRACT_FORMAT_VIEW.format(self.file.url, static(image), w, h)
 
 
 class VideoViewer(AbstractViewer):
     @staticmethod
     def supports(file_type):
         return file_type in FILE_TYPES_VIDEO
 
     def get_format_view(self):
         return VIDEO_FORMAT_VIEW.format(self.file.url)
 
 
 class AudioViewer(AbstractViewer):
     @staticmethod
     def supports(file_type):
         return file_type in FILE_TYPES_AUDIO
 
     def get_format_view(self):
         return AUDIO_FORMAT_VIEW.format(self.file.url)
 
 
 class SvgViewer(AbstractViewer):
     @staticmethod
     def supports(file_type):
         return file_type == FILE_TYPE_SVG
 
     def get_format_view(self):
         return SVG_FORMAT_VIEW.format(self.file.url, self.file.url)
 
 
 class ImageViewer(AbstractViewer):
     @staticmethod
     def supports(file_type):
         return file_type in FILE_TYPES_IMAGE
 
     def get_format_view(self):
         metadata = '{}, {}'.format(self.file.name.split('.')[-1],
                                    filesizeformat(self.file.size))
 
         try:
             width, height = get_image_dimensions(self.file.path)
         except Exception:
             # If the image is a decompression bomb, treat it as just a regular
             # file
             return super().get_format_view()
 
         preview_path = self.file.path.replace('.', '.200x150.')
         try:
             pre_width, pre_height = get_image_dimensions(preview_path)
         except Exception:
             return super().get_format_view()
 
         split = self.file.url.rsplit('.', 1)
         w, h = 200, 150
         thumb_url = '%s.%sx%s.%s' % (split[0], w, h, split[1])
 
         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)
 
 
 class UrlViewer(AbstractViewer):
     @staticmethod
     def supports(file_type):
         return file_type is None
 
     def get_view(self):
         return URL_VIEW.format(self.get_format_view(), get_domain(self.url))
 
     def get_format_view(self):
         protocol = self.url.split(':')[0]
 
         domain = get_domain(self.url)
 
         if protocol in URL_PROTOCOLS:
             url_image_name = URL_PROTOCOLS.get(protocol)
         elif domain:
             url_image_name = self._find_image_for_domains(domain) or FILE_STUB_URL
         else:
             url_image_name = FILE_STUB_URL
 
         image_path = 'images/{}.png'.format(url_image_name)
         image = static(image_path)
         w, h = get_static_dimensions(image_path)
 
         return URL_FORMAT_VIEW.format(self.url, image, w, h)
 
     @cached_result()
     def _find_image_for_domains(self, domain):
         """
         Searches for the domain image for every domain level except top.
         E.g. for l3.example.co.uk it will search for l3.example.co.uk, then
         example.co.uk, then co.uk
         """
         levels = domain.split('.')
         while len(levels) > 1:
             domain = '.'.join(levels)
 
             filename = 'images/domains/{}.png'.format(domain)
             if file_exists(filename):
                 return 'domains/' + domain
             else:
                 del levels[0]
 

boards/static/js/main.js

@@ -1,220 +1,230 b''
 /*
  @licstart  The following is the entire license notice for the
  JavaScript code in this page.
 
 
  Copyright (C) 2013  neko259
 
  The JavaScript code in this page is free software: you can
  redistribute it and/or modify it under the terms of the GNU
  General Public License (GNU GPL) as published by the Free Software
  Foundation, either version 3 of the License, or (at your option)
  any later version.  The code is distributed WITHOUT ANY WARRANTY;
  without even the implied warranty of MERCHANTABILITY or FITNESS
  FOR A PARTICULAR PURPOSE.  See the GNU GPL for more details.
 
  As additional permission under GNU GPL version 3 section 7, you
  may distribute non-source (e.g., minimized or compacted) forms of
  that code without the copy of the GNU GPL normally required by
  section 4, provided you include this license notice and a URL
  through which recipients can access the Corresponding Source.
 
  @licend  The above is the entire license notice
  for the JavaScript code in this page.
  */
 
 var ITEM_VOLUME_LEVEL = 'volumeLevel';
 var IMAGE_TYPES = ['image/png', 'image/jpg', 'image/jpeg', 'image/bmp', 'image/gif'];
 
 /**
  * An email is a hidden file to prevent spam bots from posting. It has to be
  * hidden.
  */
 function hideEmailFromForm() {
     $('.form-email').parent().parent().hide();
 }
 
 /**
  * Highlight code blocks with code highlighter
  */
 function highlightCode(node) {
     node.find('pre code').each(function(i, e) {
         hljs.highlightBlock(e);
     });
 }
 
 function updateFavPosts(data) {
     var includePostBody = $('#fav-panel').is(":visible");
 
     var allNewPostCount = 0;
 
     if (includePostBody) {
         var favoriteThreadPanel = $('#fav-panel');
         favoriteThreadPanel.empty();
     }
 
     $.each($.parseJSON(data), function (_, dict) {
         var newPostCount = dict.new_post_count;
         allNewPostCount += newPostCount;
 
         if (includePostBody) {
             var favThreadNode = $('<div class="post"></div>');
             favThreadNode.append($(dict.post_url));
             favThreadNode.append(' ');
             favThreadNode.append($('<span class="title">' + dict.title + '</span>'));
 
             if (newPostCount > 0) {
                 favThreadNode.append(' (<a href="' + dict.newest_post_link + '">+' + newPostCount + "</a>)");
             }
 
             favoriteThreadPanel.append(favThreadNode);
 
             addRefLinkPreview(favThreadNode[0]);
         }
     });
 
     var newPostCountNode = $('#new-fav-post-count');
     if (allNewPostCount > 0) {
         newPostCountNode.text('(+' + allNewPostCount + ')');
         newPostCountNode.show();
     } else {
         newPostCountNode.hide();
     }
 }
 
 function initFavPanel() {
     var favPanelButton = $('#fav-panel-btn');
     if (favPanelButton.length > 0 && typeof SharedWorker != 'undefined') {
         var worker = new SharedWorker($('body').attr('data-update-script'));
         worker.port.onmessage = function(e) {
             updateFavPosts(e.data);
         };
         worker.onerror = function(event){
             throw new Error(event.message + " (" + event.filename + ":" + event.lineno + ")");
         };
         worker.port.start();
 
         $(favPanelButton).click(function() {
             var favPanel = $('#fav-panel');
             favPanel.toggle();
 
             worker.port.postMessage({ includePostBody: favPanel.is(':visible')});
 
             return false;
         });
 
         $(document).on('keyup.removepic', function(e) {
             if(e.which === 27) {
                 $('#fav-panel').hide();
             }
         });
     }
 }
 
 function setVolumeLevel(level) {
     localStorage.setItem(ITEM_VOLUME_LEVEL, level);
 }
 
 function getVolumeLevel() {
     var level = localStorage.getItem(ITEM_VOLUME_LEVEL);
     if (level == null) {
         level = 1.0;
     }
     return level
 }
 
 function processVolumeUser(node) {
     if (!window.localStorage) return;
     node.prop("volume", getVolumeLevel());
     node.on('volumechange', function(event) {
         setVolumeLevel(event.target.volume);
         $("video,audio").prop("volume", getVolumeLevel());
     });
 }
 
 /**
  * Add all scripts than need to work on post, when the post is added to the
  * document.
  */
 function addScriptsToPost(post) {
     addRefLinkPreview(post[0]);
     highlightCode(post);
     processVolumeUser(post.find("video,audio"));
 }
 
 /**
  * Fix compatibility issues with some rare browsers
  */
 function compatibilityCrutches() {
     if (window.operamini) {
         $('#form textarea').each(function() { this.placeholder = ''; });
     }
 }
 
 function addContextMenu() {
     $.contextMenu({
         selector: '.file-menu',
         trigger: 'left',
 
         build: function($trigger, e) {
             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: {
                         name: gettext('Duplicates search'),
                         callback: function(key, opts) {
                             window.location = '/feed/?image=' + $trigger.data('filename');
                         }
                     },
                     google: {
                         name: 'Google',
                         visible: isImage && hasUrl,
                         callback: function(key, opts) {
                             window.location = 'https://www.google.com/searchbyimage?image_url=' + fileSearchUrl;
                         }
                     },
                     iqdb: {
                         name: 'IQDB',
                         visible: isImage && hasUrl,
                         callback: function(key, opts) {
                             window.location = 'http://iqdb.org/?url=' + fileSearchUrl;
                         }
                     },
                     tineye: {
                         name: 'TinEye',
                         visible: isImage && hasUrl,
                         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;
+                            }
+                        }
                     }
-                },
+                }
             };
         }
     });
 }
 
 $( document ).ready(function() {
     hideEmailFromForm();
 
     $("a[href='#top']").click(function() {
         $("html, body").animate({ scrollTop: 0 }, "slow");
         return false;
     });
 
     addImgPreview();
 
     addRefLinkPreview();
 
     highlightCode($(document));
 
     initFavPanel();
 
     var volumeUsers = $("video,audio");
     processVolumeUser(volumeUsers);
 
     addContextMenu();
 
     compatibilityCrutches();
 });

boards/templates/boards/aliases.html

@@ -1,20 +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">
-        {% 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

@@ -1,40 +1,41 b''
 {% extends "boards/base.html" %}
 
 {% load i18n %}
 {% load tz %}
 
 {% block head %}
     <meta name="robots" content="noindex">
     <title>{% trans 'Settings' %} - {{ site_name }}</title>
 {% endblock %}
 
 {% block content %}
     <div id="posts-table">
         <p>
             {% if moderator %}
                 {% trans 'You are moderator.' %}
             {% endif %}
         </p>
         {% if hidden_tags %}
             <p>{% trans 'Hidden tags:' %}
                 {% for tag in hidden_tags %}
                     {{ tag.get_view|safe }}
                 {% endfor %}
             </p>
         {% else %}
             <p>{% trans 'No hidden tags.' %}</p>
         {% endif %}
+        <p><a href="{% url 'stickers' %}">{% trans 'Stickers' %}</a></p>
     </div>
 
     <div class="post-form-w">
     <div class="post-form">
         <form method="post">{% csrf_token %}
             {{ form.as_div }}
             <div class="form-submit">
                 <input type="submit" value="{% trans "Save" %}" />
             </div>
         </form>
     </div>
     </div>
 
 {% endblock %}

boards/views/api.py

@@ -1,315 +1,317 b''
 import json
 import logging
 
 from django.core import serializers
 from django.db import transaction
 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, 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
 from boards.views.thread import ThreadView
 from boards.models.attachment.viewers import FILE_TYPES_IMAGE
 
 __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()
     
-    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}
                   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))

boards/views/stickers.py

@@ -1,25 +1,45 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'
 
 
 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')