From 216e28c0d72ebf184845abd23ccfd84f417c1636 Mon Sep 17 00:00:00 2001 From: nanaya Date: Mon, 9 May 2022 02:08:03 +0900 Subject: [PATCH] Ensure correct host --- app/models/post/image_store/local2.rb | 2 +- app/models/post/image_store/local_flat.rb | 2 +- app/models/post/image_store/local_hierarchy.rb | 2 +- app/models/post/image_store/remote_hierarchy.rb | 3 +-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/models/post/image_store/local2.rb b/app/models/post/image_store/local2.rb index 1ba4d307..ddb00377 100644 --- a/app/models/post/image_store/local2.rb +++ b/app/models/post/image_store/local2.rb @@ -41,7 +41,7 @@ module Post::ImageStore::Local2 def preview_url if status == "deleted" - ApplicationController.helpers.image_url 'deleted-preview.png' + ApplicationController.helpers.image_path 'deleted-preview.png', host: base_url(:assets) elsif image? "#{base_url :assets}/data/preview/#{file_hierarchy}/#{md5}.jpg" else diff --git a/app/models/post/image_store/local_flat.rb b/app/models/post/image_store/local_flat.rb index cdbc504c..b8976ddc 100644 --- a/app/models/post/image_store/local_flat.rb +++ b/app/models/post/image_store/local_flat.rb @@ -26,7 +26,7 @@ module Post::ImageStore def preview_url if status == "deleted" - ApplicationController.helpers.image_url 'deleted-preview.png' + ApplicationController.helpers.image_path 'deleted-preview.png', host: base_url(:assets) elsif image? CONFIG["url_base"] + "/data/preview/#{md5}.jpg" else diff --git a/app/models/post/image_store/local_hierarchy.rb b/app/models/post/image_store/local_hierarchy.rb index 5280e1f9..5858f3dd 100644 --- a/app/models/post/image_store/local_hierarchy.rb +++ b/app/models/post/image_store/local_hierarchy.rb @@ -30,7 +30,7 @@ module Post::ImageStore def preview_url if status == "deleted" - ApplicationController.helpers.image_url 'deleted-preview.png' + ApplicationController.helpers.image_path 'deleted-preview.png', host: base_url(:assets) elsif image? CONFIG["url_base"] + "/data/preview/#{file_hierarchy}/#{md5}.jpg" else diff --git a/app/models/post/image_store/remote_hierarchy.rb b/app/models/post/image_store/remote_hierarchy.rb index 0757a6f6..45ddd688 100644 --- a/app/models/post/image_store/remote_hierarchy.rb +++ b/app/models/post/image_store/remote_hierarchy.rb @@ -36,8 +36,7 @@ module Post::ImageStore def preview_url if self.is_warehoused? if status == "deleted" - ApplicationController.helpers.image_url 'deleted-preview.png' - + ApplicationController.helpers.image_path 'deleted-preview.png', host: base_url(:assets) elsif image? select_random_image_server(:preview => true, :use_aliases => true) + "/data/preview/#{file_hierarchy}/#{md5}.jpg" else