Extra refactoring on posting

misago/threads/checksums.py

@@ -3,9 +3,9 @@ from misago.markup import checksums
 
 def is_post_valid(post):
     valid_checksum = make_post_checksum(post)
-    return post.post_checksum == valid_checksum
+    return post.checksum == valid_checksum
 
 
 def update_post_checksum(post):
     post_seeds = [unicode(v) for v in (post.id, post.poster_ip)]
-    return checksums.make_checksum(post.post_parsed, post_seeds)
+    return checksums.make_checksum(post.parsed, post_seeds)

misago/threads/forms/reply.py

@@ -43,8 +43,8 @@ class ReplyForm(forms.Form):
 
         self.parsing_result = common_flavour(post, self.post_instance.poster)
 
-        self.post_instance.post = self.parsing_result['original_text']
-        self.post_instance.post_parsed = self.parsing_result['parsed_text']
+        self.post_instance.original = self.parsing_result['original_text']
+        self.post_instance.parsed = self.parsing_result['parsed_text']
 
     def validate_data(self, data):
         self.validate_post(data.get('post', ''))

misago/threads/migrations/0001_initial.py

@@ -33,9 +33,9 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
                 ('poster_name', models.CharField(max_length=255)),
                 ('poster_ip', models.GenericIPAddressField()),
-                ('post', models.TextField()),
-                ('post_parsed', models.TextField()),
-                ('post_checksum', models.CharField(max_length=64)),
+                ('original', models.TextField()),
+                ('parsed', models.TextField()),
+                ('checksum', models.CharField(max_length=64)),
                 ('has_attachments', models.BooleanField(default=False)),
                 ('pickled_attachments', models.TextField(null=True, blank=True)),
                 ('posted_on', models.DateTimeField()),

misago/threads/models/post.py

@@ -12,9 +12,9 @@ class Post(models.Model):
                                on_delete=models.SET_NULL)
     poster_name = models.CharField(max_length=255)
     poster_ip = models.GenericIPAddressField()
-    post = models.TextField()
-    post_parsed = models.TextField()
-    post_checksum = models.CharField(max_length=64)
+    original = models.TextField()
+    parsed = models.TextField()
+    checksum = models.CharField(max_length=64)
     mentions = models.ManyToManyField(settings.AUTH_USER_MODEL,
                                       related_name="mention_set")
     has_attachments = models.BooleanField(default=False)

misago/threads/posting/recordedit.py

@@ -0,0 +1,17 @@
+from django.db.models import F
+
+from misago.threads.posting import EditorFormsetMiddleware, EDIT
+
+
+class RecordEditMiddleware(EditorFormsetMiddleware):
+    def __init__(self, **kwargs):
+        super(RecordEditMiddleware, self).__init__(**kwargs)
+
+        if self.mode == EDIT:
+            self.original_title = self.thread.title
+            self.original_post = self.post.raw
+
+    def save(self, form):
+        if self.mode == EDIT:
+            # record edit
+            pass

misago/threads/posting/reply.py

@@ -10,7 +10,7 @@ from misago.threads.posting import EditorFormsetMiddleware, START, REPLY, EDIT
 
 class ReplyFormMiddleware(EditorFormsetMiddleware):
     def make_form(self):
-        initial_data = {'title': self.thread.title, 'post': self.post.post}
+        initial_data = {'title': self.thread.title, 'post': self.post.original}
 
         if self.mode == START:
             if self.request.method == 'POST':

misago/threads/tests/test_editor_view.py

@@ -101,7 +101,7 @@ class StartThreadFormTests(AdminTestCase):
 
         last_post = self.test_admin.post_set.all()[:1][0]
         self.assertEqual(last_post.forum_id, self.forum.pk)
-        self.assertEqual(last_post.post, 'Lorem ipsum dolor met!')
+        self.assertEqual(last_post.original, 'Lorem ipsum dolor met!')
         self.assertEqual(last_post.poster_id, updated_admin.id)
         self.assertEqual(last_post.poster_name, updated_admin.username)