From 8a64b0c8e860ee87f280d92b722505c666774745 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Mon, 29 Jul 2019 14:35:34 +0800
Subject: [PATCH] Revert "DEV: Remove unused kwarg and properly check for local
 missing uploads."

This reverts commit 97769f3d0226642905cf0605aeb0bc69d7295ca1.

The code is confusing but this change is quite risky. Defer for now
until we can look at it properly.
---
 app/models/post.rb   | 6 +++---
 lib/s3_inventory.rb  | 2 +-
 lib/tasks/posts.rake | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/models/post.rb b/app/models/post.rb
index 89aee0f272d..c579d012ea0 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -885,7 +885,7 @@ class Post < ActiveRecord::Base
     {}
   end
 
-  def each_upload_url(fragments: nil, local_store: nil)
+  def each_upload_url(fragments: nil, include_local_upload: true)
     current_db = RailsMultisite::ConnectionManagement.current_db
     upload_patterns = [
       /\/uploads\/#{current_db}\//,
@@ -902,7 +902,7 @@ class Post < ActiveRecord::Base
       next if Rails.configuration.multisite && src.exclude?(current_db) && src.exclude?("short-url")
 
       src = "#{SiteSetting.force_https ? "https" : "http"}:#{src}" if src.start_with?("//")
-      next unless Discourse.store.has_been_uploaded?(src) || (local_store && local_store.has_been_uploaded?(src))
+      next unless Discourse.store.has_been_uploaded?(src) || (include_local_upload && src =~ /\A\/[^\/]/i)
 
       path = begin
         URI(URI.unescape(src))&.path
@@ -922,7 +922,7 @@ class Post < ActiveRecord::Base
     end
   end
 
-  def self.find_missing_uploads
+  def self.find_missing_uploads(include_local_upload: true)
     missing_uploads = []
     missing_post_uploads = {}
     count = 0
diff --git a/lib/s3_inventory.rb b/lib/s3_inventory.rb
index 6b6eac00bda..501cb91b06e 100644
--- a/lib/s3_inventory.rb
+++ b/lib/s3_inventory.rb
@@ -82,7 +82,7 @@ class S3Inventory
   def list_missing_post_uploads
     log "Listing missing post uploads..."
 
-    missing = Post.find_missing_uploads do |post, _, _, sha1|
+    missing = Post.find_missing_uploads(include_local_upload: false) do |post, _, _, sha1|
       next if sha1.blank?
 
       upload_id = nil
diff --git a/lib/tasks/posts.rake b/lib/tasks/posts.rake
index 80cbd28c1b1..26bf54ec84e 100644
--- a/lib/tasks/posts.rake
+++ b/lib/tasks/posts.rake
@@ -413,7 +413,7 @@ def missing_uploads
 
   count_missing = 0
 
-  missing = Post.find_missing_uploads(local_store: FileStore::LocalStore.new) do |post, src, path, sha1|
+  missing = Post.find_missing_uploads(include_local_upload: true) do |post, src, path, sha1|
     next if sha1.present?
     puts "Fixing missing uploads: " if count_missing == 0
     count_missing += 1