specter/mastodon
1
0
Fork 0
forked from fedi/mastodon
Code Pull requests Activity

Do not use expiring links after all

Browse source
This commit is contained in:
Eugen Rochko 2016-12-04 13:02:43 +01:00
parent 24e692b0cf
commit f763e844e8
11 changed files with 13 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/helpers/application_helper.rb
View file

@ -4,8 +4,4 @@ module ApplicationHelper
def active_nav_class(path)
current_page?(path) ? 'active' : ''
end
def s3_expiry
Time.zone.now.beginning_of_day.since 25.hours
end
end

2
app/helpers/stream_entries_helper.rb
View file

@ -6,7 +6,7 @@ module StreamEntriesHelper
end
def avatar_for_status_url(status)
status.reblog? ? status.reblog.account.avatar.expiring_url(s3_expiry, :original) : status.account.avatar.expiring_url(s3_expiry, :original)
status.reblog? ? status.reblog.account.avatar.url( :original) : status.account.avatar.url( :original)
end
def entry_classes(status, is_predecessor, is_successor, include_threads)

2
app/views/accounts/_grid_card.html.haml
View file

@ -1,6 +1,6 @@
.account-grid-card
.account-grid-card__header
.avatar= image_tag account.avatar.expiring_url(s3_expiry, :original)
.avatar= image_tag account.avatar.url( :original)
.name
= link_to TagManager.instance.url_for(account) do
%span.display_name= display_name(account)

4
app/views/accounts/_header.html.haml
View file

@ -1,4 +1,4 @@
.card{ style: "background-image: url(#{@account.header.expiring_url(s3_expiry, :original)})" }
.card{ style: "background-image: url(#{@account.header.url( :original)})" }
- if user_signed_in? && current_account.id != @account.id
.controls
- if current_account.following?(@account)
@ -6,7 +6,7 @@
- else
= link_to t('accounts.follow'), follow_account_path(@account), data: { method: :post }, class: 'button'
.avatar= image_tag @account.avatar.expiring_url(s3_expiry, :original)
.avatar= image_tag @account.avatar.url( :original)
%h1.name
= display_name(@account)
%small= "@#{@account.username}"

2
app/views/accounts/show.atom.ruby
View file

@ -6,7 +6,7 @@ Nokogiri::XML::Builder.new do |xml|
title xml, @account.display_name
subtitle xml, @account.note
updated_at xml, stream_updated_at
logo xml, full_asset_url(@account.avatar.expiring_url(s3_expiry, :original))
logo xml, full_asset_url(@account.avatar.url( :original))
author(xml) do
include_author xml, @account

4
app/views/api/v1/accounts/show.rabl
View file

@ -4,8 +4,8 @@ attributes :id, :username, :acct, :display_name
node(:note) { |account| Formatter.instance.simplified_format(account) }
node(:url) { |account| TagManager.instance.url_for(account) }
node(:avatar) { |account| full_asset_url(account.avatar.expiring_url(s3_expiry, :original)) }
node(:header) { |account| full_asset_url(account.header.expiring_url(s3_expiry, :original)) }
node(:avatar) { |account| full_asset_url(account.avatar.url( :original)) }
node(:header) { |account| full_asset_url(account.header.url( :original)) }
node(:followers_count) { |account| defined?(@followers_counts_map) ? (@followers_counts_map[account.id] || 0) : (account.try(:followers_count) || account.followers.count) }
node(:following_count) { |account| defined?(@following_counts_map) ? (@following_counts_map[account.id] || 0) : (account.try(:following_count) || account.following.count) }
node(:statuses_count) { |account| defined?(@statuses_counts_map) ? (@statuses_counts_map[account.id] || 0) : (account.try(:statuses_count) || account.statuses.count) }

4
app/views/api/v1/media/create.rabl
View file

@ -1,5 +1,5 @@
object @media
attribute :id, :type
node(:url) { |media| full_asset_url(media.file.expiring_url(s3_expiry, :original)) }
node(:preview_url) { |media| full_asset_url(media.file.expiring_url(s3_expiry, :small)) }
node(:url) { |media| full_asset_url(media.file.url( :original)) }
node(:preview_url) { |media| full_asset_url(media.file.url( :small)) }
node(:text_url) { |media| medium_url(media) }

4
app/views/api/v1/statuses/_media.rabl
View file

@ -1,4 +1,4 @@
attributes :id, :remote_url, :type
node(:url) { |media| full_asset_url(media.file.expiring_url(s3_expiry, :original)) }
node(:preview_url) { |media| full_asset_url(media.file.expiring_url(s3_expiry, :small)) }
node(:url) { |media| full_asset_url(media.file.url( :original)) }
node(:preview_url) { |media| full_asset_url(media.file.url( :small)) }

2
app/views/stream_entries/_status.html.haml
View file

@ -34,7 +34,7 @@
- if (status.reblog? ? status.reblog : status).media_attachments.size > 0
%ul.media-attachments
- (status.reblog? ? status.reblog : status).media_attachments.each do |media|
%li.transparent-background= link_to '', media.file.expiring_url(s3_expiry, :original), style: "background-image: url(#{media.file.expiring_url(s3_expiry, :small)})", target: '_blank'
%li.transparent-background= link_to '', media.file.url( :original), style: "background-image: url(#{media.file.url( :small)})", target: '_blank'
- if include_threads
= render partial: 'status', collection: @descendants, as: :status, locals: { is_successor: true }

2
app/views/stream_entries/show.html.haml
View file

@ -7,7 +7,7 @@
%meta{ name: 'og:title', content: "#{@account.username} on #{Rails.configuration.x.local_domain}" }/
%meta{ name: 'og:article:author', content: @account.username }/
%meta{ name: 'og:description', content: @stream_entry.activity.content }/
%meta{ name: 'og:image', content: @stream_entry.activity.is_a?(Status) && @stream_entry.activity.media_attachments.size > 0 ? full_asset_url(@stream_entry.activity.media_attachments.first.file.expiring_url(s3_expiry, :small)) : full_asset_url(@account.avatar.expiring_url(s3_expiry, :original)) }/
%meta{ name: 'og:image', content: @stream_entry.activity.is_a?(Status) && @stream_entry.activity.media_attachments.size > 0 ? full_asset_url(@stream_entry.activity.media_attachments.first.file.url( :small)) : full_asset_url(@account.avatar.url( :original)) }/
.activity-stream.activity-stream-headless
= render partial: @type, locals: { @type.to_sym => @stream_entry.activity, include_threads: true }

1
config/initializers/paperclip.rb
View file

@ -7,7 +7,6 @@ if ENV['S3_ENABLED'] == 'true'
Paperclip::Attachment.default_options[:s3_host_name] = "s3-#{ENV.fetch('S3_REGION')}.amazonaws.com"
Paperclip::Attachment.default_options[:path] = '/:class/:attachment/:id_partition/:style/:filename'
Paperclip::Attachment.default_options[:s3_headers] = { 'Cache-Control' => 'max-age=315576000', 'Expires' => 10.years.from_now.httpdate }
Paperclip::Attachment.default_options[:s3_permissions] = :private
unless ENV['S3_CLOUDFRONT_HOST'].blank?
Paperclip::Attachment.default_options[:url] = ':s3_alias_url'