Skip to content

Commit

Permalink
Merge branch 'test-dev' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
linuxgemini authored Feb 13, 2017
2 parents d6ae088 + 9e56bf2 commit deda198
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 33 deletions.
7 changes: 6 additions & 1 deletion Bane.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ bot.on("message", message => {

let args = message.content.split(" ").slice(1);


if (commands[command]) {
commands[command].process(bot, message, suffix, args);
} else {
Expand All @@ -60,7 +61,11 @@ bot.on("message", message => {
});

bot.on("guildCreate", guild => {
console.log(`Yeni bir sunucuya katıldım, adı $(guild) ve sahibi $(guild.owner.user.username)`)
console.log("Yeni bir sunucuya katıldım: adı " + guild.name + ", sahibi " + guild.owner.user.username + " ve ID'si " + guild.id);
});

bot.on("guildDelete", guild => {
console.log("Bir sunucudan ayrıldım: adı " + guild.name + ", sahibi " + guild.owner.user.username + " ve ID'si " + guild.id);
});

bot.login(config.token);
2 changes: 1 addition & 1 deletion Komutlar.js
Original file line number Diff line number Diff line change
Expand Up @@ -952,7 +952,7 @@ exports.commands = {
},
"channelinfo": {
process: function (bot, message) {
return;
return;
}
}
};
67 changes: 36 additions & 31 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,31 +1,36 @@
{
"name": "Bane",
"version": "0.0.4",
"description": "Ne biçim bot bu anlamadım Kappa.",
"readme": "README.md",
"maintainers": [
"Atropos ([email protected])",
"linuxgemini ([email protected])"
],
"author": "OneMansGlory, Atropos, linuxgemini",
"repository": {
"type": "git",
"url": "git+https://github.com/mertturunc/Bane.git"
},
"license": "GPL-3.0",
"dependencies": {
"discord.js": "hydrabolt/discord.js",
"ffmpeg": "0.0.4",
"googleapis": ">=4.0.0",
"node-twitchtv": "jbueza/node-twitchtv",
"request": ">=2.58.0",
"underscore": "1.8.x",
"ytdl-core": "0.7.10",
"opusscript": ">=0.0.1",
"wav": ">=0.0.2"
},
"scripts": {
"main": "node Bane.js",
"musicbot": "node ./workinprogress/BaneMusic-beta.js"
}
}
{
"name": "Bane",
"version": "0.0.4",
"description": "Ne biçim bot bu anlamadım Kappa.",
"readme": "README.md",
"maintainers": [
"Atropos ([email protected])",
"linuxgemini ([email protected])"
],
"author": "OneMansGlory, Atropos, linuxgemini",
"repository": {
"type": "git",
"url": "git+https://github.com/mertturunc/Bane.git"
},
"license": "GPL-3.0",
"dependencies": {
"discord.js": "hydrabolt/discord.js",
"ffmpeg": "0.0.4",
"googleapis": ">=4.0.0",
"node-twitchtv": "jbueza/node-twitchtv",
"request": ">=2.58.0",
"underscore": "1.8.x",
"ytdl-core": "0.7.10",
"node-opus": ">=0.2.1",
"wav": ">=0.0.2",
"async": ">0.0.1",
"opusscript": ">=0.0.1",
"uws": ">=0.12.0",
"bufferutil": ">=2.0.0",
"erlpack": "hammerandchisel/erlpack"
},
"scripts": {
"main": "node --harmony --trace-warnings Bane.js",
"musicbot": "node ./workinprogress/BaneMusic-beta.js"
}
}

0 comments on commit deda198

Please sign in to comment.