Replace jquery getJSON and get with native fetch (#2591)
* Replace jquery getJSON and get with native fetch * Remove unnecessary console.log
This commit is contained in:
absidue
GitHub
parent
25d954f990
commit
061a7c8db1
|
|
@ -206,11 +206,13 @@ export default Vue.extend({
|
|||
const { version } = require('../../package.json')
|
||||
const requestUrl = 'https://api.github.com/repos/freetubeapp/freetube/releases?per_page=1'
|
||||
|
||||
$.getJSON(requestUrl, (response) => {
|
||||
const tagName = response[0].tag_name
|
||||
fetch(requestUrl)
|
||||
.then((response) => response.json())
|
||||
.then((json) => {
|
||||
const tagName = json[0].tag_name
|
||||
const versionNumber = tagName.replace('v', '').replace('-beta', '')
|
||||
this.updateChangelog = marked.parse(response[0].body)
|
||||
this.changeLogTitle = response[0].name
|
||||
this.updateChangelog = marked.parse(json[0].body)
|
||||
this.changeLogTitle = json[0].name
|
||||
|
||||
const message = this.$t('Version $ is now available! Click for more details')
|
||||
this.updateBannerMessage = message.replace('$', versionNumber)
|
||||
|
|
@ -225,11 +227,9 @@ export default Vue.extend({
|
|||
} else if (parseInt(appVersion[2]) < parseInt(latestVersion[2]) && parseInt(appVersion[1]) <= parseInt(latestVersion[1])) {
|
||||
this.showUpdatesBanner = true
|
||||
}
|
||||
}).fail((xhr, textStatus, error) => {
|
||||
console.log(xhr)
|
||||
console.log(textStatus)
|
||||
console.log(requestUrl)
|
||||
console.log(error)
|
||||
})
|
||||
.catch((error) => {
|
||||
console.error('errored while checking for updates', requestUrl, error)
|
||||
})
|
||||
}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
import Vue from 'vue'
|
||||
import $ from 'jquery'
|
||||
import { mapActions } from 'vuex'
|
||||
import FtCard from '../ft-card/ft-card.vue'
|
||||
import FtToggleSwitch from '../ft-toggle-switch/ft-toggle-switch.vue'
|
||||
|
|
@ -124,22 +123,23 @@ export default Vue.extend({
|
|||
if (!this.useProxy) {
|
||||
this.enableProxy()
|
||||
}
|
||||
$.getJSON(this.proxyTestUrl, (response) => {
|
||||
console.log(response)
|
||||
this.proxyIp = response.ip
|
||||
this.proxyCountry = response.country
|
||||
this.proxyRegion = response.region
|
||||
this.proxyCity = response.city
|
||||
fetch(this.proxyTestUrl)
|
||||
.then((response) => response.json())
|
||||
.then((json) => {
|
||||
this.proxyIp = json.ip
|
||||
this.proxyCountry = json.country
|
||||
this.proxyRegion = json.region
|
||||
this.proxyCity = json.city
|
||||
this.dataAvailable = true
|
||||
}).fail((xhr, textStatus, error) => {
|
||||
console.log(xhr)
|
||||
console.log(textStatus)
|
||||
console.log(error)
|
||||
})
|
||||
.catch((error) => {
|
||||
console.error('errored while testing proxy:', error)
|
||||
this.showToast({
|
||||
message: this.$t('Settings.Proxy Settings["Error getting network information. Is your proxy configured properly?"]')
|
||||
})
|
||||
this.dataAvailable = false
|
||||
}).always(() => {
|
||||
})
|
||||
.finally(() => {
|
||||
if (!this.useProxy) {
|
||||
this.disableProxy()
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,11 +25,11 @@ const actions = {
|
|||
async fetchInvidiousInstances({ commit }, payload) {
|
||||
const requestUrl = 'https://api.invidious.io/instances.json'
|
||||
|
||||
let response
|
||||
let instances = []
|
||||
try {
|
||||
response = await $.getJSON(requestUrl)
|
||||
instances = response.filter((instance) => {
|
||||
const response = await fetch(requestUrl)
|
||||
const json = await response.json()
|
||||
instances = json.filter((instance) => {
|
||||
if (instance[0].includes('.onion') || instance[0].includes('.i2p')) {
|
||||
return false
|
||||
} else {
|
||||
|
|
@ -39,7 +39,7 @@ const actions = {
|
|||
return instance[1].uri.replace(/\/$/, '')
|
||||
})
|
||||
} catch (err) {
|
||||
console.log(err)
|
||||
console.error(err)
|
||||
// Starts fallback strategy: read from static file
|
||||
// And fallback to hardcoded entry(s) if static file absent
|
||||
const fileName = 'invidious-instances.json'
|
||||
|
|
@ -52,7 +52,7 @@ const actions = {
|
|||
return entry.url
|
||||
})
|
||||
} else {
|
||||
console.log('unable to read static file for invidious instances')
|
||||
console.error('unable to read static file for invidious instances')
|
||||
instances = [
|
||||
'https://invidious.snopyta.org',
|
||||
'https://invidious.kavin.rocks/'
|
||||
|
|
@ -73,14 +73,14 @@ const actions = {
|
|||
return new Promise((resolve, reject) => {
|
||||
const requestUrl = state.currentInvidiousInstance + '/api/v1/' + payload.resource + '/' + payload.id + '?' + $.param(payload.params)
|
||||
|
||||
$.getJSON(requestUrl, (response) => {
|
||||
resolve(response)
|
||||
}).fail((xhr, textStatus, error) => {
|
||||
console.log(xhr)
|
||||
console.log(textStatus)
|
||||
console.log(requestUrl)
|
||||
console.log(error)
|
||||
reject(xhr)
|
||||
fetch(requestUrl)
|
||||
.then((response) => response.json())
|
||||
.then((json) => {
|
||||
resolve(json)
|
||||
})
|
||||
.catch((error) => {
|
||||
console.error('Invidious API error', requestUrl, error)
|
||||
reject(error)
|
||||
})
|
||||
})
|
||||
},
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
import $ from 'jquery'
|
||||
|
||||
const state = {}
|
||||
const getters = {}
|
||||
|
||||
|
|
@ -18,23 +16,29 @@ const actions = {
|
|||
|
||||
const requestUrl = `${rootState.settings.sponsorBlockUrl}/api/skipSegments/${videoIdHashPrefix}?categories=${JSON.stringify(categories)}`
|
||||
|
||||
$.getJSON(requestUrl, (response) => {
|
||||
const segments = response
|
||||
.filter((result) => result.videoID === videoId)
|
||||
.flatMap((result) => result.segments)
|
||||
resolve(segments)
|
||||
}).fail((xhr, textStatus, error) => {
|
||||
fetch(requestUrl)
|
||||
.then((response) => {
|
||||
// 404 means that there are no segments registered for the video
|
||||
if (xhr.status === 404) {
|
||||
if (response.status === 404) {
|
||||
resolve([])
|
||||
return
|
||||
}
|
||||
|
||||
console.log(xhr)
|
||||
console.log(textStatus)
|
||||
console.log(requestUrl)
|
||||
console.error(error)
|
||||
reject(xhr)
|
||||
response.json()
|
||||
.then((json) => {
|
||||
const segments = json
|
||||
.filter((result) => result.videoID === videoId)
|
||||
.flatMap((result) => result.segments)
|
||||
resolve(segments)
|
||||
})
|
||||
.catch((error) => {
|
||||
console.error('failed to fetch SponsorBlock segments', requestUrl, error)
|
||||
reject(error)
|
||||
})
|
||||
})
|
||||
.catch((error) => {
|
||||
console.error('failed to fetch SponsorBlock segments', requestUrl, error)
|
||||
reject(error)
|
||||
})
|
||||
})
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1330,11 +1330,13 @@ export default Vue.extend({
|
|||
const url = new URL(caption.baseUrl)
|
||||
url.searchParams.set('fmt', 'vtt')
|
||||
|
||||
$.get(url.toString(), response => {
|
||||
fetch(url)
|
||||
.then((response) => response.text())
|
||||
.then((text) => {
|
||||
// The character '#' needs to be percent-encoded in a (data) URI
|
||||
// because it signals an identifier, which means anything after it
|
||||
// is automatically removed when the URI is used as a source
|
||||
let vtt = response.replace(/#/g, '%23')
|
||||
let vtt = text.replace(/#/g, '%23')
|
||||
|
||||
// A lot of videos have messed up caption positions that need to be removed
|
||||
// This can be either because this format isn't really used by YouTube
|
||||
|
|
@ -1353,10 +1355,9 @@ export default Vue.extend({
|
|||
|
||||
caption.baseUrl = `data:${caption.type};${caption.charset},${vtt}`
|
||||
resolve(caption)
|
||||
}).fail((xhr, textStatus, error) => {
|
||||
console.log(xhr)
|
||||
console.log(textStatus)
|
||||
console.log(error)
|
||||
})
|
||||
.catch((error) => {
|
||||
console.error(error)
|
||||
reject(error)
|
||||
})
|
||||
}))
|
||||
|
|
|
|||
Loading…
Reference in New Issue