Split thread view into separate views for each mode

boards/views/thread/__init__.py

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

boards/views/thread/gallery.py

@@ -0,0 +1,19 b''
+from boards.views.thread import ThreadView
+
+TEMPLATE_GALLERY = 'boards/thread_gallery.html'
+
+CONTEXT_POSTS = 'posts'
+
+
+class GalleryThreadView(ThreadView):
+
+    def get_template(self):
+        return TEMPLATE_GALLERY
+
+    def get_data(self, thread):
+        params = dict()
+
+        params[CONTEXT_POSTS] = thread.get_replies_with_images(
+            view_fields_only=True)
+
+        return params

boards/views/thread/normal.py

@@ -0,0 +1,38 b''
+from boards import settings
+from boards.views.thread import ThreadView
+
+TEMPLATE_NORMAL = 'boards/thread.html'
+
+CONTEXT_OP = 'opening_post'
+CONTEXT_BUMPLIMIT_PRG = 'bumplimit_progress'
+CONTEXT_POSTS_LEFT = 'posts_left'
+CONTEXT_BUMPABLE = 'bumpable'
+
+FORM_TITLE = 'title'
+FORM_TEXT = 'text'
+FORM_IMAGE = 'image'
+
+MODE_GALLERY = 'gallery'
+MODE_NORMAL = 'normal'
+
+
+class NormalThreadView(ThreadView):
+
+    def get_template(self):
+        return TEMPLATE_NORMAL
+
+    def get_data(self, thread):
+        params = dict()
+
+        bumpable = thread.can_bump()
+        params[CONTEXT_BUMPABLE] = bumpable
+        if bumpable:
+            left_posts = settings.MAX_POSTS_PER_THREAD \
+                         - thread.get_reply_count()
+            params[CONTEXT_POSTS_LEFT] = left_posts
+            params[CONTEXT_BUMPLIMIT_PRG] = str(
+                float(left_posts) / settings.MAX_POSTS_PER_THREAD * 100)
+
+        params[CONTEXT_OP] = thread.get_opening_post()
+
+        return params

boards/views/thread/thread.py

@@ -0,0 +1,135 b''
+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, settings
+from boards.forms import PostForm, PlainErrorList
+from boards.models import Post, Ban
+from boards.views.banned import BannedView
+from boards.views.base import BaseBoardView, CONTEXT_FORM
+from boards.views.posting_mixin import PostMixin
+import neboard
+
+TEMPLATE_GALLERY = 'boards/thread_gallery.html'
+TEMPLATE_NORMAL = 'boards/thread.html'
+
+CONTEXT_POSTS = 'posts'
+CONTEXT_OP = 'opening_post'
+CONTEXT_BUMPLIMIT_PRG = 'bumplimit_progress'
+CONTEXT_POSTS_LEFT = 'posts_left'
+CONTEXT_LASTUPDATE = "last_update"
+CONTEXT_MAX_REPLIES = 'max_replies'
+CONTEXT_THREAD = 'thread'
+CONTEXT_BUMPABLE = 'bumpable'
+CONTEXT_WS_TOKEN = 'ws_token'
+CONTEXT_WS_PROJECT = 'ws_project'
+CONTEXT_WS_HOST = 'ws_host'
+CONTEXT_WS_PORT = 'ws_port'
+
+FORM_TITLE = 'title'
+FORM_TEXT = 'text'
+FORM_IMAGE = 'image'
+
+
+class ThreadView(BaseBoardView, PostMixin, FormMixin):
+
+    def get(self, request, post_id, 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()
+
+        params = dict()
+
+        params[CONTEXT_FORM] = form
+        params[CONTEXT_LASTUPDATE] = str(utils.datetime_to_epoch(
+            thread_to_show.last_edit_time))
+        params[CONTEXT_THREAD] = thread_to_show
+        params[CONTEXT_MAX_REPLIES] = settings.MAX_POSTS_PER_THREAD
+
+        if settings.WEBSOCKETS_ENABLED:
+            params[CONTEXT_WS_TOKEN] = utils.get_websocket_token(
+                timestamp=params[CONTEXT_LASTUPDATE])
+            params[CONTEXT_WS_PROJECT] = neboard.settings.CENTRIFUGE_PROJECT_ID
+            params[CONTEXT_WS_HOST] = request.get_host().split(':')[0]
+            params[CONTEXT_WS_PORT] = neboard.settings.CENTRIFUGE_PORT
+
+        params.update(self.get_data(thread_to_show))
+
+        return render(request, self.get_template(), params)
+
+    def post(self, request, post_id):
+        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, form)
+
+    def new_post(self, request, form, opening_post=None, html_response=True):
+        """
+        Adds a new post (in thread or as a reply).
+        """
+
+        ip = utils.get_client_ip(request)
+
+        data = form.cleaned_data
+
+        title = data[FORM_TITLE]
+        text = data[FORM_TEXT]
+        image = data.get(FORM_IMAGE)
+
+        text = self._remove_invalid_links(text)
+
+        post_thread = opening_post.get_thread()
+
+        post = Post.objects.create_post(title=title, text=text, image=image,
+                                        thread=post_thread, ip=ip)
+        post.send_to_websocket(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
+
+    def get_data(self, thread):
+        """
+        Returns context params for the view.
+        """
+
+        pass
+
+    def get_template(self):
+        """
+        Gets template to show the thread mode on.
+        """
+
+        pass

boards/templates/boards/base.html

@@ -1,60 +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 'css/3party/highlight.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 header">
     <a class="link" href="{% url 'index' %}">{% trans "All threads" %}</a>
     {% for tag in tags %}
         {% autoescape off %}
-            {{ tag.get_view }}{% if not forloop.last %},{% endif %}
+            {{ tag.get_view }},
         {% endautoescape %}
     {% endfor %}
     <a href="{% url 'tags' %}" title="{% trans 'Tag management' %}"
             >[...]</a>,
         <a href="{% url 'search' %}" title="{% trans 'Search' %}">[S]</a>
     <a class="link" href="{% url 'settings' %}">{% trans 'Settings' %}</a>
 </div>
 
 {% block content %}{% endblock %}
 
 <script src="{% static 'js/3party/highlight.min.js' %}"></script>
 <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 footer">
     {% block metapanel %}{% endblock %}
     [<a href="{% url 'admin:index' %}">{% trans 'Admin' %}</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>
 
 </body>
 </html>

boards/templates/boards/thread.html

@@ -1,96 +1,96 b''
 {% extends "boards/base.html" %}
 
 {% load i18n %}
 {% load cache %}
 {% load static from staticfiles %}
 {% load board %}
 
 {% block head %}
     <title>{{ opening_post.get_title|striptags|truncatewords:10 }}
         - {{ site_name }}</title>
 {% endblock %}
 
 {% block content %}
     {% get_current_language as LANGUAGE_CODE %}
 
     {% cache 600 thread_view thread.id thread.last_edit_time moderator LANGUAGE_CODE %}
 
     <div class="image-mode-tab">
         <a class="current_mode" href="{% url 'thread' opening_post.id %}">{% trans 'Normal mode' %}</a>,
-        <a href="{% url 'thread_mode' opening_post.id 'gallery' %}">{% trans 'Gallery mode' %}</a>
+        <a href="{% url 'thread_gallery' opening_post.id %}">{% trans 'Gallery mode' %}</a>
     </div>
 
     {% if bumpable %}
         <div class="bar-bg">
             <div class="bar-value" style="width:{{ bumplimit_progress }}%" id="bumplimit_progress">
             </div>
             <div class="bar-text">
                 <span id="left_to_limit">{{ posts_left }}</span> {% trans 'posts to bumplimit' %}
             </div>
         </div>
     {% endif %}
 
     <div class="thread">
         {% with can_bump=thread.can_bump %}
         {% for post in thread.get_replies %}
             {% with is_opening=forloop.first %}
                 {% post_view post moderator=moderator is_opening=is_opening thread=thread bumpable=can_bump opening_post_id=opening_post.id %}
             {% endwith %}
         {% endfor %}
         {% endwith %}
     </div>
 
     {% if not thread.archived %}
         <div class="post-form-w" id="form">
             <script src="{% static 'js/panel.js' %}"></script>
             <div class="form-title">{% trans "Reply to thread" %} #{{ opening_post.id }}</div>
             <div class="post-form" id="compact-form">
                 <div class="swappable-form-full">
                     <form enctype="multipart/form-data" method="post"
                             >{% csrf_token %}
                         <div class="compact-form-text"></div>
                         {{ form.as_div }}
                         <div class="form-submit">
                             <input type="submit" value="{% trans "Post" %}"/>
                         </div>
                     </form>
                 </div>
                 <a onclick="swapForm(); return false;" href="#">
                     {% trans 'Switch mode' %}
                 </a>
                 <div><a href="{% url "staticpage" name="help" %}">
                     {% trans 'Text syntax' %}</a></div>
             </div>
         </div>
 
         <script src="{% static 'js/jquery.form.min.js' %}"></script>
         <script src="{% static 'js/thread_update.js' %}"></script>
         <script src="{% static 'js/3party/centrifuge.js' %}"></script>
     {% endif %}
 
     <script src="{% static 'js/form.js' %}"></script>
     <script src="{% static 'js/thread.js' %}"></script>
 
     {% endcache %}
 {% endblock %}
 
 {% block metapanel %}
 
     {% get_current_language as LANGUAGE_CODE %}
 
     <span class="metapanel"
           data-last-update="{{ last_update }}"
           data-ws-token="{{ ws_token }}"
           data-ws-project="{{ ws_project }}"
           data-ws-host="{{ ws_host }}"
           data-ws-port="{{ ws_port }}">
         {% cache 600 thread_meta thread.last_edit_time moderator LANGUAGE_CODE %}
             <span id="autoupdate">[-]</span>
             <span id="reply-count">{{ thread.get_reply_count }}</span>/{{ max_replies }} {% trans 'messages' %},
             <span id="image-count">{{ thread.get_images_count }}</span> {% trans 'images' %}.
             {% trans 'Last update: ' %}<span id="last-update">{{ thread.last_edit_time }}</span>
             [<a href="rss/">RSS</a>]
         {% endcache %}
     </span>
 
 {% endblock %}

boards/templates/boards/thread_gallery.html

@@ -1,66 +1,66 b''
 {% extends "boards/base.html" %}
 
 {% load i18n %}
 {% load cache %}
 {% load static from staticfiles %}
 {% load board %}
 
 {% block head %}
     <title>{{ thread.get_opening_post.get_title|striptags|truncatewords:10 }}
         - {{ site_name }}</title>
 {% endblock %}
 
 {% block content %}
     {% spaceless %}
     {% get_current_language as LANGUAGE_CODE %}
 
     {% cache 600 thread_gallery_view thread.id thread.last_edit_time LANGUAGE_CODE request.get_host %}
     <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_mode' thread.get_opening_post.id 'gallery' %}">{% trans 'Gallery mode' %}</a>
+        <a class="current_mode" href="{% url 'thread_gallery' thread.get_opening_post.id %}">{% trans 'Gallery mode' %}</a>
     </div>
 
     <div id="posts-table">
     {% for post in posts %}
         <div class="gallery_image">
         {% with post.get_first_image as image %}
             <div>
                 <a
                         class="thumb"
                         href="{{ image.image.url }}"><img
                         src="{{ image.image.url_200x150 }}"
                         alt="{{ post.id }}"
                         width="{{ image.pre_width }}"
                         height="{{ image.pre_height }}"
                         data-width="{{ image.width }}"
                         data-height="{{ image.height }}"/>
                 </a>
             </div>
             <div class="gallery_image_metadata">
                 {{ image.width }}x{{ image.height }}
                 {% image_actions image.image.url request.get_host %}
             </div>
         {% endwith %}
         </div>
     {% endfor %}
     </div>
     {% endcache %}
 
     {% endspaceless %}
 {% endblock %}
 
 {% block metapanel %}
 
     {% get_current_language as LANGUAGE_CODE %}
 
     <span class="metapanel" data-last-update="{{ last_update }}">
         {% cache 600 thread_meta thread.last_edit_time moderator LANGUAGE_CODE %}
             <span id="reply-count">{{ thread.get_reply_count }}</span>/{{ max_replies }}
             {% trans 'messages' %},
             <span id="image-count">{{ thread.get_images_count }}</span> {% trans 'images' %}.
             {% trans 'Last update: ' %}{{ thread.last_edit_time }}
             [<a href="rss/">RSS</a>]
         {% endcache %}
     </span>
 
 {% endblock %}

boards/urls.py

@@ -1,75 +1,75 b''
 from django.conf.urls import patterns, url, include
 from django.contrib import admin
 from boards import views
 from boards.rss import AllThreadsFeed, TagThreadsFeed, ThreadPostsFeed
 from boards.views import api, tag_threads, all_threads, \
     settings, all_tags
 from boards.views.authors import AuthorsView
 from boards.views.ban import BanUserView
 from boards.views.search import BoardSearchView
 from boards.views.static import StaticPageView
 from boards.views.preview import PostPreviewView
 
 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'),
 
     # /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(),
+    url(r'^thread/(?P<post_id>\w+)/$', views.thread.normal.NormalThreadView.as_view(),
         name='thread'),
-    url(r'^thread/(?P<post_id>\w+)/mode/(?P<mode>\w+)/$', views.thread.ThreadView
-        .as_view(), name='thread_mode'),
+    url(r'^thread/(?P<post_id>\w+)/mode/gallery/$', views.thread.gallery.GalleryThreadView.as_view(),
+        name='thread_gallery'),
 
     url(r'^settings/$', settings.SettingsView.as_view(), name='settings'),
     url(r'^tags/$', all_tags.AllTagsView.as_view(), name='tags'),
     url(r'^authors/$', AuthorsView.as_view(), name='authors'),
     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'),
 
     # Search
     url(r'^search/$', BoardSearchView.as_view(), name='search'),
 
     # Post preview
     url(r'^preview/$', PostPreviewView.as_view(), name='preview')
 
 )