Skip to content
This repository has been archived by the owner on Sep 15, 2023. It is now read-only.

Commit

Permalink
v3.12 final
Browse files Browse the repository at this point in the history
  • Loading branch information
@RatWasHere
RatWasHere committed Aug 26, 2023
1 parent ae25ed0 commit b728ea6
Show file tree
Hide file tree
Showing 48 changed files with 623 additions and 156 deletions.
Binary file modified AppData.zip
View file
Binary file not shown.
59 changes: 42 additions & 17 deletions AppData/Actions/editInteractionReply.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,24 @@ module.exports = {
data: {
messageContent: "",
storeAs: "",
interactionFrom: "",
interaction: "",
actionRows: [],
name: "Edit Interaction Reply",
ExtraData: "",
sendTo: "",
editMessageContent: true
},
UI: {
compatibleWith: ["Text", "Event"],
text: "Edit Interaction Reply",
sepbar: "",
btext: "Message Content",
largeInput: "messageContent",
toggle: {
name: "Edit Message Content?",
storeAs: "editMessageContent"
},
sepbar0: "",
customMenu: {
name: "Components",
Expand Down Expand Up @@ -229,6 +235,10 @@ module.exports = {
},
storeAs: "actionRows",
},
toggle0: {
name: "Edit Message Components?",
storeAs: "editMessageComponents"
},
sepbar1: "",
customMenu0: {
name: "Embeds",
Expand Down Expand Up @@ -308,11 +318,15 @@ module.exports = {
},
storeAs: "embeds",
},
toggle1: {
name: "Edit Message Embeds?",
storeAs: "editMessageEmbeds"
},
sepbar2: "",
btext0: "Interaction Variable",
input_direct: "interaction"
},
subtitle: "Content: $[messageContent]$ - Interaction From: $[messageVariable]$",
subtitle: "Content: $[messageContent]$ - Interaction From: $[interactionFrom]$",
async run(values, message, client, bridge) {
let actionRunner = bridge.runner
const {
Expand Down Expand Up @@ -592,22 +606,33 @@ module.exports = {
}
};

let messageToEdit = bridge.variables[varTools.transf(values.interaction, bridge.variables)]
let messageToEdit = await bridge.variables[varTools.transf(values.interaction, bridge.variables)]

let msg = await messageToEdit
.editOriginal({
content: varTools.transf(values.messageContent, bridge.variables),
embeds: embeds,
components: endComponents,
})
let original = await messageToEdit.getOriginal()

if (values.storeAs != "") {
bridge.variables[values.storeAs] = msg;
}
messageStorage = msg;
client.on("interactionCreate", handleInteraction);
setTimeout(() => {
client.off("interactionCreate", handleInteraction);
}, highestTimeDenominator * 1000);
let msg = await messageToEdit
.editOriginal({
content: values.editMessageContent ? varTools.transf(values.messageContent, bridge.variables) : original.content,
embeds: values.editMessageEmbeds ? embeds : original.embeds,
components: values.editMessageComponents ? endComponents : original.components,
})



if (values.storeAs != "") {
bridge.variables[values.storeAs] = msg;
}
messageStorage = msg;

if (!values.editMessageComponents) return;

client.off("interactionCreate", bridge.variables.globalActionCache[msg.id])

bridge.variables.globalActionCache[msg.id] = handleInteraction;

client.on("interactionCreate", handleInteraction);
setTimeout(() => {
client.off("interactionCreate", handleInteraction);
}, highestTimeDenominator * 1000);
},
};
};
60 changes: 42 additions & 18 deletions AppData/Actions/editInteractionReply_slash.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,18 @@ module.exports = {
name: "Edit Interaction Reply",
ExtraData: "",
sendTo: "",
editMessageContent: true
},
UI: {
compatibleWith: ["Slash"],
text: "Edit Interaction Reply",
sepbar: "",
btext: "Message Content",
largeInput: "messageContent",
toggle: {
name: "Edit Message Content?",
storeAs: "editMessageContent"
},
sepbar0: "",
customMenu: {
name: "Components",
Expand Down Expand Up @@ -230,6 +235,10 @@ module.exports = {
},
storeAs: "actionRows",
},
toggle0: {
name: "Edit Message Components?",
storeAs: "editMessageComponents"
},
sepbar1: "",
customMenu0: {
name: "Embeds",
Expand Down Expand Up @@ -309,6 +318,10 @@ module.exports = {
},
storeAs: "embeds",
},
toggle1: {
name: "Edit Message Embeds?",
storeAs: "editMessageEmbeds"
},
sepbar2: "",
btext0: "Get Interaction Via",
menuBar: {
Expand All @@ -323,7 +336,7 @@ module.exports = {
}
}
},
subtitle: "Content: $[messageContent]$ - Interaction From: $[messageVariable]$",
subtitle: "Content: $[messageContent]$ - Interaction From: $[interactionFrom]$",
async run(values, message, client, bridge) {
let actionRunner = bridge.runner
const {
Expand Down Expand Up @@ -604,27 +617,38 @@ module.exports = {
};

let messageToEdit;

if (values.interactionFrom == 'Command Interaction') {
messageToEdit = message;
messageToEdit = await message;
} else {
messageToEdit = bridge.variables[varTools.transf(values.interaction, bridge.variables)]
messageToEdit = await bridge.variables[varTools.transf(values.interaction, bridge.variables)]
}

let msg = await messageToEdit
.editOriginal({
content: varTools.transf(values.messageContent, bridge.variables),
embeds: embeds,
components: endComponents,
})

if (values.storeAs != "") {
bridge.variables[values.storeAs] = msg;
}
messageStorage = msg;
client.on("interactionCreate", handleInteraction);
setTimeout(() => {
client.off("interactionCreate", handleInteraction);
}, highestTimeDenominator * 1000);
let original = await messageToEdit.getOriginal()

let msg = await messageToEdit
.editOriginal({
content: values.editMessageContent ? varTools.transf(values.messageContent, bridge.variables) : original.content,
embeds: values.editMessageEmbeds ? embeds : original.embeds,
components: values.editMessageComponents ? endComponents : original.components,
})


if (values.storeAs != "") {
bridge.variables[values.storeAs] = msg;
}

messageStorage = msg;

if (!values.editMessageComponents) return;

client.off("interactionCreate", bridge.variables.globalActionCache[msg.id])

bridge.variables.globalActionCache[msg.id] = handleInteraction;

client.on("interactionCreate", handleInteraction);
setTimeout(() => {
client.off("interactionCreate", handleInteraction);
}, highestTimeDenominator * 1000);
},
};
36 changes: 30 additions & 6 deletions AppData/Actions/editMessage.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ module.exports = {
sepbar: "",
btext: "Message Content",
largeInput: "messageContent",
toggle: {
name: "Edit Message Content?",
storeAs: "editMessageContent"
},
sepbar0: "",
customMenu: {
name: "Components",
Expand Down Expand Up @@ -229,6 +233,10 @@ module.exports = {
},
storeAs: "actionRows",
},
toggle0: {
name: "Edit Message Components?",
storeAs: "editMessageComponents"
},
sepbar1: "",
customMenu0: {
name: "Embeds",
Expand Down Expand Up @@ -308,6 +316,10 @@ module.exports = {
},
storeAs: "embeds",
},
toggle1: {
name: "Edit Message Embeds?",
storeAs: "editMessageEmbeds"
},
sepbar2: "",
btext0: "Message Variable",
input_direct: "messageVariable"
Expand Down Expand Up @@ -594,19 +606,31 @@ module.exports = {

let messageToEdit = bridge.variables[varTools.transf(values.messageVariable, bridge.variables)]
let msg = await messageToEdit
msg.edit({
content: varTools.transf(values.messageContent, bridge.variables),
embeds: embeds,
components: endComponents,

let original = msg; /* yes im lazying out cry ab it */
await msg.edit({
content: values.editMessageContent ? varTools.transf(values.messageContent, bridge.variables) : original.content,
embeds: values.editMessageEmbeds ? embeds : original.embeds,
components: values.editMessageComponents ? endComponents : original.components,
})

bridge.data.global[msg.id] = handleInteraction;

if (values.storeAs != "") {
bridge.variables[values.storeAs] = msg;
bridge.variables[values.storeAs] = {...msg, handleInteractionMethod: handleInteraction};
}

messageStorage = msg;

if (!values.editMessageComponents) return;

client.off("interactionCreate", bridge.variables.globalActionCache[msg.id])

bridge.variables.globalActionCache[msg.id] = handleInteraction;

client.on("interactionCreate", handleInteraction);
setTimeout(() => {
client.off("interactionCreate", handleInteraction);
}, highestTimeDenominator * 1000);
},
};
};
2 changes: 1 addition & 1 deletion AppData/Actions/getGuildChannelList.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module.exports = {
data: { name: "Get Guild Channels List", storeAs: "", get: "IDs" },

UI: {
compatibleWith: ["Text", "Slash"],
compatibleWith: ["Any"],
text: "Get Guild Channels List",

sepbar: "",
Expand Down
61 changes: 61 additions & 0 deletions AppData/Actions/getGuildData.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
module.exports = {
data: {"name":"Get Guild Data",
"dataName":"",
"storeAs":"",
"guildFrom":"Command Author",
"guild":""},

UI: {"compatibleWith":["Any"],

"text":"Get Guild Data",

"sepbar":"",

"btext":"Get Guild Via",
"menuBar":{"choices":["Command Guild", "ID*", "Variable*"], storeAs:"guildFrom", extraField:"guild"},

"sepbar1":"",

"btext0":"Data Name",
"input*":"dataName",

"sepbar0":"",

"btext1":"Store As",
"input!":"storeAs",

"variableSettings":{
"guild": {
"Variable*": "direct",
"Command Author": "novars"
}
}
},
subtitle: "Guild: $[guildFrom]$ - Data Name: $[dataName]$ - Store As: $[storeAs]$",
async run(values, message, client, bridge) {
let varTools = require(`../Toolkit/variableTools.js`)

var storedData = bridge.data.IO.get()
if (values.guildFrom == 'Command Guild') {
guild = message.guild
}
if (values.guildFrom == 'Variable*') {
guild = bridge.variables[varTools.transf(values.guild, bridge.variables)]
}
if (values.guildFrom == 'ID*') {
guild = client.guilds.get(varTools.transf(values.guild, bridge.variables))
}

let guildData = undefined;

try {
guildData = storedData.guilds[guild.id][varTools.transf(values.dataName, bridge.variables)];
} catch (error) {
guildData = ''
storedData.guilds[guild.id] = {}
bridge.data.IO.write(storedData)
}

bridge.variables[varTools.transf(values.storeAs, bridge.variables)] = guildData
}
}
2 changes: 1 addition & 1 deletion AppData/Actions/getGuildMembersList.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module.exports = {
data: { name: "Get Guild Members List", storeAs: "", get: "IDs" },

UI: {
compatibleWith: ["Text", "Slash"],
compatibleWith: ["Any"],
text: "Get Guild Members List",

sepbar: "",
Expand Down
2 changes: 1 addition & 1 deletion AppData/Actions/getGuildRolesList.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module.exports = {
data: { name: "Get Guild Roles List", storeAs: "", get: "IDs" },

UI: {
compatibleWith: ["Text", "Slash"],
compatibleWith: ["Any"],
text: "Get Guild Roles List",

sepbar: "",
Expand Down
8 changes: 5 additions & 3 deletions AppData/Actions/interactionReply.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -622,16 +622,18 @@ module.exports = {
components: endComponents,
flags: values.ephemeral == true ? 64 : null
})
.then(async (inter) => {
.then(async () => {
let msg = await interactionPendingReply.getOriginal();
if (values.storeAs != "") {
bridge.variables[values.storeAs] = msg;
bridge.variables[values.storeAs] = {...msg, handleInteractionMethod: handleInteraction};
}
bridge.variables.globalActionCache[msg.id] = handleInteraction;

messageStorage = msg;
client.on("interactionCreate", handleInteraction);
setTimeout(() => {
client.off("interactionCreate", handleInteraction);
}, highestTimeDenominator * 1000);
});
},
};
};
Loading

0 comments on commit b728ea6

Please sign in to comment.