Merge branch 'brian6932-anonymousoverflow-redirect-fix'
このコミットが含まれているのは:
コミット
6c94617ff2
|
@ -59,16 +59,16 @@ function redirect(url, type, initiator, forceRedirection) {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
if (
|
|
||||||
initiator
|
|
||||||
&&
|
|
||||||
options[frontend].includes(initiator.origin)
|
|
||||||
) return "BYPASSTAB"
|
|
||||||
|
|
||||||
let instanceList = options[frontend]
|
let instanceList = options[frontend]
|
||||||
if (instanceList === undefined) break
|
if (instanceList === undefined) break
|
||||||
if (instanceList.length === 0) return
|
if (instanceList.length === 0) return
|
||||||
|
|
||||||
|
if (
|
||||||
|
initiator
|
||||||
|
&&
|
||||||
|
instanceList.includes(initiator.origin)
|
||||||
|
) return "BYPASSTAB"
|
||||||
|
|
||||||
randomInstance = utils.getRandomInstance(instanceList)
|
randomInstance = utils.getRandomInstance(instanceList)
|
||||||
|
|
||||||
break
|
break
|
||||||
|
@ -367,7 +367,7 @@ function redirect(url, type, initiator, forceRedirection) {
|
||||||
if (url.hostname.match(/^[a-zA-Z0-9-]+\.(?:fandom|wikia)\.com/)) {
|
if (url.hostname.match(/^[a-zA-Z0-9-]+\.(?:fandom|wikia)\.com/)) {
|
||||||
wiki = url.hostname.match(/^[a-zA-Z0-9-]+(?=\.(?:fandom|wikia)\.com)/)
|
wiki = url.hostname.match(/^[a-zA-Z0-9-]+(?=\.(?:fandom|wikia)\.com)/)
|
||||||
if (wiki == "www" || !wiki) wiki = ""
|
if (wiki == "www" || !wiki) wiki = ""
|
||||||
else wiki = `/${wiki}`;
|
else wiki = `/${wiki}`
|
||||||
urlpath = url.pathname
|
urlpath = url.pathname
|
||||||
} else {
|
} else {
|
||||||
wiki = url.pathname.match(/(?<=wiki\/w:c:)[a-zA-Z0-9-]+(?=:)/)
|
wiki = url.pathname.match(/(?<=wiki\/w:c:)[a-zA-Z0-9-]+(?=:)/)
|
||||||
|
@ -406,20 +406,23 @@ function redirect(url, type, initiator, forceRedirection) {
|
||||||
case "neuters": {
|
case "neuters": {
|
||||||
const p = url.pathname
|
const p = url.pathname
|
||||||
if (p.startsWith('/article/') || p.startsWith('/pf/') || p.startsWith('/arc/') || p.startsWith('/resizer/')) {
|
if (p.startsWith('/article/') || p.startsWith('/pf/') || p.startsWith('/arc/') || p.startsWith('/resizer/')) {
|
||||||
return null;
|
return null
|
||||||
}
|
}
|
||||||
return `${randomInstance}${p}`;
|
return `${randomInstance}${p}`
|
||||||
}
|
}
|
||||||
case "dumb": {
|
case "dumb": {
|
||||||
if (url.pathname.endsWith('-lyrics')) return `${randomInstance}${url.pathname}`
|
if (url.pathname.endsWith('-lyrics')) return `${randomInstance}${url.pathname}`
|
||||||
}
|
}
|
||||||
case "ruralDictionary": {
|
case "ruralDictionary": {
|
||||||
if (!url.pathname.endsWith('/define.php') && !url.pathname.endsWith('/random.php') && url.pathname != '/') return
|
if (!url.pathname.includes('/define.php') && !url.pathname.includes('/random.php') && url.pathname != '/') return
|
||||||
return `${randomInstance}${url.pathname}${url.search}`
|
return `${randomInstance}${url.pathname}${url.search}`
|
||||||
}
|
}
|
||||||
case "anonymousOverflow": {
|
case "anonymousOverflow": {
|
||||||
if (!url.pathname.startsWith('/questions') && url.pathname != '/') return
|
if (!url.pathname.startsWith('/questions') && url.pathname != '/') return
|
||||||
|
const threadID = /\/(\d+)\/?$/.exec(url.pathname)
|
||||||
|
if (threadID) return `${randomInstance}/questions/${threadID[1]}${url.search}`
|
||||||
return `${randomInstance}${url.pathname}${url.search}`
|
return `${randomInstance}${url.pathname}${url.search}`
|
||||||
|
|
||||||
}
|
}
|
||||||
case "biblioReads": {
|
case "biblioReads": {
|
||||||
if (!url.pathname.startsWith('/book/show/') && url.pathname != '/') return
|
if (!url.pathname.startsWith('/book/show/') && url.pathname != '/') return
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
"name": "__MSG_extensionName__",
|
"name": "__MSG_extensionName__",
|
||||||
"description": "__MSG_extensionDescription__",
|
"description": "__MSG_extensionDescription__",
|
||||||
"version": "2.5.1",
|
"version": "2.5.2",
|
||||||
"manifest_version": 2,
|
"manifest_version": 2,
|
||||||
"browser_specific_settings": {
|
"browser_specific_settings": {
|
||||||
"gecko": {
|
"gecko": {
|
||||||
|
|
読み込み中…
新しいイシューから参照