mirror of
https://github.com/wukko/cobalt.git
synced 2025-05-24 02:22:08 +02:00
api/reddit: add support for short links
This commit is contained in:
parent
1477dcd4e7
commit
b1bde25dee
@ -90,7 +90,9 @@ export const services = {
|
|||||||
"r/u_:user/comments/:id/:title",
|
"r/u_:user/comments/:id/:title",
|
||||||
"r/u_:user/comments/:id/comment/:commentId",
|
"r/u_:user/comments/:id/comment/:commentId",
|
||||||
|
|
||||||
"r/:sub/s/:shareId"
|
"r/:sub/s/:shareId",
|
||||||
|
|
||||||
|
"video/:shortId",
|
||||||
],
|
],
|
||||||
subdomains: "*",
|
subdomains: "*",
|
||||||
},
|
},
|
||||||
|
@ -23,7 +23,8 @@ export const testers = {
|
|||||||
pattern.id?.length <= 16 && !pattern.sub && !pattern.user
|
pattern.id?.length <= 16 && !pattern.sub && !pattern.user
|
||||||
|| (pattern.sub?.length <= 22 && pattern.id?.length <= 16)
|
|| (pattern.sub?.length <= 22 && pattern.id?.length <= 16)
|
||||||
|| (pattern.user?.length <= 22 && pattern.id?.length <= 16)
|
|| (pattern.user?.length <= 22 && pattern.id?.length <= 16)
|
||||||
|| (pattern.sub?.length <= 22 && pattern.shareId?.length <= 16),
|
|| (pattern.sub?.length <= 22 && pattern.shareId?.length <= 16)
|
||||||
|
|| (pattern.shortId?.length <= 16),
|
||||||
|
|
||||||
"rutube": pattern =>
|
"rutube": pattern =>
|
||||||
(pattern.id?.length === 32 && pattern.key?.length <= 32) ||
|
(pattern.id?.length === 32 && pattern.key?.length <= 32) ||
|
||||||
|
@ -50,6 +50,24 @@ async function getAccessToken() {
|
|||||||
|
|
||||||
export default async function(obj) {
|
export default async function(obj) {
|
||||||
let params = obj;
|
let params = obj;
|
||||||
|
const accessToken = await getAccessToken();
|
||||||
|
|
||||||
|
if (params.shortId) {
|
||||||
|
let url = await fetch(`https://www.reddit.com/video/${params.shortId}`, {
|
||||||
|
headers: {
|
||||||
|
'User-Agent': genericUserAgent,
|
||||||
|
'Authorization': `Bearer ${accessToken}`
|
||||||
|
}
|
||||||
|
}).then(r => r.url).catch(() => {});
|
||||||
|
|
||||||
|
if (!url) return { error: "fetch.fail" };
|
||||||
|
|
||||||
|
try {
|
||||||
|
params = extract(normalizeURL(url)).patternMatch;
|
||||||
|
} catch (error) {
|
||||||
|
return { error: "fetch.fail" };
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (!params.id && params.shareId) {
|
if (!params.id && params.shareId) {
|
||||||
params = await resolveRedirectingURL(
|
params = await resolveRedirectingURL(
|
||||||
@ -63,7 +81,6 @@ export default async function(obj) {
|
|||||||
|
|
||||||
const url = new URL(`https://www.reddit.com/comments/${params.id}.json`);
|
const url = new URL(`https://www.reddit.com/comments/${params.id}.json`);
|
||||||
|
|
||||||
const accessToken = await getAccessToken();
|
|
||||||
if (accessToken) url.hostname = 'oauth.reddit.com';
|
if (accessToken) url.hostname = 'oauth.reddit.com';
|
||||||
|
|
||||||
let data = await fetch(
|
let data = await fetch(
|
||||||
|
@ -106,6 +106,14 @@ function aliasURL(url) {
|
|||||||
url.pathname = `/share/${idPart.slice(-32)}`;
|
url.pathname = `/share/${idPart.slice(-32)}`;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case "redd":
|
||||||
|
/* reddit short video links can be treated by changing https://v.redd.it/<id>
|
||||||
|
to https://reddit.com/video/<id>.*/
|
||||||
|
if (url.hostname === "v.redd.it" && parts.length === 2) {
|
||||||
|
url = new URL(`https://www.reddit.com/video/${parts[1]}`);
|
||||||
|
}
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
return url;
|
return url;
|
||||||
|
@ -56,5 +56,23 @@
|
|||||||
"code": 200,
|
"code": 200,
|
||||||
"status": "tunnel"
|
"status": "tunnel"
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "shortened video link",
|
||||||
|
"url": "https://v.redd.it/ifg2emt5ck0e1",
|
||||||
|
"params": {},
|
||||||
|
"expected": {
|
||||||
|
"code": 200,
|
||||||
|
"status": "tunnel"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "shortened video link (alternative)",
|
||||||
|
"url": "https://reddit.com/video/ifg2emt5ck0e1",
|
||||||
|
"params": {},
|
||||||
|
"expected": {
|
||||||
|
"code": 200,
|
||||||
|
"status": "tunnel"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
Loading…
x
Reference in New Issue
Block a user