Galactic/galactic-bot
3
1
Fork 1
Code Issues 4 Pull Requests Projects 2 Releases Wiki Activity

Merge branch 'master' of https://github.com/Navy-gif/New-Gbot

Browse Source
This commit is contained in:
nolan 2021-06-11 23:45:19 -07:00
commit 26fbc12af3
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
structure/client/DiscordClient.js
View File

@ -76,7 +76,7 @@ class DiscordClient extends Client {
this.logger.info(`Took ${Date.now()-beforeTime}ms to build the client.`);
process.on("unhandledRejection", (error) => {
this.client.logger.error(`Unhandled Promise Rejection:\n${error.stack || error}`);
this.logger.error(`Unhandled Promise Rejection:\n${error.stack || error}`);
});
this._built = true;
@ -106,7 +106,7 @@ class DiscordClient extends Client {
// eslint-disable-next-line no-eval
template = eval(template);
} catch(error) {
this.client.logger.error(`Error in locale ${language}:${index} while executing code.\n${error.stack || error}`);
this.logger.error(`Error in locale ${language}:${index} while executing code.\n${error.stack || error}`);
}
}
@ -176,7 +176,7 @@ class DiscordClient extends Client {
}
get prefix() {
return this._options.prefix;
return this._options.bot.prefix;
}
get storage() {

2
structure/client/components/inhibitors/Permissions.js
View File

@ -27,7 +27,7 @@ class Permissions extends Inhibitor {
//NOTE: Rewrite this entire fucking file :)
if(missing.length === permissions.length && permissions.length > 0) return super._fail({ missing: missing.join(', ') });
return super._succeed();
} else if(permissionType === 'grant' && command.permissionRequired) {
} else if(permissionType === 'grant' && permissions.length) {
// vv Prevent Softlock vv
if(safeCommands.includes(command.resolveable) && (this._checkDiscord(message, ['ADMINISTRATOR']).length === 0 || this._checkDiscord(message, ['MANAGE_GUILD']).length === 0)) {
return super._succeed();

2
structure/interfaces/Command.js
View File

@ -61,7 +61,7 @@ class Command extends Component {
usageEmbed(message, verbose = false) {
const { guild } = message;
const type = guild._settings.permissionType;
const type = guild?._settings.permissionType;
const prefix = guild?.prefix || this.client.prefix;
const fields = [];

2
util/filterPresets.json
View File

@ -1,7 +1,7 @@
{
"regex": {
"slurs": [
"n(ae|ea|ji|j|y|i|x|!|1|\\||l)(gg?|qq|99?|bb)(?!(ht|el))((e|3)r|let|ur|\\s?nog|y|ah?|or)?s?",
"n(ae|ji|j|y|i|x|!|1|\\||l)(gg?|qq|99?|bb)(?!(ht|el|un))((e|3)r|let|ur|\\s?nog|y|ah?|or)?s?",
"(?<!u)niqa?",
"nick\\s?(gurr?|ger|ga)",
"(fur\\s?)?f(e|a|4|x)(gg?|qq|99?)(otry|ots|ot|y|s)?",