|
|
|
@ -7,6 +7,7 @@ import StatusContainer from 'flavours/glitch/containers/status_container';
|
|
|
|
|
import ImmutablePureComponent from 'react-immutable-pure-component';
|
|
|
|
|
import Hashtag from 'flavours/glitch/components/hashtag';
|
|
|
|
|
import Icon from 'flavours/glitch/components/icon';
|
|
|
|
|
import { searchEnabled } from 'flavours/glitch/util/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,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
@ -27,8 +29,8 @@ class SearchResults extends ImmutablePureComponent {
|
|
|
|
|
this.props.fetchSuggestions();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
render() {
|
|
|
|
|
const { intl, results, suggestions, dismissSuggestion } = this.props;
|
|
|
|
|
render () {
|
|
|
|
|
const { intl, results, suggestions, dismissSuggestion, searchTerm } = this.props;
|
|
|
|
|
|
|
|
|
|
if (results.isEmpty() && !suggestions.isEmpty()) {
|
|
|
|
|
return (
|
|
|
|
@ -51,6 +53,16 @@ class SearchResults extends ImmutablePureComponent {
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
);
|
|
|
|
|
} else if(results.get('statuses') && results.get('statuses').size === 0 && !searchEnabled && !(searchTerm.startsWith('@') || searchTerm.startsWith('#') || searchTerm.includes(' '))) {
|
|
|
|
|
statuses = (
|
|
|
|
|
<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>
|
|
|
|
|
</section>
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
let accounts, statuses, hashtags;
|
|
|
|
|