Mirrors/cobalt
1
0
Fork 0
mirror of https://github.com/wukko/cobalt.git synced 2024-11-15 04:39:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

match: remove useless errors module & clean up

Browse source
This commit is contained in:
wukko 2024-05-15 22:36:24 +06:00
parent c2678888be
commit b4364c4921
No known key found for this signature in database
GPG key ID: 3E30B3F26C7B4AA2
2 changed files with 28 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/modules/processing/match.js
View file

@ -1,8 +1,7 @@
import { strict as assert } from "node:assert"; import { strict as assert } from "node:assert";
import { env } from '../config.js';
import { createResponse } from "../processing/request.js"; import { createResponse } from "../processing/request.js";
import { errorUnsupported, genericError, brokenLink } from "../sub/errors.js";
import loc from "../../localization/manager.js"; import loc from "../../localization/manager.js";
import { testers } from "./servicesPatternTesters.js"; import { testers } from "./servicesPatternTesters.js";
@ -25,9 +24,9 @@ import streamable from "./services/streamable.js";
import twitch from "./services/twitch.js"; import twitch from "./services/twitch.js";
import rutube from "./services/rutube.js"; import rutube from "./services/rutube.js";
import dailymotion from "./services/dailymotion.js"; import dailymotion from "./services/dailymotion.js";
import { env } from '../config.js';
let freebind; let freebind;
export default async function(host, patternMatch, lang, obj) { export default async function(host, patternMatch, lang, obj) {
const { url } = obj; const { url } = obj;
assert(url instanceof URL); assert(url instanceof URL);
@ -43,10 +42,20 @@ export default async function(host, patternMatch, lang, obj) {
} }
try { try {
let r, isAudioOnly = !!obj.isAudioOnly, disableMetadata = !!obj.disableMetadata; let r,
isAudioOnly = !!obj.isAudioOnly,
disableMetadata = !!obj.disableMetadata;
if (!testers[host]) return createResponse("error", { t: errorUnsupported(lang) }); if (!testers[host]) {
if (!(testers[host](patternMatch))) return createResponse("error", { t: brokenLink(lang, host) }); return createResponse("error", {
t: loc(lang, 'ErrorUnsupported')
});
}
if (!(testers[host](patternMatch))) {
return createResponse("error", {
t: loc(lang, 'ErrorBrokenLink', host)
});
}
switch (host) { switch (host) {
case "twitter": case "twitter":
@ -177,21 +186,26 @@ export default async function(host, patternMatch, lang, obj) {
r = await dailymotion(patternMatch); r = await dailymotion(patternMatch);
break; break;
default: default:
return createResponse("error", { t: errorUnsupported(lang) }); return createResponse("error", {
t: loc(lang, 'ErrorUnsupported')
});
} }
if (r.isAudioOnly) isAudioOnly = true; if (r.isAudioOnly) isAudioOnly = true;
let isAudioMuted = isAudioOnly ? false : obj.isAudioMuted; let isAudioMuted = isAudioOnly ? false : obj.isAudioMuted;
if (r.error && r.critical) if (r.error && r.critical) {
return createResponse("critical", { t: loc(lang, r.error) }) return createResponse("critical", {
t: loc(lang, r.error)
if (r.error) })
}
if (r.error) {
return createResponse("error", { return createResponse("error", {
t: Array.isArray(r.error) t: Array.isArray(r.error)
? loc(lang, r.error[0], r.error[1]) ? loc(lang, r.error[0], r.error[1])
: loc(lang, r.error) : loc(lang, r.error)
}) })
}
return matchActionDecider( return matchActionDecider(
r, host, obj.aFormat, isAudioOnly, r, host, obj.aFormat, isAudioOnly,
@ -200,6 +214,8 @@ export default async function(host, patternMatch, lang, obj) {
requestIP requestIP
) )
} catch { } catch {
return createResponse("error", { t: genericError(lang, host) }) return createResponse("error", {
t: loc(lang, 'ErrorBadFetch', host)
})
} }
} }

11
src/modules/sub/errors.js
View file

@ -1,11 +0,0 @@
import loc from "../../localization/manager.js";
export function errorUnsupported(lang) {
return loc(lang, 'ErrorUnsupported');
}
export function brokenLink(lang, host) {
return loc(lang, 'ErrorBrokenLink', host);
}
export function genericError(lang, host) {
return loc(lang, 'ErrorBadFetch', host);
}