From 7c351ef3419f0a254e592e899f620eb3ee812134 Mon Sep 17 00:00:00 2001
From: Jason McBrayer <jmcbray@carcosa.net>
Date: Fri, 18 Jan 2019 08:03:38 -0500
Subject: [PATCH] Fix an issue with mentions caused by last update

---
 brutaldon/settings.py                              |  2 +-
 brutaldon/templates/main/post_minimal_partial.html |  2 +-
 brutaldon/templates/main/post_partial.html         |  2 +-
 brutaldon/views.py                                 | 14 ++++++--------
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/brutaldon/settings.py b/brutaldon/settings.py
index 0790650..1197e8b 100644
--- a/brutaldon/settings.py
+++ b/brutaldon/settings.py
@@ -193,5 +193,5 @@ SESSION_SERIALIZER = 'django.contrib.sessions.serializers.PickleSerializer'
 ANONYMOUS_HOME_URL = 'about'
 
 # Version number displayed on about page
-BRUTALDON_VERSION = "2.8.0"
+BRUTALDON_VERSION = "2.8.1"
 
diff --git a/brutaldon/templates/main/post_minimal_partial.html b/brutaldon/templates/main/post_minimal_partial.html
index f5887cc..9dfcc1a 100644
--- a/brutaldon/templates/main/post_minimal_partial.html
+++ b/brutaldon/templates/main/post_minimal_partial.html
@@ -21,7 +21,7 @@
                       required="" id="id_status"
                       ic-post-to="{% url "user_search" %}"
                       ic-trigger-on="keyup changed" ic-trigger-delay="500ms"
-                      ic-target="#username_autocomplete"></textarea>
+                      ic-target="#username_autocomplete">{% if form.status.value %}{{ form.status.value }}{% endif %}</textarea>
             <div id="username_autocomplete"></div>
         </div>
         <div id="status_count"></div>
diff --git a/brutaldon/templates/main/post_partial.html b/brutaldon/templates/main/post_partial.html
index bba85bd..7620940 100644
--- a/brutaldon/templates/main/post_partial.html
+++ b/brutaldon/templates/main/post_partial.html
@@ -28,7 +28,7 @@
                   required="" id="id_status"
                   ic-post-to="{% url "user_search" %}"
                   ic-trigger-on="keyup changed" ic-trigger-delay="500ms"
-                  ic-target="#username_autocomplete"></textarea>
+                  ic-target="#username_autocomplete">{% if form.status.value %}{{ form.status.value }}{% endif %}</textarea>
         <div id="username_autocomplete"></div>
     </div>
     <div id="status_count"></div>
diff --git a/brutaldon/views.py b/brutaldon/views.py
index d8cc3e5..edd0462 100644
--- a/brutaldon/views.py
+++ b/brutaldon/views.py
@@ -453,12 +453,10 @@ def toot(request, mention=None):
         if mention:
             if not mention.startswith('@'):
                 mention = '@'+mention
-            form = PostForm(request.GET, request.FILES,
-                            initial={'visibility': request.session['user'].source.privacy,
-                                     'status': mention + '\n' })
+            form = PostForm(initial={'visibility': request.session['user'].source.privacy,
+                                     'status': mention + ' ' })
         else:
-            form = PostForm(request.GET, request.FILES,
-                            initial={'visibility': request.session['user'].source.privacy})
+            form = PostForm(initial={'visibility': request.session['user'].source.privacy})
         if request.GET.get('ic-request'):
             return render(request, 'intercooler/post.html',
                           {'form': form,
@@ -590,9 +588,9 @@ def reply(request, id):
             initial_text = ""
         for mention in [x for x in toot.mentions if x.acct != request.session['user'].acct]:
             initial_text +=('@' + mention.acct + " ")
-        form = PostForm({'status': initial_text,
-                         'visibility': toot.visibility,
-                         'spoiler_text': toot.spoiler_text})
+        form = PostForm(initial={'status': initial_text,
+                                 'visibility': toot.visibility,
+                                 'spoiler_text': toot.spoiler_text})
         return render(request, 'main/reply.html',
                       {'context': context, 'toot': toot, 'form': form, 'reply':True,
                        'own_acct': request.session['user'],