chore(errors): using the method to generate error messages

shadowplay1 · Mar 19, 2023 · a4b34b5 · a4b34b5
1 parent d038888
commit a4b34b5
Show file tree

Hide file tree

Showing 37 changed files with 295 additions and 335 deletions.
diff --git a/examples/json/example.js b/examples/json/example.js
@@ -274,7 +274,7 @@ client.on('messageCreate', async message => {
     if (command == prefix + 'daily') {
         const dailyResult = user.rewards.getDaily()
 
-        if (dailyResult.cooldown) {
+        if (!dailyResult.claimed) {
             const cooldownTime = dailyResult.cooldown.time
 
             const cooldownTimeString =
@@ -303,7 +303,7 @@ client.on('messageCreate', async message => {
     if (command == prefix + 'work') {
         const workResult = user.rewards.getWork()
 
-        if (workResult.cooldown) {
+        if (!workResult.claimed) {
             const cooldownTime = workResult.cooldown.time
 
             const cooldownTimeString =
@@ -332,7 +332,7 @@ client.on('messageCreate', async message => {
     if (command == prefix + 'weekly') {
         const weeklyResult = user.rewards.getWeekly()
 
-        if (weeklyResult.cooldown) {
+        if (!weeklyResult.claimed) {
             const cooldownTime = weeklyResult.cooldown.time
 
             const cooldownTimeString =

diff --git a/examples/json/example.ts b/examples/json/example.ts
@@ -275,7 +275,7 @@ client.on('messageCreate', async msg => {
     if (command == prefix + 'daily') {
         const dailyResult = user.rewards.getDaily<false>()
 
-        if (dailyResult.cooldown) {
+        if (!dailyResult.claimed) {
             const cooldownTime = dailyResult.cooldown.time
 
             const cooldownTimeString =
@@ -304,7 +304,7 @@ client.on('messageCreate', async msg => {
     if (command == prefix + 'work') {
         const workResult = user.rewards.getWork<true>()
 
-        if (workResult.cooldown) {
+        if (!workResult.claimed) {
             const cooldownTime = workResult.cooldown.time
 
             const cooldownTimeString =
@@ -333,7 +333,7 @@ client.on('messageCreate', async msg => {
     if (command == prefix + 'weekly') {
         const weeklyResult = user.rewards.getWeekly<true>()
 
-        if (weeklyResult.cooldown) {
+        if (!weeklyResult.claimed) {
             const cooldownTime = weeklyResult.cooldown.time
 
             const cooldownTimeString =

diff --git a/examples/mongodb/example.js b/examples/mongodb/example.js
@@ -317,7 +317,7 @@ client.on('messageCreate', async message => {
     if (command == prefix + 'daily') {
         const dailyResult = await user.rewards.getDaily()
 
-        if (dailyResult.cooldown) {
+        if (!dailyResult.claimed) {
             const cooldownTime = dailyResult.cooldown.time
 
             const cooldownTimeString =
@@ -346,7 +346,7 @@ client.on('messageCreate', async message => {
     if (command == prefix + 'work') {
         const workResult = await user.rewards.getWork()
 
-        if (workResult.cooldown) {
+        if (!workResult.claimed) {
             const cooldownTime = workResult.cooldown.time
 
             const cooldownTimeString =
@@ -375,7 +375,7 @@ client.on('messageCreate', async message => {
     if (command == prefix + 'weekly') {
         const weeklyResult = await user.rewards.getWeekly()
 
-        if (weeklyResult.cooldown) {
+        if (!weeklyResult.claimed) {
             const cooldownTime = weeklyResult.cooldown.time
 
             const cooldownTimeString =

diff --git a/examples/mongodb/example.ts b/examples/mongodb/example.ts
@@ -318,7 +318,7 @@ client.on('messageCreate', async msg => {
     if (command == prefix + 'daily') {
         const dailyResult = await user.rewards.getDaily<false>()
 
-        if (dailyResult.cooldown) {
+        if (!dailyResult.claimed) {
             const cooldownTime = dailyResult.cooldown.time
 
             const cooldownTimeString =
@@ -347,7 +347,7 @@ client.on('messageCreate', async msg => {
     if (command == prefix + 'work') {
         const workResult = await user.rewards.getWork<true>()
 
-        if (workResult.cooldown) {
+        if (!workResult.claimed) {
             const cooldownTime = workResult.cooldown.time
 
             const cooldownTimeString =
@@ -376,7 +376,7 @@ client.on('messageCreate', async msg => {
     if (command == prefix + 'weekly') {
         const weeklyResult = await user.rewards.getWeekly<true>()
 
-        if (weeklyResult.cooldown) {
+        if (!weeklyResult.claimed) {
             const cooldownTime = weeklyResult.cooldown.time
 
             const cooldownTimeString =

diff --git a/mongodb/package.json b/mongodb/package.json
@@ -10,6 +10,7 @@
 		"precommit": "bash ./.husky/scripts/commit-to-public.sh",
 		"docs:deploy": "bash ./.husky/scripts/deploy-docs.sh",
 		"deploy": "bash ./.husky/scripts/commit-and-deploy.sh",
+		"upload": "bash ./publish.sh && bash ./.husky/scripts/deploy-docs.sh",
 		"lint": "eslint ./",
 		"lint:fix": "eslint ./ --fix"
 	},

diff --git a/mongodb/src/classes/HistoryItem.js b/mongodb/src/classes/HistoryItem.js
@@ -1,7 +1,3 @@
-const EconomyError = require('../classes/util/EconomyError')
-const errors = require('../structures/errors')
-
-
 /**
 * History item class.
 */
@@ -113,19 +109,6 @@ class HistoryItem {
      */
     async remove() {
         const id = this.id
-
-        if (typeof id !== 'number' && typeof id !== 'string') {
-            throw new EconomyError(errors.invalidTypes.id + typeof id, 'INVALID_TYPE')
-        }
-
-        if (typeof memberID !== 'string') {
-            throw new EconomyError(errors.invalidTypes.memberID + typeof memberID, 'INVALID_TYPE')
-        }
-
-        if (typeof guildID !== 'string') {
-            throw new EconomyError(errors.invalidTypes.guildID + typeof guildID, 'INVALID_TYPE')
-        }
-
         const history = (await this._database.fetch(`${this.guildID}.${this.memberID}.history`)) || []
 
         const historyItem = history.find(

diff --git a/mongodb/src/classes/ShopItem.js b/mongodb/src/classes/ShopItem.js
@@ -259,7 +259,7 @@ class ShopItem extends Emitter {
      */
     async buy(memberID, quantity = 1, currency = null, reason = 'received the item from the shop') {
         if (typeof memberID !== 'string') {
-            throw new EconomyError(errors.invalidTypes.memberID + typeof memberID, 'INVALID_TYPE')
+            throw new EconomyError(errors.invalidType('memberID', 'string', memberID), 'INVALID_TYPE')
         }
 
         const balance = this.cache.balance.get({

diff --git a/mongodb/src/classes/user/History.js b/mongodb/src/classes/user/History.js
@@ -84,7 +84,7 @@ class History extends BaseManager {
 
 
         if (typeof itemID !== 'number' && typeof itemID !== 'string') {
-            throw new EconomyError(errors.invalidTypes.editItemArgs.itemID + typeof itemID, 'INVALID_TYPE')
+            throw new EconomyError(errors.invalidType('itemID', 'string or number', itemID), 'INVALID_TYPE')
         }
 
         if (!item) return false
@@ -115,7 +115,7 @@ class History extends BaseManager {
      */
     async remove(id) {
         if (typeof id !== 'number' && typeof id !== 'string') {
-            throw new EconomyError(errors.invalidTypes.id + typeof id, 'INVALID_TYPE')
+            throw new EconomyError(errors.invalidType('id', 'string or number', id), 'INVALID_TYPE')
         }
 
         const history = (await this.fetch(this.memberID, this.guildID)) || []

diff --git a/mongodb/src/classes/user/Inventory.js b/mongodb/src/classes/user/Inventory.js
@@ -90,7 +90,7 @@ class Inventory extends BaseManager {
         const item = inventory[itemIndex]
 
         if (typeof itemID !== 'number' && typeof itemID !== 'string') {
-            throw new EconomyError(errors.invalidTypes.editItemArgs.itemID + typeof itemID, 'INVALID_TYPE')
+            throw new EconomyError(errors.invalidType('itemID', 'string or number', itemID), 'INVALID_TYPE')
         }
 
         if (!item) return null
@@ -183,7 +183,7 @@ class Inventory extends BaseManager {
         const inventoryItems = inventory.filter(invItem => invItem.name == item.name)
 
         if (typeof itemID !== 'number' && typeof itemID !== 'string') {
-            throw new EconomyError(errors.invalidTypes.editItemArgs.itemID + typeof itemID, 'INVALID_TYPE')
+            throw new EconomyError(errors.invalidType('itemID', 'string or number', itemID), 'INVALID_TYPE')
         }
 
         if (!item) return false
@@ -222,7 +222,7 @@ class Inventory extends BaseManager {
         const itemIndex = inventory.findIndex(invItem => invItem.id == item?.id)
 
         if (typeof itemID !== 'number' && typeof itemID !== 'string') {
-            throw new EconomyError(errors.invalidTypes.editItemArgs.itemID + typeof itemID, 'INVALID_TYPE')
+            throw new EconomyError(errors.invalidType('itemID', 'string or number', itemID), 'INVALID_TYPE')
         }
 
         if (!item) return false

diff --git a/mongodb/src/classes/user/Rewards.js b/mongodb/src/classes/user/Rewards.js
@@ -62,14 +62,6 @@ class Rewards {
     async receive(reward, reason) {
         const rewardTypes = ['daily', 'work', 'weekly', 'monthly', 'hourly']
 
-        if (typeof memberID !== 'string') {
-            throw new EconomyError(errors.invalidTypes.memberID + typeof memberID, 'INVALID_TYPE')
-        }
-
-        if (typeof guildID !== 'string') {
-            throw new EconomyError(errors.invalidTypes.guildID + typeof guildID, 'INVALID_TYPE')
-        }
-
         if (isNaN(reward) || !rewardTypes[reward]) {
             throw new EconomyError(
                 errors.invalidType('reward', 'key of RewardType enum', typeof reward),

diff --git a/mongodb/src/managers/BalanceManager.js b/mongodb/src/managers/BalanceManager.js
@@ -100,11 +100,11 @@ class BalanceManager extends Emitter {
     */
     async fetch(memberID, guildID) {
         if (typeof memberID !== 'string') {
-            throw new EconomyError(errors.invalidTypes.memberID + typeof memberID, 'INVALID_TYPE')
+            throw new EconomyError(errors.invalidType('memberID', 'string', memberID), 'INVALID_TYPE')
         }
 
         if (typeof guildID !== 'string') {
-            throw new EconomyError(errors.invalidTypes.guildID + typeof guildID, 'INVALID_TYPE')
+            throw new EconomyError(errors.invalidType('guildID', 'string', guildID), 'INVALID_TYPE')
         }
 
         const result = await this.database.fetch(`${guildID}.${memberID}.money`)
@@ -135,15 +135,15 @@ class BalanceManager extends Emitter {
         const balance = await this.fetch(memberID, guildID)
 
         if (isNaN(amount)) {
-            throw new EconomyError(errors.invalidTypes.amount + typeof amount, 'INVALID_TYPE')
+            throw new EconomyError(errors.invalidType('amount', 'number', amount), 'INVALID_TYPE')
         }
 
         if (typeof memberID !== 'string') {
-            throw new EconomyError(errors.invalidTypes.memberID + typeof memberID, 'INVALID_TYPE')
+            throw new EconomyError(errors.invalidType('memberID', 'string', memberID), 'INVALID_TYPE')
         }
 
         if (typeof guildID !== 'string') {
-            throw new EconomyError(errors.invalidTypes.guildID + typeof guildID, 'INVALID_TYPE')
+            throw new EconomyError(errors.invalidType('guildID', 'string', guildID), 'INVALID_TYPE')
         }
 
         await this.database.set(`${guildID}.${memberID}.money`, amount)
@@ -177,15 +177,15 @@ class BalanceManager extends Emitter {
         const balance = await this.fetch(memberID, guildID)
 
         if (isNaN(amount)) {
-            throw new EconomyError(errors.invalidTypes.amount + typeof amount, 'INVALID_TYPE')
+            throw new EconomyError(errors.invalidType('amount', 'number', amount), 'INVALID_TYPE')
         }
 
         if (typeof memberID !== 'string') {
-            throw new EconomyError(errors.invalidTypes.memberID + typeof memberID, 'INVALID_TYPE')
+            throw new EconomyError(errors.invalidType('memberID', 'string', memberID), 'INVALID_TYPE')
         }
 
         if (typeof guildID !== 'string') {
-            throw new EconomyError(errors.invalidTypes.guildID + typeof guildID, 'INVALID_TYPE')
+            throw new EconomyError(errors.invalidType('guildID', 'string', guildID), 'INVALID_TYPE')
         }
 
         await this.database.add(`${guildID}.${memberID}.money`, amount)
@@ -219,15 +219,15 @@ class BalanceManager extends Emitter {
         const balance = await this.fetch(memberID, guildID)
 
         if (isNaN(amount)) {
-            throw new EconomyError(errors.invalidTypes.amount + typeof amount, 'INVALID_TYPE')
+            throw new EconomyError(errors.invalidType('amount', 'number', amount), 'INVALID_TYPE')
         }
 
         if (typeof memberID !== 'string') {
-            throw new EconomyError(errors.invalidTypes.memberID + typeof memberID, 'INVALID_TYPE')
+            throw new EconomyError(errors.invalidType('memberID', 'string', memberID), 'INVALID_TYPE')
         }
 
         if (typeof guildID !== 'string') {
-            throw new EconomyError(errors.invalidTypes.guildID + typeof guildID, 'INVALID_TYPE')
+            throw new EconomyError(errors.invalidType('guildID', 'string', guildID), 'INVALID_TYPE')
         }
 
         await this.database.subtract(`${guildID}.${memberID}.money`, amount)
@@ -262,19 +262,19 @@ class BalanceManager extends Emitter {
         const bank = await this.database.get(`${guildID}.${memberID}.bank`)
 
         if (isNaN(amount)) {
-            throw new EconomyError(errors.invalidTypes.amount + typeof amount, 'INVALID_TYPE')
+            throw new EconomyError(errors.invalidType('amount', 'number', amount), 'INVALID_TYPE')
         }
 
         if (amount < 0) {
             throw new EconomyError(errors.invalidTypes.depositInvalidInput, 'INVALID_INPUT')
         }
 
         if (typeof memberID !== 'string') {
-            throw new EconomyError(errors.invalidTypes.memberID + typeof memberID, 'INVALID_TYPE')
+            throw new EconomyError(errors.invalidType('memberID', 'string', memberID), 'INVALID_TYPE')
         }
 
         if (typeof guildID !== 'string') {
-            throw new EconomyError(errors.invalidTypes.guildID + typeof guildID, 'INVALID_TYPE')
+            throw new EconomyError(errors.invalidType('guildID', 'string', guildID), 'INVALID_TYPE')
         }
 
         await this.database.subtract(`${guildID}.${memberID}.money`, amount)
@@ -316,7 +316,7 @@ class BalanceManager extends Emitter {
         const data = await this.database.all()
 
         if (typeof guildID !== 'string') {
-            throw new EconomyError(errors.invalidTypes.guildID + typeof guildID, 'INVALID_TYPE')
+            throw new EconomyError(errors.invalidType('guildID', 'string', guildID), 'INVALID_TYPE')
         }
 
         const guildData = data[guildID]
@@ -349,19 +349,19 @@ class BalanceManager extends Emitter {
         } = options || {}
 
         if (typeof guildID !== 'string') {
-            throw new EconomyError(errors.invalidTypes.guildID + typeof guildID, 'INVALID_TYPE')
+            throw new EconomyError(errors.invalidType('guildID', 'string', guildID), 'INVALID_TYPE')
         }
 
         if (isNaN(amount)) {
-            throw new EconomyError(errors.invalidTypes.amount + typeof amount, 'INVALID_TYPE')
+            throw new EconomyError(errors.invalidType('amount', 'number', amount), 'INVALID_TYPE')
         }
 
         if (typeof senderMemberID !== 'string') {
-            throw new EconomyError(errors.invalidTypes.senderMemberID + typeof senderMemberID, 'INVALID_TYPE')
+            throw new EconomyError(errors.invalidType('senderMemberID', 'string', senderMemberID), 'INVALID_TYPE')
         }
 
         if (typeof receiverMemberID !== 'string') {
-            throw new EconomyError(errors.invalidTypes.receiverMemberID + typeof receiverMemberID, 'INVALID_TYPE')
+            throw new EconomyError(errors.invalidType('receiverMemberID', 'string', receiverMemberID), 'INVALID_TYPE')
         }
 
         await this.add(amount, receiverMemberID, guildID, receivingReason || 'receiving money from user')