Implemented search over posts. Moved get_user and get_theme to utils module. Use context processors instead of creating context in the base view. Removed unused imports in some modules

boards/context_processors.py

@@ -0,0 +1,31 b''
+from boards import utils
+from boards.models import Post
+from boards.models.post import SETTING_MODERATE
+import neboard
+
+__author__ = 'neko259'
+
+
+def user_and_ui_processor(request):
+    context = {}
+
+    user = utils.get_user(request)
+    context['user'] = user
+    context['tags'] = user.fav_tags.all()
+    context['posts_per_day'] = float(Post.objects.get_posts_per_day())
+
+    theme = utils.get_theme(request, user)
+    context['theme'] = theme
+    context['theme_css'] = 'css/' + theme + '/base_page.css'
+
+    # This shows the moderator panel
+    moderate = user.get_setting(SETTING_MODERATE)
+    if moderate == 'True':
+        context['moderator'] = user.is_moderator()
+    else:
+        context['moderator'] = False
+
+    context['version'] = neboard.settings.VERSION
+    context['site_name'] = neboard.settings.SITE_NAME
+
+    return context
  No newline at end of file

boards/search_indexes.py

@@ -0,0 +1,14 b''
+from haystack import indexes
+from boards.models import Post
+
+__author__ = 'neko259'
+
+
+class PostIndex(indexes.SearchIndex, indexes.Indexable):
+    text = indexes.CharField(document=True, use_template=True)
+
+    def get_model(self):
+        return Post
+
+    def index_queryset(self, using=None):
+        return self.get_model().objects.all()
  No newline at end of file

templates/search/indexes/boards/post_text.txt

@@ -0,0 +1,2 b''
+{{ object.title }}
+{{ object.text }}
  No newline at end of file

templates/search/search.html

@@ -0,0 +1,29 b''
+{% extends 'boards/base.html' %}
+
+{% load board %}
+{% load i18n %}
+
+{% block content %}
+    <div class="post-form-w">
+        <h3>{% trans 'Search' %}</h3>
+        <form method="get" action=".">
+            {{ form.as_p }}
+            <input type="submit" value="{% trans 'Search' %}">
+        </form>
+    </div>
+
+    {% if query %}
+        {% for result in page.object_list %}
+            {% post_view result.object %}
+        {% empty %}
+            <p>{% trans 'No results found.' %}</p>
+        {% endfor %}
+
+        {% if page.has_previous or page.has_next %}
+            <div>
+                {% if page.has_previous %}<a href="?q={{ query }}&amp;page={{ page.previous_page_number }}">{% endif %}&laquo; {% trans 'Previous' %}{% if page.has_previous %}</a>{% endif %}
+                {% if page.has_next %}<a href="?q={{ query }}&amp;page= {{ page.next_page_number }}">{% endif %}{% trans 'Next' %} &raquo; {% if page.has_next %}</a>{% endif %}
+            </div>
+        {% endif %}
+    {% endif %}
+{% endblock %}
  No newline at end of file

boards/locale/ru/LC_MESSAGES/django.po

@@ -1,390 +1,390 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: 2014-05-08 21:35+0300\n"
+"POT-Creation-Date: 2014-06-15 12:34+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"
 
 #: authors.py:5
 msgid "author"
 msgstr "автор"
 
 #: authors.py:6
 msgid "developer"
 msgstr "разработчик"
 
 #: authors.py:7
 msgid "javascript developer"
 msgstr "разработчик javascript"
 
 #: authors.py:8
 msgid "designer"
 msgstr "дизайнер"
 
 #: forms.py:23
 msgid ""
 "Type message here. You can reply to message >>123 like\n"
 " this. 2 new lines are required to start new paragraph."
 msgstr ""
 "Введите сообщение здесь. Вы можете ответить на сообщение >>123 вот так. 2 "
 "переноса строки обязательны для создания нового абзаца."
 
 #: forms.py:25
 msgid "tag1 several_words_tag"
 msgstr "тег1 тег_из_нескольких_слов"
 
 #: forms.py:27
 msgid "Such image was already posted"
 msgstr "Такое изображение уже было загружено"
 
 #: forms.py:29
 msgid "Title"
 msgstr "Заголовок"
 
 #: forms.py:30
 msgid "Text"
 msgstr "Текст"
 
 #: forms.py:31
 msgid "Tag"
 msgstr "Тег"
 
 #: forms.py:108
 msgid "Image"
 msgstr "Изображение"
 
 #: forms.py:112
 msgid "e-mail"
 msgstr ""
 
 #: forms.py:123
 #, python-format
 msgid "Title must have less than %s characters"
 msgstr "Заголовок должен иметь меньше %s символов"
 
 #: forms.py:132
 #, python-format
 msgid "Text must have less than %s characters"
 msgstr "Текст должен быть короче %s символов"
 
 #: forms.py:143
 #, python-format
 msgid "Image must be less than %s bytes"
 msgstr "Изображение должно быть менее %s байт"
 
 #: forms.py:178
 msgid "Either text or image must be entered."
 msgstr "Текст или картинка должны быть введены."
 
 #: forms.py:201
 #, python-format
 msgid "Wait %s seconds after last posting"
 msgstr "Подождите %s секунд после последнего постинга"
 
 #: forms.py:217 templates/boards/tags.html:7 templates/boards/rss/post.html:10
 msgid "Tags"
 msgstr "Теги"
 
-#: forms.py:225 forms.py:344
+#: forms.py:224 forms.py:343
 msgid "Inappropriate characters in tags."
 msgstr "Недопустимые символы в тегах."
 
-#: forms.py:253 forms.py:274
+#: forms.py:252 forms.py:273
 msgid "Captcha validation failed"
 msgstr "Проверка капчи провалена"
 
-#: forms.py:280
+#: forms.py:279
 msgid "Theme"
 msgstr "Тема"
 
-#: forms.py:285
+#: forms.py:284
 msgid "Enable moderation panel"
 msgstr "Включить панель модерации"
 
-#: forms.py:300
+#: forms.py:299
 msgid "No such user found"
 msgstr "Данный пользователь не найден"
 
-#: forms.py:314
+#: forms.py:313
 #, python-format
 msgid "Wait %s minutes after last login"
 msgstr "Подождите %s минут после последнего входа"
 
 #: templates/boards/404.html:6
 msgid "Not found"
 msgstr "Не найдено"
 
 #: templates/boards/404.html:12
 msgid "This page does not exist"
 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:11
 msgid "Feed"
 msgstr "Лента"
 
-#: templates/boards/base.html:31
+#: templates/boards/base.html:28
 msgid "All threads"
 msgstr "Все темы"
 
-#: templates/boards/base.html:36
+#: templates/boards/base.html:33
 msgid "Tag management"
 msgstr "Управление тегами"
 
-#: templates/boards/base.html:38 templates/boards/settings.html:7
+#: templates/boards/base.html:35 templates/boards/settings.html:7
 msgid "Settings"
 msgstr "Настройки"
 
-#: templates/boards/base.html:50 templates/boards/login.html:6
-#: templates/boards/login.html.py:21
+#: templates/boards/base.html:47 templates/boards/login.html:6
+#: templates/boards/login.html.py:16
 msgid "Login"
 msgstr "Вход"
 
-#: templates/boards/base.html:52
+#: templates/boards/base.html:48
+msgid "Search"
+msgstr "Поиск"
+
+#: templates/boards/base.html:50
 #, python-format
 msgid "Speed: %(ppd)s posts per day"
 msgstr "Скорость: %(ppd)s сообщений в день"
 
-#: templates/boards/base.html:54
+#: templates/boards/base.html:52
 msgid "Up"
 msgstr "Вверх"
 
-#: templates/boards/login.html:15
-msgid "User ID"
-msgstr "ID пользователя"
-
-#: templates/boards/login.html:24
+#: templates/boards/login.html:19
 msgid "Insert your user id above"
 msgstr "Вставьте свой ID пользователя выше"
 
 #: templates/boards/post.html:21 templates/boards/staticpages/help.html:19
 msgid "Quote"
 msgstr "Цитата"
 
 #: templates/boards/post.html:31
 msgid "Open"
 msgstr "Открыть"
 
 #: templates/boards/post.html:33
 msgid "Reply"
 msgstr "Ответ"
 
 #: templates/boards/post.html:40
 msgid "Edit"
 msgstr "Изменить"
 
 #: templates/boards/post.html:42
 msgid "Delete"
 msgstr "Удалить"
 
 #: templates/boards/post.html:45
 msgid "Ban IP"
 msgstr "Заблокировать IP"
 
 #: templates/boards/post.html:74
 msgid "Replies"
 msgstr "Ответы"
 
 #: templates/boards/post.html:84 templates/boards/thread.html:102
 #: templates/boards/thread_gallery.html:60
 msgid "images"
 msgstr "изображений"
 
 #: templates/boards/post_admin.html:19
 msgid "Tags:"
 msgstr "Теги:"
 
 #: templates/boards/post_admin.html:30
 msgid "Add tag"
 msgstr "Добавить тег"
 
 #: templates/boards/posting_general.html:56
 msgid "Show tag"
 msgstr "Показывать тег"
 
 #: templates/boards/posting_general.html:60
 msgid "Hide tag"
 msgstr "Скрывать тег"
 
 #: templates/boards/posting_general.html:79
 msgid "Previous page"
 msgstr "Предыдущая страница"
 
 #: templates/boards/posting_general.html:94
 #, python-format
 msgid "Skipped %(count)s replies. Open thread to see all replies."
 msgstr "Пропущено %(count)s ответов. Откройте тред, чтобы увидеть все ответы."
 
 #: templates/boards/posting_general.html:121
 msgid "Next page"
 msgstr "Следующая страница"
 
 #: templates/boards/posting_general.html:126
 msgid "No threads exist. Create the first one!"
 msgstr "Нет тем. Создайте первую!"
 
 #: templates/boards/posting_general.html:132
 msgid "Create new thread"
 msgstr "Создать новую тему"
 
 #: templates/boards/posting_general.html:137 templates/boards/thread.html:62
 #: templates/boards/thread.html.py:71
 msgid "Post"
 msgstr "Отправить"
 
 #: templates/boards/posting_general.html:142
 msgid "Tags must be delimited by spaces. Text or image is required."
 msgstr ""
 "Теги должны быть разделены пробелами. Текст или изображение обязательны."
 
 #: templates/boards/posting_general.html:145 templates/boards/thread.html:79
 msgid "Text syntax"
 msgstr "Синтаксис текста"
 
 #: templates/boards/posting_general.html:157
 msgid "Pages:"
 msgstr "Страницы: "
 
 #: templates/boards/settings.html:14
 msgid "User:"
 msgstr "Пользователь:"
 
 #: templates/boards/settings.html:16
 msgid "You are moderator."
 msgstr "Вы модератор."
 
 #: templates/boards/settings.html:19
 msgid "You are veteran."
 msgstr "Вы ветеран."
 
 #: templates/boards/settings.html:22
 msgid "Posts:"
 msgstr "Сообщений:"
 
 #: templates/boards/settings.html:23
 msgid "First access:"
 msgstr "Первый доступ:"
 
 #: templates/boards/settings.html:25
 msgid "Last access:"
 msgstr "Последний доступ: "
 
 #: templates/boards/settings.html:29
 msgid "Hidden tags:"
 msgstr "Скрытые теги:"
 
 #: templates/boards/settings.html:44
 msgid "Save"
 msgstr "Сохранить"
 
 #: templates/boards/tags.html:22
 msgid "No tags found."
 msgstr "Теги не найдены."
 
 #: templates/boards/thread.html:20 templates/boards/thread_gallery.html:21
 msgid "Normal mode"
 msgstr "Нормальный режим"
 
 #: templates/boards/thread.html:21 templates/boards/thread_gallery.html:22
 msgid "Gallery mode"
 msgstr "Режим галереи"
 
 #: templates/boards/thread.html:29
 msgid "posts to bumplimit"
 msgstr "сообщений до бамплимита"
 
 #: templates/boards/thread.html:50
 msgid "Reply to thread"
 msgstr "Ответить в тему"
 
 #: templates/boards/thread.html:76
 msgid "Switch mode"
 msgstr "Переключить режим"
 
 #: templates/boards/thread.html:101 templates/boards/thread_gallery.html:59
 msgid "replies"
 msgstr "ответов"
 
 #: templates/boards/thread.html:103 templates/boards/thread_gallery.html:61
 msgid "Last update: "
 msgstr "Последнее обновление: "
 
 #: templates/boards/rss/post.html:5
 msgid "Post image"
 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 "2 line breaks for a new line."
 msgstr "2 перевода строки создают новый абзац."
 
 #: templates/boards/staticpages/help.html:12
 msgid "Italic text"
 msgstr "Курсивный текст"
 
 #: templates/boards/staticpages/help.html:13
 msgid "Bold text"
 msgstr "Полужирный текст"
 
 #: templates/boards/staticpages/help.html:14
 msgid "Spoiler"
 msgstr "Спойлер"
 
 #: templates/boards/staticpages/help.html:15
 msgid "Link to a post"
 msgstr "Ссылка на сообщение"
 
 #: templates/boards/staticpages/help.html:16
 msgid "Strikethrough text"
 msgstr "Зачеркнутый текст"
 
 #: templates/boards/staticpages/help.html:17
 msgid "You need to new line before:"
 msgstr "Перед этими тегами нужна новая строка:"
 
 #: templates/boards/staticpages/help.html:18
 msgid "Comment"
 msgstr "Комментарий"
 
-#~ msgid "Archive"
-#~ msgstr "Архив"
+#~ msgid "User ID"
+#~ msgstr "ID пользователя"

boards/middlewares.py

@@ -1,41 +1,42 b''
 from django.shortcuts import redirect
-from boards import views, utils
+from boards import utils
 from boards.models import Ban
 from django.utils.html import strip_spaces_between_tags
 from django.conf import settings
+from boards.views.banned import BannedView
 
 RESPONSE_CONTENT_TYPE = 'Content-Type'
 
 TYPE_HTML = 'text/html'
 
 
 class BanMiddleware:
     """
     This is run before showing the thread. Banned users don't need to see
     anything
     """
 
     def process_view(self, request, view_func, view_args, view_kwargs):
 
-        if view_func != views.banned.BannedView.as_view:
+        if view_func != BannedView.as_view:
             ip = utils.get_client_ip(request)
             bans = Ban.objects.filter(ip=ip)
 
             if bans.exists():
                 ban = bans[0]
                 if not ban.can_read:
                     return redirect('banned')
 
 
 class MinifyHTMLMiddleware(object):
     def process_response(self, request, response):
         try:
             compress_html = settings.COMPRESS_HTML
         except AttributeError:
             compress_html = False
 
         if RESPONSE_CONTENT_TYPE in response\
             and TYPE_HTML in response[RESPONSE_CONTENT_TYPE] and compress_html:
             response.content = strip_spaces_between_tags(
                 response.content.strip())
         return response
  No newline at end of file

boards/templates/boards/base.html

@@ -1,62 +1,60 b''
 {% load staticfiles %}
 {% load i18n %}
 {% load l10n %}
 {% load static from staticfiles %}
 
 <!DOCTYPE html>
 <html>
 <head>
-    <link rel="stylesheet" type="text/css"
-        href="{% static 'css/base.css' %}" media="all"/>
-    <link rel="stylesheet" type="text/css"
-	href="{% static theme_css %}" media="all"/>
-    <link rel="alternate" type="application/rss+xml" href="rss/" title=
-	"{% trans 'Feed' %}"/>
+    <link rel="stylesheet" type="text/css" href="{% static 'css/base.css' %}" media="all"/>
+    <link rel="stylesheet" type="text/css" href="{% static theme_css %}" media="all"/>
+    <link rel="alternate" type="application/rss+xml" href="rss/" title="{% trans 'Feed' %}"/>
 
     <link rel="icon" type="image/png"
         href="{% static 'favicon.png' %}">
 
     <meta name="viewport" content="width=device-width, initial-scale=1"/>
     <meta charset="utf-8"/>
 
     {% block head %}{% endblock %}
 </head>
 <body>
 <script src="{% static 'js/jquery-2.0.1.min.js' %}"></script>
 <script src="{% static 'js/jquery-ui-1.10.3.custom.min.js' %}"></script>
 <script src="{% static 'js/jquery.mousewheel.js' %}"></script>
 <script src="{% url 'js_info_dict' %}"></script>
 
 <div class="navigation_panel">
     <a class="link" href="{% url 'index' %}">{% trans "All threads" %}</a>
     {% for tag in tags %}
         <a class="tag" href="{% url 'tag' tag_name=tag.name %}"
                 >#{{ tag.name }}</a>,
     {% endfor %}
     <a href="{% url 'tags' %}" title="{% trans 'Tag management' %}"
             >[...]</a>
     <a class="link" href="{% url 'settings' %}">{% trans 'Settings' %}</a>
 </div>
 
 {% block content %}{% endblock %}
 
 <script src="{% static 'js/popup.js' %}"></script>
 <script src="{% static 'js/image.js' %}"></script>
 <script src="{% static 'js/refpopup.js' %}"></script>
 <script src="{% static 'js/main.js' %}"></script>
 
 <div class="navigation_panel">
     {% block metapanel %}{% endblock %}
     [<a href="{% url "login" %}">{% trans 'Login' %}</a>]
+    [<a href="{% url "haystack_search" %}">{% trans 'Search' %}</a>]
     {% with ppd=posts_per_day|floatformat:2 %}
         {% blocktrans %}Speed: {{ ppd }} posts per day{% endblocktrans %}
     {% endwith %}
     <a class="link" href="#top">{% trans 'Up' %}</a>
 </div>
 
 <div class="footer">
     <!-- Put your banners here -->
 </div>
 
 </body>
 </html>

boards/urls.py

@@ -1,81 +1,84 b''
 from django.conf.urls import patterns, url, include
 from boards import views
 from boards.rss import AllThreadsFeed, TagThreadsFeed, ThreadPostsFeed
 from boards.views import api, tag_threads, all_threads, \
         login, settings, all_tags
 from boards.views.authors import AuthorsView
 from boards.views.delete_post import DeletePostView
 from boards.views.ban import BanUserView
 from boards.views.static import StaticPageView
 from boards.views.post_admin import PostAdminView
 
 js_info_dict = {
     'packages': ('boards',),
 }
 
 urlpatterns = patterns('',
 
     # /boards/
     url(r'^$', all_threads.AllThreadsView.as_view(), name='index'),
     # /boards/page/
     url(r'^page/(?P<page>\w+)/$', all_threads.AllThreadsView.as_view(),
         name='index'),
 
     # login page
     url(r'^login/$', login.LoginView.as_view(), name='login'),
 
     # /boards/tag/tag_name/
     url(r'^tag/(?P<tag_name>\w+)/$', tag_threads.TagView.as_view(),
         name='tag'),
     # /boards/tag/tag_id/page/
     url(r'^tag/(?P<tag_name>\w+)/page/(?P<page>\w+)/$',
         tag_threads.TagView.as_view(), name='tag'),
 
     # /boards/thread/
     url(r'^thread/(?P<post_id>\w+)/$', views.thread.ThreadView.as_view(),
         name='thread'),
     url(r'^thread/(?P<post_id>\w+)/mode/(?P<mode>\w+)/$', views.thread.ThreadView
         .as_view(), name='thread_mode'),
 
     # /boards/post_admin/
     url(r'^post_admin/(?P<post_id>\w+)/$', PostAdminView.as_view(),
             name='post_admin'),
 
     url(r'^settings/$', settings.SettingsView.as_view(), name='settings'),
     url(r'^tags/$', all_tags.AllTagsView.as_view(), name='tags'),
     url(r'^captcha/', include('captcha.urls')),
     url(r'^authors/$', AuthorsView.as_view(), name='authors'),
     url(r'^delete/(?P<post_id>\w+)/$', DeletePostView.as_view(),
             name='delete'),
     url(r'^ban/(?P<post_id>\w+)/$', BanUserView.as_view(), name='ban'),
 
     url(r'^banned/$', views.banned.BannedView.as_view(), name='banned'),
     url(r'^staticpage/(?P<name>\w+)/$', StaticPageView.as_view(),
         name='staticpage'),
 
     # RSS feeds
     url(r'^rss/$', AllThreadsFeed()),
     url(r'^page/(?P<page>\w+)/rss/$', AllThreadsFeed()),
     url(r'^tag/(?P<tag_name>\w+)/rss/$', TagThreadsFeed()),
     url(r'^tag/(?P<tag_name>\w+)/page/(?P<page>\w+)/rss/$', TagThreadsFeed()),
     url(r'^thread/(?P<post_id>\w+)/rss/$', ThreadPostsFeed()),
 
     # i18n
     url(r'^jsi18n/$', 'boards.views.cached_js_catalog', js_info_dict,
         name='js_info_dict'),
 
     # API
     url(r'^api/post/(?P<post_id>\w+)/$', api.get_post, name="get_post"),
     url(r'^api/diff_thread/(?P<thread_id>\w+)/(?P<last_update_time>\w+)/$',
         api.api_get_threaddiff, name="get_thread_diff"),
     url(r'^api/threads/(?P<count>\w+)/$', api.api_get_threads,
             name='get_threads'),
     url(r'^api/tags/$', api.api_get_tags, name='get_tags'),
     url(r'^api/thread/(?P<opening_post_id>\w+)/$', api.api_get_thread_posts,
             name='get_thread'),
     url(r'^api/add_post/(?P<opening_post_id>\w+)/$', api.api_add_post,
             name='add_post'),
-    url(r'api/get_tag_popularity/(?P<tag_name>\w+)$', api.get_tag_popularity,
+    url(r'^api/get_tag_popularity/(?P<tag_name>\w+)$', api.get_tag_popularity,
             name='get_tag_popularity'),
 
+    # Search
+    url(r'^search/', include('haystack.urls')),
+
 )

boards/utils.py

@@ -1,80 +1,129 b''
 """
 This module contains helper functions and helper classes.
 """
+import hashlib
 from django.utils import timezone
 
 from neboard import settings
+from boards.models import Post, User
+from boards.models.post import SETTING_MODERATE
+from boards.models.user import RANK_USER
 import time
+import neboard
 
 
 KEY_CAPTCHA_FAILS = 'key_captcha_fails'
 KEY_CAPTCHA_DELAY_TIME = 'key_captcha_delay_time'
 KEY_CAPTCHA_LAST_ACTIVITY = 'key_captcha_last_activity'
 
 
 def need_include_captcha(request):
     """
     Check if request is made by a user.
     It contains rules which check for bots.
     """
 
     if not settings.ENABLE_CAPTCHA:
         return False
 
     enable_captcha = False
 
     #newcomer
     if KEY_CAPTCHA_LAST_ACTIVITY not in request.session:
         return settings.ENABLE_CAPTCHA
 
     last_activity = request.session[KEY_CAPTCHA_LAST_ACTIVITY]
     current_delay = int(time.time()) - last_activity
 
     delay_time = (request.session[KEY_CAPTCHA_DELAY_TIME]
                   if KEY_CAPTCHA_DELAY_TIME in request.session
                   else settings.CAPTCHA_DEFAULT_SAFE_TIME)
 
     if current_delay < delay_time:
         enable_captcha = True
 
     print 'ENABLING' + str(enable_captcha)
 
     return enable_captcha
 
 
 def update_captcha_access(request, passed):
     """
     Update captcha fields.
     It will reduce delay time if user passed captcha verification and
     it will increase it otherwise.
     """
     session = request.session
 
     delay_time = (request.session[KEY_CAPTCHA_DELAY_TIME]
                   if KEY_CAPTCHA_DELAY_TIME in request.session
                   else settings.CAPTCHA_DEFAULT_SAFE_TIME)
 
     print "DELAY TIME = " + str(delay_time)
 
     if passed:
         delay_time -= 2 if delay_time >= 7 else 5
     else:
         delay_time += 10
 
     session[KEY_CAPTCHA_LAST_ACTIVITY] = int(time.time())
     session[KEY_CAPTCHA_DELAY_TIME] = delay_time
 
 
 def get_client_ip(request):
     x_forwarded_for = request.META.get('HTTP_X_FORWARDED_FOR')
     if x_forwarded_for:
         ip = x_forwarded_for.split(',')[-1].strip()
     else:
         ip = request.META.get('REMOTE_ADDR')
     return ip
 
 
 def datetime_to_epoch(datetime):
     return int(time.mktime(timezone.localtime(
         datetime,timezone.get_current_timezone()).timetuple())
-               * 1000000 + datetime.microsecond)
  No newline at end of file
+               * 1000000 + datetime.microsecond)
+
+
+def get_user(request):
+    """
+    Get current user from the session. If the user does not exist, create
+    a new one.
+    """
+
+    session = request.session
+    if not 'user_id' in session:
+        request.session.save()
+
+        md5 = hashlib.md5()
+        md5.update(session.session_key)
+        new_id = md5.hexdigest()
+
+        while User.objects.filter(user_id=new_id).exists():
+            md5.update(str(timezone.now()))
+            new_id = md5.hexdigest()
+
+        time_now = timezone.now()
+        user = User.objects.create(user_id=new_id, rank=RANK_USER,
+                                   registration_time=time_now)
+
+        session['user_id'] = user.id
+    else:
+        user = User.objects.select_related('fav_tags').get(
+            id=session['user_id'])
+
+    return user
+
+
+def get_theme(request, user=None):
+    """
+    Get user's CSS theme
+    """
+
+    if not user:
+        user = get_user(request)
+    theme = user.get_setting('theme')
+    if not theme:
+        theme = neboard.settings.DEFAULT_THEME
+
+    return theme
  No newline at end of file

boards/views/all_tags.py

@@ -1,12 +1,13 b''
 from django.shortcuts import render
 
 from boards.views.base import BaseBoardView
 from boards.models.tag import Tag
 
+
 class AllTagsView(BaseBoardView):
 
     def get(self, request):
         context = self.get_context_data(request=request)
         context['all_tags'] = Tag.objects.get_not_empty_tags()
 
         return render(request, 'boards/tags.html', context)

boards/views/all_threads.py

@@ -1,134 +1,134 b''
 import string
 
-from django.core.urlresolvers import reverse
 from django.db import transaction
 from django.shortcuts import render, redirect
 
 from boards import utils
 from boards.abstracts.paginator import get_paginator
 from boards.forms import ThreadForm, PlainErrorList
 from boards.models import Post, Thread, Ban, Tag
 from boards.views.banned import BannedView
 from boards.views.base import BaseBoardView, PARAMETER_FORM
 from boards.views.posting_mixin import PostMixin
 import neboard
 
 TAG_DELIMITER = ' '
 
 PARAMETER_CURRENT_PAGE = 'current_page'
 PARAMETER_PAGINATOR = 'paginator'
 PARAMETER_THREADS = 'threads'
 
 TEMPLATE = 'boards/posting_general.html'
 DEFAULT_PAGE = 1
 
 
 class AllThreadsView(PostMixin, BaseBoardView):
 
     user = None
 
     def get(self, request, page=DEFAULT_PAGE, form=None):
         context = self.get_context_data(request=request)
 
-        self.user = context['user']
+        self.user = utils.get_user(request)
 
         if not form:
             form = ThreadForm(error_class=PlainErrorList)
 
         paginator = get_paginator(self.get_threads(),
                                   neboard.settings.THREADS_PER_PAGE)
         paginator.current_page = int(page)
 
         threads = paginator.page(page).object_list
 
         context[PARAMETER_THREADS] = threads
         context[PARAMETER_FORM] = form
 
         self._get_page_context(paginator, context, page)
 
         return render(request, TEMPLATE, context)
 
     def post(self, request, page=DEFAULT_PAGE):
         form = ThreadForm(request.POST, request.FILES,
                           error_class=PlainErrorList)
         form.session = request.session
 
         if form.is_valid():
             return self.create_thread(request, form)
         if form.need_to_ban:
             # Ban user because he is suspected to be a bot
             self._ban_current_user(request)
 
         return self.get(request, page, form)
 
     @staticmethod
     def _get_page_context(paginator, context, page):
         """
         Get pagination context variables
         """
 
         context[PARAMETER_PAGINATOR] = paginator
         context[PARAMETER_CURRENT_PAGE] = paginator.page(int(page))
 
-    def parse_tags_string(self, tag_strings):
+    @staticmethod
+    def parse_tags_string(tag_strings):
         """
         Parses tag list string and returns tag object list.
         """
 
         tags = []
 
         if tag_strings:
             tag_strings = tag_strings.split(TAG_DELIMITER)
             for tag_name in tag_strings:
                 tag_name = string.lower(tag_name.strip())
                 if len(tag_name) > 0:
                     tag, created = Tag.objects.get_or_create(name=tag_name)
                     tags.append(tag)
 
         return tags
 
     @transaction.atomic
     def create_thread(self, request, form, html_response=True):
         """
         Creates a new thread with an opening post.
         """
 
         ip = utils.get_client_ip(request)
         is_banned = Ban.objects.filter(ip=ip).exists()
 
         if is_banned:
             if html_response:
                 return redirect(BannedView().as_view())
             else:
                 return
 
         data = form.cleaned_data
 
         title = data['title']
         text = data['text']
 
         text = self._remove_invalid_links(text)
 
         if 'image' in data.keys():
             image = data['image']
         else:
             image = None
 
         tag_strings = data['tags']
 
         tags = self.parse_tags_string(tag_strings)
 
         post = Post.objects.create_post(title=title, text=text, ip=ip,
                                         image=image, tags=tags,
-                                        user=self._get_user(request))
+                                        user=utils.get_user(request))
 
         if html_response:
             return redirect(post.get_url())
 
     def get_threads(self):
         """
         Gets list of threads that will be shown on a page.
         """
 
         return Thread.objects.all().order_by('-bump_time')\
             .exclude(tags__in=self.user.hidden_tags.all())

boards/views/api.py

@@ -1,245 +1,245 b''
 from datetime import datetime
 import json
 import logging
 from django.db import transaction
 from django.http import HttpResponse
 from django.shortcuts import get_object_or_404, render
 from django.template import RequestContext
 from django.utils import timezone
 from django.core import serializers
 
 from boards.forms import PostForm, PlainErrorList
 from boards.models import Post, Thread, Tag
 from boards.utils import datetime_to_epoch
 from boards.views.thread import ThreadView
 
 __author__ = 'neko259'
 
 PARAMETER_TRUNCATED = 'truncated'
 PARAMETER_TAG = 'tag'
 PARAMETER_OFFSET = 'offset'
 PARAMETER_DIFF_TYPE = 'type'
 
 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, thread_id, last_update_time):
     """
     Gets posts that were changed or added since time
     """
 
     thread = get_object_or_404(Post, id=thread_id).get_thread()
 
     filter_time = datetime.fromtimestamp(float(last_update_time) / 1000000,
                                          timezone.get_current_timezone())
 
     json_data = {
         'added': [],
         'updated': [],
         'last_update': None,
     }
     added_posts = Post.objects.filter(thread_new=thread,
                                       pub_time__gt=filter_time) \
         .order_by('pub_time')
     updated_posts = Post.objects.filter(thread_new=thread,
                                         pub_time__lte=filter_time,
                                         last_edit_time__gt=filter_time)
 
     diff_type = DIFF_TYPE_HTML
     if PARAMETER_DIFF_TYPE in request.GET:
         diff_type = request.GET[PARAMETER_DIFF_TYPE]
 
     for post in added_posts:
         json_data['added'].append(_get_post_data(post.id, diff_type, request))
     for post in updated_posts:
         json_data['updated'].append(_get_post_data(post.id, diff_type, request))
     json_data['last_update'] = datetime_to_epoch(thread.last_edit_time)
 
     return HttpResponse(content=json.dumps(json_data))
 
 
 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)
+                                         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.
     """
 
     logger.info('Getting post #%s' % post_id)
 
     post = get_object_or_404(Post, id=post_id)
 
     context = RequestContext(request)
     context['post'] = post
     if PARAMETER_TRUNCATED in request.GET:
         context[PARAMETER_TRUNCATED] = True
 
     return render(request, 'boards/api_post.html', context)
 
 
 # TODO Test this
 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.threads.filter(archived=False)
     else: 
         threads = Thread.objects.filter(archived=False)
 
     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
         opening_posts.append(_get_post_data(opening_post.id,
-            include_last_update=True))
+                                            include_last_update=True))
 
     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 = Tag.objects.get_not_empty_tags()
     tag_names = []
     for tag in tags:
         tag_names.append(tag.name)
 
     return HttpResponse(content=json.dumps(tag_names))
 
 
 # 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(_get_post_data(post.id))
     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_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 get_tag_popularity(request, tag_name):
     tag = get_object_or_404(Tag, name=tag_name)
 
     json_data = []
     json_data['popularity'] = tag.get_popularity()
 
     return HttpResponse(content=json.dumps(json_data))
 
 
 # TODO Add pub time and replies
 def _get_post_data(post_id, format_type=DIFF_TYPE_JSON, request=None,
         include_last_update=False):
     if format_type == DIFF_TYPE_HTML:
         return get_post(request, post_id).content.strip()
     elif format_type == DIFF_TYPE_JSON:
         post = get_object_or_404(Post, id=post_id)
         post_json = {
             'id': post.id,
             'title': post.title,
             'text': post.text.rendered,
         }
         if post.image:
             post_json['image'] = post.image.url
             post_json['image_preview'] = post.image.url_200x150
         if include_last_update:
             post_json['bump_time'] = datetime_to_epoch(
-                    post.thread_new.bump_time)
+                post.thread_new.bump_time)
         return post_json

boards/views/ban.py

@@ -1,23 +1,24 b''
 from django.db import transaction
 from django.shortcuts import get_object_or_404
+from boards import utils
 
 from boards.views.base import BaseBoardView
 from boards.models import Post, Ban
 from boards.views.mixins import RedirectNextMixin
 
 
 class BanUserView(BaseBoardView, RedirectNextMixin):
 
     @transaction.atomic
     def get(self, request, post_id):
-        user = self._get_user(request)
+        user = utils.get_user(request)
         post = get_object_or_404(Post, id=post_id)
 
         if user.is_moderator():
             # TODO Show confirmation page before ban
             ban, created = Ban.objects.get_or_create(ip=post.poster_ip)
             if created:
                 ban.reason = 'Banned for post ' + str(post_id)
                 ban.save()
 
         return self.redirect_to_next(request)

boards/views/base.py

@@ -1,107 +1,35 b''
-from datetime import datetime, timedelta
-import hashlib
 from django.db import transaction
-from django.db.models import Count
 from django.template import RequestContext
-from django.utils import timezone
 from django.views.generic import View
+
 from boards import utils
-from boards.models import User, Post
-from boards.models.post import SETTING_MODERATE
-from boards.models.user import RANK_USER, Ban
-import neboard
+from boards.models.user import Ban
+
 
 BAN_REASON_SPAM = 'Autoban: spam bot'
 
 PARAMETER_FORM = 'form'
 
 
 class BaseBoardView(View):
 
     def get_context_data(self, **kwargs):
         request = kwargs['request']
-        context = self._default_context(request)
-
-        context['version'] = neboard.settings.VERSION
-        context['site_name'] = neboard.settings.SITE_NAME
-
-        return context
-
-    def _default_context(self, request):
-        """Create context with default values that are used in most views"""
-
+        # context = self._default_context(request)
         context = RequestContext(request)
 
-        user = self._get_user(request)
-        context['user'] = user
-        context['tags'] = user.fav_tags.all()
-        context['posts_per_day'] = float(Post.objects.get_posts_per_day())
-
-        theme = self._get_theme(request, user)
-        context['theme'] = theme
-        context['theme_css'] = 'css/' + theme + '/base_page.css'
-
-        # This shows the moderator panel
-        moderate = user.get_setting(SETTING_MODERATE)
-        if moderate == 'True':
-            context['moderator'] = user.is_moderator()
-        else:
-            context['moderator'] = False
-
         return context
 
-    def _get_user(self, request):
-        """
-        Get current user from the session. If the user does not exist, create
-        a new one.
-        """
-
-        session = request.session
-        if not 'user_id' in session:
-            request.session.save()
-
-            md5 = hashlib.md5()
-            md5.update(session.session_key)
-            new_id = md5.hexdigest()
-
-            while User.objects.filter(user_id=new_id).exists():
-                md5.update(str(timezone.now()))
-                new_id = md5.hexdigest()
-
-            time_now = timezone.now()
-            user = User.objects.create(user_id=new_id, rank=RANK_USER,
-                                       registration_time=time_now)
-
-            session['user_id'] = user.id
-        else:
-            user = User.objects.select_related('fav_tags').get(
-                id=session['user_id'])
-
-        return user
-
-    def _get_theme(self, request, user=None):
-        """
-        Get user's CSS theme
-        """
-
-        if not user:
-            user = self._get_user(request)
-        theme = user.get_setting('theme')
-        if not theme:
-            theme = neboard.settings.DEFAULT_THEME
-
-        return theme
-
     @transaction.atomic
     def _ban_current_user(self, request):
         """
         Add current user to the IP ban list
         """
 
         ip = utils.get_client_ip(request)
         ban, created = Ban.objects.get_or_create(ip=ip)
         if created:
             ban.can_read = False
             ban.reason = BAN_REASON_SPAM
         ban.save()
 

boards/views/delete_post.py

@@ -1,26 +1,27 b''
 from django.shortcuts import redirect, get_object_or_404
 from django.db import transaction
+from boards import utils
 
 from boards.views.base import BaseBoardView
 from boards.views.mixins import RedirectNextMixin
 from boards.models import Post
 
 
 class DeletePostView(BaseBoardView, RedirectNextMixin):
 
     @transaction.atomic
     def get(self, request, post_id):
-        user = self._get_user(request)
+        user = utils.get_user(request)
         post = get_object_or_404(Post, id=post_id)
 
         opening_post = post.is_opening()
 
         if user.is_moderator():
             # TODO Show confirmation page before deletion
             Post.objects.delete_post(post)
 
         if not opening_post:
             thread = post.thread_new
             return redirect('thread', post_id=thread.get_opening_post().id)
         else:
             return self.redirect_to_next(request)

boards/views/post_admin.py

@@ -1,57 +1,57 b''
 from django.shortcuts import render, get_object_or_404, redirect
 
 from boards.views.base import BaseBoardView
 from boards.views.mixins import DispatcherMixin
 from boards.models.post import Post
 from boards.models.tag import Tag
 from boards.forms import AddTagForm, PlainErrorList
 
 class PostAdminView(BaseBoardView, DispatcherMixin):
 
     def get(self, request, post_id, form=None):
-        user = self._get_user(request)
+        user = utils.get_user(request)
         if not user.is_moderator:
             redirect('index')
 
         post = get_object_or_404(Post, id=post_id)
 
         if not form:
             dispatch_result = self.dispatch_method(request, post)
             if dispatch_result:
                 return dispatch_result
             form = AddTagForm()
 
         context = self.get_context_data(request=request)
 
         context['post'] = post
 
         context['tag_form'] = form
 
         return render(request, 'boards/post_admin.html', context)
 
     def post(self, request, post_id):
-        user = self._get_user(request)
+        user = utils.get_user(request)
         if not user.is_moderator:
             redirect('index')
 
         post = get_object_or_404(Post, id=post_id)
         return self.dispatch_method(request, post)
 
     def delete_tag(self, request, post):
         tag_name = request.GET['tag']
         tag = get_object_or_404(Tag, name=tag_name)
 
         post.remove_tag(tag)
 
         return redirect('post_admin', post.id)
 
     def add_tag(self, request, post):
         form = AddTagForm(request.POST, error_class=PlainErrorList)
         if form.is_valid():
             tag_name = form.cleaned_data['tag']
             tag, created = Tag.objects.get_or_create(name=tag_name)
 
             post.add_tag(tag)
             return redirect('post_admin', post.id)
         else:
             return self.get(request, post.id, form)

boards/views/settings.py

@@ -1,52 +1,53 b''
 from django.db import transaction
 from django.shortcuts import render, redirect
+from boards import utils
 
 from boards.views.base import BaseBoardView, PARAMETER_FORM
 from boards.forms import SettingsForm, ModeratorSettingsForm, PlainErrorList
 from boards.models.post import SETTING_MODERATE
 
 
 class SettingsView(BaseBoardView):
 
     def get(self, request):
         context = self.get_context_data(request=request)
-        user = context['user']
+        user = utils.get_user(request)
         is_moderator = user.is_moderator()
 
-        selected_theme = context['theme']
+        selected_theme = utils.get_theme(request, user)
 
         if is_moderator:
             form = ModeratorSettingsForm(initial={
                 'theme': selected_theme,
-                'moderate': context['moderator']
+                'moderate': user.get_setting(SETTING_MODERATE) and \
+                            user.is_moderator()
             }, error_class=PlainErrorList)
         else:
             form = SettingsForm(initial={'theme': selected_theme},
                                 error_class=PlainErrorList)
 
         context[PARAMETER_FORM] = form
 
         return render(request, 'boards/settings.html', context)
 
     def post(self, request):
-        context = self.get_context_data(request=request)
-        user = context['user']
+        user = utils.get_user(request)
         is_moderator = user.is_moderator()
 
         with transaction.atomic():
             if is_moderator:
                 form = ModeratorSettingsForm(request.POST,
                                              error_class=PlainErrorList)
             else:
                 form = SettingsForm(request.POST, error_class=PlainErrorList)
 
             if form.is_valid():
                 selected_theme = form.cleaned_data['theme']
 
                 user.save_setting('theme', selected_theme)
 
                 if is_moderator:
                     moderate = form.cleaned_data['moderate']
                     user.save_setting(SETTING_MODERATE, moderate)
 
             return redirect('settings')

boards/views/static.py

@@ -1,13 +1,14 b''
 from django.shortcuts import render
 
 from boards.views.base import BaseBoardView
 
+
 class StaticPageView(BaseBoardView):
 
     def get(self, request, name):
         """
         Show a static page that needs only tags list and a CSS
         """
 
         context = self.get_context_data(request=request)
         return render(request, 'boards/staticpages/' + name + '.html', context)

boards/views/tag_threads.py

@@ -1,86 +1,87 b''
 from django.shortcuts import get_object_or_404
+from boards import utils
 from boards.models import Tag, Post
 from boards.views.all_threads import AllThreadsView, DEFAULT_PAGE
 from boards.views.mixins import DispatcherMixin, RedirectNextMixin
 from boards.forms import ThreadForm, PlainErrorList
 
 __author__ = 'neko259'
 
 
 class TagView(AllThreadsView, DispatcherMixin, RedirectNextMixin):
 
     tag_name = None
 
     def get_threads(self):
         tag = get_object_or_404(Tag, name=self.tag_name)
 
         return tag.threads.all().order_by('-bump_time')
 
     def get_context_data(self, **kwargs):
         context = super(TagView, self).get_context_data(**kwargs)
 
         tag = get_object_or_404(Tag, name=self.tag_name)
         context['tag'] = tag
 
         return context
 
     def get(self, request, tag_name, page=DEFAULT_PAGE, form=None):
         self.tag_name = tag_name
 
         dispatch_result = self.dispatch_method(request)
         if dispatch_result:
             return dispatch_result
         else:
             return super(TagView, self).get(request, page, form)
 
     def post(self, request, tag_name, page=DEFAULT_PAGE):
         form = ThreadForm(request.POST, request.FILES,
                           error_class=PlainErrorList)
         form.session = request.session
 
         if form.is_valid():
             return self.create_thread(request, form)
         if form.need_to_ban:
             # Ban user because he is suspected to be a bot
             self._ban_current_user(request)
 
         return self.get(request, tag_name, page, form)
 
     def subscribe(self, request):
-        user = self._get_user(request)
+        user = utils.get_user(request)
         tag = get_object_or_404(Tag, name=self.tag_name)
 
         if not tag in user.fav_tags.all():
             user.add_tag(tag)
 
         return self.redirect_to_next(request)
 
     def unsubscribe(self, request):
-        user = self._get_user(request)
+        user = utils.get_user(request)
         tag = get_object_or_404(Tag, name=self.tag_name)
 
         if tag in user.fav_tags.all():
             user.remove_tag(tag)
 
         return self.redirect_to_next(request)
 
     def hide(self, request):
         """
         Adds tag to user's hidden tags. Threads with this tag will not be
         shown.
         """
 
-        user = self._get_user(request)
+        user = utils.get_user(request)
         tag = get_object_or_404(Tag, name=self.tag_name)
 
         user.hide_tag(tag)
 
     def unhide(self, request):
         """
         Removed tag from user's hidden tags.
         """
 
-        user = self._get_user(request)
+        user = utils.get_user(request)
         tag = get_object_or_404(Tag, name=self.tag_name)
 
         user.unhide_tag(tag)

boards/views/thread.py

@@ -1,132 +1,133 b''
-import string
 from django.core.urlresolvers import reverse
 from django.db import transaction
 from django.http import Http404
 from django.shortcuts import get_object_or_404, render, redirect
 from django.views.generic.edit import FormMixin
+
 from boards import utils
 from boards.forms import PostForm, PlainErrorList
-from boards.models import Post, Ban, Tag
+from boards.models import Post, Ban
 from boards.views.banned import BannedView
 from boards.views.base import BaseBoardView, PARAMETER_FORM
 from boards.views.posting_mixin import PostMixin
 import neboard
 
+
 MODE_GALLERY = 'gallery'
 MODE_NORMAL = 'normal'
 
 PARAMETER_MAX_REPLIES = 'max_replies'
 PARAMETER_THREAD = 'thread'
 PARAMETER_BUMPABLE = 'bumpable'
 
 
 class ThreadView(BaseBoardView, PostMixin, FormMixin):
 
     def get(self, request, post_id, mode=MODE_NORMAL, form=None):
         try:
             opening_post = Post.objects.filter(id=post_id).only('thread_new')[0]
         except IndexError:
             raise Http404
 
         # If this is not OP, don't show it as it is
         if not opening_post or not opening_post.is_opening():
             raise Http404
 
         if not form:
             form = PostForm(error_class=PlainErrorList)
 
         thread_to_show = opening_post.get_thread()
 
         context = self.get_context_data(request=request)
 
         context[PARAMETER_FORM] = form
         context["last_update"] = utils.datetime_to_epoch(
             thread_to_show.last_edit_time)
         context[PARAMETER_THREAD] = thread_to_show
         context[PARAMETER_MAX_REPLIES] = neboard.settings.MAX_POSTS_PER_THREAD
 
         if MODE_NORMAL == mode:
             context[PARAMETER_BUMPABLE] = thread_to_show.can_bump()
             if context[PARAMETER_BUMPABLE]:
                 context['posts_left'] = neboard.settings.MAX_POSTS_PER_THREAD \
                         - thread_to_show.get_reply_count()
                 context['bumplimit_progress'] = str(
                     float(context['posts_left']) /
                     neboard.settings.MAX_POSTS_PER_THREAD * 100)
 
             context['opening_post'] = opening_post
 
             document = 'boards/thread.html'
         elif MODE_GALLERY == mode:
             posts = thread_to_show.get_replies(view_fields_only=True)
             context['posts'] = posts.filter(image_width__gt=0)
 
             document = 'boards/thread_gallery.html'
         else:
             raise Http404
 
         return render(request, document, context)
 
     def post(self, request, post_id, mode=MODE_NORMAL):
         opening_post = get_object_or_404(Post, id=post_id)
 
         # If this is not OP, don't show it as it is
         if not opening_post.is_opening():
             raise Http404
 
         if not opening_post.get_thread().archived:
             form = PostForm(request.POST, request.FILES,
                             error_class=PlainErrorList)
             form.session = request.session
 
             if form.is_valid():
                 return self.new_post(request, form, opening_post)
             if form.need_to_ban:
                 # Ban user because he is suspected to be a bot
                 self._ban_current_user(request)
 
             return self.get(request, post_id, mode, form)
 
     @transaction.atomic
     def new_post(self, request, form, opening_post=None, html_response=True):
         """Add a new post (in thread or as a reply)."""
 
         ip = utils.get_client_ip(request)
         is_banned = Ban.objects.filter(ip=ip).exists()
 
         if is_banned:
             if html_response:
                 return redirect(BannedView().as_view())
             else:
                 return None
 
         data = form.cleaned_data
 
         title = data['title']
         text = data['text']
 
         text = self._remove_invalid_links(text)
 
         if 'image' in data.keys():
             image = data['image']
         else:
             image = None
 
         tags = []
 
         post_thread = opening_post.get_thread()
 
         post = Post.objects.create_post(title=title, text=text, ip=ip,
                                         thread=post_thread, image=image,
                                         tags=tags,
-                                        user=self._get_user(request))
+                                        user=utils.get_user(request))
 
         thread_to_show = (opening_post.id if opening_post else post.id)
 
         if html_response:
             if opening_post:
                 return redirect(reverse(
                     'thread',
                     kwargs={'post_id': thread_to_show}) + '#' + str(post.id))
         else:
             return post

neboard/settings.py

@@ -1,259 +1,276 b''
 # Django settings for neboard project.
 import os
 from boards.mdx_neboard import markdown_extended
 
 DEBUG = True
 TEMPLATE_DEBUG = DEBUG
 
 ADMINS = (
     # ('Your Name', '[e-mail]'),
     ('admin', '[e-mail]')
 )
 
 MANAGERS = ADMINS
 
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
         'NAME': 'database.db',                      # Or path to database file if using sqlite3.
         'USER': '',                      # Not used with sqlite3.
         'PASSWORD': '',                  # Not used with sqlite3.
         'HOST': '',                      # Set to empty string for localhost. Not used with sqlite3.
         'PORT': '',                      # Set to empty string for default. Not used with sqlite3.
 	'CONN_MAX_AGE': None,
     }
 }
 
 # Local time zone for this installation. Choices can be found here:
 # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
 # although not all choices may be available on all operating systems.
 # In a Windows environment this must be set to your system time zone.
 TIME_ZONE = 'Europe/Kiev'
 
 # Language code for this installation. All choices can be found here:
 # http://www.i18nguy.com/unicode/language-identifiers.html
 LANGUAGE_CODE = 'en'
 
 SITE_ID = 1
 
 # If you set this to False, Django will make some optimizations so as not
 # to load the internationalization machinery.
 USE_I18N = True
 
 # If you set this to False, Django will not format dates, numbers and
 # calendars according to the current locale.
 USE_L10N = True
 
 # If you set this to False, Django will not use timezone-aware datetimes.
 USE_TZ = True
 
 # Absolute filesystem path to the directory that will hold user-uploaded files.
 # Example: "/home/media/media.lawrence.com/media/"
 MEDIA_ROOT = './media/' 
 
 # URL that handles the media served from MEDIA_ROOT. Make sure to use a
 # trailing slash.
 # Examples: "http://media.lawrence.com/media/", "http://example.com/media/"
 MEDIA_URL = '/media/'
 
 # Absolute path to the directory static files should be collected to.
 # Don't put anything in this directory yourself; store your static files
 # in apps' "static/" subdirectories and in STATICFILES_DIRS.
 # Example: "/home/media/media.lawrence.com/static/"
 STATIC_ROOT = ''
 
 # URL prefix for static files.
 # Example: "http://media.lawrence.com/static/"
 STATIC_URL = '/static/'
 
 # Additional locations of static files
 # It is really a hack, put real paths, not related
 STATICFILES_DIRS = (
     os.path.dirname(__file__) + '/boards/static',
 
 #    '/d/work/python/django/neboard/neboard/boards/static',
     # Put strings here, like "/home/html/static" or "C:/www/django/static".
     # Always use forward slashes, even on Windows.
     # Don't forget to use absolute paths, not relative paths.
 )
 
 # List of finder classes that know how to find static files in
 # various locations.
 STATICFILES_FINDERS = (
     'django.contrib.staticfiles.finders.FileSystemFinder',
     'django.contrib.staticfiles.finders.AppDirectoriesFinder',
 )
 
 if DEBUG:
     STATICFILES_STORAGE = \
         'django.contrib.staticfiles.storage.StaticFilesStorage'
 else:
     STATICFILES_STORAGE = \
         'django.contrib.staticfiles.storage.CachedStaticFilesStorage'
 
 # Make this unique, and don't share it with anybody.
 SECRET_KEY = '@1rc$o(7=tt#kd+4s$u6wchm**z^)4x90)7f6z(i&55@o11*8o'
 
 # List of callables that know how to import templates from various sources.
 TEMPLATE_LOADERS = (
     'django.template.loaders.filesystem.Loader',
     'django.template.loaders.app_directories.Loader',
 )
 
 TEMPLATE_CONTEXT_PROCESSORS = (
     'django.core.context_processors.media',
     'django.core.context_processors.static',
     'django.core.context_processors.request',
     'django.contrib.auth.context_processors.auth',
+    'boards.context_processors.user_and_ui_processor',
 )
 
 MIDDLEWARE_CLASSES = (
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.locale.LocaleMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'boards.middlewares.BanMiddleware',
     'boards.middlewares.MinifyHTMLMiddleware',
 )
 
 ROOT_URLCONF = 'neboard.urls'
 
 # Python dotted path to the WSGI application used by Django's runserver.
 WSGI_APPLICATION = 'neboard.wsgi.application'
 
 TEMPLATE_DIRS = (
     # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
     # Always use forward slashes, even on Windows.
     # Don't forget to use absolute paths, not relative paths.
     'templates',
 )
 
 INSTALLED_APPS = (
     'django.contrib.auth',
     'django.contrib.contenttypes',
     'django.contrib.sessions',
     # 'django.contrib.sites',
     'django.contrib.messages',
     'django.contrib.staticfiles',
     # Uncomment the next line to enable the admin:
-     'django.contrib.admin',
+    'django.contrib.admin',
     # Uncomment the next line to enable admin documentation:
     # 'django.contrib.admindocs',
     'django.contrib.humanize',
     'django_cleanup',
-    'boards',
-    'captcha',
+
+    # Migrations
     'south',
     'debug_toolbar',
+
+    'captcha',
+
+    # Search
+    'haystack',
+
+    'boards',
 )
 
 DEBUG_TOOLBAR_PANELS = (
     'debug_toolbar.panels.version.VersionDebugPanel',
     'debug_toolbar.panels.timer.TimerDebugPanel',
     'debug_toolbar.panels.settings_vars.SettingsVarsDebugPanel',
     'debug_toolbar.panels.headers.HeaderDebugPanel',
     'debug_toolbar.panels.request_vars.RequestVarsDebugPanel',
     'debug_toolbar.panels.template.TemplateDebugPanel',
     'debug_toolbar.panels.sql.SQLDebugPanel',
     'debug_toolbar.panels.signals.SignalDebugPanel',
     'debug_toolbar.panels.logger.LoggingPanel',
 )
 
 # TODO: NEED DESIGN FIXES
 CAPTCHA_OUTPUT_FORMAT = (u' %(hidden_field)s '
                          u'<div class="form-label">%(image)s</div>'
                          u'<div class="form-text">%(text_field)s</div>')
 
 # A sample logging configuration. The only tangible logging
 # performed by this configuration is to send an email to
 # the site admins on every HTTP 500 error when DEBUG=False.
 # See http://docs.djangoproject.com/en/dev/topics/logging for
 # more details on how to customize your logging configuration.
 LOGGING = {
     'version': 1,
     'disable_existing_loggers': False,
     'formatters': {
         'verbose': {
             'format': '%(levelname)s %(asctime)s %(module)s %(process)d %(thread)d %(message)s'
         },
         'simple': {
             'format': '%(levelname)s %(asctime)s [%(module)s] %(message)s'
         },
     },
     'filters': {
         'require_debug_false': {
             '()': 'django.utils.log.RequireDebugFalse'
         }
     },
     'handlers': {
         'console': {
             'level': 'DEBUG',
             'class': 'logging.StreamHandler',
             'formatter': 'simple'
         },
     },
     'loggers': {
         'boards': {
             'handlers': ['console'],
             'level': 'DEBUG',
         }
     },
 }
 
+HAYSTACK_CONNECTIONS = {
+    'default': {
+        'ENGINE': 'haystack.backends.whoosh_backend.WhooshEngine',
+        'PATH': os.path.join(os.path.dirname(__file__), 'whoosh_index'),
+    },
+}
+
+HAYSTACK_SIGNAL_PROCESSOR = 'haystack.signals.RealtimeSignalProcessor'
+
 MARKUP_FIELD_TYPES = (
     ('markdown', markdown_extended),
 )
 # Custom imageboard settings
 # TODO These should me moved to
 MAX_POSTS_PER_THREAD = 10  # Thread bumplimit
 MAX_THREAD_COUNT = 5  # Old threads will be deleted to preserve this count
 THREADS_PER_PAGE = 3
 SITE_NAME = 'Neboard'
 
 THEMES = [
     ('md', 'Mystic Dark'),
     ('md_centered', 'Mystic Dark (centered)'),
     ('sw', 'Snow White'),
     ('pg', 'Photon Gray'),
 ]
 
 DEFAULT_THEME = 'md'
 
 POPULAR_TAGS = 10
 LAST_REPLIES_COUNT = 3
 
 ENABLE_CAPTCHA = False
 # if user tries to post before CAPTCHA_DEFAULT_SAFE_TIME. Captcha will be shown
 CAPTCHA_DEFAULT_SAFE_TIME = 30  # seconds
 POSTING_DELAY = 20  # seconds
 
 COMPRESS_HTML = True
 
 VERSION = '1.7.4 Anubis'
 
 # Debug mode middlewares
 if DEBUG:
 
     SITE_NAME += ' DEBUG'
 
     MIDDLEWARE_CLASSES += (
         'boards.profiler.ProfilerMiddleware',
         'debug_toolbar.middleware.DebugToolbarMiddleware',
     )
 
     def custom_show_toolbar(request):
         return DEBUG
 
     DEBUG_TOOLBAR_CONFIG = {
         'INTERCEPT_REDIRECTS': False,
         'SHOW_TOOLBAR_CALLBACK': custom_show_toolbar,
         'HIDE_DJANGO_SQL': False,
         'ENABLE_STACKTRACES': True,
     }
 
     # FIXME Uncommenting this fails somehow. Need to investigate this
     #DEBUG_TOOLBAR_PANELS += (
     #    'debug_toolbar.panels.profiling.ProfilingDebugPanel',
     #)