Skip to content

Commit

Permalink
BETA VERSION 0.67.1 (#1794)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Mittelblut9
Mittelblut9 authored Nov 24, 2023
2 parents b77437c + 8a0975d commit d763437
Show file tree
Hide file tree
Showing 12 changed files with 358 additions and 441 deletions.
16 changes: 8 additions & 8 deletions bot/events/autoModerationRuleCreate.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,18 @@ module.exports.autoModerationRuleCreate = async (bot, rule) => {
action.type === 1
? 'Delete Message'
: action.type === 2
? 'Send alert to'
: action.type === 3
? 'Timeout user'
: 'none',
? 'Send alert to'
: action.type === 3
? 'Timeout user'
: 'none',
value:
action.type === 1
? 'True'
: action.type === 2
? `<#${action.metadata.channelId}>`
: action.type === 3
? `${action.metadata.durationSeconds} seconds`
: 'none',
? `<#${action.metadata.channelId}>`
: action.type === 3
? `${action.metadata.durationSeconds} seconds`
: 'none',
};
});

Expand Down
16 changes: 8 additions & 8 deletions bot/events/autoModerationRuleUpdate.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,18 @@ module.exports.autoModerationRuleUpdate = async (bot, oldRule, newRule) => {
action.type === 1
? 'Delete Message'
: action.type === 2
? 'Send alert to'
: action.type === 3
? 'Timeout user'
: 'none',
? 'Send alert to'
: action.type === 3
? 'Timeout user'
: 'none',
value:
action.type === 1
? 'True'
: action.type === 2
? `<#${action.metadata.channelId}>`
: action.type === 3
? `${action.metadata.durationSeconds} seconds`
: 'none',
? `<#${action.metadata.channelId}>`
: action.type === 3
? `${action.metadata.durationSeconds} seconds`
: 'none',
};
});

Expand Down
682 changes: 296 additions & 386 deletions package-lock.json
View file

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "mittelbot",
"version": "0.67.0",
"version": "0.67.1",
"description": "A Discord Bot written in Node.js",
"main": "bot/core/shard.js",
"private": true,
Expand Down Expand Up @@ -52,23 +52,23 @@
"@discord-player/extractor": "^4.4.3",
"@discord-player/utils": "^0.2.1",
"@discordjs/opus": "github:discordjs/opus",
"@discordjs/rest": "^2.0.0",
"@discordjs/voice": "^0.16.0",
"@distube/ytdl-core": "^4.13.2",
"@discordjs/rest": "^2.2.0",
"@discordjs/voice": "^0.16.1",
"@distube/ytdl-core": "^4.13.3",
"@ffmpeg-installer/ffmpeg": "^1.1.0",
"@napi-rs/canvas": "^0.1.44",
"@sentry/node": "^7.77.0",
"@sentry/node": "^7.81.1",
"@sentry/profiling-node": "^1.2.6",
"@stdlib/assert-is-uri": "^0.1.1",
"@twurple/api": "^7.0.5",
"@twurple/auth": "^7.0.0",
"axios": "^1.6.0",
"axios": "^1.6.2",
"caller-id": "^0.1.0",
"canvacord": "5.4.10",
"discord-html-transcripts": "^3.2.0",
"discord-logs": "^2.2.1",
"discord-player": "^6.6.6",
"discord.js": "^14.13.0",
"discord.js": "^14.14.1",
"dotenv": "^16.3.1",
"extends-classes": "^1.0.5",
"ffmpeg-static": "^5.2.0",
Expand All @@ -79,12 +79,12 @@
"link-module-alias": "^1.2.0",
"module-alias": "^2.2.3",
"moment-timezone": "^0.5.43",
"mysql2": "^3.6.3",
"mysql2": "^3.6.5",
"nconf": "^0.12.1",
"patch-package": "^8.0.0",
"random-animals-api": "^1.2.6",
"rss-parser": "^3.13.0",
"sequelize": "^6.34.0",
"sequelize": "^6.35.1",
"simple-node-logger": "^21.8.12",
"string-mismatch": "^2.1.1",
"translatte": "^3.0.1",
Expand All @@ -98,6 +98,6 @@
"jest": "^29.7.0",
"node-sloc": "^0.2.1",
"nodemon": "^3.0.1",
"prettier": "^3.0.3"
"prettier": "^3.1.0"
}
}
16 changes: 8 additions & 8 deletions src/slash_commands/admin/antiinsults.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,14 +81,14 @@ module.exports.run = async ({ main_interaction, bot }) => {
main_interaction.guild.id
)
: setting.enabled
? global.t.trans(
['success.admin.automod.antiinsults.enabled', ...replyData],
main_interaction.guild.id
)
: global.t.trans(
['success.admin.automod.antiinsults.disabled', ...replyData],
main_interaction.guild.id
);
? global.t.trans(
['success.admin.automod.antiinsults.enabled', ...replyData],
main_interaction.guild.id
)
: global.t.trans(
['success.admin.automod.antiinsults.disabled', ...replyData],
main_interaction.guild.id
);

main_interaction
.followUp({
Expand Down
8 changes: 4 additions & 4 deletions src/slash_commands/admin/modroles.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ module.exports.run = async ({ main_interaction, bot }) => {
? dbEntity.isAdmin
? 'Admin'
: dbEntity.isMod
? 'Moderator'
: dbEntity.isHelper
? 'Helper'
: 'Not set yet'
? 'Moderator'
: dbEntity.isHelper
? 'Helper'
: 'Not set yet'
: 'Not set yet'
}**`
);
Expand Down
7 changes: 7 additions & 0 deletions src/slash_commands/fun/singasong.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@ const { singasongConfig } = require('../_config/fun/singasong');
const { EmbedBuilder } = require('discord.js');

module.exports.run = async ({ main_interaction, bot }) => {
return await main_interaction
.reply({
content: 'This command is currently disabled!',
ephemeral: true,
})
.catch((err) => {});

const singasong = new SingASong(main_interaction, bot);

switch (main_interaction.options.getSubcommand()) {
Expand Down
4 changes: 2 additions & 2 deletions utils/classes/BanappealLogic.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -217,8 +217,8 @@ module.exports = class BanappealLogic {
err.code === 10026
? 'The user is not banned.'
: err.code === 50013
? 'The bot does not have permissions to unban the user.'
: 'There was an error while trying to unban the user.'
? 'The bot does not have permissions to unban the user.'
: 'There was an error while trying to unban the user.'
}`,
ephemeral: true,
})
Expand Down
2 changes: 1 addition & 1 deletion utils/classes/Notifications/Notifications.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ module.exports = class Notification {
updateNotification({ message, embed = null }) {
return new Promise((resolve, reject) => {
if (!message && !embed) return reject('No message, content or embed provided.');
if (!message instanceof Message) {
if ((!message) instanceof Message) {
return reject('Message is not a valid message object.');
}

Expand Down
4 changes: 2 additions & 2 deletions utils/classes/levelsystemAPI.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -473,8 +473,8 @@ class Levelsystem {
type === 'dm'
? 'type to **DM**'
: type === 'disable'
? 'type to **disabled**'
: 'channel to ' + channel
? 'type to **disabled**'
: 'channel to ' + channel
}`
);
})
Expand Down
8 changes: 4 additions & 4 deletions utils/classes/scam.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -420,8 +420,8 @@ module.exports.manageScam = async ({ main_interaction }) => {
request.request_type == 'ADD'
? `✅ This request has been added to the scam list by ${main_interaction.user}`
: request.request_type == 'DELETE'
? `✅ This request has been deleted from the scam list by ${main_interaction.user}`
: `✅ This Guild has been added to the blacklist by ${main_interaction.user}`,
? `✅ This request has been deleted from the scam list by ${main_interaction.user}`
: `✅ This Guild has been added to the blacklist by ${main_interaction.user}`,
components: [],
}).catch((err) => {});
});
Expand All @@ -433,8 +433,8 @@ module.exports.manageScam = async ({ main_interaction }) => {
request.request_type == 'ADD'
? `✅ Your request got accepted.`
: request.request_type == 'DELETE'
? `❌ Your request got declined.`
: `❌ Your request got declined.`,
? `❌ Your request got declined.`
: `❌ Your request got declined.`,
})
.catch((err) => {});
}
Expand Down
16 changes: 8 additions & 8 deletions utils/functions/publicResponses/publicModResponses.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,10 @@ module.exports.publicInfractionResponse = async ({
inf.mute === 1
? `${'Mute'}`
: inf.kick === 1
? `${'Kick'}`
: inf.warn === 1
? `${'Warn'}`
: `${'Ban'}`
? `${'Kick'}`
: inf.warn === 1
? `${'Warn'}`
: `${'Ban'}`
}`,
value: `Reason: ${inf.reason} ${
inf.warn === 0
Expand All @@ -116,10 +116,10 @@ module.exports.publicInfractionResponse = async ({
timeZone: 'UTC',
})
: inf.mute === 1
? 'Permanent'
: inf.ban === 1
? 'Permanent'
: ''
? 'Permanent'
: inf.ban === 1
? 'Permanent'
: ''
}**`
: ''
}`,
Expand Down

0 comments on commit d763437

Please sign in to comment.