Fixed tag threads view

boards/views/all_threads.py

@@ -1,137 +1,137 b''
 from django.db import transaction
 from django.shortcuts import render, redirect
 
 from boards import utils, settings
 from boards.abstracts.paginator import get_paginator
 from boards.abstracts.settingsmanager import get_settings_manager
 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, CONTEXT_FORM
 from boards.views.posting_mixin import PostMixin
 
 
 FORM_TAGS = 'tags'
 FORM_TEXT = 'text'
 FORM_TITLE = 'title'
 FORM_IMAGE = 'image'
 
 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):
 
     def __init__(self):
         self.settings_manager = None
         super(AllThreadsView, self).__init__()
 
     def get(self, request, page=DEFAULT_PAGE, form=None):
-        params = dict()
+        params = self.get_context_data(request=request)
 
         if not form:
             form = ThreadForm(error_class=PlainErrorList)
 
         self.settings_manager = get_settings_manager(request)
         paginator = get_paginator(self.get_threads(),
                                   settings.THREADS_PER_PAGE)
         paginator.current_page = int(page)
 
         threads = paginator.page(page).object_list
 
         params[PARAMETER_THREADS] = threads
         params[CONTEXT_FORM] = form
 
         self._get_page_context(paginator, params, page)
 
         return render(request, TEMPLATE, params)
 
     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)
 
     def _get_page_context(self, paginator, params, page):
         """
         Get pagination context variables
         """
 
         params[PARAMETER_PAGINATOR] = paginator
         params[PARAMETER_CURRENT_PAGE] = paginator.page(int(page))
 
     @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 = tag_name.strip().lower()
                 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[FORM_TITLE]
         text = data[FORM_TEXT]
         image = data.get(FORM_IMAGE)
 
         text = self._remove_invalid_links(text)
 
         tag_strings = data[FORM_TAGS]
 
         tags = self.parse_tags_string(tag_strings)
 
         post = Post.objects.create_post(title=title, text=text, image=image,
                                         ip=ip, tags=tags)
 
         # This is required to update the threads to which posts we have replied
         # when creating this one
         post.send_to_websocket(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.settings_manager.get_hidden_tags())

boards/views/base.py

@@ -1,39 +1,31 b''
 from django.db import transaction
 from django.template import RequestContext
 from django.views.generic import View
 
 from boards import utils
 from boards.models.user import Ban
 
 
 BAN_REASON_SPAM = 'Autoban: spam bot'
 
 CONTEXT_FORM = 'form'
 
 
 class BaseBoardView(View):
 
     def get_context_data(self, **kwargs):
-        """
-        This method is deprecated. You need to use dicts instead of context
-        instances in all places it is used now.
-        """
-
-        request = kwargs['request']
-        context = RequestContext(request)
-
-        return context
+        return dict()
 
     @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/not_found.py

@@ -1,18 +1,17 b''
 from django.shortcuts import render
 
 from boards.views.base import BaseBoardView
 
 
 class NotFoundView(BaseBoardView):
     """
     Page 404 (not found)
     """
 
     def get(self, request):
-        context = self.get_context_data(request=request)
+        params = self.get_context_data()
 
-        # TODO Use dict here
-        response = render(request, 'boards/404.html', context_instance=context)
+        response = render(request, 'boards/404.html', params)
         response.status_code = 404
 
         return response

boards/views/settings.py

@@ -1,41 +1,41 b''
 from django.db import transaction
 from django.shortcuts import render, redirect
 
 from boards.abstracts.settingsmanager import get_settings_manager
 from boards.views.base import BaseBoardView, CONTEXT_FORM
 from boards.forms import SettingsForm, PlainErrorList
 
 FORM_THEME = 'theme'
 
 CONTEXT_HIDDEN_TAGS = 'hidden_tags'
 
 
 class SettingsView(BaseBoardView):
 
     def get(self, request):
-        context = self.get_context_data(request=request)
+        params = self.get_context_data()
         settings_manager = get_settings_manager(request)
 
         selected_theme = settings_manager.get_theme()
 
         form = SettingsForm(initial={FORM_THEME: selected_theme},
                             error_class=PlainErrorList)
 
-        context[CONTEXT_FORM] = form
-        context[CONTEXT_HIDDEN_TAGS] = settings_manager.get_hidden_tags()
+        params[CONTEXT_FORM] = form
+        params[CONTEXT_HIDDEN_TAGS] = settings_manager.get_hidden_tags()
 
         # TODO Use dict here
-        return render(request, 'boards/settings.html', context_instance=context)
+        return render(request, 'boards/settings.html', params)
 
     def post(self, request):
         settings_manager = get_settings_manager(request)
 
         with transaction.atomic():
             form = SettingsForm(request.POST, error_class=PlainErrorList)
 
             if form.is_valid():
                 selected_theme = form.cleaned_data[FORM_THEME]
 
                 settings_manager.set_theme(selected_theme)
 
             return redirect('settings')

boards/views/static.py

@@ -1,17 +1,13 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)
-
-        # TODO Use dict here
-        return render(request, 'boards/staticpages/' + name + '.html',
-                      context_instance=context)
+        return render(request, 'boards/staticpages/' + name + '.html')

boards/views/tag_threads.py

@@ -1,95 +1,95 b''
 from django.shortcuts import get_object_or_404
 
 from boards.abstracts.settingsmanager import get_settings_manager
 from boards.models import Tag, Thread
 from boards.views.all_threads import AllThreadsView, DEFAULT_PAGE
 from boards.views.mixins import DispatcherMixin, RedirectNextMixin
 from boards.forms import ThreadForm, PlainErrorList
 
 PARAM_HIDDEN_TAGS = 'hidden_tags'
 PARAM_FAV_TAGS = 'fav_tags'
 PARAM_TAG = 'tag'
 
 __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.get_threads()
 
     def get_context_data(self, **kwargs):
-        context = super(TagView, self).get_context_data(**kwargs)
+        params = super(TagView, self).get_context_data(**kwargs)
 
         settings_manager = get_settings_manager(kwargs['request'])
 
         tag = get_object_or_404(Tag, name=self.tag_name)
-        context[PARAM_TAG] = tag
+        params[PARAM_TAG] = tag
 
-        context[PARAM_FAV_TAGS] = settings_manager.get_fav_tags()
-        context[PARAM_HIDDEN_TAGS] = settings_manager.get_hidden_tags()
+        params[PARAM_FAV_TAGS] = settings_manager.get_fav_tags()
+        params[PARAM_HIDDEN_TAGS] = settings_manager.get_hidden_tags()
 
-        return context
+        return params
 
     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):
         tag = get_object_or_404(Tag, name=self.tag_name)
 
         settings_manager = get_settings_manager(request)
         settings_manager.add_fav_tag(tag)
 
         return self.redirect_to_next(request)
 
     def unsubscribe(self, request):
         tag = get_object_or_404(Tag, name=self.tag_name)
 
         settings_manager = get_settings_manager(request)
         settings_manager.del_fav_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.
         """
 
         tag = get_object_or_404(Tag, name=self.tag_name)
 
         settings_manager = get_settings_manager(request)
         settings_manager.add_hidden_tag(tag)
 
     def unhide(self, request):
         """
         Removed tag from user's hidden tags.
         """
 
         tag = get_object_or_404(Tag, name=self.tag_name)
 
         settings_manager = get_settings_manager(request)
         settings_manager.del_hidden_tag(tag)