# HG changeset patch
# User neko259 <neko259@gmail.com>
# Date 2015-07-31 15:03:58
# Node ID 4c8a70f62fe9cf6b6566d7943431458dee153717
# Parent  93f2906af979b18e4bfb832fba63b9e2b94fb236

Don't include archived posts into the random image list

diff --git a/boards/migrations/0020_auto_20150731_1738.py b/boards/migrations/0020_auto_20150731_1738.py
new file mode 100644
--- /dev/null
+++ b/boards/migrations/0020_auto_20150731_1738.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('boards', '0019_auto_20150519_1323'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='post',
+            name='images',
+            field=models.ManyToManyField(to='boards.PostImage', blank=True, null=True, db_index=True, related_name='post_images'),
+        ),
+    ]
diff --git a/boards/models/image.py b/boards/models/image.py
--- a/boards/models/image.py
+++ b/boards/models/image.py
@@ -42,8 +42,9 @@ class PostImageManager(models.Manager):
             md5.update(chunk)
         return md5.hexdigest()
 
-    def get_random_images(self, count):
-        return self.order_by('?')[:count]
+    def get_random_images(self, count, include_archived=False):
+        return self.filter(post_images__thread__archived=include_archived)\
+                .order_by('?')[:count]
 
 
 class PostImage(models.Model, Viewable):
diff --git a/boards/models/post/__init__.py b/boards/models/post/__init__.py
--- a/boards/models/post/__init__.py
+++ b/boards/models/post/__init__.py
@@ -168,7 +168,7 @@ class Post(models.Model, Viewable):
     _text_rendered = TextField(blank=True, null=True, editable=False)
 
     images = models.ManyToManyField(PostImage, null=True, blank=True,
-                                    related_name='ip+', db_index=True)
+                                    related_name='post_images', db_index=True)
 
     poster_ip = models.GenericIPAddressField()