From ccb21b0cdc6051ba3ff663117fa779fb997d8d34 Mon Sep 17 00:00:00 2001
From: Jason McBrayer <jmcbray@carcosa.net>
Date: Thu, 6 Sep 2018 20:51:18 -0400
Subject: [PATCH] Fix formatting problem with redrafts and tags

Plus misc. redraft problems
---
 Pipfile                                    | 2 ++
 brutaldon/templates/main/toot_partial.html | 3 ++-
 brutaldon/views.py                         | 6 ++++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Pipfile b/Pipfile
index dd2cedd..13cd8b4 100644
--- a/Pipfile
+++ b/Pipfile
@@ -23,6 +23,8 @@ six = "*"
 webencodings = "*"
 Django = "*"
 django-html_sanitizer = "*"
+inscriptis = "*"
+lxml = "*"
 
 [dev-packages]
 
diff --git a/brutaldon/templates/main/toot_partial.html b/brutaldon/templates/main/toot_partial.html
index 76473df..99d4f2c 100644
--- a/brutaldon/templates/main/toot_partial.html
+++ b/brutaldon/templates/main/toot_partial.html
@@ -125,7 +125,8 @@
                            ic-get-from="{% url "redraft" toot.id %}"
                            ic-indicator="#page-load-indicator"
                            ic-target="#main"
-                           ic-select-from-response="#main">
+                           ic-select-from-response="#main"
+                           ic-push-url="true">
                             redraft
                         </a>
                         <a class="level-item" href="{% url "delete" toot.id %}"
diff --git a/brutaldon/views.py b/brutaldon/views.py
index 48d3cd5..fc30f30 100644
--- a/brutaldon/views.py
+++ b/brutaldon/views.py
@@ -10,8 +10,9 @@ from brutaldon.models import Client, Account, Preference, Theme
 from mastodon import Mastodon, AttribAccessDict, MastodonError, MastodonAPIError
 from urllib import parse
 from pdb import set_trace
-from bs4 import BeautifulSoup
+from inscriptis import get_text
 from time import sleep
+import re
 
 class NotLoggedInException(Exception):
     pass
@@ -436,7 +437,8 @@ def redraft(request, id):
     if request.method == 'GET':
         account, mastodon = get_usercontext(request)
         toot = mastodon.status(id)
-        toot_content = BeautifulSoup(toot.content).get_text("\n")
+        toot_content = get_text(toot.content)
+        toot_content = re.sub("(^\n)|(\n$)", '', re.sub("\n\n", "\n", toot_content))
         form = PostForm({'status': toot_content,
                          'visibility': toot.visibility,
                          'spoiler_text': toot.spoiler_text,