ClaytonWWilson/CS307-Team24
1
0
Fork 0
mirror of https://github.com/ClaytonWWilson/CS307-Team24.git synced 2026-03-10 13:15:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixing DMs with users who have them disabled

Browse Source
This commit is contained in:
Clayton Wilson
2019-12-05 19:13:00 -05:00
parent 719294f0ed
commit b402c96864
3 changed files with 55 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
twistter-frontend/src/pages/directMessages.js
View File

@@ -432,7 +432,7 @@ export class directMessages extends Component {
)
}
>
{
{!channel.hasDirectMessagesEnabled ? "This user has DMs disabled" :
!channel.recentMessage ?
'No messages'
:
@@ -597,7 +597,16 @@ export class directMessages extends Component {
multiline
rows={2}
margin="dense"
value={this.state.drafts[this.state.selectedChannel.dmId] ? this.state.drafts[this.state.selectedChannel.dmId] : ""}
disabled={!this.state.selectedChannel.hasDirectMessagesEnabled}
value={
!this.state.selectedChannel.hasDirectMessagesEnabled ?
"This user has DMs disabled"
:
this.state.drafts[this.state.selectedChannel.dmId] ?
this.state.drafts[this.state.selectedChannel.dmId]
:
""
}
onChange={this.handleChangeMessage}
/>
<Fab

1
twistter-frontend/src/redux/actions/dataActions.js
View File

@@ -142,5 +142,6 @@ export const sendDirectMessage = (user, message) => (dispatch) => {
sendDirectMessage: err.response.data
}
})
dispatch({type: SET_NOT_LOADING_UI_4});
})
}