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

sth

Browse Source
This commit is contained in:
Erik 2020-05-24 12:55:22 +03:00
parent e22dbd15b0
commit e7258233cd
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
language/LocaleLoader.js
View File

@ -57,7 +57,7 @@ class LocaleLoader {
let text = ''; let text = '';
for(const line of lines) { for(const line of lines) {
if(line.startsWith('//')) continue; if(line.startsWith('//')) continue;
const matches = line.match(/\[([_A-Z0-9]{1,})\]/giu); const matches = line.match(/\[([_A-Z0-9]{1,})\]/iu);
if(matches) { if(matches) {
if (matched) { if (matched) {
parsed[matched] = text; parsed[matched] = text;

3
language/languages/en_us/settings/en_us_moderation.lang
View File

@ -26,7 +26,7 @@ The followin infraction types will now be logged:
//CHATLOGS SETTING //CHATLOGS SETTING
[S_CHATLOGS_DESCRIPTION] [S_MESSAGELOGS_DESCRIPTION]
Configure message logging for your server. Configure message logging for your server.
[S_CHATLOGS_ROLES_LIST] [S_CHATLOGS_ROLES_LIST]
@ -65,6 +65,7 @@ Successfully reset the chatlogs setting.
[S_MUTE_DESCRIPTION] [S_MUTE_DESCRIPTION]
Assign or create a muted role and choose mute functionality for your guild. Assign or create a muted role and choose mute functionality for your guild.
__Mute Types__ __Mute Types__
**`0`:** Mutes only add/remove the muted role. *(default)* **`0`:** Mutes only add/remove the muted role. *(default)*
**`1`:** Mutes remove all roles except for the muted role. **`1`:** Mutes remove all roles except for the muted role.

4
structure/client/Resolver.js
View File

@ -46,10 +46,11 @@ class Resolver {
* @param {Array<String>} args The incoming arguments with the first element being the method ex. ['add','ban','kick'] * @param {Array<String>} args The incoming arguments with the first element being the method ex. ['add','ban','kick']
* @param {Array<String>} valid An array of items to compare to, if an argument doesn't exist in this array it'll be skipped over * @param {Array<String>} valid An array of items to compare to, if an argument doesn't exist in this array it'll be skipped over
* @param {Array<String>} [existing=[]] Existing values in the array, valid elements will be appended to this * @param {Array<String>} [existing=[]] Existing values in the array, valid elements will be appended to this
* @param {Function} resolver One of the resolver functions used to resolve the passed values into objects (should always be one of the mass resolver due to the nature of this method, might break otherwise)
* @returns {Object} * @returns {Object}
* @memberof Resolver * @memberof Resolver
*/ */
resolveMethod(args, valid, existing = []) { resolveMethod(args, valid, existing = [], resolver) {
const methods = { const methods = {
list: ['view', 'list', '?'], list: ['view', 'list', '?'],
@ -69,6 +70,7 @@ class Resolver {
} }
if (methods.list.includes(method)) { if (methods.list.includes(method)) {
if(resolver)
return { method: 'list' }; return { method: 'list' };
} else if (methods.add.includes(method)) { } else if (methods.add.includes(method)) {
const added = []; const added = [];

1
structure/client/components/settings/moderation/Modlogs.js
View File

@ -18,7 +18,6 @@ class Modlogs extends Setting {
], ],
guarded: true, guarded: true,
resolve: 'GUILD', resolve: 'GUILD',
index: 'modlogs',
examples: [ examples: [
'modlogs <add|remove|list> <infraction-type..>', 'modlogs <add|remove|list> <infraction-type..>',
'modlogs #moderation-log', 'modlogs #moderation-log',