|
@@ -7,6 +7,7 @@ import StatusContainer from '../../../containers/status_container';
|
|
|
import ImmutablePureComponent from 'react-immutable-pure-component';
|
|
|
import Hashtag from '../../../components/hashtag';
|
|
|
import Icon from 'mastodon/components/icon';
|
|
|
+import { searchEnabled } from '../../../initial_state';
|
|
|
|
|
|
const messages = defineMessages({
|
|
|
dismissSuggestion: { id: 'suggestions.dismiss', defaultMessage: 'Dismiss suggestion' },
|
|
@@ -20,6 +21,7 @@ class SearchResults extends ImmutablePureComponent {
|
|
|
suggestions: ImmutablePropTypes.list.isRequired,
|
|
|
fetchSuggestions: PropTypes.func.isRequired,
|
|
|
dismissSuggestion: PropTypes.func.isRequired,
|
|
|
+ searchTerm: PropTypes.string,
|
|
|
intl: PropTypes.object.isRequired,
|
|
|
};
|
|
|
|
|
@@ -28,7 +30,7 @@ class SearchResults extends ImmutablePureComponent {
|
|
|
}
|
|
|
|
|
|
render () {
|
|
|
- const { intl, results, suggestions, dismissSuggestion } = this.props;
|
|
|
+ const { intl, results, suggestions, dismissSuggestion, searchTerm } = this.props;
|
|
|
|
|
|
if (results.isEmpty() && !suggestions.isEmpty()) {
|
|
|
return (
|
|
@@ -76,6 +78,16 @@ class SearchResults extends ImmutablePureComponent {
|
|
|
{results.get('statuses').map(statusId => <StatusContainer key={statusId} id={statusId} />)}
|
|
|
</div>
|
|
|
);
|
|
|
+ } else if(results.get('statuses') && results.get('statuses').size === 0 && !searchEnabled && !(searchTerm.startsWith('@') || searchTerm.startsWith('#') || searchTerm.includes(' '))) {
|
|
|
+ statuses = (
|
|
|
+ <div className='search-results__section'>
|
|
|
+ <h5><Icon id='quote-right' fixedWidth /><FormattedMessage id='search_results.statuses' defaultMessage='Toots' /></h5>
|
|
|
+
|
|
|
+ <div className='search-results__info'>
|
|
|
+ <FormattedMessage id='search_results.statuses_fts_disabled' defaultMessage='Searching toots by their content is not enabled on this Mastodon server.' />
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ );
|
|
|
}
|
|
|
|
|
|
if (results.get('hashtags') && results.get('hashtags').size > 0) {
|