From 960886dd53700e8d3fc8695d209cd3130418f31e Mon Sep 17 00:00:00 2001 From: USERSATOSHI Date: Sun, 25 Jun 2023 21:12:14 +0530 Subject: [PATCH] some update idk cause of merge conflict somehow --- src/functions/discord/message/$description.ts | 12 ------------ src/functions/discord/message/$title.ts | 11 +---------- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/src/functions/discord/message/$description.ts b/src/functions/discord/message/$description.ts index 35e6d6dca..e29d24c70 100644 --- a/src/functions/discord/message/$description.ts +++ b/src/functions/discord/message/$description.ts @@ -53,13 +53,7 @@ export const $description: FunctionData = { }; currentScope.setters += escapeResult( -<<<<<<< HEAD `${escapeVars(`${currentScope.name}_embeds`)}[${index}] = { fields: [] };` -======= - `${escapeVars( - currentScope.name + "_embeds", - )}[${index}] = { fields: [] };`, ->>>>>>> d679aa85ca16eee7375524de8ce607c9ee85db14 ); } @@ -67,15 +61,9 @@ export const $description: FunctionData = { currentScope.embeds[index] = embed; const res = escapeResult( -<<<<<<< HEAD `${escapeVars(`${currentScope.name}_embeds`)}[${index}].description = ${parseString( actualDescription, )};`, -======= - `${escapeVars( - currentScope.name + "_embeds", - )}[${index}].description = ${parseString(actualDescription)};`, ->>>>>>> d679aa85ca16eee7375524de8ce607c9ee85db14 ); currentScope.update(res, data); diff --git a/src/functions/discord/message/$title.ts b/src/functions/discord/message/$title.ts index 14b5f3640..664384f7a 100644 --- a/src/functions/discord/message/$title.ts +++ b/src/functions/discord/message/$title.ts @@ -53,13 +53,9 @@ export const $title: FunctionData = { }; currentScope.setters += escapeResult( -<<<<<<< HEAD - `${escapeVars(`${currentScope.name}_embeds`)}[${index}] = { fields: [] };` -======= `${escapeVars( - currentScope.name + "_embeds", + `${currentScope.name}_embeds`, )}[${index}] = { fields: [] };`, ->>>>>>> d679aa85ca16eee7375524de8ce607c9ee85db14 ); } @@ -67,16 +63,11 @@ export const $title: FunctionData = { currentScope.embeds[index] = embed; const res = escapeResult( -<<<<<<< HEAD - `${escapeVars(`${currentScope.name}_embeds`)}[${index}].title = ${parseString(actualTitle)};` -======= `${escapeVars( currentScope.name + "_embeds", )}[${index}].title = ${parseString(actualTitle)};`, ->>>>>>> d679aa85ca16eee7375524de8ce607c9ee85db14 ); - currentScope.update(res, data); return { code: res, scope,