github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-23 18:51:07 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: improve last_modified date returned for avatars

Browse Source 
instead of hard coding a date:

1. For optimized images use the upload date when on s3
2. For not-found use 10 minutes ago to match the expiry
This commit is contained in:
Sam
2018-08-24 09:36:11 +10:00
parent c26de01399
commit 29315b73c2
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/controllers/user_avatars_controller.rb
View File

@ -124,7 +124,7 @@ class UserAvatarsController < ApplicationController
optimized_path = Discourse.store.path_for(optimized)
image = optimized_path if File.exists?(optimized_path)
else
return proxy_avatar(Discourse.store.cdn_url(optimized.url))
return proxy_avatar(Discourse.store.cdn_url(optimized.url), upload.created_at)
end
end
@ -141,7 +141,7 @@ class UserAvatarsController < ApplicationController
end
PROXY_PATH = Rails.root + "tmp/avatar_proxy"
def proxy_avatar(url)
def proxy_avatar(url, last_modified)
if url[0..1] == "//"
url = (SiteSetting.force_https ? "https:" : "http:") + url
@ -163,8 +163,7 @@ class UserAvatarsController < ApplicationController
FileUtils.mv tmp.path, path
end
# putting a bogus date cause download is not retaining the data
response.headers["Last-Modified"] = DateTime.parse("1-1-2000").httpdate
response.headers["Last-Modified"] = last_modified.httpdate
response.headers["Content-Length"] = File.size(path).to_s
immutable_for(1.year)
send_file path, disposition: nil
@ -174,7 +173,7 @@ class UserAvatarsController < ApplicationController
def render_blank
path = Rails.root + "public/images/avatar.png"
expires_in 10.minutes, public: true
response.headers["Last-Modified"] = DateTime.parse("1-1-2000").httpdate
response.headers["Last-Modified"] = 10.minutes.ago.httpdate
response.headers["Content-Length"] = File.size(path).to_s
send_file path, disposition: nil
end