Skip to content

Commit 9b19503

Browse files
ClearlyClairehiyuki2578
authored andcommitted
Fix crash when expanding search results for hashtags (mastodon#11447)
1 parent f8b7f1c commit 9b19503

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

app/javascript/mastodon/reducers/search.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ export default function search(state = initialState, action) {
4444
hashtags: fromJS(action.results.hashtags),
4545
})).set('submitted', true).set('searchTerm', action.searchTerm);
4646
case SEARCH_EXPAND_SUCCESS:
47-
return state.updateIn(['results', action.searchType], list => list.concat(action.results[action.searchType].map(item => item.id)));
47+
const results = action.searchType === 'hashtags' ? fromJS(action.results.hashtags) : action.results[action.searchType].map(item => item.id);
48+
return state.updateIn(['results', action.searchType], list => list.concat(results));
4849
default:
4950
return state;
5051
}

0 commit comments

Comments
 (0)