gearheads/mastodon
Archived
2
0
Fork 0
Code Releases 4 Activity

Fix full-text search query quotation, improve tag search performance with an index,

Browse source 
add ability to open status by URL from search (fix #53)
This commit is contained in:
Eugen Rochko 2017-03-22 17:36:34 +01:00
parent c89ccbab09
commit 5aa3df017b
14 changed files with 106 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/assets/javascripts/components/features/compose/components/search.jsx
View file

@ -2,6 +2,7 @@ import PureRenderMixin from 'react-addons-pure-render-mixin';
import ImmutablePropTypes from 'react-immutable-proptypes';
import Autosuggest from 'react-autosuggest';
import AutosuggestAccountContainer from '../containers/autosuggest_account_container';
import AutosuggestStatusContainer from '../containers/autosuggest_status_container';
import { debounce } from 'react-decoration';
import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
@ -14,8 +15,10 @@ const getSuggestionValue = suggestion => suggestion.value;
const renderSuggestion = suggestion => {
if (suggestion.type === 'account') {
return <AutosuggestAccountContainer id={suggestion.id} />;
} else if (suggestion.type === 'hashtag') {
return <span>#{suggestion.id}</span>;
} else {
return <span>#{suggestion.id}</span>
return <AutosuggestStatusContainer id={suggestion.id} />;
}
};
@ -78,8 +81,10 @@ const Search = React.createClass({
onSuggestionSelected (_, { suggestion }) {
if (suggestion.type === 'account') {
this.context.router.push(`/accounts/${suggestion.id}`);
} else {
} else if(suggestion.type === 'hashtag') {
this.context.router.push(`/timelines/tag/${suggestion.id}`);
} else {
this.context.router.push(`/statuses/${suggestion.id}`);
}
},