From 0ffea2d886c0cbca91488189d922c901f01b0025 Mon Sep 17 00:00:00 2001
From: wukko <me@wukko.me>
Date: Sat, 3 Aug 2024 15:02:59 +0600
Subject: [PATCH] api/match: pass action parameters as object

---
 api/src/processing/match-action.js |  7 +++----
 api/src/processing/match.js        | 17 +++++++++++------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/api/src/processing/match-action.js b/api/src/processing/match-action.js
index d5c58013..d6ec98ca 100644
--- a/api/src/processing/match-action.js
+++ b/api/src/processing/match-action.js
@@ -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"
diff --git a/api/src/processing/match.js b/api/src/processing/match.js
index 381c9b98..fd40010d 100644
--- a/api/src/processing/match.js
+++ b/api/src/processing/match.js
@@ -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",