Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Add GET /api/v2/search which returns rich tag objects, adjust web UI (#7661)

Browse source
This commit is contained in:
Eugen Rochko 2018-05-29 02:01:24 +02:00 • committed by GitHub
parent 90b64c0069
commit 8bb74e50be
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 69 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/javascript/mastodon/reducers/search.js
View file

@ -9,7 +9,7 @@ import {
COMPOSE_REPLY,
COMPOSE_DIRECT,
} from '../actions/compose';
import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
import { Map as ImmutableMap, List as ImmutableList, fromJS } from 'immutable';
const initialState = ImmutableMap({
value: '',
@ -39,7 +39,7 @@ export default function search(state = initialState, action) {
return state.set('results', ImmutableMap({
accounts: ImmutableList(action.results.accounts.map(item => item.id)),
statuses: ImmutableList(action.results.statuses.map(item => item.id)),
hashtags: ImmutableList(action.results.hashtags),
hashtags: fromJS(action.results.hashtags),
})).set('submitted', true);
default:
return state;