Neboard - {{ tag.name }}

- {% else %} -

- {% endif %} +

{% if thread.op.image %}

{{ thread.op.title }} ({{ thread.op.id }}) - [{{ thread.op.pub_time }}] + [{{ thread.op.pub_time }}] — [{{ thread.thread.last_edit_time }}] + [{% trans "Reply" %}] + {% url 'thread' thread.op.id %}">{% trans "Open" %}] {% if moderator %} @@ -122,7 +93,8 @@ {% endif %}

- {{ thread.thread.get_images_count }} {% trans 'images' %}. + {{ thread.thread.get_images_count }} {% trans 'images' %}, + {{ thread.thread.get_reply_count }} {% trans 'replies' %}. {% if thread.thread.tags %} {% for tag in thread.thread.get_tags %} @@ -135,72 +107,13 @@ {% endif %}

- {% if thread.last_replies.exists %} - {% if thread.skipped_replies %} -

- - {% blocktrans with count=thread.skipped_replies %}Skipped {{ count }} replies. Open thread to see all replies.{% endblocktrans %} - -

- {% endif %} -

- {% for post in thread.last_replies %} - {% if thread.bumpable %} -

- {% else %} -

- {% endif %} - {% if post.image %} -

- -

- {% endif %} -

- {{ post.title }} - - ({{ post.id }}) - [{{ post.pub_time }}] -

- {% autoescape off %} - {{ post.text.rendered|truncatewords_html:50 }} - {% endautoescape %} -

- {% if post.is_referenced %} -

- {% trans "Replies" %}: - {% for ref_post in post.get_sorted_referenced_posts %} - >>{{ ref_post.id }}{% if not forloop.last %},{% endif %} - {% endfor %} -

- {% endif %} -

- {% endfor %} -

- {% endif %}

{% endcache %} {% endfor %} - {% if next_page %} + {% if current_page.has_next %}

- {% trans "Next page" %} + {% trans "Next page" %}

{% endif %} {% else %} @@ -208,42 +121,20 @@ {% trans 'No threads exist. Create the first one!' %}

{% endif %} -

- -

{% trans "Create new thread" %}

- -

- {% trans 'Tags must be delimited by spaces. Text or image is required.' %} -

- {% trans 'Text syntax' %}

- {% endblock %} {% block metapanel %} - Neboard 1.5 Aker + Neboard 1.6 Amon {% trans "Pages:" %}[ - {% for page in pages %} + {% for page in paginator.page_range %} {{ page }} {% if not forloop.last %},{% endif %} {% endfor %} diff --git a/boards/templates/boards/base.html b/boards/templates/boards/base.html --- a/boards/templates/boards/base.html +++ b/boards/templates/boards/base.html @@ -48,6 +48,7 @@

{% block metapanel %}{% endblock %} [{% trans 'Login' %}] + [{% trans 'Archive' %}] {% with ppd=posts_per_day|floatformat:2 %} {% blocktrans %}Speed: {{ ppd }} posts per day{% endblocktrans %} {% endwith %} diff --git a/boards/templates/boards/posting_general.html b/boards/templates/boards/posting_general.html --- a/boards/templates/boards/posting_general.html +++ b/boards/templates/boards/posting_general.html @@ -12,21 +12,21 @@ Neboard {% endif %} - {% if prev_page %} - {% endif %} - {% if next_page %} + {% if current_page.has_next %} {% endif %} @@ -53,13 +53,13 @@ {% endif %} {% if threads %} - {% if prev_page %} + {% if current_page.has_previous %}

{% trans "Previous page" %}

@@ -69,9 +69,9 @@ {% cache 600 thread_short thread.id thread.thread.last_edit_time moderator LANGUAGE_CODE %}

{% if thread.bumpable %} -

{% else %} -

{% endif %} {% if thread.op.image %}

@@ -192,13 +192,13 @@ {% endcache %} {% endfor %} - {% if next_page %} + {% if current_page.has_next %}

{% trans "Next page" %}

@@ -231,11 +231,11 @@ {% block metapanel %} - Neboard 1.5 Aker + Neboard 1.6 Amon {% trans "Pages:" %}[ - {% for page in pages %} + {% for page in paginator.page_range %} - {% if all_tags %} - {% for tag in all_tags %} - {% if tag in user.fav_tags.all %} - ★ - {% else %} - ★ - {% endif %} - - #{{ tag.name }} - ({{ tag.get_post_count }} {% trans 'threads' %}) - {% if tag.linked %} - ( + - {% for linked_tag in tag.get_linked_tags %} - - #{{ linked_tag.name }} - - {% endfor %} - ) - {% endif %} -
- {% endfor %} - {% else %} - {% trans 'No tags found.' %} - {% endif %} + {% if all_tags %} + {% for tag in all_tags %} +

+ {% if tag in user.fav_tags.all %} + ★ + {% else %} + ★ + {% endif %} + + #{{ tag.name }} + ({{ tag.get_post_count }} {% trans 'threads' %}) + {% if tag.linked %} + ( + + {% for linked_tag in tag.get_linked_tags %} + + #{{ linked_tag.name }} + + {% endfor %} + ) + {% endif %} +

+ {% endfor %} + {% else %} + {% trans 'No tags found.' %} + {% endif %}

{% endblock %} diff --git a/boards/templates/boards/thread.html b/boards/templates/boards/thread.html --- a/boards/templates/boards/thread.html +++ b/boards/templates/boards/thread.html @@ -6,7 +6,7 @@ {% load board %} {% block head %} - Neboard - {{ thread.get_opening_post.get_title }} + Neboard - {{ thread.get_opening_post.get_title|striptags }} {% endblock %} {% block content %} @@ -33,6 +33,8 @@ {% for post in posts %} {% if bumpable %}

+ {% elif thread.archived %} +

{% else %}

{% endif %} @@ -56,8 +58,10 @@ ({{ post.id }}) [{{ post.pub_time }}] + {% if not thread.archived %} [>>] + {% endif %} {% if moderator %} @@ -98,6 +102,8 @@

{% endcache %} + {% if not thread.archived %} +

{% trans "Reply to thread" %} #{{ thread.get_opening_post.id }}

@@ -114,7 +120,9 @@

- + + {% endif %} + {% endspaceless %} diff --git a/boards/templates/boards/thread_gallery.html b/boards/templates/boards/thread_gallery.html --- a/boards/templates/boards/thread_gallery.html +++ b/boards/templates/boards/thread_gallery.html @@ -6,7 +6,7 @@ {% load board %} {% block head %} - Neboard - {{ thread.get_opening_post.get_title }} + Neboard - {{ thread.get_opening_post.get_title|striptags }} {% endblock %} {% block content %} diff --git a/boards/tests.py b/boards/tests.py --- a/boards/tests.py +++ b/boards/tests.py @@ -115,7 +115,7 @@ class PostTests(TestCase): all_threads = Post.objects.get_threads() - posts_in_second_page = Post.objects.get_threads(page=1) + posts_in_second_page = Post.objects.get_threads(page=2) first_post = posts_in_second_page[0] self.assertEqual(all_threads[settings.THREADS_PER_PAGE].id, @@ -230,4 +230,4 @@ class ViewTest(TestCase): self.assertEqual(HTTP_CODE_OK, response.status_code, 'Index page not ' 'opened') self.assertEqual('boards/posting_general.html', response.templates[0] - .name, 'Index page should open posting_general template') \ No newline at end of file + .name, 'Index page should open posting_general template') diff --git a/boards/urls.py b/boards/urls.py --- a/boards/urls.py +++ b/boards/urls.py @@ -1,7 +1,7 @@ from django.conf.urls import patterns, url, include from boards import views from boards.rss import AllThreadsFeed, TagThreadsFeed, ThreadPostsFeed -from boards.views.api import api_get_threaddiff +from boards.views import api js_info_dict = { 'packages': ('boards',), @@ -14,6 +14,9 @@ urlpatterns = patterns('', # /boards/page/ url(r'^page/(?P\w+)/$', views.index, name='index'), + url(r'^archive/$', views.archive, name='archive'), + url(r'^archive/page/(?P\w+)/$', views.archive, name='archive'), + # login page url(r'^login/$', views.login, name='login'), @@ -54,7 +57,13 @@ urlpatterns = patterns('', url(r'^jsi18n/$', 'boards.views.cached_js_catalog', js_info_dict, name='js_info_dict'), # API - url(r'^api/post/(?P\w+)/$', views.get_post, name="get_post"), + url(r'^api/post/(?P\w+)/$', api.get_post, name="get_post"), url(r'^api/diff_thread/(?P\w+)/(?P\w+)/$', - api_get_threaddiff, name="get_thread_diff"), + api.api_get_threaddiff, name="get_thread_diff"), + url(r'^api/threads/(?P\w+)/$', api.api_get_threads, + name='get_threads'), + url(r'api/tags/$', api.api_get_tags, name='get_tags'), + url(r'api/thread/(?P\w+)/$', api.api_get_thread_posts, + name='get_thread'), + ) diff --git a/boards/views/__init__.py b/boards/views/__init__.py --- a/boards/views/__init__.py +++ b/boards/views/__init__.py @@ -1,3 +1,10 @@ +from datetime import datetime, timedelta + +from django.db.models import Count + + +OLD_USER_AGE_DAYS = 90 + __author__ = 'neko259' import hashlib @@ -15,13 +22,14 @@ from django.utils import timezone from django.db import transaction from django.views.decorators.cache import cache_page from django.views.i18n import javascript_catalog +from django.core.paginator import Paginator from boards import forms import boards from boards import utils from boards.forms import ThreadForm, PostForm, SettingsForm, PlainErrorList, \ ThreadCaptchaForm, PostCaptchaForm, LoginForm, ModeratorSettingsForm -from boards.models import Post, Tag, Ban, User +from boards.models import Post, Tag, Ban, User, Thread from boards.models.post import SETTING_MODERATE, REGEX_REPLY from boards.models.user import RANK_USER from boards import authors @@ -33,8 +41,10 @@ BAN_REASON_SPAM = 'Autoban: spam bot' MODE_GALLERY = 'gallery' MODE_NORMAL = 'normal' +DEFAULT_PAGE = 1 -def index(request, page=0): + +def index(request, page=DEFAULT_PAGE): context = _init_default_context(request) if utils.need_include_captcha(request): @@ -64,20 +74,36 @@ def index(request, page=0): # TODO Make this generic for tag and threads list pages context['threads'] = None if len(threads) == 0 else threads context['form'] = form - context['current_page'] = int(page) - page_count = Post.objects.get_thread_page_count() - context['pages'] = range(page_count) - page = int(page) - if page < page_count - 1: - context['next_page'] = str(page + 1) - if page > 0: - context['prev_page'] = str(page - 1) + paginator = Paginator(Thread.objects.filter(archived=False), + neboard.settings.THREADS_PER_PAGE) + _get_page_context(paginator, context, page) return render(request, 'boards/posting_general.html', context) +def archive(request, page=DEFAULT_PAGE): + """ + Get archived posts + """ + + context = _init_default_context(request) + + threads = [] + for thread_to_show in Post.objects.get_threads(page=int(page), + archived=True): + threads.append(_get_template_thread(thread_to_show)) + + context['threads'] = threads + + paginator = Paginator(Thread.objects.filter(archived=True), + neboard.settings.THREADS_PER_PAGE) + _get_page_context(paginator, context, page) + + return render(request, 'boards/archive.html', context) + + @transaction.atomic def _new_post(request, form, opening_post=None): """Add a new post (in thread or as a reply).""" @@ -129,10 +155,10 @@ def _new_post(request, form, opening_pos return redirect(thread, post_id=thread_to_show) -def tag(request, tag_name, page=0): +def tag(request, tag_name, page=DEFAULT_PAGE): """ Get all tag threads. Threads are split in pages, so some page is - requested. Default page is 0. + requested. """ tag = get_object_or_404(Tag, name=tag_name) @@ -157,15 +183,10 @@ def tag(request, tag_name, page=0): context = _init_default_context(request) context['threads'] = None if len(threads) == 0 else threads context['tag'] = tag - context['current_page'] = int(page) - page_count = Post.objects.get_thread_page_count(tag=tag) - context['pages'] = range(page_count) - page = int(page) - if page < page_count - 1: - context['next_page'] = str(page + 1) - if page > 0: - context['prev_page'] = str(page - 1) + paginator = Paginator(Post.objects.get_threads(tag=tag), + neboard.settings.THREADS_PER_PAGE) + _get_page_context(paginator, context, page) context['form'] = form @@ -184,7 +205,12 @@ def thread(request, post_id, mode=MODE_N kwargs = {} opening_post = get_object_or_404(Post, id=post_id) - if request.method == 'POST': + + # If this is not OP, don't show it as it is + if not opening_post.is_opening(): + raise Http404 + + if request.method == 'POST' and not opening_post.thread_new.archived: form = postFormClass(request.POST, request.FILES, error_class=PlainErrorList, **kwargs) form.session = request.session @@ -422,20 +448,6 @@ def api_get_post(request, post_id): return HttpResponse(content=json) -def get_post(request, post_id): - """Get the html of a post. Used for popups.""" - - post = get_object_or_404(Post, id=post_id) - thread = post.thread_new - - context = RequestContext(request) - context["post"] = post - context["can_bump"] = thread.can_bump() - if "truncated" in request.GET: - context["truncated"] = True - - return render(request, 'boards/post.html', context) - @cache_page(86400) def cached_js_catalog(request, domain='djangojs', packages=None): return javascript_catalog(request, domain, packages) @@ -491,10 +503,16 @@ def _get_user(request): 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) + _delete_old_users() + session['user_id'] = user.id else: user = User.objects.get(id=session['user_id']) @@ -562,3 +580,26 @@ def _get_template_thread(thread_to_show) 'last_replies': last_replies, 'skipped_replies': skipped_replies_count, } + + +def _delete_old_users(): + """ + Delete users with no favorite tags and posted messages. These can be spam + bots or just old user accounts + """ + + old_registration_date = datetime.now().date() - timedelta(OLD_USER_AGE_DAYS) + + for user in User.objects.annotate(tags_count=Count('fav_tags')).filter( + tags_count=0).filter(registration_time__lt=old_registration_date): + if not Post.objects.filter(user=user).exists(): + user.delete() + + +def _get_page_context(paginator, context, page): + """ + Get pagination context variables + """ + + context['paginator'] = paginator + context['current_page'] = paginator.page(int(page)) diff --git a/boards/views/api.py b/boards/views/api.py --- a/boards/views/api.py +++ b/boards/views/api.py @@ -2,15 +2,20 @@ from datetime import datetime import json from django.db import transaction from django.http import HttpResponse -from django.shortcuts import get_object_or_404 +from django.shortcuts import get_object_or_404, render +from django.template import RequestContext from django.utils import timezone from boards.forms import ThreadForm, PlainErrorList -from boards.models import Post -from boards.views import get_post, _datetime_to_epoch, _new_post, \ +from boards.models import Post, Thread, Tag +from boards.views import _datetime_to_epoch, _new_post, \ _ban_current_user __author__ = 'neko259' +PARAMETER_TRUNCATED = 'truncated' +PARAMETER_TAG = 'tag' +PARAMETER_OFFSET = 'offset' + @transaction.atomic def api_get_threaddiff(request, thread_id, last_update_time): @@ -25,7 +30,7 @@ def api_get_threaddiff(request, thread_i 'added': [], 'updated': [], 'last_update': None, - } + } added_posts = Post.objects.filter(thread_new=thread, pub_time__gt=filter_time) \ .order_by('pub_time') @@ -73,3 +78,108 @@ def api_get_threaddiff(request, thread_i # } # # return HttpResponse(content=json.dumps(response)) + + +def get_post(request, post_id): + """ + Get the html of a post. Used for popups. Post can be truncated if used + in threads list with 'truncated' get parameter. + """ + + post = get_object_or_404(Post, id=post_id) + thread = post.thread_new + + context = RequestContext(request) + context['post'] = post + context['can_bump'] = thread.can_bump() + if PARAMETER_TRUNCATED in request.GET: + context[PARAMETER_TRUNCATED] = True + + return render(request, 'boards/post.html', context) + + +# TODO Test this +def api_get_threads(request, count): + """ + Get 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 pub time, tags, replies and images count + post_json = { + 'id': opening_post.id, + 'title': opening_post.title, + 'text': opening_post.text.rendered, + } + if opening_post.image: + post_json['image'] = opening_post.image.url + post_json['image_preview'] = opening_post.image.url_200x150 + opening_posts.append(post_json) + + return HttpResponse(content=json.dumps(opening_posts)) + + +# TODO Test this +def api_get_tags(request): + """ + Get 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): + """ + Get the JSON array of thread posts + """ + + opening_post = get_object_or_404(Post, id=opening_post_id) + thread = opening_post.thread_new + posts = thread.get_replies() + + json_post_list = [] + + for post in posts: + # TODO Add pub time and replies + 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 + json_post_list.append(post_json) + + return HttpResponse(content=json.dumps(json_post_list)) diff --git a/changelog.markdown b/changelog.markdown --- a/changelog.markdown +++ b/changelog.markdown @@ -4,4 +4,13 @@ styles. * Showing notification in page title when new posts are loaded into the open thread. * Thread moderation fixes -* Added new gallery with search links and image metadata \ No newline at end of file +* Added new gallery with search links and image metadata + +# 1.6 Amon # +* Deleted threads are moved to archive instead of permanent delete +* User management fixes and optimizations +* Markdown fixes +* Pagination changes. Pages counter now starts from 1 instead of 0 +* Added API for viewing threads and posts +* New tag popularity algorithm +* Tags list page changes. Now tags list is more like a tag cloud diff --git a/docs/api.markdown b/docs/api.markdown new file mode 100644 --- /dev/null +++ b/docs/api.markdown @@ -0,0 +1,25 @@ +# INTRO # + +The API is provided to query the data from a neaboard server by any client +application. + +Tha data is returned in the json format and got by an http query. + +# METHODS # + + /api/threads/N/?offset=M&tag=O + +Get a thread list. You will get N threads (required parameter) starting from +Mth one (optional parameter, default is 0) with the tag O (optional parameter, +threads with any tags are shown by default). + + /api/tags/ + +Get all active tag list. Active tag is a tag that has at least 1 active thread +associated with it. + + /api/thread/N/ + +Get all Nth thread post. N is an opening post ID for the thread. + +In case of incorrect request you can get http error 404. diff --git a/todo.txt b/todo.txt --- a/todo.txt +++ b/todo.txt @@ -34,8 +34,6 @@ post or its part (delimited by N charact [NOT STARTED] Get thread graph image using pygraphviz [NOT STARTED] Creating post via AJAX without reloading page [NOT STARTED] Subscribing to tag via AJAX -[NOT STARTED] Count posts by user not by current active posts, but by adding 1 -on evety posting = Bugs = [DONE] Fix bug with creating threads from tag view

- {% if tag in user.fav_tags.all %} - ★ - {% else %} - ★ - {% endif %} - #{{ tag.name }} -