From 492742837e65ec104dce1698be9ef2676bebc85d Mon Sep 17 00:00:00 2001
From: Sam Saffron <sam.saffron@gmail.com>
Date: Tue, 29 Oct 2019 17:07:33 +1100
Subject: [PATCH] PERF: stop destroying drafts on client when posting replies

The server already ensures it advances draft keys when a post is created
this means this code that used to delete drafts is simply introducing
composer delays with no benefit.
---
 .../discourse/controllers/composer.js.es6     | 58 +++++++------------
 1 file changed, 22 insertions(+), 36 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/composer.js.es6 b/app/assets/javascripts/discourse/controllers/composer.js.es6
index ad34970e5bc..dbc9a59f9af 100644
--- a/app/assets/javascripts/discourse/controllers/composer.js.es6
+++ b/app/assets/javascripts/discourse/controllers/composer.js.es6
@@ -687,47 +687,33 @@ export default Controller.extend({
           });
         }
 
-        // If user "created a new topic/post" or "replied as a new topic" successfully, remove the draft.
-        let destroyDraftPromise;
-
-        if (result.responseJson.action === "create_post") {
-          destroyDraftPromise = this.destroyDraft();
+        if (this.get("model.editingPost")) {
+          this.appEvents.trigger("post-stream:refresh", {
+            id: parseInt(result.responseJson.id)
+          });
+          if (result.responseJson.post.post_number === 1) {
+            this.appEvents.trigger("header:update-topic", composer.topic);
+          }
         } else {
-          destroyDraftPromise = Ember.RSVP.Promise.resolve();
+          this.appEvents.trigger("post-stream:refresh");
         }
 
-        return destroyDraftPromise.then(() => {
-          if (this.get("model.editingPost")) {
-            this.appEvents.trigger("post-stream:refresh", {
-              id: parseInt(result.responseJson.id)
-            });
-            if (result.responseJson.post.post_number === 1) {
-              this.appEvents.trigger("header:update-topic", composer.topic);
-            }
-          } else {
-            this.appEvents.trigger("post-stream:refresh");
-          }
+        if (result.responseJson.action === "create_post") {
+          this.appEvents.trigger("post:highlight", result.payload.post_number);
+        }
+        this.close();
 
-          if (result.responseJson.action === "create_post") {
-            this.appEvents.trigger(
-              "post:highlight",
-              result.payload.post_number
-            );
-          }
-          this.close();
+        const currentUser = this.currentUser;
+        if (composer.creatingTopic) {
+          currentUser.set("topic_count", currentUser.topic_count + 1);
+        } else {
+          currentUser.set("reply_count", currentUser.reply_count + 1);
+        }
 
-          const currentUser = this.currentUser;
-          if (composer.creatingTopic) {
-            currentUser.set("topic_count", currentUser.topic_count + 1);
-          } else {
-            currentUser.set("reply_count", currentUser.reply_count + 1);
-          }
-
-          const post = result.target;
-          if (post && !staged) {
-            DiscourseURL.routeTo(post.url);
-          }
-        });
+        const post = result.target;
+        if (post && !staged) {
+          DiscourseURL.routeTo(post.url);
+        }
       })
       .catch(error => {
         composer.set("disableDrafts", false);