File tree Expand file tree Collapse file tree 1 file changed +15
-3
lines changed
Expand file tree Collapse file tree 1 file changed +15
-3
lines changed Original file line number Diff line number Diff line change @@ -2,18 +2,30 @@ const fs = require('fs');
22const Discord = require ( 'discord.js' ) ;
33const { log } = require ( './utils/' ) ;
44const { MessageHandler } = require ( './handlers/' ) ;
5- const config = require ( '../../config' ) || require ( '../config' ) ;
5+ let config ;
6+
7+ try {
8+ config = require ( '../../config' ) ;
9+ } catch ( e ) {
10+ config = require ( '../config' ) ;
11+ }
612
713const loadRules = ( ruleNames , eventName ) => {
814 let rules = [ ] ;
915
1016 ruleNames . forEach ( ( ruleName ) => {
1117 const rulePath = `../rules/${ eventName } .${ ruleName } .js` ;
12- const rule = require ( `../${ rulePath } ` ) || require ( rulePath ) ;
18+ let rule ;
19+
20+ try {
21+ rule = require ( `../${ rulePath } ` ) ;
22+ } catch ( e ) {
23+ rule = require ( rulePath ) ;
24+ }
1325
1426 if ( Array . isArray ( rule ) ) rules . push ( ...rule ) ;
1527 else if ( typeof rule === 'object' ) rules . push ( rule ) ;
16- else throw `Error: Unknown error loading rule file "./ rules/${ eventName } .${ ruleName } .js"` ;
28+ else throw `Error: Unknown error loading rule file "rules/${ eventName } .${ ruleName } .js"` ;
1729 } ) ;
1830
1931 return { rules } ;
You can’t perform that action at this time.
0 commit comments