nolanlawson
/
pinafore
forked from cybrespace/pinafore
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't show media in notifications (#112) 

Fixes #70
This commit is contained in:
Nolan Lawson 2018-04-14 14:18:19 -07:00 committed by GitHub
parent 47975d0fcc
commit 29c38c1f83
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
routes/_components/status/Status.html
View File

@ -27,7 +27,7 @@
<StatusContent :isStatusInOwnThread :isStatusInNotification <StatusContent :isStatusInOwnThread :isStatusInNotification
:originalStatus :uuid shown="{{showContent}}"/> :originalStatus :uuid shown="{{showContent}}"/>
{{/if}} {{/if}}
{{#if originalStatus.media_attachments && originalStatus.media_attachments.length}} {{#if showMedia }}
<StatusMediaAttachments :originalStatus :uuid <StatusMediaAttachments :originalStatus :uuid
on:recalculateHeight /> on:recalculateHeight />
{{/if}} {{/if}}
@ -206,6 +206,11 @@
}, },
spoilerShown: ($spoilersShown, uuid) => !!$spoilersShown[uuid], spoilerShown: ($spoilersShown, uuid) => !!$spoilersShown[uuid],
replyShown: ($repliesShown, uuid) => !!$repliesShown[uuid], replyShown: ($repliesShown, uuid) => !!$repliesShown[uuid],
showMedia: (originalStatus, isStatusInNotification) => {
return !isStatusInNotification
&& originalStatus.media_attachments
&& originalStatus.media_attachments.length
},
ariaLabel: (originalAccount, originalStatus, visibility) => { ariaLabel: (originalAccount, originalStatus, visibility) => {
return (visibility === 'direct' ? 'Direct message' : 'Status') + return (visibility === 'direct' ? 'Direct message' : 'Status') +
` by ${originalAccount.display_name || originalAccount.username}` ` by ${originalAccount.display_name || originalAccount.username}`