Merged with default branch

boards/migrations/0019_auto_20150519_1323.py

@@ -0,0 +1,19 b''
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('boards', '0018_banner'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='post',
+            name='referenced_posts',
+            field=models.ManyToManyField(db_index=True, to='boards.Post', null=True, related_name='refposts', blank=True),
+        ),
+    ]

boards/migrations/0020_merge.py

@@ -0,0 +1,15 b''
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('boards', '0019_merge'),
+        ('boards', '0019_auto_20150519_1323'),
+    ]
+
+    operations = [
+    ]

boards/templates/boards/thread_tree.html

@@ -0,0 +1,19 b''
+{% extends "boards/thread.html" %}
+
+{% load i18n %}
+{% load static from staticfiles %}
+{% load board %}
+{% load tz %}
+
+{% block thread_content %}
+    {% get_current_language as LANGUAGE_CODE %}
+    {% get_current_timezone as TIME_ZONE %}
+
+    <div class="thread">
+        {% for post in thread.get_top_level_replies %}
+            {% post_view post moderator=moderator mode_tree=True %}
+        {% endfor %}
+    </div>
+
+    <script src="{% static 'js/thread.js' %}"></script>
+{% endblock %}

boards/views/thread/tree.py

@@ -0,0 +1,12 b''
+from boards.views.thread import ThreadView
+
+TEMPLATE_TREE = 'boards/thread_tree.html'
+
+
+class TreeThreadView(ThreadView):
+
+    def get_template(self):
+        return TEMPLATE_TREE
+
+    def get_mode(self):
+        return 'tree'

.hgtags

@@ -29,3 +29,7 b' d528d76d3242cced614fa11bb63f3d342e4e1d09'
 1b631781ced34fbdeec032e7674bc4e131724699 2.6.0
 0f2ef17dc0de678ada279bf7eedf6c5585f1fd7a 2.6.1
 d53fc814a424d7fd90f23025c87b87baa164450e 2.7.0
+836d8bb9fcd930b952b9a02029442c71c2441983 2.8.0
+dfb6c481b1a2c33705de9a9b5304bc924c46b202 2.8.1
+4a5bec08ccfb47a27f9e98698f12dd5b7246623b 2.8.2
+604935b98f5b5e4a5e903594f048046e1fbb3519 2.8.3

boards/abstracts/paginator.py

@@ -2,7 +2,7 b''
 
 from django.core.paginator import Paginator
 
-PAGINATOR_LOOKAROUND_SIZE = 3
+PAGINATOR_LOOKAROUND_SIZE = 2
 
 
 def get_paginator(*args, **kwargs):
@@ -14,9 +14,48 b' class DividedPaginator(Paginator):'
     lookaround_size = PAGINATOR_LOOKAROUND_SIZE
     current_page = 0
 
-    def center_range(self):
+    def _left_range(self):
+        return self.page_range[:self.lookaround_size]
+
+    def _right_range(self):
+        pages = self.num_pages-self.lookaround_size
+        if pages <= 0:
+            return []
+        else:
+            return self.page_range[pages:]
+
+    def _center_range(self):
         index = self.page_range.index(self.current_page)
 
-        start = max(0, index - self.lookaround_size)
-        end = min(len(self.page_range), index + self.lookaround_size + 1)
-        return self.page_range[start:end]
  No newline at end of file
+        start = max(self.lookaround_size, index - self.lookaround_size)
+        end = min(self.num_pages - self.lookaround_size, index + self.lookaround_size + 1)
+        return self.page_range[start:end]
+
+    def get_divided_range(self):
+        dr = list()
+
+        dr += self._left_range()
+        dr += self._center_range()
+        dr += self._right_range()
+
+        # Remove duplicates
+        dr = list(set(dr))
+        dr.sort()
+
+        return dr
+
+    def get_dividers(self):
+        dividers = []
+
+        prev_page = 1
+        for page in self.get_divided_range():
+            if page - prev_page > 1:
+                dividers.append(page)
+
+                # There can be no more than 2 dividers, so don't bother going
+                # further
+                if len(dividers) > 2:
+                    break
+            prev_page = page
+
+        return dividers

boards/abstracts/settingsmanager.py

@@ -71,7 +71,7 b' class SettingsManager:'
         tag_names = self.get_setting(SETTING_FAVORITE_TAGS)
         tags = []
         if tag_names:
-            tags = Tag.objects.filter(name__in=tag_names)
+            tags = list(Tag.objects.filter(name__in=tag_names))
         return tags
 
     def add_fav_tag(self, tag):
@@ -95,9 +95,7 b' class SettingsManager:'
         tag_names = self.get_setting(SETTING_HIDDEN_TAGS)
         tags = []
         if tag_names:
-            for tag_name in tag_names:
-                tag = get_object_or_404(Tag, name=tag_name)
-                tags.append(tag)
+            tags = list(Tag.objects.filter(name__in=tag_names))
 
         return tags
 

boards/config/default_settings.ini

@@ -1,6 +1,6 b''
 [Version]
-Version = 2.7.0 Chani
-SiteName = Neboard
+Version = 2.8.3 Charlie
+SiteName = Neboard DEV
 
 [Cache]
 # Timeout for caching, if cache is used

boards/forms.py

@@ -15,9 +15,12 b' from boards.models import Tag, Post'
 from neboard import settings
 import boards.settings as board_settings
 
+HEADER_CONTENT_LENGTH = 'content-length'
+HEADER_CONTENT_TYPE = 'content-type'
 
 CONTENT_TYPE_IMAGE = (
     'image/jpeg',
+    'image/jpg',
     'image/png',
     'image/gif',
     'image/bmp',
@@ -298,9 +301,9 b' class PostForm(NeboardForm):'
         try:
             # Verify content headers
             response_head = requests.head(url, verify=False)
-            content_type = response_head.headers['content-type'].split(';')[0]
+            content_type = response_head.headers[HEADER_CONTENT_TYPE].split(';')[0]
             if content_type in CONTENT_TYPE_IMAGE:
-                length_header = response_head.headers.get('content-length')
+                length_header = response_head.headers.get(HEADER_CONTENT_LENGTH)
                 if length_header:
                     length = int(length_header)
                     self.validate_image_size(length)

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-05-14 23:38+0300\n"
+"POT-Creation-Date: 2015-05-19 17:51+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"
@@ -189,7 +189,7 b' msgid "Create new thread"'
 msgstr "Создать новую тему"
 
 #: templates/boards/all_threads.html:118 templates/boards/preview.html:16
-#: templates/boards/thread_normal.html:43
+#: templates/boards/thread_normal.html:38
 msgid "Post"
 msgstr "Отправить"
 
@@ -199,7 +199,7 b' msgstr ""'
 "Метки должны быть разделены пробелами. Текст или изображение обязательны."
 
 #: templates/boards/all_threads.html:126
-#: templates/boards/thread_normal.html:48
+#: templates/boards/thread_normal.html:43
 msgid "Text syntax"
 msgstr "Синтаксис текста"
 
@@ -244,7 +244,6 b' msgid "tags"'
 msgstr "метки"
 
 #: templates/boards/base.html:40
-#| msgid "Search"
 msgid "search"
 msgstr "поиск"
 
@@ -298,15 +297,15 b' msgstr "\xd0\x98\xd0\xb7\xd0\xbc\xd0\xb5\xd0\xbd\xd0\xb8\xd1\x82\xd1\x8c"'
 msgid "Edit thread"
 msgstr "Изменить тему"
 
-#: templates/boards/post.html:77
+#: templates/boards/post.html:84
 msgid "Replies"
 msgstr "Ответы"
 
-#: templates/boards/post.html:89 templates/boards/thread.html:26
+#: templates/boards/post.html:97 templates/boards/thread.html:37
 msgid "messages"
 msgstr "сообщений"
 
-#: templates/boards/post.html:90 templates/boards/thread.html:27
+#: templates/boards/post.html:98 templates/boards/thread.html:38
 msgid "images"
 msgstr "изображений"
 
@@ -388,37 +387,42 b' msgstr "\xd0\x9c\xd0\xb5\xd1\x82\xd0\xba\xd0\xb8 \xd0\xbd\xd0\xb5 \xd0\xbd\xd0\xb0\xd0\xb9\xd0\xb4\xd0\xb5\xd0\xbd\xd1\x8b."'
 msgid "All tags"
 msgstr "Все метки"
 
-#: templates/boards/thread.html:28
+#: templates/boards/thread.html:15
+#| msgid "Normal mode"
+msgid "Normal"
+msgstr "Нормальный"
+
+#: templates/boards/thread.html:16
+#| msgid "Gallery mode"
+msgid "Gallery"
+msgstr "Галерея"
+
+#: templates/boards/thread.html:17
+#| msgid "Tree mode"
+msgid "Tree"
+msgstr "Дерево"
+
+#: templates/boards/thread.html:39
 msgid "Last update: "
 msgstr "Последнее обновление: "
 
-#: templates/boards/thread_gallery.html:19
-#: templates/boards/thread_normal.html:13
-msgid "Normal mode"
-msgstr "Нормальный режим"
-
-#: templates/boards/thread_gallery.html:20
-#: templates/boards/thread_normal.html:14
-msgid "Gallery mode"
-msgstr "Режим галереи"
-
-#: templates/boards/thread_gallery.html:41
+#: templates/boards/thread_gallery.html:36
 msgid "No images."
 msgstr "Нет изображений."
 
-#: templates/boards/thread_normal.html:22
+#: templates/boards/thread_normal.html:17
 msgid "posts to bumplimit"
 msgstr "сообщений до бамплимита"
 
-#: templates/boards/thread_normal.html:36
+#: templates/boards/thread_normal.html:31
 msgid "Reply to thread"
 msgstr "Ответить в тему"
 
-#: templates/boards/thread_normal.html:49
+#: templates/boards/thread_normal.html:44
 msgid "Close form"
 msgstr "Закрыть форму"
 
-#: templates/boards/thread_normal.html:63
+#: templates/boards/thread_normal.html:58
 msgid "Update"
 msgstr "Обновить"
 

boards/management/commands/generate_keypair.py

@@ -17,6 +17,5 b' class Command(BaseCommand):'
             primary=first_key)
         print(key)
 
-        if first_key:
-            for post in Post.objects.filter(global_id=None):
-                post.set_global_id()
  No newline at end of file
+        for post in Post.objects.filter(global_id=None):
+            post.set_global_id()

boards/mdx_neboard.py

@@ -160,6 +160,17 b' def render_notification(tag_name, value,'
         reverse('notifications', kwargs={'username': username}), username)
 
 
+def render_tag(tag_name, value, options, parent, context):
+    tag_name = value.lower()
+
+    try:
+        url = boards.models.Tag.objects.get(name=tag_name).get_view()
+    except ObjectDoesNotExist:
+        url = tag_name
+
+    return url
+
+
 formatters = [
     QuotePattern,
     SpoilerPattern,
@@ -188,6 +199,7 b' class Parser:'
         self.parser.add_formatter('post', render_reflink, strip=True)
         self.parser.add_formatter('quote', render_quote, strip=True)
         self.parser.add_formatter('user', render_notification, strip=True)
+        self.parser.add_formatter('tag', render_tag, strip=True)
         self.parser.add_simple_formatter(
             'comment', '<span class="comment">//%(value)s</span>')
         self.parser.add_simple_formatter(

boards/models/post/__init__.py

@@ -7,7 +7,7 b' import uuid'
 from django.core.exceptions import ObjectDoesNotExist
 from django.core.urlresolvers import reverse
 from django.db import models, transaction
-from django.db.models import TextField
+from django.db.models import TextField, QuerySet
 from django.template.loader import render_to_string
 from django.utils import timezone
 
@@ -44,7 +44,6 b" REGEX_GLOBAL_REPLY = re.compile(r'\\[post"
 REGEX_URL = re.compile(r'https?\://[a-zA-Z0-9\-\.]+\.[a-zA-Z]{2,3}(/\S*)?')
 REGEX_NOTIFICATION = re.compile(r'\[user\](\w+)\[/user\]')
 
-
 PARAMETER_TRUNCATED = 'truncated'
 PARAMETER_TAG = 'tag'
 PARAMETER_OFFSET = 'offset'
@@ -59,7 +58,14 b" PARAMETER_NEED_OPEN_LINK = 'need_open_li"
 PARAMETER_REPLY_LINK = 'reply_link'
 PARAMETER_NEED_OP_DATA = 'need_op_data'
 
-DIFF_TYPE_HTML = 'html'
+POST_VIEW_PARAMS = (
+    'need_op_data',
+    'reply_link',
+    'moderator',
+    'need_open_link',
+    'truncated',
+    'mode_tree',
+)
 
 REFMAP_STR = '<a href="{}">&gt;&gt;{}</a>'
 
@@ -67,7 +73,7 b' REFMAP_STR = \'<a href="{}">&gt;&gt;{}</a'
 class PostManager(models.Manager):
     @transaction.atomic
     def create_post(self, title: str, text: str, image=None, thread=None,
-            ip=NO_IP, tags: list=None, threads: list=None):
+            ip=NO_IP, tags: list=None, opening_posts: list=None):
         """
         Creates new post
         """
@@ -80,13 +86,14 b' class PostManager(models.Manager):'
 
         if not tags:
             tags = []
-        if not threads:
-            threads = []
+        if not opening_posts:
+            opening_posts = []
 
         posting_time = timezone.now()
         if not thread:
             thread = boards.models.thread.Thread.objects.create(
                 bump_time=posting_time, last_edit_time=posting_time)
+            list(map(thread.tags.add, tags))
             new_thread = True
         else:
             new_thread = False
@@ -110,8 +117,6 b' class PostManager(models.Manager):'
         if image:
             post.images.add(PostImage.objects.create_with_hash(image))
 
-        list(map(thread.add_tag, tags))
-
         if new_thread:
             boards.models.thread.Thread.objects.process_oldest_threads()
         else:
@@ -119,8 +124,9 b' class PostManager(models.Manager):'
             thread.bump()
             thread.save()
 
+        post.build_url()
         post.connect_replies()
-        post.connect_threads(threads)
+        post.connect_threads(opening_posts)
         post.connect_notifications()
 
         post.build_url()
@@ -183,7 +189,7 b' class Post(models.Model, Viewable):'
 
     referenced_posts = models.ManyToManyField('Post', symmetrical=False,
                                               null=True,
-                                              blank=True, related_name='rfp+',
+                                              blank=True, related_name='refposts',
                                               db_index=True)
     refmap = models.TextField(null=True, blank=True)
     threads = models.ManyToManyField('Thread', db_index=True)
@@ -202,6 +208,11 b' class Post(models.Model, Viewable):'
     def __str__(self):
         return 'P#{}/{}'.format(self.id, self.title)
 
+    def get_referenced_posts(self):
+        threads = self.get_threads().all()
+        return self.referenced_posts.filter(threads__in=threads)\
+                .order_by('pub_time').distinct().all()
+
     def get_title(self) -> str:
         """
         Gets original post title or part of its text.
@@ -235,20 +246,26 b' class Post(models.Model, Viewable):'
         return self.get_thread().get_opening_post_id() == self.id
 
     def get_absolute_url(self):
-        return self.url
+        if self.url:
+            return self.url
+        else:
+            opening_id = self.get_thread().get_opening_post_id()
+            post_url = reverse('thread', kwargs={'post_id': opening_id})
+            if self.id != opening_id:
+                post_url += '#' + str(self.id)
+            return post_url
 
     def get_thread(self):
         return self.thread
 
-    def get_threads(self) -> list:
+    def get_threads(self) -> QuerySet:
         """
         Gets post's thread.
         """
 
         return self.threads
 
-    def get_view(self, moderator=False, need_open_link=False,
-                 truncated=False, reply_link=False, *args, **kwargs) -> str:
+    def get_view(self, *args, **kwargs) -> str:
         """
         Renders post's HTML view. Some of the post params can be passed over
         kwargs for the means of caching (if we view the thread, some params
@@ -269,19 +286,21 b' class Post(models.Model, Viewable):'
         elif not thread.can_bump():
             css_class += ' dead_post'
 
-        return render_to_string('boards/post.html', {
+        params = dict()
+        for param in POST_VIEW_PARAMS:
+            if param in kwargs:
+                params[param] = kwargs[param]
+
+        params.update({
             PARAMETER_POST: self,
-            PARAMETER_MODERATOR: moderator,
             PARAMETER_IS_OPENING: is_opening,
             PARAMETER_THREAD: thread,
             PARAMETER_CSS_CLASS: css_class,
-            PARAMETER_NEED_OPEN_LINK: need_open_link,
-            PARAMETER_TRUNCATED: truncated,
             PARAMETER_OP_ID: opening_post_id,
-            PARAMETER_REPLY_LINK: reply_link,
-            PARAMETER_NEED_OP_DATA: kwargs.get(PARAMETER_NEED_OP_DATA)
         })
 
+        return render_to_string('boards/post.html', params)
+
     def get_search_view(self, *args, **kwargs):
         return self.get_view(need_op_data=True, *args, **kwargs)
 
@@ -399,12 +418,7 b' class Post(models.Model, Viewable):'
                     pass
 
     def build_url(self):
-        thread = self.get_thread()
-        opening_id = thread.get_opening_post_id()
-        post_url = reverse('thread', kwargs={'post_id': opening_id})
-        if self.id != opening_id:
-            post_url += '#' + str(self.id)
-        self.url = post_url
+        self.url = self.get_absolute_url()
         self.save(update_fields=['url'])
 
     def save(self, force_insert=False, force_update=False, using=None,
@@ -417,11 +431,9 b' class Post(models.Model, Viewable):'
 
         if self.id:
             for thread in self.get_threads().all():
-                if thread.can_bump():
-                    thread.update_bump_status(exclude_posts=[self])
                 thread.last_edit_time = self.last_edit_time
 
-                thread.save(update_fields=['last_edit_time', 'bumpable'])
+                thread.save(update_fields=['last_edit_time'])
 
         super().save(force_insert, force_update, using, update_fields)
 
@@ -466,11 +478,6 b' class Post(models.Model, Viewable):'
                 pass
 
     def connect_threads(self, opening_posts):
-        """
-        If the referenced post is an OP in another thread,
-        make this post multi-thread.
-        """
-
         for opening_post in opening_posts:
             threads = opening_post.get_threads().all()
             for thread in threads:
@@ -479,5 +486,4 b' class Post(models.Model, Viewable):'
 
                 thread.last_edit_time = self.last_edit_time
                 thread.save(update_fields=['last_edit_time', 'bumpable'])
-
-                self.threads.add(thread)
+            self.threads.add(opening_post.get_thread())

boards/models/post/sync.py

@@ -30,6 +30,7 b" ATTR_MIMETYPE = 'mimetype'"
 STATUS_SUCCESS = 'success'
 
 
+# TODO Make this fully static
 class SyncManager:
     def generate_response_get(self, model_list: list):
         response = et.Element(TAG_RESPONSE)

boards/models/thread.py

@@ -1,7 +1,7 b''
 import logging
 from adjacent import Client
 
-from django.db.models import Count, Sum
+from django.db.models import Count, Sum, QuerySet
 from django.utils import timezone
 from django.db import models
 
@@ -72,7 +72,7 b' class Thread(models.Model):'
     bumpable = models.BooleanField(default=True)
     max_posts = models.IntegerField(default=get_thread_max_posts)
 
-    def get_tags(self) -> list:
+    def get_tags(self) -> QuerySet:
         """
         Gets a sorted tag list.
         """
@@ -118,7 +118,7 b' class Thread(models.Model):'
 
         return self.bumpable and not self.archived
 
-    def get_last_replies(self) -> list:
+    def get_last_replies(self) -> QuerySet:
         """
         Gets several last replies, not including opening post
         """
@@ -145,7 +145,7 b' class Thread(models.Model):'
                                  reply_count - 1)
         return reply_count - last_replies_count - 1
 
-    def get_replies(self, view_fields_only=False) -> list:
+    def get_replies(self, view_fields_only=False) -> QuerySet:
         """
         Gets sorted thread posts
         """
@@ -156,7 +156,10 b' class Thread(models.Model):'
             query = query.defer('poster_ip')
         return query.all()
 
-    def get_replies_with_images(self, view_fields_only=False) -> list:
+    def get_top_level_replies(self) -> QuerySet:
+        return self.get_replies().exclude(refposts__threads__in=[self])
+
+    def get_replies_with_images(self, view_fields_only=False) -> QuerySet:
         """
         Gets replies that have at least one image attached
         """
@@ -164,14 +167,6 b' class Thread(models.Model):'
         return self.get_replies(view_fields_only).annotate(images_count=Count(
             'images')).filter(images_count__gt=0)
 
-    # TODO Do we still need this?
-    def add_tag(self, tag: Tag):
-        """
-        Connects thread to a tag and tag to a thread
-        """
-
-        self.tags.add(tag)
-
     def get_opening_post(self, only_id=False) -> Post:
         """
         Gets the first post of the thread
@@ -199,16 +194,6 b' class Thread(models.Model):'
 
         return self.get_opening_post().pub_time
 
-    def delete(self, using=None):
-        """
-        Deletes thread with all replies.
-        """
-
-        for reply in self.get_replies().all():
-            reply.delete()
-
-        super(Thread, self).delete(using)
-
     def __str__(self):
         return 'T#{}/{}'.format(self.id, self.get_opening_post_id())
 
@@ -216,13 +201,15 b' class Thread(models.Model):'
         return boards.models.Tag.objects.get_tag_url_list(self.get_tags())
 
     def update_posts_time(self, exclude_posts=None):
+        last_edit_time = self.last_edit_time
+
         for post in self.post_set.all():
-            if exclude_posts is not None and post not in exclude_posts:
+            if exclude_posts is None or post not in exclude_posts:
                 # Manual update is required because uids are generated on save
-                post.last_edit_time = self.last_edit_time
+                post.last_edit_time = last_edit_time
                 post.save(update_fields=['last_edit_time'])
 
-                post.threads.update(last_edit_time=self.last_edit_time)
+                post.get_threads().update(last_edit_time=last_edit_time)
 
     def notify_clients(self):
         if not settings.get_bool('External', 'WebsocketsEnabled'):

boards/static/css/base.css

@@ -99,3 +99,7 b' textarea, input {'
 .post-image-full {
     width: 100%;
 }
+
+#preview-text {
+    display: none;
+}

boards/static/css/md/base_page.css

@@ -232,11 +232,11 b' blockquote {'
 }
 
 .dead_post {
-    background-color: #442222;
+    border-left: solid 5px #982C2C;
 }
 
 .archive_post {
-    background-color: #000;
+    border-left: solid 5px #B7B7B7;
 }
 
 .mark_btn {
@@ -534,3 +534,22 b' ul {'
 .post-button-form > button:hover {
     text-decoration: underline;
 }
+
+.tree_reply > .post {
+    margin-left: 1ex;
+    margin-top: 1ex;
+    border-left: solid 1px #777;
+    border-right: solid 1px #777;
+}
+
+#preview-text {
+    border: solid 1px white;
+    margin: 1ex 0 1ex 0;
+    padding: 1ex;
+}
+
+button {
+    border: 1px solid white;
+    margin-bottom: .5ex;
+    margin-top: .5ex;
+}

boards/static/css/pg/base_page.css

@@ -28,7 +28,7 b' html {'
 }
 
 .link, a {
-    color: rgb(255, 102, 0);
+    color: #ff7000;
 }
 
 .block {
@@ -187,7 +187,11 b' blockquote {'
 }
 
 .dead_post {
-    background-color: #ecc;
+    border-top: solid #d5494f;
+}
+
+.archive_post {
+    border-top: solid #575e9f;
 }
 
 .quote {
@@ -366,3 +370,9 b' input[type="submit"]:hover {'
 .highlight {
     background-color: #F9E8A5;
 }
+
+#preview-text {
+    border: solid 1px black;
+    margin: 1ex 0 1ex 0;
+    padding: 1ex;
+}

boards/static/css/sw/base_page.css

@@ -401,3 +401,9 b' li {'
 .dead_post {
     border-right: 1ex solid #666;
 }
+
+#preview-text {
+    border: solid 1px white;
+    margin: 1ex 0 1ex 0;
+    padding: 1ex;
+}

boards/static/js/form.js

@@ -24,4 +24,20 b" var form = $('#form');"
     if (event.which == 13 && event.ctrlKey) {
         form.submit();
     }
-});
  No newline at end of file
+});
+
+$('#preview-button').click(function() {
+    var data = {
+        raw_text: $('textarea').val()
+    }
+
+    var diffUrl = '/api/preview/';
+
+    $.post(diffUrl,
+        data,
+        function(data) {
+            var previewTextBlock = $('#preview-text');
+            previewTextBlock.html(data);
+            previewTextBlock.show();
+        })
+})

boards/static/js/thread_update.js

@@ -104,10 +104,11 b' function getThreadDiff() {'
     }
 
     var data = {
-        uids: uids
+        uids: uids,
+        thread: threadId
     }
 
-    var diffUrl = '/api/diff_thread?thread=' + threadId;
+    var diffUrl = '/api/diff_thread/';
 
     $.post(diffUrl,
         data,
@@ -309,6 +310,7 b' function resetForm(form) {'
     form.find('input:radio, input:checkbox')
              .removeAttr('checked').removeAttr('selected');
     $('.file_wrap').find('.file-thumb').remove();
+    $('#preview-text').hide();
 }
 
 /**
@@ -373,6 +375,9 b' function processNewPost(post) {'
                     showAsErrors($('form'), gettext('Sending message...'));
                 },
                 success: updateOnPost,
+                error: function() {
+                    showAsErrors($('form'), gettext('Server error!'));
+                },
                 url: '/api/add_post/' + threadId + '/'
             };
 

boards/templates/boards/all_threads.html

@@ -122,12 +122,10 b''
             <div>
                 {% trans 'Tags must be delimited by spaces. Text or image is required.' %}
             </div>
-            <div>
-                <a href="{% url "staticpage" name="help" %}">{% trans 'Text syntax' %}</a>
-            </div>
-            <div>
-                <a href="{% url "tags" "required" %}">{% trans 'Tags' %}</a>
-            </div>
+            <div><button id="preview-button">{% trans 'Preview' %}</button></div>
+            <div id="preview-text"></div>
+            <div><a href="{% url "staticpage" name="help" %}">{% trans 'Text syntax' %}</a></div>
+            <div><a href="{% url "tags" "required" %}">{% trans 'Tags' %}</a></div>
         </div>
     </div>
 
@@ -141,36 +139,27 b''
     <span class="metapanel">
         <b><a href="{% url "authors" %}">{{ site_name }}</a> {{ version }}</b>
         {% trans "Pages:" %}
-        <a href="
-            {% if tag %}
-                {% url "tag" tag_name=tag.name page=paginator.page_range|first %}
-            {% else %}
-                {% url "index" page=paginator.page_range|first %}
-            {% endif %}
-        ">&lt;&lt;</a>
         [
-        {% for page in paginator.center_range %}
-            <a
-                {% ifequal page current_page.number %}
-                    class="current_page"
-                {% endifequal %}
-                href="
-            {% if tag %}
-                {% url "tag" tag_name=tag.name page=page %}
-            {% else %}
-                {% url "index" page=page %}
-            {% endif %}
-            ">{{ page }}</a>
-            {% if not forloop.last %},{% endif %}
-        {% endfor %}
+        {% with dividers=paginator.get_dividers %}
+            {% for page in paginator.get_divided_range %}
+                {% if page in dividers %}
+                    …,
+                {% endif %}
+                <a
+                    {% ifequal page current_page.number %}
+                        class="current_page"
+                    {% endifequal %}
+                    href="
+                {% if tag %}
+                {% url "tag" tag_name=tag.name %}?page={{ page }}
+                {% else %}
+                    {% url "index" %}?page={{ page }}
+                {% endif %}
+                ">{{ page }}</a>
+                {% if not forloop.last %},{% endif %}
+            {% endfor %}
+        {% endwith %}
         ]
-        <a href="
-            {% if tag %}
-                {% url "tag" tag_name=tag.name page=paginator.page_range|last %}
-            {% else %}
-                {% url "index" page=paginator.page_range|last %}
-            {% endif %}
-        ">&gt;&gt;</a>
         [<a href="rss/">RSS</a>]
     </span>
 

boards/templates/boards/feed.html

@@ -51,24 +51,21 b''
     <span class="metapanel">
         <b><a href="{% url "authors" %}">{{ site_name }}</a> {{ version }}</b>
         {% trans "Pages:" %}
-        <a href="
-            {% url "feed" page=paginator.page_range|first %}
-        ">&lt;&lt;</a>
         [
-        {% for page in paginator.center_range %}
-            <a
-                {% ifequal page current_page.number %}
-                    class="current_page"
-                {% endifequal %}
-                href="
-            {% url "feed" page=page %}
-            ">{{ page }}</a>
-            {% if not forloop.last %},{% endif %}
-        {% endfor %}
+        {% with dividers=paginator.get_dividers %}
+            {% for page in paginator.get_divided_range %}
+                {% if page in dividers %}
+                    …,
+                {% endif %}
+                <a
+                    {% ifequal page current_page.number %}
+                        class="current_page"
+                    {% endifequal %}
+                    href="{% url "feed" %}?page={{ page }}">{{ page }}</a>
+                {% if not forloop.last %},{% endif %}
+            {% endfor %}
+        {% endwith %}
         ]
-        <a href="
-            {% url "feed" page=paginator.page_range|last %}
-        ">&gt;&gt;</a>
     </span>
 
 {% endblock %}

boards/templates/boards/post.html

@@ -73,11 +73,19 b''
             {% endif %}
         {% endautoescape %}
         {% if post.is_referenced %}
-            <div class="refmap">
-                {% autoescape off %}
-                    {% trans "Replies" %}: {{ post.refmap }}
-                {% endautoescape %}
-            </div>
+            {% if mode_tree %}
+                <div class="tree_reply">
+                    {% for refpost in post.get_referenced_posts %}
+                        {% post_view refpost mode_tree=True %}
+                    {% endfor %}
+                </div>
+            {% else %}
+                <div class="refmap">
+                    {% autoescape off %}
+                        {% trans "Replies" %}: {{ post.refmap }}
+                    {% endautoescape %}
+                </div>
+            {% endif %}
         {% endif %}
     </div>
     {% comment %}

boards/templates/boards/staticpages/help.html

@@ -16,6 +16,7 b''
     <p>[comment]<span class="comment">{% trans 'Comment' %}</span>[/comment]</p>
     <p>[quote]<span class="quote">&gt;{% trans 'Quote' %}</span>[/quote]</p>
     <p>[quote source=src]<div class="multiquote"><div class="quote-header">src</div><div class="quote-text">{% trans 'Quote' %}</div></div><br />[/quote]</p>
+    <p>[tag]<a class="tag">tag</a>[/tag]</p>
     <br/>
     <p>{% trans 'You can try pasting the text and previewing the result here:' %} <a href="{% url 'preview' %}">{% trans 'Preview' %}</a></p>
 {% endblock %}

boards/templates/boards/thread.html

@@ -10,6 +10,17 b''
         - {{ site_name }}</title>
 {% endblock %}
 
+{% block content %}
+    <div class="image-mode-tab">
+        <a {% ifequal mode 'normal' %}class="current_mode"{% endifequal %} href="{% url 'thread' opening_post.id %}">{% trans 'Normal' %}</a>,
+        <a {% ifequal mode 'gallery' %}class="current_mode"{% endifequal %} href="{% url 'thread_gallery' opening_post.id %}">{% trans 'Gallery' %}</a>,
+        <a {% ifequal mode 'tree' %}class="current_mode"{% endifequal %} href="{% url 'thread_tree' opening_post.id %}">{% trans 'Tree' %}</a>
+    </div>
+
+    {% block thread_content %}
+    {% endblock %}
+{% endblock %}
+
 {% block metapanel %}
 
     <span class="metapanel"

boards/templates/boards/thread_gallery.html

@@ -11,15 +11,10 b''
         - {{ site_name }}</title>
 {% endblock %}
 
-{% block content %}
+{% block thread_content %}
     {% get_current_language as LANGUAGE_CODE %}
     {% get_current_timezone as TIME_ZONE %}
 
-    <div class="image-mode-tab">
-        <a href="{% url 'thread' thread.get_opening_post.id %}">{% trans 'Normal mode' %}</a>,
-        <a class="current_mode" href="{% url 'thread_gallery' thread.get_opening_post.id %}">{% trans 'Gallery mode' %}</a>
-    </div>
-
     <div id="posts-table">
         {% if posts %}
             {% for post in posts %}

boards/templates/boards/thread_normal.html

@@ -5,15 +5,10 b''
 {% load board %}
 {% load tz %}
 
-{% block content %}
+{% block thread_content %}
     {% get_current_language as LANGUAGE_CODE %}
     {% get_current_timezone as TIME_ZONE %}
 
-    <div class="image-mode-tab">
-        <a class="current_mode" href="{% url 'thread' opening_post.id %}">{% trans 'Normal mode' %}</a>,
-        <a href="{% url 'thread_gallery' opening_post.id %}">{% trans 'Gallery mode' %}</a>
-    </div>
-
     {% if bumpable and thread.has_post_limit %}
         <div class="bar-bg">
             <div class="bar-value" style="width:{{ bumplimit_progress }}%" id="bumplimit_progress">
@@ -44,6 +39,8 b''
                         </div>
                     </form>
                 </div>
+                <div><button id="preview-button">{% trans 'Preview' %}</button></div>
+                <div id="preview-text"></div>
                 <div><a href="{% url "staticpage" name="help" %}">
                     {% trans 'Text syntax' %}</a></div>
                 <div><a id="form-close-button" href="#" onClick="resetFormPosition(); return false;">{% trans 'Close form' %}</a></div>

boards/templatetags/board.py

@@ -36,7 +36,7 b' def image_actions(*args, **kwargs):'
         image_link = 'http://' + args[1] + image_link  # TODO https?
 
     return ', '.join([IMG_ACTION_URL.format(
-        action['link'] % image_link, action['name'])for action in actions])
+        action['link'] % image_link, action['name']) for action in actions])
 
 
 @register.simple_tag(name='post_view')

boards/tests/test_api.py

@@ -15,7 +15,7 b' class ApiTest(TestCase):'
                                                 tags=[tag])
 
         req = MockRequest()
-        req.GET['thread'] = opening_post.id
+        req.POST['thread'] = opening_post.id
         req.POST['uids'] = opening_post.uid
         # Check the exact timestamp post was added
         empty_response = api.api_get_threaddiff(req)
@@ -29,7 +29,7 b' class ApiTest(TestCase):'
                                          text='[post]%d[/post]\ntext' % opening_post.id,
                                          thread=opening_post.get_thread())
         req = MockRequest()
-        req.GET['thread'] = opening_post.id
+        req.POST['thread'] = opening_post.id
         req.POST['uids'] = ' '.join(uids)
         # Check the timestamp before post was added
         response = api.api_get_threaddiff(req)
@@ -40,7 +40,7 b' class ApiTest(TestCase):'
         # Reload post to get the new UID
         opening_post = Post.objects.get(id=opening_post.id)
         req = MockRequest()
-        req.GET['thread'] = opening_post.id
+        req.POST['thread'] = opening_post.id
         req.POST['uids'] = ' '.join([opening_post.uid, reply.uid])
         empty_response = api.api_get_threaddiff(req)
         diff = simplejson.loads(empty_response.content)

boards/tests/test_keys.py

@@ -3,7 +3,7 b' import logging'
 
 from django.test import TestCase
 from boards.models import KeyPair, GlobalId, Post
-
+from boards.models.post.sync import SyncManager
 
 logger = logging.getLogger(__name__)
 
@@ -56,7 +56,7 b' class KeyTest(TestCase):'
                                               text='[post]%d[/post]' % post.id,
                                               thread=post.get_thread())
 
-        response = Post.objects.generate_response_get([reply_post])
+        response = SyncManager().generate_response_get([reply_post])
         logger.debug(response)
 
         key = KeyPair.objects.get(primary=True)

boards/tests/test_post.py

@@ -1,5 +1,6 b''
 from django.core.paginator import Paginator
 from django.test import TestCase
+
 from boards import settings
 from boards.models import Tag, Post, Thread, KeyPair
 
@@ -145,8 +146,8 b' class PostTests(TestCase):'
                                         tags=[tag])
         thread = opening_post.get_thread()
 
-        reply1 = Post.objects.create_post(title='title', text='text', thread=thread)
-        reply2 = Post.objects.create_post(title='title', text='text', thread=thread)
+        Post.objects.create_post(title='title', text='text', thread=thread)
+        Post.objects.create_post(title='title', text='text', thread=thread)
 
         replies = thread.get_replies()
         self.assertTrue(len(replies) > 0, 'No replies found for thread.')
@@ -154,3 +155,45 b' class PostTests(TestCase):'
         replies = thread.get_replies(view_fields_only=True)
         self.assertTrue(len(replies) > 0,
                 'No replies found for thread with view fields only.')
+
+    def test_bumplimit(self):
+        """
+        Tests that the thread bumpable status is changed and post uids and
+        last update times are updated across all post threads.
+        """
+
+        op1 = Post.objects.create_post(title='title', text='text')
+        op2 = Post.objects.create_post(title='title', text='text')
+
+        thread1 = op1.get_thread()
+        thread1.max_posts = 5
+        thread1.save()
+
+        uid_1 = op1.uid
+        uid_2 = op2.uid
+
+        # Create multi reply
+        Post.objects.create_post(
+            title='title', text='text', thread=thread1,
+            opening_posts=[op1, op2])
+        thread_update_time_2 = op2.get_thread().last_edit_time
+        for i in range(6):
+            Post.objects.create_post(title='title', text='text',
+                                     thread=thread1)
+
+        self.assertFalse(op1.get_thread().can_bump(),
+                         'Thread is bumpable when it should not be.')
+        self.assertTrue(op2.get_thread().can_bump(),
+                        'Thread is not bumpable when it should be.')
+        self.assertNotEqual(
+            uid_1, Post.objects.get(id=op1.id).uid,
+            'UID of the first OP should be changed but it is not.')
+        self.assertEqual(
+            uid_2, Post.objects.get(id=op2.id).uid,
+            'UID of the first OP should not be changed but it is.')
+
+        self.assertNotEqual(
+            thread_update_time_2,
+            Thread.objects.get(id=op2.get_thread().id).last_edit_time,
+            'Thread last update time should change when the other thread '
+            'changes status.')

boards/tests/test_sync.py

@@ -1,6 +1,6 b''
 from boards.models import KeyPair, Post
 from boards.tests.mocks import MockRequest
-from boards.views.sync import respond_get
+from boards.views.sync import response_get
 
 __author__ = 'neko259'
 
@@ -18,7 +18,7 b' class SyncTest(TestCase):'
         post = Post.objects.create_post(title='test_title', text='test_text')
 
         request = MockRequest()
-        request.POST['xml'] = (
+        request.body = (
             '<request type="get" version="1.0">'
             '<model name="post" version="1.0">'
             '<id key="%s" local-id="%d" type="%s" />'
@@ -44,5 +44,5 b' class SyncTest(TestCase):'
                 post.title,
                 post.get_raw_text(),
                 post.get_pub_time_epoch(),
-            ) in respond_get(request).content.decode(),
+            ) in response_get(request).content.decode(),
             'Wrong response generated for the GET request.')

boards/urls.py

@@ -20,26 +20,20 b' js_info_dict = {'
 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'),
 
     # /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>\d+)/$', views.thread.normal.NormalThreadView.as_view(),
+    url(r'^thread/(?P<post_id>\d+)/$', views.thread.NormalThreadView.as_view(),
         name='thread'),
-    url(r'^thread/(?P<post_id>\d+)/mode/gallery/$', views.thread.gallery.GalleryThreadView.as_view(),
+    url(r'^thread/(?P<post_id>\d+)/mode/gallery/$', views.thread.GalleryThreadView.as_view(),
         name='thread_gallery'),
+    url(r'^thread/(?P<post_id>\d+)/mode/tree/$', views.thread.TreeThreadView.as_view(),
+        name='thread_tree'),
     # /feed/
     url(r'^feed/$', views.feed.FeedView.as_view(), name='feed'),
-    url(r'^feed/page/(?P<page>\w+)/$', views.feed.FeedView.as_view(),
-        name='feed'),
 
     url(r'^settings/$', settings.SettingsView.as_view(), name='settings'),
     url(r'^tags/(?P<query>\w+)?/?$', all_tags.AllTagsView.as_view(), name='tags'),
@@ -62,8 +56,7 b" urlpatterns = patterns('',"
 
     # API
     url(r'^api/post/(?P<post_id>\d+)/$', api.get_post, name="get_post"),
-    url(r'^api/diff_thread$',
-        api.api_get_threaddiff, name="get_thread_diff"),
+    url(r'^api/diff_thread/$', 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'),
@@ -73,6 +66,7 b" urlpatterns = patterns('',"
             name='add_post'),
     url(r'^api/notifications/(?P<username>\w+)/$', api.api_get_notifications,
             name='api_notifications'),
+    url(r'^api/preview/$', api.api_get_preview, name='preview'),
 
     # Sync protocol API
     url(r'^api/sync/pull/$', api.sync_pull, name='api_sync_pull'),

boards/views/all_threads.py

@@ -43,7 +43,9 b' class AllThreadsView(PostMixin, BaseBoar'
         self.settings_manager = None
         super(AllThreadsView, self).__init__()
 
-    def get(self, request, page=DEFAULT_PAGE, form: ThreadForm=None):
+    def get(self, request, form: ThreadForm=None):
+        page = request.GET.get('page', DEFAULT_PAGE)
+
         params = self.get_context_data(request=request)
 
         if not form:
@@ -67,7 +69,7 b' class AllThreadsView(PostMixin, BaseBoar'
 
         return render(request, TEMPLATE, params)
 
-    def post(self, request, page=DEFAULT_PAGE):
+    def post(self, request):
         form = ThreadForm(request.POST, request.FILES,
                           error_class=PlainErrorList)
         form.session = request.session
@@ -78,7 +80,7 b' class AllThreadsView(PostMixin, BaseBoar'
             # Ban user because he is suspected to be a bot
             self._ban_current_user(request)
 
-        return self.get(request, page, form)
+        return self.get(request, form)
 
     def get_page_context(self, paginator, params, page):
         """
@@ -95,14 +97,12 b' class AllThreadsView(PostMixin, BaseBoar'
             params[PARAMETER_NEXT_LINK] = self.get_next_page_link(current_page)
 
     def get_previous_page_link(self, current_page):
-        return reverse('index', kwargs={
-            'page': current_page.previous_page_number(),
-        })
+        return reverse('index') + '?page=' \
+                + str(current_page.previous_page_number())
 
     def get_next_page_link(self, current_page):
-        return reverse('index', kwargs={
-            'page': current_page.next_page_number(),
-        })
+        return reverse('index') + '?page=' \
+                + str(current_page.next_page_number())
 
     @staticmethod
     def parse_tags_string(tag_strings):
@@ -151,7 +151,7 b' class AllThreadsView(PostMixin, BaseBoar'
         tags = self.parse_tags_string(tag_strings)
 
         post = Post.objects.create_post(title=title, text=text, image=image,
-                                        ip=ip, tags=tags, threads=threads)
+                                        ip=ip, tags=tags, opening_posts=threads)
 
         # This is required to update the threads to which posts we have replied
         # when creating this one

boards/views/api.py

@@ -14,6 +14,7 b' from boards.models.post.sync import Sync'
 from boards.utils import datetime_to_epoch
 from boards.views.thread import ThreadView
 from boards.models.user import Notification
+from boards.mdx_neboard import Parser
 
 
 __author__ = 'neko259'
@@ -43,7 +44,7 b' def api_get_threaddiff(request):'
     Gets posts that were changed or added since time
     """
 
-    thread_id = request.GET.get(PARAMETER_THREAD)
+    thread_id = request.POST.get(PARAMETER_THREAD)
     uids_str = request.POST.get(PARAMETER_UIDS).strip()
     uids = uids_str.split(' ')
 
@@ -58,7 +59,8 b' def api_get_threaddiff(request):'
     diff_type = request.GET.get(PARAMETER_DIFF_TYPE, DIFF_TYPE_HTML)
 
     for post in posts:
-        json_data[PARAMETER_UPDATED].append(get_post_data(post.id, diff_type, request))
+        json_data[PARAMETER_UPDATED].append(get_post_data(post.id, diff_type,
+            request))
     json_data[PARAMETER_LAST_UPDATE] = str(thread.last_edit_time)
 
     return HttpResponse(content=json.dumps(json_data))
@@ -234,6 +236,13 b' def get_post_data(post_id, format_type=D'
                               include_last_update=include_last_update)
 
 
+def api_get_preview(request):
+    raw_text = request.POST['raw_text']
+
+    parser = Parser()
+    return HttpResponse(content=parser.parse(parser.preparse(raw_text)))
+
+
 # TODO Make a separate module for sync API methods
 def sync_pull(request):
     """

boards/views/feed.py

@@ -28,7 +28,9 b' DEFAULT_PAGE = 1'
 
 class FeedView(PostMixin, BaseBoardView):
 
-    def get(self, request, page=DEFAULT_PAGE):
+    def get(self, request):
+        page = request.GET.get('page', DEFAULT_PAGE)
+
         params = self.get_context_data(request=request)
 
         settings_manager = get_settings_manager(request)
@@ -61,11 +63,9 b' class FeedView(PostMixin, BaseBoardView)'
             params[PARAMETER_NEXT_LINK] = self.get_next_page_link(current_page)
 
     def get_previous_page_link(self, current_page):
-        return reverse('feed', kwargs={
-            'page': current_page.previous_page_number(),
-        })
+        return reverse('feed') + '?page={}'.format(
+                current_page.previous_page_number())
 
     def get_next_page_link(self, current_page):
-        return reverse('feed', kwargs={
-            'page': current_page.next_page_number(),
-        })
+        return reverse('feed') + '?page={}'.format(
+                current_page.next_page_number())

boards/views/tag_threads.py

@@ -52,22 +52,20 b' class TagView(AllThreadsView, Dispatcher'
     def get_previous_page_link(self, current_page):
         return reverse('tag', kwargs={
             'tag_name': self.tag_name,
-            'page': current_page.previous_page_number(),
-        })
+        }) + '?page=' + str(current_page.previous_page_number())
 
     def get_next_page_link(self, current_page):
         return reverse('tag', kwargs={
             'tag_name': self.tag_name,
-            'page': current_page.next_page_number(),
-        })
+        }) + '?page=' + str(current_page.next_page_number())
 
-    def get(self, request, tag_name, page=DEFAULT_PAGE, form=None):
+    def get(self, request, tag_name, form=None):
         self.tag_name = tag_name
 
-        return super(TagView, self).get(request, page, form)
+        return super(TagView, self).get(request, form)
 
 
-    def post(self, request, tag_name, page=DEFAULT_PAGE):
+    def post(self, request, tag_name):
         self.tag_name = tag_name
 
         if 'method' in request.POST:

boards/views/thread/__init__.py

@@ -1,3 +1,4 b''
 from boards.views.thread.thread import ThreadView
 from boards.views.thread.normal import NormalThreadView
 from boards.views.thread.gallery import GalleryThreadView
+from boards.views.thread.tree import TreeThreadView

boards/views/thread/gallery.py

@@ -17,3 +17,6 b' class GalleryThreadView(ThreadView):'
             view_fields_only=True)
 
         return params
+
+    def get_mode(self):
+        return 'gallery'

boards/views/thread/normal.py

@@ -1,9 +1,7 b''
-from boards import settings
 from boards.views.thread import ThreadView
 
 TEMPLATE_NORMAL = 'boards/thread_normal.html'
 
-CONTEXT_OP = 'opening_post'
 CONTEXT_BUMPLIMIT_PRG = 'bumplimit_progress'
 CONTEXT_POSTS_LEFT = 'posts_left'
 CONTEXT_BUMPABLE = 'bumpable'
@@ -14,6 +12,9 b' class NormalThreadView(ThreadView):'
     def get_template(self):
         return TEMPLATE_NORMAL
 
+    def get_mode(self):
+        return 'normal'
+
     def get_data(self, thread):
         params = dict()
 
@@ -26,6 +27,4 b' class NormalThreadView(ThreadView):'
             params[CONTEXT_BUMPLIMIT_PRG] = str(
                 float(left_posts) / max_posts * 100)
 
-        params[CONTEXT_OP] = thread.get_opening_post()
-
         return params

boards/views/thread/thread.py

@@ -21,6 +21,8 b" CONTEXT_WS_PROJECT = 'ws_project'"
 CONTEXT_WS_HOST = 'ws_host'
 CONTEXT_WS_PORT = 'ws_port'
 CONTEXT_WS_TIME = 'ws_token_time'
+CONTEXT_MODE = 'mode'
+CONTEXT_OP = 'opening_post'
 
 FORM_TITLE = 'title'
 FORM_TEXT = 'text'
@@ -51,6 +53,8 b' class ThreadView(BaseBoardView, PostMixi'
         params[CONTEXT_FORM] = form
         params[CONTEXT_LASTUPDATE] = str(thread_to_show.last_edit_time)
         params[CONTEXT_THREAD] = thread_to_show
+        params[CONTEXT_MODE] = self.get_mode()
+        params[CONTEXT_OP] = opening_post
 
         if settings.get_bool('External', 'WebsocketsEnabled'):
             token_time = format(timezone.now(), u'U')
@@ -107,7 +111,7 b' class ThreadView(BaseBoardView, PostMixi'
 
         post = Post.objects.create_post(title=title, text=text, image=image,
                                         thread=post_thread, ip=ip,
-                                        threads=threads)
+                                        opening_posts=threads)
         post.notify_clients()
 
         if html_response:
@@ -116,16 +120,19 b' class ThreadView(BaseBoardView, PostMixi'
         else:
             return post
 
-    def get_data(self, thread):
+    def get_data(self, thread) -> dict:
         """
         Returns context params for the view.
         """
 
-        pass
+        return dict()
 
-    def get_template(self):
+    def get_template(self) -> str:
         """
         Gets template to show the thread mode on.
         """
 
         pass
+
+    def get_mode(self) -> str:
+        pass

neboard/settings.py

@@ -83,7 +83,6 b' STATICFILES_DIRS = ('
 STATICFILES_FINDERS = (
     'django.contrib.staticfiles.finders.FileSystemFinder',
     'django.contrib.staticfiles.finders.AppDirectoriesFinder',
-    'compressor.finders.CompressorFinder',
 )
 
 if DEBUG:

readme.markdown

@@ -12,7 +12,7 b' Site: http://neboard.me/'
 1. Install all dependencies over pip or system-wide
 2. Setup a database in `neboard/settings.py`
 3. Run `./manage.py migrate` to apply all south migrations
-4. Apply config changes to `boards/settings/config.ini`. You can see the default settings in `boards/settings/default_config.ini`
+4. Apply config changes to `boards/config/config.ini`. You can see the default settings in `boards/config/default_config.ini`
 
 # RUNNING #
 
@@ -34,4 +34,4 b' You can also just clone the mercurial pr'
 
 # CONCLUSION #
 
-Enjoy our software and thank you!
  No newline at end of file
+Enjoy our software and thank you!

requirements.txt

@@ -2,8 +2,9 b' httplib2'
 simplejson
 requests
 adjacent
-haystack
+django-haystack
 pillow
 django>=1.8
 bbcode
-ecdsa
  No newline at end of file
+django-debug-toolbar
+pytz