diff options
author | Saturnino Abril <saturnino.abril@gmail.com> | 2017-08-01 20:16:45 +0800 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2017-08-01 08:16:45 -0400 |
commit | 88f398ffddbcbb58265d085c09cb72008be3f3d5 (patch) | |
tree | 6db22e220a781a144808e113505ce040c7e2eac7 /webapp/components | |
parent | b023b891550cd8fb2f874e822f05921d13f51fb2 (diff) | |
download | chat-88f398ffddbcbb58265d085c09cb72008be3f3d5.tar.gz chat-88f398ffddbcbb58265d085c09cb72008be3f3d5.tar.bz2 chat-88f398ffddbcbb58265d085c09cb72008be3f3d5.zip |
Revert " #4755 Combining consecutive user join/leave system messages to single message and few other changes." (#7072)
* Revert "PLT-6603: Don't return all posts on invalid query. (#7061)"
This reverts commit 25a2013890c7e07b4621fa9b18342e7f35363049.
* Revert " #4755 Combining consecutive user join/leave system messages to single message and few other changes. (#5945)"
This reverts commit 8a91235fb3cdc8d094dbc2eaa0d7baa447132b3c.
Diffstat (limited to 'webapp/components')
-rw-r--r-- | webapp/components/post_view/post_message_view/system_message_helpers.jsx | 51 |
1 files changed, 9 insertions, 42 deletions
diff --git a/webapp/components/post_view/post_message_view/system_message_helpers.jsx b/webapp/components/post_view/post_message_view/system_message_helpers.jsx index c215ddb59..c134e1a7a 100644 --- a/webapp/components/post_view/post_message_view/system_message_helpers.jsx +++ b/webapp/components/post_view/post_message_view/system_message_helpers.jsx @@ -7,13 +7,6 @@ import {FormattedMessage} from 'react-intl'; import {PostTypes} from 'utils/constants.jsx'; import {formatText} from 'utils/text_formatting.jsx'; -const joinLeaveMessageGetters = { - [PostTypes.JOIN_CHANNEL]: getJoinChannelMessage, - [PostTypes.LEAVE_CHANNEL]: getLeaveChannelMessage, - [PostTypes.ADD_TO_CHANNEL]: getAddToChannelMessage, - [PostTypes.REMOVE_FROM_CHANNEL]: getRemoveFromChannelMessage -}; - function renderUsername(value, options) { return renderFormattedText(value, {...options, markdown: false}); } @@ -22,60 +15,38 @@ function renderFormattedText(value, options) { return <span dangerouslySetInnerHTML={{__html: formatText(value, options)}}/>; } -function renderJoinLeaveMessage(post, options, messageFunction) { - if (post.props.messages) { - return ( - <div> - {post.props.messages.map((message, key) => <span key={key}> {joinLeaveMessageGetters[message.type](message, options)}</span>)} - </div> - ); - } - return messageFunction(post.props, options); -} - function renderJoinChannelMessage(post, options) { - return renderJoinLeaveMessage(post, options, getJoinChannelMessage); -} - -function getJoinChannelMessage(messageProps, options) { - const username = renderUsername(messageProps.username, options); + const username = renderUsername(post.props.username, options); return ( <FormattedMessage id='api.channel.join_channel.post_and_forget' - defaultMessage='{username} joined the channel.' + defaultMessage='{username} has joined the channel.' values={{username}} /> ); } function renderLeaveChannelMessage(post, options) { - return renderJoinLeaveMessage(post, options, getLeaveChannelMessage); -} - -function getLeaveChannelMessage(messageProps, options) { - const username = renderUsername(messageProps.username, options); + const username = renderUsername(post.props.username, options); return ( <FormattedMessage id='api.channel.leave.left' - defaultMessage='{username} left the channel.' + defaultMessage='{username} has left the channel.' values={{username}} /> ); } function renderAddToChannelMessage(post, options) { - return renderJoinLeaveMessage(post, options, getAddToChannelMessage); -} + const username = renderUsername(post.props.username, options); + const addedUsername = renderUsername(post.props.addedUsername, options); -function getAddToChannelMessage(messageProps, options) { - const username = renderUsername(messageProps.username, options); - const addedUsername = renderUsername(messageProps.addedUsername, options); return ( <FormattedMessage id='api.channel.add_member.added' - defaultMessage='{username} added {addedUsername} to the channel.' + defaultMessage='{addedUsername} added to the channel by {username}' values={{ username, addedUsername @@ -85,16 +56,12 @@ function getAddToChannelMessage(messageProps, options) { } function renderRemoveFromChannelMessage(post, options) { - return renderJoinLeaveMessage(post, options, getRemoveFromChannelMessage); -} - -function getRemoveFromChannelMessage(messageProps, options) { - const removedUsername = renderUsername(messageProps.removedUsername, options); + const removedUsername = renderUsername(post.props.removedUsername, options); return ( <FormattedMessage id='api.channel.remove_member.removed' - defaultMessage='{removedUsername} was removed from the channel.' + defaultMessage='{removedUsername} was removed from the channel' values={{ removedUsername }} |