Mirrors/cobalt
1
0
Fork 0
mirror of https://github.com/wukko/cobalt.git synced 2025-03-26 19:24:50 +01:00
Code Issues Projects Releases Packages 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 { 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,
responseType = "stream",
defaultParams = {
@ -11,12 +11,11 @@ export default function(r, host, userFormat, isAudioOnly, lang, isAudioMuted, di
headers: r.headers,
service: host,
filename: r.filenameAttributes ?
createFilename(r.filenameAttributes, filenamePattern, isAudioOnly, isAudioMuted) : r.filename,
createFilename(r.filenameAttributes, filenameStyle, isAudioOnly, isAudioMuted) : r.filename,
fileMetadata: !disableMetadata ? r.fileMetadata : false,
requestIP
},
params = {},
audioFormat = String(userFormat);
params = {};
if (r.isPhoto) action = "photo";
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 { testers } from "./service-patterns.js";
import matchActionDecider from "./match-action.js";
import matchAction from "./match-action.js";
import bilibili from "./services/bilibili.js";
import reddit from "./services/reddit.js";
@ -230,12 +230,17 @@ export default async function(host, patternMatch, lang, obj) {
})
}
return matchActionDecider(
r, host, obj.aFormat, isAudioOnly,
lang, isAudioMuted, disableMetadata,
obj.filenamePattern, obj.twitterGif,
return matchAction({
r,
host,
audioFormat: obj.audioFormat,
isAudioOnly,
isAudioMuted,
disableMetadata,
filenameStyle: obj.filenamePattern,
toGif: obj.twitterGif,
requestIP
)
})
} catch {
return createResponse("error", {
code: "ErrorBadFetch",