From d852e0991f047f610b7afdaa2b862100381dcaa4 Mon Sep 17 00:00:00 2001 From: Yusuke Nemoto Date: Sat, 23 Mar 2019 02:06:02 +0900 Subject: [PATCH] Support MinimumHashtagLength setting (#2583) * Support MinimumHashtagLength setting * Set default value if missing --- app/components/markdown/index.js | 5 ++++- app/components/markdown/markdown.js | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/components/markdown/index.js b/app/components/markdown/index.js index 8705ac28d..c4e90aee9 100644 --- a/app/components/markdown/index.js +++ b/app/components/markdown/index.js @@ -3,16 +3,19 @@ import {connect} from 'react-redux'; -import {getAutolinkedUrlSchemes} from 'mattermost-redux/selectors/entities/general'; +import {getAutolinkedUrlSchemes, getConfig} from 'mattermost-redux/selectors/entities/general'; import {getTheme} from 'mattermost-redux/selectors/entities/preferences'; import {getCurrentUserMentionKeys} from 'mattermost-redux/selectors/entities/users'; import Markdown from './markdown'; function mapStateToProps(state) { + const {MinimumHashtagLength} = getConfig(state); + return { autolinkedUrlSchemes: getAutolinkedUrlSchemes(state), mentionKeys: getCurrentUserMentionKeys(state), + minimumHashtagLength: MinimumHashtagLength ? parseInt(MinimumHashtagLength, 10) : 3, theme: getTheme(state), }; } diff --git a/app/components/markdown/markdown.js b/app/components/markdown/markdown.js index 50a523473..7c22b476f 100644 --- a/app/components/markdown/markdown.js +++ b/app/components/markdown/markdown.js @@ -48,6 +48,7 @@ export default class Markdown extends PureComponent { isReplyPost: PropTypes.bool, isSearchResult: PropTypes.bool, mentionKeys: PropTypes.array.isRequired, + minimumHashtagLength: PropTypes.number.isRequired, navigator: PropTypes.object.isRequired, onChannelLinkPress: PropTypes.func, onHashtagPress: PropTypes.func, @@ -80,6 +81,7 @@ export default class Markdown extends PureComponent { createParser = () => { return new Parser({ urlFilter: this.urlFilter, + minimumHashtagLength: this.props.minimumHashtagLength, }); };