Merged in the 1.6 version

boards/migrations/0018_auto__add_field_thread_archived.py

@@ -0,0 +1,85 b''
+# -*- coding: utf-8 -*-
+from south.utils import datetime_utils as datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Adding field 'Thread.archived'
+        db.add_column(u'boards_thread', 'archived',
+                      self.gf('django.db.models.fields.BooleanField')(default=0),
+                      keep_default=False)
+
+
+    def backwards(self, orm):
+        # Deleting field 'Thread.archived'
+        db.delete_column(u'boards_thread', 'archived')
+
+
+    models = {
+        'boards.ban': {
+            'Meta': {'object_name': 'Ban'},
+            'can_read': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ip': ('django.db.models.fields.GenericIPAddressField', [], {'max_length': '39'}),
+            'reason': ('django.db.models.fields.CharField', [], {'default': "'Auto'", 'max_length': '200'})
+        },
+        'boards.post': {
+            'Meta': {'object_name': 'Post'},
+            '_text_rendered': ('django.db.models.fields.TextField', [], {}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'image': ('boards.thumbs.ImageWithThumbsField', [], {'max_length': '100', 'blank': 'True'}),
+            'image_height': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'image_pre_height': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'image_pre_width': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'image_width': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'last_edit_time': ('django.db.models.fields.DateTimeField', [], {}),
+            'poster_ip': ('django.db.models.fields.GenericIPAddressField', [], {'max_length': '39'}),
+            'poster_user_agent': ('django.db.models.fields.TextField', [], {}),
+            'pub_time': ('django.db.models.fields.DateTimeField', [], {}),
+            'referenced_posts': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'rfp+'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['boards.Post']"}),
+            'text': ('markupfield.fields.MarkupField', [], {'rendered_field': 'True'}),
+            'text_markup_type': ('django.db.models.fields.CharField', [], {'default': "'markdown'", 'max_length': '30'}),
+            'thread': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': "orm['boards.Post']", 'null': 'True'}),
+            'thread_new': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': "orm['boards.Thread']", 'null': 'True'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': "orm['boards.User']", 'null': 'True'})
+        },
+        'boards.setting': {
+            'Meta': {'object_name': 'Setting'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['boards.User']"}),
+            'value': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'boards.tag': {
+            'Meta': {'object_name': 'Tag'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'linked': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['boards.Tag']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'threads': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'tag+'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['boards.Thread']"})
+        },
+        'boards.thread': {
+            'Meta': {'object_name': 'Thread'},
+            'archived': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'bump_time': ('django.db.models.fields.DateTimeField', [], {}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_edit_time': ('django.db.models.fields.DateTimeField', [], {}),
+            'replies': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'tre+'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['boards.Post']"}),
+            'tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['boards.Tag']", 'symmetrical': 'False'})
+        },
+        'boards.user': {
+            'Meta': {'object_name': 'User'},
+            'fav_tags': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['boards.Tag']", 'null': 'True', 'blank': 'True'}),
+            'fav_threads': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['boards.Post']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'rank': ('django.db.models.fields.IntegerField', [], {}),
+            'registration_time': ('django.db.models.fields.DateTimeField', [], {}),
+            'user_id': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        }
+    }
+
+    complete_apps = ['boards']
  No newline at end of file

docs/api.markdown

@@ -0,0 +1,25 b''
+# 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.

boards/locale/ru/LC_MESSAGES/django.po

@@ -7,7 +7,7 b' msgid ""'
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-24 20:39+0200\n"
+"POT-Creation-Date: 2014-01-06 23:43+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -74,8 +74,7 b' msgstr "\xd0\xa2\xd0\xb5\xd0\xba\xd1\x81\xd1\x82 \xd0\xb8\xd0\xbb\xd0\xb8 \xd0\xba\xd0\xb0\xd1\x80\xd1\x82\xd0\xb8\xd0\xbd\xd0\xba\xd0\xb0 \xd0\xb4\xd0\xbe\xd0\xbb\xd0\xb6\xd0\xbd\xd1\x8b \xd0\xb1\xd1\x8b\xd1\x82\xd1\x8c \xd0\xb2\xd0\xb2\xd0\xb5\xd0\xb4\xd0\xb5\xd0\xbd\xd1\x8b."'
 msgid "Wait %s seconds after last posting"
 msgstr "Подождите %s секунд после последнего постинга"
 
-#: forms.py:163 templates/boards/post.html:61 templates/boards/tags.html:6
-#: templates/boards/rss/post.html:10
+#: forms.py:163 templates/boards/tags.html:6 templates/boards/rss/post.html:10
 msgid "Tags"
 msgstr "Теги"
 
@@ -112,6 +111,52 b' msgstr "\xd0\x9d\xd0\xb5 \xd0\xbd\xd0\xb0\xd0\xb9\xd0\xb4\xd0\xb5\xd0\xbd\xd0\xbe"'
 msgid "This page does not exist"
 msgstr "Этой страницы не существует"
 
+#: templates/boards/archive.html:45 templates/boards/posting_general.html:64
+msgid "Previous page"
+msgstr "Предыдущая страница"
+
+#: templates/boards/archive.html:75
+msgid "Open"
+msgstr "Открыть"
+
+#: templates/boards/archive.html:81 templates/boards/post.html:37
+#: templates/boards/posting_general.html:103 templates/boards/thread.html:69
+msgid "Delete"
+msgstr "Удалить"
+
+#: templates/boards/archive.html:85 templates/boards/post.html:40
+#: templates/boards/posting_general.html:107 templates/boards/thread.html:72
+msgid "Ban IP"
+msgstr "Заблокировать IP"
+
+#: templates/boards/archive.html:94 templates/boards/post.html:53
+#: templates/boards/posting_general.html:116
+#: templates/boards/posting_general.html:180 templates/boards/thread.html:81
+msgid "Replies"
+msgstr "Ответы"
+
+#: templates/boards/archive.html:103 templates/boards/posting_general.html:125
+#: templates/boards/thread.html:138 templates/boards/thread_gallery.html:58
+msgid "images"
+msgstr "изображений"
+
+#: templates/boards/archive.html:104 templates/boards/thread.html:137
+#: templates/boards/thread_gallery.html:57
+msgid "replies"
+msgstr "ответов"
+
+#: templates/boards/archive.html:129 templates/boards/posting_general.html:203
+msgid "Next page"
+msgstr "Следующая страница"
+
+#: templates/boards/archive.html:134 templates/boards/posting_general.html:208
+msgid "No threads exist. Create the first one!"
+msgstr "Нет тем. Создайте первую!"
+
+#: templates/boards/archive.html:143 templates/boards/posting_general.html:235
+msgid "Pages:"
+msgstr "Страницы: "
+
 #: templates/boards/authors.html:6 templates/boards/authors.html.py:12
 msgid "Authors"
 msgstr "Авторы"
@@ -149,12 +194,16 b' msgstr "\xd0\x9d\xd0\xb0\xd1\x81\xd1\x82\xd1\x80\xd0\xbe\xd0\xb9\xd0\xba\xd0\xb8"'
 msgid "Login"
 msgstr "Вход"
 
-#: templates/boards/base.html:52
+#: templates/boards/base.html:51
+msgid "Archive"
+msgstr "Архив"
+
+#: templates/boards/base.html:53
 #, python-format
 msgid "Speed: %(ppd)s posts per day"
 msgstr "Скорость: %(ppd)s сообщений в день"
 
-#: templates/boards/base.html:54
+#: templates/boards/base.html:55
 msgid "Up"
 msgstr "Вверх"
 
@@ -166,52 +215,20 b' msgstr "ID \xd0\xbf\xd0\xbe\xd0\xbb\xd1\x8c\xd0\xb7\xd0\xbe\xd0\xb2\xd0\xb0\xd1\x82\xd0\xb5\xd0\xbb\xd1\x8f"'
 msgid "Insert your user id above"
 msgstr "Вставьте свой ID пользователя выше"
 
-#: templates/boards/post.html:35 templates/boards/posting_general.html:103
-#: templates/boards/thread.html:68
-msgid "Delete"
-msgstr "Удалить"
-
-#: templates/boards/post.html:38 templates/boards/posting_general.html:107
-#: templates/boards/thread.html:71
-msgid "Ban IP"
-msgstr "Заблокировать IP"
-
-#: templates/boards/post.html:51 templates/boards/posting_general.html:116
-#: templates/boards/posting_general.html:180 templates/boards/thread.html:80
-msgid "Replies"
-msgstr "Ответы"
-
-#: templates/boards/posting_general.html:64
-msgid "Previous page"
-msgstr "Предыдущая страница"
-
 #: templates/boards/posting_general.html:97
 msgid "Reply"
 msgstr "Ответ"
 
-#: templates/boards/posting_general.html:125 templates/boards/thread.html:130
-#: templates/boards/thread_gallery.html:52
-msgid "images"
-msgstr "изображений"
-
 #: templates/boards/posting_general.html:142
 #, python-format
 msgid "Skipped %(count)s replies. Open thread to see all replies."
 msgstr "Пропущено %(count)s ответов. Откройте тред, чтобы увидеть все ответы."
 
-#: templates/boards/posting_general.html:203
-msgid "Next page"
-msgstr "Следующая страница"
-
-#: templates/boards/posting_general.html:208
-msgid "No threads exist. Create the first one!"
-msgstr "Нет тем. Создайте первую!"
-
 #: templates/boards/posting_general.html:214
 msgid "Create new thread"
 msgstr "Создать новую тему"
 
-#: templates/boards/posting_general.html:218 templates/boards/thread.html:112
+#: templates/boards/posting_general.html:218 templates/boards/thread.html:115
 msgid "Post"
 msgstr "Отправить"
 
@@ -220,14 +237,10 b' msgid "Tags must be delimited by spaces.'
 msgstr ""
 "Теги должны быть разделены пробелами. Текст или изображение обязательны."
 
-#: templates/boards/posting_general.html:225 templates/boards/thread.html:116
+#: templates/boards/posting_general.html:225 templates/boards/thread.html:119
 msgid "Text syntax"
 msgstr "Синтаксис текста"
 
-#: templates/boards/posting_general.html:235
-msgid "Pages:"
-msgstr "Страницы: "
-
 #: templates/boards/settings.html:14
 msgid "User:"
 msgstr "Пользователь:"
@@ -260,27 +273,23 b' msgstr "\xd1\x82\xd0\xb5\xd0\xbc"'
 msgid "No tags found."
 msgstr "Теги не найдены."
 
-#: templates/boards/thread.html:22 templates/boards/thread_gallery.html:20
+#: templates/boards/thread.html:19 templates/boards/thread_gallery.html:20
 msgid "Normal mode"
 msgstr "Нормальный режим"
 
-#: templates/boards/thread.html:23 templates/boards/thread_gallery.html:21
+#: templates/boards/thread.html:20 templates/boards/thread_gallery.html:21
 msgid "Gallery mode"
 msgstr "Режим галереи"
 
-#: templates/boards/thread.html:31
+#: templates/boards/thread.html:28
 msgid "posts to bumplimit"
 msgstr "сообщений до бамплимита"
 
-#: templates/boards/thread.html:106
+#: templates/boards/thread.html:109
 msgid "Reply to thread"
 msgstr "Ответить в тему"
 
-#: templates/boards/thread.html:129 templates/boards/thread_gallery.html:51
-msgid "replies"
-msgstr "ответов"
-
-#: templates/boards/thread.html:131 templates/boards/thread_gallery.html:53
+#: templates/boards/thread.html:139 templates/boards/thread_gallery.html:59
 msgid "Last update: "
 msgstr "Последнее обновление: "
 

boards/mdx_neboard.py

@@ -10,7 +10,7 b' import boards'
 AUTOLINK_PATTERN = r'(https?://\S+)'
 QUOTE_PATTERN = r'^(?<!>)(>[^>].+)$'
 REFLINK_PATTERN = r'((>>)(\d+))'
-SPOILER_PATTERN = r'%%(.+)%%'
+SPOILER_PATTERN = r'%%([^(%%)]+)%%'
 COMMENT_PATTERN = r'^(//(.+))'
 STRIKETHROUGH_PATTERN = r'~(.+)~'
 

boards/models/post.py

@@ -6,6 +6,7 b' import time'
 import math
 import re
 from django.core.cache import cache
+from django.core.paginator import Paginator
 
 from django.db import models
 from django.http import Http404
@@ -15,6 +16,8 b' from markupfield.fields import MarkupFie'
 from neboard import settings
 from boards import thumbs
 
+MAX_TITLE_LENGTH = 50
+
 APP_LABEL_BOARDS = 'boards'
 
 CACHE_KEY_PPD = 'ppd'
@@ -64,7 +67,8 b' class PostManager(models.Manager):'
                            thread_new=thread,
                            image=image,
                            poster_ip=ip,
-                           poster_user_agent=UNKNOWN_UA, # TODO Get UA at last!
+                           poster_user_agent=UNKNOWN_UA,  # TODO Get UA at
+                           # last!
                            last_edit_time=posting_time,
                            user=user)
 
@@ -111,7 +115,7 b' class PostManager(models.Manager):'
 
     # TODO Move this method to thread manager
     def get_threads(self, tag=None, page=ALL_PAGES,
-                    order_by='-bump_time'):
+                    order_by='-bump_time', archived=False):
         if tag:
             threads = tag.threads
 
@@ -120,39 +124,21 b' class PostManager(models.Manager):'
         else:
             threads = Thread.objects.all()
 
-        threads = threads.order_by(order_by)
+        threads = threads.filter(archived=archived).order_by(order_by)
 
         if page != ALL_PAGES:
-            thread_count = threads.count()
-
-            if page < self._get_page_count(thread_count):
-                start_thread = page * settings.THREADS_PER_PAGE
-                end_thread = min(start_thread + settings.THREADS_PER_PAGE,
-                                 thread_count)
-                threads = threads[start_thread:end_thread]
+            threads = Paginator(threads, settings.THREADS_PER_PAGE).page(
+                    page).object_list
 
         return threads
 
     # TODO Move this method to thread manager
-    def get_thread_page_count(self, tag=None):
-        if tag:
-            threads = Thread.objects.filter(tags=tag)
-        else:
-            threads = Thread.objects.all()
-
-        return self._get_page_count(threads.count())
-
-    # TODO Move this method to thread manager
     def _delete_old_threads(self):
         """
         Preserves maximum thread count. If there are too many threads,
-        delete the old ones.
+        archive the old ones.
         """
 
-        # TODO Move old threads to the archive instead of deleting them.
-        # Maybe make some 'old' field in the model to indicate the thread
-        # must not be shown and be able for replying.
-
         threads = self.get_threads()
         thread_count = threads.count()
 
@@ -160,7 +146,10 b' class PostManager(models.Manager):'
             num_threads_to_delete = thread_count - settings.MAX_THREAD_COUNT
             old_threads = threads[thread_count - num_threads_to_delete:]
 
-            map(Thread.delete_with_posts, old_threads)
+            for thread in old_threads:
+                thread.archived = True
+                thread.last_edit_time = timezone.now()
+                thread.save()
 
     def connect_replies(self, post):
         """
@@ -176,13 +165,6 b' class PostManager(models.Manager):'
                 referenced_post.last_edit_time = post.pub_time
                 referenced_post.save()
 
-    def _get_page_count(self, thread_count):
-        """
-        Get number of pages that will be needed for all threads
-        """
-
-        return int(math.ceil(thread_count / float(settings.THREADS_PER_PAGE)))
-
     def get_posts_per_day(self):
         """
         Get average count of posts per day for the last 7 days
@@ -270,7 +252,7 b' class Post(models.Model):'
     def get_title(self):
         title = self.title
         if len(title) == 0:
-            title = self.text.raw[:20]
+            title = self.text.rendered[:MAX_TITLE_LENGTH]
 
         return title
 
@@ -294,6 +276,7 b' class Thread(models.Model):'
     last_edit_time = models.DateTimeField()
     replies = models.ManyToManyField('Post', symmetrical=False, null=True,
                                      blank=True, related_name='tre+')
+    archived = models.BooleanField(default=False)
 
     def get_tags(self):
         """
@@ -321,6 +304,9 b' class Thread(models.Model):'
         Check if the thread can be bumped by replying
         """
 
+        if self.archived:
+            return False
+
         post_count = self.get_reply_count()
 
         return post_count < settings.MAX_POSTS_PER_THREAD

boards/models/tag.py

@@ -6,7 +6,10 b' from django.db.models import Count'
 
 TAG_FONT_MULTIPLIER = 0.1
 MAX_TAG_FONT = 10
-OPENING_POST_POPULARITY_WEIGHT = 2
+
+OPENING_POST_POPULARITY = 0.5
+ARCHIVE_POPULARITY = 0.01
+REPLY_POPULARITY = 0.1
 
 
 class TagManager(models.Manager):
@@ -43,15 +46,19 b' class Tag(models.Model):'
     def get_post_count(self):
         return self.threads.count()
 
-    # TODO Reenable this method after migration
-    # def get_popularity(self):
-    #     posts_with_tag = Thread.objects.get_threads(tag=self)
-    #     reply_count = 0
-    #     for post in posts_with_tag:
-    #         reply_count += post.get_reply_count()
-    #         reply_count += OPENING_POST_POPULARITY_WEIGHT
-    #
-    #     return reply_count
+    def get_popularity(self):
+        popularity = 0.0
+
+        for thread in self.threads.all():
+            reply_count = thread.get_reply_count()
+
+            if thread.archived:
+                popularity += ARCHIVE_POPULARITY * reply_count
+            else:
+                popularity += REPLY_POPULARITY * reply_count
+            popularity += OPENING_POST_POPULARITY
+
+        return popularity
 
     def get_linked_tags(self):
         tag_list = []
@@ -75,10 +82,10 b' class Tag(models.Model):'
     def get_font_value(self):
         """Get tag font value to differ most popular tags in the list"""
 
-        post_count = self.get_post_count()
-        if post_count > MAX_TAG_FONT:
-            post_count = MAX_TAG_FONT
+        popularity = self.get_popularity()
+        if popularity > MAX_TAG_FONT:
+            popularity = MAX_TAG_FONT
 
-        font_value = str(1 + (post_count - 1) * TAG_FONT_MULTIPLIER)
+        font_value = str(1 + (popularity - 1) * TAG_FONT_MULTIPLIER)
 
-        return font_value
  No newline at end of file
+        return font_value

boards/static/css/md/base_page.css

@@ -43,7 +43,7 b' html {'
     color: #fff380;
 }
 
-.post, .dead_post, #posts-table {
+.post, .dead_post, .archive_post, #posts-table {
     background: #333;
     margin: 5px;
     padding: 10px;
@@ -191,6 +191,10 b' blockquote {'
     background-color: #442222;
 }
 
+.archive_post {
+    background-color: #000;
+}
+
 .mark_btn {
     border: 1px solid;
     min-width: 2ex;
@@ -381,3 +385,16 b' code {'
 pre {
     overflow: auto;
 }
+
+.img-full {
+    background: #222;
+    border: solid 1px white;
+}
+
+.tag_item {
+    display: inline-block;
+    background: #555;
+    border: 1px solid #ccc;
+    margin: 0.3ex;
+    padding: 0.2ex;
+}

boards/static/css/pg/base_page.css

@@ -344,4 +344,11 b' input[type="submit"]:hover {'
 .current_page, .current_mode {
     border: solid 1px #000;
     padding: 2px;
-}
  No newline at end of file
+}
+
+.tag_item {
+    display: inline-block;
+    border: 1px solid #ccc;
+    margin: 0.3ex;
+    padding: 0.2ex;
+}

boards/templates/boards/archive.html

@@ -6,27 +6,23 b''
 {% load static %}
 
 {% block head %}
-    {% if tag %}
-        <title>Neboard - {{ tag.name }}</title>
-    {% else %}
-        <title>Neboard</title>
-    {% endif %}
+<title>Neboard - {% trans 'Archive' %}</title>
 
-    {% if prev_page %}
-        <link rel="next" href="
+    {% if current_page.has_previous %}
+        <link rel="prev" href="
             {% if tag %}
-                {% url "tag" tag_name=tag page=prev_page %}
+                {% url "tag" tag_name=tag page=current_page.previous_page_number %}
             {% else %}
-                {% url "index" page=prev_page %}
+                {% url "index" page=current_page.previous_page_number %}
             {% endif %}
         " />
     {% endif %}
-    {% if next_page %}
+    {% if current_page.has_next %}
         <link rel="next" href="
             {% if tag %}
-                {% url "tag" tag_name=tag page=next_page %}
+                {% url "tag" tag_name=tag page=current_page.next_page_number %}
             {% else %}
-                {% url "index" page=next_page %}
+                {% url "index" page=current_page.next_page_number %}
             {% endif %}
         " />
     {% endif %}
@@ -37,42 +33,17 b''
 
     {% get_current_language as LANGUAGE_CODE %}
 
-{% if tag %}
-    <div class="tag_info">
-        <h2>
-            {% if tag in user.fav_tags.all %}
-                <a href="{% url 'tag_unsubscribe' tag.name %}?next={{ request.path }}"
-                   class="fav">★</a>
-            {% else %}
-                <a href="{% url 'tag_subscribe' tag.name %}?next={{ request.path }}"
-                   class="not_fav">★</a>
-            {% endif %}
-            #{{ tag.name }}
-        </h2>
-    </div>
-{% endif %}
-
     {% if threads %}
-        {% if prev_page %}
+        {% if current_page.has_previous %}
             <div class="page_link">
-                <a href="
-            {% if tag %}
-                {% url "tag" tag_name=tag page=prev_page %}
-            {% else %}
-                {% url "index" page=prev_page %}
-            {% endif %}
-                ">{% trans "Previous page" %}</a>
+                <a href="{% url "archive" page=current_page.previous_page_number %}">{% trans "Previous page" %}</a>
             </div>
         {% endif %}
 
         {% for thread in threads %}
             {% cache 600 thread_short thread.id thread.thread.last_edit_time moderator LANGUAGE_CODE %}
             <div class="thread">
-            {% if thread.bumpable %}
-		        <div class="post" id="{{ thread.op.id }}">
-            {% else %}
-		        <div class="post dead_post" id="{{ thread.op.id }}">
-            {% endif %}
+            <div class="post archive_post" id="{{ thread.op.id }}">
             {% if thread.op.image %}
                 <div class="image">
                     <a class="thumb"
@@ -91,10 +62,10 b''
                     <span class="title">{{ thread.op.title }}</span>
                     <a class="post_id" href="{% url 'thread' thread.op.id %}"
                     > ({{ thread.op.id }})</a>
-                    [{{ thread.op.pub_time }}]
+                    [{{ thread.op.pub_time }}] — [{{ thread.thread.last_edit_time }}]
+
                     [<a class="link" href="
-                    {% url 'thread' thread.op.id %}#form"
-                        >{% trans "Reply" %}</a>]
+                    {% url 'thread' thread.op.id %}">{% trans "Open" %}</a>]
 
                     {% if moderator %}
                         <span class="moderator_info">
@@ -122,7 +93,8 b''
 		{% endif %}
             </div>
             <div class="metadata">
-                {{ 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 %}
                     <span class="tags">
                         {% for tag in thread.thread.get_tags %}
@@ -135,72 +107,13 b''
                 {% endif %}
             </div>
             </div>
-            {% if thread.last_replies.exists %}
-                {% if thread.skipped_replies %}
-                    <div class="skipped_replies">
-                        <a href="{% url 'thread' thread.op.id %}">
-                        {% blocktrans with count=thread.skipped_replies %}Skipped {{ count }} replies. Open thread to see all replies.{% endblocktrans %}
-                        </a>
-                    </div>
-                {% endif %}
-                <div class="last-replies">
-                    {% for post in thread.last_replies %}
-                        {% if thread.bumpable %}
-                            <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="
-                                {% url 'thread' thread.op.id %}#{{ post.id }}">
-                                        ({{ post.id }})</a>
-                                    [{{ post.pub_time }}]
-                                </div>
-                                {% autoescape off %}
-                                    {{ post.text.rendered|truncatewords_html:50 }}
-                                {% endautoescape %}
-                        </div>
-                    {% 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>
-                    {% endfor %}
-                </div>
-            {% endif %}
         </div>
         {% endcache %}
         {% endfor %}
 
-        {% if next_page %}
+        {% if current_page.has_next %}
             <div class="page_link">
-                <a href="
-            {% if tag %}
-                {% url "tag" tag_name=tag page=next_page %}
-            {% else %}
-                {% url "index" page=next_page %}
-            {% endif %}
-                ">{% trans "Next page" %}</a>
+                <a href="{% url "archive" page=current_page.next_page_number %}">{% trans "Next page" %}</a>
             </div>
         {% endif %}
     {% else %}
@@ -208,42 +121,20 b''
             {% trans 'No threads exist. Create the first one!' %}</div>
     {% endif %}
 
-    <div class="post-form-w">
-        <script src="{% static 'js/panel.js' %}"></script>
-        <div class="post-form">
-            <div class="form-title">{% trans "Create new thread" %}</div>
-            <form enctype="multipart/form-data" method="post">{% csrf_token %}
-                {{ form.as_div }}
-                <div class="form-submit">
-                    <input type="submit" value="{% trans "Post" %}"/>
-                </div>
-            </form>
-            <div>
-                {% trans 'Tags must be delimited by spaces. Text or image is required.' %}
-            </div>
-            <div><a href="{% url "staticpage" name="help" %}">
-                {% trans 'Text syntax' %}</a></div>
-        </div>
-    </div>
-
 {% endblock %}
 
 {% block metapanel %}
 
     <span class="metapanel">
-        <b><a href="{% url "authors" %}">Neboard</a> 1.5 Aker</b>
+        <b><a href="{% url "authors" %}">Neboard</a> 1.6 Amon</b>
         {% trans "Pages:" %}[
-        {% for page in pages %}
+        {% for page in paginator.page_range %}
             <a
-                {% ifequal page current_page %}
+                {% ifequal page current_page.number %}
                     class="current_page"
                 {% endifequal %}
                 href="
-            {% if tag %}
-                {% url "tag" tag_name=tag page=page %}
-            {% else %}
-                {% url "index" page=page %}
-            {% endif %}
+                {% url "archive" page=page %}
             ">{{ page }}</a>
             {% if not forloop.last %},{% endif %}
         {% endfor %}

boards/templates/boards/base.html

@@ -48,6 +48,7 b''
 <div class="navigation_panel">
     {% block metapanel %}{% endblock %}
     [<a href="{% url "login" %}">{% trans 'Login' %}</a>]
+    [<a href="{% url "archive" %}">{% trans 'Archive' %}</a>]
     {% with ppd=posts_per_day|floatformat:2 %}
         {% blocktrans %}Speed: {{ ppd }} posts per day{% endblocktrans %}
     {% endwith %}

boards/templates/boards/posting_general.html

@@ -12,21 +12,21 b''
         <title>Neboard</title>
     {% endif %}
 
-    {% if prev_page %}
-        <link rel="next" href="
+    {% if current_page.has_previous %}
+        <link rel="prev" href="
             {% if tag %}
-                {% url "tag" tag_name=tag page=prev_page %}
+                {% url "tag" tag_name=tag page=current_page.previous_page_number %}
             {% else %}
-                {% url "index" page=prev_page %}
+                {% url "index" page=current_page.previous_page_number %}
             {% endif %}
         " />
     {% endif %}
-    {% if next_page %}
+    {% if current_page.has_next %}
         <link rel="next" href="
             {% if tag %}
-                {% url "tag" tag_name=tag page=next_page %}
+                {% url "tag" tag_name=tag page=current_page.next_page_number %}
             {% else %}
-                {% url "index" page=next_page %}
+                {% url "index" page=current_page.next_page_number %}
             {% endif %}
         " />
     {% endif %}
@@ -53,13 +53,13 b''
 {% endif %}
 
     {% if threads %}
-        {% if prev_page %}
+        {% if current_page.has_previous %}
             <div class="page_link">
                 <a href="
             {% if tag %}
-                {% url "tag" tag_name=tag page=prev_page %}
+                {% url "tag" tag_name=tag page=current_page.previous_page_number %}
             {% else %}
-                {% url "index" page=prev_page %}
+                {% url "index" page=current_page.previous_page_number %}
             {% endif %}
                 ">{% trans "Previous page" %}</a>
             </div>
@@ -69,9 +69,9 b''
             {% cache 600 thread_short thread.id thread.thread.last_edit_time moderator LANGUAGE_CODE %}
             <div class="thread">
             {% if thread.bumpable %}
-		        <div class="post" id="{{ thread.op.id }}">
+                <div class="post" id="{{ thread.op.id }}">
             {% else %}
-		        <div class="post dead_post" id="{{ thread.op.id }}">
+                <div class="post dead_post" id="{{ thread.op.id }}">
             {% endif %}
             {% if thread.op.image %}
                 <div class="image">
@@ -192,13 +192,13 b''
         {% endcache %}
         {% endfor %}
 
-        {% if next_page %}
+        {% if current_page.has_next %}
             <div class="page_link">
                 <a href="
             {% if tag %}
-                {% url "tag" tag_name=tag page=next_page %}
+                {% url "tag" tag_name=tag page=current_page.next_page_number %}
             {% else %}
-                {% url "index" page=next_page %}
+                {% url "index" page=current_page.next_page_number %}
             {% endif %}
                 ">{% trans "Next page" %}</a>
             </div>
@@ -231,11 +231,11 b''
 {% block metapanel %}
 
     <span class="metapanel">
-        <b><a href="{% url "authors" %}">Neboard</a> 1.5 Aker</b>
+        <b><a href="{% url "authors" %}">Neboard</a> 1.6 Amon</b>
         {% trans "Pages:" %}[
-        {% for page in pages %}
+        {% for page in paginator.page_range %}
             <a
-                {% ifequal page current_page %}
+                {% ifequal page current_page.number %}
                     class="current_page"
                 {% endifequal %}
                 href="

boards/templates/boards/tags.html

@@ -9,33 +9,34 b''
 {% block content %}
 
     <div class="post">
-	{% if all_tags %}
-		{% for tag in all_tags %}
-            {% if tag in user.fav_tags.all %}
-                <a href="{% url 'tag_unsubscribe' tag.name %}?next={{ request.path }}"
-                    class="fav">★</a>
-            {% else %}
-                <a href="{% url 'tag_subscribe' tag.name %}?next={{ request.path }}"
-                    class="not_fav">★</a>
-            {% endif %}
-            <a class="tag" href="{% url 'tag' tag.name %}"
-               style="font-size: {{ tag.get_font_value }}em">
-                #{{ tag.name }}</a>
-            ({{ tag.get_post_count }} {% trans 'threads' %})
-            {% if tag.linked %}
-                ( +
-                {% for linked_tag in tag.get_linked_tags %}
-                    <a class="tag" href="{% url 'tag' linked_tag.name %}">
-                        #{{ linked_tag.name }}
-                    </a>
-                {% endfor %}
-                )
-            {% endif %}
-            <br />
-		{% endfor %}
-	{% else %}
-		{% trans 'No tags found.' %}
-	{% endif %}
+        {% if all_tags %}
+            {% for tag in all_tags %}
+                <div class="tag_item">
+                {% if tag in user.fav_tags.all %}
+                    <a href="{% url 'tag_unsubscribe' tag.name %}?next={{ request.path }}"
+                        class="fav">★</a>
+                {% else %}
+                    <a href="{% url 'tag_subscribe' tag.name %}?next={{ request.path }}"
+                        class="not_fav">★</a>
+                {% endif %}
+                <a class="tag" href="{% url 'tag' tag.name %}"
+                   style="font-size: {{ tag.get_font_value }}em">
+                    #{{ tag.name }}</a>
+                ({{ tag.get_post_count }} {% trans 'threads' %})
+                {% if tag.linked %}
+                    ( +
+                    {% for linked_tag in tag.get_linked_tags %}
+                        <a class="tag" href="{% url 'tag' linked_tag.name %}">
+                            #{{ linked_tag.name }}
+                        </a>
+                    {% endfor %}
+                    )
+                {% endif %}
+                </div>
+            {% endfor %}
+        {% else %}
+            {% trans 'No tags found.' %}
+        {% endif %}
     </div>
 
 {% endblock %}

boards/templates/boards/thread.html

@@ -6,7 +6,7 b''
 {% load board %}
 
 {% block head %}
-    <title>Neboard - {{ thread.get_opening_post.get_title }}</title>
+    <title>Neboard - {{ thread.get_opening_post.get_title|striptags }}</title>
 {% endblock %}
 
 {% block content %}
@@ -33,6 +33,8 b''
     {% for post in posts %}
         {% if bumpable %}
             <div class="post" id="{{ post.id }}">
+        {% elif thread.archived %}
+            <div class="post archive_post" id="{{ post.id }}">
         {% else %}
             <div class="post dead_post" id="{{ post.id }}">
         {% endif %}
@@ -56,8 +58,10 b''
                 <a class="post_id" href="#{{ post.id }}">
                     ({{ post.id }})</a>
                 [{{ post.pub_time }}]
+            {% if not thread.archived %}
             [<a href="#" onclick="javascript:addQuickReply('{{ post.id }}')
                 ; return false;">&gt;&gt;</a>]
+            {% endif %}
 
                 {% if moderator %}
                     <span class="moderator_info">
@@ -98,6 +102,8 b''
     </div>
     {% endcache %}
 
+    {% if not thread.archived %}
+
     <div class="post-form-w">
         <script src="{% static 'js/panel.js' %}"></script>
         <div class="form-title">{% trans "Reply to thread" %} #{{ thread.get_opening_post.id }}</div>
@@ -114,7 +120,9 b''
         </div>
     </div>
 
-    <script src="{% static 'js/thread_update.js' %}"></script>
+            <script src="{% static 'js/thread_update.js' %}"></script>
+    {% endif %}
+
     <script src="{% static 'js/thread.js' %}"></script>
 
     {% endspaceless %}

boards/templates/boards/thread_gallery.html

@@ -6,7 +6,7 b''
 {% load board %}
 
 {% block head %}
-    <title>Neboard - {{ thread.get_opening_post.get_title }}</title>
+    <title>Neboard - {{ thread.get_opening_post.get_title|striptags }}</title>
 {% endblock %}
 
 {% block content %}

boards/tests.py

@@ -115,7 +115,7 b' 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 b' 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')

boards/urls.py

@@ -1,7 +1,7 b''
 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 b" urlpatterns = patterns('',"
     # /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'),
 
@@ -54,7 +57,13 b" urlpatterns = patterns('',"
     url(r'^jsi18n/$', 'boards.views.cached_js_catalog', js_info_dict, name='js_info_dict'),
 
     # API
-    url(r'^api/post/(?P<post_id>\w+)/$', views.get_post, name="get_post"),
+    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_get_threaddiff, name="get_thread_diff"),
+        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/__init__.py

@@ -1,3 +1,10 b''
+from datetime import datetime, timedelta
+
+from django.db.models import Count
+
+
+OLD_USER_AGE_DAYS = 90
+
 __author__ = 'neko259'
 
 import hashlib
@@ -15,13 +22,14 b' 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 b" 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 b' 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 b' 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 b' 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 b' 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 b' 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 b' 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 b' 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))

boards/views/api.py

@@ -2,15 +2,20 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
+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 b' 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 b' 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))

changelog.markdown

@@ -4,4 +4,13 b' 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

todo.txt

@@ -34,8 +34,6 b' 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