Merge branch 'current' into feat/twitch

src/modules/processing/match.js

@@ -17,11 +17,13 @@ import vimeo from "./services/vimeo.js";
 import soundcloud from "./services/soundcloud.js";
 import instagram from "./services/instagram.js";
 import vine from "./services/vine.js";
+import pinterest from "./services/pinterest.js";
+import streamable from "./services/streamable.js";
 import twitch from "./services/twitch.js";
 
 export default async function (host, patternMatch, url, lang, obj) {
     try {
-        let r, isAudioOnly = !!obj.isAudioOnly;
+        let r, isAudioOnly = !!obj.isAudioOnly, disableMetadata = !!obj.disableMetadata;
 
         if (!testers[host]) return apiJSON(0, { t: errorUnsupported(lang) });
         if (!(testers[host](patternMatch))) return apiJSON(0, { t: brokenLink(lang, host) });
@@ -111,6 +113,16 @@ export default async function (host, patternMatch, url, lang, obj) {
             case "vine":
                 r = await vine({ id: patternMatch["id"] });
                 break;
+            case "pinterest":
+                r = await pinterest({ id: patternMatch["id"] });
+                break;
+            case "streamable":
+                r = await streamable({
+                    id: patternMatch["id"],
+                    quality: obj.vQuality,
+                    isAudioOnly: isAudioOnly,
+                });
+                break;
             case "twitch":
                 r = await twitch({
                     vodId: patternMatch["video"] ? patternMatch["video"] : false,
@@ -119,7 +131,6 @@ export default async function (host, patternMatch, url, lang, obj) {
                     isAudioOnly: obj.isAudioOnly,
                     format: obj.vFormat
                 });
-                break;
             default:
                 return apiJSON(0, { t: errorUnsupported(lang) });
         }
@@ -129,7 +140,7 @@ export default async function (host, patternMatch, url, lang, obj) {
 
         if (r.error) return apiJSON(0, { t: Array.isArray(r.error) ? loc(lang, r.error[0], r.error[1]) : loc(lang, r.error) });
 
-        return matchActionDecider(r, host, obj.ip, obj.aFormat, isAudioOnly, lang, isAudioMuted);
+        return matchActionDecider(r, host, obj.aFormat, isAudioOnly, lang, isAudioMuted, disableMetadata);
     } catch (e) {
         return apiJSON(0, { t: genericError(lang, host) })
     }