Added api for getting thread posts

boards/urls.py

@@ -1,67 +1,69
 from django.conf.urls import patterns, url, include
 from boards import views
 from boards.rss import AllThreadsFeed, TagThreadsFeed, ThreadPostsFeed
 from boards.views import api
 
 js_info_dict = {
     'packages': ('boards',),
 }
 
 urlpatterns = patterns('',
 
     # /boards/
     url(r'^$', views.index, name='index'),
     # /boards/page/
     url(r'^page/(?P<page>\w+)/$', views.index, name='index'),
 
     url(r'^archive/$', views.archive, name='archive'),
     url(r'^archive/page/(?P<page>\w+)/$', views.archive, name='archive'),
 
     # login page
     url(r'^login/$', views.login, name='login'),
 
     # /boards/tag/tag_name/
     url(r'^tag/(?P<tag_name>\w+)/$', views.tag, name='tag'),
     # /boards/tag/tag_id/page/
     url(r'^tag/(?P<tag_name>\w+)/page/(?P<page>\w+)/$', views.tag, name='tag'),
 
     # /boards/tag/tag_name/unsubscribe/
     url(r'^tag/(?P<tag_name>\w+)/subscribe/$', views.tag_subscribe,
         name='tag_subscribe'),
     # /boards/tag/tag_name/unsubscribe/
     url(r'^tag/(?P<tag_name>\w+)/unsubscribe/$', views.tag_unsubscribe,
         name='tag_unsubscribe'),
 
     # /boards/thread/
     url(r'^thread/(?P<post_id>\w+)/$', views.thread, name='thread'),
     url(r'^thread/(?P<post_id>\w+)/(?P<mode>\w+)/$', views.thread, name='thread_mode'),
     url(r'^settings/$', views.settings, name='settings'),
     url(r'^tags/$', views.all_tags, name='tags'),
     url(r'^captcha/', include('captcha.urls')),
     url(r'^jump/(?P<post_id>\w+)/$', views.jump_to_post, name='jumper'),
     url(r'^authors/$', views.authors, name='authors'),
     url(r'^delete/(?P<post_id>\w+)/$', views.delete, name='delete'),
     url(r'^ban/(?P<post_id>\w+)/$', views.ban, name='ban'),
 
     url(r'^banned/$', views.you_are_banned, name='banned'),
     url(r'^staticpage/(?P<name>\w+)/$', views.static_page, 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'),
 
 )

boards/views/api.py

@@ -1,157 +1,189
 from datetime import datetime
 import json
 from django.db import transaction
 from django.http import HttpResponse
 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, 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):
     """Get posts that were changed or added since time"""
 
     thread = get_object_or_404(Post, id=thread_id).thread_new
 
     filter_time = datetime.fromtimestamp(float(last_update_time) / 1000000,
                                          timezone.get_current_timezone())
 
     json_data = {
         'added': [],
         'updated': [],
         'last_update': None,
         }
     added_posts = Post.objects.filter(thread_new=thread,
                                       pub_time__gt=filter_time) \
         .order_by('pub_time')
     updated_posts = Post.objects.filter(thread_new=thread,
                                         pub_time__lte=filter_time,
                                         last_edit_time__gt=filter_time)
     for post in added_posts:
         json_data['added'].append(get_post(request, post.id).content.strip())
     for post in updated_posts:
         json_data['updated'].append(get_post(request, post.id).content.strip())
     json_data['last_update'] = _datetime_to_epoch(thread.last_edit_time)
 
     return HttpResponse(content=json.dumps(json_data))
 
 
 # TODO This method needs to be implemented properly
 # def api_add_post(request, form):
 #     """
 #     Add a post and return the JSON response for it
 #     """
 #
 #     status = 'ok'
 #     errors = []
 #
 #     if request.method == 'POST':
 #         form = ThreadForm(request.POST, request.FILES,
 #                           error_class=PlainErrorList)
 #         form.session = request.session
 #
 #         if form.is_valid():
 #             # TODO Don't form a response here cause we'll not need it
 #             _new_post(request, form)
 #         if form.need_to_ban:
 #             # Ban user because he is suspected to be a bot
 #             _ban_current_user(request)
 #     else:
 #         status = 'error'
 #         for field in form.fields:
 #             if field.errors:
 #                 errors.append(field.errors)
 #
 #     response = {
 #         'status': status,
 #         'errors': errors,
 #     }
 #
 #     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,
                     '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,
+                    'image_preview' : post.image.url_200x150,
+                    }
+        json_post_list.append(post_json)
+
+    return HttpResponse(content=json.dumps(json_post_list))