Mirrors/cobalt
1
0
Fork 0
mirror of https://github.com/wukko/cobalt.git synced 2025-05-29 13:00:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

api/match: pass action parameters as object

Browse Source
This commit is contained in:
wukko 2024-08-03 15:02:59 +06:00
parent 559e8448e5
commit 0ffea2d886
No known key found for this signature in database
GPG Key ID: 3E30B3F26C7B4AA2
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
api/src/processing/match-action.js
View File

@ -3,7 +3,7 @@ import { createResponse } from "./request.js";
import createFilename from "./create-filename.js"; import createFilename from "./create-filename.js";
import { createStream } from "../stream/manage.js"; import { createStream } from "../stream/manage.js";
export default function(r, host, userFormat, isAudioOnly, lang, isAudioMuted, disableMetadata, filenamePattern, toGif, requestIP) { export default function({ r, host, audioFormat, isAudioOnly, isAudioMuted, disableMetadata, filenameStyle, toGif, requestIP }) {
let action, let action,
responseType = "stream", responseType = "stream",
defaultParams = { defaultParams = {
@ -11,12 +11,11 @@ export default function(r, host, userFormat, isAudioOnly, lang, isAudioMuted, di
headers: r.headers, headers: r.headers,
service: host, service: host,
filename: r.filenameAttributes ? filename: r.filenameAttributes ?
createFilename(r.filenameAttributes, filenamePattern, isAudioOnly, isAudioMuted) : r.filename, createFilename(r.filenameAttributes, filenameStyle, isAudioOnly, isAudioMuted) : r.filename,
fileMetadata: !disableMetadata ? r.fileMetadata : false, fileMetadata: !disableMetadata ? r.fileMetadata : false,
requestIP requestIP
}, },
params = {}, params = {};
audioFormat = String(userFormat);
if (r.isPhoto) action = "photo"; if (r.isPhoto) action = "photo";
else if (r.picker) action = "picker" else if (r.picker) action = "picker"

17
api/src/processing/match.js
View File

@ -4,7 +4,7 @@ import { env } from "../config.js";
import { createResponse } from "../processing/request.js"; import { createResponse } from "../processing/request.js";
import { testers } from "./service-patterns.js"; import { testers } from "./service-patterns.js";
import matchActionDecider from "./match-action.js"; import matchAction from "./match-action.js";
import bilibili from "./services/bilibili.js"; import bilibili from "./services/bilibili.js";
import reddit from "./services/reddit.js"; import reddit from "./services/reddit.js";
@ -230,12 +230,17 @@ export default async function(host, patternMatch, lang, obj) {
}) })
} }
return matchActionDecider( return matchAction({
r, host, obj.aFormat, isAudioOnly, r,
lang, isAudioMuted, disableMetadata, host,
obj.filenamePattern, obj.twitterGif, audioFormat: obj.audioFormat,
isAudioOnly,
isAudioMuted,
disableMetadata,
filenameStyle: obj.filenamePattern,
toGif: obj.twitterGif,
requestIP requestIP
) })
} catch { } catch {
return createResponse("error", { return createResponse("error", {
code: "ErrorBadFetch", code: "ErrorBadFetch",