From f6c0582b2d4fb9bae8e7d67f8d0b9bdb6ffe8e49 Mon Sep 17 00:00:00 2001 From: Mai Sakurajima Date: Thu, 24 Sep 2020 02:43:19 +0800 Subject: [PATCH 1/6] Changes for Linux Compatibility --- helper.js | 10 +++++----- utilities/{Anilist Query.js => AnilistQuery.js} | 0 utilities/{Anilist Schedule.js => AnilistSchedule.js} | 0 .../{Cooldowns Checker.js => CooldownsChecker.js} | 0 .../{Permissions Checker.js => PermissionsChecker.js} | 0 utilities/{String Utilities.js => StringUtilities.js} | 0 6 files changed, 5 insertions(+), 5 deletions(-) rename utilities/{Anilist Query.js => AnilistQuery.js} (100%) rename utilities/{Anilist Schedule.js => AnilistSchedule.js} (100%) rename utilities/{Cooldowns Checker.js => CooldownsChecker.js} (100%) rename utilities/{Permissions Checker.js => PermissionsChecker.js} (100%) rename utilities/{String Utilities.js => StringUtilities.js} (100%) diff --git a/helper.js b/helper.js index 98358400..4011da72 100644 --- a/helper.js +++ b/helper.js @@ -3,7 +3,7 @@ const requireText = require('require-text') module.exports = { //text Helpers - TextHelpers: require('./utilities/String Utilities') + TextHelpers: require('./utilities/StringUtilities') //GraphiQl Templates , NextAirDate_NoQuery: requireText('./assets/graphql/NextAirDateWithoutQuery.graphql', require) @@ -13,8 +13,8 @@ module.exports = { , Watching: requireText('./assets/graphql/Watching.graphql', require) //Anilist Tools - , AniListQuery: require('./utilities/Anilist Query') - , AniListSchedule: require('./utilities/Anilist Schedule') + , AniListQuery: require('./utilities/AnilistQuery') + , AniListSchedule: require('./utilities/AnilistSchedule') //Error Tools , ErrorTools: require('./utilities/Errors') @@ -50,7 +50,7 @@ module.exports = { , addXP: require('./utilities/Add XP') //Permissions Checker - , PermissionsCheck: require('./utilities/Permissions Checker') - , CooldownsCheck: require('./utilities/Cooldowns Checker') + , PermissionsCheck: require('./utilities/PermissionsChecker') + , CooldownsCheck: require('./utilities/CooldownsChecker') } diff --git a/utilities/Anilist Query.js b/utilities/AnilistQuery.js similarity index 100% rename from utilities/Anilist Query.js rename to utilities/AnilistQuery.js diff --git a/utilities/Anilist Schedule.js b/utilities/AnilistSchedule.js similarity index 100% rename from utilities/Anilist Schedule.js rename to utilities/AnilistSchedule.js diff --git a/utilities/Cooldowns Checker.js b/utilities/CooldownsChecker.js similarity index 100% rename from utilities/Cooldowns Checker.js rename to utilities/CooldownsChecker.js diff --git a/utilities/Permissions Checker.js b/utilities/PermissionsChecker.js similarity index 100% rename from utilities/Permissions Checker.js rename to utilities/PermissionsChecker.js diff --git a/utilities/String Utilities.js b/utilities/StringUtilities.js similarity index 100% rename from utilities/String Utilities.js rename to utilities/StringUtilities.js From 7e87873b76aaced840639c310e5ddc44f75375a9 Mon Sep 17 00:00:00 2001 From: Mai Sakurajima Date: Thu, 24 Sep 2020 02:52:58 +0800 Subject: [PATCH 2/6] Change for Linux Compatibility v2 --- helper.js | 32 +++++++++---------- .../{AnilistQuery.js => Anilist Query.js} | 0 ...AnilistSchedule.js => Anilist Schedule.js} | 2 +- ...oldownsChecker.js => Cooldowns Checker.js} | 0 ...sionsChecker.js => Permissions Checker.js} | 0 ...StringUtilities.js => String Utilities.js} | 0 6 files changed, 17 insertions(+), 17 deletions(-) rename utilities/{AnilistQuery.js => Anilist Query.js} (100%) rename utilities/{AnilistSchedule.js => Anilist Schedule.js} (99%) rename utilities/{CooldownsChecker.js => Cooldowns Checker.js} (100%) rename utilities/{PermissionsChecker.js => Permissions Checker.js} (100%) rename utilities/{StringUtilities.js => String Utilities.js} (100%) diff --git a/helper.js b/helper.js index 4011da72..d576d592 100644 --- a/helper.js +++ b/helper.js @@ -3,7 +3,7 @@ const requireText = require('require-text') module.exports = { //text Helpers - TextHelpers: require('./utilities/StringUtilities') + TextHelpers: require('./utilities/String Utilities.js') //GraphiQl Templates , NextAirDate_NoQuery: requireText('./assets/graphql/NextAirDateWithoutQuery.graphql', require) @@ -13,19 +13,19 @@ module.exports = { , Watching: requireText('./assets/graphql/Watching.graphql', require) //Anilist Tools - , AniListQuery: require('./utilities/AnilistQuery') - , AniListSchedule: require('./utilities/AnilistSchedule') + , AniListQuery: require('./utilities/Anilist Query.js') + , AniListSchedule: require('./utilities/Anilist Schedule.js') //Error Tools - , ErrorTools: require('./utilities/Errors') + , ErrorTools: require('./utilities/Errors.js') //Mongoose Models , MongooseModels: { - guildInviteSchema: require('./models/guildInviteSchema') - , guildProfileSchema: require('./models/guildProfileSchema') - , guildWatchlistSchema: require('./models/guildWatchlistSchema') - , malProfileSchema: require('./models/malProfileSchema') - , xpSchema: require('./models/xpSchema') + guildInviteSchema: require('./models/guildInviteSchema.js') + , guildProfileSchema: require('./models/guildProfileSchema.js') + , guildWatchlistSchema: require('./models/guildWatchlistSchema.js') + , malProfileSchema: require('./models/malProfileSchema.js') + , xpSchema: require('./models/xpSchema.js') } //Databases @@ -37,20 +37,20 @@ module.exports = { //Classes , Classes: { - Paginate: require('./struct/Paginate') + Paginate: require('./struct/Paginate.js') } , Quiz: { - collectPlayers: require('./utilities/quiz/collectPlayers') - , loadQuestions: require('./utilities/quiz/loadQuestions') - , sendQuestion: require('./utilities/quiz/sendQuestion') + collectPlayers: require('./utilities/quiz/collectPlayers.js') + , loadQuestions: require('./utilities/quiz/loadQuestions.js') + , sendQuestion: require('./utilities/quiz/sendQuestion.js') } //XP - , addXP: require('./utilities/Add XP') + , addXP: require('./utilities/Add XP.js') //Permissions Checker - , PermissionsCheck: require('./utilities/PermissionsChecker') - , CooldownsCheck: require('./utilities/CooldownsChecker') + , PermissionsCheck: require('./utilities/Permissions Checker.js') + , CooldownsCheck: require('./utilities/Cooldowns Checker.js') } diff --git a/utilities/AnilistQuery.js b/utilities/Anilist Query.js similarity index 100% rename from utilities/AnilistQuery.js rename to utilities/Anilist Query.js diff --git a/utilities/AnilistSchedule.js b/utilities/Anilist Schedule.js similarity index 99% rename from utilities/AnilistSchedule.js rename to utilities/Anilist Schedule.js index 1bdfc185..4f0c48aa 100644 --- a/utilities/AnilistSchedule.js +++ b/utilities/Anilist Schedule.js @@ -4,7 +4,7 @@ require('moment-duration-format'); const { duration } = require('moment'); const { MessageEmbed } = require('discord.js') const guildWatchlistSchema = require('../models/guildWatchlistSchema') -const query = require('./AniList Query') +const query = require('./AniList Query.js') const schedule = require('require-text')('../assets/graphql/Schedule.graphql', require) let queuedNotifications = []; diff --git a/utilities/CooldownsChecker.js b/utilities/Cooldowns Checker.js similarity index 100% rename from utilities/CooldownsChecker.js rename to utilities/Cooldowns Checker.js diff --git a/utilities/PermissionsChecker.js b/utilities/Permissions Checker.js similarity index 100% rename from utilities/PermissionsChecker.js rename to utilities/Permissions Checker.js diff --git a/utilities/StringUtilities.js b/utilities/String Utilities.js similarity index 100% rename from utilities/StringUtilities.js rename to utilities/String Utilities.js From f804b13709f1692e47062f4757238e8edd1754bc Mon Sep 17 00:00:00 2001 From: Mai Sakurajima Date: Thu, 24 Sep 2020 02:57:18 +0800 Subject: [PATCH 3/6] experimental changes --- helper.js | 2 +- utilities/Anilist Schedule.js | 2 +- utilities/{Anilist Query.js => AnilistQuery.js} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename utilities/{Anilist Query.js => AnilistQuery.js} (100%) diff --git a/helper.js b/helper.js index d576d592..50689e9f 100644 --- a/helper.js +++ b/helper.js @@ -13,7 +13,7 @@ module.exports = { , Watching: requireText('./assets/graphql/Watching.graphql', require) //Anilist Tools - , AniListQuery: require('./utilities/Anilist Query.js') + , AniListQuery: require('./utilities/AnilistQuery.js') , AniListSchedule: require('./utilities/Anilist Schedule.js') //Error Tools diff --git a/utilities/Anilist Schedule.js b/utilities/Anilist Schedule.js index 4f0c48aa..5efc1e0d 100644 --- a/utilities/Anilist Schedule.js +++ b/utilities/Anilist Schedule.js @@ -4,7 +4,7 @@ require('moment-duration-format'); const { duration } = require('moment'); const { MessageEmbed } = require('discord.js') const guildWatchlistSchema = require('../models/guildWatchlistSchema') -const query = require('./AniList Query.js') +const query = require('./AniListQuery.js') const schedule = require('require-text')('../assets/graphql/Schedule.graphql', require) let queuedNotifications = []; diff --git a/utilities/Anilist Query.js b/utilities/AnilistQuery.js similarity index 100% rename from utilities/Anilist Query.js rename to utilities/AnilistQuery.js From 53b103e1803e9ea72e84908766a5484cd429a5a1 Mon Sep 17 00:00:00 2001 From: Mai Sakurajima Date: Thu, 24 Sep 2020 03:01:49 +0800 Subject: [PATCH 4/6] experimental change --- helper.js | 2 +- utilities/{AnilistQuery.js => Anilist Query.js} | 0 utilities/Anilist Schedule.js | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename utilities/{AnilistQuery.js => Anilist Query.js} (100%) diff --git a/helper.js b/helper.js index 50689e9f..f632917e 100644 --- a/helper.js +++ b/helper.js @@ -13,7 +13,7 @@ module.exports = { , Watching: requireText('./assets/graphql/Watching.graphql', require) //Anilist Tools - , AniListQuery: require('./utilities/AnilistQuery.js') + , AniListQuery: require('./utilities/Anilist Query') , AniListSchedule: require('./utilities/Anilist Schedule.js') //Error Tools diff --git a/utilities/AnilistQuery.js b/utilities/Anilist Query.js similarity index 100% rename from utilities/AnilistQuery.js rename to utilities/Anilist Query.js diff --git a/utilities/Anilist Schedule.js b/utilities/Anilist Schedule.js index 5efc1e0d..c53eb030 100644 --- a/utilities/Anilist Schedule.js +++ b/utilities/Anilist Schedule.js @@ -4,7 +4,7 @@ require('moment-duration-format'); const { duration } = require('moment'); const { MessageEmbed } = require('discord.js') const guildWatchlistSchema = require('../models/guildWatchlistSchema') -const query = require('./AniListQuery.js') +const { AniListQuery: query } = require('../helper.js') const schedule = require('require-text')('../assets/graphql/Schedule.graphql', require) let queuedNotifications = []; From 98274deae7f5612f9a917c05f04f848cdcd32ae6 Mon Sep 17 00:00:00 2001 From: Mai Sakurajima Date: Thu, 24 Sep 2020 03:08:21 +0800 Subject: [PATCH 5/6] Linux-based Changes --- helper.js | 30 +++++++++++++++--------------- index.js | 2 +- utilities/Anilist Schedule.js | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/helper.js b/helper.js index f632917e..98358400 100644 --- a/helper.js +++ b/helper.js @@ -3,7 +3,7 @@ const requireText = require('require-text') module.exports = { //text Helpers - TextHelpers: require('./utilities/String Utilities.js') + TextHelpers: require('./utilities/String Utilities') //GraphiQl Templates , NextAirDate_NoQuery: requireText('./assets/graphql/NextAirDateWithoutQuery.graphql', require) @@ -14,18 +14,18 @@ module.exports = { //Anilist Tools , AniListQuery: require('./utilities/Anilist Query') - , AniListSchedule: require('./utilities/Anilist Schedule.js') + , AniListSchedule: require('./utilities/Anilist Schedule') //Error Tools - , ErrorTools: require('./utilities/Errors.js') + , ErrorTools: require('./utilities/Errors') //Mongoose Models , MongooseModels: { - guildInviteSchema: require('./models/guildInviteSchema.js') - , guildProfileSchema: require('./models/guildProfileSchema.js') - , guildWatchlistSchema: require('./models/guildWatchlistSchema.js') - , malProfileSchema: require('./models/malProfileSchema.js') - , xpSchema: require('./models/xpSchema.js') + guildInviteSchema: require('./models/guildInviteSchema') + , guildProfileSchema: require('./models/guildProfileSchema') + , guildWatchlistSchema: require('./models/guildWatchlistSchema') + , malProfileSchema: require('./models/malProfileSchema') + , xpSchema: require('./models/xpSchema') } //Databases @@ -37,20 +37,20 @@ module.exports = { //Classes , Classes: { - Paginate: require('./struct/Paginate.js') + Paginate: require('./struct/Paginate') } , Quiz: { - collectPlayers: require('./utilities/quiz/collectPlayers.js') - , loadQuestions: require('./utilities/quiz/loadQuestions.js') - , sendQuestion: require('./utilities/quiz/sendQuestion.js') + collectPlayers: require('./utilities/quiz/collectPlayers') + , loadQuestions: require('./utilities/quiz/loadQuestions') + , sendQuestion: require('./utilities/quiz/sendQuestion') } //XP - , addXP: require('./utilities/Add XP.js') + , addXP: require('./utilities/Add XP') //Permissions Checker - , PermissionsCheck: require('./utilities/Permissions Checker.js') - , CooldownsCheck: require('./utilities/Cooldowns Checker.js') + , PermissionsCheck: require('./utilities/Permissions Checker') + , CooldownsCheck: require('./utilities/Cooldowns Checker') } diff --git a/index.js b/index.js index fb394125..e11bef66 100644 --- a/index.js +++ b/index.js @@ -51,7 +51,7 @@ const mai = new Client({ , 'quiz' , 'xp' ] - , prefix: ',' + , prefix: 'm!' , uploadchannel: '728866550207086642' , owners: ['545427431662682112'] , mongoPassword: process.env.MONGO diff --git a/utilities/Anilist Schedule.js b/utilities/Anilist Schedule.js index c53eb030..b2f74964 100644 --- a/utilities/Anilist Schedule.js +++ b/utilities/Anilist Schedule.js @@ -4,7 +4,7 @@ require('moment-duration-format'); const { duration } = require('moment'); const { MessageEmbed } = require('discord.js') const guildWatchlistSchema = require('../models/guildWatchlistSchema') -const { AniListQuery: query } = require('../helper.js') +const query = require('./Anilist Query') const schedule = require('require-text')('../assets/graphql/Schedule.graphql', require) let queuedNotifications = []; From 7daa076d8da3e8084b7407bf004fe7fd1edc8b81 Mon Sep 17 00:00:00 2001 From: Mai Sakurajima Date: Thu, 24 Sep 2020 03:30:08 +0800 Subject: [PATCH 6/6] Catch Unhandled Promise Rejection --- utilities/Add XP.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utilities/Add XP.js b/utilities/Add XP.js index 2e0adb53..68411f03 100644 --- a/utilities/Add XP.js +++ b/utilities/Add XP.js @@ -17,11 +17,11 @@ module.exports = (guildID, userID, xp) => { return new Promise((resolve,reject)=>{ xpSchema.findOne({ guildID, userID }, async (err,data) => { - if (err) reject('Unable to connecto to database') + if (err) return reject('Unable to connecto to database') if (!data) data = await new xpSchema({ guildID, userID }).save().catch(()=>null) - if (!data) reject('Unable to save new document') + if (!data) return reject('Unable to save new document') let cap = 150 * (data.level * 2) let next = cap * data.level