Skip to content

fix: disableTwimg #1118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
brian6932 wants to merge 1 commit into from
+8 −11
Closed

fix: disableTwimg #1118

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 8 additions & 11 deletions src/assets/javascripts/services.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,24 +35,21 @@ function all(service, frontend, options, config) {
* @param {string} frontend
*/
function regexArray(service, url, config, options, frontend) {
let targetList = config.services[service].targets
const targetList = new Set(config.services[service].targets)
if (frontend) {
if (
"excludeTargets" in config.services[service].frontends[frontend] &&
(service !== "search" || !options["search"].redirectGoogle)
) {
targetList = targetList.filter(
val => !config.services[service].frontends[frontend].excludeTargets.includes(targetList.indexOf(val))
)
}
if (service === "twitter" && options["twitter"].disableTwimg) {
targetList = targetList.splice(2)
for (const target of config.services[service].frontends[frontend].excludeTargets)
targetList.delete(target)
}
if (service === "twitter" && options["twitter"].disableTwimg)
targetList.delete(String.raw`^https?:\/{2}(pbs\.|video\.)twimg\.com\/`)
}
for (const targetString in targetList) {
const target = new RegExp(targetList[targetString])
if (target.test(url.href)) return true
}
for (const target of targetList)
if (new RegExp(target).test(url.href))
return true
return false
}

Expand Down
Loading