From b63632d9d4edf918489b7b99d58740c9c7eb7d93 Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@gmail.com>
Date: Fri, 4 Jun 2021 08:04:11 -0400
Subject: [PATCH 01/12] update

---
 biostar/forum/ajax.py                      | 15 ++++++++++-
 biostar/forum/management/commands/tasks.py | 30 ++++++++++++++++-----
 biostar/forum/models.py                    | 31 ++++++++++++++++++++++
 biostar/forum/signals.py                   | 17 ++++++++++--
 4 files changed, 84 insertions(+), 9 deletions(-)

diff --git a/biostar/forum/ajax.py b/biostar/forum/ajax.py
index 18d8afebe..7e943192a 100644
--- a/biostar/forum/ajax.py
+++ b/biostar/forum/ajax.py
@@ -20,7 +20,7 @@
 
 from biostar.accounts.models import Profile, User
 from . import auth, util, forms, tasks, search, views, const, moderate
-from .models import Post, Vote, Subscription, delete_post_cache, SharedLink
+from .models import Post, Vote, Subscription, delete_post_cache, SharedLink, Diff
 
 
 
@@ -470,6 +470,19 @@ def email_disable(request, uid):
     return ajax_success(msg='Disabled messages')
 
 
+def view_diff(request, uid):
+    """
+    View diffs made to a post.
+    """
+
+    # View changes made in a post
+    post = Post.objects.filter(uid=uid).first()
+    
+    diff = Diff.objects.filter(post=post)
+
+    return
+
+
 def similar_posts(request, uid):
     """
     Return a feed populated with posts similar to the one in the request.
diff --git a/biostar/forum/management/commands/tasks.py b/biostar/forum/management/commands/tasks.py
index a1563edf0..ab365ebf9 100644
--- a/biostar/forum/management/commands/tasks.py
+++ b/biostar/forum/management/commands/tasks.py
@@ -6,7 +6,7 @@
 from biostar import VERSION
 from django.core.management.base import BaseCommand
 from biostar.forum import models, util, tasks
-from biostar.forum.models import Post
+from biostar.forum.models import Post, Diff
 from django.conf import settings
 from biostar.accounts.models import User
 from biostar.utils.decorators import timeit
@@ -17,8 +17,8 @@
 
 BACKUP_DIR = os.path.join(settings.BASE_DIR, 'export', 'backup')
 
-BUMP, UNBUMP, AWARD = 'bump', 'unbump', 'award'
-CHOICES = [BUMP, UNBUMP, AWARD]
+CHOICES = ['bump', 'unbump', 'award', 'diffs']
+BUMP, UNBUMP, AWARD, DIFFS = CHOICES
 
 
 def bump(uids, **kwargs):
@@ -77,19 +77,37 @@ def awards(limit=50, **kwargs):
     return
 
 
+def create_diffs(nbatch=100000, **kwargs):
+    """
+    Bulk create diffs
+    """
+
+    targets = Post.objects.all()
+
+    def batch():
+        for post in targets:
+            diff = Diff(post=post, initial=post.content, current=post.content, created=post.creation_date,
+                        edited=post.lastedit_date)
+
+            yield diff
+
+    models.Diff.objects.bulk_create(objs=batch(), batch_size=nbatch)
+
 
 class Command(BaseCommand):
     help = 'Preform action on list of posts.'
 
     def add_arguments(self, parser):
         parser.add_argument('--uids', '-u', type=str, required=False, default='', help='List of uids')
-        parser.add_argument('--action', '-a', type=str, required=True, choices=CHOICES, default='',help='Action to take.')
-        parser.add_argument('--limit', dest='limit', type=int, default=100, help='Limit how many users/posts to process.'),
+        parser.add_argument('--action', '-a', type=str, required=True, choices=CHOICES, default='',
+                            help='Action to take.')
+        parser.add_argument('--limit', dest='limit', type=int, default=100,
+                            help='Limit how many users/posts to process.'),
 
     def handle(self, *args, **options):
         action = options['action']
 
-        opts = {BUMP: bump, UNBUMP: unbump, AWARD: awards}
+        opts = {BUMP: bump, UNBUMP: unbump, AWARD: awards, DIFFS: create_diffs}
 
         func = opts[action]
         # print()
diff --git a/biostar/forum/models.py b/biostar/forum/models.py
index 5028b47ca..48e0a431e 100644
--- a/biostar/forum/models.py
+++ b/biostar/forum/models.py
@@ -631,6 +631,37 @@ def save(self, *args, **kwargs):
     def uid(self):
         return self.pk
 
+
+class Diff(models.Model):
+
+    # Initial content state
+    initial = models.TextField(default='')
+
+    # Current content state
+    current = models.TextField(default='')
+
+    # Date the initial content was created
+    created = models.DateTimeField(auto_now_add=True)
+
+    # Date the current content was created
+    edited = models.DateTimeField(auto_now=True)
+
+    # Post this diff belongs to
+    post = models.ForeignKey(Post, on_delete=models.CASCADE)
+
+    def save(self, *args, **kwargs):
+
+        self.initial = self.initial or self.post.content
+        self.current = self.current or self.initial
+
+        self.created = self.created or self.post.lastedit_date
+        self.edited = self.edited or self.created
+
+        super(Diff, self).save(*args, **kwargs)
+
+
+
+
 class Log(models.Model):
     """
     Represents moderation actions
diff --git a/biostar/forum/signals.py b/biostar/forum/signals.py
index 1e2b5ffe8..899e481fd 100644
--- a/biostar/forum/signals.py
+++ b/biostar/forum/signals.py
@@ -1,10 +1,10 @@
 import logging
-from django.db.models.signals import post_save
+from django.db.models.signals import post_save, pre_save
 from django.dispatch import receiver
 from taggit.models import Tag
 from django.db.models import F, Q
 from biostar.accounts.models import Profile, Message, User
-from biostar.forum.models import Post, Award, Subscription, SharedLink
+from biostar.forum.models import Post, Award, Subscription, SharedLink, Diff
 from biostar.forum import tasks, auth, util
 
 
@@ -43,6 +43,19 @@ def send_award_message(sender, instance, created, **kwargs):
     return
 
 
+@receiver(post_save, sender=Post)
+def create_diffs(sender, instance, created, **kwargs):
+    """
+    Create a diff for given post
+    """
+
+    # Create initial diff using post content
+    diff, created = Diff.objects.get_or_create(post=instance)
+
+    # Update existing diff to current post content
+    Diff.objects.filter(pk=diff.pk).update(current=instance.content, editted=instance.lastedit_date)
+
+
 @receiver(post_save, sender=Profile)
 def ban_user(sender, instance, created, **kwargs):
     """

From e10860a65c3a4517dec975b1f1ca775066f8c398 Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@gmail.com>
Date: Fri, 4 Jun 2021 10:19:35 -0400
Subject: [PATCH 02/12] update

---
 biostar/forum/forms.py   |  3 +++
 biostar/forum/models.py  | 12 +++++-------
 biostar/forum/signals.py |  4 ++++
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/biostar/forum/forms.py b/biostar/forum/forms.py
index d9186ad31..17c7b9322 100644
--- a/biostar/forum/forms.py
+++ b/biostar/forum/forms.py
@@ -147,7 +147,10 @@ def edit(self):
             raise forms.ValidationError("Only the author or a moderator can edit a post.")
         data = self.cleaned_data
         self.post.title = data.get('title')
+        # TODO: make trasaction safe
+        #  Compute/save diff here
         self.post.content = data.get("content")
+       
         self.post.type = data.get('post_type')
         self.post.tag_val = data.get('tag_val')
         self.post.lastedit_user = self.user
diff --git a/biostar/forum/models.py b/biostar/forum/models.py
index 48e0a431e..6edddd162 100644
--- a/biostar/forum/models.py
+++ b/biostar/forum/models.py
@@ -635,22 +635,20 @@ def uid(self):
 class Diff(models.Model):
 
     # Initial content state
-    initial = models.TextField(default='')
-
-    # Current content state
-    current = models.TextField(default='')
+    diff = models.TextField(default='')
 
     # Date the initial content was created
     created = models.DateTimeField(auto_now_add=True)
 
-    # Date the current content was created
-    edited = models.DateTimeField(auto_now=True)
-
     # Post this diff belongs to
     post = models.ForeignKey(Post, on_delete=models.CASCADE)
 
+    # Person who created the diff
+    author = ''
+
     def save(self, *args, **kwargs):
 
+
         self.initial = self.initial or self.post.content
         self.current = self.current or self.initial
 
diff --git a/biostar/forum/signals.py b/biostar/forum/signals.py
index 899e481fd..77f7211f0 100644
--- a/biostar/forum/signals.py
+++ b/biostar/forum/signals.py
@@ -49,6 +49,10 @@ def create_diffs(sender, instance, created, **kwargs):
     Create a diff for given post
     """
 
+    # TODO: testout
+    if created:
+        return
+
     # Create initial diff using post content
     diff, created = Diff.objects.get_or_create(post=instance)
 

From 39b0e5cbf55ca6c962bb2ad216f940dbe2095ee8 Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@gmail.com>
Date: Tue, 8 Jun 2021 12:32:58 -0400
Subject: [PATCH 03/12] update

---
 biostar/forum/ajax.py                         | 42 ++++++--------
 biostar/forum/auth.py                         | 58 +++++++++++++++----
 biostar/forum/forms.py                        | 36 ++++++++----
 biostar/forum/herald.py                       |  1 +
 biostar/forum/migrations/0021_diff.py         | 26 +++++++++
 biostar/forum/models.py                       | 11 +---
 biostar/forum/signals.py                      | 17 ------
 biostar/forum/static/forum.css                | 10 +++-
 biostar/forum/static/forum.js                 | 39 +++++++++++--
 .../forum/templates/forms/form_inplace.html   |  3 +-
 biostar/forum/templates/post_view.html        |  1 -
 .../forum/templates/widgets/post_actions.html |  7 +++
 biostar/forum/urls.py                         |  1 +
 biostar/forum/views.py                        | 10 +---
 biostar/utils/decorators.py                   |  4 +-
 15 files changed, 180 insertions(+), 86 deletions(-)
 create mode 100644 biostar/forum/migrations/0021_diff.py

diff --git a/biostar/forum/ajax.py b/biostar/forum/ajax.py
index 7e943192a..5af6e9e40 100644
--- a/biostar/forum/ajax.py
+++ b/biostar/forum/ajax.py
@@ -3,6 +3,7 @@
 import json
 from ratelimit.decorators import ratelimit
 from urllib import request as builtin_request
+from difflib import Differ
 # import requests
 from urllib.parse import urlencode
 from datetime import datetime, timedelta
@@ -237,21 +238,6 @@ def get_fields(request, post=None):
     return fields
 
 
-def set_post(post, user, fields):
-    # Set the fields for this post.
-    if post.is_toplevel:
-        post.title = fields.get('title', post.title)
-        post.type = fields.get('post_type', post.type)
-        post.tag_val = fields.get('tag_val', post.tag_val)
-
-    post.lastedit_user = user
-    post.lastedit_date = util.now()
-    post.content = fields.get('content', post.content)
-    post.save()
-
-    return post
-
-
 @ajax_limited(key=RATELIMIT_KEY, rate=EDIT_RATE)
 @ajax_error_wrapper(method="POST", login_required=True)
 def ajax_edit(request, uid):
@@ -279,7 +265,7 @@ def ajax_edit(request, uid):
         form = forms.PostShortForm(post=post, user=user, data=fields)
 
     if form.is_valid():
-        post = set_post(post, user, form.cleaned_data)
+        form.edit()
         return ajax_success(msg='Edited post', redirect=post.get_absolute_url())
     else:
         msg = [field.errors for field in form if field.errors]
@@ -321,7 +307,7 @@ def ajax_comment_create(request):
 
     if form.is_valid():
         # Create the comment.
-        post = Post.objects.create(type=Post.COMMENT, content=content, author=user, parent=parent)
+        post = form.save()
         return ajax_success(msg='Created post', redirect=post.get_absolute_url())
     else:
         msg = [field.errors for field in form if field.errors]
@@ -470,17 +456,25 @@ def email_disable(request, uid):
     return ajax_success(msg='Disabled messages')
 
 
-def view_diff(request, uid):
+@ajax_error_wrapper(method="POST", login_required=True)
+def view_diff(request, pk):
     """
-    View diffs made to a post.
+    View specific diffs made to a post.
     """
 
-    # View changes made in a post
-    post = Post.objects.filter(uid=uid).first()
-    
-    diff = Diff.objects.filter(post=post)
+    # View changes made by this user.
+    user = request.user
+    diffobj = Diff.objects.filter(pk=pk).first()
+
+    if not diffobj:
+        return ajax_error(msg='Post dot not have a diff')
+
+    # Change new line chars to breakline tags.
+    diff = diffobj.diff
+    diff = diff.replace('\n', '<br>')
 
-    return
+    # Return newly created diff
+    return ajax_success(msg='Disabled messages', diff=diff)
 
 
 def similar_posts(request, uid):
diff --git a/biostar/forum/auth.py b/biostar/forum/auth.py
index c7d223869..d5e44beaa 100644
--- a/biostar/forum/auth.py
+++ b/biostar/forum/auth.py
@@ -3,7 +3,8 @@
 import re
 import urllib.parse as urlparse
 from datetime import timedelta
-
+from difflib import Differ, SequenceMatcher, HtmlDiff, unified_diff
+import bs4
 from django.contrib import messages
 from django.contrib.auth import get_user_model
 from django.core.cache import cache
@@ -21,7 +22,7 @@
 from biostar.utils.helpers import get_ip
 from . import util, awards
 from .const import *
-from .models import Post, Vote, Subscription, Badge, delete_post_cache, Log, SharedLink
+from .models import Post, Vote, Subscription, Badge, delete_post_cache, Log, SharedLink, Diff
 
 User = get_user_model()
 
@@ -67,7 +68,8 @@ def delete_cache(prefix, user):
 
 import datetime
 
-ICONS = [ "monsterid", "robohash", "wavatar", "retro"]
+ICONS = ["monsterid", "robohash", "wavatar", "retro"]
+
 
 def gravatar_url(email, style='mp', size=80, force=None):
     global ICONS
@@ -208,18 +210,19 @@ def create_post_from_json(**json_data):
     return
 
 
-def create_post(author, title, content, request, root=None, parent=None, ptype=Post.QUESTION, tag_val="", nodups=True):
+def create_post(author, title, content, request=None, root=None, parent=None, ptype=Post.QUESTION, tag_val="",
+                nodups=True):
     # Check if a post with this exact content already exists.
     post = Post.objects.filter(content=content, author=author).order_by('-creation_date').first()
 
     # How many seconds since the last post should we disallow duplicates.
-    time_frame = 60
-    if nodups and post:
-        # Check to see if this post was made within given timeframe
-        delta_secs = (util.now() - post.creation_date).seconds
-        if delta_secs < time_frame:
+    frame = 60
+    delta = (util.now() - post.creation_date).seconds if post else frame
+
+    if nodups and delta < frame:
+        if request:
             messages.warning(request, "Post with this content was created recently.")
-            return post
+        return post
 
     post = Post.objects.create(title=title, content=content, root=root, parent=parent,
                                type=ptype, tag_val=tag_val, author=author)
@@ -228,6 +231,41 @@ def create_post(author, title, content, request, root=None, parent=None, ptype=P
     return post
 
 
+def diff_ratio(text1, text2):
+
+    # Do not match on spaces
+    s = SequenceMatcher(lambda char: re.match(r'\w+', char), text1, text2)
+    return round(s.ratio(), 5)
+
+
+def compute_diff(text, post, user):
+    """
+    Compute and return Diff object for diff between text and post.content
+    """
+
+    # Skip on post creation
+    if not post:
+        return
+
+    ratio = diff_ratio(text1=text, text2=post.content)
+
+    # Skip no changes detected
+    if ratio == 1:
+        return
+
+    # Compute diff between text and post.
+    content = post.content.splitlines(keepends=True)
+    text = text.splitlines(keepends=True)
+
+    diff = unified_diff(content, text)
+    diff = ''.join(diff)
+
+    # Create diff object for this user.
+    dobj = Diff.objects.create(diff=diff, post=post, author=user)
+
+    return dobj
+
+
 def merge_profiles(main, alias):
     """
     Merge alias profile into main
diff --git a/biostar/forum/forms.py b/biostar/forum/forms.py
index 17c7b9322..35e598b0a 100644
--- a/biostar/forum/forms.py
+++ b/biostar/forum/forms.py
@@ -11,7 +11,7 @@
 from snowpenguin.django.recaptcha2.widgets import ReCaptchaWidget
 from biostar.accounts.models import User
 from .models import Post, SharedLink
-from biostar.forum import models, auth
+from biostar.forum import models, auth, util
 
 from .const import *
 
@@ -146,13 +146,16 @@ def edit(self):
         if self.user != self.post.author and not self.user.profile.is_moderator:
             raise forms.ValidationError("Only the author or a moderator can edit a post.")
         data = self.cleaned_data
+
         self.post.title = data.get('title')
-        # TODO: make trasaction safe
-        #  Compute/save diff here
-        self.post.content = data.get("content")
-       
+        content = data.get('content', self.post.content)
+        # Calculate diff and save to db
+        auth.compute_diff(text=content, post=self.post, user=self.user)
+        self.post.content = content
+
         self.post.type = data.get('post_type')
         self.post.tag_val = data.get('tag_val')
+        self.post.lastedit_date = util.now()
         self.post.lastedit_user = self.user
         self.post.save()
         return self.post
@@ -190,13 +193,12 @@ def clean_content(self):
 
 class PostShortForm(forms.Form):
     MIN_LEN, MAX_LEN = 10, 10000
-    parent_uid = forms.CharField(widget=forms.HiddenInput(), min_length=2, max_length=32, required=False)
-    content = forms.CharField(widget=forms.Textarea,
-                              min_length=MIN_LEN, max_length=MAX_LEN, strip=False)
+    content = forms.CharField(widget=forms.Textarea, min_length=MIN_LEN, max_length=MAX_LEN, strip=False)
 
-    def __init__(self, user=None, post=None, *args, **kwargs):
+    def __init__(self, post, user=None, request=None, ptype=Post.COMMENT, *args, **kwargs):
         self.user = user
         self.post = post
+        self.ptype = ptype
         super().__init__(*args, **kwargs)
         self.fields['content'].strip = False
 
@@ -210,9 +212,23 @@ def clean(self):
             raise forms.ValidationError("You need to be logged in.")
         return cleaned_data
 
+    def edit(self):
+        # Set the fields for this post.
+        self.post.lastedit_user = self.user
+        self.post.lastedit_date = util.now()
+        content = self.cleaned_data.get('content', self.post.content)
+        auth.compute_diff(text=content, post=self.post, user=self.user)
+        self.post.content = content
+        self.post.save()
+
+    def save(self):
+        content = self.cleaned_data.get('content', self.post.content)
+        post = auth.create_post(parent=self.post, author=self.user, content=content, ptype=self.ptype,
+                                root=self.post.root, title=self.post.title)
+        return post
 
-class MergeProfiles(forms.Form):
 
+class MergeProfiles(forms.Form):
     main = forms.CharField(label='Main user email', max_length=100, required=True)
     alias = forms.CharField(label='Alias email to merge to main', max_length=100, required=True)
 
diff --git a/biostar/forum/herald.py b/biostar/forum/herald.py
index 4974b2b9c..475d4c6a2 100644
--- a/biostar/forum/herald.py
+++ b/biostar/forum/herald.py
@@ -177,6 +177,7 @@ def herald_list(request):
             # Add the Link attribute.
             link = form.cleaned_data['url']
             text = form.cleaned_data['text']
+
             # Create the herald_list objects.
             herald = SharedLink.objects.create(author=user, text=text, url=link)
             messages.success(request, 'Submitted for review.')
diff --git a/biostar/forum/migrations/0021_diff.py b/biostar/forum/migrations/0021_diff.py
new file mode 100644
index 000000000..925ed9c85
--- /dev/null
+++ b/biostar/forum/migrations/0021_diff.py
@@ -0,0 +1,26 @@
+# Generated by Django 3.2 on 2021-06-06 12:43
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('forum', '0020_sharedlink_status'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Diff',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('diff', models.TextField(default='')),
+                ('created', models.DateTimeField(auto_now_add=True)),
+                ('author', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+                ('post', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='forum.post')),
+            ],
+        ),
+    ]
diff --git a/biostar/forum/models.py b/biostar/forum/models.py
index 6edddd162..2165a7912 100644
--- a/biostar/forum/models.py
+++ b/biostar/forum/models.py
@@ -644,22 +644,15 @@ class Diff(models.Model):
     post = models.ForeignKey(Post, on_delete=models.CASCADE)
 
     # Person who created the diff
-    author = ''
+    author = models.ForeignKey(User, on_delete=models.CASCADE)
 
     def save(self, *args, **kwargs):
 
-
-        self.initial = self.initial or self.post.content
-        self.current = self.current or self.initial
-
-        self.created = self.created or self.post.lastedit_date
-        self.edited = self.edited or self.created
+        self.created = self.created or util.now()
 
         super(Diff, self).save(*args, **kwargs)
 
 
-
-
 class Log(models.Model):
     """
     Represents moderation actions
diff --git a/biostar/forum/signals.py b/biostar/forum/signals.py
index 77f7211f0..6d987699d 100644
--- a/biostar/forum/signals.py
+++ b/biostar/forum/signals.py
@@ -43,23 +43,6 @@ def send_award_message(sender, instance, created, **kwargs):
     return
 
 
-@receiver(post_save, sender=Post)
-def create_diffs(sender, instance, created, **kwargs):
-    """
-    Create a diff for given post
-    """
-
-    # TODO: testout
-    if created:
-        return
-
-    # Create initial diff using post content
-    diff, created = Diff.objects.get_or_create(post=instance)
-
-    # Update existing diff to current post content
-    Diff.objects.filter(pk=diff.pk).update(current=instance.content, editted=instance.lastedit_date)
-
-
 @receiver(post_save, sender=Profile)
 def ban_user(sender, instance, created, **kwargs):
     """
diff --git a/biostar/forum/static/forum.css b/biostar/forum/static/forum.css
index 247dc5586..5c3b3d474 100644
--- a/biostar/forum/static/forum.css
+++ b/biostar/forum/static/forum.css
@@ -116,6 +116,14 @@ blockquote.twitter-tweet {
     background: white;
 }
 
+.diff-plus{
+        background: #aee4ae;
+}
+
+.diff-minus{
+    background: #ffc5c5;
+}
+
 #topicbar {
     border: none;
     border-radius: 0;
@@ -549,7 +557,7 @@ i.icon {
     padding-bottom: 10px;
 }
 
-.draggable {
+.draggable, .view-diffs {
     cursor: pointer;
     font-size: 85%;
 }
diff --git a/biostar/forum/static/forum.js b/biostar/forum/static/forum.js
index 1b738c0c1..fbd36c355 100644
--- a/biostar/forum/static/forum.js
+++ b/biostar/forum/static/forum.js
@@ -12,6 +12,30 @@ function captcha() {
     }
 }
 
+function view_diffs(pk, elem) {
+    // View post diff given associated Diff.pk
+
+    $.ajax("/view/diffs/" + pk + '/', {
+        type: 'POST',
+        dataType: 'json',
+        ContentType: 'application/json',
+
+        success: function (data) {
+            if (data.status === 'error') {
+                popup_message(elem, data.msg, data.status);
+                return
+            }
+            // Success
+            elem.html(data.diff);
+            elem.addClass('ui segment');
+        },
+        error: function (xhr, status, text) {
+            error_message(elem, xhr, status, text)
+        }
+    });
+
+
+}
 
 function apply_vote(vote_elem) {
 
@@ -100,7 +124,7 @@ function moderate(uid, container, url) {
 }
 
 
-function disable_emails(user_id, elem){
+function disable_emails(user_id, elem) {
 
     var url = '/email/disable/{0}/'.format(user_id);
     $.ajax(url, {
@@ -195,7 +219,6 @@ function activate_prism(elem) {
 }
 
 
-
 function herald_update(hpk, status, elem) {
 
     $.ajax('/herald/update/' + hpk + '/',
@@ -348,7 +371,10 @@ $(document).ready(function () {
         on: 'hover',
         content: 'Drag and Drop'
     });
-
+    $(".view-diffs").popup({
+        on: 'hover',
+        content: 'View Changes'
+    });
     $("[data-value='bookmark']").popup({
         on: 'hover',
         content: 'Bookmark '
@@ -359,7 +385,7 @@ $(document).ready(function () {
         content: 'Accept'
     });
 
-     $("[data-value='decline']").popup({
+    $("[data-value='decline']").popup({
         on: 'hover',
         content: 'Decline'
     });
@@ -419,7 +445,12 @@ $(document).ready(function () {
     $(this).on('click', ".herald-sub", function (event) {
         herald_subscribe($(this))
     });
+    $(this).on('click', ".view-diffs", function (event) {
+        var pk = $(this).data('value');
+        var elem =  $('#diff-cont');
+        view_diffs(pk, elem);
 
+    });
     $('pre').addClass('language-bash');
     $('code').addClass('language-bash');
     Prism.highlightAll();
diff --git a/biostar/forum/templates/forms/form_inplace.html b/biostar/forum/templates/forms/form_inplace.html
index 0d2c00c7e..f8d983a05 100644
--- a/biostar/forum/templates/forms/form_inplace.html
+++ b/biostar/forum/templates/forms/form_inplace.html
@@ -56,9 +56,10 @@
             </a>
 
             <a class="ui button cancel">
-                <i class="undo icon"></i>Cancel
+                <i class="x icon"></i>Cancel
             </a>
 
+
             {% if post and not new %}
                 <a class="ui right floated button delete">
                     <i class="trash icon"></i>Delete
diff --git a/biostar/forum/templates/post_view.html b/biostar/forum/templates/post_view.html
index eb5f5da0c..98cf8effa 100644
--- a/biostar/forum/templates/post_view.html
+++ b/biostar/forum/templates/post_view.html
@@ -52,7 +52,6 @@
         </div>
     {% endif %}
 
-
     <script>
 
         $(document).ready(function () {
diff --git a/biostar/forum/templates/widgets/post_actions.html b/biostar/forum/templates/widgets/post_actions.html
index 6faceb041..87ce2a5eb 100644
--- a/biostar/forum/templates/widgets/post_actions.html
+++ b/biostar/forum/templates/widgets/post_actions.html
@@ -20,11 +20,16 @@
         &bull;
         {# Draggable element #}
         <a class="draggable"><i class="hand lizard outline icon"></i></a>
+        &bull;
+        <a class="view-diffs"><i class="exchange icon"></i></a>
     {% endif %}
 
     {#  Show title on top level posts #}
     {% if post.is_toplevel and user.is_authenticated %}
         &bull;
+
+        <a class="view-diffs"><i class="exchange icon"></i></a>
+        &bull;
         <div class="ui bottom pointing dropdown" id="subscribe">
             <div class="text">{% follow_label post=post %}</div>
             <i class="caret up icon"></i>
@@ -34,11 +39,13 @@
                 <a class="item" data-value="unfollow"><i class="close icon"></i> stop following</a>
             </div>
         </div>
+
     {% endif %}
 
     <span class="status muted user-info">
         {% post_user_line post=post avatar=avatar %}
     </span>
+    <div id="diff-cont"></div>
 
 </div>
 
diff --git a/biostar/forum/urls.py b/biostar/forum/urls.py
index 30f361946..b70de7dbd 100644
--- a/biostar/forum/urls.py
+++ b/biostar/forum/urls.py
@@ -51,6 +51,7 @@
     path('inplace/form/', ajax.inplace_form, name='inplace_form'),
     path('ajax/user/image/<str:username>/', ajax.user_image, name='user_image'),
     path('similar/posts/<str:uid>/', ajax.similar_posts, name='similar_posts'),
+    path('view/diffs/<int:pk>/', ajax.view_diff, name='view_diff'),
     path('email/disable/<int:uid>/', ajax.email_disable, name='email_disable'),
 
     path('moderate/<str:uid>/', moderate.post_moderate, name="post_moderate"),
diff --git a/biostar/forum/views.py b/biostar/forum/views.py
index 26f4e053b..470fe2a67 100644
--- a/biostar/forum/views.py
+++ b/biostar/forum/views.py
@@ -537,15 +537,11 @@ def post_view(request, uid):
     form = forms.PostShortForm(user=request.user, post=post)
 
     if request.method == "POST":
-
-        form = forms.PostShortForm(data=request.POST, user=request.user, post=post)
+        form = forms.PostShortForm(data=request.POST, ptype=Post.ANSWER, user=request.user, post=post)
         if form.is_valid():
-            author = request.user
-            content = form.cleaned_data.get("content")
-            answer = auth.create_post(title=post.title, parent=post, author=author,
-                                      content=content, ptype=Post.ANSWER, root=post.root,
-                                      request=request)
+            answer = form.save()
             return redirect(answer.get_absolute_url())
+
         messages.error(request, form.errors)
 
     # Build the comment tree .
diff --git a/biostar/utils/decorators.py b/biostar/utils/decorators.py
index 2f853f8a0..e17a0a76d 100644
--- a/biostar/utils/decorators.py
+++ b/biostar/utils/decorators.py
@@ -424,8 +424,8 @@ def select_runner(name):
     # Disable tasks when there are errors, raising exceptions breaks migration.
     WORKER = d_worker()
     TIMER = d_timer()
-    logger.error(f'Error initializing task: {settings.TASK_RUNNER}.')
-    logger.error(f'Tasks disabled: {exc}.')
+    logger.warning(f'Error initializing task: {settings.TASK_RUNNER}.')
+    logger.warning(f'Tasks disabled: {exc}.')
 
 
 def task(f):

From 36e18eff6b2475566768edc74a7a896bc220d12b Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@gmail.com>
Date: Tue, 8 Jun 2021 13:09:50 -0400
Subject: [PATCH 04/12] update

---
 biostar/forum/ajax.py                             |  4 ++--
 biostar/forum/static/forum.js                     | 12 +++++++-----
 biostar/forum/templates/widgets/post_actions.html | 14 ++++++++------
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/biostar/forum/ajax.py b/biostar/forum/ajax.py
index 1ff83b092..50b821af2 100644
--- a/biostar/forum/ajax.py
+++ b/biostar/forum/ajax.py
@@ -463,12 +463,12 @@ def view_diff(request, pk):
     """
 
     # View most recent diff made to a post
-    post = Post.objects.fitler(pk=pk).first()
+    post = Post.objects.filter(pk=pk).first()
 
     diffobj = Diff.objects.filter(post=post).order_by('-pk').first()
 
     if not diffobj:
-        return ajax_error(msg='Post has no recorded changes')
+        return ajax_success(msg='Post has no recorded changes')
 
     # Change new line chars to break line tags.
     diff = diffobj.diff
diff --git a/biostar/forum/static/forum.js b/biostar/forum/static/forum.js
index 5c1777ea3..74201f14f 100644
--- a/biostar/forum/static/forum.js
+++ b/biostar/forum/static/forum.js
@@ -12,10 +12,10 @@ function captcha() {
     }
 }
 
-function view_diffs(pk, elem) {
+function view_diffs(uid, elem) {
     // View post diff given associated Diff.pk
 
-    $.ajax("/view/diffs/" + pk + '/', {
+    $.ajax("/view/diffs/" + uid + '/', {
         type: 'POST',
         dataType: 'json',
         ContentType: 'application/json',
@@ -447,9 +447,11 @@ $(document).ready(function () {
         herald_subscribe($(this))
     });
     $(this).on('click', ".view-diffs", function (event) {
-        var pk = $(this).data('value');
-        var elem =  $('#diff-cont');
-        view_diffs(pk, elem);
+        var post = $(this).closest('.post');
+        var uid = post.data('value');
+        var elem =  post.find('.diff-cont');
+
+        view_diffs(uid, elem);
 
     });
     $('pre').addClass('language-bash');
diff --git a/biostar/forum/templates/widgets/post_actions.html b/biostar/forum/templates/widgets/post_actions.html
index 1da5899fe..6d00a65c5 100644
--- a/biostar/forum/templates/widgets/post_actions.html
+++ b/biostar/forum/templates/widgets/post_actions.html
@@ -11,25 +11,27 @@
 
     {% if post.is_editable %}
         &bull; <a class="edit-button" href="#">edit</a>
+
     {% endif %}
 
     {% if post.can_moderate %}
         &bull; <a class="moderate" href="#">moderate</a>
     {% endif %}
+
+    {% if post.is_editable %}
+        &bull;
+        <a class="view-diffs"><i class="exchange icon"></i></a>
+    {% endif %}
     {% if not post.is_toplevel  and post.is_editable %}
         &bull;
         {# Draggable element #}
         <a class="draggable"><i class="hand lizard outline icon"></i></a>
-        &bull;
-        <a class="view-diffs"><i class="exchange icon"></i></a>
+
     {% endif %}
 
     {#  Show title on top level posts #}
     {% if post.is_toplevel and user.is_authenticated %}
         &bull;
-
-        <a class="view-diffs" ><i class="exchange icon"></i></a>
-        &bull;
         <div class="ui bottom pointing dropdown" id="subscribe">
             <div class="text">{% follow_label post=post %}</div>
             <i class="caret up icon"></i>
@@ -45,7 +47,7 @@
     <span class="status muted user-info">
         {% post_user_line post=post avatar=avatar %}
     </span>
-    <div id="diff-cont"></div>
+    <div class="diff-cont"></div>
 
 </div>
 

From 9bee8f3d77812b0e416d6a7d7bda0330edcf8002 Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@gmail.com>
Date: Wed, 9 Jun 2021 09:54:27 -0400
Subject: [PATCH 05/12] update

---
 biostar/forum/ajax.py                         | 14 +++++++----
 biostar/forum/auth.py                         | 18 +++++++++++----
 biostar/forum/static/forum.js                 | 23 +++++++++++--------
 biostar/forum/static/inplace.js               |  1 +
 biostar/forum/templates/diff.html             |  3 +++
 biostar/forum/templates/widgets/diff.html     | 10 --------
 .../forum/templates/widgets/post_actions.html |  6 ++---
 biostar/forum/urls.py                         |  2 +-
 8 files changed, 45 insertions(+), 32 deletions(-)
 create mode 100644 biostar/forum/templates/diff.html
 delete mode 100644 biostar/forum/templates/widgets/diff.html

diff --git a/biostar/forum/ajax.py b/biostar/forum/ajax.py
index 50b821af2..2826ed39f 100644
--- a/biostar/forum/ajax.py
+++ b/biostar/forum/ajax.py
@@ -457,25 +457,29 @@ def email_disable(request, uid):
 
 
 @ajax_error_wrapper(method="POST", login_required=True)
-def view_diff(request, pk):
+def view_diff(request, uid):
     """
     View most recent diff to a post.
     """
 
     # View most recent diff made to a post
-    post = Post.objects.filter(pk=pk).first()
+    post = Post.objects.filter(uid=uid).first()
 
     diffobj = Diff.objects.filter(post=post).order_by('-pk').first()
 
+    print(post, diffobj, uid)
     if not diffobj:
-        return ajax_success(msg='Post has no recorded changes')
+        return ajax_error(msg='Post has no recorded changes')
 
     # Change new line chars to break line tags.
     diff = diffobj.diff
-    #diff = diff.replace('\n', '<br>')
+    diff = diff.replace('\n', '<br>')
+    context = dict(dobj=diffobj, diff=diff)
+    tmpl = loader.get_template(template_name='diff.html')
+    tmpl = tmpl.render(context)
 
     # Return newly created diff
-    return ajax_success(msg='Disabled messages', diff=diff)
+    return ajax_success(msg='Disabled messages', diff=tmpl)
 
 
 def similar_posts(request, uid):
diff --git a/biostar/forum/auth.py b/biostar/forum/auth.py
index d5e44beaa..840d570ca 100644
--- a/biostar/forum/auth.py
+++ b/biostar/forum/auth.py
@@ -254,14 +254,24 @@ def compute_diff(text, post, user):
         return
 
     # Compute diff between text and post.
-    content = post.content.splitlines(keepends=True)
-    text = text.splitlines(keepends=True)
+    content = post.content.splitlines()
+    text = text.splitlines()
 
     diff = unified_diff(content, text)
+    diff = [f"{line}\n" if not line.endswith('\n') else line for line in diff]
     diff = ''.join(diff)
 
-    # Create diff object for this user.
-    dobj = Diff.objects.create(diff=diff, post=post, author=user)
+    # See if a diff has been made by this user in the past 10 minutes
+    dobj = Diff.objects.filter(post=post, author=post.author).first()
+
+    frame = 60 * 10
+    delta = (util.now() - dobj.creation).seconds if dobj else frame
+
+    print(post, delta, frame)
+    # Create diff object within time frame
+    if delta >= frame:
+        # Create diff object for this user.
+        dobj = Diff.objects.create(diff=diff, post=post, author=user)
 
     return dobj
 
diff --git a/biostar/forum/static/forum.js b/biostar/forum/static/forum.js
index 74201f14f..36126c225 100644
--- a/biostar/forum/static/forum.js
+++ b/biostar/forum/static/forum.js
@@ -12,8 +12,12 @@ function captcha() {
     }
 }
 
-function view_diffs(uid, elem) {
-    // View post diff given associated Diff.pk
+function view_diffs(uid, elem, post) {
+
+    if (elem.children().length > 0){
+         elem.html('');
+         return
+    }
 
     $.ajax("/view/diffs/" + uid + '/', {
         type: 'POST',
@@ -22,20 +26,21 @@ function view_diffs(uid, elem) {
 
         success: function (data) {
             if (data.status === 'error') {
-                popup_message(elem, data.msg, data.status);
+                popup_message(post, data.msg, data.status);
                 return
             }
             // Success
-            var insert = "<div class='ui segment' style='white-space: pre-line'>" + data.diff +" </div>";
-            elem.html(insert);
+            // TODO change to insert data.html
+            var insert = "<div class='diffs' style='white-space: pre-line'>" + data.diff +" </div>";
+            //elem.html(insert);
+            elem.html(insert)
             //elem.addClass('ui segment');
         },
         error: function (xhr, status, text) {
-            error_message(elem, xhr, status, text)
+            error_message(post, xhr, status, text)
         }
     });
 
-
 }
 
 function apply_vote(vote_elem) {
@@ -449,9 +454,9 @@ $(document).ready(function () {
     $(this).on('click', ".view-diffs", function (event) {
         var post = $(this).closest('.post');
         var uid = post.data('value');
-        var elem =  post.find('.diff-cont');
+        var elem =  post.find('.diff-cont').first();
 
-        view_diffs(uid, elem);
+        view_diffs(uid, elem, post);
 
     });
     $('pre').addClass('language-bash');
diff --git a/biostar/forum/static/inplace.js b/biostar/forum/static/inplace.js
index 9fe1aa13f..699a3c675 100644
--- a/biostar/forum/static/inplace.js
+++ b/biostar/forum/static/inplace.js
@@ -61,6 +61,7 @@ function cancel_inplace() {
     //if (inplace.length){}
     // Remove inplace item
     inplace.remove();
+    $('.diff-cont').html('');
 
     // Find the hidden items
     var hidden = hidden_selector();
diff --git a/biostar/forum/templates/diff.html b/biostar/forum/templates/diff.html
new file mode 100644
index 000000000..f563ed907
--- /dev/null
+++ b/biostar/forum/templates/diff.html
@@ -0,0 +1,3 @@
+
+{{ diff|safe }}
+changes made by  <a href="{{ dobj.author.get_absoulute_url }}">{{ dobj.author.profile.name }}</a>
\ No newline at end of file
diff --git a/biostar/forum/templates/widgets/diff.html b/biostar/forum/templates/widgets/diff.html
deleted file mode 100644
index 566549bdf..000000000
--- a/biostar/forum/templates/widgets/diff.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Title</title>
-</head>
-<body>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/biostar/forum/templates/widgets/post_actions.html b/biostar/forum/templates/widgets/post_actions.html
index 6d00a65c5..7063cf313 100644
--- a/biostar/forum/templates/widgets/post_actions.html
+++ b/biostar/forum/templates/widgets/post_actions.html
@@ -20,7 +20,7 @@
 
     {% if post.is_editable %}
         &bull;
-        <a class="view-diffs"><i class="exchange icon"></i></a>
+        <a class="view-diffs"><i class="window restore outline icon"></i></a>
     {% endif %}
     {% if not post.is_toplevel  and post.is_editable %}
         &bull;
@@ -43,11 +43,11 @@
         </div>
 
     {% endif %}
-
+<div class="diff-cont"></div>
     <span class="status muted user-info">
         {% post_user_line post=post avatar=avatar %}
     </span>
-    <div class="diff-cont"></div>
+
 
 </div>
 
diff --git a/biostar/forum/urls.py b/biostar/forum/urls.py
index b70de7dbd..c12c79c04 100644
--- a/biostar/forum/urls.py
+++ b/biostar/forum/urls.py
@@ -51,7 +51,7 @@
     path('inplace/form/', ajax.inplace_form, name='inplace_form'),
     path('ajax/user/image/<str:username>/', ajax.user_image, name='user_image'),
     path('similar/posts/<str:uid>/', ajax.similar_posts, name='similar_posts'),
-    path('view/diffs/<int:pk>/', ajax.view_diff, name='view_diff'),
+    path('view/diffs/<str:uid>/', ajax.view_diff, name='view_diff'),
     path('email/disable/<int:uid>/', ajax.email_disable, name='email_disable'),
 
     path('moderate/<str:uid>/', moderate.post_moderate, name="post_moderate"),

From d8a54202573ce4275071d0f22a2559ba8a863950 Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@gmail.com>
Date: Sun, 11 Jul 2021 16:25:08 -0400
Subject: [PATCH 06/12] refactor and update

---
 biostar/forum/ajax.py                         | 14 +++++-------
 biostar/forum/auth.py                         |  6 ++---
 biostar/forum/migrations/0021_diff.py         |  2 +-
 biostar/forum/models.py                       |  8 ++++++-
 biostar/forum/static/forum.js                 | 22 ++++++++++---------
 biostar/forum/templates/diff.html             | 12 +++++++---
 .../forum/templates/widgets/post_actions.html |  3 ++-
 7 files changed, 40 insertions(+), 27 deletions(-)

diff --git a/biostar/forum/ajax.py b/biostar/forum/ajax.py
index 2826ed39f..bccc76abe 100644
--- a/biostar/forum/ajax.py
+++ b/biostar/forum/ajax.py
@@ -465,21 +465,19 @@ def view_diff(request, uid):
     # View most recent diff made to a post
     post = Post.objects.filter(uid=uid).first()
 
-    diffobj = Diff.objects.filter(post=post).order_by('-pk').first()
+    diffs = Diff.objects.filter(post=post).order_by('-pk')
 
-    print(post, diffobj, uid)
-    if not diffobj:
-        return ajax_error(msg='Post has no recorded changes')
+    # Post has no recorded changes,
+    if not diffs.exists():
+        return ajax_success(has_changes=False, msg='Post has no recorded changes')
 
     # Change new line chars to break line tags.
-    diff = diffobj.diff
-    diff = diff.replace('\n', '<br>')
-    context = dict(dobj=diffobj, diff=diff)
+    context = dict(diffs=diffs)
     tmpl = loader.get_template(template_name='diff.html')
     tmpl = tmpl.render(context)
 
     # Return newly created diff
-    return ajax_success(msg='Disabled messages', diff=tmpl)
+    return ajax_success(has_changes=True, msg='Showing changes', diff=tmpl)
 
 
 def similar_posts(request, uid):
diff --git a/biostar/forum/auth.py b/biostar/forum/auth.py
index 840d570ca..08849f1d5 100644
--- a/biostar/forum/auth.py
+++ b/biostar/forum/auth.py
@@ -264,10 +264,10 @@ def compute_diff(text, post, user):
     # See if a diff has been made by this user in the past 10 minutes
     dobj = Diff.objects.filter(post=post, author=post.author).first()
 
-    frame = 60 * 10
-    delta = (util.now() - dobj.creation).seconds if dobj else frame
+    # 10 minute time frame between
+    frame = 1 * 10
+    delta = (util.now() - dobj.created).seconds if dobj else frame
 
-    print(post, delta, frame)
     # Create diff object within time frame
     if delta >= frame:
         # Create diff object for this user.
diff --git a/biostar/forum/migrations/0021_diff.py b/biostar/forum/migrations/0021_diff.py
index 925ed9c85..ec3fbcac9 100644
--- a/biostar/forum/migrations/0021_diff.py
+++ b/biostar/forum/migrations/0021_diff.py
@@ -1,4 +1,4 @@
-# Generated by Django 3.2 on 2021-06-06 12:43
+# Generated by Django 3.2 on 2021-07-11 19:58
 
 from django.conf import settings
 from django.db import migrations, models
diff --git a/biostar/forum/models.py b/biostar/forum/models.py
index 2165a7912..c2d4408fe 100644
--- a/biostar/forum/models.py
+++ b/biostar/forum/models.py
@@ -637,7 +637,7 @@ class Diff(models.Model):
     # Initial content state
     diff = models.TextField(default='')
 
-    # Date the initial content was created
+    # Date this change was made.
     created = models.DateTimeField(auto_now_add=True)
 
     # Post this diff belongs to
@@ -652,6 +652,12 @@ def save(self, *args, **kwargs):
 
         super(Diff, self).save(*args, **kwargs)
 
+    @property
+    def breakline(self):
+        diff = self.diff
+        diff = diff.replace('\n', '<br>')
+        return diff
+
 
 class Log(models.Model):
     """
diff --git a/biostar/forum/static/forum.js b/biostar/forum/static/forum.js
index 36126c225..b4295a38e 100644
--- a/biostar/forum/static/forum.js
+++ b/biostar/forum/static/forum.js
@@ -14,9 +14,9 @@ function captcha() {
 
 function view_diffs(uid, elem, post) {
 
-    if (elem.children().length > 0){
-         elem.html('');
-         return
+    if (elem.children().length > 0) {
+        elem.html('');
+        return
     }
 
     $.ajax("/view/diffs/" + uid + '/', {
@@ -29,12 +29,14 @@ function view_diffs(uid, elem, post) {
                 popup_message(post, data.msg, data.status);
                 return
             }
-            // Success
-            // TODO change to insert data.html
-            var insert = "<div class='diffs' style='white-space: pre-line'>" + data.diff +" </div>";
-            //elem.html(insert);
-            elem.html(insert)
-            //elem.addClass('ui segment');
+            if (data.has_changes) {
+                elem.html(data.diff)
+
+            } else {
+                popup_message(elem, data.msg, data.status);
+
+            }
+
         },
         error: function (xhr, status, text) {
             error_message(post, xhr, status, text)
@@ -454,7 +456,7 @@ $(document).ready(function () {
     $(this).on('click', ".view-diffs", function (event) {
         var post = $(this).closest('.post');
         var uid = post.data('value');
-        var elem =  post.find('.diff-cont').first();
+        var elem = post.find('.diff-cont').first();
 
         view_diffs(uid, elem, post);
 
diff --git a/biostar/forum/templates/diff.html b/biostar/forum/templates/diff.html
index f563ed907..8cc785ddc 100644
--- a/biostar/forum/templates/diff.html
+++ b/biostar/forum/templates/diff.html
@@ -1,3 +1,9 @@
-
-{{ diff|safe }}
-changes made by  <a href="{{ dobj.author.get_absoulute_url }}">{{ dobj.author.profile.name }}</a>
\ No newline at end of file
+<div class="ui vertical segment">
+    {% for dobj in diffs %}
+        {{ dobj.breakline|safe }}
+        <div class="muted">
+            changes made by <a href="{{ dobj.author.get_absoulute_url }}">{{ dobj.author.profile.name }}</a>
+            {{ dobj.created|timesince }} ago
+        </div>
+    {% endfor %}
+</div>
diff --git a/biostar/forum/templates/widgets/post_actions.html b/biostar/forum/templates/widgets/post_actions.html
index 7063cf313..727d48a2e 100644
--- a/biostar/forum/templates/widgets/post_actions.html
+++ b/biostar/forum/templates/widgets/post_actions.html
@@ -43,7 +43,7 @@
         </div>
 
     {% endif %}
-<div class="diff-cont"></div>
+
     <span class="status muted user-info">
         {% post_user_line post=post avatar=avatar %}
     </span>
@@ -51,6 +51,7 @@
 
 </div>
 
+<span class="diff-cont"></span>
 
 
 

From 332b94e363cafcb77c717e22e4d5f26f1ed29f64 Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@gmail.com>
Date: Mon, 12 Jul 2021 08:53:43 -0400
Subject: [PATCH 07/12] update

---
 biostar/forum/auth.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/biostar/forum/auth.py b/biostar/forum/auth.py
index 08849f1d5..f7390cf16 100644
--- a/biostar/forum/auth.py
+++ b/biostar/forum/auth.py
@@ -265,7 +265,7 @@ def compute_diff(text, post, user):
     dobj = Diff.objects.filter(post=post, author=post.author).first()
 
     # 10 minute time frame between
-    frame = 1 * 10
+    frame = 6 * 10
     delta = (util.now() - dobj.created).seconds if dobj else frame
 
     # Create diff object within time frame

From dad5de01591cbf2078b6299601b7b389a9807cf3 Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@gmail.com>
Date: Thu, 15 Jul 2021 22:41:36 -0400
Subject: [PATCH 08/12] adds more logs

---
 biostar/forum/auth.py    | 7 ++++---
 biostar/forum/signals.py | 4 +++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/biostar/forum/auth.py b/biostar/forum/auth.py
index f7390cf16..6cd4ba650 100644
--- a/biostar/forum/auth.py
+++ b/biostar/forum/auth.py
@@ -265,13 +265,14 @@ def compute_diff(text, post, user):
     dobj = Diff.objects.filter(post=post, author=post.author).first()
 
     # 10 minute time frame between
-    frame = 6 * 10
+    frame = 6 * 100
     delta = (util.now() - dobj.created).seconds if dobj else frame
 
-    # Create diff object within time frame
-    if delta >= frame:
+    # Create diff object within time frame or the person editing is a mod.
+    if delta >= frame or user != post.author:
         # Create diff object for this user.
         dobj = Diff.objects.create(diff=diff, post=post, author=user)
+        db_logger(user=user, action=Log.EDIT, text=f'changed post by {ratio}', post=post)
 
     return dobj
 
diff --git a/biostar/forum/signals.py b/biostar/forum/signals.py
index 6d987699d..81bf5e146 100644
--- a/biostar/forum/signals.py
+++ b/biostar/forum/signals.py
@@ -29,7 +29,7 @@ def send_award_message(sender, instance, created, **kwargs):
 
 
 @receiver(post_save, sender=SharedLink)
-def send_award_message(sender, instance, created, **kwargs):
+def send_herald_message(sender, instance, created, **kwargs):
     """
     Send message to users when they receive an award.
     """
@@ -39,6 +39,8 @@ def send_award_message(sender, instance, created, **kwargs):
 
         # Let the user know we have received.
         tasks.create_messages(template=template, extra_context=context, user_ids=[instance.author.pk])
+        logmsg = f"{instance.get_status_display().lower()} herald story {instance.url[:100]}"
+        auth.db_logger(user=instance.author, text=logmsg)
 
     return
 

From 6253538095e4281771bd02193d75231452265cf5 Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@gmail.com>
Date: Thu, 15 Jul 2021 22:42:54 -0400
Subject: [PATCH 09/12] herald submission ordered by creation

---
 biostar/forum/herald.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/biostar/forum/herald.py b/biostar/forum/herald.py
index 475d4c6a2..bcafd7a83 100644
--- a/biostar/forum/herald.py
+++ b/biostar/forum/herald.py
@@ -100,7 +100,7 @@ def herald_publisher(request, limit=20, nmin=1):
     # Reset status on published links.
     # SharedLink.objects.filter(status=SharedLink.PUBLISHED).update(status=SharedLink.ACCEPTED)
 
-    heralds = SharedLink.objects.filter(status=SharedLink.ACCEPTED).order_by('-creation_date')[:limit]
+    heralds = SharedLink.objects.filter(status=SharedLink.ACCEPTED).order_by('-pk')[:limit]
     count = heralds.count()
 
     if count < nmin:

From 9d4b6494cc466d22871f8b8bc798a794c0aa0758 Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@gmail.com>
Date: Fri, 16 Jul 2021 08:28:56 -0400
Subject: [PATCH 10/12] improved logs

---
 biostar/forum/auth.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/biostar/forum/auth.py b/biostar/forum/auth.py
index 6cd4ba650..e64824496 100644
--- a/biostar/forum/auth.py
+++ b/biostar/forum/auth.py
@@ -272,7 +272,10 @@ def compute_diff(text, post, user):
     if delta >= frame or user != post.author:
         # Create diff object for this user.
         dobj = Diff.objects.create(diff=diff, post=post, author=user)
-        db_logger(user=user, action=Log.EDIT, text=f'changed post by {ratio}', post=post)
+
+        # Only log when anyone but the author commits changes.
+        if user != post.author:
+            db_logger(user=user, action=Log.EDIT, text=f'edited post', target=post.author, post=post)
 
     return dobj
 

From 64178e6b0b5685ab5a1b3026b9441ac52b700df7 Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@gmail.com>
Date: Fri, 16 Jul 2021 08:44:53 -0400
Subject: [PATCH 11/12] clean up

---
 biostar/forum/management/commands/tasks.py | 22 +++-------------------
 biostar/forum/static/forum.css             |  9 +--------
 2 files changed, 4 insertions(+), 27 deletions(-)

diff --git a/biostar/forum/management/commands/tasks.py b/biostar/forum/management/commands/tasks.py
index ab365ebf9..5b4082b9b 100644
--- a/biostar/forum/management/commands/tasks.py
+++ b/biostar/forum/management/commands/tasks.py
@@ -17,8 +17,8 @@
 
 BACKUP_DIR = os.path.join(settings.BASE_DIR, 'export', 'backup')
 
-CHOICES = ['bump', 'unbump', 'award', 'diffs']
-BUMP, UNBUMP, AWARD, DIFFS = CHOICES
+CHOICES = ['bump', 'unbump', 'award']
+BUMP, UNBUMP, AWARD = CHOICES
 
 
 def bump(uids, **kwargs):
@@ -77,22 +77,6 @@ def awards(limit=50, **kwargs):
     return
 
 
-def create_diffs(nbatch=100000, **kwargs):
-    """
-    Bulk create diffs
-    """
-
-    targets = Post.objects.all()
-
-    def batch():
-        for post in targets:
-            diff = Diff(post=post, initial=post.content, current=post.content, created=post.creation_date,
-                        edited=post.lastedit_date)
-
-            yield diff
-
-    models.Diff.objects.bulk_create(objs=batch(), batch_size=nbatch)
-
 
 class Command(BaseCommand):
     help = 'Preform action on list of posts.'
@@ -107,7 +91,7 @@ def add_arguments(self, parser):
     def handle(self, *args, **options):
         action = options['action']
 
-        opts = {BUMP: bump, UNBUMP: unbump, AWARD: awards, DIFFS: create_diffs}
+        opts = {BUMP: bump, UNBUMP: unbump, AWARD: awards}
 
         func = opts[action]
         # print()
diff --git a/biostar/forum/static/forum.css b/biostar/forum/static/forum.css
index 5c3b3d474..e5f71abdf 100644
--- a/biostar/forum/static/forum.css
+++ b/biostar/forum/static/forum.css
@@ -116,13 +116,6 @@ blockquote.twitter-tweet {
     background: white;
 }
 
-.diff-plus{
-        background: #aee4ae;
-}
-
-.diff-minus{
-    background: #ffc5c5;
-}
 
 #topicbar {
     border: none;
@@ -557,7 +550,7 @@ i.icon {
     padding-bottom: 10px;
 }
 
-.draggable, .view-diffs {
+.draggable {
     cursor: pointer;
     font-size: 85%;
 }

From 139a813d19d6d286652db696b2f21fed22283d27 Mon Sep 17 00:00:00 2001
From: Natay Aberra <natay.aberra@gmail.com>
Date: Fri, 16 Jul 2021 09:22:43 -0400
Subject: [PATCH 12/12] change in inplace form

---
 biostar/forum/static/forum.js                   | 2 +-
 biostar/forum/templates/forms/form_inplace.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/biostar/forum/static/forum.js b/biostar/forum/static/forum.js
index b4295a38e..e4f6d482c 100644
--- a/biostar/forum/static/forum.js
+++ b/biostar/forum/static/forum.js
@@ -292,7 +292,7 @@ $(document).ready(function () {
 
     $('.ui.dropdown').dropdown();
 
-    $('form .preview').each(function () {
+    $('#form .preview').each(function () {
         var text = $(this).closest('form').find('.wmd-input').val();
         var form = $(this).closest('form');
         setTimeout(function () {
diff --git a/biostar/forum/templates/forms/form_inplace.html b/biostar/forum/templates/forms/form_inplace.html
index f8d983a05..8d0ecdd0e 100644
--- a/biostar/forum/templates/forms/form_inplace.html
+++ b/biostar/forum/templates/forms/form_inplace.html
@@ -6,7 +6,7 @@
 
 <div class="ui basic form-wrap segment fit" id="inplace">
 
-    <form class="ui compact form">
+    <form class="ui compact form" id="form">
         {# Create a new comment #}
         {% if new %}
             <div class="field">