tesses50
/
freetube
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #59 from Worble/#36_sanitize_search_inputs 

encodeUriComponent search query before adding to router path
This commit is contained in:
Preston 2020-08-04 22:12:42 -04:00 committed by GitHub
parent e1c9adf783 0f1adf10c7
commit 30b4392a77
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
src/renderer/components/top-nav/top-nav.js
View File

@ -10,14 +10,14 @@ export default Vue.extend({
name: 'TopNav',
components: {
FtInput,
FtSearchFilters
FtSearchFilters,
},
data: () => {
return {
component: this,
windowWidth: 0,
showFilters: false,
searchSuggestionsDataList: []
searchSuggestionsDataList: [],
}
},
computed: {
@ -57,7 +57,7 @@ export default Vue.extend({
searchContainer.style.display = 'none'
}
window.addEventListener('resize', function(event) {
window.addEventListener('resize', function (event) {
const width = event.srcElement.innerWidth
const searchContainer = $('.searchContainer').get(0)
@ -82,23 +82,19 @@ export default Vue.extend({
this.$store.dispatch('getVideoIdFromUrl', query).then((result) => {
if (result) {
this.$router.push(
{
path: `/watch/${result}`,
}
)
this.$router.push({
path: `/watch/${result}`,
})
} else {
router.push(
{
path: `/search/${query}`,
query: {
sortBy: this.searchSettings.sortBy,
time: this.searchSettings.time,
type: this.searchSettings.type,
duration: this.searchSettings.duration
}
}
)
router.push({
path: `/search/${encodeURIComponent(query)}`,
query: {
sortBy: this.searchSettings.sortBy,
time: this.searchSettings.time,
type: this.searchSettings.type,
duration: this.searchSettings.duration,
},
})
}
})
@ -143,19 +139,24 @@ export default Vue.extend({
resource: 'search/suggestions',
id: '',
params: {
q: query
}
q: query,
},
}
this.$store.dispatch('invidiousAPICall', searchPayload).then((results) => {
this.searchSuggestionsDataList = results.suggestions
}).error((err) => {
console.log(err)
if (this.backendFallback) {
console.log('Error gettings search suggestions. Falling back to Local API')
this.getSearchSuggestionsLocal(query)
}
})
this.$store
.dispatch('invidiousAPICall', searchPayload)
.then((results) => {
this.searchSuggestionsDataList = results.suggestions
})
.error((err) => {
console.log(err)
if (this.backendFallback) {
console.log(
'Error gettings search suggestions. Falling back to Local API'
)
this.getSearchSuggestionsLocal(query)
}
})
},
toggleSearchContainer: function () {
@ -180,6 +181,6 @@ export default Vue.extend({
toggleSideNav: function () {
this.$store.commit('toggleSideNav')
}
}
},
},
})