Added admin actions (showing IP, post removal). Added user ranks. This refs #61, #12

boards/admin.py

@@ -1,6 +1,6 b''
 from django.contrib import admin
-from boards.models import Post, Tag, Admin
+from boards.models import Post, Tag, User
 
 admin.site.register(Post)
 admin.site.register(Tag)
-admin.site.register(Admin)
+admin.site.register(User)

boards/locale/ru/LC_MESSAGES/django.po

@@ -1,168 +1,180 b''
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-04 14:04+0300\n"
+"POT-Creation-Date: 2013-08-21 20:49+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: templates/boards/authors.html:6
 msgid "Authors"
 msgstr "Авторы"
 
 #: templates/boards/authors.html:24
 msgid "Distributed under the"
 msgstr "Распространяется под"
 
 #: templates/boards/authors.html:26
 msgid "license"
 msgstr "лицензией"
 
 #: templates/boards/authors.html:28
 msgid "Repository"
 msgstr "Репозиторий"
 
 #: templates/boards/base.html:12
 msgid "Feed"
 msgstr "Лента"
 
-#: templates/boards/base.html:31
+#: templates/boards/base.html:27
 msgid "All threads"
 msgstr "Все темы"
 
-#: templates/boards/base.html:37
+#: templates/boards/base.html:33
 msgid "Settings"
 msgstr "Настройки"
 
-#: templates/boards/base.html:45
+#: templates/boards/base.html:41
 msgid "Up"
 msgstr "Вверх"
 
 #: templates/boards/posting_general.html:18
 msgid "Tag: "
 msgstr "Тег: "
 
 #: templates/boards/posting_general.html:35
-#: templates/boards/posting_general.html:79 templates/boards/thread.html:27
+#: templates/boards/posting_general.html:87 templates/boards/thread.html:27
 #: templates/boards/rss/post.html:5
 msgid "Post image"
 msgstr "Изображение сообщения"
 
 #: templates/boards/posting_general.html:46
 msgid "Reply"
 msgstr "Ответ"
 
-#: templates/boards/posting_general.html:53 templates/boards/thread.html:111
+#: templates/boards/posting_general.html:52 templates/boards/thread.html:49
+msgid "Delete"
+msgstr "Удалить"
+
+#: templates/boards/posting_general.html:61 templates/boards/thread.html:119
 msgid "replies"
 msgstr "ответов"
 
-#: templates/boards/posting_general.html:54 templates/boards/thread.html:112
+#: templates/boards/posting_general.html:62 templates/boards/thread.html:120
 msgid "images"
 msgstr "изображений"
 
-#: templates/boards/posting_general.html:56
-#: templates/boards/posting_general.html:127 templates/boards/thread.html:51
+#: templates/boards/posting_general.html:64
+#: templates/boards/posting_general.html:135 templates/boards/thread.html:59
 #: templates/boards/rss/post.html:10
 msgid "Tags"
 msgstr "Теги"
 
-#: templates/boards/posting_general.html:109
+#: templates/boards/posting_general.html:117
 msgid "Create new thread"
 msgstr "Создать новую тему"
 
-#: templates/boards/posting_general.html:112 templates/boards/thread.html:73
+#: templates/boards/posting_general.html:120 templates/boards/thread.html:81
 msgid "Title"
 msgstr "Заголовок"
 
-#: templates/boards/posting_general.html:117 templates/boards/thread.html:78
+#: templates/boards/posting_general.html:125 templates/boards/thread.html:86
 msgid "Text"
 msgstr "Текст"
 
-#: templates/boards/posting_general.html:122 templates/boards/thread.html:83
+#: templates/boards/posting_general.html:130 templates/boards/thread.html:91
 msgid "Image"
 msgstr "Изображение"
 
-#: templates/boards/posting_general.html:137 templates/boards/thread.html:94
+#: templates/boards/posting_general.html:145 templates/boards/thread.html:102
 msgid "Post"
 msgstr "Отправить"
 
-#: templates/boards/posting_general.html:139
+#: templates/boards/posting_general.html:147
 msgid "Tags must be delimited by spaces. Text or image is required."
 msgstr ""
 "Теги должны быть разделены пробелами. Текст или изображение обязательны."
 
-#: templates/boards/posting_general.html:142 templates/boards/thread.html:96
+#: templates/boards/posting_general.html:150 templates/boards/thread.html:104
 msgid "Basic markdown syntax."
 msgstr "Базовый синтаксис markdown."
 
-#: templates/boards/posting_general.html:152
+#: templates/boards/posting_general.html:160
 msgid "Pages:"
 msgstr "Страницы: "
 
-#: templates/boards/settings.html:13
+#: templates/boards/settings.html:12
+msgid "User:"
+msgstr "Пользователь:"
+
+#: templates/boards/settings.html:14
+msgid "You are moderator."
+msgstr "Вы модератор."
+
+#: templates/boards/settings.html:20
 msgid "Theme"
 msgstr "Тема"
 
-#: templates/boards/settings.html:29
+#: templates/boards/settings.html:36
 msgid "Save"
 msgstr "Сохранить"
 
 #: templates/boards/tags.html:7
 msgid "tags"
 msgstr "тегов"
 
 #: templates/boards/thread.html:39
 msgid "Get!"
 msgstr "Гет!"
 
-#: templates/boards/thread.html:70
+#: templates/boards/thread.html:78
 msgid "Reply to thread"
 msgstr "Ответить в тему"
 
-#: templates/boards/thread.html:97
+#: templates/boards/thread.html:105
 msgid "Example: "
 msgstr "Пример: "
 
-#: templates/boards/thread.html:97
+#: templates/boards/thread.html:105
 msgid "italic"
 msgstr "курсив"
 
-#: templates/boards/thread.html:98
+#: templates/boards/thread.html:106
 msgid "bold"
 msgstr "полужирный"
 
-#: templates/boards/thread.html:99
+#: templates/boards/thread.html:107
 msgid "Quotes can be inserted with"
 msgstr "Цитаты могут быть вставлены при помощи"
 
-#: templates/boards/thread.html:100
+#: templates/boards/thread.html:108
 msgid "Links to answers can be inserted with"
 msgstr "Ссылки на ответы могут быть вставлены с помощью"
 
-#: templates/boards/thread.html:113
+#: templates/boards/thread.html:121
 msgid "Last update: "
 msgstr "Последнее обновление: "
 
 #~ msgid "View"
 #~ msgstr "Просмотр"
 
 #~ msgid "gets"
 #~ msgstr "гетов"
 
-msgid "author"
-msgstr "автор"
+#~ msgid "author"
+#~ msgstr "автор"
 
-msgid "developer"
-msgstr "разработчик"
  No newline at end of file
+#~ msgid "developer"
+#~ msgstr "разработчик"

boards/models.py

@@ -1,322 +1,333 b''
 import os
 from random import random
 import re
 import time
 import math
 
 from django.db import models
 from django.http import Http404
 from django.utils import timezone
 from markupfield.fields import MarkupField
 from threading import Thread
 
 from neboard import settings
 import thumbs
 
 IMAGE_THUMB_SIZE = (200, 150)
 
 TITLE_MAX_LENGTH = 50
 
 DEFAULT_MARKUP_TYPE = 'markdown'
 
 NO_PARENT = -1
 NO_IP = '0.0.0.0'
 UNKNOWN_UA = ''
 ALL_PAGES = -1
 OPENING_POST_POPULARITY_WEIGHT = 2
 IMAGES_DIRECTORY = 'images/'
 FILE_EXTENSION_DELIMITER = '.'
 
 REGEX_PRETTY = re.compile(r'^\d(0)+$')
 REGEX_SAME = re.compile(r'^(.)\1+$')
 
+RANK_ADMIN = 0
+RANK_MODERATOR = 10
+RANK_USER = 100
+
 
 class PostManager(models.Manager):
     def create_post(self, title, text, image=None, parent_id=NO_PARENT,
                     ip=NO_IP, tags=None):
         post = self.create(title=title,
                            text=text,
                            pub_time=timezone.now(),
                            parent=parent_id,
                            image=image,
                            poster_ip=ip,
                            poster_user_agent=UNKNOWN_UA,
                            last_edit_time=timezone.now())
 
         if tags:
             map(post.tags.add, tags)
 
         if parent_id != NO_PARENT:
             self._bump_thread(parent_id)
         else:
             self._delete_old_threads()
 
         return post
 
     def delete_post(self, post):
         children = self.filter(parent=post.id)
         for child in children:
             self.delete_post(child)
         post.delete()
 
     def delete_posts_by_ip(self, ip):
         posts = self.filter(poster_ip=ip)
         for post in posts:
             self.delete_post(post)
 
     def get_threads(self, tag=None, page=ALL_PAGES,
                     order_by='-last_edit_time'):
         if tag:
             threads = self.filter(parent=NO_PARENT, tags=tag)
 
             # TODO Throw error 404 if no threads for tag found?
         else:
             threads = self.filter(parent=NO_PARENT)
 
         threads = threads.order_by(order_by)
 
         if page != ALL_PAGES:
             thread_count = len(threads)
 
             if page < self.get_thread_page_count(tag=tag):
                 start_thread = page * settings.THREADS_PER_PAGE
                 end_thread = min(start_thread + settings.THREADS_PER_PAGE,
                                  thread_count)
                 threads = threads[start_thread:end_thread]
 
         return threads
 
     def get_thread(self, opening_post_id):
         try:
             opening_post = self.get(id=opening_post_id, parent=NO_PARENT)
         except Post.DoesNotExist:
             raise Http404
 
         if opening_post.parent == NO_PARENT:
             replies = self.filter(parent=opening_post_id)
 
             thread = [opening_post]
             thread.extend(replies)
 
             return thread
 
     def exists(self, post_id):
         posts = self.filter(id=post_id)
 
         return posts.count() > 0
 
     def get_thread_page_count(self, tag=None):
         if tag:
             threads = self.filter(parent=NO_PARENT, tags=tag)
         else:
             threads = self.filter(parent=NO_PARENT)
 
         return int(math.ceil(threads.count() / float(
             settings.THREADS_PER_PAGE)))
 
     def _delete_old_threads(self):
         """
         Preserves maximum thread count. If there are too many threads,
         delete 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 = len(threads)
 
         if thread_count > settings.MAX_THREAD_COUNT:
             num_threads_to_delete = thread_count - settings.MAX_THREAD_COUNT
             old_threads = threads[thread_count - num_threads_to_delete:]
 
             for thread in old_threads:
                 self.delete_post(thread)
 
     def _bump_thread(self, thread_id):
         thread = self.get(id=thread_id)
 
         if thread.can_bump():
             thread.last_edit_time = timezone.now()
             thread.save()
 
 
 class TagManager(models.Manager):
     def get_not_empty_tags(self):
         all_tags = self.all().order_by('name')
         tags = []
         for tag in all_tags:
             if not tag.is_empty():
                 tags.append(tag)
 
         return tags
 
     def get_popular_tags(self):
         all_tags = self.get_not_empty_tags()
 
         sorted_tags = sorted(all_tags, key=lambda tag: tag.get_popularity(),
                              reverse=True)
 
         return sorted_tags[:settings.POPULAR_TAGS]
 
 
 class Tag(models.Model):
     """
     A tag is a text node assigned to the post. The tag serves as a board
     section. There can be multiple tags for each message
     """
 
     objects = TagManager()
 
     name = models.CharField(max_length=100)
     # TODO Connect the tag to its posts to check the number of threads for
     # the tag.
 
     def __unicode__(self):
         return self.name
 
     def is_empty(self):
         return self.get_post_count() == 0
 
     def get_post_count(self):
         posts_with_tag = Post.objects.get_threads(tag=self)
         return posts_with_tag.count()
 
     def get_popularity(self):
         posts_with_tag = Post.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
 
 
 class Post(models.Model):
     """A post is a message."""
 
     objects = PostManager()
 
     def _update_image_filename(self, filename):
         """Get unique image filename"""
 
         path = IMAGES_DIRECTORY
         new_name = str(int(time.mktime(time.gmtime())))
         new_name += str(int(random() * 1000))
         new_name += FILE_EXTENSION_DELIMITER
         new_name += filename.split(FILE_EXTENSION_DELIMITER)[-1:][0]
 
         return os.path.join(path, new_name)
 
     title = models.CharField(max_length=TITLE_MAX_LENGTH)
     pub_time = models.DateTimeField()
     text = MarkupField(default_markup_type=DEFAULT_MARKUP_TYPE,
                        escape_html=False)
     image = thumbs.ImageWithThumbsField(upload_to=_update_image_filename,
                                         blank=True, sizes=(IMAGE_THUMB_SIZE,))
     poster_ip = models.IPAddressField()
     poster_user_agent = models.TextField()
     parent = models.BigIntegerField()
     tags = models.ManyToManyField(Tag)
     last_edit_time = models.DateTimeField()
 
     def __unicode__(self):
         return '#' + str(self.id) + ' ' + self.title + ' (' + self.text.raw + \
                ')'
 
     def _get_replies(self):
         return Post.objects.filter(parent=self.id)
 
     def get_reply_count(self):
         return self._get_replies().count()
 
     def get_images_count(self):
         images_count = 1 if self.image else 0
         for reply in self._get_replies():
             if reply.image:
                 images_count += 1
 
         return images_count
 
     def get_gets_count(self):
         gets_count = 1 if self.is_get() else 0
         for reply in self._get_replies():
             if reply.is_get():
                 gets_count += 1
 
         return gets_count
 
     def is_get(self):
         """If the post has pretty id (1, 1000, 77777), than it is called GET"""
 
         first = self.id == 1
 
         id_str = str(self.id)
         pretty = REGEX_PRETTY.match(id_str)
         same_digits = REGEX_SAME.match(id_str)
 
         return first or pretty or same_digits
 
     def can_bump(self):
         """Check if the thread can be bumped by replying"""
 
         replies_count = len(Post.objects.get_thread(self.id))
 
         return replies_count <= settings.MAX_POSTS_PER_THREAD
 
     def get_last_replies(self):
         if settings.LAST_REPLIES_COUNT > 0:
             reply_count = self.get_reply_count()
 
             if reply_count > 0:
                 reply_count_to_show = min(settings.LAST_REPLIES_COUNT,
                                           reply_count)
                 last_replies = self._get_replies()[reply_count
                                                    - reply_count_to_show:]
 
                 return last_replies
 
 
 class Admin(models.Model):
     """
     Model for admin users
     """
     name = models.CharField(max_length=100)
     password = models.CharField(max_length=100)
 
     def __unicode__(self):
         return self.name + '/' + '*' * len(self.password)
 
 
-class Setting(models.Model):
-
-    name = models.CharField(max_length=50)
-    value = models.CharField(max_length=50)
-
-
 class User(models.Model):
 
-    user_id = models.CharField(max_length=20)
-    settings = models.ManyToManyField(Setting)
+    user_id = models.CharField(max_length=50)
+    rank = models.IntegerField()
 
     def save_setting(self, name, value):
-        setting, created = self.settings.get_or_create(name=name)
+        setting, created = Setting.objects.get_or_create(name=name, user=self)
         setting.value = value
         setting.save()
 
         return setting
 
     def get_setting(self, name):
-        settings = self.settings.filter(name=name)
+        settings = Setting.objects.filter(name=name, user=self)
         if len(settings) > 0:
             setting = settings[0]
         else:
             setting = None
 
         if setting:
             setting_value = setting.value
         else:
             setting_value = None
 
         return setting_value
+
+    def is_moderator(self):
+        return RANK_MODERATOR >= self.rank
+
+    def __unicode__(self):
+        return self.user_id
+
+
+class Setting(models.Model):
+
+    name = models.CharField(max_length=50)
+    value = models.CharField(max_length=50)
+    user = models.ForeignKey(User)

boards/static/css/md/base_page.css

@@ -1,275 +1,280 b''
 html {
     background: #555;
     color: #ffffff;
 }
 
 #admin_panel {
     background: #FF0000;
     color: #00FF00
 }
 
 .input_field {
 
 }
 
 .input_field_name {
 
 }
 
 .input_field_error {
     color: #FF0000;
 }
 
 
 .title {
     font-weight: bold;
     color: #ffcc00;
 }
 
 .link, a {
     color: #afdcec;
 }
 
 .block {
     display: inline-block;
     vertical-align: top;
 }
 
 .tag {
     color: #b4cfec;
 }
 
 .post_id {
     color: #fff380;
 }
 
 .post, .dead_post {
     background: #333;
     margin: 5px;
     padding: 10px;
     border-radius: 5px;
     clear: left;
     word-wrap: break-word;
 }
 
 .metadata {
     padding: 5px;
     margin-top: 10px;
     border: solid 1px #666;
     font-size: 0.9em;
     color: #ddd;
     display: table;
 }
 
 .navigation_panel, .tag_info {
     background: #444;
     margin: 5px;
     padding: 10px;
     border-radius: 5px;
     color: #eee;
 }
 
 .navigation_panel .link {
     border-right: 1px solid #fff;
     font-weight: bold;
     margin-right: 1ex;
     padding-right: 1ex;
 }
 .navigation_panel .link:last-child {
     border-left: 1px solid #fff;
     border-right: none;
     float: right;
     margin-left: 1ex;
     margin-right: 0;
     padding-left: 1ex;
     padding-right: 0;
 }
 
 .navigation_panel::after, .post::after {
     clear: both;
     content: ".";
     display: block;
     height: 0;
     line-height: 0;
     visibility: hidden;
 }
 
 p {
     margin-top: .5em;
     margin-bottom: .5em;
 }
 
 .post-form-w {
     display: table;
     background: #333344;
     border-radius: 5px;
     color: #fff;
     padding: 10px;
     margin: 5px
 }
 
 .form-row {
     display: table-row;
 }
 
 .form-label, .form-input, .form-errors {
     display: table-cell;
 }
 
 .form-label {
     padding: .25em 1ex .25em 0;
     vertical-align: top;
 }
 
 .form-input {
     padding: .25em 0;
 }
 
 .form-errors {
     padding-left: 1ex;
     font-weight: bold;
     vertical-align: top;
 }
 
 .post-form input, .post-form textarea {
     background: #333;
     color: #fff;
     border: solid 1px;
     padding: 0;
     width: 100%;
 }
 
 .form-submit {
     border-bottom: 2px solid #ddd;
     margin-bottom: .5em;
     padding-bottom: .5em;
 }
 
 .form-title {
     font-weight: bold;
 }
 
 input[type="submit"] {
     background: #222;
     border: solid 1px #fff;
     color: #fff;
 }
 
 blockquote {
     border-left: solid 2px;
     padding-left: 5px;
     color: #B1FB17;
     margin: 0;
 }
 
 .post > .image {
     float: left;
     margin: 0 1ex .5ex 0;
     min-width: 1px;
     height: 150px;
     text-align: center;
     display: table-row;
 }
 
 .post > .metadata {
     clear: left;
 }
 
 .get {
     font-weight: bold;
     color: #d55;
 }
 
 * {
     text-decoration: none;
 }
 
 .dead_post {
     background-color: #442222;
 }
 
 .quote {
     color: #92cf38;
 }
 
 .spoiler {
     background: white;
     color: white;
 }
 
 .spoiler:hover {
     background: black;
 }
 
 .comment {
     color: #eb2;
     font-style: italic;
 }
 
 a:hover {
     text-decoration: underline;
 }
 
 .last-replies {
     margin-left: 3ex;
 }
 
 .thread {
     margin-bottom: 3ex;
 }
 
 .post:target {
     border: solid 2px white;
 }
 
 pre{
     white-space:pre-wrap
 }
 
 li {
     list-style-position: inside;
 }
 
 .fancybox-skin {
     position: relative;
     background-color: #fff;
     color: #ddd;
     text-shadow: none;
 }
 
 .fancybox-image {
     border: 1px solid black;
 }
 
 .image-mode-tab {
     background: #444;
     color: #eee;
     display: table;
     margin: 5px;
     padding: 5px;
     border-radius: 5px;
 }
 
 .image-mode-tab > label {
     margin: 0 1ex;
 }
 
 .image-mode-tab > label > input {
     margin-right: .5ex;
 }
 
 #posts-table {
     margin: 5px;
 }
 
 .tag_info {
     display: table;
 }
 
 .tag_info > h2 {
     margin: 0;
 }
 
 .post-info {
     color: #ddd;
 }
+
+.moderator_info {
+    color: #e99d41;
+    float: right;
+}
  No newline at end of file

boards/static/css/sw/base_page.css

@@ -1,264 +1,269 b''
 * {
     font-size: inherit;
     margin: 0;
     padding: 0;
 }
 html {
     background: #fff;
     color: #000;
     font: medium sans-serif;
 }
 a {
     color: inherit;
     text-decoration: underline;
 }
 li {
     list-style-position: inside;
 }
 
 #admin_panel {
     background: #182F6F;
     color: #fff;
     padding: .5ex 1ex .5ex 1ex;
 }
 
 .navigation_panel {
     background: #182F6F;
     color: #B4CFEC;
     margin-bottom: 1em;
     padding: .5ex 1ex 1ex 1ex;
 }
 .navigation_panel::after {
     clear: both;
     content: ".";
     display: block;
     height: 0;
     line-height: 0;
     visibility: hidden;
 }
 
 .navigation_panel a:link, .navigation_panel a:visited, .navigation_panel a:hover {
     text-decoration: none;
 }
 
 .navigation_panel .link {
     border-right: 1px solid #fff;
     color: #fff;
     font-weight: bold;
     margin-right: 1ex;
     padding-right: 1ex;
 }
 .navigation_panel .link:last-child {
     border-left: 1px solid #fff;
     border-right: none;
     float: right;
     margin-left: 1ex;
     margin-right: 0;
     padding-left: 1ex;
     padding-right: 0;
 }
 
 .navigation_panel .tag {
     color: #fff;
 }
 
 .input_field {
 
 }
 
 .input_field_name {
 
 }
 
 .input_field_error {
     color: #FF0000;
 }
 
 
 .title {
     color: #182F6F;
     font-weight: bold;
 }
 
 .post-form-w {
     background: #182F6F;
     border-radius: 1ex;
     color: #fff;
     margin: 1em 1ex;
     padding: 1ex;
 }
 .post-form {
     display: table;
     border-collapse: collapse;
     width: 100%;
 
 }
 .form-row {
     display: table-row;
 }
 .form-label, .form-input {
     display: table-cell;
     vertical-align: top;
 }
 .form-label {
     padding: .25em 1ex .25em 0;
 }
 .form-input {
     padding: .25em 0;
 }
 .form-input > * {
     background: #fff;
     color: #000;
     border: none;
     padding: 0;
     resize: vertical;
     width: 100%;
 }
 .form-submit {
     border-bottom: 1px solid #666;
     margin-bottom: .5em;
     padding-bottom: .5em;
 }
 .form-title {
     font-weight: bold;
     margin-bottom: .5em;
 }
 .post-form .settings_item {
     margin: .5em 0;
 }
 .form-submit input {
     margin-top: .5em;
     padding: .2em 1ex;
 }
 .form-label {
     text-align: right;
 }
 
 .block {
     display: inline-block;
     vertical-align: top;
 }
 
 .post_id {
     color: #a00;
 }
 
 .post {
     clear: left;
     margin: 0 1ex 1em 1ex;
     overflow-x: auto;
     word-wrap: break-word;
 }
 .last-replies > .post, #posts > .post {
     border-bottom: 1px solid #182F6F;
     padding-bottom: 1em;
 }
 #posts > .post:last-child {
     border-bottom: none;
     padding-bottom: 0;
 }
 
 .metadata {
     background: #C0E4E8;
     border: 1px solid #7F9699;
     border-radius: .4ex;
     display: table;
     margin-top: .5em;
     padding: .4em;
 }
 
 .post ul, .post ol {
     margin: .5em 0 .5em 3ex;
 }
 .post li {
     margin: .2em 0;
 }
 .post p {
     margin: .5em 0;
 }
 .post blockquote {
     border-left: 3px solid #182F6F;
     margin: .5em 0 .5em 3ex;
     padding-left: 1ex;
 }
 .post blockquote > blockquote {
     padding-top: .1em;
 }
 
 .post > .image {
     float: left;
     margin-right: 1ex;
 }
 .post > .metadata {
     clear: left;
 }
 
 .post > .message .get {
     color: #182F6F; font-weight: bold;
 }
 
 .dead_post > .metadata {
     background: #eee;
 }
 
 .quote {
     color: #182F6F;
 }
 
 .spoiler {
     background: black;
     color: black;
 }
 
 .spoiler:hover {
     background: #ffffff;
 }
 
 .comment {
     color: #557055;
 }
 
 .last-replies {
     margin-left: 6ex;
 }
 
 .thread > .post > .message > .post-info {
     border-bottom: 2px solid #182F6F;
     padding-bottom: .5em;
 }
 
 .last-replies > .post:last-child {
     border-bottom: none;
     padding-bottom: 0;
 }
 
 :target .post_id {
     background: #182F6F;
     color: #FFF;
     text-decoration: none;
 }
 
 .image-mode-tab {
     background: #182F6F;
     color: #FFF;
     display: table;
     margin: 1em auto 1em 0;
     padding: .2em .5ex;
 }
 
 .image-mode-tab > label {
     margin: 0 1ex;
 }
 
 .image-mode-tab > label > input {
     margin-right: .5ex;
 }
 
 .tag_info {
     margin: 1em 0;
     text-align: center;
 }
 
 .form-errors {
     margin-left: 1ex;
+}
+
+.moderator_info {
+    font-weight: bold;
+    float: right;
 }
  No newline at end of file

boards/templates/boards/base.html

@@ -1,52 +1,45 b''
 {% load staticfiles %}
 {% load i18n %}
 
 <!DOCTYPE html>
 <html>
 <head>
     <link rel="stylesheet" type="text/css"
           href="{{ STATIC_URL }}css/jquery.fancybox.css" media="all"/>
     <link rel="stylesheet" type="text/css"
           href="{{ STATIC_URL }}css/{{ theme }}/base_page.css" media="all"/>
     <link rel="alternate" type="application/rss+xml" href="rss/" title="
     {% trans 'Feed' %}"/>
 
     <link rel="icon" type="image/png"
           href="{{ STATIC_URL }}favicon.png">
 
     <meta name="viewport" content="width=device-width, initial-scale=1"/>
     <meta charset="utf-8"/>
     {% block head %}{% endblock %}
 </head>
 <body>
 <script src="{{ STATIC_URL }}js/jquery-2.0.1.min.js"></script>
 <script src="{{ STATIC_URL }}js/jquery.fancybox.pack.js"></script>
 <script src="{{ STATIC_URL }}js/main.js"></script>
-<div id="admin_panel">
-
-    {% if request.session.admin == True %}
-        Admin panel TODO: Need to implement <BR />
-    {% endif %}
-
-</div>
 
 <div class="navigation_panel">
     <a class="link" href="{% url 'index' %}">{% trans "All threads" %}</a>
     {% for tag in tags %}
         <a class="tag" href=" {% url 'tag' tag_name=tag.name %}">
             {{ tag.name }}</a>({{ tag.get_post_count }})
     {% endfor %}
     <a class="tag" href="{% url 'tags' %}">[...]</a>
     <a class="link" href="{% url 'settings' %}">{% trans 'Settings' %}</a>
 </div>
 
 {% block content %}{% endblock %}
 
 <div class="navigation_panel">
     {% block metapanel %}{% endblock %}
     [<a href="rss/">RSS</a>]
     <a class="link" href="#top">{% trans 'Up' %}</a>
 </div>
 
 </body>
 </html>
  No newline at end of file

boards/templates/boards/posting_general.html

@@ -1,164 +1,172 b''
 {% extends "boards/base.html" %}
 
 {% load i18n %}
 {% load markup %}
 
 {% block head %}
     {% if tag %}
         <title>Neboard - {{ tag }}</title>
     {% else %}
         <title>Neboard</title>
     {% endif %}
 {% endblock %}
 
 {% block content %}
 
 {% if tag %}
     <div class="tag_info">
         <h2>{% trans 'Tag: ' %}{{ tag }}</h2>
     </div>
 {% endif %}
 
     {% if threads %}
         {% for thread in threads %}
             <div class="thread">
             {% if thread.can_bump %}
                 <div class="post">
             {% else %}
                 <div class="post dead_post">
             {% endif %}
             {% if thread.image %}
                 <div class="image">
                     <a class="fancy"
                        href="{{ thread.image.url }}"><img
                 src="{{ thread.image.url_200x150 }}"
                 alt="{% trans 'Post image' %}" />
                     </a>
                 </div>
             {% endif %}
             <div class="message">
                 <div class="post-info">
                     <span class="title">{{ thread.title }}</span>
                     <a class="post_id" href="{% url 'thread' thread.id %}">
                         (#{{ thread.id }})</a>
                     [{{ thread.pub_time }}]
                     [<a class="link" href="{% url 'thread' thread.id %}#form"
                         >{% trans "Reply" %}</a>]
+
+                    {% if user.is_moderator %}
+                        <span class="moderator_info">
+                            ({{ thread.poster_ip }})
+                            [<a href="{% url 'delete' post_id=thread.id %}"
+                                >{% trans 'Delete' %}</a>]
+                        </span>
+                    {% endif %}
                 </div>
                 {% autoescape off %}
                     {{ thread.text.rendered|truncatewords_html:50 }}
                 {% endautoescape %}
             </div>
             <div class="metadata">
                 {{ thread.get_reply_count }} {% trans 'replies' %},
                 {{ thread.get_images_count }} {% trans 'images' %}.
                 {% if thread.tags.all %}
                     <span class="tags">{% trans 'Tags' %}:
                         {% for tag in thread.tags.all %}
                             <a class="tag" href="
                                     {% url 'tag' tag_name=tag.name %}">
                                 {{ tag.name }}</a>
                         {% endfor %}
                     </span>
                 {% endif %}
             </div>
             </div>
             {% if thread.get_last_replies %}
                 <div class="last-replies">
                     {% for post in thread.get_last_replies %}
                         {% if thread.can_bump %}
                             <div class="post">
                         {% else %}
                             <div class="post dead_post">
                         {% endif %}
                             {% if post.image %}
                                 <div class="image">
                                     <a class="fancy"
                                        href="{{ post.image.url }}"><img
                                 src=" {{ post.image.url_200x150 }}"
                                 alt="{% trans 'Post image' %}" />
                                     </a>
                                 </div>
                             {% endif %}
                             <div class="message">
                                 <div class="post-info">
                                     <span class="title">{{ post.title }}</span>
                                     <a class="post_id" href="
                                 {% url 'thread' thread.id %}#{{ post.id }}">
                                         (#{{ post.id }})</a>
                                     [{{ post.pub_time }}]
                                 </div>
                                 {% autoescape off %}
                                     {{ post.text.rendered|truncatewords_html:50 }}
                                 {% endautoescape %}
                         </div>
                         </div>
                     {% endfor %}
                 </div>
             {% endif %}
         </div>
         {% endfor %}
     {% else %}
         No threads found.
         <hr />
 	{% endif %}
 
     <form enctype="multipart/form-data" method="post">{% csrf_token %}
     <div class="post-form-w">
 
         <div class="form-title">{% trans "Create new thread" %}</div>
         <div class="post-form">
             <div class="form-row">
                 <div class="form-label">{% trans 'Title' %}</div>
                 <div class="form-input">{{ form.title }}</div>
                 <div class="form-errors">{{ form.title.errors }}</div>
             </div>
             <div class="form-row">
                 <div class="form-label">{% trans 'Text' %}</div>
                 <div class="form-input">{{ form.text }}</div>
                 <div class="form-errors">{{ form.text.errors }}</div>
             </div>
             <div class="form-row">
                 <div class="form-label">{% trans 'Image' %}</div>
                 <div class="form-input">{{ form.image }}</div>
                 <div class="form-errors">{{ form.image.errors }}</div>
             </div>
             <div class="form-row">
                 <div class="form-label">{% trans 'Tags' %}</div>
                 <div class="form-input">{{ form.tags }}</div>
                 <div class="form-errors">{{ form.tags.errors }}</div>
             </div>
             <div class="form-row">
                 {{ form.captcha }}
                 <div class="form-errors">{{ form.captcha.errors }}</div>
             </div>
         </div>
         <div class="form-submit">
             <input type="submit" value="{% trans "Post" %}"/></div>
         <div>
             {% trans 'Tags must be delimited by spaces. Text or image is required.' %}
         </div>
         <div><a href="http://daringfireball.net/projects/markdown/basics">
             {% trans 'Basic markdown syntax.' %}</a></div>
     </div>
     </form>
 
 {% endblock %}
 
 {% block metapanel %}
 
     <span class="metapanel">
         <b><a href="{% url "authors" %}">Neboard</a> pre1.0</b>
         {% trans "Pages:" %}
         {% for page in pages %}
             [<a href="
             {% if tag %}
                 {% url "tag" tag_name=tag page=page %}
             {% else %}
                 {% url "index" page=page %}
             {% endif %}
             ">{{ page }}</a>]
         {% endfor %}
     </span>
 
 {% endblock %}

boards/templates/boards/settings.html

@@ -1,38 +1,41 b''
 {% extends "boards/base.html" %}
 
 {% load i18n %}
 
 {% block head %}
     <title>Neboard settings</title>
 {% endblock %}
 
 {% block content %}
 
     <div class="post">
-        {% trans 'User:' %} <b>{{ request.session.user.user_id }}</b>
+        {% trans 'User:' %} <b>{{ user.user_id }}</b>.
+        {% if user.is_moderator %}
+            {% trans 'You are moderator.' %}
+        {% endif %}
     </div>
 
     <div class="post-form-w">
     <div class="post-form">
         <span class="form-title">{% trans "Theme" %}</span>
         <form method="post">{% csrf_token %}
             {% for choice in form.fields.theme.choices %}
                 <div class="settings_item">
                     <label for="{{ choice.0 }}">
                     <input type="radio" name="theme"
                            id="{{ choice.0 }}"
                            value="{{ choice.0 }}"
                            {% ifequal form.initial.theme choice.0 %}
                             checked
                            {% endifequal %}
                             />
                         {{ choice.1 }}
                     </label>
                 </div>
             {% endfor %}
         <input type="submit" value="{% trans "Save" %}" />
         </form>
     </div>
     </div>
 
 {% endblock %}
  No newline at end of file

boards/templates/boards/thread.html

@@ -1,116 +1,124 b''
 {% extends "boards/base.html" %}
 
 {% load i18n %}
 {% load markup %}
 
 {% block head %}
     <title>Neboard - {{ posts.0.title }}</title>
 {% endblock %}
 
 {% block content %}
     <script src="{{ STATIC_URL }}js/thread.js"></script>
 
 	{% if posts %}
         <div id="posts">
 		{% for post in posts %}
             {% if posts.0.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="fancy"
                             href="{{ post.image.url }}"><img
                             src="{{ post.image.url_200x150 }}"
                             alt="{% trans 'Post image' %}" />
                     </a>
                 </div>
             {% endif %}
             <div class="message">
                 <div class="post-info">
                     <span class="title">{{ post.title }}</span>
                     <a class="post_id" href="#{{ post.id }}">
                         (#{{ post.id }})</a>
                     [{{ post.pub_time }}]
                     {% if post.is_get %}
                         <span class="get">
                             {% trans "Get!" %}
                         </span>
                     {% endif %}
                 [<a href="#" onclick="javascript:addQuickReply('{{ post.id }}')
                     ; return false;">&gt;&gt;</a>]
+
+                    {% if user.is_moderator %}
+                        <span class="moderator_info">
+                            ({{ post.poster_ip }})
+                            [<a href="{% url 'delete' post_id=post.id %}"
+                                >{% trans 'Delete' %}</a>]
+                        </span>
+                    {% endif %}
                 </div>
                 {% autoescape off %}
                 {{ post.text.rendered }}
                 {% endautoescape %}
             </div>
             {% if post.tags.all %}
                 <div class="metadata">
                     <span class="tags">{% trans 'Tags' %}:
                         {% for tag in post.tags.all %}
                             <a class="tag" href="{% url 'tag' tag.name %}">
                                 {{ tag.name }}</a>
                         {% endfor %}
                     </span>
                 </div>
             {% endif %}
             </div>
 		{% endfor %}
         </div>
 	{% else %}
 		No thread found.
         <hr />
 	{% endif %}
 
     <form id="form" enctype="multipart/form-data" method="post"
             >{% csrf_token %}
         <div class="post-form-w">
             <div class="form-title">{% trans "Reply to thread" %}</div>
             <div class="post-form">
                 <div class="form-row">
                     <div class="form-label">{% trans 'Title' %}</div>
                     <div class="form-input">{{ form.title }}</div>
                     <div class="form-errors">{{ form.title.errors }}</div>
                 </div>
                 <div class="form-row">
                     <div class="form-label">{% trans 'Text' %}</div>
                     <div class="form-input">{{ form.text }}</div>
                     <div class="form-errors">{{ form.text.errors }}</div>
                 </div>
                 <div class="form-row">
                     <div class="form-label">{% trans 'Image' %}</div>
                     <div class="form-input">{{ form.image }}</div>
                     <div class="form-errors">{{ form.image.errors }}</div>
                 </div>
                 <div class="form-row">
                     {{ form.captcha }}
                     <div class="form-errors">{{ form.captcha.errors }}</div>
                 </div>
             </div>
 
             <div class="form-submit"><input type="submit"
                                             value="{% trans "Post" %}"/></div>
             <div><a href="http://daringfireball.net/projects/markdown/basics">
                 {% trans 'Basic markdown syntax.' %}</a></div>
             <div>{% trans 'Example: ' %}*<i>{% trans 'italic' %}</i>*,
                 **<b>{% trans 'bold' %}</b>**</div>
             <div>{% trans 'Quotes can be inserted with' %} "&gt;"</div>
             <div>{% trans 'Links to answers can be inserted with' %}
                 "&gt;&gt;123"
             </div>
         </div>
     </form>
 
 {% endblock %}
 
 {% block metapanel %}
 
     <span class="metapanel">
         {{ posts.0.get_reply_count }} {% trans 'replies' %},
         {{ posts.0.get_images_count }} {% trans 'images' %}.
         {% trans 'Last update: ' %}{{ posts.0.last_edit_time }}
     </span>
 
 {% endblock %}
  No newline at end of file

boards/urls.py

@@ -1,36 +1,37 b''
 from django.conf.urls import patterns, url, include
 from boards import views
 from boards.rss import AllThreadsFeed, TagThreadsFeed, ThreadPostsFeed
 
 urlpatterns = patterns('',
 
     # /boards/
     url(r'^$', views.index, name='index'),
     # /boards/page/
     url(r'^page/(?P<page>\w+)/$', views.index, name='index'),
 
     # login page
     url(r'^login$', views.login, name='login'),
     # logout page
     url(r'^logout$', views.logout, name='logout'),
 
     # /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/thread/
     url(r'^thread/(?P<post_id>\w+)/$', views.thread, name='thread'),
     # /boards/theme/theme_name/
     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'),
 
     # 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()),
 )
  No newline at end of file

boards/views.py

@@ -1,274 +1,287 b''
 import hashlib
 from django.core.urlresolvers import reverse
 from django.template import RequestContext
 from django.shortcuts import render, redirect, get_object_or_404
 from django.http import HttpResponseRedirect
 
 from boards import forms
 import boards
 from boards import utils
 from boards.forms import ThreadForm, PostForm, SettingsForm, PlainErrorList, \
     ThreadCaptchaForm, PostCaptchaForm
 
-from boards.models import Post, Admin, Tag, User
+from boards.models import Post, Admin, Tag, User, RANK_USER, RANK_MODERATOR, NO_PARENT
 from boards import authors
 import neboard
 
 
 def index(request, page=0):
     context = _init_default_context(request)
 
     if utils.need_include_captcha(request):
         threadFormClass = ThreadCaptchaForm
         kwargs = {'request': request}
     else:
         threadFormClass = ThreadForm
         kwargs = {}
 
     if request.method == 'POST':
         form = threadFormClass(request.POST, request.FILES,
                                error_class=PlainErrorList, **kwargs)
 
         if form.is_valid():
             return _new_post(request, form)
     else:
         form = threadFormClass(error_class=PlainErrorList, **kwargs)
 
     threads = Post.objects.get_threads(page=int(page))
 
     context['threads'] = None if len(threads) == 0 else threads
     context['form'] = form
     context['pages'] = range(Post.objects.get_thread_page_count())
 
     return render(request, 'boards/posting_general.html',
                   context)
 
 
 def _new_post(request, form, thread_id=boards.models.NO_PARENT):
     """Add a new post (in thread or as a reply)."""
 
     data = form.cleaned_data
 
     title = data['title']
     text = data['text']
 
     if 'image' in data.keys():
         image = data['image']
     else:
         image = None
 
     ip = _get_client_ip(request)
 
     tags = []
 
     new_thread = thread_id == boards.models.NO_PARENT
     if new_thread:
         tag_strings = data['tags']
 
         if tag_strings:
             tag_strings = tag_strings.split(' ')
             for tag_name in tag_strings:
                 tag_name = tag_name.strip()
                 if len(tag_name) > 0:
                     tag, created = Tag.objects.get_or_create(name=tag_name)
                     tags.append(tag)
 
     # TODO Add a possibility to define a link image instead of an image file.
     # If a link is given, download the image automatically.
 
     post = Post.objects.create_post(title=title, text=text, ip=ip,
                                     parent_id=thread_id, image=image,
                                     tags=tags)
 
     thread_to_show = (post.id if new_thread else thread_id)
 
     if new_thread:
         return redirect(thread, post_id=thread_to_show)
     else:
         return redirect(reverse(thread,
                                 kwargs={'post_id': thread_to_show}) + '#'
                         + str(post.id))
 
 
 def tag(request, tag_name, page=0):
     """Get all tag threads (posts without a parent)."""
 
     tag = get_object_or_404(Tag, name=tag_name)
     threads = Post.objects.get_threads(tag=tag, page=int(page))
 
     if request.method == 'POST':
         form = ThreadForm(request.POST, request.FILES,
                           error_class=PlainErrorList)
         if form.is_valid():
             return _new_post(request, form)
     else:
         form = forms.ThreadForm(initial={'tags': tag_name},
                                 error_class=PlainErrorList)
 
     context = _init_default_context(request)
     context['threads'] = None if len(threads) == 0 else threads
     context['tag'] = tag_name
     context['pages'] = range(Post.objects.get_thread_page_count(tag=tag))
 
     context['form'] = form
 
     return render(request, 'boards/posting_general.html',
                   context)
 
 
 def thread(request, post_id):
     """Get all thread posts"""
 
     if utils.need_include_captcha(request):
         postFormClass = PostCaptchaForm
         kwargs = {'request': request}
     else:
         postFormClass = PostForm
         kwargs = {}
 
     if request.method == 'POST':
         form = postFormClass(request.POST, request.FILES,
                              error_class=PlainErrorList, **kwargs)
         if form.is_valid():
             return _new_post(request, form, post_id)
     else:
         form = postFormClass(error_class=PlainErrorList, **kwargs)
 
     posts = Post.objects.get_thread(post_id)
 
     context = _init_default_context(request)
 
     context['posts'] = posts
     context['form'] = form
 
     return render(request, 'boards/thread.html', context)
 
 
 def login(request):
     """Log in as admin"""
 
     if 'name' in request.POST and 'password' in request.POST:
         request.session['admin'] = False
 
         isAdmin = len(Admin.objects.filter(name=request.POST['name'],
                                            password=request.POST[
                                                'password'])) > 0
 
         if isAdmin:
             request.session['admin'] = True
 
             response = HttpResponseRedirect('/')
 
         else:
             response = render(request, 'boards/login.html', {'error': 'Login error'})
     else:
         response = render(request, 'boards/login.html', {})
 
     return response
 
 
 def logout(request):
     request.session['admin'] = False
     return HttpResponseRedirect('/')
 
 
 def settings(request):
     """User's settings"""
 
     context = _init_default_context(request)
 
     if request.method == 'POST':
         form = SettingsForm(request.POST)
         if form.is_valid():
             selected_theme = form.cleaned_data['theme']
 
             user = _get_user(request)
             user.save_setting('theme', selected_theme)
 
         return redirect(settings)
     else:
         selected_theme = _get_theme(request)
         form = SettingsForm(initial={'theme': selected_theme})
         context['form'] = form
-        _get_user(request)
 
         return render(request, 'boards/settings.html', context)
 
 
 def all_tags(request):
     """All tags list"""
 
     context = _init_default_context(request)
     context['all_tags'] = Tag.objects.get_not_empty_tags()
 
     return render(request, 'boards/tags.html', context)
 
 
 def jump_to_post(request, post_id):
     """Determine thread in which the requested post is and open it's page"""
 
     post = get_object_or_404(Post, id=post_id)
 
     if boards.models.NO_PARENT == post.parent:
         return redirect(thread, post_id=post.id)
     else:
         parent_thread = get_object_or_404(Post, id=post.parent)
         return redirect(reverse(thread, kwargs={'post_id': parent_thread.id})
                         + '#' + str(post.id))
 
 
 def authors(request):
     context = _init_default_context(request)
     context['authors'] = boards.authors.authors
 
     return render(request, 'boards/authors.html', context)
 
 
+def delete(request, post_id):
+    user = _get_user(request)
+    post = get_object_or_404(Post, id=post_id)
+
+    if user.is_moderator():
+        Post.objects.delete_post(post)
+
+    if NO_PARENT == post.parent:
+        return redirect(index)
+    else:
+        return redirect(thread, post_id=post.parent)
+
+
 def _get_theme(request):
     """Get user's CSS theme"""
 
     user = _get_user(request)
     theme = user.get_setting('theme')
     if not theme:
         theme = neboard.settings.DEFAULT_THEME
 
     return theme
 
 
 def _get_client_ip(request):
     x_forwarded_for = request.META.get('HTTP_X_FORWARDED_FOR')
     if x_forwarded_for:
         ip = x_forwarded_for.split(',')[-1].strip()
     else:
         ip = request.META.get('REMOTE_ADDR')
     return ip
 
 
 def _init_default_context(request):
     """Create context with default values that are used in most views"""
 
     context = RequestContext(request)
     context['tags'] = Tag.objects.get_popular_tags()
     context['theme'] = _get_theme(request)
+    context['user'] = _get_user(request)
 
     return context
 
 
 def _get_user(request):
     """Get current user from the session"""
 
     session = request.session
-    if not 'user' in session:
+    if not 'user_id' in session:
         request.session.save()
 
         md5 = hashlib.md5()
         md5.update(session.session_key)
         new_id = md5.hexdigest()
 
-        user = User.objects.create(user_id=new_id)
+        user = User.objects.create(user_id=new_id, rank=RANK_USER)
 
-        session['user'] = user
+        session['user_id'] = user.id
     else:
-        user = session['user']
+        user = User.objects.get(id=session['user_id'])
 
     return user
  No newline at end of file