Mute button progress so far. WIP, doesn't entirely work correctly.
This commit is contained in:
		
					parent
					
						
							
								89fc2d7f48
							
						
					
				
			
			
				commit
				
					
						442fdbfc53
					
				
			
		
					 26 changed files with 390 additions and 33 deletions
				
			
		|  | @ -9,7 +9,9 @@ const messages = defineMessages({ | |||
|   edit_profile: { id: 'account.edit_profile', defaultMessage: 'Edit profile' }, | ||||
|   unblock: { id: 'account.unblock', defaultMessage: 'Unblock @{name}' }, | ||||
|   unfollow: { id: 'account.unfollow', defaultMessage: 'Unfollow' }, | ||||
|   unmute: { id: 'account.unmute', defaultMessage: 'Unmute' }, | ||||
|   block: { id: 'account.block', defaultMessage: 'Block @{name}' }, | ||||
|   mute: { id: 'account.mute', defaultMessage: 'Mute' }, | ||||
|   follow: { id: 'account.follow', defaultMessage: 'Follow' }, | ||||
|   report: { id: 'account.report', defaultMessage: 'Report @{name}' }, | ||||
|   disclaimer: { id: 'account.disclaimer', defaultMessage: 'This user is from another instance. This number may be larger.' } | ||||
|  | @ -35,6 +37,7 @@ const ActionBar = React.createClass({ | |||
|     onBlock: React.PropTypes.func.isRequired, | ||||
|     onMention: React.PropTypes.func.isRequired, | ||||
|     onReport: React.PropTypes.func.isRequired, | ||||
|     onMute: React.PropTypes.func.isRequired, | ||||
|     intl: React.PropTypes.object.isRequired | ||||
|   }, | ||||
| 
 | ||||
|  | @ -67,6 +70,12 @@ const ActionBar = React.createClass({ | |||
|       extraInfo = <abbr title={intl.formatMessage(messages.disclaimer)}>*</abbr>; | ||||
|     } | ||||
| 
 | ||||
|     if (account.getIn(['relationship', 'muting'])) { | ||||
|       menu.push({ text: intl.formatMessage(messages.unmute), action: this.props.onMute }); | ||||
|     } else { | ||||
|       menu.push({ text: intl.formatMessage(messages.mute), action: this.props.onMute }); | ||||
|     } | ||||
| 
 | ||||
|     return ( | ||||
|       <div className='account__action-bar'> | ||||
|         <div style={outerDropdownStyle}> | ||||
|  |  | |||
|  | @ -16,6 +16,7 @@ const Header = React.createClass({ | |||
|     onBlock: React.PropTypes.func.isRequired, | ||||
|     onMention: React.PropTypes.func.isRequired, | ||||
|     onReport: React.PropTypes.func.isRequired | ||||
|     onMute: React.PropTypes.func.isRequired, | ||||
|   }, | ||||
| 
 | ||||
|   mixins: [PureRenderMixin], | ||||
|  | @ -37,6 +38,10 @@ const Header = React.createClass({ | |||
|     this.context.router.push('/report'); | ||||
|   }, | ||||
| 
 | ||||
|   handleMute() { | ||||
|     this.props.onMute(this.props.account); | ||||
|   }, | ||||
| 
 | ||||
|   render () { | ||||
|     const { account, me } = this.props; | ||||
| 
 | ||||
|  | @ -58,6 +63,7 @@ const Header = React.createClass({ | |||
|           onBlock={this.handleBlock} | ||||
|           onMention={this.handleMention} | ||||
|           onReport={this.handleReport} | ||||
|           onMute={this.handleMute} | ||||
|         /> | ||||
|       </div> | ||||
|     ); | ||||
|  |  | |||
|  | @ -5,7 +5,9 @@ import { | |||
|   followAccount, | ||||
|   unfollowAccount, | ||||
|   blockAccount, | ||||
|   unblockAccount | ||||
|   unblockAccount, | ||||
|   muteAccount, | ||||
|   unmuteAccount | ||||
| } from '../../../actions/accounts'; | ||||
| import { mentionCompose } from '../../../actions/compose'; | ||||
| import { initReport } from '../../../actions/reports'; | ||||
|  | @ -44,6 +46,14 @@ const mapDispatchToProps = dispatch => ({ | |||
| 
 | ||||
|   onReport (account) { | ||||
|     dispatch(initReport(account)); | ||||
|   }, | ||||
| 
 | ||||
|   onMute (account) { | ||||
|     if (account.getIn(['relationship', 'muting'])) { | ||||
|       dispatch(unmuteAccount(account.get('id'))); | ||||
|     } else { | ||||
|       dispatch(muteAccount(account.get('id'))); | ||||
|     } | ||||
|   } | ||||
| }); | ||||
| 
 | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue