Merge remote-tracking branch 'tootsuite/master' into merge-upstream

Conflicts:
	Gemfile
	config/locales/simple_form.pl.yml
rebase/4.0.0rc2
David Yip 2018-02-17 00:02:37 -06:00
commit 3d033a4687
No known key found for this signature in database
GPG Key ID: 7DA0036508FCC0CC
23 changed files with 353 additions and 145 deletions

View File

@ -21,6 +21,7 @@ gem 'fog-openstack', '~> 0.1', require: false
gem 'paperclip', '~> 5.1' gem 'paperclip', '~> 5.1'
gem 'paperclip-av-transcoder', '~> 0.6' gem 'paperclip-av-transcoder', '~> 0.6'
gem 'posix-spawn' gem 'posix-spawn'
gem 'streamio-ffmpeg', '~> 3.0'
gem 'active_model_serializers', '~> 0.10' gem 'active_model_serializers', '~> 0.10'
gem 'addressable', '~> 2.5' gem 'addressable', '~> 2.5'

View File

@ -550,6 +550,8 @@ GEM
net-scp (>= 1.1.2) net-scp (>= 1.1.2)
net-ssh (>= 2.8.0) net-ssh (>= 2.8.0)
statsd-ruby (1.2.1) statsd-ruby (1.2.1)
streamio-ffmpeg (3.0.2)
multi_json (~> 1.8)
strong_migrations (0.1.9) strong_migrations (0.1.9)
activerecord (>= 3.2.0) activerecord (>= 3.2.0)
temple (0.8.0) temple (0.8.0)
@ -712,6 +714,7 @@ DEPENDENCIES
simple_form (~> 3.4) simple_form (~> 3.4)
simplecov (~> 0.14) simplecov (~> 0.14)
sprockets-rails (~> 3.2) sprockets-rails (~> 3.2)
streamio-ffmpeg (~> 3.0)
strong_migrations strong_migrations
tty-command tty-command
tty-prompt tty-prompt

View File

@ -3,20 +3,26 @@
class MediaController < ApplicationController class MediaController < ApplicationController
include Authorization include Authorization
before_action :verify_permitted_status before_action :set_media_attachment
before_action :verify_permitted_status!
def show def show
redirect_to media_attachment.file.url(:original) redirect_to @media_attachment.file.url(:original)
end
def player
@body_classes = 'player'
raise ActiveRecord::RecordNotFound unless @media_attachment.video? || @media_attachment.gifv?
end end
private private
def media_attachment def set_media_attachment
MediaAttachment.attached.find_by!(shortcode: params[:id]) @media_attachment = MediaAttachment.attached.find_by!(shortcode: params[:id] || params[:medium_id])
end end
def verify_permitted_status def verify_permitted_status!
authorize media_attachment.status, :show? authorize @media_attachment.status, :show?
rescue Mastodon::NotPermittedError rescue Mastodon::NotPermittedError
# Reraise in order to get a 404 instead of a 403 error code # Reraise in order to get a 404 instead of a 403 error code
raise ActiveRecord::RecordNotFound raise ActiveRecord::RecordNotFound

View File

@ -249,7 +249,7 @@ export default class MediaGallery extends React.PureComponent {
} }
children = ( children = (
<button className='media-spoiler' onClick={this.handleOpen} style={style} ref={this.handleRef}> <button type='button' className='media-spoiler' onClick={this.handleOpen} style={style} ref={this.handleRef}>
<span className='media-spoiler__warning'>{warning}</span> <span className='media-spoiler__warning'>{warning}</span>
<span className='media-spoiler__trigger'><FormattedMessage id='status.sensitive_toggle' defaultMessage='Click to view' /></span> <span className='media-spoiler__trigger'><FormattedMessage id='status.sensitive_toggle' defaultMessage='Click to view' /></span>
</button> </button>

View File

@ -20,6 +20,39 @@ const getHostname = url => {
return parser.hostname; return parser.hostname;
}; };
const trim = (text, len) => {
const cut = text.indexOf(' ', len);
if (cut === -1) {
return text;
}
return text.substring(0, cut) + (text.length > len ? '…' : '');
};
const domParser = new DOMParser();
const addAutoPlay = html => {
const document = domParser.parseFromString(html, 'text/html').documentElement;
const iframe = document.querySelector('iframe');
if (iframe) {
if (iframe.src.indexOf('?') !== -1) {
iframe.src += '&';
} else {
iframe.src += '?';
}
iframe.src += 'autoplay=1&auto_play=1';
// DOM parser creates html/body elements around original HTML fragment,
// so we need to get innerHTML out of the body and not the entire document
return document.querySelector('body').innerHTML;
}
return html;
};
export default class Card extends React.PureComponent { export default class Card extends React.PureComponent {
static propTypes = { static propTypes = {
@ -33,9 +66,16 @@ export default class Card extends React.PureComponent {
}; };
state = { state = {
width: 0, width: 280,
embedded: false,
}; };
componentWillReceiveProps (nextProps) {
if (this.props.card !== nextProps.card) {
this.setState({ embedded: false });
}
}
handlePhotoClick = () => { handlePhotoClick = () => {
const { card, onOpenMedia } = this.props; const { card, onOpenMedia } = this.props;
@ -57,56 +97,14 @@ export default class Card extends React.PureComponent {
); );
}; };
renderLink () { handleEmbedClick = () => {
const { card, maxDescription } = this.props;
const { width } = this.state;
const horizontal = card.get('width') > card.get('height') && (card.get('width') + 100 >= width);
let image = '';
let provider = card.get('provider_name');
if (card.get('image')) {
image = (
<div className='status-card__image'>
<img src={card.get('image')} alt={card.get('title')} className='status-card__image-image' width={card.get('width')} height={card.get('height')} />
</div>
);
}
if (provider.length < 1) {
provider = decodeIDNA(getHostname(card.get('url')));
}
const className = classnames('status-card', { horizontal });
return (
<a href={card.get('url')} className={className} target='_blank' rel='noopener' ref={this.setRef}>
{image}
<div className='status-card__content'>
<strong className='status-card__title' title={card.get('title')}>{card.get('title')}</strong>
{!horizontal && <p className='status-card__description'>{(card.get('description') || '').substring(0, maxDescription)}</p>}
<span className='status-card__host'>{provider}</span>
</div>
</a>
);
}
renderPhoto () {
const { card } = this.props; const { card } = this.props;
return ( if (card.get('type') === 'photo') {
<img this.handlePhotoClick();
className='status-card-photo' } else {
onClick={this.handlePhotoClick} this.setState({ embedded: true });
role='button' }
tabIndex='0'
src={card.get('embed_url')}
alt={card.get('title')}
width={card.get('width')}
height={card.get('height')}
/>
);
} }
setRef = c => { setRef = c => {
@ -117,7 +115,7 @@ export default class Card extends React.PureComponent {
renderVideo () { renderVideo () {
const { card } = this.props; const { card } = this.props;
const content = { __html: card.get('html') }; const content = { __html: addAutoPlay(card.get('html')) };
const { width } = this.state; const { width } = this.state;
const ratio = card.get('width') / card.get('height'); const ratio = card.get('width') / card.get('height');
const height = card.get('width') > card.get('height') ? (width / ratio) : (width * ratio); const height = card.get('width') > card.get('height') ? (width / ratio) : (width * ratio);
@ -125,7 +123,7 @@ export default class Card extends React.PureComponent {
return ( return (
<div <div
ref={this.setRef} ref={this.setRef}
className='status-card-video' className='status-card__image status-card-video'
dangerouslySetInnerHTML={content} dangerouslySetInnerHTML={content}
style={{ height }} style={{ height }}
/> />
@ -133,23 +131,76 @@ export default class Card extends React.PureComponent {
} }
render () { render () {
const { card } = this.props; const { card, maxDescription } = this.props;
const { width, embedded } = this.state;
if (card === null) { if (card === null) {
return null; return null;
} }
switch(card.get('type')) { const provider = card.get('provider_name').length === 0 ? decodeIDNA(getHostname(card.get('url'))) : card.get('provider_name');
case 'link': const horizontal = card.get('width') > card.get('height') && (card.get('width') + 100 >= width) || card.get('type') !== 'link';
return this.renderLink(); const className = classnames('status-card', { horizontal });
case 'photo': const interactive = card.get('type') !== 'link';
return this.renderPhoto(); const title = interactive ? <a className='status-card__title' href={card.get('url')} title={card.get('title')} rel='noopener' target='_blank'><strong>{card.get('title')}</strong></a> : <strong className='status-card__title' title={card.get('title')}>{card.get('title')}</strong>;
case 'video': const ratio = card.get('width') / card.get('height');
return this.renderVideo(); const height = card.get('width') > card.get('height') ? (width / ratio) : (width * ratio);
case 'rich':
default: const description = (
return null; <div className='status-card__content'>
{title}
{!horizontal && <p className='status-card__description'>{trim(card.get('description') || '', maxDescription)}</p>}
<span className='status-card__host'>{provider}</span>
</div>
);
let embed = '';
let thumbnail = <div style={{ backgroundImage: `url(${card.get('image')})`, width: horizontal ? width : null, height: horizontal ? height : null }} className='status-card__image-image' />;
if (interactive) {
if (embedded) {
embed = this.renderVideo();
} else {
let iconVariant = 'play';
if (card.get('type') === 'photo') {
iconVariant = 'search-plus';
}
embed = (
<div className='status-card__image'>
{thumbnail}
<div className='status-card__actions'>
<div>
<button onClick={this.handleEmbedClick}><i className={`fa fa-${iconVariant}`} /></button>
<a href={card.get('url')} target='_blank' rel='noopener'><i className='fa fa-external-link' /></a>
</div>
</div>
</div>
);
}
return (
<div className={className} ref={this.setRef}>
{embed}
{description}
</div>
);
} else if (card.get('image')) {
embed = (
<div className='status-card__image'>
{thumbnail}
</div>
);
} }
return (
<a href={card.get('url')} className={className} target='_blank' rel='noopener' ref={this.setRef}>
{embed}
{description}
</a>
);
} }
} }

View File

@ -271,7 +271,7 @@ export default class Video extends React.PureComponent {
onProgress={this.handleProgress} onProgress={this.handleProgress}
/> />
<button className={classNames('video-player__spoiler', { active: !revealed })} onClick={this.toggleReveal}> <button type='button' className={classNames('video-player__spoiler', { active: !revealed })} onClick={this.toggleReveal}>
<span className='video-player__spoiler__title'><FormattedMessage id='status.sensitive_warning' defaultMessage='Sensitive content' /></span> <span className='video-player__spoiler__title'><FormattedMessage id='status.sensitive_warning' defaultMessage='Sensitive content' /></span>
<span className='video-player__spoiler__subtitle'><FormattedMessage id='status.sensitive_toggle' defaultMessage='Click to view' /></span> <span className='video-player__spoiler__subtitle'><FormattedMessage id='status.sensitive_toggle' defaultMessage='Click to view' /></span>
</button> </button>
@ -290,10 +290,10 @@ export default class Video extends React.PureComponent {
<div className='video-player__buttons-bar'> <div className='video-player__buttons-bar'>
<div className='video-player__buttons left'> <div className='video-player__buttons left'>
<button aria-label={intl.formatMessage(paused ? messages.play : messages.pause)} onClick={this.togglePlay}><i className={classNames('fa fa-fw', { 'fa-play': paused, 'fa-pause': !paused })} /></button> <button type='button' aria-label={intl.formatMessage(paused ? messages.play : messages.pause)} onClick={this.togglePlay}><i className={classNames('fa fa-fw', { 'fa-play': paused, 'fa-pause': !paused })} /></button>
<button aria-label={intl.formatMessage(muted ? messages.unmute : messages.mute)} onClick={this.toggleMute}><i className={classNames('fa fa-fw', { 'fa-volume-off': muted, 'fa-volume-up': !muted })} /></button> <button type='button' aria-label={intl.formatMessage(muted ? messages.unmute : messages.mute)} onClick={this.toggleMute}><i className={classNames('fa fa-fw', { 'fa-volume-off': muted, 'fa-volume-up': !muted })} /></button>
{!onCloseVideo && <button aria-label={intl.formatMessage(messages.hide)} onClick={this.toggleReveal}><i className='fa fa-fw fa-eye' /></button>} {!onCloseVideo && <button type='button' aria-label={intl.formatMessage(messages.hide)} onClick={this.toggleReveal}><i className='fa fa-fw fa-eye' /></button>}
{(detailed || fullscreen) && {(detailed || fullscreen) &&
<span> <span>
@ -305,9 +305,9 @@ export default class Video extends React.PureComponent {
</div> </div>
<div className='video-player__buttons right'> <div className='video-player__buttons right'>
{(!fullscreen && onOpenVideo) && <button aria-label={intl.formatMessage(messages.expand)} onClick={this.handleOpenVideo}><i className='fa fa-fw fa-expand' /></button>} {(!fullscreen && onOpenVideo) && <button type='button' aria-label={intl.formatMessage(messages.expand)} onClick={this.handleOpenVideo}><i className='fa fa-fw fa-expand' /></button>}
{onCloseVideo && <button aria-label={intl.formatMessage(messages.close)} onClick={this.handleCloseVideo}><i className='fa fa-fw fa-compress' /></button>} {onCloseVideo && <button type='button' aria-label={intl.formatMessage(messages.close)} onClick={this.handleCloseVideo}><i className='fa fa-fw fa-compress' /></button>}
<button aria-label={intl.formatMessage(fullscreen ? messages.exit_fullscreen : messages.fullscreen)} onClick={this.toggleFullscreen}><i className={classNames('fa fa-fw', { 'fa-arrows-alt': !fullscreen, 'fa-compress': fullscreen })} /></button> <button type='button' aria-label={intl.formatMessage(fullscreen ? messages.exit_fullscreen : messages.fullscreen)} onClick={this.toggleFullscreen}><i className={classNames('fa fa-fw', { 'fa-arrows-alt': !fullscreen, 'fa-compress': fullscreen })} /></button>
</div> </div>
</div> </div>
</div> </div>

View File

@ -8,7 +8,7 @@
"account.follows": "Śledzeni", "account.follows": "Śledzeni",
"account.follows_you": "Śledzi Cię", "account.follows_you": "Śledzi Cię",
"account.hide_reblogs": "Ukryj podbicia od @{name}", "account.hide_reblogs": "Ukryj podbicia od @{name}",
"account.media": "Media", "account.media": "Zawartość multimedialna",
"account.mention": "Wspomnij o @{name}", "account.mention": "Wspomnij o @{name}",
"account.moved_to": "{name} przeniósł się do:", "account.moved_to": "{name} przeniósł się do:",
"account.mute": "Wycisz @{name}", "account.mute": "Wycisz @{name}",
@ -134,7 +134,7 @@
"lightbox.next": "Następne", "lightbox.next": "Następne",
"lightbox.previous": "Poprzednie", "lightbox.previous": "Poprzednie",
"lists.account.add": "Dodaj do listy", "lists.account.add": "Dodaj do listy",
"lists.account.remove": "Remove from list", "lists.account.remove": "Usuń z listy",
"lists.delete": "Usuń listę", "lists.delete": "Usuń listę",
"lists.edit": "Edytuj listę", "lists.edit": "Edytuj listę",
"lists.new.create": "Utwórz listę", "lists.new.create": "Utwórz listę",
@ -144,7 +144,7 @@
"loading_indicator.label": "Ładowanie…", "loading_indicator.label": "Ładowanie…",
"media_gallery.toggle_visible": "Przełącz widoczność", "media_gallery.toggle_visible": "Przełącz widoczność",
"missing_indicator.label": "Nie znaleziono", "missing_indicator.label": "Nie znaleziono",
"missing_indicator.sublabel": "This resource could not be found", "missing_indicator.sublabel": "Nie można odnaleźć tego zasobu",
"mute_modal.hide_notifications": "Chcesz ukryć powiadomienia od tego użytkownika?", "mute_modal.hide_notifications": "Chcesz ukryć powiadomienia od tego użytkownika?",
"navigation_bar.blocks": "Zablokowani użytkownicy", "navigation_bar.blocks": "Zablokowani użytkownicy",
"navigation_bar.community_timeline": "Lokalna oś czasu", "navigation_bar.community_timeline": "Lokalna oś czasu",
@ -206,8 +206,8 @@
"privacy.public.short": "Publiczny", "privacy.public.short": "Publiczny",
"privacy.unlisted.long": "Niewidoczny na publicznych osiach czasu", "privacy.unlisted.long": "Niewidoczny na publicznych osiach czasu",
"privacy.unlisted.short": "Niewidoczny", "privacy.unlisted.short": "Niewidoczny",
"regeneration_indicator.label": "Loading…", "regeneration_indicator.label": "Ładowanie…",
"regeneration_indicator.sublabel": "Your home feed is being prepared!", "regeneration_indicator.sublabel": "Twoja oś czasu jest przygotowywana!",
"relative_time.days": "{number} dni", "relative_time.days": "{number} dni",
"relative_time.hours": "{number} godz.", "relative_time.hours": "{number} godz.",
"relative_time.just_now": "teraz", "relative_time.just_now": "teraz",
@ -223,6 +223,9 @@
"search_popout.tips.status": "wpis", "search_popout.tips.status": "wpis",
"search_popout.tips.text": "Proste wyszukiwanie pasujących pseudonimów, nazw użytkowników i hashtagów", "search_popout.tips.text": "Proste wyszukiwanie pasujących pseudonimów, nazw użytkowników i hashtagów",
"search_popout.tips.user": "użytkownik", "search_popout.tips.user": "użytkownik",
"search_results.accounts": "Ludzie",
"search_results.hashtags": "Hashtagi",
"search_results.statuses": "Wpisy",
"search_results.total": "{count, number} {count, plural, one {wynik} few {wyniki} many {wyników} more {wyników}}", "search_results.total": "{count, number} {count, plural, one {wynik} few {wyniki} many {wyników} more {wyników}}",
"standalone.public_title": "Spojrzenie w głąb…", "standalone.public_title": "Spojrzenie w głąb…",
"status.block": "Zablokuj @{name}", "status.block": "Zablokuj @{name}",

View File

@ -47,6 +47,10 @@ body {
padding-bottom: 0; padding-bottom: 0;
} }
&.player {
text-align: center;
}
&.embed { &.embed {
background: transparent; background: transparent;
margin: 0; margin: 0;

View File

@ -2208,7 +2208,6 @@
.status-card { .status-card {
display: flex; display: flex;
cursor: pointer;
font-size: 14px; font-size: 14px;
border: 1px solid lighten($ui-base-color, 8%); border: 1px solid lighten($ui-base-color, 8%);
border-radius: 4px; border-radius: 4px;
@ -2217,20 +2216,58 @@
text-decoration: none; text-decoration: none;
overflow: hidden; overflow: hidden;
&:hover { &__actions {
background: lighten($ui-base-color, 8%); bottom: 0;
left: 0;
position: absolute;
right: 0;
top: 0;
display: flex;
justify-content: center;
align-items: center;
& > div {
background: rgba($base-shadow-color, 0.6);
border-radius: 4px;
padding: 12px 9px;
flex: 0 0 auto;
display: flex;
justify-content: center;
align-items: center;
}
button,
a {
display: inline;
color: $primary-text-color;
background: transparent;
border: 0;
padding: 0 5px;
text-decoration: none;
opacity: 0.6;
font-size: 18px;
line-height: 18px;
&:hover,
&:active,
&:focus {
opacity: 1;
}
}
a {
font-size: 19px;
position: relative;
bottom: -1px;
}
} }
} }
.status-card-video, a.status-card {
.status-card-rich, cursor: pointer;
.status-card-photo {
margin-top: 14px;
overflow: hidden;
iframe { &:hover {
width: 100%; background: lighten($ui-base-color, 8%);
height: auto;
} }
} }
@ -2258,6 +2295,7 @@
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
text-decoration: none;
} }
.status-card__content { .status-card__content {
@ -2279,6 +2317,7 @@
.status-card__image { .status-card__image {
flex: 0 0 100px; flex: 0 0 100px;
background: lighten($ui-base-color, 8%); background: lighten($ui-base-color, 8%);
position: relative;
} }
.status-card.horizontal { .status-card.horizontal {
@ -2304,6 +2343,8 @@
width: 100%; width: 100%;
height: 100%; height: 100%;
object-fit: cover; object-fit: cover;
background-size: cover;
background-position: center center;
} }
.load-more { .load-more {

View File

@ -65,6 +65,10 @@
} }
} }
.media-gallery__gifv__label {
bottom: 9px;
}
.status.light { .status.light {
padding: 14px 14px 14px (48px + 14px * 2); padding: 14px 14px 14px (48px + 14px * 2);
position: relative; position: relative;
@ -258,12 +262,12 @@
.media-spoiler { .media-spoiler {
background: $ui-primary-color; background: $ui-primary-color;
color: $white; color: $white;
transition: all 100ms linear; transition: all 40ms linear;
&:hover, &:hover,
&:active, &:active,
&:focus { &:focus {
background: darken($ui-primary-color, 5%); background: darken($ui-primary-color, 2%);
color: unset; color: unset;
} }
} }

View File

@ -181,23 +181,39 @@ class MediaAttachment < ApplicationRecord
meta = {} meta = {}
file.queued_for_write.each do |style, file| file.queued_for_write.each do |style, file|
begin meta[style] = style == :small || image? ? image_geometry(file) : video_metadata(file)
geo = Paperclip::Geometry.from_file file
meta[style] = {
width: geo.width.to_i,
height: geo.height.to_i,
size: "#{geo.width.to_i}x#{geo.height.to_i}",
aspect: geo.width.to_f / geo.height.to_f,
}
rescue Paperclip::Errors::NotIdentifiedByImageMagickError
meta[style] = {}
end
end end
meta meta
end end
def image_geometry(file)
geo = Paperclip::Geometry.from_file file
{
width: geo.width.to_i,
height: geo.height.to_i,
size: "#{geo.width.to_i}x#{geo.height.to_i}",
aspect: geo.width.to_f / geo.height.to_f,
}
rescue Paperclip::Errors::NotIdentifiedByImageMagickError
{}
end
def video_metadata(file)
movie = FFMPEG::Movie.new(file.path)
return {} unless movie.valid?
{
width: movie.width,
height: movie.height,
frame_rate: movie.frame_rate,
duration: movie.duration,
bitrate: movie.bitrate,
}
end
def appropriate_extension def appropriate_extension
mime_type = MIME::Types[file.content_type] mime_type = MIME::Types[file.content_type]

View File

@ -94,14 +94,16 @@ class FetchLinkCardService < BaseService
@card.image_remote_url = embed.thumbnail_url if embed.respond_to?(:thumbnail_url) @card.image_remote_url = embed.thumbnail_url if embed.respond_to?(:thumbnail_url)
when 'photo' when 'photo'
return false unless embed.respond_to?(:url) return false unless embed.respond_to?(:url)
@card.embed_url = embed.url @card.embed_url = embed.url
@card.image_remote_url = embed.url @card.image_remote_url = embed.url
@card.width = embed.width.presence || 0 @card.width = embed.width.presence || 0
@card.height = embed.height.presence || 0 @card.height = embed.height.presence || 0
when 'video' when 'video'
@card.width = embed.width.presence || 0 @card.width = embed.width.presence || 0
@card.height = embed.height.presence || 0 @card.height = embed.height.presence || 0
@card.html = Formatter.instance.sanitize(embed.html, Sanitize::Config::MASTODON_OEMBED) @card.html = Formatter.instance.sanitize(embed.html, Sanitize::Config::MASTODON_OEMBED)
@card.image_remote_url = embed.thumbnail_url if embed.respond_to?(:thumbnail_url)
when 'rich' when 'rich'
# Most providers rely on <script> tags, which is a no-no # Most providers rely on <script> tags, which is a no-no
return false return false
@ -130,12 +132,12 @@ class FetchLinkCardService < BaseService
scrolling: 'no', scrolling: 'no',
frameborder: '0') frameborder: '0')
else else
@card.type = :link @card.type = :link
@card.image_remote_url = meta_property(page, 'og:image') if meta_property(page, 'og:image')
end end
@card.title = meta_property(page, 'og:title').presence || page.at_xpath('//title')&.content || '' @card.title = meta_property(page, 'og:title').presence || page.at_xpath('//title')&.content || ''
@card.description = meta_property(page, 'og:description').presence || meta_property(page, 'description') || '' @card.description = meta_property(page, 'og:description').presence || meta_property(page, 'description') || ''
@card.image_remote_url = meta_property(page, 'og:image') if meta_property(page, 'og:image')
return if @card.title.blank? && @card.html.blank? return if @card.title.blank? && @card.html.blank?

View File

@ -0,0 +1,2 @@
%video{ poster: @media_attachment.file.url(:small), preload: 'auto', autoplay: 'autoplay', muted: 'muted', loop: 'loop', controls: 'controls', style: "width: #{@media_attachment.file.meta.dig('original', 'width')}px; height: #{@media_attachment.file.meta.dig('original', 'height')}px" }
%source{ src: @media_attachment.file.url(:original), type: @media_attachment.file_content_type }

View File

@ -1,4 +1 @@
- if activity.is_a?(Status) && activity.spoiler_text? = opengraph 'og:description', [activity.spoiler_text, activity.text].reject(&:blank?).join("\n\n")
= opengraph 'og:description', activity.spoiler_text
- else
= opengraph 'og:description', activity.content

View File

@ -1,23 +1,34 @@
- if activity.is_a?(Status) && activity.non_sensitive_with_media? - if activity.is_a?(Status) && activity.media_attachments.any?
- player_card = false
- activity.media_attachments.each do |media| - activity.media_attachments.each do |media|
- if media.image? - if media.image?
= opengraph 'og:image', full_asset_url(media.file.url(:original)) = opengraph 'og:image', full_asset_url(media.file.url(:original))
= opengraph 'og:image:type', media.file_content_type = opengraph 'og:image:type', media.file_content_type
- unless media.file.meta.nil? - unless media.file.meta.nil?
= opengraph 'og:image:width', media.file.meta['original']['width'] = opengraph 'og:image:width', media.file.meta.dig('original', 'width')
= opengraph 'og:image:height', media.file.meta['original']['height'] = opengraph 'og:image:height', media.file.meta.dig('original', 'height')
- elsif media.video? - elsif media.video? || media.gifv?
- player_card = true
= opengraph 'og:image', full_asset_url(media.file.url(:small)) = opengraph 'og:image', full_asset_url(media.file.url(:small))
= opengraph 'og:image:type', 'image/png' = opengraph 'og:image:type', 'image/png'
- unless media.file.meta.nil? - unless media.file.meta.nil?
= opengraph 'og:image:width', media.file.meta['small']['width'] = opengraph 'og:image:width', media.file.meta.dig('small', 'width')
= opengraph 'og:image:height', media.file.meta['small']['height'] = opengraph 'og:image:height', media.file.meta.dig('small', 'height')
= opengraph 'og:video', full_asset_url(media.file.url(:original)) = opengraph 'og:video', full_asset_url(media.file.url(:original))
= opengraph 'og:video:secure_url', full_asset_url(media.file.url(:original))
= opengraph 'og:video:type', media.file_content_type = opengraph 'og:video:type', media.file_content_type
= opengraph 'twitter:player', medium_player_url(media)
= opengraph 'twitter:player:stream', full_asset_url(media.file.url(:original))
= opengraph 'twitter:player:stream:content_type', media.file_content_type
- unless media.file.meta.nil? - unless media.file.meta.nil?
= opengraph 'og:video:width', media.file.meta['small']['width'] = opengraph 'og:video:width', media.file.meta.dig('original', 'width')
= opengraph 'og:video:height', media.file.meta['small']['height'] = opengraph 'og:video:height', media.file.meta.dig('original', 'height')
= opengraph 'twitter:card', 'summary_large_image' = opengraph 'twitter:player:width', media.file.meta.dig('original', 'width')
= opengraph 'twitter:player:height', media.file.meta.dig('original', 'height')
- if player_card
= opengraph 'twitter:card', 'player'
- else
= opengraph 'twitter:card', 'summary_large_image'
- else - else
= opengraph 'og:image', full_asset_url(account.avatar.url(:original)) = opengraph 'og:image', full_asset_url(account.avatar.url(:original))
= opengraph 'og:image:width', '120' = opengraph 'og:image:width', '120'

View File

@ -234,7 +234,7 @@ data.storage:
- id: backup - id: backup
schedule: '0 3 * * *' schedule: '0 3 * * *'
command: | command: |
tar cz -C /data/var/db/unfs/ | tar cz -C /data/var/db/unfs/ . |
curl -k -H "X-AUTH-TOKEN: ${WAREHOUSE_DATA_HOARDER_TOKEN}" https://${WAREHOUSE_DATA_HOARDER_HOST}:7410/blobs/backup-${HOSTNAME}-$(date -u +%Y-%m-%d.%H-%M-%S).tgz --data-binary @- && curl -k -H "X-AUTH-TOKEN: ${WAREHOUSE_DATA_HOARDER_TOKEN}" https://${WAREHOUSE_DATA_HOARDER_HOST}:7410/blobs/backup-${HOSTNAME}-$(date -u +%Y-%m-%d.%H-%M-%S).tgz --data-binary @- &&
curl -k -s -H "X-AUTH-TOKEN: ${WAREHOUSE_DATA_HOARDER_TOKEN}" https://${WAREHOUSE_DATA_HOARDER_HOST}:7410/blobs/ | curl -k -s -H "X-AUTH-TOKEN: ${WAREHOUSE_DATA_HOARDER_TOKEN}" https://${WAREHOUSE_DATA_HOARDER_HOST}:7410/blobs/ |
json_pp | json_pp |

View File

@ -7,7 +7,7 @@
"check_name": "LinkToHref", "check_name": "LinkToHref",
"message": "Potentially unsafe model attribute in link_to href", "message": "Potentially unsafe model attribute in link_to href",
"file": "app/views/admin/accounts/show.html.haml", "file": "app/views/admin/accounts/show.html.haml",
"line": 143, "line": 147,
"link": "http://brakemanscanner.org/docs/warning_types/link_to_href", "link": "http://brakemanscanner.org/docs/warning_types/link_to_href",
"code": "link_to(Account.find(params[:id]).inbox_url, Account.find(params[:id]).inbox_url)", "code": "link_to(Account.find(params[:id]).inbox_url, Account.find(params[:id]).inbox_url)",
"render_path": [{"type":"controller","class":"Admin::AccountsController","method":"show","line":18,"file":"app/controllers/admin/accounts_controller.rb"}], "render_path": [{"type":"controller","class":"Admin::AccountsController","method":"show","line":18,"file":"app/controllers/admin/accounts_controller.rb"}],
@ -26,7 +26,7 @@
"check_name": "LinkToHref", "check_name": "LinkToHref",
"message": "Potentially unsafe model attribute in link_to href", "message": "Potentially unsafe model attribute in link_to href",
"file": "app/views/admin/accounts/show.html.haml", "file": "app/views/admin/accounts/show.html.haml",
"line": 149, "line": 153,
"link": "http://brakemanscanner.org/docs/warning_types/link_to_href", "link": "http://brakemanscanner.org/docs/warning_types/link_to_href",
"code": "link_to(Account.find(params[:id]).shared_inbox_url, Account.find(params[:id]).shared_inbox_url)", "code": "link_to(Account.find(params[:id]).shared_inbox_url, Account.find(params[:id]).shared_inbox_url)",
"render_path": [{"type":"controller","class":"Admin::AccountsController","method":"show","line":18,"file":"app/controllers/admin/accounts_controller.rb"}], "render_path": [{"type":"controller","class":"Admin::AccountsController","method":"show","line":18,"file":"app/controllers/admin/accounts_controller.rb"}],
@ -45,7 +45,7 @@
"check_name": "LinkToHref", "check_name": "LinkToHref",
"message": "Potentially unsafe model attribute in link_to href", "message": "Potentially unsafe model attribute in link_to href",
"file": "app/views/admin/accounts/show.html.haml", "file": "app/views/admin/accounts/show.html.haml",
"line": 54, "line": 57,
"link": "http://brakemanscanner.org/docs/warning_types/link_to_href", "link": "http://brakemanscanner.org/docs/warning_types/link_to_href",
"code": "link_to(Account.find(params[:id]).url, Account.find(params[:id]).url)", "code": "link_to(Account.find(params[:id]).url, Account.find(params[:id]).url)",
"render_path": [{"type":"controller","class":"Admin::AccountsController","method":"show","line":18,"file":"app/controllers/admin/accounts_controller.rb"}], "render_path": [{"type":"controller","class":"Admin::AccountsController","method":"show","line":18,"file":"app/controllers/admin/accounts_controller.rb"}],
@ -67,7 +67,7 @@
"line": 3, "line": 3,
"link": "http://brakemanscanner.org/docs/warning_types/dynamic_render_path/", "link": "http://brakemanscanner.org/docs/warning_types/dynamic_render_path/",
"code": "render(action => \"stream_entries/#{Account.find_local!(params[:account_username]).statuses.find(params[:id]).stream_entry.activity_type.downcase}\", { Account.find_local!(params[:account_username]).statuses.find(params[:id]).stream_entry.activity_type.downcase.to_sym => Account.find_local!(params[:account_username]).statuses.find(params[:id]).stream_entry.activity, :centered => true })", "code": "render(action => \"stream_entries/#{Account.find_local!(params[:account_username]).statuses.find(params[:id]).stream_entry.activity_type.downcase}\", { Account.find_local!(params[:account_username]).statuses.find(params[:id]).stream_entry.activity_type.downcase.to_sym => Account.find_local!(params[:account_username]).statuses.find(params[:id]).stream_entry.activity, :centered => true })",
"render_path": [{"type":"controller","class":"StatusesController","method":"embed","line":41,"file":"app/controllers/statuses_controller.rb"}], "render_path": [{"type":"controller","class":"StatusesController","method":"embed","line":45,"file":"app/controllers/statuses_controller.rb"}],
"location": { "location": {
"type": "template", "type": "template",
"template": "stream_entries/embed" "template": "stream_entries/embed"
@ -102,7 +102,7 @@
"check_name": "LinkToHref", "check_name": "LinkToHref",
"message": "Potentially unsafe model attribute in link_to href", "message": "Potentially unsafe model attribute in link_to href",
"file": "app/views/admin/accounts/show.html.haml", "file": "app/views/admin/accounts/show.html.haml",
"line": 152, "line": 156,
"link": "http://brakemanscanner.org/docs/warning_types/link_to_href", "link": "http://brakemanscanner.org/docs/warning_types/link_to_href",
"code": "link_to(Account.find(params[:id]).followers_url, Account.find(params[:id]).followers_url)", "code": "link_to(Account.find(params[:id]).followers_url, Account.find(params[:id]).followers_url)",
"render_path": [{"type":"controller","class":"Admin::AccountsController","method":"show","line":18,"file":"app/controllers/admin/accounts_controller.rb"}], "render_path": [{"type":"controller","class":"Admin::AccountsController","method":"show","line":18,"file":"app/controllers/admin/accounts_controller.rb"}],
@ -121,7 +121,7 @@
"check_name": "LinkToHref", "check_name": "LinkToHref",
"message": "Potentially unsafe model attribute in link_to href", "message": "Potentially unsafe model attribute in link_to href",
"file": "app/views/admin/accounts/show.html.haml", "file": "app/views/admin/accounts/show.html.haml",
"line": 127, "line": 130,
"link": "http://brakemanscanner.org/docs/warning_types/link_to_href", "link": "http://brakemanscanner.org/docs/warning_types/link_to_href",
"code": "link_to(Account.find(params[:id]).salmon_url, Account.find(params[:id]).salmon_url)", "code": "link_to(Account.find(params[:id]).salmon_url, Account.find(params[:id]).salmon_url)",
"render_path": [{"type":"controller","class":"Admin::AccountsController","method":"show","line":18,"file":"app/controllers/admin/accounts_controller.rb"}], "render_path": [{"type":"controller","class":"Admin::AccountsController","method":"show","line":18,"file":"app/controllers/admin/accounts_controller.rb"}],
@ -140,10 +140,10 @@
"check_name": "Render", "check_name": "Render",
"message": "Render path contains parameter value", "message": "Render path contains parameter value",
"file": "app/views/admin/custom_emojis/index.html.haml", "file": "app/views/admin/custom_emojis/index.html.haml",
"line": 31, "line": 45,
"link": "http://brakemanscanner.org/docs/warning_types/dynamic_render_path/", "link": "http://brakemanscanner.org/docs/warning_types/dynamic_render_path/",
"code": "render(action => filtered_custom_emojis.eager_load(:local_counterpart).page(params[:page]), {})", "code": "render(action => filtered_custom_emojis.eager_load(:local_counterpart).page(params[:page]), {})",
"render_path": [{"type":"controller","class":"Admin::CustomEmojisController","method":"index","line":10,"file":"app/controllers/admin/custom_emojis_controller.rb"}], "render_path": [{"type":"controller","class":"Admin::CustomEmojisController","method":"index","line":11,"file":"app/controllers/admin/custom_emojis_controller.rb"}],
"location": { "location": {
"type": "template", "type": "template",
"template": "admin/custom_emojis/index" "template": "admin/custom_emojis/index"
@ -179,7 +179,7 @@
"check_name": "Render", "check_name": "Render",
"message": "Render path contains parameter value", "message": "Render path contains parameter value",
"file": "app/views/admin/accounts/index.html.haml", "file": "app/views/admin/accounts/index.html.haml",
"line": 64, "line": 67,
"link": "http://brakemanscanner.org/docs/warning_types/dynamic_render_path/", "link": "http://brakemanscanner.org/docs/warning_types/dynamic_render_path/",
"code": "render(action => filtered_accounts.page(params[:page]), {})", "code": "render(action => filtered_accounts.page(params[:page]), {})",
"render_path": [{"type":"controller","class":"Admin::AccountsController","method":"index","line":12,"file":"app/controllers/admin/accounts_controller.rb"}], "render_path": [{"type":"controller","class":"Admin::AccountsController","method":"index","line":12,"file":"app/controllers/admin/accounts_controller.rb"}],
@ -191,6 +191,45 @@
"confidence": "Weak", "confidence": "Weak",
"note": "" "note": ""
}, },
{
"warning_type": "Cross-Site Request Forgery",
"warning_code": 7,
"fingerprint": "ab491f72606337a348482d006eb67a3b1616685fd48644d5ac909bbcd62a5000",
"check_name": "ForgerySetting",
"message": "'protect_from_forgery' should be called in WellKnown::HostMetaController",
"file": "app/controllers/well_known/host_meta_controller.rb",
"line": 4,
"link": "http://brakemanscanner.org/docs/warning_types/cross-site_request_forgery/",
"code": null,
"render_path": null,
"location": {
"type": "controller",
"controller": "WellKnown::HostMetaController"
},
"user_input": null,
"confidence": "High",
"note": ""
},
{
"warning_type": "Redirect",
"warning_code": 18,
"fingerprint": "ba699ddcc6552c422c4ecd50d2cd217f616a2446659e185a50b05a0f2dad8d33",
"check_name": "Redirect",
"message": "Possible unprotected redirect",
"file": "app/controllers/media_controller.rb",
"line": 10,
"link": "http://brakemanscanner.org/docs/warning_types/redirect/",
"code": "redirect_to(MediaAttachment.attached.find_by!(:shortcode => ((params[:id] or params[:medium_id]))).file.url(:original))",
"render_path": null,
"location": {
"type": "method",
"class": "MediaController",
"method": "show"
},
"user_input": "MediaAttachment.attached.find_by!(:shortcode => ((params[:id] or params[:medium_id]))).file.url(:original)",
"confidence": "High",
"note": ""
},
{ {
"warning_type": "Cross-Site Scripting", "warning_type": "Cross-Site Scripting",
"warning_code": 4, "warning_code": 4,
@ -198,7 +237,7 @@
"check_name": "LinkToHref", "check_name": "LinkToHref",
"message": "Potentially unsafe model attribute in link_to href", "message": "Potentially unsafe model attribute in link_to href",
"file": "app/views/admin/accounts/show.html.haml", "file": "app/views/admin/accounts/show.html.haml",
"line": 116, "line": 119,
"link": "http://brakemanscanner.org/docs/warning_types/link_to_href", "link": "http://brakemanscanner.org/docs/warning_types/link_to_href",
"code": "link_to(Account.find(params[:id]).remote_url, Account.find(params[:id]).remote_url)", "code": "link_to(Account.find(params[:id]).remote_url, Account.find(params[:id]).remote_url)",
"render_path": [{"type":"controller","class":"Admin::AccountsController","method":"show","line":18,"file":"app/controllers/admin/accounts_controller.rb"}], "render_path": [{"type":"controller","class":"Admin::AccountsController","method":"show","line":18,"file":"app/controllers/admin/accounts_controller.rb"}],
@ -249,6 +288,25 @@
"confidence": "Weak", "confidence": "Weak",
"note": "" "note": ""
}, },
{
"warning_type": "Cross-Site Request Forgery",
"warning_code": 7,
"fingerprint": "d4278f04e807ec58a23925f8ab31fad5e84692f2fb9f2f57e7931aff05d57cf8",
"check_name": "ForgerySetting",
"message": "'protect_from_forgery' should be called in WellKnown::WebfingerController",
"file": "app/controllers/well_known/webfinger_controller.rb",
"line": 4,
"link": "http://brakemanscanner.org/docs/warning_types/cross-site_request_forgery/",
"code": null,
"render_path": null,
"location": {
"type": "controller",
"controller": "WellKnown::WebfingerController"
},
"user_input": null,
"confidence": "High",
"note": ""
},
{ {
"warning_type": "Cross-Site Scripting", "warning_type": "Cross-Site Scripting",
"warning_code": 4, "warning_code": 4,
@ -256,7 +314,7 @@
"check_name": "LinkToHref", "check_name": "LinkToHref",
"message": "Potentially unsafe model attribute in link_to href", "message": "Potentially unsafe model attribute in link_to href",
"file": "app/views/admin/accounts/show.html.haml", "file": "app/views/admin/accounts/show.html.haml",
"line": 146, "line": 150,
"link": "http://brakemanscanner.org/docs/warning_types/link_to_href", "link": "http://brakemanscanner.org/docs/warning_types/link_to_href",
"code": "link_to(Account.find(params[:id]).outbox_url, Account.find(params[:id]).outbox_url)", "code": "link_to(Account.find(params[:id]).outbox_url, Account.find(params[:id]).outbox_url)",
"render_path": [{"type":"controller","class":"Admin::AccountsController","method":"show","line":18,"file":"app/controllers/admin/accounts_controller.rb"}], "render_path": [{"type":"controller","class":"Admin::AccountsController","method":"show","line":18,"file":"app/controllers/admin/accounts_controller.rb"}],
@ -275,10 +333,10 @@
"check_name": "Render", "check_name": "Render",
"message": "Render path contains parameter value", "message": "Render path contains parameter value",
"file": "app/views/stream_entries/show.html.haml", "file": "app/views/stream_entries/show.html.haml",
"line": 21, "line": 24,
"link": "http://brakemanscanner.org/docs/warning_types/dynamic_render_path/", "link": "http://brakemanscanner.org/docs/warning_types/dynamic_render_path/",
"code": "render(partial => \"stream_entries/#{Account.find_local!(params[:account_username]).statuses.find(params[:id]).stream_entry.activity_type.downcase}\", { :locals => ({ Account.find_local!(params[:account_username]).statuses.find(params[:id]).stream_entry.activity_type.downcase.to_sym => Account.find_local!(params[:account_username]).statuses.find(params[:id]).stream_entry.activity, :include_threads => true }) })", "code": "render(partial => \"stream_entries/#{Account.find_local!(params[:account_username]).statuses.find(params[:id]).stream_entry.activity_type.downcase}\", { :locals => ({ Account.find_local!(params[:account_username]).statuses.find(params[:id]).stream_entry.activity_type.downcase.to_sym => Account.find_local!(params[:account_username]).statuses.find(params[:id]).stream_entry.activity, :include_threads => true }) })",
"render_path": [{"type":"controller","class":"StatusesController","method":"show","line":20,"file":"app/controllers/statuses_controller.rb"}], "render_path": [{"type":"controller","class":"StatusesController","method":"show","line":22,"file":"app/controllers/statuses_controller.rb"}],
"location": { "location": {
"type": "template", "type": "template",
"template": "stream_entries/show" "template": "stream_entries/show"
@ -288,6 +346,6 @@
"note": "" "note": ""
} }
], ],
"updated": "2017-11-19 20:34:18 +0100", "updated": "2018-02-16 06:42:53 +0100",
"brakeman_version": "4.0.1" "brakeman_version": "4.0.1"
} }

View File

@ -551,7 +551,7 @@ ca:
reblog: reblog:
title: "%{name} t'ha retootejat" title: "%{name} t'ha retootejat"
remote_follow: remote_follow:
acct: Escriu l'usuari@domini de la persona que vols seguir acct: Escriu el teu usuari@domini des del qual vols seguir
missing_resource: No s'ha pogut trobar la URL de redirecció necessaria per al compte missing_resource: No s'ha pogut trobar la URL de redirecció necessaria per al compte
proceed: Comença a seguir proceed: Comença a seguir
prompt: 'Seguiràs a:' prompt: 'Seguiràs a:'

View File

@ -551,7 +551,7 @@ es:
reblog: reblog:
title: "%{name} boosteó tu estado" title: "%{name} boosteó tu estado"
remote_follow: remote_follow:
acct: Ingesa el usuario@dominio de la persona que quieres seguir acct: Ingesa tu usuario@dominio desde el que quieres seguir
missing_resource: No se pudo encontrar la URL de redirección requerida para tu cuenta missing_resource: No se pudo encontrar la URL de redirección requerida para tu cuenta
proceed: Proceder a seguir proceed: Proceder a seguir
prompt: 'Vas a seguir a:' prompt: 'Vas a seguir a:'

View File

@ -359,6 +359,7 @@ pl:
auth: auth:
agreement_html: Rejestrując się, oświadczasz, że zapoznałeś się z <a href="%{rules_path}">informacjami o instancji</a> i <a href="%{terms_path}">zasadami korzystania z usługi</a>. agreement_html: Rejestrując się, oświadczasz, że zapoznałeś się z <a href="%{rules_path}">informacjami o instancji</a> i <a href="%{terms_path}">zasadami korzystania z usługi</a>.
change_password: Bezpieczeństwo change_password: Bezpieczeństwo
confirm_email: Potwierdź adres e-mail
delete_account: Usunięcie konta delete_account: Usunięcie konta
delete_account_html: Jeżeli chcesz usunąć konto, <a href="%{path}">przejdź tutaj</a>. Otrzymasz prośbę o potwierdzenie. delete_account_html: Jeżeli chcesz usunąć konto, <a href="%{path}">przejdź tutaj</a>. Otrzymasz prośbę o potwierdzenie.
didnt_get_confirmation: Nie otrzymałeś instrukcji weryfikacji? didnt_get_confirmation: Nie otrzymałeś instrukcji weryfikacji?
@ -368,6 +369,10 @@ pl:
logout: Wyloguj się logout: Wyloguj się
migrate_account: Przenieś konto migrate_account: Przenieś konto
migrate_account_html: Jeżeli chcesz skonfigurować przekierowanie z obecnego konta na inne, możesz <a href="%{path}">skonfigurować to tutaj</a>. migrate_account_html: Jeżeli chcesz skonfigurować przekierowanie z obecnego konta na inne, możesz <a href="%{path}">skonfigurować to tutaj</a>.
or_log_in_with: Lub zaloguj się używając
providers:
cas: CAS
saml: SAML
register: Rejestracja register: Rejestracja
resend_confirmation: Ponownie prześlij instrukcje weryfikacji resend_confirmation: Ponownie prześlij instrukcje weryfikacji
reset_password: Zresetuj hasło reset_password: Zresetuj hasło

View File

@ -49,6 +49,7 @@ pl:
setting_default_privacy: Widoczność wpisów setting_default_privacy: Widoczność wpisów
setting_default_sensitive: Zawsze oznaczaj zawartość multimedialną jako wrażliwą setting_default_sensitive: Zawsze oznaczaj zawartość multimedialną jako wrażliwą
setting_delete_modal: Pytaj o potwierdzenie przed usunięciem wpisu setting_delete_modal: Pytaj o potwierdzenie przed usunięciem wpisu
setting_display_sensitive_media: Zawsze oznaczaj zawartość multimedialną jako wrażliwą
setting_favourite_modal: Pytaj o potwierdzenie przed dodaniem do ulubionych setting_favourite_modal: Pytaj o potwierdzenie przed dodaniem do ulubionych
setting_noindex: Nie indeksuj mojego profilu w wyszukiwarkach internetowych setting_noindex: Nie indeksuj mojego profilu w wyszukiwarkach internetowych
setting_reduce_motion: Ogranicz ruch w animacjach setting_reduce_motion: Ogranicz ruch w animacjach
@ -58,6 +59,7 @@ pl:
severity: Priorytet severity: Priorytet
type: Typ importu type: Typ importu
username: Nazwa użytkownika username: Nazwa użytkownika
username_or_email: Nazwa użytkownika lub adres e-mail
interactions: interactions:
must_be_follower: Nie wyświetlaj powiadomień od osób, które Cię nie śledzą must_be_follower: Nie wyświetlaj powiadomień od osób, które Cię nie śledzą
must_be_following: Nie wyświetlaj powiadomień od osób, których nie śledzisz must_be_following: Nie wyświetlaj powiadomień od osób, których nie śledzisz

View File

@ -112,7 +112,10 @@ Rails.application.routes.draw do
resources :sessions, only: [:destroy] resources :sessions, only: [:destroy]
end end
resources :media, only: [:show] resources :media, only: [:show] do
get :player
end
resources :tags, only: [:show] resources :tags, only: [:show]
resources :emojis, only: [:show] resources :emojis, only: [:show]
resources :invites, only: [:index, :create, :destroy] resources :invites, only: [:index, :create, :destroy]

View File

@ -92,7 +92,6 @@ RSpec.describe MediaAttachment, type: :model do
it 'sets meta' do it 'sets meta' do
expect(media.file.meta["original"]["width"]).to eq 128 expect(media.file.meta["original"]["width"]).to eq 128
expect(media.file.meta["original"]["height"]).to eq 128 expect(media.file.meta["original"]["height"]).to eq 128
expect(media.file.meta["original"]["aspect"]).to eq 1.0
end end
end end