Merge pull request #864 from mouse-reeve/delete-and-redraft

Delete and redraft

bookwyrm/views/__init__.py

@@ -31,7 +31,7 @@ from .shelf import Shelf
 from .shelf import create_shelf, delete_shelf
 from .shelf import shelve, unshelve
 from .site import Site
-from .status import CreateStatus, DeleteStatus
+from .status import CreateStatus, DeleteStatus, DeleteAndRedraft
 from .tag import Tag, AddTag, RemoveTag
 from .updates import get_notification_count, get_unread_status_count
 from .user import User, EditUser, Followers, Following

bookwyrm/views/status.py

@@ -3,6 +3,7 @@ import re
 from django.contrib.auth.decorators import login_required
 from django.http import HttpResponseBadRequest
 from django.shortcuts import get_object_or_404, redirect
+from django.template.response import TemplateResponse
 from django.utils.decorators import method_decorator
 from django.views import View
 from markdown import markdown
@@ -10,7 +11,6 @@ from markdown import markdown
 from bookwyrm import forms, models
 from bookwyrm.sanitize_html import InputHtmlParser
 from bookwyrm.settings import DOMAIN
-from bookwyrm.status import delete_status
 from bookwyrm.utils import regex
 from .helpers import handle_remote_webfinger
 from .reading import edit_readthrough
@@ -21,6 +21,12 @@ from .reading import edit_readthrough
 class CreateStatus(View):
     """ the view for *posting* """
 
+    def get(self, request):
+        """ compose view (used for delete-and-redraft """
+        book = get_object_or_404(models.Edition, id=request.GET.get("book"))
+        data = {"book": book}
+        return TemplateResponse(request, "compose.html", data)
+
     def post(self, request, status_type):
         """ create  status of whatever type """
         status_type = status_type[0].upper() + status_type[1:]
@@ -69,9 +75,10 @@ class CreateStatus(View):
         # update a readthorugh, if needed
         edit_readthrough(request)
 
-        return redirect(request.headers.get("Referer", "/"))
+        return redirect("/")
 
 
+@method_decorator(login_required, name="dispatch")
 class DeleteStatus(View):
     """ tombstone that bad boy """
 
@@ -84,10 +91,44 @@ class DeleteStatus(View):
             return HttpResponseBadRequest()
 
         # perform deletion
-        delete_status(status)
+        status.delete()
         return redirect(request.headers.get("Referer", "/"))
 
 
+@method_decorator(login_required, name="dispatch")
+class DeleteAndRedraft(View):
+    """ delete a status but let the user re-create it """
+
+    def post(self, request, status_id):
+        """ delete and tombstone a status """
+        status = get_object_or_404(
+            models.Status.objects.select_subclasses(), id=status_id
+        )
+        if isinstance(status, (models.GeneratedNote, models.ReviewRating)):
+            return HttpResponseBadRequest()
+
+        # don't let people redraft other people's statuses
+        if status.user != request.user:
+            return HttpResponseBadRequest()
+
+        status_type = status.status_type.lower()
+        if status.reply_parent:
+            status_type = "reply"
+
+        data = {
+            "draft": status,
+            "type": status_type,
+        }
+        if hasattr(status, "book"):
+            data["book"] = status.book
+        elif status.mention_books:
+            data["book"] = status.mention_books.first()
+
+        # perform deletion
+        status.delete()
+        return TemplateResponse(request, "compose.html", data)
+
+
 def find_mentions(content):
     """ detect @mentions in raw status content """
     if not content: