From efb74f0eb6b667eea5368a0b4832638cadf755bb Mon Sep 17 00:00:00 2001
From: towards-a-new-leftypol <paul_cockshott@protonmail.com>
Date: Mon, 4 Jan 2021 03:00:16 -0500
Subject: [PATCH] Fix for ajax posting not showing you your new post

- TODO: there are console.logs that still need to be removed
- Posting was loading the new page twice - once in ajax.js and once in
auto-reload.js. auto-reload will handle this behaviour, the other is
commented out
- The new post does not immediately show up when immediately ajax
requesting the page after posting completes. Adding an epoch query
parameter did not change this. Instead of figuring out why it was easier
to add a 500ms delay before requesting the page, now it seems to work
well.
---
 js/ajax.js        |  7 +++++++
 js/auto-reload.js | 22 ++++++++++++++++++++--
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/js/ajax.js b/js/ajax.js
index a85840d9..31634e9e 100644
--- a/js/ajax.js
+++ b/js/ajax.js
@@ -79,6 +79,8 @@ $(window).ready(function() {
                             || (!settings.get('always_noko_replies', true) && !post_response.noko)) {
                             document.location = post_response.redirect;
                         } else {
+                            console.log("do nothing for now, this behaviour will be handled by auto-reload.js");
+                            /*
                             $.ajax({
                                 url: document.location,
                                 success: function(data) {
@@ -105,9 +107,14 @@ $(window).ready(function() {
                                 contentType: false,
                                 processData: false
                             }, 'html');
+                        */
                         }
                         $(form).find('input[type="submit"]').val(_('Posted...'));
                         $(document).trigger("ajax_after_post", post_response);
+                        $(form).find('input[type="submit"]').val(submit_txt);
+                        $(form).find('input[type="submit"]').removeAttr('disabled');
+                        $(form).find('input[name="subject"],input[name="file_url"],\
+                            textarea[name="body"],input[type="file"]').val('').change();
                     } else {
                         alert(_('An unknown error occured when posting!'));
                         $(form).find('input[type="submit"]').val(submit_txt);
diff --git a/js/auto-reload.js b/js/auto-reload.js
index 544f5df9..5c2b7064 100644
--- a/js/auto-reload.js
+++ b/js/auto-reload.js
@@ -232,10 +232,18 @@ $(document).ready(function(){
         $.ajax({
             url: document.location,
             success: function(data) {
+                console.log("poll ajax succes");
+                console.log(data);
                 var loaded_posts = 0;   // the number of new posts loaded in this update
+
                 $(data).find('div.post.reply').each(function() {
+                    console.log("new data post reply:", this);
                     var id = $(this).attr('id');
+                    console.log("new data post reply id:", id);
+
+                    // check that this post doesn't already exist
                     if($('#' + id).length == 0) {
+                        console.log("post with id ", id, "does not already exist on the page");
                         if (!new_posts) {
                             first_new_post = this;
                             makeIcon('reply');
@@ -245,17 +253,22 @@ $(document).ready(function(){
                             }
                         }
                         if ($("div.post").length > 1){
+                            console.log("adding post A");
                             $(this).parent().insertAfter($('div.post:not(.post-hover):last').parent().next()).after('<br class="clear">');
                         }
                         else {
+                            console.log("adding post B");
                             $(this).insertAfter($('div.post:not(.post-hover):last')).after('<br class="clear">');
                         }
                         new_posts++;
                         loaded_posts++;
                         $(document).trigger('new_post', this);
                         recheck_activated();
+                    } else {
+                        console.log("post with id ", id, "already exists on the page, not adding");
                     }
                 });
+
                 time_loaded = Date.now(); // interop with watch.js
                 
                 
@@ -312,8 +325,13 @@ $(document).ready(function(){
     };
 
     $(post).on('submit', function(e){
-        poll(manualUpdate = true);
-        dothis(this);
+        console.log("post on submit");
+        setTimeout(
+            function() {
+                poll(manualUpdate = true)
+            },
+            500
+        );
      });
     
     $(window).scrollStopped(function() {