+
Text Color
+
Comment To Show: (Supports some HTML Tags)
diff --git a/actions/color_tool_MOD.js b/actions/color_tool_MOD.js
index 0e5faddb..9d1f87c6 100644
--- a/actions/color_tool_MOD.js
+++ b/actions/color_tool_MOD.js
@@ -22,11 +22,13 @@ module.exports = {
html() {
return `
-Color:
-
-
-
`;
+
Text Color
+
+
+
+
+
`;
},
init() {},
diff --git a/actions/send_message_to_console_MOD.js b/actions/send_message_to_console_MOD.js
index 7e4ce02e..13836546 100644
--- a/actions/send_message_to_console_MOD.js
+++ b/actions/send_message_to_console_MOD.js
@@ -21,8 +21,8 @@ module.exports = {
html() {
return `
- Color
- Color
From fd5d2b98f0c7fc8c9d95e36fbbe226f996894117 Mon Sep 17 00:00:00 2001
From: TheMonDon <11539895+TheMonDon@users.noreply.github.com>
Date: Fri, 9 Jun 2023 15:46:41 -0500
Subject: [PATCH 10/62] Start updating music to v14
---
actions/control_music_MOD.js | 26 +++++-----
actions/play_music_MOD.js | 94 ++++++++++++++++++++----------------
events/on_track_start_EVT.js | 23 ++++++---
3 files changed, 81 insertions(+), 62 deletions(-)
diff --git a/actions/control_music_MOD.js b/actions/control_music_MOD.js
index 2f4fdbad..4b144641 100644
--- a/actions/control_music_MOD.js
+++ b/actions/control_music_MOD.js
@@ -8,7 +8,6 @@ module.exports = {
authorUrl: 'https://github.com/dbm-network/mods',
downloadURL: 'https://github.com/dbm-network/mods/blob/master/actions/control_music_MOD.js',
},
- requiresAudioLibraries: true,
fields: ['action', 'volume'],
subtitle(data) {
@@ -74,42 +73,45 @@ module.exports = {
glob.onChange(document.getElementById('action'));
},
- action(cache) {
- const { Bot } = this.getDBM();
+ async action(cache) {
const data = cache.actions[cache.index];
- const queue = Bot.bot.player.getQueue(cache.server);
const action = parseInt(data.action, 10);
const volume = parseInt(this.evalMessage(data.volume, cache), 10);
+ const { useQueue, useHistory } = require('discord-player');
+
+ const server = cache.server;
+ if (!server) return this.callNextAction(cache);
+
+ const queue = useQueue(server.id);
+ const history = useHistory(server.id);
if (volume && isNaN(volume)) {
console.log('Invalid volume number in Control Music');
return this.callNexAction(cache);
}
- if (!queue) return this.callNextAction(cache);
-
try {
switch (action) {
case 0:
- queue.destroy();
+ queue.delete(); // Stop playing
break;
case 1:
- queue.setPaused(true);
+ queue.node.pause();
break;
case 2:
- queue.setPaused(false);
+ queue.node.resume();
break;
case 3:
- queue.skip();
+ queue.node.skip();
break;
case 4:
- queue.back();
+ await history.previous();
break;
case 5:
queue.destroy(false);
break;
case 6:
- queue.shuffle();
+ queue.tracks.shuffle();
break;
case 7:
queue.setVolume(volume);
diff --git a/actions/play_music_MOD.js b/actions/play_music_MOD.js
index e99e1a1b..bbb779fe 100644
--- a/actions/play_music_MOD.js
+++ b/actions/play_music_MOD.js
@@ -9,7 +9,7 @@ module.exports = {
downloadURL: 'https://github.com/dbm-network/mods/blob/master/actions/play_music_MOD.js',
},
requiresAudioLibraries: true,
- fields: ['query', 'voiceChannel', 'varName', 'storage', 'varName2', 'type'],
+ fields: ['query', 'voiceChannel', 'varName', 'storage', 'varName2', '', 'volume', 'leaveOnEmpty', 'leaveOnEnd'],
subtitle(data) {
return `${data.query}`;
@@ -22,33 +22,42 @@ module.exports = {
html() {
return `
+
YouTube Search
-
+
+
-
-
Play Type
-
- Add to Queue
- Play Immediately
-
+
+
+ Default Volume
+
+
-
+
+
-
+
NOTE:
+
`;
},
@@ -58,44 +67,45 @@ module.exports = {
const data = cache.actions[cache.index];
const server = cache.server;
const channel = cache.msg?.channel ?? cache.interaction?.channel;
- const { Bot } = this.getDBM();
- const Mods = this.getMods();
- const playdl = Mods.require('play-dl');
- const player = Bot.bot.player;
+ const { Files } = this.getDBM();
const voiceChannel = await this.getVoiceChannelFromData(data.voiceChannel, data.varName2, cache);
+ const Mods = this.getMods();
+ // Setup Music
+ const { useMasterPlayer } = Mods.require('discord-player');
+ const player = useMasterPlayer();
const query = this.evalMessage(data.query, cache);
- const queue = player.createQueue(server, {
- metadata: {
- channel,
- },
- async onBeforeCreateStream(track, source) {
- if (source === 'youtube') {
- return (await playdl.stream(track.url, { discordPlayerCompatibility: true })).stream;
- }
- },
- });
+ if (!server ?? !query) return this.callNextAction();
+
+ let volume = 80;
+ if (data.volume) volume = parseInt(this.evalMessage(data.volume, cache), 10) ?? 80;
- const track = await player.search(query, {
- requestedBy: cache.getUser(),
+ // leaveOnEnd & leaveOnEmpty Cooldowns from DBM Settings
+ const leaveVoiceTimeout = Files.data.settings.leaveVoiceTimeout ?? '0';
+ let seconds = parseInt(leaveVoiceTimeout, 10);
+
+ if (isNaN(seconds) || seconds < 0) seconds = 0;
+ if (leaveVoiceTimeout === '' || !isFinite(seconds)) seconds = 0;
+ // Needs to be converted to Milliseconds, keeping the same variable.
+ if (seconds > 0) seconds *= 1000;
+
+ const { track } = await player.play(voiceChannel, query, {
+ nodeOptions: {
+ metadata: {
+ channel,
+ client: server.members.me,
+ requestedBy: cache.getUser(),
+ },
+ selfDeaf: (Files.data.settings.autoDeafen ?? 'true') === 'true',
+ volume,
+ leaveOnEmpty: data.leaveOnEmpty,
+ leaveOnEmptyCooldown: seconds,
+ leaveOnEnd: data.leaveOnEnd,
+ leaveOnEndCooldown: seconds,
+ },
});
- if (track.tracks.length > 0) {
- try {
- if (!queue.connection) await queue.connect(voiceChannel);
- } catch {
- queue.destroy();
- console.log('Could not join voice channel');
- return this.callNextAction(cache);
- }
-
- track.playlist ? queue.addTracks(track.tracks) : queue.addTrack(track.tracks[0]);
- if (data.type === '1') {
- await queue.play();
- }
- if (data.type === '0') {
- if (!queue.playing) await queue.play();
- }
+ if (track) {
const storage = parseInt(data.storage, 10);
const varName2 = this.evalMessage(data.varName2, cache);
this.storeValue(track, storage, varName2, cache);
diff --git a/events/on_track_start_EVT.js b/events/on_track_start_EVT.js
index d6b551c6..dedd0c99 100644
--- a/events/on_track_start_EVT.js
+++ b/events/on_track_start_EVT.js
@@ -7,7 +7,11 @@ module.exports = {
mod(DBM) {
const { Bot, Actions, Events } = DBM;
const Mods = Actions.getMods();
- const { Player } = Mods.require('@themondon/discord-player-v13');
+
+ // Require all the needed modules for discord-player
+ const { Player } = Mods.require('discord-player');
+ Mods.require('@discord-player/extractor');
+ Mods.require('play-dl');
DBM.Events.onTrackStart = function onTrackStart(queue, track) {
if (!Bot.$evts['On Track Start']) return;
@@ -21,30 +25,33 @@ module.exports = {
};
const { onReady } = Bot;
- Bot.onReady = function onTrackStartOnReady(...params) {
+ Bot.onReady = async function onTrackStartOnReady(...params) {
Bot.bot.player = new Player(Bot.bot);
+ // This method will load all the extractors from the @discord-player/extractor package
+ await Bot.bot.player.extractors.loadDefault();
+
Bot.bot.on('onTrackStart', DBM.Events.onTrackStart);
- Bot.bot.player
- .on('trackStart', async (queue, track) => {
+ Bot.bot.player.events
+ .on('playerStart', async (queue, track) => {
Events.onTrackStart(queue, track);
})
- .on('trackAdd', async (queue, track) => {
+ .on('audioTrackAdd', async (queue, track) => {
Events.onTrackAdd(queue, track);
})
- .on('tracksAdd', async (queue, track) => {
+ .on('audioTracksAdd', async (queue, track) => {
Events.onTracksAdd(queue, track);
})
.on('noResults', async (queue, track) => {
Events.onPlayerNoResults(queue, track);
})
- .on('queueEnd', async (queue) => {
+ .on('emptyQueue', async (queue) => {
Events.onQueueEnd(queue);
})
.on('error', async (queue, error) => {
Events.onPlayerError(queue, error);
})
- .on('connectionError', async (queue, error) => {
+ .on('playerError', async (queue, error) => {
Events.onPlayerConnectionError(queue, error);
});
From d8fb7139ae24902e58268981e488ee4376b4ec65 Mon Sep 17 00:00:00 2001
From: TheMonDon <11539895+TheMonDon@users.noreply.github.com>
Date: Fri, 9 Jun 2023 23:22:22 -0500
Subject: [PATCH 11/62] Remove Anchor Actions (Now default)
---
actions/anchor_create_MOD.js | 56 ----------------------------
actions/anchor_jump_MOD.js | 71 ------------------------------------
2 files changed, 127 deletions(-)
delete mode 100644 actions/anchor_create_MOD.js
delete mode 100644 actions/anchor_jump_MOD.js
diff --git a/actions/anchor_create_MOD.js b/actions/anchor_create_MOD.js
deleted file mode 100644
index 5d860efb..00000000
--- a/actions/anchor_create_MOD.js
+++ /dev/null
@@ -1,56 +0,0 @@
-module.exports = {
- name: 'Create Anchor',
- section: 'Other Stuff',
- meta: {
- version: '2.2.0',
- preciseCheck: false,
- author: 'DBM Mods',
- authorUrl: 'https://github.com/dbm-network/mods',
- downloadURL: 'https://github.com/dbm-network/mods/blob/master/actions/anchor_create_MOD.js',
- },
-
- subtitle(data) {
- return data.description
- ? `
${data.description} `
- : `Create ${
- data.anchor_id
- ? `the "
${data.anchor_id} " anchor at the current position!`
- : 'an anchor!'
- }`;
- },
-
- fields: ['anchor_id', 'color', 'description'],
-
- html() {
- return `
-
-
- Mod Info:
-
-
- Anchor ID
-
-
- Anchor Color
-
-
`;
- },
-
- init() {},
-
- async action(cache) {
- this.callNextAction(cache);
- },
-
- mod() {},
-};
diff --git a/actions/anchor_jump_MOD.js b/actions/anchor_jump_MOD.js
deleted file mode 100644
index 4a87cd9c..00000000
--- a/actions/anchor_jump_MOD.js
+++ /dev/null
@@ -1,71 +0,0 @@
-module.exports = {
- name: 'Jump to Anchor',
- section: 'Other Stuff',
- meta: {
- version: '2.2.0',
- preciseCheck: false,
- author: 'DBM Mods',
- authorUrl: 'https://github.com/dbm-network/mods',
- downloadURL: 'https://github.com/dbm-network/mods/blob/master/actions/anchor_jump_MOD.js',
- },
-
- subtitle(data) {
- return data.description
- ? `
${data.description} `
- : `Jump to ${
- data.jump_to_anchor
- ? `the "
${data.jump_to_anchor} " anchor in your command if it exists!`
- : 'an anchor!'
- }`;
- },
-
- fields: ['description', 'jump_to_anchor', 'color'],
-
- html() {
- return `
-
-
- Mod Info: This is sensitive and must be exactly the same as your anchor name.
-
-
-
- Jump to Anchor ID
-
-
- Anchor Color
-
-
- Description
-
`;
- },
-
- init() {},
-
- async action(cache) {
- const id = this.evalMessage(cache.actions[cache.index].jump_to_anchor, cache);
- this.anchorJump(id, cache);
- },
-
- mod(DBM) {
- DBM.Actions.anchorJump = function anchorJump(id, cache) {
- const anchorIndex = cache.actions.findIndex((a) => a.name === 'Create Anchor' && a.anchor_id === id);
- if (anchorIndex === -1) throw new Error('There was not an anchor found with that exact anchor ID!');
- cache.index = anchorIndex - 1;
- this.callNextAction(cache);
- };
-
- DBM.Actions.anchorExist = function anchorExist(id, cache) {
- const anchorIndex = cache.actions.findIndex((a) => a.name === 'Create Anchor' && a.anchor_id === id);
- if (anchorIndex === -1) {
- return false;
- }
- return true;
- };
- },
-};
From 2c2a8c79770422df0c9a4132b153a71a1d91f845 Mon Sep 17 00:00:00 2001
From: TheMonDon <11539895+TheMonDon@users.noreply.github.com>
Date: Sat, 10 Jun 2023 01:38:59 -0500
Subject: [PATCH 12/62] A lot of music for v14 fixes/updates
---
actions/control_music_MOD.js | 9 ++--
actions/play_music_MOD.js | 55 ++++++++++++------------
actions/set_music_repeat_mode_MOD.js | 7 +++-
actions/store_queue_info_MOD.js | 62 ++++++++++++++++------------
events/on_player_no_results_EVT.js | 22 ----------
events/on_track_start_EVT.js | 3 --
6 files changed, 71 insertions(+), 87 deletions(-)
delete mode 100644 events/on_player_no_results_EVT.js
diff --git a/actions/control_music_MOD.js b/actions/control_music_MOD.js
index 4b144641..e1163f5c 100644
--- a/actions/control_music_MOD.js
+++ b/actions/control_music_MOD.js
@@ -77,13 +77,13 @@ module.exports = {
const data = cache.actions[cache.index];
const action = parseInt(data.action, 10);
const volume = parseInt(this.evalMessage(data.volume, cache), 10);
- const { useQueue, useHistory } = require('discord-player');
+ const { useQueue } = require('discord-player');
const server = cache.server;
if (!server) return this.callNextAction(cache);
const queue = useQueue(server.id);
- const history = useHistory(server.id);
+ if (!queue) this.callNextAction(cache);
if (volume && isNaN(volume)) {
console.log('Invalid volume number in Control Music');
@@ -105,10 +105,10 @@ module.exports = {
queue.node.skip();
break;
case 4:
- await history.previous();
+ queue.history.back();
break;
case 5:
- queue.destroy(false);
+ queue.clear();
break;
case 6:
queue.tracks.shuffle();
@@ -118,6 +118,7 @@ module.exports = {
break;
}
} catch (err) {
+ console.log(err);
return this.callNextAction(cache);
}
diff --git a/actions/play_music_MOD.js b/actions/play_music_MOD.js
index bbb779fe..bfb1b5d4 100644
--- a/actions/play_music_MOD.js
+++ b/actions/play_music_MOD.js
@@ -17,7 +17,7 @@ module.exports = {
variableStorage(data, varType) {
if (parseInt(data.storage, 10) !== varType) return;
- return [data.varName3, 'Music Track'];
+ return [data.varName2, 'Music Track'];
},
html() {
@@ -48,15 +48,6 @@ module.exports = {
-
-
-
- NOTE:
`;
},
@@ -89,27 +80,33 @@ module.exports = {
// Needs to be converted to Milliseconds, keeping the same variable.
if (seconds > 0) seconds *= 1000;
- const { track } = await player.play(voiceChannel, query, {
- nodeOptions: {
- metadata: {
- channel,
- client: server.members.me,
- requestedBy: cache.getUser(),
+ try {
+ const { track } = await player.play(voiceChannel, query, {
+ nodeOptions: {
+ metadata: {
+ channel,
+ client: server.members.me,
+ requestedBy: cache.getUser(),
+ },
+ selfDeaf: (Files.data.settings.autoDeafen ?? 'true') === 'true',
+ volume,
+ leaveOnEmpty: data.leaveOnEmpty,
+ leaveOnEmptyCooldown: seconds,
+ leaveOnEnd: data.leaveOnEnd,
+ leaveOnEndCooldown: seconds,
},
- selfDeaf: (Files.data.settings.autoDeafen ?? 'true') === 'true',
- volume,
- leaveOnEmpty: data.leaveOnEmpty,
- leaveOnEmptyCooldown: seconds,
- leaveOnEnd: data.leaveOnEnd,
- leaveOnEndCooldown: seconds,
- },
- });
-
- if (track) {
- const storage = parseInt(data.storage, 10);
- const varName2 = this.evalMessage(data.varName2, cache);
- this.storeValue(track, storage, varName2, cache);
+ });
+
+ if (track) {
+ const storage = parseInt(data.storage, 10);
+ const varName2 = this.evalMessage(data.varName2, cache);
+ this.storeValue(track, storage, varName2, cache);
+ }
+ } catch (err) {
+ console.log(err);
+ this.callNextAction(cache);
}
+
this.callNextAction(cache);
},
diff --git a/actions/set_music_repeat_mode_MOD.js b/actions/set_music_repeat_mode_MOD.js
index 2260e1a7..c4a67e32 100644
--- a/actions/set_music_repeat_mode_MOD.js
+++ b/actions/set_music_repeat_mode_MOD.js
@@ -32,11 +32,14 @@ module.exports = {
init() {},
action(cache) {
- const { Bot } = this.getDBM();
const data = cache.actions[cache.index];
- const queue = Bot.bot.player.getQueue(cache.server);
const action = parseInt(data.action, 10);
+ const { useQueue } = require('discord-player');
+ const server = cache.server;
+ if (!server) return this.callNextAction(cache);
+
+ const queue = useQueue(server.id);
if (!queue) return this.callNextAction(cache);
switch (action) {
diff --git a/actions/store_queue_info_MOD.js b/actions/store_queue_info_MOD.js
index 9b168980..2820e659 100644
--- a/actions/store_queue_info_MOD.js
+++ b/actions/store_queue_info_MOD.js
@@ -9,7 +9,7 @@ module.exports = {
downloadURL: 'https://github.com/dbm-network/mods/blob/master/actions/store_queue_info_MOD.js',
},
requiresAudioLibraries: true,
- fields: ['info', 'storage', 'varName'],
+ fields: ['queueObject', 'varName0', 'info', 'storage', 'varName'],
subtitle({ info }) {
const names = [
@@ -18,8 +18,8 @@ module.exports = {
'Is Playing?',
'Repeat Mode',
'Progress Bar',
- 'Formatted Track List',
- 'Now Playing',
+ 'Current Track',
+ 'Queue Channel',
];
return `${names[parseInt(info, 10)]}`;
},
@@ -28,21 +28,20 @@ module.exports = {
if (parseInt(data.storage, 10) !== varType) return;
return [
data.varName,
- [
- 'Tracks',
- 'Previous Tracks',
- 'Is Playing?',
- 'Repeat Mode',
- 'Progress Bar',
- 'Formatted Track List',
- 'Now Playing',
- ][parseInt(data.info, 10)] || 'Queue Info',
+ ['Tracks', 'Previous Tracks', 'Is Playing?', 'Repeat Mode', 'Progress Bar', 'Current Track', 'Queue Channel'][
+ parseInt(data.info, 10)
+ ] || 'Queue Info',
];
},
- html() {
+ html(isEvent) {
return `
-
+ ${
+ isEvent &&
+ '
'
+ }
+
+
Queue Info
Tracks
@@ -50,13 +49,13 @@ module.exports = {
Is Playing?
Repeat Mode
Progress Bar
- Formatted Track List
- Now Playing
+ Current Track
+ Queue Channel
-
+
`;
@@ -65,36 +64,45 @@ module.exports = {
init() {},
async action(cache) {
- const { Bot } = this.getDBM();
const data = cache.actions[cache.index];
- const server = cache.msg?.guildId ?? cache.interaction?.guildId;
- const queue = Bot.bot.player.getQueue(server);
const info = parseInt(data.info, 10);
- let result;
- if (!queue) return this.callNextAction(cache);
+ const type = parseInt(data.storage, 10);
+ const varName = this.evalMessage(data.varName, cache);
+ let queue = this.getVariable(type, varName, cache);
+
+ if (!queue) {
+ const { useQueue } = require('discord-player');
+
+ const server = cache.server;
+ if (!server) return this.callNextAction(cache);
+ queue = useQueue(server.id);
+ if (!queue) return this.callNextAction(cache);
+ }
+
+ let result;
switch (info) {
case 0:
result = queue.tracks;
break;
case 1:
- result = queue.previousTracks;
+ result = queue.history.tracks;
break;
case 2:
- result = queue.playing;
+ result = queue.node.isPlaying();
break;
case 3:
result = queue.repeatMode;
break;
case 4:
- result = queue.createProgressBar({ timecodes: true });
+ result = queue.node.createProgressBar({ timecodes: true });
break;
case 5:
- result = queue.toString();
+ result = queue.currentTrack;
break;
case 6:
- result = queue.nowPlaying();
+ result = queue.metadata.channel;
break;
}
diff --git a/events/on_player_no_results_EVT.js b/events/on_player_no_results_EVT.js
deleted file mode 100644
index 2fb40050..00000000
--- a/events/on_player_no_results_EVT.js
+++ /dev/null
@@ -1,22 +0,0 @@
-module.exports = {
- name: 'On Player No Results',
- isEvent: true,
-
- fields: ['Temp Variable Name (stores the queue):', 'Temp Variable Name (stores the query):'],
-
- mod(DBM) {
- const { Bot, Actions } = DBM;
- DBM.Events = DBM.Events || {};
-
- DBM.Events.onPlayerNoResults = function onPlayerNoResults(queue, query) {
- if (!Bot.$evts['On Player No Results']) return;
-
- for (const event of Bot.$evts['On Player No Results']) {
- const temp = {};
- if (event.temp) temp[event.temp] = queue;
- if (event.temp2) temp[event.temp2] = query;
- Actions.invokeEvent(event, queue.metadata.guild, temp);
- }
- };
- },
-};
diff --git a/events/on_track_start_EVT.js b/events/on_track_start_EVT.js
index dedd0c99..8acd7630 100644
--- a/events/on_track_start_EVT.js
+++ b/events/on_track_start_EVT.js
@@ -42,9 +42,6 @@ module.exports = {
.on('audioTracksAdd', async (queue, track) => {
Events.onTracksAdd(queue, track);
})
- .on('noResults', async (queue, track) => {
- Events.onPlayerNoResults(queue, track);
- })
.on('emptyQueue', async (queue) => {
Events.onQueueEnd(queue);
})
From 802e425fe95d5ffa218d0c83dbcca0cffdf65a7c Mon Sep 17 00:00:00 2001
From: TheMonDon <11539895+TheMonDon@users.noreply.github.com>
Date: Sat, 10 Jun 2023 08:46:01 -0500
Subject: [PATCH 13/62] Replace store-in-variable with retrieve-from-variable
Last time I did not know if these were different, SRD confirmed they are different.
---
actions/attach_image_to_embed_MOD.js | 4 ++--
actions/canvas_draw_image_MOD.js | 2 +-
actions/canvas_send_image_MOD.js | 2 +-
actions/cleverbot_MOD.js | 2 +-
actions/compare_permissions_MOD.js | 4 ++--
actions/convert_text_to_list_MOD.js | 2 +-
actions/convert_variable_MOD.js | 2 +-
actions/create_animated_emoji_MOD.js | 2 +-
actions/filter_list_or_object_MOD.js | 2 +-
actions/find_item_in_list_MOD.js | 2 +-
actions/inspect_list_or_object_MOD.js | 2 +-
actions/parse_from_stored_json_MOD.js | 2 +-
actions/parse_from_stored_webpage_MOD.js | 2 +-
actions/send_embed_to_webhook_MOD.js | 2 +-
actions/store_audit_log_info_MOD.js | 2 +-
actions/store_category_info_MOD.js | 2 +-
actions/store_emoji_info_MOD.js | 2 +-
actions/store_permissions_Info_MOD.js | 2 +-
actions/store_reaction_info_MOD.js | 2 +-
actions/store_regex_matched_variable_MOD.js | 2 +-
actions/store_webhook_info_MOD.js | 2 +-
actions/variable_pattern_MOD.js | 2 +-
22 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/actions/attach_image_to_embed_MOD.js b/actions/attach_image_to_embed_MOD.js
index 425438ab..b12e2d8e 100644
--- a/actions/attach_image_to_embed_MOD.js
+++ b/actions/attach_image_to_embed_MOD.js
@@ -21,12 +21,12 @@ module.exports = {
html() {
return `
-
-
diff --git a/actions/canvas_draw_image_MOD.js b/actions/canvas_draw_image_MOD.js
index 46cf8b6f..3c87340b 100644
--- a/actions/canvas_draw_image_MOD.js
+++ b/actions/canvas_draw_image_MOD.js
@@ -20,7 +20,7 @@ module.exports = {
html() {
return `
-
+
diff --git a/actions/canvas_send_image_MOD.js b/actions/canvas_send_image_MOD.js
index 1b8bb258..dd3316f3 100644
--- a/actions/canvas_send_image_MOD.js
+++ b/actions/canvas_send_image_MOD.js
@@ -32,7 +32,7 @@ module.exports = {
html() {
return `
-
+
diff --git a/actions/cleverbot_MOD.js b/actions/cleverbot_MOD.js
index 58f7bd2c..cd8dec89 100644
--- a/actions/cleverbot_MOD.js
+++ b/actions/cleverbot_MOD.js
@@ -37,7 +37,7 @@ module.exports = {
-
diff --git a/actions/compare_permissions_MOD.js b/actions/compare_permissions_MOD.js
index ac2182ad..cd5ffed3 100644
--- a/actions/compare_permissions_MOD.js
+++ b/actions/compare_permissions_MOD.js
@@ -25,12 +25,12 @@ module.exports = {
html() {
return `
-
-
diff --git a/actions/convert_text_to_list_MOD.js b/actions/convert_text_to_list_MOD.js
index b35c4c96..47ac5707 100644
--- a/actions/convert_text_to_list_MOD.js
+++ b/actions/convert_text_to_list_MOD.js
@@ -26,7 +26,7 @@ module.exports = {
html() {
return `
-
diff --git a/actions/convert_variable_MOD.js b/actions/convert_variable_MOD.js
index 90fe9d82..bc79e2a2 100644
--- a/actions/convert_variable_MOD.js
+++ b/actions/convert_variable_MOD.js
@@ -33,7 +33,7 @@ module.exports = {
html() {
return `
-
diff --git a/actions/create_animated_emoji_MOD.js b/actions/create_animated_emoji_MOD.js
index f8775572..128e96be 100644
--- a/actions/create_animated_emoji_MOD.js
+++ b/actions/create_animated_emoji_MOD.js
@@ -29,7 +29,7 @@ module.exports = {
-
diff --git a/actions/filter_list_or_object_MOD.js b/actions/filter_list_or_object_MOD.js
index 652a8dcf..b9aaee43 100644
--- a/actions/filter_list_or_object_MOD.js
+++ b/actions/filter_list_or_object_MOD.js
@@ -25,7 +25,7 @@ module.exports = {
return `
-
diff --git a/actions/find_item_in_list_MOD.js b/actions/find_item_in_list_MOD.js
index b1b077fd..a470b2fe 100644
--- a/actions/find_item_in_list_MOD.js
+++ b/actions/find_item_in_list_MOD.js
@@ -35,7 +35,7 @@ module.exports = {
html() {
return `
-
diff --git a/actions/inspect_list_or_object_MOD.js b/actions/inspect_list_or_object_MOD.js
index 7fac57b4..149d0fed 100644
--- a/actions/inspect_list_or_object_MOD.js
+++ b/actions/inspect_list_or_object_MOD.js
@@ -24,7 +24,7 @@ module.exports = {
return `
-
diff --git a/actions/parse_from_stored_json_MOD.js b/actions/parse_from_stored_json_MOD.js
index f6673515..f21348c9 100644
--- a/actions/parse_from_stored_json_MOD.js
+++ b/actions/parse_from_stored_json_MOD.js
@@ -32,7 +32,7 @@ module.exports = {
-
+
diff --git a/actions/parse_from_stored_webpage_MOD.js b/actions/parse_from_stored_webpage_MOD.js
index a9aace60..62921b5a 100644
--- a/actions/parse_from_stored_webpage_MOD.js
+++ b/actions/parse_from_stored_webpage_MOD.js
@@ -32,7 +32,7 @@ module.exports = {
-
diff --git a/actions/send_embed_to_webhook_MOD.js b/actions/send_embed_to_webhook_MOD.js
index 2ea4ad14..2e5c24f0 100644
--- a/actions/send_embed_to_webhook_MOD.js
+++ b/actions/send_embed_to_webhook_MOD.js
@@ -18,7 +18,7 @@ module.exports = {
html() {
return `
-
diff --git a/actions/store_audit_log_info_MOD.js b/actions/store_audit_log_info_MOD.js
index 57a101fe..c450cff5 100644
--- a/actions/store_audit_log_info_MOD.js
+++ b/actions/store_audit_log_info_MOD.js
@@ -67,7 +67,7 @@ module.exports = {
html() {
return `
-
diff --git a/actions/store_category_info_MOD.js b/actions/store_category_info_MOD.js
index 8c94a7d9..41902350 100644
--- a/actions/store_category_info_MOD.js
+++ b/actions/store_category_info_MOD.js
@@ -70,7 +70,7 @@ module.exports = {
html() {
return `
-
diff --git a/actions/store_emoji_info_MOD.js b/actions/store_emoji_info_MOD.js
index 975bb197..ce19bdc4 100644
--- a/actions/store_emoji_info_MOD.js
+++ b/actions/store_emoji_info_MOD.js
@@ -82,7 +82,7 @@ module.exports = {
html() {
return `
-
diff --git a/actions/store_permissions_Info_MOD.js b/actions/store_permissions_Info_MOD.js
index 369a0a41..430200f4 100644
--- a/actions/store_permissions_Info_MOD.js
+++ b/actions/store_permissions_Info_MOD.js
@@ -77,7 +77,7 @@ module.exports = {
html() {
return `
-
diff --git a/actions/store_reaction_info_MOD.js b/actions/store_reaction_info_MOD.js
index 41638002..2bc8b882 100644
--- a/actions/store_reaction_info_MOD.js
+++ b/actions/store_reaction_info_MOD.js
@@ -66,7 +66,7 @@ module.exports = {
html() {
return `
-
diff --git a/actions/store_regex_matched_variable_MOD.js b/actions/store_regex_matched_variable_MOD.js
index 5991d0e7..63e97521 100644
--- a/actions/store_regex_matched_variable_MOD.js
+++ b/actions/store_regex_matched_variable_MOD.js
@@ -35,7 +35,7 @@ module.exports = {
-
diff --git a/actions/store_webhook_info_MOD.js b/actions/store_webhook_info_MOD.js
index 11c079f3..10ccc89f 100644
--- a/actions/store_webhook_info_MOD.js
+++ b/actions/store_webhook_info_MOD.js
@@ -51,7 +51,7 @@ module.exports = {
html() {
return `
-
diff --git a/actions/variable_pattern_MOD.js b/actions/variable_pattern_MOD.js
index ed0024cb..61160b19 100644
--- a/actions/variable_pattern_MOD.js
+++ b/actions/variable_pattern_MOD.js
@@ -24,7 +24,7 @@ module.exports = {
html() {
return `
-
From f8135a1e68f5606a4d437310b23206856af958d3 Mon Sep 17 00:00:00 2001
From: TheMonDon <11539895+TheMonDon@users.noreply.github.com>
Date: Sat, 10 Jun 2023 09:31:26 -0500
Subject: [PATCH 14/62] html fixes, check if member fix, music fix & new music
actions
---
actions/action_list_comment_MOD.js | 2 +-
actions/check_if_member_MOD.js | 12 ++--
actions/find_reaction_MOD.js | 2 +-
actions/send_message_to_console_MOD.js | 4 +-
actions/store_queue_info_MOD.js | 2 +-
actions/store_track_info_MOD.js | 94 ++++++++++++++++++++++++++
6 files changed, 104 insertions(+), 12 deletions(-)
create mode 100644 actions/store_track_info_MOD.js
diff --git a/actions/action_list_comment_MOD.js b/actions/action_list_comment_MOD.js
index c719dc78..57a39d8e 100644
--- a/actions/action_list_comment_MOD.js
+++ b/actions/action_list_comment_MOD.js
@@ -20,7 +20,7 @@ module.exports = {
Text Color
-
+
Comment To Show: (Supports some HTML Tags)
diff --git a/actions/check_if_member_MOD.js b/actions/check_if_member_MOD.js
index d29a7429..3a9291c1 100644
--- a/actions/check_if_member_MOD.js
+++ b/actions/check_if_member_MOD.js
@@ -35,7 +35,7 @@ module.exports = {
-
+
Check If Member
@@ -60,21 +60,19 @@ module.exports = {
-
`;
+
`;
},
init() {},
async action(cache) {
- let member;
const data = cache.actions[cache.index];
const info = parseInt(data.info, 10);
const { Files } = this.getDBM();
const { msg, interaction } = cache;
+ const member = await this.getMemberFromData(data.member, data.varName, cache);
- try {
- member = await this.getMemberFromData(data.member, data.varName, cache);
- } catch (_err) {
+ if (!member) {
console.error('You need to provide a member of some sort to the "Check If Member" action');
return this.executeResults(false, data?.branch ?? data, cache);
}
@@ -82,7 +80,7 @@ module.exports = {
let result = false;
switch (info) {
case 0:
- result = member.user?.bot || member.bot;
+ result = member.user?.bot;
break;
case 1:
result = member.bannable;
diff --git a/actions/find_reaction_MOD.js b/actions/find_reaction_MOD.js
index bd6ae3d7..b4cd93b0 100644
--- a/actions/find_reaction_MOD.js
+++ b/actions/find_reaction_MOD.js
@@ -27,7 +27,7 @@ module.exports = {
-
+
Source Emoji
diff --git a/actions/send_message_to_console_MOD.js b/actions/send_message_to_console_MOD.js
index 13836546..210730cc 100644
--- a/actions/send_message_to_console_MOD.js
+++ b/actions/send_message_to_console_MOD.js
@@ -21,8 +21,8 @@ module.exports = {
html() {
return `
- Color Text Color
+Track Info
+ Track Title
+ Track Thumbnail
+ Track URL
+ Track Author
+ Track Duration
+ Requested By
+
+
+
+
+`;
+ },
+
+ init() {},
+
+ async action(cache) {
+ const data = cache.actions[cache.index];
+ const info = parseInt(data.info, 10);
+
+ const type = parseInt(data.trackObject, 10);
+ const varName = this.evalMessage(data.varName, cache);
+ const track = this.getVariable(type, varName, cache);
+ if (!track) return this.callNextAction(cache);
+
+ let result;
+ switch (info) {
+ case 0:
+ result = track.title;
+ break;
+ case 1:
+ result = track.thumbnail;
+ break;
+ case 2:
+ result = track.url;
+ break;
+ case 3:
+ result = track.author;
+ break;
+ case 4:
+ result = track.duration;
+ break;
+ case 5:
+ result = track.requestedBy;
+ break;
+ }
+
+ if (result !== undefined) {
+ const storage = parseInt(data.storage, 10);
+ const varName = this.evalMessage(data.varName, cache);
+ this.storeValue(result, storage, varName, cache);
+ }
+ this.callNextAction(cache);
+ },
+
+ mod() {},
+};
From af9647f8b0d8eb223a725e075c4b5be35d6b7368 Mon Sep 17 00:00:00 2001
From: TheMonDon <11539895+TheMonDon@users.noreply.github.com>
Date: Sat, 10 Jun 2023 13:23:36 -0500
Subject: [PATCH 15/62] Force rgb-hex to use 3.0.0
---
actions/color_from_image_MOD.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/actions/color_from_image_MOD.js b/actions/color_from_image_MOD.js
index db70ef8d..99ba456a 100644
--- a/actions/color_from_image_MOD.js
+++ b/actions/color_from_image_MOD.js
@@ -47,7 +47,7 @@ module.exports = {
async action(cache) {
const Mods = this.getMods();
const { getColorFromURL } = Mods.require('color-thief-node');
- const rgbToHex = Mods.require('rgb-hex');
+ const rgbToHex = Mods.require('rgb-hex', '3.0.0');
const data = cache.actions[cache.index];
const info = parseInt(data.info, 10);
const url = this.evalMessage(data.find, cache);
From 0e2ea2e661e3974514e5a6c1d5641577070a2165 Mon Sep 17 00:00:00 2001
From: TheMonDon <11539895+TheMonDon@users.noreply.github.com>
Date: Sun, 11 Jun 2023 00:31:24 -0500
Subject: [PATCH 16/62] Music Updates/Fixes
---
actions/play_music_MOD.js | 16 +++++++++------
actions/store_queue_info_MOD.js | 36 +++++++++++++++++++++------------
actions/store_track_info_MOD.js | 8 ++++----
3 files changed, 37 insertions(+), 23 deletions(-)
diff --git a/actions/play_music_MOD.js b/actions/play_music_MOD.js
index bfb1b5d4..40fb60a6 100644
--- a/actions/play_music_MOD.js
+++ b/actions/play_music_MOD.js
@@ -57,6 +57,7 @@ module.exports = {
async action(cache) {
const data = cache.actions[cache.index];
const server = cache.server;
+ const { Actions } = this.getDBM();
const channel = cache.msg?.channel ?? cache.interaction?.channel;
const { Files } = this.getDBM();
const voiceChannel = await this.getVoiceChannelFromData(data.voiceChannel, data.varName2, cache);
@@ -81,13 +82,16 @@ module.exports = {
if (seconds > 0) seconds *= 1000;
try {
- const { track } = await player.play(voiceChannel, query, {
+ const searchResult = await player.search(query, { requestedBy: cache.getUser() });
+
+ if (!searchResult.hasTracks()) {
+ // If player didn't find any songs for this query
+ return Actions.callNextAction();
+ }
+
+ const { track } = await player.play(voiceChannel, searchResult, {
nodeOptions: {
- metadata: {
- channel,
- client: server.members.me,
- requestedBy: cache.getUser(),
- },
+ metadata: channel,
selfDeaf: (Files.data.settings.autoDeafen ?? 'true') === 'true',
volume,
leaveOnEmpty: data.leaveOnEmpty,
diff --git a/actions/store_queue_info_MOD.js b/actions/store_queue_info_MOD.js
index 12a6c89e..7e45fb4b 100644
--- a/actions/store_queue_info_MOD.js
+++ b/actions/store_queue_info_MOD.js
@@ -18,6 +18,7 @@ module.exports = {
'Is Playing?',
'Repeat Mode',
'Progress Bar',
+ 'REMOVED OPTION',
'Current Track',
'Queue Channel',
];
@@ -28,32 +29,39 @@ module.exports = {
if (parseInt(data.storage, 10) !== varType) return;
return [
data.varName,
- ['Tracks', 'Previous Tracks', 'Is Playing?', 'Repeat Mode', 'Progress Bar', 'Current Track', 'Queue Channel'][
- parseInt(data.info, 10)
- ] || 'Queue Info',
+ [
+ 'Tracks',
+ 'Previous Tracks',
+ 'Is Playing?',
+ 'Repeat Mode',
+ 'Progress Bar',
+ 'REMOVED OPTION',
+ 'Current Track',
+ 'Queue Channel',
+ ][parseInt(data.info, 10)] || 'Queue Info',
];
},
html(isEvent) {
return `
${
- isEvent &&
- '
-Queue Info Queue Info
Tracks
Previous Tracks
Is Playing?
Repeat Mode
Progress Bar
- Current Track
- Queue Channel
+ Current Track
+ Queue Channel
-
@@ -98,11 +106,13 @@ module.exports = {
case 4:
result = queue.node.createProgressBar({ timecodes: true });
break;
- case 5:
+ case 6:
result = queue.currentTrack;
break;
- case 6:
- result = queue.metadata.channel;
+ case 7:
+ result = queue.metadata;
+ break;
+ default:
break;
}
diff --git a/actions/store_track_info_MOD.js b/actions/store_track_info_MOD.js
index a7ee7280..8cac24ef 100644
--- a/actions/store_track_info_MOD.js
+++ b/actions/store_track_info_MOD.js
@@ -1,5 +1,5 @@
module.exports = {
- name: 'Store Queue Info',
+ name: 'Store Track Info',
section: 'Audio Control',
meta: {
version: '2.2.0',
@@ -19,7 +19,7 @@ module.exports = {
variableStorage(data, varType) {
if (parseInt(data.storage, 10) !== varType) return;
return [
- data.varName,
+ data.varName1,
['Track Title', 'Track Thumbnail', 'Track URL', 'Track Author', 'Track Duration', 'Requested By'][
parseInt(data.info, 10)
] || 'Track Info',
@@ -84,8 +84,8 @@ module.exports = {
if (result !== undefined) {
const storage = parseInt(data.storage, 10);
- const varName = this.evalMessage(data.varName, cache);
- this.storeValue(result, storage, varName, cache);
+ const varName1 = this.evalMessage(data.varName1, cache);
+ this.storeValue(result, storage, varName1, cache);
}
this.callNextAction(cache);
},
From a3b93937e7f43d7fc352da07be50b432f71d2b1e Mon Sep 17 00:00:00 2001
From: TheMonDon <11539895+TheMonDon@users.noreply.github.com>
Date: Mon, 12 Jun 2023 16:33:57 -0500
Subject: [PATCH 17/62] Music Action Updates
---
actions/control_music_MOD.js | 25 +++++++++++++++++++------
actions/store_queue_info_MOD.js | 6 ++++++
2 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/actions/control_music_MOD.js b/actions/control_music_MOD.js
index e1163f5c..a7ed07ec 100644
--- a/actions/control_music_MOD.js
+++ b/actions/control_music_MOD.js
@@ -8,7 +8,7 @@ module.exports = {
authorUrl: 'https://github.com/dbm-network/mods',
downloadURL: 'https://github.com/dbm-network/mods/blob/master/actions/control_music_MOD.js',
},
- fields: ['action', 'volume'],
+ fields: ['action', 'volume', 'skip'],
subtitle(data) {
const actions = [
@@ -43,27 +43,38 @@ module.exports = {
Volume Level
`;
+
+
+ Skip Amount
+
+`;
},
init() {
const { glob, document } = this;
const volume = document.getElementById('volumeDiv');
+ const skip = document.getElementById('skipDiv');
glob.onChange = function onChange(event) {
switch (parseInt(event.value, 10)) {
+ case 3:
+ skip.style.display = null;
+ volume.style.display = 'none';
+ break;
case 0:
case 1:
case 2:
- case 3:
case 4:
case 5:
case 6:
volume.style.display = 'none';
+ skip.style.display = 'none';
break;
case 7:
volume.style.display = null;
+ skip.style.display = 'none';
break;
default:
break;
@@ -83,7 +94,7 @@ module.exports = {
if (!server) return this.callNextAction(cache);
const queue = useQueue(server.id);
- if (!queue) this.callNextAction(cache);
+ if (!queue) return this.callNextAction(cache);
if (volume && isNaN(volume)) {
console.log('Invalid volume number in Control Music');
@@ -101,9 +112,11 @@ module.exports = {
case 2:
queue.node.resume();
break;
- case 3:
- queue.node.skip();
+ case 3: {
+ const amount = parseInt(this.evalMessage(data.skip, cache), 10) ?? 1;
+ amount === 1 ? queue.node.skip() : queue.node.skipTo(amount);
break;
+ }
case 4:
queue.history.back();
break;
diff --git a/actions/store_queue_info_MOD.js b/actions/store_queue_info_MOD.js
index 7e45fb4b..0c5c7f2e 100644
--- a/actions/store_queue_info_MOD.js
+++ b/actions/store_queue_info_MOD.js
@@ -21,6 +21,7 @@ module.exports = {
'REMOVED OPTION',
'Current Track',
'Queue Channel',
+ 'Queue Object',
];
return `${names[parseInt(info, 10)]}`;
},
@@ -38,6 +39,7 @@ module.exports = {
'REMOVED OPTION',
'Current Track',
'Queue Channel',
+ 'Queue Object',
][parseInt(data.info, 10)] || 'Queue Info',
];
},
@@ -60,6 +62,7 @@ module.exports = {
Progress Bar
Current Track
Queue Channel
+ Queue Object
@@ -112,6 +115,9 @@ module.exports = {
case 7:
result = queue.metadata;
break;
+ case 8:
+ result = queue;
+ break;
default:
break;
}
From 7223e0b285346f01306e7be2b1b7e801236a3b0f Mon Sep 17 00:00:00 2001
From: TheMonDon <11539895+TheMonDon@users.noreply.github.com>
Date: Mon, 12 Jun 2023 16:44:08 -0500
Subject: [PATCH 18/62] Remove forum channel mod: new default action
---
actions/create_forum_channel_MOD.js | 86 -----------------------------
1 file changed, 86 deletions(-)
delete mode 100644 actions/create_forum_channel_MOD.js
diff --git a/actions/create_forum_channel_MOD.js b/actions/create_forum_channel_MOD.js
deleted file mode 100644
index 6afe7c06..00000000
--- a/actions/create_forum_channel_MOD.js
+++ /dev/null
@@ -1,86 +0,0 @@
-module.exports = {
- name: 'Create Forum Channel',
- section: 'Channel Control',
- meta: {
- version: '2.1.7',
- preciseCheck: false,
- author: 'DBM Mods',
- authorUrl: 'https://github.com/dbm-network/mods',
- downloadURL: 'https://github.com/dbm-network/mods/blob/master/actions/create_forum_channel_MOD.js',
- },
- subtitle(data) {
- return `${data.channelName}`;
- },
- variableStorage(data, varType) {
- const type = parseInt(data.storage, 10);
- if (type !== varType) return;
- return [data.varName, 'Channel'];
- },
- fields: ['channelName', 'topic', 'position', 'storage', 'varName', 'categoryID', 'slowmodepost', 'reason'],
- html() {
- return `
-
-
- Name
-
-
- Guidelines
-
-
-
-
-
- Slowmode
-
- Reason
-
-
-
-
-`;
- },
- init() {},
- async action(cache) {
- const data = cache.actions[cache.index];
- const { server } = cache;
- const name = this.evalMessage(data.channelName, cache);
- const channelData = { reason: this.evalMessage(data.reason, cache) };
- if (data.topic) {
- channelData.topic = this.evalMessage(data.topic, cache);
- }
- if (data.position) {
- channelData.position = parseInt(this.evalMessage(data.position, cache), 10);
- }
- if (data.categoryID) {
- channelData.parent = this.evalMessage(data.categoryID, cache);
- }
- if (data.slowmodepost) {
- channelData.rateLimitPerUser = parseInt(this.evalMessage(data.slowmodepost, cache), 10);
- }
- channelData.type = 15;
- server.channels
- .create(name, channelData)
- .then((channel) => {
- const storage = parseInt(data.storage, 10);
- const varName = this.evalMessage(data.varName, cache);
- this.storeValue(channel, storage, varName, cache);
- this.executeResults(true, data?.branch ?? data, cache);
- })
- .catch((err) => this.displayError(data, cache, err));
- },
- mod() {},
-};
From db77a7d10d53de61ce0f3c1149ab7343d09718e5 Mon Sep 17 00:00:00 2001
From: TheMonDon <11539895+TheMonDon@users.noreply.github.com>
Date: Mon, 12 Jun 2023 17:48:19 -0500
Subject: [PATCH 19/62] Minor code changes
---
actions/delete_webhook_MOD.js | 2 +-
actions/generate_random_emoji_MOD.js | 2 +-
actions/generate_random_word_MOD.js | 6 +++---
actions/get_lyrics_MOD.js | 9 +--------
actions/google_search_MOD.js | 4 +---
5 files changed, 7 insertions(+), 16 deletions(-)
diff --git a/actions/delete_webhook_MOD.js b/actions/delete_webhook_MOD.js
index b90342bc..86645f95 100644
--- a/actions/delete_webhook_MOD.js
+++ b/actions/delete_webhook_MOD.js
@@ -17,7 +17,7 @@ module.exports = {
fields: ['webhook', 'varName'],
html() {
- return `
`;
+ return `
`;
},
init() {},
diff --git a/actions/generate_random_emoji_MOD.js b/actions/generate_random_emoji_MOD.js
index befcd558..3609b375 100644
--- a/actions/generate_random_emoji_MOD.js
+++ b/actions/generate_random_emoji_MOD.js
@@ -34,7 +34,7 @@ module.exports = {
const storage = parseInt(data.storage, 10);
const varName = this.evalMessage(data.varName, cache);
const Mods = this.getMods();
- const emoji = Mods.require('node-emoji');
+ const emoji = Mods.require('node-emoji', '1.11.0'); // Last version that isn't ESM only.
const res = emoji.random();
this.storeValue(res.emoji, storage, varName, cache);
diff --git a/actions/generate_random_word_MOD.js b/actions/generate_random_word_MOD.js
index aba3184b..de418059 100644
--- a/actions/generate_random_word_MOD.js
+++ b/actions/generate_random_word_MOD.js
@@ -53,7 +53,7 @@ module.exports = {
const data = cache.actions[cache.index];
const type = parseInt(data.storage, 10);
const varName = this.evalMessage(data.varName, cache);
- const wps = parseInt(this.evalMessage(data.wps, cache), 10);
+ const wordsPerString = parseInt(this.evalMessage(data.wps, cache), 10);
const min = parseInt(this.evalMessage(data.min, cache), 10);
const max = parseInt(this.evalMessage(data.max, cache), 10) + 1;
@@ -63,12 +63,12 @@ module.exports = {
} else if (isNaN(max)) {
console.log(`Error with Generate Random Word(s), Action #${cache.index}: max is not a number`);
return this.callNextAction(cache);
- } else if (isNaN(wps)) {
+ } else if (isNaN(wordsPerString)) {
console.log(`Error with Generate Random Word(s), Action #${cache.index}: Words Per Sentence is not a number`);
return this.callNextAction(cache);
}
- const words = randomWords({ min, max, wordsPerString: wps });
+ const words = randomWords({ min, max, wordsPerString });
this.storeValue(words, type, varName, cache);
this.callNextAction(cache);
},
diff --git a/actions/get_lyrics_MOD.js b/actions/get_lyrics_MOD.js
index d3227eba..a8b059a7 100644
--- a/actions/get_lyrics_MOD.js
+++ b/actions/get_lyrics_MOD.js
@@ -19,11 +19,7 @@ module.exports = {
let dataType = 'Unknown Type';
switch (parseInt(data.info, 10)) {
case 0:
- dataType = 'String';
- break;
case 1:
- dataType = 'String';
- break;
case 2:
dataType = 'String';
break;
@@ -105,10 +101,7 @@ module.exports = {
`;
},
- init() {
- const { glob, document } = this;
- glob.variableChange(document.getElementById('storage'), 'varNameContainer');
- },
+ init() {},
async action(cache) {
const { Actions } = this.getDBM();
diff --git a/actions/google_search_MOD.js b/actions/google_search_MOD.js
index b16824bf..b0b3397d 100644
--- a/actions/google_search_MOD.js
+++ b/actions/google_search_MOD.js
@@ -102,10 +102,8 @@ module.exports = {
const storage = parseInt(data.storage, 10);
const varName2 = this.evalMessage(data.varName, cache);
this.storeValue(result, storage, varName2, cache);
- this.callNextAction(cache);
- } else {
- this.callNextAction(cache);
}
+ this.callNextAction(cache);
})
.catch((e) => {
console.log(`An error in Google Search MOD: ${e}`);
From dd382496bc6bc8316720521d7d2c82fe5e4ac422 Mon Sep 17 00:00:00 2001
From: TheMonDon <11539895+TheMonDon@users.noreply.github.com>
Date: Mon, 12 Jun 2023 18:21:47 -0500
Subject: [PATCH 20/62] Mod Section Changes
---
actions/base_convert_MOD.js | 2 +-
actions/control_music_MOD.js | 2 +-
actions/convert_seconds_to_days_MOD.js | 2 +-
actions/convert_timestamp_to_date_MOD.js | 2 +-
actions/convert_to_base64_MOD.js | 2 +-
actions/convert_to_morse_code_MOD.js | 2 +-
actions/convert_to_world_time_MOD.js | 2 +-
actions/play_music_MOD.js | 2 +-
actions/set_music_repeat_mode_MOD.js | 2 +-
actions/store_queue_info_MOD.js | 2 +-
actions/store_track_info_MOD.js | 2 +-
11 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/actions/base_convert_MOD.js b/actions/base_convert_MOD.js
index b6f38c6b..546acdb1 100644
--- a/actions/base_convert_MOD.js
+++ b/actions/base_convert_MOD.js
@@ -1,7 +1,7 @@
module.exports = {
name: 'Base Convert MOD',
displayName: 'Base Convert',
- section: 'Other Stuff',
+ section: 'Conversions',
meta: {
version: '2.2.0',
preciseCheck: false,
diff --git a/actions/control_music_MOD.js b/actions/control_music_MOD.js
index a7ed07ec..73dbcb6c 100644
--- a/actions/control_music_MOD.js
+++ b/actions/control_music_MOD.js
@@ -1,6 +1,6 @@
module.exports = {
name: 'Control Music',
- section: 'Audio Control',
+ section: 'Music Control',
meta: {
version: '2.2.0',
preciseCheck: false,
diff --git a/actions/convert_seconds_to_days_MOD.js b/actions/convert_seconds_to_days_MOD.js
index 66577bca..7f6b4514 100644
--- a/actions/convert_seconds_to_days_MOD.js
+++ b/actions/convert_seconds_to_days_MOD.js
@@ -1,6 +1,6 @@
module.exports = {
name: 'Convert Seconds To D/H/M/S',
- section: 'Other Stuff',
+ section: 'Conversions',
meta: {
version: '2.2.0',
preciseCheck: false,
diff --git a/actions/convert_timestamp_to_date_MOD.js b/actions/convert_timestamp_to_date_MOD.js
index e1c7174a..05d1dc9b 100644
--- a/actions/convert_timestamp_to_date_MOD.js
+++ b/actions/convert_timestamp_to_date_MOD.js
@@ -1,6 +1,6 @@
module.exports = {
name: 'Convert Timestamp to Date',
- section: 'Other Stuff',
+ section: 'Conversions',
meta: {
version: '2.2.0',
preciseCheck: false,
diff --git a/actions/convert_to_base64_MOD.js b/actions/convert_to_base64_MOD.js
index 32eb9069..36eb4883 100644
--- a/actions/convert_to_base64_MOD.js
+++ b/actions/convert_to_base64_MOD.js
@@ -1,6 +1,6 @@
module.exports = {
name: 'Convert to Base64',
- section: 'Other Stuff',
+ section: 'Conversions',
meta: {
version: '2.2.0',
preciseCheck: false,
diff --git a/actions/convert_to_morse_code_MOD.js b/actions/convert_to_morse_code_MOD.js
index 20133636..18059bcf 100644
--- a/actions/convert_to_morse_code_MOD.js
+++ b/actions/convert_to_morse_code_MOD.js
@@ -1,6 +1,6 @@
module.exports = {
name: 'Morse Code',
- section: 'Other Stuff',
+ section: 'Conversions',
meta: {
version: '2.2.0',
preciseCheck: false,
diff --git a/actions/convert_to_world_time_MOD.js b/actions/convert_to_world_time_MOD.js
index 486fa416..c57aa2b6 100644
--- a/actions/convert_to_world_time_MOD.js
+++ b/actions/convert_to_world_time_MOD.js
@@ -1,6 +1,6 @@
module.exports = {
name: 'Convert To World Time',
- section: 'Other Stuff',
+ section: 'Conversions',
meta: {
version: '2.2.0',
preciseCheck: false,
diff --git a/actions/play_music_MOD.js b/actions/play_music_MOD.js
index 40fb60a6..6e61b887 100644
--- a/actions/play_music_MOD.js
+++ b/actions/play_music_MOD.js
@@ -1,6 +1,6 @@
module.exports = {
name: 'Play Music',
- section: 'Audio Control',
+ section: 'Music Control',
meta: {
version: '2.2.0',
preciseCheck: false,
diff --git a/actions/set_music_repeat_mode_MOD.js b/actions/set_music_repeat_mode_MOD.js
index c4a67e32..1fda12b0 100644
--- a/actions/set_music_repeat_mode_MOD.js
+++ b/actions/set_music_repeat_mode_MOD.js
@@ -1,6 +1,6 @@
module.exports = {
name: 'Set Music Repeat Mode',
- section: 'Audio Control',
+ section: 'Music Control',
meta: {
version: '2.2.0',
preciseCheck: false,
diff --git a/actions/store_queue_info_MOD.js b/actions/store_queue_info_MOD.js
index 0c5c7f2e..129e8a7d 100644
--- a/actions/store_queue_info_MOD.js
+++ b/actions/store_queue_info_MOD.js
@@ -1,6 +1,6 @@
module.exports = {
name: 'Store Queue Info',
- section: 'Audio Control',
+ section: 'Music Control',
meta: {
version: '2.2.0',
preciseCheck: false,
diff --git a/actions/store_track_info_MOD.js b/actions/store_track_info_MOD.js
index 8cac24ef..2832e036 100644
--- a/actions/store_track_info_MOD.js
+++ b/actions/store_track_info_MOD.js
@@ -1,6 +1,6 @@
module.exports = {
name: 'Store Track Info',
- section: 'Audio Control',
+ section: 'Music Control',
meta: {
version: '2.2.0',
preciseCheck: false,
From 2a3fae9be5bdaa58da173dda38a7543de0ab3bfb Mon Sep 17 00:00:00 2001
From: TheMonDon <11539895+TheMonDon@users.noreply.github.com>
Date: Mon, 12 Jun 2023 18:32:57 -0500
Subject: [PATCH 21/62] Section changes & minor code changes
---
actions/botsfordiscord_stats_MOD.js | 6 ++++--
actions/get_command_description_MOD.js | 2 +-
actions/get_stats_from_dbl_MOD.js | 2 +-
actions/get_stats_from_dbxyz_MOD.js | 2 +-
actions/send_stats_to_botlist.me_MOD.js | 2 +-
actions/send_stats_to_dbl_MOD.js | 2 +-
actions/store_command_info_MOD.js | 2 +-
7 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/actions/botsfordiscord_stats_MOD.js b/actions/botsfordiscord_stats_MOD.js
index 0520d5d9..cc86b675 100644
--- a/actions/botsfordiscord_stats_MOD.js
+++ b/actions/botsfordiscord_stats_MOD.js
@@ -1,6 +1,6 @@
module.exports = {
name: 'Send Stats to BFD',
- section: 'Other Stuff',
+ section: 'Bot Stats',
meta: {
version: '2.2.0',
preciseCheck: false,
@@ -41,7 +41,9 @@ module.exports = {
const Mods = this.getMods();
const BFD = Mods.require('bfd-api');
const bfd = new BFD(token);
- bfd.postCount(this.getDBM().Bot.bot.guilds.cache.size, this.getDBM().Bot.bot.user.id);
+
+ const client = this.getDBM().Bot.bot;
+ bfd.postCount(client.guilds.cache.size, client.user.id);
this.callNextAction(cache);
},
diff --git a/actions/get_command_description_MOD.js b/actions/get_command_description_MOD.js
index c4d9a679..94b26cd8 100644
--- a/actions/get_command_description_MOD.js
+++ b/actions/get_command_description_MOD.js
@@ -1,7 +1,7 @@
module.exports = {
name: 'Get Command Description',
displayName: 'Get Command Description',
- section: 'Other Stuff',
+ section: 'Command Control',
fields: ['findBy', 'commandData', 'saveTo', 'varName'],
meta: {
version: '2.2.0',
diff --git a/actions/get_stats_from_dbl_MOD.js b/actions/get_stats_from_dbl_MOD.js
index ecf9874d..4c399683 100644
--- a/actions/get_stats_from_dbl_MOD.js
+++ b/actions/get_stats_from_dbl_MOD.js
@@ -1,7 +1,7 @@
module.exports = {
name: 'Get Bot Stats From DBL',
displayName: 'Get Bot Stats From TopGG',
- section: 'Other Stuff',
+ section: 'Bot Stats',
meta: {
version: '2.2.0',
preciseCheck: false,
diff --git a/actions/get_stats_from_dbxyz_MOD.js b/actions/get_stats_from_dbxyz_MOD.js
index 7a0257a0..905bc1b7 100644
--- a/actions/get_stats_from_dbxyz_MOD.js
+++ b/actions/get_stats_from_dbxyz_MOD.js
@@ -1,7 +1,7 @@
module.exports = {
name: 'Get Bot Stats From DBXYZ',
displayName: 'Get Bot Stats From Discord Boats',
- section: 'Other Stuff',
+ section: 'Bot Stats',
meta: {
version: '2.2.0',
preciseCheck: false,
diff --git a/actions/send_stats_to_botlist.me_MOD.js b/actions/send_stats_to_botlist.me_MOD.js
index cb98bf97..870ca5b3 100644
--- a/actions/send_stats_to_botlist.me_MOD.js
+++ b/actions/send_stats_to_botlist.me_MOD.js
@@ -1,7 +1,7 @@
module.exports = {
name: 'Sends Stats to Botlist.me',
displayname: 'Send Stats to Botlist.me',
- section: 'Other Stuff',
+ section: 'Bot Stats',
meta: {
version: '2.2.0',
preciseCheck: false,
diff --git a/actions/send_stats_to_dbl_MOD.js b/actions/send_stats_to_dbl_MOD.js
index cb9a907e..0ed8fecb 100644
--- a/actions/send_stats_to_dbl_MOD.js
+++ b/actions/send_stats_to_dbl_MOD.js
@@ -1,7 +1,7 @@
module.exports = {
name: 'Sends Stats to DBL',
displayName: 'Send Stats to TopGG',
- section: 'Other Stuff',
+ section: 'Bot Stats',
meta: {
version: '2.2.0',
preciseCheck: false,
diff --git a/actions/store_command_info_MOD.js b/actions/store_command_info_MOD.js
index fdae1343..de3a9b84 100644
--- a/actions/store_command_info_MOD.js
+++ b/actions/store_command_info_MOD.js
@@ -1,6 +1,6 @@
module.exports = {
name: 'Store Command Info',
- section: 'Bot Client Control',
+ section: 'Command Control',
meta: {
version: '2.2.0',
preciseCheck: false,
From 0ab73b848e862d6c316f9c1865d1c6410d5d7d14 Mon Sep 17 00:00:00 2001
From: TheMonDon <11539895+TheMonDon@users.noreply.github.com>
Date: Tue, 13 Jun 2023 08:22:05 -0500
Subject: [PATCH 22/62] Action HTML Fixes
---
actions/canvas_draw_text_MOD.js | 8 +-
actions/canvas_save_image_MOD.js | 9 +--
actions/check_if_message_MOD.js | 4 +-
actions/check_role_permissions_MOD.js | 96 ++++++------------------
actions/control_permissons_MOD.js | 2 +-
actions/control_server_prefix_MOD.js | 14 ++--
actions/set_slowmode_MOD.js | 18 ++---
actions/store_channel_permissions_MOD.js | 28 ++++++-
8 files changed, 70 insertions(+), 109 deletions(-)
diff --git a/actions/canvas_draw_text_MOD.js b/actions/canvas_draw_text_MOD.js
index 75f623c5..e82592ad 100644
--- a/actions/canvas_draw_text_MOD.js
+++ b/actions/canvas_draw_text_MOD.js
@@ -17,7 +17,7 @@ module.exports = {
html() {
return `
-
+
@@ -56,11 +56,7 @@ module.exports = {
`;
},
- init() {
- const { glob, document } = this;
-
- glob.refreshVariableList(document.getElementById('storage'));
- },
+ init() {},
async action(cache) {
const Canvas = require('canvas');
diff --git a/actions/canvas_save_image_MOD.js b/actions/canvas_save_image_MOD.js
index 0a5fe58b..02ab41e3 100644
--- a/actions/canvas_save_image_MOD.js
+++ b/actions/canvas_save_image_MOD.js
@@ -33,15 +33,11 @@ module.exports = {
-
+
`;
},
- init() {
- const { document, glob } = this;
-
- glob.refreshVariableList(document.getElementById('storage'));
- },
+ init() {},
async action(cache) {
const data = cache.actions[cache.index];
@@ -59,6 +55,7 @@ module.exports = {
ctx.drawImage(image, 0, 0, image.width, image.height);
const buffer = canvas.toBuffer();
const Path = this.evalMessage(data.Path, cache);
+
if (Path) {
fs.writeFileSync(Path, buffer);
const varName2 = this.evalMessage(data.varName2, cache);
diff --git a/actions/check_if_message_MOD.js b/actions/check_if_message_MOD.js
index 2a115c99..c50c6090 100644
--- a/actions/check_if_message_MOD.js
+++ b/actions/check_if_message_MOD.js
@@ -19,8 +19,8 @@ module.exports = {
return `
+
-
Check If Message
@@ -28,7 +28,7 @@ module.exports = {
Is Pinned?
Is Deletable?
Is TTS?
- Is Of Discord?
+ Is From Discord?
Includes @everyone Mention?
diff --git a/actions/check_role_permissions_MOD.js b/actions/check_role_permissions_MOD.js
index cf78e5d4..a65ee48e 100644
--- a/actions/check_role_permissions_MOD.js
+++ b/actions/check_role_permissions_MOD.js
@@ -17,82 +17,23 @@ module.exports = {
html(isEvent, data) {
return `
-
-
-
-
- Permission
-
- ${data.permissions[2]}
-
-
-
- ${data.conditions[0]}
-
`;
+
+
+
+
+ Permission
+
+ ${data.permissions[2]}
+
+
+
+ ${data.conditions[0]}
+
+
+
-
Control Type
- Set Prefix
- Delete Prefix
+ Set Prefix
+ Set Prefix to Default
-
+
Prefix
`;
@@ -39,10 +39,14 @@ module.exports = {
init() {
const { glob, document } = this;
+ const prefixContainer = document.getElementById('prefixContainer');
- glob.serverChange(document.getElementById('server'), 'varNameContainer');
glob.onChangeControl = function onChangeControl(controlType) {
- document.getElementById('prefixContainer').style.display = [null, 'none'][parseInt(controlType.value, 10)];
+ if (controlType.value === '0') {
+ prefixContainer.style.display = null;
+ } else {
+ prefixContainer.style.display = 'none';
+ }
};
glob.onChangeControl(document.getElementById('controlType'));
diff --git a/actions/set_slowmode_MOD.js b/actions/set_slowmode_MOD.js
index 318d7924..3d1e6f88 100644
--- a/actions/set_slowmode_MOD.js
+++ b/actions/set_slowmode_MOD.js
@@ -28,18 +28,14 @@ module.exports = {
-
-
- Amount Reason
+
+
+ Amount
-
`;
},
diff --git a/actions/store_channel_permissions_MOD.js b/actions/store_channel_permissions_MOD.js
index e709febd..04b93a0b 100644
--- a/actions/store_channel_permissions_MOD.js
+++ b/actions/store_channel_permissions_MOD.js
@@ -29,7 +29,7 @@ module.exports = {
Target Type
+
Role
Member
@@ -37,7 +37,7 @@ module.exports = {
-
+
@@ -51,7 +51,29 @@ module.exports = {
`;
},
- init() {},
+ init() {
+ const { glob, document } = this;
+
+ const roleHolder = document.getElementById('roleHolder');
+ const memberHolder = document.getElementById('memberHolder');
+
+ glob.onChange = function onChange(event) {
+ switch (parseInt(event.value, 10)) {
+ case 0:
+ roleHolder.style.display = null;
+ memberHolder.style.display = 'none';
+ break;
+ case 1:
+ roleHolder.style.display = 'none';
+ memberHolder.style.display = null;
+ break;
+ default:
+ break;
+ }
+ };
+
+ glob.onChange(document.getElementById('target'));
+ },
async action(cache) {
const data = cache.actions[cache.index];
From c5412db9d71e2ae8104eeac5716bffdaaf4b497f Mon Sep 17 00:00:00 2001
From: TheMonDon <11539895+TheMonDon@users.noreply.github.com>
Date: Tue, 13 Jun 2023 19:33:00 -0500
Subject: [PATCH 23/62] More HTML changes
---
actions/canvas_crop_image_MOD.js | 3 +--
actions/store_file_info_MOD.js | 1 +
actions/store_json_from_webapi_MOD.js | 14 ++++++++------
actions/transcript_MOD.js | 4 ++--
actions/urban_dictionary_MOD.js | 2 +-
5 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/actions/canvas_crop_image_MOD.js b/actions/canvas_crop_image_MOD.js
index 00124c95..675af076 100644
--- a/actions/canvas_crop_image_MOD.js
+++ b/actions/canvas_crop_image_MOD.js
@@ -18,7 +18,7 @@ module.exports = {
html() {
return `
-
+
@@ -93,7 +93,6 @@ module.exports = {
}
};
- glob.refreshVariableList(document.getElementById('storage'));
glob.onChange0(document.getElementById('align'));
},
diff --git a/actions/store_file_info_MOD.js b/actions/store_file_info_MOD.js
index 91b39bcd..a98fd1f6 100644
--- a/actions/store_file_info_MOD.js
+++ b/actions/store_file_info_MOD.js
@@ -118,6 +118,7 @@ module.exports = {
.split(/\r\n|\r|\n/).length;
break;
}
+
this.storeValue(result, storage, varName, cache);
this.callNextAction(cache);
},
diff --git a/actions/store_json_from_webapi_MOD.js b/actions/store_json_from_webapi_MOD.js
index 33ea7ddc..8a2b9b2b 100644
--- a/actions/store_json_from_webapi_MOD.js
+++ b/actions/store_json_from_webapi_MOD.js
@@ -65,17 +65,19 @@ module.exports = {
-
+
-
-
+
+
Re-Use Previously Stored
Allow
@@ -83,7 +85,7 @@ module.exports = {
Toggles re-use of previously stored JSON from same URL.
-
+
Debug Mode
Enabled
diff --git a/actions/transcript_MOD.js b/actions/transcript_MOD.js
index 6d483a26..dee8284f 100644
--- a/actions/transcript_MOD.js
+++ b/actions/transcript_MOD.js
@@ -115,11 +115,11 @@ module.exports = {
const discordTranscripts = require('discord-html-transcripts', '2.6.1'); // Version 2.6.1 needed for discord.js v13.
const dtVersion = require('../package.json').dependencies['discord-html-transcripts']; // Get Version
- if (dtVersion === '2.6.1') {
+ if (dtVersion !== '2.6.1') {
console.log(`Current Version ${dtVersion}`);
console.log('Needed Version 2.6.1');
console.log('Use `npm i discord-html-transcripts@2.6.1` to install the right version');
- this.callNextAction(cache);
+ return this.callNextAction(cache);
}
try {
diff --git a/actions/urban_dictionary_MOD.js b/actions/urban_dictionary_MOD.js
index 230fdcc2..5293a78d 100644
--- a/actions/urban_dictionary_MOD.js
+++ b/actions/urban_dictionary_MOD.js
@@ -89,7 +89,7 @@ module.exports = {
const info = parseInt(data.info, 10);
const string = this.evalMessage(data.string, cache);
- if (!string) return console.log('Please write something to search on Urban Dictionary.');
+ if (!string) return this.callNextAction(cache);
const { Actions } = this.getDBM();
const Mods = this.getMods();
From ab6e9bbfe9cb7eb977aa6b7cca8c02ab1301045b Mon Sep 17 00:00:00 2001
From: TheMonDon <11539895+TheMonDon@users.noreply.github.com>
Date: Tue, 13 Jun 2023 19:33:11 -0500
Subject: [PATCH 24/62] Remove basic math operation
---
actions/basic_math_operation_MOD.js | 85 -----------------------------
1 file changed, 85 deletions(-)
delete mode 100644 actions/basic_math_operation_MOD.js
diff --git a/actions/basic_math_operation_MOD.js b/actions/basic_math_operation_MOD.js
deleted file mode 100644
index 81f421bd..00000000
--- a/actions/basic_math_operation_MOD.js
+++ /dev/null
@@ -1,85 +0,0 @@
-module.exports = {
- name: 'Basic Math Operation',
- section: 'Other Stuff',
- meta: {
- version: '2.2.0',
- preciseCheck: false,
- author: 'DBM Mods',
- authorUrl: 'https://github.com/dbm-network/mods',
- downloadURL: 'https://github.com/dbm-network/mods/blob/master/actions/basic_math_operation_MOD.js',
- },
-
- subtitle(data) {
- const info = ['Addition', 'Subtraction', 'Multiplication', 'Division'];
- return `${info[data.info]}`;
- },
-
- variableStorage(data, varType) {
- if (parseInt(data.storage, 10) !== varType) return;
- return [data.varName, 'Number'];
- },
-
- fields: ['FirstNumber', 'info', 'SecondNumber', 'storage', 'varName'],
-
- html() {
- return `
-
- First Number
-
- Math Operation
-
- Addition
- Subtraction
- Multiplication
- Division
-
-
- Second Number
-
- `;
},
- init() {
- const { glob, document } = this;
-
- glob.refreshVariableList(document.getElementById('storage'));
- },
+ init() {},
async action(cache) {
const Canvas = require('canvas');
diff --git a/actions/canvas_edit_image_border_MOD.js b/actions/canvas_edit_image_border_MOD.js
index c0e152d2..4c8a0cab 100644
--- a/actions/canvas_edit_image_border_MOD.js
+++ b/actions/canvas_edit_image_border_MOD.js
@@ -18,7 +18,7 @@ module.exports = {
html() {
return `
-
+
@@ -36,11 +36,7 @@ module.exports = {
`;
},
- init() {
- const { glob, document } = this;
-
- glob.refreshVariableList(document.getElementById('storage'));
- },
+ init() {},
async action(cache) {
const Canvas = require('canvas');
diff --git a/actions/canvas_generate_progress_bar_MOD.js b/actions/canvas_generate_progress_bar_MOD.js
index 777a316c..6d75f03d 100644
--- a/actions/canvas_generate_progress_bar_MOD.js
+++ b/actions/canvas_generate_progress_bar_MOD.js
@@ -33,7 +33,9 @@ module.exports = {
Circle
-
+
+
+
Width
@@ -43,7 +45,9 @@ module.exports = {
Height
-
+
+
+
Line Width
@@ -56,7 +60,9 @@ module.exports = {
Round
-
+
+
+
+
+
+
`;
diff --git a/actions/canvas_image_filter_MOD.js b/actions/canvas_image_filter_MOD.js
index 1417797a..6d7e28b8 100644
--- a/actions/canvas_image_filter_MOD.js
+++ b/actions/canvas_image_filter_MOD.js
@@ -31,7 +31,7 @@ module.exports = {
html() {
return `
-
+
@@ -58,8 +58,6 @@ module.exports = {
init() {
const { glob, document } = this;
- glob.refreshVariableList(document.getElementById('storage'));
-
glob.onChange1 = function onChange1(event) {
const value = parseInt(event.value, 10);
const valuetext = document.getElementById('valuetext');
diff --git a/actions/canvas_send_image_MOD.js b/actions/canvas_send_image_MOD.js
index dd3316f3..205e1eac 100644
--- a/actions/canvas_send_image_MOD.js
+++ b/actions/canvas_send_image_MOD.js
@@ -73,11 +73,7 @@ module.exports = {
`;
},
- init() {
- const { glob, document } = this;
-
- glob.sendTargetChange(document.getElementById('channel'), 'varNameContainer2');
- },
+ init() {},
async action(cache) {
const { DiscordJS } = this.getDBM();
diff --git a/actions/cleverbot_MOD.js b/actions/cleverbot_MOD.js
index cd8dec89..24b57dc6 100644
--- a/actions/cleverbot_MOD.js
+++ b/actions/cleverbot_MOD.js
@@ -73,12 +73,7 @@ module.exports = {
`;
},
- init() {
- const { glob, document } = this;
-
- glob.variableChange(document.getElementById('inputVarType'), 'varNameContainer');
- glob.variableChange(document.getElementById('storage'), 'varNameContainer2');
- },
+ init() {},
async action(cache) {
const { Actions } = this.getDBM();
diff --git a/actions/convert_seconds_to_days_MOD.js b/actions/convert_seconds_to_days_MOD.js
index 7f6b4514..af70dadd 100644
--- a/actions/convert_seconds_to_days_MOD.js
+++ b/actions/convert_seconds_to_days_MOD.js
@@ -22,11 +22,11 @@ module.exports = {
html() {
return `
-
+
Seconds to Convert
-
+
diff --git a/actions/convert_text_to_list_MOD.js b/actions/convert_text_to_list_MOD.js
index 47ac5707..d7b25f39 100644
--- a/actions/convert_text_to_list_MOD.js
+++ b/actions/convert_text_to_list_MOD.js
@@ -28,13 +28,11 @@ module.exports = {
-
+
-
-
+
Timestamp to Convert
@@ -45,10 +45,7 @@ module.exports = {
`;
},
- init() {
- const { glob, document } = this;
- glob.variableChange(document.getElementById('storage'), 'varNameContainer');
- },
+ init() {},
async action(cache) {
const data = cache.actions[cache.index];
diff --git a/actions/convert_to_base64_MOD.js b/actions/convert_to_base64_MOD.js
index 36eb4883..2de8d898 100644
--- a/actions/convert_to_base64_MOD.js
+++ b/actions/convert_to_base64_MOD.js
@@ -23,23 +23,23 @@ module.exports = {
html() {
return `
-
+
Options
Encode
Decode
-
-
-
`;
+
+
`;
},
init() {},
diff --git a/actions/convert_to_morse_code_MOD.js b/actions/convert_to_morse_code_MOD.js
index 18059bcf..a5cd86f0 100644
--- a/actions/convert_to_morse_code_MOD.js
+++ b/actions/convert_to_morse_code_MOD.js
@@ -22,24 +22,25 @@ module.exports = {
html() {
return `
-
- Text or Morse Code:
-
+
+
+ Options
+
+ Encode
+ Decode
+
+
-
- Options:
-
- Encode
- Decode
-
-
-
+
+ Text or Morse Code
+
+
+
-
-
`;
+
+
`;
},
init() {},
diff --git a/actions/convert_to_world_time_MOD.js b/actions/convert_to_world_time_MOD.js
index c57aa2b6..8c76a552 100644
--- a/actions/convert_to_world_time_MOD.js
+++ b/actions/convert_to_world_time_MOD.js
@@ -23,10 +23,8 @@ module.exports = {
html() {
return `
diff --git a/actions/create_animated_emoji_MOD.js b/actions/create_animated_emoji_MOD.js
index 128e96be..0ffe52a5 100644
--- a/actions/create_animated_emoji_MOD.js
+++ b/actions/create_animated_emoji_MOD.js
@@ -22,18 +22,18 @@ module.exports = {
html() {
return `
-
+
Animated Emoji Name
-
+
-
+
`;
},
diff --git a/actions/create_category_MOD.js b/actions/create_category_MOD.js
index 7d40a1fe..893356d1 100644
--- a/actions/create_category_MOD.js
+++ b/actions/create_category_MOD.js
@@ -27,15 +27,15 @@ module.exports = {
-
- Position
-
-
+
+ Position
+
+
-
-
`;
+
+
`;
},
init() {},
diff --git a/actions/create_gif_MOD.js b/actions/create_gif_MOD.js
index e2a64199..0ee8788e 100644
--- a/actions/create_gif_MOD.js
+++ b/actions/create_gif_MOD.js
@@ -24,11 +24,11 @@ module.exports = {
return `
Local/Web URL
-
-
+
-
+
`;
},
From d675b7d3c28fa700eb9f6e1ac97dd0f8faed23f6 Mon Sep 17 00:00:00 2001
From: TheMonDon <11539895+TheMonDon@users.noreply.github.com>
Date: Wed, 14 Jun 2023 21:28:27 -0500
Subject: [PATCH 27/62] Update mods.json
---
docs/mods.json | 28 ++++++++++++----------------
1 file changed, 12 insertions(+), 16 deletions(-)
diff --git a/docs/mods.json b/docs/mods.json
index 7ae1fffd..f5c1b059 100644
--- a/docs/mods.json
+++ b/docs/mods.json
@@ -44,11 +44,6 @@
"name": "Base Convert MOD",
"section": "Other Stuff"
},
- "basic_math_operation_MOD.js": {
- "description": "Have the bot do a basic math operation",
- "name": "Basic Math Operation",
- "section": "Other Stuff"
- },
"botsfordiscord_stats_MOD.js": {
"description": "Sends statistics (server count) to botsfordiscord.com",
"name": "Send Stats to BFD",
@@ -197,7 +192,7 @@
"control_music_MOD.js": {
"description": "Control music status",
"name": "Control Music",
- "section": "Audio Control"
+ "section": "Music Control"
},
"control_permissons_MOD.js": {
"description": "Control certain permissions",
@@ -479,11 +474,6 @@
"name": "Loop through Folder",
"section": "Lists and Loops"
},
- "math_operation_MOD.js": {
- "description": "Have the bot complete a math operation",
- "name": "Math Operation",
- "section": "Other Stuff"
- },
"math_operation_plus_MOD.js": {
"description": "Have the bot complete more advanced math operations",
"name": "Math Operation Plus",
@@ -522,7 +512,7 @@
"play_music_MOD.js": {
"description": "Search for a song/track and play it",
"name": "Play Music",
- "section": "Audio Control"
+ "section": "Music Control"
},
"play_youtube_playlist_MOD.js": {
"description": "Play a specified YouTube playlist",
@@ -662,7 +652,7 @@
"set_music_repeat_mode_MOD.js": {
"description": "Set the mode for repeating music",
"name": "Set Music Repeat Mode",
- "section": "Audio Control"
+ "section": "Music Control"
},
"set_permissions_MOD.js": {
"description": "Set permissions",
@@ -849,10 +839,10 @@
"name": "Store Playlist Info",
"section": "YouTube Tools"
},
- "store_queue_MOD.js": {
+ "store_queue_info_MOD.js": {
"description": "Store information about the queue",
"name": "Store Queue Info",
- "section": "Audio Control"
+ "section": "Music Control"
},
"store_reaction_info_MOD.js": {
"description": "Store information pertaining to a reaction",
@@ -866,7 +856,13 @@
},
"store_shard_info.js": {
"description": "Shows shard information.",
- "name": "Store Shard Info"
+ "name": "Store Shard Info",
+ "section": "Bot Client Control"
+ },
+ "store_track_info_MOD.js": {
+ "description": "Stores music track information",
+ "name": "Store Track Info",
+ "section": "Music Control"
},
"store_twitch_info_MOD.js": {
"description": "Store information about Twitch",
From 9e3eae5ebc0f6cee632c7f215cac620e04b4ae2f Mon Sep 17 00:00:00 2001
From: TheMonDon <11539895+TheMonDon@users.noreply.github.com>
Date: Wed, 14 Jun 2023 21:49:04 -0500
Subject: [PATCH 28/62] Use built in data deltion, rename globals.delData to
.clearData
---
actions/default_variable_MOD.js | 22 +++++++++++-------
actions/delete_global_data_MOD.js | 10 ++++----
actions/delete_member_data_MOD.js | 38 ++++---------------------------
actions/delete_server_data_MOD.js | 24 ++++---------------
4 files changed, 26 insertions(+), 68 deletions(-)
diff --git a/actions/default_variable_MOD.js b/actions/default_variable_MOD.js
index da928e5a..2f386baf 100644
--- a/actions/default_variable_MOD.js
+++ b/actions/default_variable_MOD.js
@@ -26,15 +26,21 @@ module.exports = {
return `
This action sets a variable to a default value if it's empty.
-
-
Mode
-
- Normal (null, undefined)
- Strict (null, undefined, 0, false)
-
+
+
+
+ Mode
+
+ Normal (null, undefined)
+ Strict (null, undefined, 0, false)
+
+
-
Default Value
-
+
+
+ Default Value
+
`;
},
diff --git a/actions/delete_global_data_MOD.js b/actions/delete_global_data_MOD.js
index b94c5550..64134972 100644
--- a/actions/delete_global_data_MOD.js
+++ b/actions/delete_global_data_MOD.js
@@ -17,12 +17,10 @@ module.exports = {
html() {
return `
-
`;
},
init() {},
@@ -31,7 +29,7 @@ module.exports = {
const data = cache.actions[cache.index];
const dataName = this.evalMessage(data.dataName, cache);
const { Globals } = this.getDBM();
- Globals.delData(dataName);
+ Globals.clearData(dataName);
this.callNextAction(cache);
},
@@ -44,7 +42,7 @@ module.exports = {
}
DBM.Files.data.globals = JSON.parse(fs.readFileSync(filePath));
class GlobalData {
- delData(name) {
+ clearData(name) {
if (name && DBM.Files.data.globals[name]) {
delete DBM.Files.data.globals[name];
DBM.Files.saveData('globals');
diff --git a/actions/delete_member_data_MOD.js b/actions/delete_member_data_MOD.js
index 8925cc14..c3f43388 100644
--- a/actions/delete_member_data_MOD.js
+++ b/actions/delete_member_data_MOD.js
@@ -23,10 +23,8 @@ module.exports = {
`;
},
@@ -37,37 +35,9 @@ module.exports = {
const member = await this.getMemberFromData(data.member, data.varName, cache);
const dataName = this.evalMessage(data.dataName, cache);
- member.delData(dataName);
+ member.clearData(dataName);
this.callNextAction(cache);
},
- mod(DBM) {
- Reflect.defineProperty(DBM.DiscordJS.GuildMember.prototype, 'delData', {
- value(name) {
- const { players } = DBM.Files.data;
-
- if (name && players[this.id]?.[name]) {
- delete players[this.id][name];
- DBM.Files.saveData('players');
- } else if (!name) {
- delete players[this.id];
- DBM.Files.saveData('players');
- }
- },
- });
-
- Reflect.defineProperty(DBM.DiscordJS.User.prototype, 'delData', {
- value(name) {
- const { players } = DBM.Files.data;
-
- if (name && players[this.id]?.[name]) {
- delete players[this.id][name];
- DBM.Files.saveData('players');
- } else if (!name) {
- delete players[this.id];
- DBM.Files.saveData('players');
- }
- },
- });
- },
+ mod() {},
};
diff --git a/actions/delete_server_data_MOD.js b/actions/delete_server_data_MOD.js
index 8bf4f7df..04b6e02c 100644
--- a/actions/delete_server_data_MOD.js
+++ b/actions/delete_server_data_MOD.js
@@ -23,10 +23,8 @@ module.exports = {
`;
},
@@ -39,23 +37,9 @@ module.exports = {
if (!server) return this.callNextAction(cache);
- server.delData(dataName);
+ server.clearData(dataName);
this.callNextAction(cache);
},
- mod(DBM) {
- Reflect.defineProperty(DBM.DiscordJS.Guild.prototype, 'delData', {
- value(name) {
- const { servers } = DBM.Files.data;
-
- if (servers && servers[this.id]?.[name]) {
- delete servers[this.id][name];
- DBM.Files.saveData('servers');
- } else if (!servers) {
- delete servers[this.id];
- DBM.Files.saveData('servers');
- }
- },
- });
- },
+ mod() {},
};
From 96da65ca6a4fce3d3fec8bcbf08ea1697f1c8ec3 Mon Sep 17 00:00:00 2001
From: TheMonDon <11539895+TheMonDon@users.noreply.github.com>
Date: Wed, 14 Jun 2023 22:36:19 -0500
Subject: [PATCH 29/62] Pushing latest HTML Fixes
---
actions/crosspost_message_MOD.js | 2 +-
actions/delete_invite_MOD.js | 5 ++--
actions/description_MOD.js | 6 ++--
actions/edit_item_from_list_MOD.js | 15 ++++------
actions/edit_webhook_MOD.js | 4 +--
actions/emit_event_MOD.js | 8 +++---
actions/filter_list_or_object_MOD.js | 2 --
actions/find_category_MOD.js | 43 +---------------------------
actions/find_invite_MOD.js | 12 ++++----
actions/start_rss_feed_MOD.js | 2 +-
10 files changed, 25 insertions(+), 74 deletions(-)
diff --git a/actions/crosspost_message_MOD.js b/actions/crosspost_message_MOD.js
index 9e7f6174..9c59c86e 100644
--- a/actions/crosspost_message_MOD.js
+++ b/actions/crosspost_message_MOD.js
@@ -48,7 +48,7 @@ module.exports = {
this.storeValue(msg, storage, varName2, cache);
this.callNextAction(cache);
})
- .catch(console.error);
+ .catch(this.displayError.bind(this, data, cache));
},
mod() {},
diff --git a/actions/delete_invite_MOD.js b/actions/delete_invite_MOD.js
index 087d7322..4ef111b6 100644
--- a/actions/delete_invite_MOD.js
+++ b/actions/delete_invite_MOD.js
@@ -28,6 +28,7 @@ module.exports = {
+
Reason
@@ -45,11 +46,11 @@ module.exports = {
client
.fetchInvite(invite)
- .catch(console.error)
.then((invite) => {
if (!invite) this.callNextAction(cache);
invite.delete(reason);
- });
+ })
+ .catch(this.displayError.bind(this, data, cache));
this.callNextAction(cache);
},
diff --git a/actions/description_MOD.js b/actions/description_MOD.js
index d0dcaa90..67c94a67 100644
--- a/actions/description_MOD.js
+++ b/actions/description_MOD.js
@@ -17,12 +17,10 @@ module.exports = {
html() {
return `
-
`;
+
+
`;
},
init() {},
diff --git a/actions/edit_item_from_list_MOD.js b/actions/edit_item_from_list_MOD.js
index 5f7c0f20..50eca881 100644
--- a/actions/edit_item_from_list_MOD.js
+++ b/actions/edit_item_from_list_MOD.js
@@ -19,26 +19,23 @@ module.exports = {
html() {
return `
-
-
-
+
-
+
Webhook Name
-
+
Webhook Icon URL
diff --git a/actions/emit_event_MOD.js b/actions/emit_event_MOD.js
index 67b57bd8..66d7aefc 100644
--- a/actions/emit_event_MOD.js
+++ b/actions/emit_event_MOD.js
@@ -17,7 +17,7 @@ module.exports = {
DiscordJS = require('discord.js');
} catch (_) {}
- const events = Object.values(DiscordJS.Constants.Events).sort();
+ const events = Object.values(DiscordJS.Events ?? {}).sort();
return events.includes(eventType) ? `Emits a ${eventType} event` : 'Not emitting anything';
},
@@ -45,8 +45,8 @@ module.exports = {
DiscordJS = require('discord.js');
} catch (_) {}
- const events = DiscordJS && Object.values(DiscordJS.Constants.Events).sort();
- const docs = `https://discord.js.org/#/docs/main/stable/class/Client?scrollTo=e-${
+ const events = DiscordJS && Object.values(DiscordJS.Events ?? {}).sort();
+ const docs = `https://old.discordjs.dev/#/docs/main/stable/class/Client?scrollTo=e-${
(events && events[0]) || 'channelCreate'
}`;
@@ -118,7 +118,7 @@ module.exports = {
const data = cache.actions[cache.index];
const { DiscordJS } = this.getDBM();
- const events = Object.values(DiscordJS.Constants.Events).sort();
+ const events = Object.values(DiscordJS.Events).sort();
const event = this.evalMessage(data.eventType);
if (!events.includes(event)) return console.error(`${this.name} (#${cache.index + 1}): Unknown event type.`);
diff --git a/actions/filter_list_or_object_MOD.js b/actions/filter_list_or_object_MOD.js
index b9aaee43..8234f93b 100644
--- a/actions/filter_list_or_object_MOD.js
+++ b/actions/filter_list_or_object_MOD.js
@@ -134,8 +134,6 @@ module.exports = {
};
glob.onChange1(document.getElementById('type'));
- glob.variableChange(document.getElementById('storage'), 'varNameContainer');
- glob.variableChange(document.getElementById('storage2'), 'varNameContainer2');
},
async action(cache) {
diff --git a/actions/find_category_MOD.js b/actions/find_category_MOD.js
index 42a603c5..2b6da5b5 100644
--- a/actions/find_category_MOD.js
+++ b/actions/find_category_MOD.js
@@ -43,48 +43,7 @@ module.exports = {
-
You can store and edit a category using the channel actions "Store Channel Info", "Edit Channel" or "Set Channel Permission".
-
-`;
+
You can store and edit a category using the channel actions "Store Channel Info", "Edit Channel" or "Set Channel Permission".
`;
},
init() {},
diff --git a/actions/find_invite_MOD.js b/actions/find_invite_MOD.js
index 5795d8a4..ff28c38d 100644
--- a/actions/find_invite_MOD.js
+++ b/actions/find_invite_MOD.js
@@ -22,16 +22,14 @@ module.exports = {
html() {
return `
-
-
-
`;
+
+
`;
},
init() {},
@@ -49,7 +47,7 @@ module.exports = {
this.storeValue(invite, storage, varName, cache);
this.callNextAction(cache);
})
- .catch(console.error);
+ .catch(this.displayError.bind(this, data, cache));
},
mod() {},
diff --git a/actions/start_rss_feed_MOD.js b/actions/start_rss_feed_MOD.js
index 28a5ee96..15c911d1 100644
--- a/actions/start_rss_feed_MOD.js
+++ b/actions/start_rss_feed_MOD.js
@@ -86,7 +86,7 @@ module.exports = {
.then(() => {
console.log('Starting watching...');
})
- .catch(console.error);
+ .catch(this.displayError.bind(this, data, cache));
},
mod() {},
From d60b5108bd5398dc87a081c1c3b51d5abcf7c2f2 Mon Sep 17 00:00:00 2001
From: TheMonDon <11539895+TheMonDon@users.noreply.github.com>
Date: Thu, 15 Jun 2023 09:47:45 -0500
Subject: [PATCH 30/62] A lot more HTML changes
---
actions/find_item_in_list_MOD.js | 13 +++++-
actions/find_message_MOD.js | 4 +-
actions/find_reaction_MOD.js | 5 +--
actions/get_command_description_MOD.js | 3 +-
actions/get_lyrics_MOD.js | 60 ++++---------------------
actions/inspect_list_or_object_MOD.js | 26 +++++------
actions/jump_to_action_MOD.js | 5 +--
actions/loop_through_folder_MOD.js | 3 +-
actions/math_operation_plus_MOD.js | 12 ++---
actions/push_webhook_MOD.js | 2 +-
actions/read_file_MOD.js | 18 ++++----
actions/remove_reaction_MOD.js | 5 ++-
actions/replace_text_MOD.js | 28 ++++++------
actions/revise_MOD.js | 4 +-
actions/run_script_too_MOD.js | 58 +++---------------------
actions/run_sql_query_MOD.js | 30 -------------
actions/send_gif_MOD.js | 4 +-
actions/send_json_to_webapi_MOD.js | 52 +++++----------------
actions/send_stats_to_botlist.me_MOD.js | 15 +++----
actions/send_stats_to_dbl_MOD.js | 11 ++---
actions/set_server_owner_MOD.js | 11 ++++-
actions/set_time_restriction_MOD.js | 26 ++++++-----
actions/skip_actions_MOD.js | 6 +--
actions/slice_MOD.js | 8 ++--
actions/speed_test_MOD.js | 56 +++++------------------
25 files changed, 140 insertions(+), 325 deletions(-)
diff --git a/actions/find_item_in_list_MOD.js b/actions/find_item_in_list_MOD.js
index a470b2fe..183e5d8a 100644
--- a/actions/find_item_in_list_MOD.js
+++ b/actions/find_item_in_list_MOD.js
@@ -32,10 +32,19 @@ module.exports = {
fields: ['list', 'varName', 'item', 'storage', 'varName2'],
- html() {
+ html(isEvent, data) {
return `
-
+
+ Source List
+
+ ${data.lists[isEvent ? 1 : 0]}
+
+
+
+ Variable Name
+
diff --git a/actions/find_message_MOD.js b/actions/find_message_MOD.js
index aa084708..7da09fe8 100644
--- a/actions/find_message_MOD.js
+++ b/actions/find_message_MOD.js
@@ -23,7 +23,6 @@ module.exports = {
html() {
return `
-
Search for
-
-
+
`;
},
- init() {
- const { glob, document } = this;
- glob.messageChange(document.getElementById('message'), 'varNameContainer');
- },
+ init() {},
async action(cache) {
const data = cache.actions[cache.index];
diff --git a/actions/get_command_description_MOD.js b/actions/get_command_description_MOD.js
index 94b26cd8..8775ef87 100644
--- a/actions/get_command_description_MOD.js
+++ b/actions/get_command_description_MOD.js
@@ -17,7 +17,6 @@ module.exports = {
html() {
return `
-
Find By
@@ -32,7 +31,7 @@ module.exports = {
`;
+`;
},
init() {},
diff --git a/actions/get_lyrics_MOD.js b/actions/get_lyrics_MOD.js
index a8b059a7..cfb3119b 100644
--- a/actions/get_lyrics_MOD.js
+++ b/actions/get_lyrics_MOD.js
@@ -34,17 +34,17 @@ module.exports = {
html() {
return `
-
-
-
+
Song to Search
-
+
-
+
+
API Key
-
+
-
+
+
Source Info
Song Title
@@ -53,52 +53,10 @@ module.exports = {
Song URL
-
-
+
-
-
-
-
- To get an API key, create a new app on https://genius.com/api-clients/new or check a tutorial by clicking here .
-
-
-
-
-
-
`;
+
`;
},
init() {},
diff --git a/actions/inspect_list_or_object_MOD.js b/actions/inspect_list_or_object_MOD.js
index 149d0fed..b712690a 100644
--- a/actions/inspect_list_or_object_MOD.js
+++ b/actions/inspect_list_or_object_MOD.js
@@ -22,31 +22,28 @@ module.exports = {
html() {
return `
-
+
-
-
- Depth
-
+
+ Depth
+
-
+
-
-
-
- Sample Result Client {_events : [Object ],_eventsCount : 5 ,_maxListeners : 10 ,options : [Object ],rest : [RESTManager],dataManager : [ClientDataManager],manager : [ClientManager],ws : [WebSocketManager],resolver : [ClientDataResolver],actions : [ActionsManager],voice : [ClientVoiceManager],shard : null ,users : [Collection],guilds : [Collection],channels : [Collection],presences : [Collection],user : [ClientUser],readyAt : 2019-05-11 T11:30 :47.999 Z,broadcasts : [],pings : [Array ],_timeouts : [Set ],_intervals : [Set ],config : [Object ],info : [Object ],audio : [Object ],warnings : [Object ],loadCommands : [Function ],commands : [Map ] }
+
+
+
+ Sample Result Client {_events : [Object ],_eventsCount : 5 ,_maxListeners : 10 ,options : [Object ],rest : [RESTManager],dataManager : [ClientDataManager],manager : [ClientManager],ws : [WebSocketManager],resolver : [ClientDataResolver],actions : [ActionsManager],voice : [ClientVoiceManager],shard : null ,users : [Collection],guilds : [Collection],channels : [Collection],presences : [Collection],user : [ClientUser],readyAt : 2019-05-11 T11:30 :47.999 Z,broadcasts : [],pings : [Array ],_timeouts : [Set ],_intervals : [Set ],config : [Object ],info : [Object ],audio : [Object ],warnings : [Object ],loadCommands : [Function ],commands : [Map ] }
@@ -72,9 +69,6 @@ module.exports = {
margin-left: 4px;
position: absolute;
}
- span {
- font-family: 'Gill Sans', 'Gill Sans MT', Calibri, 'Trebuchet MS', sans-serif;
- }
span.embed-auth {
color: rgb(255, 255, 255);
diff --git a/actions/jump_to_action_MOD.js b/actions/jump_to_action_MOD.js
index b1ba06e5..4cd9038f 100644
--- a/actions/jump_to_action_MOD.js
+++ b/actions/jump_to_action_MOD.js
@@ -17,12 +17,11 @@ module.exports = {
html() {
return `
-
-
`;
+`;
},
init() {},
diff --git a/actions/loop_through_folder_MOD.js b/actions/loop_through_folder_MOD.js
index 5c63c790..4a7255af 100644
--- a/actions/loop_through_folder_MOD.js
+++ b/actions/loop_through_folder_MOD.js
@@ -29,12 +29,11 @@ module.exports = {
- This is a good path: ./resources/images
- This will turn all filenames in the folder into an array.
-
-
diff --git a/actions/math_operation_plus_MOD.js b/actions/math_operation_plus_MOD.js
index b864fa02..b9280290 100644
--- a/actions/math_operation_plus_MOD.js
+++ b/actions/math_operation_plus_MOD.js
@@ -47,13 +47,13 @@ module.exports = {
html() {
return `
-
+
First Number
-
-
+
Math Operation
Addition
@@ -80,10 +80,10 @@ module.exports = {
Value of Pi
Value of Euler's number
+
-
-
+
Second Number
@@ -102,7 +102,7 @@ module.exports = {
const dom = document.getElementById('SecondNum');
const dom2 = document.getElementById('FirstNum');
- if ((value >= 0 && value <= 3) || [5, 10, 11].includes(value) || (value >= 18 && value <= 20)) {
+ if ([0, 1, 2, 3, 5, 10, 11, 18, 19, 20].includes(value)) {
dom.style.display = null;
} else {
dom.style.display = 'none';
diff --git a/actions/push_webhook_MOD.js b/actions/push_webhook_MOD.js
index bdf8e07b..4c1ecf1a 100644
--- a/actions/push_webhook_MOD.js
+++ b/actions/push_webhook_MOD.js
@@ -24,7 +24,7 @@ module.exports = {
Message
-
+
`;
},
diff --git a/actions/read_file_MOD.js b/actions/read_file_MOD.js
index bc7d7265..2946dbac 100644
--- a/actions/read_file_MOD.js
+++ b/actions/read_file_MOD.js
@@ -22,17 +22,15 @@ module.exports = {
html() {
return `
-
+
-
-
`;
+
+
`;
},
init() {},
@@ -44,7 +42,9 @@ module.exports = {
try {
if (path) {
const output = readFileSync(path, 'utf8');
- this.storeValue(output, parseInt(data.storage, 10), this.evalMessage(data.varName2, cache), cache);
+ const storage = parseInt(data.storage, 10);
+ const varName2 = this.evalMessage(data.varName2, cache);
+ this.storeValue(output, storage, varName2, cache);
} else {
console.log('File path is missing from read file mod!');
}
diff --git a/actions/remove_reaction_MOD.js b/actions/remove_reaction_MOD.js
index 3e396727..767534a5 100644
--- a/actions/remove_reaction_MOD.js
+++ b/actions/remove_reaction_MOD.js
@@ -20,8 +20,9 @@ module.exports = {
-
-
+
+
+
`;
},
diff --git a/actions/replace_text_MOD.js b/actions/replace_text_MOD.js
index 49e37c19..ecf5857c 100644
--- a/actions/replace_text_MOD.js
+++ b/actions/replace_text_MOD.js
@@ -23,34 +23,36 @@ module.exports = {
html() {
return `
-
+
Source Text
-
-
+
+
+
Replace this
-
+
-
+
Type
-
- Replace the first result
- Replace all results
-
+
+ Replace the first result
+ Replace all results
+
-
+
-
+`;
},
init() {},
diff --git a/actions/revise_MOD.js b/actions/revise_MOD.js
index b2b757e3..dd0e18b4 100644
--- a/actions/revise_MOD.js
+++ b/actions/revise_MOD.js
@@ -23,14 +23,14 @@ module.exports = {
html() {
return `
-
`;
},
diff --git a/actions/run_script_too_MOD.js b/actions/run_script_too_MOD.js
index 9dba2090..1b26d2af 100644
--- a/actions/run_script_too_MOD.js
+++ b/actions/run_script_too_MOD.js
@@ -23,16 +23,16 @@ module.exports = {
html() {
return `
-
+
-
+
End Behavior
Call Next Action
Do Not Call Next Action
-
+
Interpretation Style
Evaluate Text First
@@ -42,14 +42,14 @@ module.exports = {
-
+
Script Name
-
+
External File Path
@@ -65,53 +65,7 @@ module.exports = {
Or Use Custom Code: (This isn't used if an external path is defined.)
-
-`;
+
`;
},
init() {},
diff --git a/actions/run_sql_query_MOD.js b/actions/run_sql_query_MOD.js
index 8f4a30ac..4726d3fb 100644
--- a/actions/run_sql_query_MOD.js
+++ b/actions/run_sql_query_MOD.js
@@ -193,40 +193,10 @@ module.exports = {
`;
+
`;
},
init() {},
From c2cedd527542566f9ac3e196f9b5d2a281adfb29 Mon Sep 17 00:00:00 2001
From: TheMonDon <11539895+TheMonDon@users.noreply.github.com>
Date: Thu, 15 Jun 2023 11:02:24 -0500
Subject: [PATCH 31/62] Remove broken speedtest mod
---
actions/speed_test_MOD.js | 87 ---------------------------------------
1 file changed, 87 deletions(-)
delete mode 100644 actions/speed_test_MOD.js
diff --git a/actions/speed_test_MOD.js b/actions/speed_test_MOD.js
deleted file mode 100644
index a470a7fa..00000000
--- a/actions/speed_test_MOD.js
+++ /dev/null
@@ -1,87 +0,0 @@
-module.exports = {
- name: 'Speed Test',
- section: 'Other Stuff',
- meta: {
- version: '2.2.0',
- preciseCheck: false,
- author: 'DBM Mods',
- authorUrl: 'https://github.com/dbm-network/mods',
- downloadURL: 'https://github.com/dbm-network/mods/blob/master/actions/speed_test_MOD.js',
- },
-
- subtitle(data) {
- if (data.info === 'downloadspeed') {
- return 'Speed Test - Download Speed';
- }
- if (data.info === 'uploadspeed') {
- return 'Speed Test - Upload Speed';
- }
- return 'Error in subtitles.';
- },
-
- variableStorage(data, varType) {
- if (parseInt(data.storage, 10) !== varType) return;
- let dataType = 'Unknown Data Type';
- if (data.info === 'downloadspeed') {
- dataType = 'Download Speed';
- } else if (data.info === 'uploadspeed') {
- dataType = 'Upload Speed';
- }
- return [data.varName, dataType];
- },
-
- fields: ['info', 'type', 'storage', 'varName'],
-
- html() {
- return `
-
- Bit Type
- MB/s
- KB/s
-
-
-
-
- Speed
- Download Speed
- Upload Speed
-
-
-
-
-
-
`;
- },
-
- init() {},
-
- async action(cache) {
- const data = cache.actions[cache.index];
- const type = parseInt(data.type, 10);
- const Mods = this.getMods();
- const speedTest = Mods.require('speedtest-net');
-
- try {
- const test = await speedTest({ maxTime: 5000, acceptLicense: true });
-
- let result = data.info === 'downloadspeed' ? test.download.bandwidth : test.upload.bandwidth;
- if (type === 0) result /= 125000;
- else if (type === 1) result /= 1000;
-
- if (result !== undefined) {
- const storage = parseInt(data.storage, 10);
- const varName2 = this.evalMessage(data.varName, cache);
- this.storeValue(result, storage, varName2, cache);
- }
- } catch (err) {
- console.log(`Error in Speed Test Mod: ${err}`);
- } finally {
- this.callNextAction(cache);
- }
- },
-
- mod() {},
-};
From d39d4e75d3a1ff3fa1525498178c246d625d9dc6 Mon Sep 17 00:00:00 2001
From: TheMonDon <11539895+TheMonDon@users.noreply.github.com>
Date: Thu, 15 Jun 2023 15:40:55 -0500
Subject: [PATCH 32/62] Minor updates to code/HTML
---
actions/split_MOD.js | 10 +++---
actions/spotify_search_MOD.js | 10 +++---
actions/spreadsheet_MOD.js | 4 +--
actions/store_attachment_info_MOD.js | 7 ++---
actions/store_audit_log_info_MOD.js | 5 ++-
actions/store_bot_client_info_MOD.js | 6 ++--
actions/store_category_info_MOD.js | 47 ++++------------------------
7 files changed, 24 insertions(+), 65 deletions(-)
diff --git a/actions/split_MOD.js b/actions/split_MOD.js
index 7507b712..f4333658 100644
--- a/actions/split_MOD.js
+++ b/actions/split_MOD.js
@@ -22,22 +22,20 @@ module.exports = {
html() {
return `
-
`;
},
init() {},
diff --git a/actions/spotify_search_MOD.js b/actions/spotify_search_MOD.js
index ce11ec5a..51708f2b 100644
--- a/actions/spotify_search_MOD.js
+++ b/actions/spotify_search_MOD.js
@@ -281,14 +281,14 @@ module.exports = {
html() {
return `
-
-
+
+
Client ID
-
+
Client Secret
diff --git a/actions/spreadsheet_MOD.js b/actions/spreadsheet_MOD.js
index c0ab77b6..808b7f6b 100644
--- a/actions/spreadsheet_MOD.js
+++ b/actions/spreadsheet_MOD.js
@@ -5,8 +5,8 @@ module.exports = {
version: '2.2.0',
preciseCheck: false,
author: 'DBM Mods',
- authorUrl: null,
- downloadURL: null,
+ authorUrl: 'https://github.com/dbm-network/mods',
+ downloadURL: 'https://github.com/dbm-network/mods/blob/master/actions/spreadsheet_MOD.js',
},
subtitle(data) {
diff --git a/actions/store_attachment_info_MOD.js b/actions/store_attachment_info_MOD.js
index 1919154f..3c2b4595 100644
--- a/actions/store_attachment_info_MOD.js
+++ b/actions/store_attachment_info_MOD.js
@@ -37,7 +37,7 @@ module.exports = {
-
+
Source Info
Attachment's URL
@@ -54,10 +54,7 @@ module.exports = {
`;
},
- init() {
- const { document, glob } = this;
- glob.variableChange(document.getElementById('storage2'), 'varNameContainer2');
- },
+ init() {},
async action(cache) {
const data = cache.actions[cache.index];
diff --git a/actions/store_audit_log_info_MOD.js b/actions/store_audit_log_info_MOD.js
index c450cff5..254b3b49 100644
--- a/actions/store_audit_log_info_MOD.js
+++ b/actions/store_audit_log_info_MOD.js
@@ -72,7 +72,7 @@ module.exports = {
-
+
Source Info
Audit Log Id
@@ -94,7 +94,7 @@ module.exports = {
-
+
Position of Key
@@ -123,7 +123,6 @@ module.exports = {
};
glob.onChange0(document.getElementById('info'));
- glob.refreshVariableList(document.getElementById('storage'));
},
async action(cache) {
diff --git a/actions/store_bot_client_info_MOD.js b/actions/store_bot_client_info_MOD.js
index b53e0f27..72be3e5c 100644
--- a/actions/store_bot_client_info_MOD.js
+++ b/actions/store_bot_client_info_MOD.js
@@ -226,11 +226,11 @@ module.exports = {
init() {},
async action(cache) {
- const botClient = this.getDBM().Bot.bot;
- const { Bot } = this.getDBM();
+ const DBM = this.getDBM();
+ const { Bot } = DBM;
+ const botClient = Bot.bot;
const os = require('os');
if (process.platform === 'win32') this.getMods().require('loadavg-windows'); // Make loadavg work on windows.
- const DBM = this.getDBM();
const data = cache.actions[cache.index];
const info = parseInt(data.info, 10);
const msToDay = 1000 * 60 * 60 * 24;
diff --git a/actions/store_category_info_MOD.js b/actions/store_category_info_MOD.js
index 41902350..4964e94c 100644
--- a/actions/store_category_info_MOD.js
+++ b/actions/store_category_info_MOD.js
@@ -9,7 +9,8 @@ module.exports = {
downloadURL: 'https://github.com/dbm-network/mods/blob/master/actions/store_category_info_MOD.js',
},
- subtitle(data, presets) {
+ subtitle(data) {
+ const categories = ['You cheater!', 'Temp Variable', 'Server Variable', 'Global Variable'];
const info = [
'Category ID',
'Category Name',
@@ -24,7 +25,7 @@ module.exports = {
'Category Voice Channel List',
'Category Voice Channel Count',
];
- return presets.getChannelText(data.category, info[parseInt(data.info, 10)]);
+ return `${categories[parseInt(data.category, 10)]} - ${info[parseInt(data.info, 10)]}`;
},
variableStorage(data, varType) {
@@ -70,12 +71,12 @@ module.exports = {
html() {
return `
-
-
+
Source Info
@@ -100,43 +101,7 @@ module.exports = {
-
-`;
+ `;
},
init() {},
From 80f5337e7eaebc0d42a3eefc3806362f776bfb1e Mon Sep 17 00:00:00 2001
From: TheMonDon <11539895+TheMonDon@users.noreply.github.com>
Date: Thu, 15 Jun 2023 15:42:36 -0500
Subject: [PATCH 33/62] Update docs
---
docs/events.json | 4 ----
docs/mods.json | 5 -----
2 files changed, 9 deletions(-)
diff --git a/docs/events.json b/docs/events.json
index acbfc208..9ccc57de 100644
--- a/docs/events.json
+++ b/docs/events.json
@@ -83,10 +83,6 @@
"description": "Triggers when the music player has an error",
"name": "On Player Error"
},
- "on_player_no_results_EVT.js": {
- "description": "Triggers when the music player found no results",
- "name": "On Player No Results"
- },
"on_queue_end_EVT.js": {
"description": "Triggers when the music queue ends",
"name": "On Queue End"
diff --git a/docs/mods.json b/docs/mods.json
index f5c1b059..c266c848 100644
--- a/docs/mods.json
+++ b/docs/mods.json
@@ -699,11 +699,6 @@
"name": "Slice",
"section": "Other Stuff"
},
- "speed_test_MOD.js": {
- "description": "Test your internet speed",
- "name": "Speed Test",
- "section": "Other Stuff"
- },
"split_MOD.js": {
"description": "Split a string",
"name": "Split",
From dead5db3dde0cef0436e30a208f1edb56ee2b398 Mon Sep 17 00:00:00 2001
From: TheMonDon <11539895+TheMonDon@users.noreply.github.com>
Date: Thu, 15 Jun 2023 15:53:50 -0500
Subject: [PATCH 34/62] Fix notes
---
actions/convert_timestamp_to_date_MOD.js | 6 ++++--
actions/emit_event_MOD.js | 6 ++++--
actions/find_message_MOD.js | 7 ++++---
actions/restart_bot_MOD.js | 6 ++++--
actions/set_server_owner_MOD.js | 3 ++-
actions/store_date_info_plus_MOD.js | 2 +-
6 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/actions/convert_timestamp_to_date_MOD.js b/actions/convert_timestamp_to_date_MOD.js
index 51a58495..bcf498e0 100644
--- a/actions/convert_timestamp_to_date_MOD.js
+++ b/actions/convert_timestamp_to_date_MOD.js
@@ -23,8 +23,10 @@ module.exports = {
html() {
return `
-
Note: Unix Timestamp and YouTube Timestamp with this mod (both were tested).
+
+ Note: Unix Timestamp and YouTube Timestamp with this mod (both were tested).
+
diff --git a/actions/emit_event_MOD.js b/actions/emit_event_MOD.js
index 66d7aefc..ea450081 100644
--- a/actions/emit_event_MOD.js
+++ b/actions/emit_event_MOD.js
@@ -81,8 +81,10 @@ module.exports = {
-
Note:
+ Note:
`;
},
@@ -95,45 +113,32 @@ module.exports = {
init() {},
async action(cache) {
- // get packages and data
const data = cache.actions[cache.index];
+ const channel = await this.getChannelFromData(data.channelObj, data.varName, cache);
+ const discordTranscripts = require('discord-html-transcripts');
- // Setup Variable
- const type = parseInt(data.channelObj, 10);
- const varName = this.evalMessage(data.channelID, cache);
-
- // Get Channel Object From Variable
- const channelObj = this.getVariable(type, varName, cache);
+ if (!channel) {
+ console.log('Missing channel in Transcript');
+ return this.callNextAction(cache);
+ }
// Get Config
- const useMinify = data.useMinify === '1' ? true : false;
const saveImages = data.saveImages === '1' ? true : false;
- const useCDN = data.useCDN === '1' ? true : false;
-
- // Thanks to TheMonDon helped me to fix some Code
- // Get Version And Check it
- const discordTranscripts = require('discord-html-transcripts', '2.6.1'); // Version 2.6.1 needed for discord.js v13.
- const dtVersion = require('../package.json').dependencies['discord-html-transcripts']; // Get Version
-
- if (dtVersion !== '2.6.1') {
- console.log(`Current Version ${dtVersion}`);
- console.log('Needed Version 2.6.1');
- console.log('Use `npm i discord-html-transcripts@2.6.1` to install the right version');
- return this.callNextAction(cache);
- }
+ const poweredBy = data.poweredBy === '1' ? true : false;
+ const footer = this.evalMessage(data.footer, cache);
try {
- const transcript = await discordTranscripts.createTranscript(channelObj, {
+ const transcript = await discordTranscripts.createTranscript(channel, {
limit: -1,
- returnBuffer: false,
- fileName: `temp.html`,
- minify: useMinify,
+ returnType: 'string',
saveImages,
- useCDN,
+ poweredBy,
+ footer,
});
- const output = transcript.attachment.toString();
- this.storeValue(output, parseInt(data.storage, 10), data.varName, cache);
+ const storage = parseInt(data.storage, 10);
+ const varName = this.evalMessage(data.varName, cache);
+ this.storeValue(transcript, storage, varName, cache);
} catch (err) {
console.error(err);
}
diff --git a/actions/translate_MOD.js b/actions/translate_MOD.js
index 40625f8b..1d1c6ea3 100644
--- a/actions/translate_MOD.js
+++ b/actions/translate_MOD.js
@@ -37,7 +37,7 @@ module.exports = {
diff --git a/actions/urban_dictionary_MOD.js b/actions/urban_dictionary_MOD.js
index 5293a78d..2ab8a1c5 100644
--- a/actions/urban_dictionary_MOD.js
+++ b/actions/urban_dictionary_MOD.js
@@ -56,13 +56,12 @@ module.exports = {
html() {
return `
-
Search
-
+
-
+
Source Info
Definition
@@ -76,10 +75,9 @@ module.exports = {
-
`;
+
`;
},
init() {},
diff --git a/actions/weather_MOD.js b/actions/weather_MOD.js
index 301ad2e4..5ca2fb29 100644
--- a/actions/weather_MOD.js
+++ b/actions/weather_MOD.js
@@ -77,19 +77,18 @@ module.exports = {
html() {
return `
-
-
- Source City
-
-
+
Degree Type
Farhenheit
Celsius
-
+
+ Source City
+
+
Source Info
diff --git a/actions/youtube_search_MOD.js b/actions/youtube_search_MOD.js
index 7f9c51ce..cc7a657e 100644
--- a/actions/youtube_search_MOD.js
+++ b/actions/youtube_search_MOD.js
@@ -141,19 +141,46 @@ module.exports = {
html() {
return `
-
-
+
Source Type
YouTube Video
YouTube Playlist
+
Video to Search
-
+
-
+
+
+ Result Number
+
+ 1st Result
+ 2nd Result
+ 3rd Result
+ 4th Result
+ 5th Result
+ 6th Result
+ 7th Result
+ 8th Result
+ 9th Result
+ 10th Result
+ 11th Result
+ 12th Result
+ 13th Result
+ 14th Result
+ 15th Result
+ 16th Result
+ 17th Result
+ 18th Result
+ 19th Result
+ 20th Result
+
+
+
+
Source Video Info
Video ID
@@ -171,7 +198,8 @@ module.exports = {
Video is Live?
-
+
+
Source Playlist Info
Playlist ID
@@ -204,40 +232,15 @@ module.exports = {
Video Publish Dates
-
- Result Number
-
- 1st Result
- 2nd Result
- 3rd Result
- 4th Result
- 5th Result
- 6th Result
- 7th Result
- 8th Result
- 9th Result
- 10th Result
- 11th Result
- 12th Result
- 13th Result
- 14th Result
- 15th Result
- 16th Result
- 17th Result
- 18th Result
- 19th Result
- 20th Result
-
-
+
API Key
-
-
`;
+
`;
},
init() {
From 24d9fec32787a6841565c9d2d2ac6ce62b30138f Mon Sep 17 00:00:00 2001
From: TheMonDon <11539895+TheMonDon@users.noreply.github.com>
Date: Mon, 19 Jun 2023 08:36:56 -0500
Subject: [PATCH 36/62] Fix varName in attach_image_to_embed
---
actions/attach_image_to_embed_MOD.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/actions/attach_image_to_embed_MOD.js b/actions/attach_image_to_embed_MOD.js
index b12e2d8e..85dba872 100644
--- a/actions/attach_image_to_embed_MOD.js
+++ b/actions/attach_image_to_embed_MOD.js
@@ -26,7 +26,7 @@ module.exports = {
-
From 5ea0ccba522989a37230029916d5b58639ebb26b Mon Sep 17 00:00:00 2001
From: TheMonDon <11539895+TheMonDon@users.noreply.github.com>
Date: Tue, 20 Jun 2023 07:47:05 -0500
Subject: [PATCH 37/62] Added description option (from Ni)
---
actions/store_command_info_MOD.js | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/actions/store_command_info_MOD.js b/actions/store_command_info_MOD.js
index de3a9b84..ac708a5a 100644
--- a/actions/store_command_info_MOD.js
+++ b/actions/store_command_info_MOD.js
@@ -19,6 +19,7 @@ module.exports = {
'Command Aliases',
'Command Time Restriction',
'Command Actions Length',
+ 'Command Description',
];
const storage = ['', 'Temp Variable', 'Server Variable', 'Global Variable'];
return `${info[parseInt(data.info, 10)]} - ${storage[parseInt(data.storage, 10)]}`;
@@ -33,6 +34,7 @@ module.exports = {
case 2:
case 3:
case 4:
+ case 8:
dataType = 'Text';
break;
case 5:
@@ -52,7 +54,7 @@ module.exports = {
html() {
return `
-
+
Search Command By
Name
@@ -60,13 +62,13 @@ module.exports = {
None (Same Command)
-
+
Value To Search
-
+
Source Info
Command Name
@@ -77,6 +79,7 @@ module.exports = {
Command Aliases
Command Time Restriction
Command Actions Length
+ Command Description
@@ -196,6 +199,9 @@ module.exports = {
? 'none'
: parseInt(jp.query(command, '$..name').length, 10) - 1;
break;
+ case 8:
+ result = jp.query(command, '$..description') === '' ? 'none' : jp.query(command, '$..description');
+ break;
default:
break;
}
From a32dc5a66bef6e619631c6c985d466d9750386eb Mon Sep 17 00:00:00 2001
From: TheMonDon <11539895+TheMonDon@users.noreply.github.com>
Date: Tue, 20 Jun 2023 09:28:23 -0500
Subject: [PATCH 38/62] Action needs embed object not a message variable
---
actions/store_embed_info_MOD.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/actions/store_embed_info_MOD.js b/actions/store_embed_info_MOD.js
index 1b94caf5..8a94e301 100644
--- a/actions/store_embed_info_MOD.js
+++ b/actions/store_embed_info_MOD.js
@@ -32,7 +32,7 @@ module.exports = {
html() {
return `
-
From 7cffa20312b4f51c87bb8fde71c47789f556ec4e Mon Sep 17 00:00:00 2001
From: TheMonDon <11539895+TheMonDon@users.noreply.github.com>
Date: Tue, 20 Jun 2023 09:28:41 -0500
Subject: [PATCH 39/62] Fix spelling
---
actions/store_embed_info_MOD.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/actions/store_embed_info_MOD.js b/actions/store_embed_info_MOD.js
index 8a94e301..21f7072d 100644
--- a/actions/store_embed_info_MOD.js
+++ b/actions/store_embed_info_MOD.js
@@ -32,7 +32,7 @@ module.exports = {
html() {
return `
-
+
From 63c1746c8d6adf154325281a288b24c3fedbca9d Mon Sep 17 00:00:00 2001
From: TheMonDon <11539895+TheMonDon@users.noreply.github.com>
Date: Tue, 20 Jun 2023 10:15:51 -0500
Subject: [PATCH 40/62] HTML Updates
---
actions/store_embed_info_MOD.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/actions/store_embed_info_MOD.js b/actions/store_embed_info_MOD.js
index 21f7072d..40c8ca1d 100644
--- a/actions/store_embed_info_MOD.js
+++ b/actions/store_embed_info_MOD.js
@@ -37,7 +37,7 @@ module.exports = {
-
+
Source Info
Object
@@ -112,6 +112,7 @@ module.exports = {
default:
break;
}
+
if (result !== undefined) {
const storage = parseInt(data.storage, 10);
this.storeValue(result, storage, this.evalMessage(data.varName2, cache), cache);
From c9dd91fa368003540d58eb54528c6e4eeebed6b2 Mon Sep 17 00:00:00 2001
From: TheMonDon <11539895+TheMonDon@users.noreply.github.com>
Date: Tue, 20 Jun 2023 21:38:25 -0500
Subject: [PATCH 41/62] Structures from the API cannot be edited directly
---
actions/attach_image_to_embed_MOD.js | 5 +++--
actions/edit_embed_object_MOD.js | 6 +++++-
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/actions/attach_image_to_embed_MOD.js b/actions/attach_image_to_embed_MOD.js
index 85dba872..c59d8059 100644
--- a/actions/attach_image_to_embed_MOD.js
+++ b/actions/attach_image_to_embed_MOD.js
@@ -48,7 +48,7 @@ module.exports = {
const embedstorage = parseInt(data.embedstorage, 10);
const embedvarName = this.evalMessage(data.embedvarName, cache);
- const embed = this.getVariable(embedstorage, embedvarName, cache);
+ let embed = this.getVariable(embedstorage, embedvarName, cache);
const imagestorage = parseInt(data.imagestorage, 10);
const imagevarName = this.evalMessage(data.imagevarName, cache);
@@ -61,7 +61,8 @@ module.exports = {
Images.createBuffer(image).then((buffer) => {
const attachment = new DBM.DiscordJS.AttachmentBuilder(buffer, { name: filename });
- embed.attachFiles([attachment]);
+ const { EmbedBuilder } = DBM.DiscordJS;
+ embed = EmbedBuilder.from(embed).attachFiles([attachment]);
const storage = parseInt(data.storage, 10);
const varName = Actions.evalMessage(data.varName, cache);
diff --git a/actions/edit_embed_object_MOD.js b/actions/edit_embed_object_MOD.js
index 709112a4..7a52a0d9 100644
--- a/actions/edit_embed_object_MOD.js
+++ b/actions/edit_embed_object_MOD.js
@@ -558,9 +558,12 @@ module.exports = {
const data = cache.actions[cache.index];
const storage = parseInt(data.storage, 10);
const varName = this.evalMessage(data.varName, cache);
- const embed = this.getVariable(storage, varName, cache);
+ let embed = this.getVariable(storage, varName, cache);
if (!embed) return this.callNextAction(cache);
+ const { EmbedBuilder } = this.getDBM().DiscordJS;
+ embed = EmbedBuilder.from(embed);
+
const Edit0 = parseInt(data.Edit0, 10);
const Edit1 = parseInt(data.Edit1, 10);
const Edit2 = parseInt(data.Edit2, 10);
@@ -592,6 +595,7 @@ module.exports = {
const fieldName = this.evalMessage(data.fieldName, cache);
const fieldDescription = this.evalMessage(data.fieldDescription, cache);
const fieldInline = parseInt(data.fieldInline, 10);
+
switch (Edit0) {
case 1:
embed.setTitle(title);
From 9c54b45bfa9e24dbf1775657bda4a88837415683 Mon Sep 17 00:00:00 2001
From: TheMonDon <11539895+TheMonDon@users.noreply.github.com>
Date: Wed, 21 Jun 2023 17:12:51 -0500
Subject: [PATCH 42/62] Fix convert text to list
---
actions/convert_text_to_list_MOD.js | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/actions/convert_text_to_list_MOD.js b/actions/convert_text_to_list_MOD.js
index d7b25f39..5e90a5ce 100644
--- a/actions/convert_text_to_list_MOD.js
+++ b/actions/convert_text_to_list_MOD.js
@@ -49,11 +49,14 @@ module.exports = {
const varName = this.evalMessage(data.varName, cache);
const text = this.getVariable(storage, varName, cache);
const separator = this.evalMessage(data.separator, cache);
+
+ const list = [];
const params = text.split(new RegExp(separator));
+ params.forEach((i) => list.push(i.replace(/\r/g, '')));
const storage2 = parseInt(data.storage2, 10);
const varName2 = this.evalMessage(data.varName2, cache);
- this.storeValue(params, storage2, varName2, cache);
+ this.storeValue(list, storage2, varName2, cache);
this.callNextAction(cache);
},
From b6045304bdeb2861634f2e57332e9dd5d4a330ba Mon Sep 17 00:00:00 2001
From: TheMonDon <11539895+TheMonDon@users.noreply.github.com>
Date: Thu, 22 Jun 2023 23:09:38 -0500
Subject: [PATCH 43/62] Added convert color mod
---
actions/convert_color_MOD.js | 258 +++++++++++++++++++++++++++++++++++
docs/mods.json | 5 +
2 files changed, 263 insertions(+)
create mode 100644 actions/convert_color_MOD.js
diff --git a/actions/convert_color_MOD.js b/actions/convert_color_MOD.js
new file mode 100644
index 00000000..1a6cf280
--- /dev/null
+++ b/actions/convert_color_MOD.js
@@ -0,0 +1,258 @@
+module.exports = {
+ name: 'Convert Color',
+ section: 'Conversions',
+ meta: {
+ version: '2.2.0',
+ preciseCheck: false,
+ author: 'DBM Mods',
+ authorUrl: 'https://github.com/dbm-network/mods',
+ downloadURL: 'https://github.com/dbm-network/mods/blob/master/actions/convert_color_MOD.js',
+ },
+
+ subtitle(data) {
+ let from = data.InputColor.toUpperCase();
+ if (from === 'AUTO') from = 'Auto Detect';
+ if (from === 'CSS') from = 'Keyword';
+ if (from === 'DECIMAL') from = 'Decimal';
+
+ let to = data.OutputColor.toUpperCase();
+ if (to === 'CSS') to = 'Keyword';
+ if (to === 'DECIMAL') to = 'Decimal';
+ return `Convert Color from ${from} to ${to}`;
+ },
+
+ variableStorage(data, varType) {
+ if (parseInt(data.Storage, 10) !== varType) return;
+ return [data.VarName, 'Color'];
+ },
+
+ fields: ['InputColor', 'InputText', 'OutputColor', 'Storage', 'VarName'],
+
+ html() {
+ return `
+
+
+ Convert From
+
+ Auto Detect
+ Keyword
+ HEX
+ RGB
+ HSL
+ CMYK
+ Decimal
+
+
+
+ Color
+
+
+ Convert To
+
+ Keyword
+ HEX
+ RGB
+ HSL
+ CMYK
+ Decimal
+
+
+
+
+
+
+ Input Strings:
+
Date: Thu, 29 Jun 2023 17:47:42 -0500
Subject: [PATCH 48/62] Call next action on error
---
actions/game_server_MOD.js | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/actions/game_server_MOD.js b/actions/game_server_MOD.js
index f634094c..fef7989d 100644
--- a/actions/game_server_MOD.js
+++ b/actions/game_server_MOD.js
@@ -445,7 +445,10 @@ module.exports = {
}
Actions.callNextAction(cache);
})
- .catch((error) => console.log(`Game Server Info: ${error}`));
+ .catch((error) => {
+ console.log(`Game Server Info: ${error}`);
+ Actions.callNextAction(cache);
+ });
},
mod() {},
From bec056b43a56d2281c357dd05fbddeb9e3a2781c Mon Sep 17 00:00:00 2001
From: TheMonDon
Date: Thu, 29 Jun 2023 19:24:47 -0500
Subject: [PATCH 49/62] Update bot check
---
actions/check_if_member_MOD.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/actions/check_if_member_MOD.js b/actions/check_if_member_MOD.js
index 3a9291c1..30336e6b 100644
--- a/actions/check_if_member_MOD.js
+++ b/actions/check_if_member_MOD.js
@@ -80,7 +80,7 @@ module.exports = {
let result = false;
switch (info) {
case 0:
- result = member.user?.bot;
+ result = member.user ? member.user?.bot : member.bot;
break;
case 1:
result = member.bannable;
From 0094d71d3ba181f723bbd80a447d47b8046c037b Mon Sep 17 00:00:00 2001
From: TheMonDon
Date: Thu, 29 Jun 2023 19:37:57 -0500
Subject: [PATCH 50/62] Delete attach_image_to_embed_MOD.js
---
actions/attach_image_to_embed_MOD.js | 75 ----------------------------
1 file changed, 75 deletions(-)
delete mode 100644 actions/attach_image_to_embed_MOD.js
diff --git a/actions/attach_image_to_embed_MOD.js b/actions/attach_image_to_embed_MOD.js
deleted file mode 100644
index c59d8059..00000000
--- a/actions/attach_image_to_embed_MOD.js
+++ /dev/null
@@ -1,75 +0,0 @@
-module.exports = {
- name: 'Attach Image To Embed',
- section: 'Embed Message',
- meta: {
- version: '2.2.0',
- preciseCheck: false,
- author: 'DBM Mods',
- authorUrl: 'https://github.com/dbm-network/mods',
- downloadURL: 'https://github.com/dbm-network/mods/blob/master/actions/attach_image_to_embed_MOD.js',
- },
-
- subtitle(data) {
- const array = ['Temp Variable', 'Server Variable', 'Global Variable'];
- return `Attach (${array[data.imagestorage - 1]} ${data.imagevarName}) to Embed (${array[data.embedstorage - 1]} ${
- data.embedvarName
- }) (${data.filename || 'image.png'})`;
- },
-
- fields: ['embedstorage', 'embedvarName', 'imagestorage', 'imagevarName', 'filename'],
-
- html() {
- return `
-
-
-
-
-
- Image File Name
-
-
-
-
`;
- },
-
- init() {},
-
- async action(cache) {
- const data = cache.actions[cache.index];
- const { Actions } = this.getDBM();
-
- const embedstorage = parseInt(data.embedstorage, 10);
- const embedvarName = this.evalMessage(data.embedvarName, cache);
- let embed = this.getVariable(embedstorage, embedvarName, cache);
-
- const imagestorage = parseInt(data.imagestorage, 10);
- const imagevarName = this.evalMessage(data.imagevarName, cache);
- const image = this.getVariable(imagestorage, imagevarName, cache);
-
- const filename = data.filename || 'image.png';
-
- const DBM = this.getDBM();
- const { Images } = DBM;
-
- Images.createBuffer(image).then((buffer) => {
- const attachment = new DBM.DiscordJS.AttachmentBuilder(buffer, { name: filename });
- const { EmbedBuilder } = DBM.DiscordJS;
- embed = EmbedBuilder.from(embed).attachFiles([attachment]);
-
- const storage = parseInt(data.storage, 10);
- const varName = Actions.evalMessage(data.varName, cache);
- Actions.storeValue(embed, storage, varName, cache);
- this.callNextAction(cache);
- });
- },
-
- mod() {},
-};
From 4f2df3c0a4a520f922342858ca64d4499faf484a Mon Sep 17 00:00:00 2001
From: TheMonDon <11539895+TheMonDon@users.noreply.github.com>
Date: Fri, 30 Jun 2023 13:00:08 -0500
Subject: [PATCH 51/62] Set `leaveVoiceTimeout` to be 10 if undefined
---
actions/play_music_MOD.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/actions/play_music_MOD.js b/actions/play_music_MOD.js
index 6e61b887..74bed3ef 100644
--- a/actions/play_music_MOD.js
+++ b/actions/play_music_MOD.js
@@ -73,7 +73,7 @@ module.exports = {
if (data.volume) volume = parseInt(this.evalMessage(data.volume, cache), 10) ?? 80;
// leaveOnEnd & leaveOnEmpty Cooldowns from DBM Settings
- const leaveVoiceTimeout = Files.data.settings.leaveVoiceTimeout ?? '0';
+ const leaveVoiceTimeout = Files.data.settings.leaveVoiceTimeout ?? '10';
let seconds = parseInt(leaveVoiceTimeout, 10);
if (isNaN(seconds) || seconds < 0) seconds = 0;
From 511eb6ab5b225d37d5f772649bc29acde04dd9cc Mon Sep 17 00:00:00 2001
From: TheMonDon
Date: Sat, 1 Jul 2023 21:58:04 -0500
Subject: [PATCH 52/62] Fix html in store data list
---
actions/store_data_list_MOD.js | 33 +++++++++++++++------------------
1 file changed, 15 insertions(+), 18 deletions(-)
diff --git a/actions/store_data_list_MOD.js b/actions/store_data_list_MOD.js
index b550d40e..c1537c3f 100644
--- a/actions/store_data_list_MOD.js
+++ b/actions/store_data_list_MOD.js
@@ -46,7 +46,7 @@ module.exports = {
'storage',
],
- html(_isEvent, data) {
+ html() {
return `
@@ -57,7 +57,7 @@ module.exports = {
servers.json
-