fedi/lemmy-ui
1
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy-ui.git synced 2024-11-22 14:45:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #55 from LemmyNet/urlencode-search

Browse source 
Use urlencode for search queries (fixes #10)
This commit is contained in:
Dessalines 2020-10-07 10:39:30 -04:00 committed by GitHub
parent 5e6f613e16 3cd200469f
commit 28a474234f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/shared/components/navbar.tsx
View file

@ -137,8 +137,9 @@ export class Navbar extends Component<NavbarProps, NavbarState> {
if (searchParam === '') { if (searchParam === '') {
this.context.router.history.push(`/search/`); this.context.router.history.push(`/search/`);
} else { } else {
const searchParamEncoded = encodeURIComponent(searchParam);
this.context.router.history.push( this.context.router.history.push(
`/search/q/${searchParam}/type/All/sort/TopAll/page/1` `/search/q/${searchParamEncoded}/type/All/sort/TopAll/page/1`
); );
} }
} }

5
src/shared/components/search.tsx
View file

@ -84,7 +84,7 @@ export class Search extends Component<any, SearchState> {
}; };
static getSearchQueryFromProps(q: string): string { static getSearchQueryFromProps(q: string): string {
return q || ''; return decodeURIComponent(q) || '';
} }
static getSearchTypeFromProps(type_: string): SearchType { static getSearchTypeFromProps(type_: string): SearchType {
@ -504,11 +504,12 @@ export class Search extends Component<any, SearchState> {
updateUrl(paramUpdates: UrlParams) { updateUrl(paramUpdates: UrlParams) {
const qStr = paramUpdates.q || this.state.q; const qStr = paramUpdates.q || this.state.q;
const qStrEncoded = encodeURIComponent(qStr);
const typeStr = paramUpdates.type_ || this.state.type_; const typeStr = paramUpdates.type_ || this.state.type_;
const sortStr = paramUpdates.sort || this.state.sort; const sortStr = paramUpdates.sort || this.state.sort;
const page = paramUpdates.page || this.state.page; const page = paramUpdates.page || this.state.page;
this.props.history.push( this.props.history.push(
`/search/q/${qStr}/type/${typeStr}/sort/${sortStr}/page/${page}` `/search/q/${qStrEncoded}/type/${typeStr}/sort/${sortStr}/page/${page}`
); );
} }