ar
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Display AttachmentList in notifications (#6693)

rebase/4.0.0rc2
Eugen Rochko 2018-03-08 08:22:04 +01:00 committed by GitHub
parent 510c9049c7
commit 77406d3a09
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/javascript/mastodon/components/attachment_list.js
View File

@ -19,11 +19,15 @@ export default class AttachmentList extends ImmutablePureComponent {
return ( return (
<div className='attachment-list compact'> <div className='attachment-list compact'>
<ul className='attachment-list__list'> <ul className='attachment-list__list'>
{media.map(attachment => ( {media.map(attachment => {
const displayUrl = attachment.get('remote_url') || attachment.get('url');
return (
<li key={attachment.get('id')}> <li key={attachment.get('id')}>
<a href={attachment.get('remote_url')} target='_blank' rel='noopener'><i className='fa fa-link' /> {filename(attachment.get('remote_url'))}</a> <a href={displayUrl} target='_blank' rel='noopener'><i className='fa fa-link' /> {filename(displayUrl)}</a>
</li> </li>
))} );
})}
</ul> </ul>
</div> </div>
); );
@ -36,11 +40,15 @@ export default class AttachmentList extends ImmutablePureComponent {
</div> </div>
<ul className='attachment-list__list'> <ul className='attachment-list__list'>
{media.map(attachment => ( {media.map(attachment => {
const displayUrl = attachment.get('remote_url') || attachment.get('url');
return (
<li key={attachment.get('id')}> <li key={attachment.get('id')}>
<a href={attachment.get('remote_url')} target='_blank' rel='noopener'>{filename(attachment.get('remote_url'))}</a> <a href={displayUrl} target='_blank' rel='noopener'>{filename(displayUrl)}</a>
</li> </li>
))} );
})}
</ul> </ul>
</div> </div>
); );

4
app/javascript/mastodon/components/status.js
View File

@ -178,8 +178,8 @@ export default class Status extends ImmutablePureComponent {
status = status.get('reblog'); status = status.get('reblog');
} }
if (status.get('media_attachments').size > 0 && !this.props.muted) { if (status.get('media_attachments').size > 0) {
if (status.get('media_attachments').some(item => item.get('type') === 'unknown')) { if (this.props.muted || status.get('media_attachments').some(item => item.get('type') === 'unknown')) {
media = ( media = (
<AttachmentList <AttachmentList
compact compact