tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sensitive content federates using the "nsfw" hashtag

Browse Source
This commit is contained in:
Eugen Rochko
2016-12-11 22:49:25 +01:00
parent f90133d2ad
commit e90fcb46e3
3 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/assets/javascripts/components/components/status_action_bar.jsx
View File

@ -10,7 +10,8 @@ const messages = defineMessages({
block: { id: 'account.block', defaultMessage: 'Block' },
reply: { id: 'status.reply', defaultMessage: 'Reply' },
reblog: { id: 'status.reblog', defaultMessage: 'Reblog' },
favourite: { id: 'status.favourite', defaultMessage: 'Favourite' }
favourite: { id: 'status.favourite', defaultMessage: 'Favourite' },
open: { id: 'status.open', defaultMessage: 'Expand' }
});
const StatusActionBar = React.createClass({
@ -55,10 +56,16 @@ const StatusActionBar = React.createClass({
this.props.onBlock(this.props.status.get('account'));
},
handleOpen () {
this.context.router.push(`/statuses/${this.props.status.get('id')}`);
},
render () {
const { status, me, intl } = this.props;
let menu = [];
menu.push({ text: intl.formatMessage(messages.open), action: this.handleOpen });
if (status.getIn(['account', 'id']) === me) {
menu.push({ text: intl.formatMessage(messages.delete), action: this.handleDeleteClick });
} else {