From 64d109dc0e39574d4ed45f2443ee132dfb761033 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Mon, 5 Dec 2016 17:13:05 +0100 Subject: [PATCH] Downsize originals in media attachments, small fixes --- app/assets/javascripts/components/actions/compose.jsx | 2 +- .../javascripts/components/components/media_gallery.jsx | 2 +- app/models/media_attachment.rb | 2 +- app/views/api/v1/statuses/_media.rabl | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/assets/javascripts/components/actions/compose.jsx b/app/assets/javascripts/components/actions/compose.jsx index 23bcf8eac9..ec5465381c 100644 --- a/app/assets/javascripts/components/actions/compose.jsx +++ b/app/assets/javascripts/components/actions/compose.jsx @@ -74,7 +74,7 @@ export function submitCompose() { // To make the app more responsive, immediately get the status into the columns dispatch(updateTimeline('home', { ...response.data })); - if (response.data.in_reply_to_id === null) { + if (response.data.in_reply_to_id === null && !getState().getIn(['compose', 'unlisted'])) { dispatch(updateTimeline('public', { ...response.data })); } }).catch(function (error) { diff --git a/app/assets/javascripts/components/components/media_gallery.jsx b/app/assets/javascripts/components/components/media_gallery.jsx index d04c7c8699..9aafd81816 100644 --- a/app/assets/javascripts/components/components/media_gallery.jsx +++ b/app/assets/javascripts/components/components/media_gallery.jsx @@ -129,7 +129,7 @@ const MediaGallery = React.createClass({ return (
- +
); }); diff --git a/app/models/media_attachment.rb b/app/models/media_attachment.rb index d37ef99a85..7214ab8809 100644 --- a/app/models/media_attachment.rb +++ b/app/models/media_attachment.rb @@ -44,7 +44,7 @@ class MediaAttachment < ApplicationRecord def file_styles(f) if f.instance.image? { - original: '100%', + original: '1280x1280>', small: '510x680>', } else diff --git a/app/views/api/v1/statuses/_media.rabl b/app/views/api/v1/statuses/_media.rabl index af635dfecb..5c6be1ce77 100644 --- a/app/views/api/v1/statuses/_media.rabl +++ b/app/views/api/v1/statuses/_media.rabl @@ -1,4 +1,4 @@ attributes :id, :remote_url, :type -node(:url) { |media| full_asset_url(media.file.url( :original)) } -node(:preview_url) { |media| full_asset_url(media.file.url( :small)) } +node(:url) { |media| full_asset_url(media.file.url(:original)) } +node(:preview_url) { |media| full_asset_url(media.file.url(:small)) }