Added ability to reset tripcode

boards/abstracts/tripcode.py

@@ -0,0 +1,27 b''
+class Tripcode:
+    def __init__(self, code_str):
+        self.tripcode = code_str
+
+    def get_color(self):
+        return self.tripcode[:6]
+
+    def get_background(self):
+        code = self.get_color()
+        result = ''
+
+        for i in range(0, len(code), 2):
+            p = code[i:i+2]
+            background = hex(255 - int(p, 16))[2:]
+            if len(background) < 2:
+                background = '0' + background
+            result += background
+
+        return result
+
+    def get_short_text(self):
+        return self.tripcode[:8]
+
+    def get_view(self):
+        return '<span style="color: #{}; background: #{}">{}</span>'\
+            .format(self.get_color(), self.get_background(),
+                    self.get_short_text())
  No newline at end of file

boards/abstracts/settingsmanager.py

@@ -1,3 +1,4 b''
+import uuid
 from django.shortcuts import get_object_or_404
 from boards.models import Tag
 
@@ -15,6 +16,7 b" SETTING_PERMISSIONS = 'permissions'"
 SETTING_USERNAME = 'username'
 SETTING_LAST_NOTIFICATION_ID = 'last_notification'
 SETTING_IMAGE_VIEWER = 'image_viewer'
+SETTING_TRIPCODE = 'tripcode'
 
 DEFAULT_THEME = 'md'
 
@@ -116,6 +118,12 b' class SettingsManager:'
             tags.remove(tag.name)
             self.set_setting(SETTING_HIDDEN_TAGS, tags)
 
+    def get_tripcode(self):
+        return self.get_setting(SETTING_TRIPCODE, str(uuid.uuid4()))
+
+    def reset_tripcode(self):
+        self.set_setting(SETTING_TRIPCODE, str(uuid.uuid4()))
+
 
 class SessionSettingsManager(SettingsManager):
     """
@@ -130,6 +138,7 b' class SessionSettingsManager(SettingsMan'
         if setting in self.session:
             return self.session[setting]
         else:
+            self.set_setting(setting, default)
             return default
 
     def set_setting(self, setting, value):

boards/forms.py

@@ -1,8 +1,7 b''
-import hashlib
 import re
 import time
+
 import pytz
-
 from django import forms
 from django.core.files.uploadedfile import SimpleUploadedFile
 from django.core.exceptions import ObjectDoesNotExist
@@ -10,6 +9,7 b' from django.forms.util import ErrorList'
 from django.utils.translation import ugettext_lazy as _
 import requests
 
+from boards.abstracts.settingsmanager import SessionSettingsManager
 from boards.mdx_neboard import formatters
 from boards.models.post import TITLE_MAX_LENGTH
 from boards.models import Tag, Post
@@ -241,7 +241,7 b' class PostForm(NeboardForm):'
 
     def get_tripcode(self):
         if self.cleaned_data['tripcode']:
-            return hashlib.sha1(self.session.session_key.encode()).hexdigest()
+            return SessionSettingsManager(self.session).get_tripcode()
 
     def _clean_text_file(self):
         text = self.cleaned_data.get('text')
@@ -366,7 +366,7 b' class ThreadForm(PostForm):'
 class SettingsForm(NeboardForm):
 
     theme = forms.ChoiceField(choices=settings.THEMES, label=_('Theme'))
-    image_viewer = forms.ChoiceField(choices=settings.IMAGE_VIEWERS, label=_('image view mode'))
+    image_viewer = forms.ChoiceField(choices=settings.IMAGE_VIEWERS, label=_('Image view mode'))
     username = forms.CharField(label=_('User name'), required=False)
     timezone = forms.ChoiceField(choices=get_timezones(), label=_('Time zone'))
 

boards/locale/ru/LC_MESSAGES/django.po

@@ -7,7 +7,7 b' msgid ""'
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-21 11:01+0300\n"
+"POT-Creation-Date: 2015-08-22 15:07+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"
@@ -38,111 +38,114 b' msgstr "\xd1\x80\xd0\xb0\xd0\xb7\xd1\x80\xd0\xb0\xd0\xb1\xd0\xbe\xd1\x82\xd1\x87\xd0\xb8\xd0\xba javascript"'
 msgid "designer"
 msgstr "дизайнер"
 
-#: forms.py:30
+#: forms.py:31
 msgid "Type message here. Use formatting panel for more advanced usage."
 msgstr ""
 "Вводите сообщение сюда. Используйте панель для более сложного форматирования."
 
-#: forms.py:31
+#: forms.py:32
 msgid "music images i_dont_like_tags"
 msgstr "музыка картинки теги_не_нужны"
 
-#: forms.py:33
+#: forms.py:34
 msgid "Title"
 msgstr "Заголовок"
 
-#: forms.py:34
+#: forms.py:35
 msgid "Text"
 msgstr "Текст"
 
-#: forms.py:35
+#: forms.py:36
 msgid "Tag"
 msgstr "Метка"
 
-#: forms.py:36 templates/boards/base.html:40 templates/search/search.html:7
+#: forms.py:37 templates/boards/base.html:40 templates/search/search.html:7
 msgid "Search"
 msgstr "Поиск"
 
-#: forms.py:38
+#: forms.py:39
 #, python-format
 msgid "Please wait %s seconds before sending message"
 msgstr "Пожалуйста подождите %s секунд перед отправкой сообщения"
 
-#: forms.py:139
+#: forms.py:140
 msgid "File"
 msgstr "Файл"
 
-#: forms.py:142
+#: forms.py:143
 msgid "File URL"
 msgstr "URL файла"
 
-#: forms.py:148
+#: forms.py:149
 msgid "e-mail"
 msgstr ""
 
-#: forms.py:151
+#: forms.py:152
 msgid "Additional threads"
 msgstr "Дополнительные темы"
 
-#: forms.py:162
+#: forms.py:155
+msgid "Tripcode"
+msgstr "Трипкод"
+
+#: forms.py:164
 #, python-format
 msgid "Title must have less than %s characters"
 msgstr "Заголовок должен иметь меньше %s символов"
 
-#: forms.py:172
+#: forms.py:174
 #, python-format
 msgid "Text must have less than %s characters"
 msgstr "Текст должен быть короче %s символов"
 
-#: forms.py:192
+#: forms.py:194
 msgid "Invalid URL"
 msgstr "Неверный URL"
 
-#: forms.py:213
+#: forms.py:215
 msgid "Invalid additional thread list"
 msgstr "Неверный список дополнительных тем"
 
-#: forms.py:245
+#: forms.py:251
 msgid "Either text or file must be entered."
 msgstr "Текст или файл должны быть введены."
 
-#: forms.py:283
+#: forms.py:289
 #, python-format
 msgid "File must be less than %s bytes"
 msgstr "Файл должен быть менее %s байт"
 
-#: forms.py:329 templates/boards/all_threads.html:154
+#: forms.py:335 templates/boards/all_threads.html:154
 #: templates/boards/rss/post.html:10 templates/boards/tags.html:6
 msgid "Tags"
 msgstr "Метки"
 
-#: forms.py:336
+#: forms.py:342
 msgid "Inappropriate characters in tags."
 msgstr "Недопустимые символы в метках."
 
-#: forms.py:350
+#: forms.py:356
 msgid "Need at least one section."
 msgstr "Нужен хотя бы один раздел."
 
-#: forms.py:362
+#: forms.py:368
 msgid "Theme"
 msgstr "Тема"
 
-#: forms.py:363
-#, fuzzy
+#: forms.py:369
 #| msgid "Image view mode"
-msgid "image view mode"
+msgid "Image view mode"
 msgstr "Режим просмотра изображений"
 
-#: forms.py:364
+#: forms.py:370
 msgid "User name"
 msgstr "Имя пользователя"
 
-#: forms.py:365
+#: forms.py:371
 msgid "Time zone"
 msgstr "Часовой пояс"
 
-#: forms.py:371
+#: forms.py:377
 msgid "Inappropriate characters."
 msgstr "Недопустимые символы."
 
@@ -300,35 +303,35 b' msgstr "\xd0\x92\xd0\xb2\xd0\xb5\xd1\x80\xd1\x85"'
 msgid "No posts exist. Create the first one!"
 msgstr "Нет сообщений. Создайте первое!"
 
-#: templates/boards/post.html:25
+#: templates/boards/post.html:30
 msgid "Open"
 msgstr "Открыть"
 
-#: templates/boards/post.html:27 templates/boards/post.html.py:38
+#: templates/boards/post.html:32 templates/boards/post.html.py:43
 msgid "Reply"
 msgstr "Ответить"
 
-#: templates/boards/post.html:33
+#: templates/boards/post.html:38
 msgid " in "
 msgstr " в "
 
-#: templates/boards/post.html:43
+#: templates/boards/post.html:48
 msgid "Edit"
 msgstr "Изменить"
 
-#: templates/boards/post.html:45
+#: templates/boards/post.html:50
 msgid "Edit thread"
 msgstr "Изменить тему"
 
-#: templates/boards/post.html:92
+#: templates/boards/post.html:97
 msgid "Replies"
 msgstr "Ответы"
 
-#: templates/boards/post.html:104 templates/boards/thread.html:34
+#: templates/boards/post.html:109 templates/boards/thread.html:34
 msgid "messages"
 msgstr "сообщений"
 
-#: templates/boards/post.html:105 templates/boards/thread.html:35
+#: templates/boards/post.html:110 templates/boards/thread.html:35
 msgid "images"
 msgstr "изображений"
 
@@ -336,18 +339,26 b' msgstr "\xd0\xb8\xd0\xb7\xd0\xbe\xd0\xb1\xd1\x80\xd0\xb0\xd0\xb6\xd0\xb5\xd0\xbd\xd0\xb8\xd0\xb9"'
 msgid "Post image"
 msgstr "Изображение сообщения"
 
-#: templates/boards/settings.html:16
+#: templates/boards/settings.html:15
 msgid "You are moderator."
 msgstr "Вы модератор."
 
-#: templates/boards/settings.html:20
+#: templates/boards/settings.html:19
 msgid "Hidden tags:"
 msgstr "Скрытые метки:"
 
-#: templates/boards/settings.html:28
+#: templates/boards/settings.html:27
 msgid "No hidden tags."
 msgstr "Нет скрытых меток."
 
+#: templates/boards/settings.html:29
+msgid "Tripcode:"
+msgstr "Трипкод:"
+
+#: templates/boards/settings.html:29
+msgid "reset"
+msgstr "сбросить"
+
 #: templates/boards/settings.html:37
 msgid "Save"
 msgstr "Сохранить"
@@ -439,7 +450,6 b' msgid "Reply to thread"'
 msgstr "Ответить в тему"
 
 #: templates/boards/thread_normal.html:31
-#| msgid "messages"
 msgid "to message "
 msgstr "на сообщение"
 

boards/models/post/__init__.py

@@ -12,6 +12,7 b' from django.template.loader import rende'
 from django.utils import timezone
 
 from boards import settings
+from boards.abstracts.tripcode import Tripcode
 from boards.mdx_neboard import Parser
 from boards.models import PostImage, Attachment
 from boards.models.base import Viewable
@@ -440,21 +441,6 b' class Post(models.Model, Viewable):'
                 thread.save(update_fields=['last_edit_time', 'bumpable'])
             self.threads.add(opening_post.get_thread())
 
-    def get_tripcode_color(self):
-        return self.tripcode[:6]
-
-    def get_tripcode_background(self):
-        code = self.get_tripcode_color()
-        result = ''
-
-        for i in range(0, len(code), 2):
-            p = code[i:i+2]
-            background = hex(255 - int(p, 16))[2:]
-            if len(background) < 2:
-                background = '0' + background
-            result += background
-
-        return result
-
-    def get_short_tripcode(self):
-        return self.tripcode[:10]
+    def get_tripcode(self):
+        if self.tripcode:
+            return Tripcode(self.tripcode)

boards/templates/boards/post.html

@@ -9,7 +9,9 b''
         <span class="title">{{ post.title }}</span>
         <span class="pub_time"><time datetime="{{ post.pub_time|date:'c' }}">{{ post.pub_time }}</time></span>
         {% if post.tripcode %}
-            <span style="color: #{{ post.get_tripcode_color }}; background: #{{ post.get_tripcode_background }}">{{ post.get_short_tripcode }}</span>
+            {% autoescape off %}
+                {{ post.get_tripcode.get_view }}
+            {% endautoescape %}
         {% endif %}
         {% comment %}
             Thread death time needs to be shown only if the thread is alredy archived

boards/templates/boards/settings.html

@@ -9,7 +9,6 b''
 {% endblock %}
 
 {% block content %}
-
     <div class="post">
         <p>
             {% if moderator %}
@@ -27,6 +26,7 b''
         {% else %}
             <p>{% trans 'No hidden tags.' %}</p>
         {% endif %}
+        <p>{% trans "Tripcode:" %} {% autoescape off %}{{ tripcode.get_view }}{% endautoescape %} (<a href="?reset_tripcode">{% trans "reset" %}</a>)</p>
     </div>
 
     <div class="post-form-w">

boards/views/settings.py

@@ -4,11 +4,13 b' from django.utils import timezone'
 
 from boards.abstracts.settingsmanager import get_settings_manager, \
     SETTING_USERNAME, SETTING_LAST_NOTIFICATION_ID, SETTING_IMAGE_VIEWER
+from boards.abstracts.tripcode import Tripcode
 from boards.middlewares import SESSION_TIMEZONE
 from boards.views.base import BaseBoardView, CONTEXT_FORM
 from boards.forms import SettingsForm, PlainErrorList
 from boards import settings
 
+PARAM_RESET_TRIPCODE = 'reset_tripcode'
 
 FORM_THEME = 'theme'
 FORM_USERNAME = 'username'
@@ -16,6 +18,7 b" FORM_TIMEZONE = 'timezone'"
 FORM_IMAGE_VIEWER = 'image_viewer'
 
 CONTEXT_HIDDEN_TAGS = 'hidden_tags'
+CONTEXT_TRIPCODE = 'tripcode'
 
 TEMPLATE = 'boards/settings.html'
 
@@ -26,6 +29,9 b' class SettingsView(BaseBoardView):'
         params = dict()
         settings_manager = get_settings_manager(request)
 
+        if PARAM_RESET_TRIPCODE in request.GET:
+            settings_manager.reset_tripcode()
+
         selected_theme = settings_manager.get_theme()
 
         form = SettingsForm(
@@ -42,6 +48,7 b' class SettingsView(BaseBoardView):'
 
         params[CONTEXT_FORM] = form
         params[CONTEXT_HIDDEN_TAGS] = settings_manager.get_hidden_tags()
+        params[CONTEXT_TRIPCODE] = Tripcode(settings_manager.get_tripcode())
 
         return render(request, TEMPLATE, params)