devol
/
libredirect
mirror of https://codeberg.org/LibRedirect/libredirect.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'syeopite-master'

This commit is contained in:
ManeraKai 2023-12-10 22:51:47 +03:00
parent 7951a084ba fa9f55978e
commit 473e196567
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/assets/javascripts/services.js
View File

@ -569,19 +569,30 @@ function redirect(url, type, initiator, forceRedirection, incognito) {
return `${randomInstance}?url=${encodeURIComponent(url.href)}` return `${randomInstance}?url=${encodeURIComponent(url.href)}`
} }
case "priviblur": { case "priviblur": {
if (url.hostname.startsWith("blog")) if (url.hostname == "www.tumblr.com")
return `${randomInstance}/blog${url.pathname}${url.search}` return `${randomInstance}${url.pathname}${url.search}`
if (url.hostname.startsWith("assets")) if (url.hostname.startsWith("assets"))
return `${randomInstance}/assets${url.pathname}${url.search}` return `${randomInstance}/tblr/assets${url.pathname}${url.search}`
if (url.hostname.startsWith("static")) if (url.hostname.startsWith("static"))
return `${randomInstance}/static${url.pathname}${url.search}` return `${randomInstance}/tblr/static${url.pathname}${url.search}`
const reg = /^([0-9]+)\.media\.tumblr\.com/.exec(url.hostname) const reg = /^([0-9]+)\.media\.tumblr\.com/.exec(url.hostname) // *.media.tumblr.com
if (reg) if (reg)
return `${randomInstance}/media/${reg[1]}${url.pathname}${url.search}` return `${randomInstance}/tblr/media/${reg[1]}${url.pathname}${url.search}`
return `${randomInstance}${url.pathname}${url.search}`
const blogregex = /^(?:www\.)?([a-z\d]+)\.tumblr\.com/.exec(url.hostname) // <blog>.tumblr.com
if (blogregex) {
const blog_name = blogregex[1];
// Under the <blog>.tumblr.com domain posts are under a /post path
if (url.pathname.startsWith("/post")) {
return `${randomInstance}/${blog_name}${url.pathname.slice(5)}${url.search}`
} else {
return `${randomInstance}/${blog_name}${url.pathname}${url.search}`;
}
}
return `${randomInstance}${url.pathname}${url.search}`;
} }
default: { default: {
return `${randomInstance}${url.pathname}${url.search}` return `${randomInstance}${url.pathname}${url.search}`

5
src/config.json
View File

@ -1006,8 +1006,9 @@
} }
}, },
"targets": [ "targets": [
"^https?:\\/{2}(media\\.|blog\\.|assets\\.|static\\.)?tumblr\\.com\\/", "^https?:\\/{2}(media\\.|assets\\.|static\\.)?tumblr\\.com\\/",
"^https?:\\/{2}[0-9]+\\.media\\.tumblr\\.com\\/" "^https?:\\/{2}[0-9]+\\.media\\.tumblr\\.com\\/",
"^https?:\\/{2}(www\\.)?(.*)\\.tumblr.com\\/"
], ],
"name": "Tumblr", "name": "Tumblr",
"options": { "options": {