Merge pull request #51 from Rahuletto/dev

main <- dev

Author: Rahuletto

README.md

@@ -26,19 +26,27 @@ npm install simply-djs
 yarn add simply-djs
 ```
 
+## **Need Help ? Join the [Discord Server](https://discord.gg/3JzDV9T5Fn)**
+
 <br>
 
 # 🎉 [What's New](https://simplyd.js.org/docs/new) 🎉
-- ### Insane Big Bug Fixes
-- ### Removed `rankCard`
 
-<br>
+## Note that this is just half of the update.
 
-## **Need Help ? Join the [Discord Server](https://discord.gg/3JzDV9T5Fn)**
+- ### Beyond Customization !!!. Now Some functions return data [Refer docs], So you can use them.
+- ### Custom Errors !
+- ### Auto Slash Recognition ! No more slash options.
+- ### Code cleanup.
+- ### Re-did many functions.
+- ### 40% Promise Based !
+- ### Bug Fixes.
+
+- ### [Docs Became open-src (kinda)](https://github.com/Rahuletto/simplydjs-docs)
 
 <br>
 
-# But Why ?
+# 🤔 But Why ?
 
 - Simplifies things in discord.js
 - Fastest Support ever
@@ -51,7 +59,25 @@ yarn add simply-djs
 - Simple & Understandable **[Documentation](https://simplyd.js.org)**
 
 <br>
-   
+
+# 📄 [License](https://creativecommons.org/licenses/by-nc-nd/4.0/)
+
+## You are free to:
+
+- **Share:** Copy and redistribute the material in any medium or format
+
+## Under the following terms:
+
+- **Attribution:** You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may do so in any reasonable manner, but not in any way that suggests the licensor endorses you or your use.
+
+- **NonCommercial:** You may not use the material for commercial purposes.
+
+- **NoDerivatives:** If you remix, transform, or build upon the material, you may not distribute the _modified_ material.
+
+<img align="center" style="margin-bottom:-6px; width: 100px" src="https://mirrors.creativecommons.org/presskit/logos/cc.logo.large.png">
+
+<br>
+
  <h1>👥 Contact us | Support</h1>
  <p>
 <a href="https://discord.gg/3JzDV9T5Fn"><img src="https://media.discordapp.net/attachments/867344514943156254/891314222837936168/9sG4YFfuxxvPzCfcJO6XXnuAAAAAElFTkSuQmCC.png" /></a>

index.d.ts

@@ -284,7 +284,8 @@ export type rpsOptions = {
 export declare function rps(
 	message: Message,
 	options?: rpsOptions
-): Promise<any>
+): Promise<User>
+
 export declare function rps(
 	interaction: CommandInteraction,
 	options?: rpsOptions

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "simply-djs",
-	"version": "2.2.2",
+	"version": "2.5.2",
 	"description": "A Simple, Easy and Beginner friendly Discord.js Package for everyone. Uses Discord.js v13",
 	"main": "simplydjs.js",
 	"typings": "index.d.ts",

src/Error/Error.js

@@ -0,0 +1,20 @@
+class SimplyError extends Error {
+	/**
+	 * SimplyError
+	 * @param {String} name
+	 * @param {String} tip
+	 */
+
+	constructor(name, tip) {
+		tip = tip || 'Join the Support Server [https://discord.gg/3JzDV9T5Fn]'
+
+		const msg = '"' + name + '"' + '\n' + 'Tip: ' + tip + '\n'
+		super(msg)
+	}
+}
+
+Object.defineProperty(SimplyError.prototype, 'name', {
+	value: 'SimplyError'
+})
+
+module.exports = SimplyError

src/automeme.js

@@ -1,5 +1,6 @@
 const Discord = require('discord.js')
 const fetch = require('node-fetch')
+let SimplyError = require('./Error/Error.js')
 
 /**
  * @param {Discord.Client} client
@@ -43,7 +44,10 @@ async function automeme(client, options = []) {
 	let interv
 	if (options.interval) {
 		if (options.interval <= 60000)
-			throw new Error(`Interval Time should be above 60000 (1 minute).`)
+			throw new SimplyError(
+				`Interval Time should be above 60000 (1 minute).`,
+				'Interval should not be less than 60000'
+			)
 		interv = options.interval
 	} else {
 		interv = 120000
@@ -52,17 +56,19 @@ async function automeme(client, options = []) {
 	setInterval(() => {
 		const channel = client.channels.cache.get(ch)
 		if (!channel)
-			throw new Error(
-				"Invalid channel id has been provided (OR) I don't have permissions to View the Channel"
+			throw new SimplyError(
+				"Invalid channel id has been provided (OR) I don't have permissions to View the Channel",
+				'Check my permissions (or) Try using other Channel ID'
 			)
 
 		fetch(`https://www.reddit.com/r/${sub[random]}/random/.json`)
 			.then((res) => res.json())
 			.then((response) => {
+				if (!response) return
+				if (!response[0].data) return
+
+				if (response[0].data.children[0].data.over_18 === true) return
 
-				if(!response) return;
-				if(!response[0].data) return;
-				
 				let perma = response[0].data.children[0].data.permalink
 				let url = `https://reddit.com${perma}`
 				let memeImage =

src/btnrole.js

@@ -1,4 +1,5 @@
 const Discord = require('discord.js')
+let SimplyError = require('./Error/Error.js')
 
 /**
  * @param {Discord.Client} client
@@ -22,7 +23,7 @@ embed => Embed
 async function btnrole(client, message, options = []) {
 	try {
 		if (!options.data)
-			throw new Error(
+			throw new SimplyError(
 				'NO_DATA_PROVIDED. You didnt specify any data to make buttons..'
 			)
 
@@ -52,7 +53,10 @@ async function btnrole(client, message, options = []) {
 			button = new Array([], [], [], [], [])
 			btnroleengin(data, button, row)
 		} else if (data.length > 25) {
-			throw new Error('Max 25 roles accepted.. Exceeding it will cause errors.')
+			throw new SimplyError(
+				'Max 25 roles accepted.. Exceeding it will cause errors.',
+				'Discord allows only 25 buttons in a message. Send a new message with more buttons.'
+			)
 		}
 		async function btnroleengin(data, button, row) {
 			let current = 0
@@ -84,16 +88,24 @@ async function btnrole(client, message, options = []) {
 			}
 
 			if (!options.embed)
-				throw new Error(
-					'NO_EMBED_SPECIFIED. You didnt specify any embed to me to send..'
+				throw new SimplyError(
+					'NO_EMBED_SPECIFIED. You didnt specify any embed to me to send..',
+					'Create a new embed and specify.'
 				)
 
 			let emb = options.embed
 
-			message.channel.send({
-				embeds: [emb],
-				components: row
-			})
+			if (message.commandId) {
+				message.followUp({
+					embeds: [emb],
+					components: row
+				})
+			} else if (!message.commandId) {
+				message.channel.send({
+					embeds: [emb],
+					components: row
+				})
+			}
 
 			function addRow(btns) {
 				let row1 = new MessageActionRow()

src/bumpSys.js

@@ -1,4 +1,5 @@
 const Discord = require('discord.js')
+let SimplyError = require('./Error/Error.js')
 
 /**
  * @param {Discord.Client} client
@@ -77,7 +78,11 @@ async function bumpSys(client, db, options = []) {
 					} else return
 				}
 			}, 5000)
-		} else throw new Error('Unknown Event.. Please provide me a valid event..')
+		} else
+			throw new SimplyError(
+				'Unknown Event.. Please provide me a valid event..',
+				'Available Events: ready | messageCreate'
+			)
 	} catch (err) {
 		console.log(`Error Occured. | bumpSystem | Error: ${err.stack}`)
 	}