From d4b05d7bc5ec85c6f3841bb35df2c2d2c9836a16 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Thu, 6 Sep 2018 14:08:03 +0800
Subject: [PATCH] Always link post to uploads in post process.

The operation is cheap anyway so no point skipping.
---
 app/models/post.rb                   | 3 +--
 lib/cooked_post_processor.rb         | 6 +-----
 lib/post_creator.rb                  | 7 +++----
 lib/post_jobs_enqueuer.rb            | 4 +---
 spec/components/post_creator_spec.rb | 1 -
 5 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/app/models/post.rb b/app/models/post.rb
index 293bed1a29..92ed377312 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -650,11 +650,10 @@ class Post < ActiveRecord::Base
   end
 
   # Enqueue post processing for this post
-  def trigger_post_process(bypass_bump: false, skip_link_post_uploads: false)
+  def trigger_post_process(bypass_bump: false)
     args = {
       post_id: id,
       bypass_bump: bypass_bump,
-      skip_link_post_uploads: skip_link_post_uploads
     }
     args[:image_sizes] = image_sizes if image_sizes.present?
     args[:invalidate_oneboxes] = true if invalidate_oneboxes.present?
diff --git a/lib/cooked_post_processor.rb b/lib/cooked_post_processor.rb
index 467a7fbc56..c64edce285 100644
--- a/lib/cooked_post_processor.rb
+++ b/lib/cooked_post_processor.rb
@@ -35,16 +35,12 @@ class CookedPostProcessor
       post_process_oneboxes
       post_process_images
       post_process_quotes
-
-      unless @opts[:skip_link_post_uploads]
-        @post.link_post_uploads(fragments: @doc)
-      end
-
       optimize_urls
       update_post_image
       enforce_nofollow
       pull_hotlinked_images(bypass_bump)
       grant_badges
+      @post.link_post_uploads(fragments: @doc)
       DiscourseEvent.trigger(:post_process_cooked, @doc, @post)
       nil
     end
diff --git a/lib/post_creator.rb b/lib/post_creator.rb
index 9cfe9c2fcc..aa6c75c72b 100644
--- a/lib/post_creator.rb
+++ b/lib/post_creator.rb
@@ -189,7 +189,7 @@ class PostCreator
       publish
 
       track_latest_on_category
-      enqueue_jobs(skip_link_post_uploads: true) unless @opts[:skip_jobs]
+      enqueue_jobs unless @opts[:skip_jobs]
       BadgeGranter.queue_badge_grant(Badge::Trigger::PostRevision, post: @post)
 
       trigger_after_events unless opts[:skip_events]
@@ -214,13 +214,12 @@ class PostCreator
     @post
   end
 
-  def enqueue_jobs(skip_link_post_uploads: false)
+  def enqueue_jobs
     return unless @post && !@post.errors.present?
 
     PostJobsEnqueuer.new(@post, @topic, new_topic?,
       import_mode: @opts[:import_mode],
-      post_alert_options: @opts[:post_alert_options],
-      skip_link_post_uploads: skip_link_post_uploads
+      post_alert_options: @opts[:post_alert_options]
     ).enqueue_jobs
   end
 
diff --git a/lib/post_jobs_enqueuer.rb b/lib/post_jobs_enqueuer.rb
index a0abef96c0..4dde3b73af 100644
--- a/lib/post_jobs_enqueuer.rb
+++ b/lib/post_jobs_enqueuer.rb
@@ -38,9 +38,7 @@ class PostJobsEnqueuer
   end
 
   def trigger_post_post_process
-    @post.trigger_post_process(
-      skip_link_post_uploads: @opts[:skip_link_post_uploads]
-    )
+    @post.trigger_post_process
   end
 
   def after_post_create
diff --git a/spec/components/post_creator_spec.rb b/spec/components/post_creator_spec.rb
index ecb30681df..2ad2736ab2 100644
--- a/spec/components/post_creator_spec.rb
+++ b/spec/components/post_creator_spec.rb
@@ -193,7 +193,6 @@ describe PostCreator do
         topic_id = post.topic_id
 
         process_post_args = Jobs::ProcessPost.jobs.first["args"].first
-        expect(process_post_args["skip_link_post_uploads"]).to eq(true)
         expect(process_post_args["post_id"]).to eq(post_id)
 
         feature_topic_users_args = Jobs::FeatureTopicUsers.jobs.first["args"].first