Even more refactoring

boards/abstracts/constants.py

@@ -2,4 +2,6 b' import re'
 
 FILE_DIRECTORY = 'files/'
 REGEX_TAGS = re.compile(r'^[\w\s\d\']+$', re.UNICODE)
-REGEX_REPLY = re.compile(r'\[post\](\d+)\[/post\]')
  No newline at end of file
+REGEX_REPLY = re.compile(r'\[post\](\d+)\[/post\]')
+
+PARAM_PAGE = 'page'
  No newline at end of file

boards/views/all_threads.py

@@ -6,6 +6,7 b' from django.utils.decorators import meth'
 from django.views.decorators.csrf import csrf_protect
 
 from boards import settings
+from boards.abstracts.constants import PARAM_PAGE
 from boards.abstracts.paginator import get_paginator
 from boards.abstracts.settingsmanager import get_settings_manager, \
     SETTING_ONLY_FAVORITES
@@ -16,6 +17,10 b' from boards.views.mixins import FileUplo'
     DispatcherMixin, PARAMETER_METHOD
 from boards.settings import SECTION_VIEW, SECTION_FORMS
 
+ORDER_BUMP = 'bump'
+
+PARAM_ORDER = 'order'
+
 FORM_TAGS = 'tags'
 FORM_TEXT = 'text'
 FORM_TITLE = 'title'
@@ -47,29 +52,28 b' class AllThreadsView(FileUploadMixin, Ba'
 
     @method_decorator(csrf_protect)
     def get(self, request, form: ThreadForm=None):
-        page = request.GET.get('page', DEFAULT_PAGE)
+        page = request.GET.get(PARAM_PAGE, DEFAULT_PAGE)
 
         params = self.get_context_data(request=request)
 
         if not form:
             form = ThreadForm(error_class=PlainErrorList,
-                    initial={FORM_TAGS: self.tag_name})
+                              initial={FORM_TAGS: self.tag_name})
 
         self.settings_manager = get_settings_manager(request)
 
         threads = self.get_threads()
 
-        order = request.GET.get('order', 'bump')
-        if order == 'bump':
+        order = request.GET.get(PARAM_ORDER, ORDER_BUMP)
+        if order == ORDER_BUMP:
             threads = threads.order_by('-bump_time')
         else:
             threads = threads.filter(replies__opening=True)\
                 .order_by('-replies__pub_time')
-        filter = request.GET.get('filter')
         threads = threads.distinct()
 
-        paginator = get_paginator(threads,
-                                  settings.get_int(SECTION_VIEW, 'ThreadsPerPage'))
+        paginator = get_paginator(threads, settings.get_int(
+            SECTION_VIEW, 'ThreadsPerPage'))
         paginator.current_page = int(page)
 
         try:
@@ -93,7 +97,7 b' class AllThreadsView(FileUploadMixin, Ba'
         if PARAMETER_METHOD in request.POST:
             self.dispatch_method(request)
 
-            return redirect('index')  # FIXME Different for different modes
+            return self.get_reverse_url()
 
         form = ThreadForm(request.POST, request.FILES,
                           error_class=PlainErrorList)

boards/views/feed.py

@@ -2,6 +2,7 b' from django.urls import reverse'
 from django.shortcuts import render
 
 from boards import settings
+from boards.abstracts.constants import PARAM_PAGE
 from boards.abstracts.paginator import get_paginator
 from boards.abstracts.settingsmanager import get_settings_manager
 from boards.models import Post
@@ -101,7 +102,7 b' class FeedView(PaginatedMixin, BaseBoard'
     )
 
     def get(self, request):
-        page = request.GET.get('page', DEFAULT_PAGE)
+        page = request.GET.get(PARAM_PAGE, DEFAULT_PAGE)
 
         params = self.get_context_data(request=request)
 

boards/views/mixins.py

@@ -1,4 +1,5 b''
 import boards
+from boards.settings import SECTION_FORMS
 
 PARAM_NEXT = 'next'
 PARAMETER_METHOD = 'method'
@@ -36,7 +37,7 b' class DispatcherMixin:'
 
 class FileUploadMixin:
     def get_max_upload_size(self):
-        return boards.settings.get_int('Forms', 'MaxFileSize')
+        return boards.settings.get_int(SECTION_FORMS, 'MaxFileSize')
 
 
 class PaginatedMixin:

boards/views/notifications.py

@@ -1,17 +1,16 b''
 from django.shortcuts import render
 
+from boards.abstracts.constants import PARAM_PAGE
 from boards.abstracts.paginator import get_paginator
 from boards.abstracts.settingsmanager import get_settings_manager, \
-    SETTING_USERNAME, SETTING_LAST_NOTIFICATION_ID
+    SETTING_LAST_NOTIFICATION_ID
 from boards.models.user import Notification
 from boards.views.base import BaseBoardView
 
 DEFAULT_PAGE = '1'
 
 TEMPLATE = 'boards/notifications.html'
-PARAM_PAGE = 'page'
 PARAM_USERNAMES = 'notification_usernames'
-REQUEST_PAGE = 'page'
 RESULTS_PER_PAGE = 10
 
 
@@ -41,7 +40,7 b' class NotificationView(BaseBoardView):'
 
         paginator = get_paginator(posts, RESULTS_PER_PAGE)
 
-        page = int(request.GET.get(REQUEST_PAGE, DEFAULT_PAGE))
+        page = int(request.GET.get(PARAM_PAGE, DEFAULT_PAGE))
 
         params[PARAM_PAGE] = paginator.page(page)
         params[PARAM_USERNAMES] = notification_usernames

boards/views/tag_gallery.py

@@ -2,6 +2,7 b' from django.shortcuts import get_object_'
 from django.urls import reverse
 
 from boards import settings
+from boards.abstracts.constants import PARAM_PAGE
 from boards.abstracts.paginator import get_paginator
 from boards.models import TagAlias
 from boards.settings import SECTION_VIEW
@@ -16,7 +17,7 b" TEMPLATE = 'boards/tag_gallery.html'"
 class TagGalleryView(BaseBoardView, PaginatedMixin):
 
     def get(self, request, tag_name):
-        page = int(request.GET.get('page', 1))
+        page = int(request.GET.get(PARAM_PAGE, 1))
 
         params = dict()
         tag_alias = get_object_or_404(TagAlias, name=tag_name)

boards/views/utils.py

@@ -1,11 +1,11 b''
+from django.contrib.auth.decorators import permission_required
 from django.shortcuts import redirect
 from django.utils.decorators import method_decorator
 from django.views.decorators.csrf import csrf_protect
-from django.contrib.auth.decorators import permission_required
 
-from boards.views.base import BaseBoardView, CONTEXT_FORM
-from boards.views.mixins import DispatcherMixin, PARAMETER_METHOD
 from boards.models import Post, Ban
+from boards.views.base import BaseBoardView
+from boards.views.mixins import DispatcherMixin
 
 
 class UtilsView(BaseBoardView, DispatcherMixin):