gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-09-05 09:21:11 +00:00
Code Issues Actions 28 Packages Projects Releases Wiki Activity

Merge 5c41bb0747 into 14cb5ff881

Browse Source
This commit is contained in:
dongzhimin-xz 2025-09-03 20:07:44 +00:00 committed by GitHub
commit 439efac880
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/helpers/routing_helper.rb
View File

@ -23,7 +23,8 @@ module RoutingHelper
def expiring_asset_url(attachment, expires_in)
case Paperclip::Attachment.default_options[:storage]
when :s3, :azure
attachment.expiring_url(expires_in.to_i)
url = attachment.expiring_url(expires_in.to_i)
ENV.key?('S3_ALIAS_HOST') ? url.sub("#{ENV.fetch('S3_ENDPOINT')}/#{ENV.fetch('S3_BUCKET')}", "https://#{ENV.fetch('S3_ALIAS_HOST')}") : url
when :fog
if Paperclip::Attachment.default_options.dig(:fog_credentials, :openstack_temp_url_key).present?
attachment.expiring_url(expires_in.from_now)