Merge branch 'master' of https://github.com/mudkipscience/woomy
This commit is contained in:
		
						commit
						64aa46a04b
					
				
					 7 changed files with 18 additions and 14 deletions
				
			
		
							
								
								
									
										3
									
								
								.gitignore
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								.gitignore
									
										
									
									
										vendored
									
									
								
							| 
						 | 
					@ -1,4 +1,5 @@
 | 
				
			||||||
node_modules
 | 
					node_modules
 | 
				
			||||||
data
 | 
					data
 | 
				
			||||||
config.js
 | 
					config.js
 | 
				
			||||||
package-lock.json
 | 
					package-lock.json
 | 
				
			||||||
 | 
					.env
 | 
				
			||||||
| 
						 | 
					@ -1,6 +1,6 @@
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
  "name": "woomy",
 | 
					  "name": "woomy",
 | 
				
			||||||
  "version": "1.1.0",
 | 
					  "version": "1.2.3",
 | 
				
			||||||
  "description": "Woomy is a all-purpose discord bot built off the guidebot base and coded in node.js using discord.js.",
 | 
					  "description": "Woomy is a all-purpose discord bot built off the guidebot base and coded in node.js using discord.js.",
 | 
				
			||||||
  "main": "index.js",
 | 
					  "main": "index.js",
 | 
				
			||||||
  "dependencies": {
 | 
					  "dependencies": {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,4 +1,4 @@
 | 
				
			||||||
const API = require('nekos.life');
 | 
					/*const API = require('nekos.life');
 | 
				
			||||||
const {sfw} = new API();
 | 
					const {sfw} = new API();
 | 
				
			||||||
exports.run = async (client, message) => {
 | 
					exports.run = async (client, message) => {
 | 
				
			||||||
  message.channel.startTyping();
 | 
					  message.channel.startTyping();
 | 
				
			||||||
| 
						 | 
					@ -15,7 +15,7 @@ exports.run = async (client, message) => {
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
exports.conf = {
 | 
					exports.conf = {
 | 
				
			||||||
  enabled: true, 
 | 
					  enabled: false, 
 | 
				
			||||||
  guildOnly: false,
 | 
					  guildOnly: false,
 | 
				
			||||||
  aliases: [],
 | 
					  aliases: [],
 | 
				
			||||||
  permLevel: "User",
 | 
					  permLevel: "User",
 | 
				
			||||||
| 
						 | 
					@ -28,3 +28,4 @@ exports.help = {
 | 
				
			||||||
  description: "Sends you pictures of fox girls.",
 | 
					  description: "Sends you pictures of fox girls.",
 | 
				
			||||||
  usage: "foxgirl"
 | 
					  usage: "foxgirl"
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					*/
 | 
				
			||||||
| 
						 | 
					@ -1,4 +1,4 @@
 | 
				
			||||||
const API = require('nekos.life');
 | 
					/*const API = require('nekos.life');
 | 
				
			||||||
const {sfw} = new API();
 | 
					const {sfw} = new API();
 | 
				
			||||||
exports.run = async (client, message) => {
 | 
					exports.run = async (client, message) => {
 | 
				
			||||||
  message.channel.startTyping();
 | 
					  message.channel.startTyping();
 | 
				
			||||||
| 
						 | 
					@ -15,7 +15,7 @@ exports.run = async (client, message) => {
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
exports.conf = {
 | 
					exports.conf = {
 | 
				
			||||||
  enabled: true, 
 | 
					  enabled: false, 
 | 
				
			||||||
  guildOnly: false,
 | 
					  guildOnly: false,
 | 
				
			||||||
  aliases: [],
 | 
					  aliases: [],
 | 
				
			||||||
  permLevel: "User",
 | 
					  permLevel: "User",
 | 
				
			||||||
| 
						 | 
					@ -27,4 +27,4 @@ exports.help = {
 | 
				
			||||||
  category: "Image",
 | 
					  category: "Image",
 | 
				
			||||||
  description: "Sends you pictures of people with animal characteristics.",
 | 
					  description: "Sends you pictures of people with animal characteristics.",
 | 
				
			||||||
  usage: "kemonomimi"
 | 
					  usage: "kemonomimi"
 | 
				
			||||||
};
 | 
					};*/
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,4 +1,4 @@
 | 
				
			||||||
const API = require('nekos.life');
 | 
					/*const API = require('nekos.life');
 | 
				
			||||||
const {sfw} = new API();
 | 
					const {sfw} = new API();
 | 
				
			||||||
exports.run = async (client, message) => {
 | 
					exports.run = async (client, message) => {
 | 
				
			||||||
  message.channel.startTyping();
 | 
					  message.channel.startTyping();
 | 
				
			||||||
| 
						 | 
					@ -15,7 +15,7 @@ exports.run = async (client, message) => {
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
exports.conf = {
 | 
					exports.conf = {
 | 
				
			||||||
  enabled: true, 
 | 
					  enabled: false, 
 | 
				
			||||||
  guildOnly: false,
 | 
					  guildOnly: false,
 | 
				
			||||||
  aliases: ["catgirl"],
 | 
					  aliases: ["catgirl"],
 | 
				
			||||||
  permLevel: "User",
 | 
					  permLevel: "User",
 | 
				
			||||||
| 
						 | 
					@ -27,4 +27,4 @@ exports.help = {
 | 
				
			||||||
  category: "Image",
 | 
					  category: "Image",
 | 
				
			||||||
  description: "Sends you pictures of catgirls.",
 | 
					  description: "Sends you pictures of catgirls.",
 | 
				
			||||||
  usage: "neko"
 | 
					  usage: "neko"
 | 
				
			||||||
};
 | 
					};*/
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,4 +1,4 @@
 | 
				
			||||||
const API = require('nekos.life');
 | 
					/*const API = require('nekos.life');
 | 
				
			||||||
const {sfw} = new API();
 | 
					const {sfw} = new API();
 | 
				
			||||||
exports.run = async (client, message) => {
 | 
					exports.run = async (client, message) => {
 | 
				
			||||||
  message.channel.startTyping();
 | 
					  message.channel.startTyping();
 | 
				
			||||||
| 
						 | 
					@ -15,7 +15,7 @@ exports.run = async (client, message) => {
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
exports.conf = {
 | 
					exports.conf = {
 | 
				
			||||||
  enabled: true, 
 | 
					  enabled: false, 
 | 
				
			||||||
  guildOnly: false,
 | 
					  guildOnly: false,
 | 
				
			||||||
  aliases: ["catgirlgif"],
 | 
					  aliases: ["catgirlgif"],
 | 
				
			||||||
  permLevel: "User",
 | 
					  permLevel: "User",
 | 
				
			||||||
| 
						 | 
					@ -27,4 +27,4 @@ exports.help = {
 | 
				
			||||||
  category: "Image",
 | 
					  category: "Image",
 | 
				
			||||||
  description: "Sends you gifs of catgirls.",
 | 
					  description: "Sends you gifs of catgirls.",
 | 
				
			||||||
  usage: "nekogif"
 | 
					  usage: "nekogif"
 | 
				
			||||||
};
 | 
					};*/
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -280,6 +280,8 @@ module.exports = client => {
 | 
				
			||||||
          {
 | 
					          {
 | 
				
			||||||
              let dispatcher = client.music.getGuild(message.guild.id).dispatcher = connection.play(await ytdl("https://www.youtube.com/watch?v=" + id, {highWaterMark: 1024 * 1024 * 32}), {type: 'opus'});
 | 
					              let dispatcher = client.music.getGuild(message.guild.id).dispatcher = connection.play(await ytdl("https://www.youtube.com/watch?v=" + id, {highWaterMark: 1024 * 1024 * 32}), {type: 'opus'});
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					              dispatcher.setVolume(0.25)
 | 
				
			||||||
 | 
					            
 | 
				
			||||||
              dispatcher.on('finish', (a, b) =>
 | 
					              dispatcher.on('finish', (a, b) =>
 | 
				
			||||||
              {
 | 
					              {
 | 
				
			||||||
                  end(a == "silent");
 | 
					                  end(a == "silent");
 | 
				
			||||||
| 
						 | 
					@ -386,6 +388,6 @@ module.exports = client => {
 | 
				
			||||||
  });
 | 
					  });
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  process.on("unhandledRejection", err => {
 | 
					  process.on("unhandledRejection", err => {
 | 
				
			||||||
    client.logger.error(`Unhandled rejection: ${err.stack}`);
 | 
					    client.logger.error(`Unhandled rejection: ${err}`);
 | 
				
			||||||
  });
 | 
					  });
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue