Use archived post style when opening an archived post preview

boards/templates/boards/post.html

@@ -1,72 +1,74 b''
 {% load i18n %}
 {% load board %}
 
 {% spaceless %}
-{% if can_bump %}
+{% if post.thread_new.archived %}
+    <div class="post archive_post" id="{{ post.id }}">
+{% elif post.thread_new.can_bump %}
     <div class="post" id="{{ post.id }}">
 {% else %}
     <div class="post dead_post" id="{{ post.id }}">
 {% endif %}
 
 {% if post.image %}
     <div class="image">
         <a
                 class="thumb"
                 href="{{ post.image.url }}"><img
                 src="{{ post.image.url_200x150 }}"
                 alt="{{ post.id }}"
                 width="{{ post.image_pre_width }}"
                 height="{{ post.image_pre_height }}"
                 data-width="{{ post.image_width }}"
                 data-height="{{ post.image_height }}"/>
         </a>
     </div>
 {% endif %}
 <div class="message">
     <div class="post-info">
         <span class="title">{{ post.title }}</span>
         <a class="post_id" href="{% post_url post.id %}">
             ({{ post.id }})</a>
         [{{ post.pub_time }}]
         [<a href="#" onclick="javascript:addQuickReply('{{ post.id }}')
             ; return false;">&gt;&gt;</a>]
 
         {% if moderator %}
             <span class="moderator_info">
                             [<a href="{% url 'delete' post_id=post.id %}"
                     >{% trans 'Delete' %}</a>]
                             ({{ post.poster_ip }})
                             [<a href="{% url 'ban' post_id=post.id %}?next={{ request.path }}"
                     >{% trans 'Ban IP' %}</a>]
                         </span>
         {% endif %}
     </div>
     {% autoescape off %}
         {% if truncated %}
             {{ post.text.rendered|truncatewords_html:50 }}
         {% else %}
             {{ post.text.rendered }}
         {% endif %}
     {% endautoescape %}
     {% if post.is_referenced %}
         <div class="refmap">
         {% trans "Replies" %}:
         {% for ref_post in post.get_sorted_referenced_posts %}
         <a href="{% post_url ref_post.id %}">&gt;&gt;{{ ref_post.id }}</a
             >{% if not forloop.last %},{% endif %}
         {% endfor %}
         </div>
     {% endif %}
 </div>
 {% if post.is_opening and post.thread_new.tags.exists %}
     <div class="metadata">
         <span class="tags">
             {% for tag in post.thread_new.get_tags %}
                 <a class="tag" href="{% url 'tag' tag.name %}">
                     #{{ tag.name }}</a>{% if not forloop.last %},{% endif %}
             {% endfor %}
         </span>
     </div>
 {% endif %}
 </div>
 {% endspaceless %}

boards/views/api.py

@@ -1,205 +1,204 b''
 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'
 PARAMETER_DIFF_TYPE = 'type'
 
 DIFF_TYPE_HTML = 'html'
 DIFF_TYPE_JSON = 'json'
 
 
 @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)
 
     diff_type = DIFF_TYPE_HTML
     if PARAMETER_DIFF_TYPE in request.GET:
         diff_type = request.GET[PARAMETER_DIFF_TYPE]
 
     for post in added_posts:
         json_data['added'].append(_get_post_data(post.id, diff_type, request))
     for post in updated_posts:
         json_data['updated'].append(_get_post_data(post.id, diff_type, request))
     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 tags, replies and images count
         opening_posts.append(_get_post_data(opening_post.id,
             include_last_update=True))
 
     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_data = {
         'posts': [],
         'last_update': None,
     }
     json_post_list = []
 
     for post in posts:
         json_post_list.append(_get_post_data(post.id))
     json_data['last_update'] = _datetime_to_epoch(thread.last_edit_time)
     json_data['posts'] = json_post_list
 
     return HttpResponse(content=json.dumps(json_data))
 
 
 # TODO Add pub time and replies
 def _get_post_data(post_id, format_type=DIFF_TYPE_JSON, request=None,
         include_last_update=False):
     if format_type == DIFF_TYPE_HTML:
         return get_post(request, post_id).content.strip()
     elif format_type == DIFF_TYPE_JSON:
         post = get_object_or_404(Post, id=post_id)
         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
         if include_last_update:
             post_json['bump_time'] = _datetime_to_epoch(
                     post.thread_new.bump_time)
         return post_json