diff --git a/src/modules/pageRender/page.js b/src/modules/pageRender/page.js
index affc4fbb..80f29ac4 100644
--- a/src/modules/pageRender/page.js
+++ b/src/modules/pageRender/page.js
@@ -578,7 +578,7 @@ export default function(obj) {
diff --git a/src/modules/processing/match.js b/src/modules/processing/match.js
index 75ce5b78..0d5980ca 100644
--- a/src/modules/processing/match.js
+++ b/src/modules/processing/match.js
@@ -133,7 +133,8 @@ export default async function(host, patternMatch, url, lang, obj) {
break;
case "pinterest":
r = await pinterest({
- id: patternMatch.id
+ id: patternMatch.id,
+ shortLink: patternMatch.shortLink || false
});
break;
case "streamable":
diff --git a/src/modules/processing/services/pinterest.js b/src/modules/processing/services/pinterest.js
index 086573c6..156b65cd 100644
--- a/src/modules/processing/services/pinterest.js
+++ b/src/modules/processing/services/pinterest.js
@@ -1,29 +1,36 @@
-import { maxVideoDuration } from "../../config.js";
+import { genericUserAgent } from "../../config.js";
-export default async function(obj) {
- const pinId = obj.id.split('--').reverse()[0];
- if (!(/^\d+$/.test(pinId))) return { error: 'ErrorCantGetID' };
- let data = await fetch(`https://www.pinterest.com/resource/PinResource/get?data=${encodeURIComponent(JSON.stringify({
- options: {
- field_set_key: "unauth_react_main_pin",
- id: pinId
- }
- }))}`).then((r) => { return r.json() }).catch(() => { return false });
- if (!data) return { error: 'ErrorCouldntFetch' };
+const videoLinkBase = {
+ "regular": "https://v1.pinimg.com/videos/mc/720p/",
+ "story": "https://v1.pinimg.com/videos/mc/720p/"
+}
- data = data["resource_response"]["data"];
+export default async function(o) {
+ let id = o.id, type = "regular";
- let video = null;
+ if (id.includes("--")) {
+ id = id.split("--")[1];
+ type = "story";
+ }
+ if (!o.id && o.shortLink) {
+ id = await fetch(`https://api.pinterest.com/url_shortener/${o.shortLink}/redirect/`, { redirect: "manual" }).then((r) => {
+ return r.headers.get("location").split('pin/')[1].split('/')[0]
+ }).catch(() => {});
+ }
+ if (!id) return { error: 'ErrorCouldntFetch' };
- if (data.videos !== null) video = data.videos.video_list.V_720P;
- else if (data.story_pin_data !== null) video = data.story_pin_data.pages[0].blocks[0].video.video_list.V_EXP7;
+ let html = await fetch(`https://www.pinterest.com/pin/${id}/`, {
+ headers: { "user-agent": genericUserAgent }
+ }).then((r) => { return r.text() }).catch(() => { return false });
- if (!video) return { error: 'ErrorEmptyDownload' };
- if (video.duration > maxVideoDuration) return { error: ['ErrorLengthLimit', maxVideoDuration / 60000] };
+ if (!html) return { error: 'ErrorCouldntFetch' };
+
+ let videoLink = html.split(`"url":"${videoLinkBase[type]}`)[1]?.split('"')[0];
+ if (!html.includes(videoLink)) return { error: 'ErrorEmptyDownload' };
return {
- urls: video.url,
- filename: `pinterest_${pinId}.mp4`,
- audioFilename: `pinterest_${pinId}_audio`
+ urls: `${videoLinkBase[type]}${videoLink}`,
+ filename: `pinterest_${o.id}.mp4`,
+ audioFilename: `pinterest_${o.id}_audio`
}
}
diff --git a/src/modules/processing/servicesConfig.json b/src/modules/processing/servicesConfig.json
index a4bbf493..e9021490 100644
--- a/src/modules/processing/servicesConfig.json
+++ b/src/modules/processing/servicesConfig.json
@@ -86,7 +86,7 @@
},
"pinterest": {
"alias": "pinterest videos & stories",
- "patterns": ["pin/:id"],
+ "patterns": ["pin/:id", "url_shortener/:shortLink"],
"enabled": true
},
"streamable": {
diff --git a/src/modules/processing/servicesPatternTesters.js b/src/modules/processing/servicesPatternTesters.js
index 6bfd1d48..970e8f40 100644
--- a/src/modules/processing/servicesPatternTesters.js
+++ b/src/modules/processing/servicesPatternTesters.js
@@ -10,7 +10,7 @@ export const testers = {
patternMatch.id?.length <= 16,
"pinterest": (patternMatch) =>
- patternMatch.id?.length <= 128,
+ patternMatch.id?.length <= 128 || patternMatch.shortLink?.length <= 32,
"reddit": (patternMatch) =>
patternMatch.sub?.length <= 22 && patternMatch.id?.length <= 10,
diff --git a/src/modules/processing/url.js b/src/modules/processing/url.js
index 2f1ac87f..9c87889d 100644
--- a/src/modules/processing/url.js
+++ b/src/modules/processing/url.js
@@ -25,6 +25,13 @@ export function aliasURL(url) {
}`)
}
break;
+ case "pin":
+ if (url.hostname === 'pin.it' && parts.length === 2) {
+ url = new URL(`https://pinterest.com/url_shortener/${
+ encodeURIComponent(parts[1])
+ }`)
+ }
+ break;
case "vxtwitter":
case "fixvx":