From 5a971ba097edb348f9ea3fc3fbdac65b68dbcf15 Mon Sep 17 00:00:00 2001 From: Amish Shah Date: Sat, 5 Dec 2015 16:57:58 +0000 Subject: [PATCH] Added role shortcuts and to user also --- lib/Client/Client.js | 2 +- lib/Client/ConnectionState.js | 2 +- lib/Client/InternalClient.js | 2 +- lib/Client/Resolver/Resolver.js | 2 +- lib/Constants.js | 2 +- lib/Structures/Channel.js | 2 +- lib/Structures/ChannelPermissions.js | 2 +- lib/Structures/Invite.js | 2 +- lib/Structures/Message.js | 2 +- lib/Structures/PMChannel.js | 2 +- lib/Structures/PermissionOverwrite.js | 2 +- lib/Structures/Role.js | 32 ++++++++++++++++++++++++++- lib/Structures/Server.js | 2 +- lib/Structures/ServerChannel.js | 2 +- lib/Structures/TextChannel.js | 2 +- lib/Structures/User.js | 20 ++++++++++++++++- lib/Structures/VoiceChannel.js | 10 ++++++++- lib/Util/ArgumentRegulariser.js | 2 +- lib/Util/Cache.js | 2 +- lib/Util/Equality.js | 2 +- lib/Voice/AudioEncoder.js | 2 +- lib/Voice/StreamIntent.js | 2 +- lib/Voice/VoiceConnection.js | 2 +- lib/Voice/VoicePacket.js | 2 +- lib/index.js | 2 +- src/Structures/Role.js | 29 ++++++++++++++++++++++++ src/Structures/User.js | 17 ++++++++++++++ src/Structures/VoiceChannel.js | 5 +++++ 28 files changed, 132 insertions(+), 25 deletions(-) diff --git a/lib/Client/Client.js b/lib/Client/Client.js index 5d34363e4..e575920c4 100644 --- a/lib/Client/Client.js +++ b/lib/Client/Client.js @@ -630,4 +630,4 @@ var Client = (function (_EventEmitter) { })(_events2["default"]); exports["default"] = Client; -module.exports = exports["default"]; \ No newline at end of file +module.exports = exports["default"]; diff --git a/lib/Client/ConnectionState.js b/lib/Client/ConnectionState.js index e876542d8..b17e17a5e 100644 --- a/lib/Client/ConnectionState.js +++ b/lib/Client/ConnectionState.js @@ -8,4 +8,4 @@ exports["default"] = { READY: 3, DISCONNECTED: 4 }; -module.exports = exports["default"]; \ No newline at end of file +module.exports = exports["default"]; diff --git a/lib/Client/InternalClient.js b/lib/Client/InternalClient.js index 854bd1ed5..6dd35d5ea 100644 --- a/lib/Client/InternalClient.js +++ b/lib/Client/InternalClient.js @@ -1416,4 +1416,4 @@ var InternalClient = (function () { })(); exports["default"] = InternalClient; -module.exports = exports["default"]; \ No newline at end of file +module.exports = exports["default"]; diff --git a/lib/Client/Resolver/Resolver.js b/lib/Client/Resolver/Resolver.js index c602e4949..b05ac0363 100644 --- a/lib/Client/Resolver/Resolver.js +++ b/lib/Client/Resolver/Resolver.js @@ -245,4 +245,4 @@ var Resolver = (function () { })(); exports["default"] = Resolver; -module.exports = exports["default"]; \ No newline at end of file +module.exports = exports["default"]; diff --git a/lib/Constants.js b/lib/Constants.js index 3381d3c5b..13b465ae1 100644 --- a/lib/Constants.js +++ b/lib/Constants.js @@ -127,4 +127,4 @@ var PacketType = { SERVER_BAN_ADD: "GUILD_BAN_ADD", SERVER_BAN_REMOVE: "GUILD_BAN_REMOVE" }; -exports.PacketType = PacketType; \ No newline at end of file +exports.PacketType = PacketType; diff --git a/lib/Structures/Channel.js b/lib/Structures/Channel.js index 887420059..c573a3a10 100644 --- a/lib/Structures/Channel.js +++ b/lib/Structures/Channel.js @@ -42,4 +42,4 @@ var Channel = (function (_Equality) { })(_UtilEquality2["default"]); exports["default"] = Channel; -module.exports = exports["default"]; \ No newline at end of file +module.exports = exports["default"]; diff --git a/lib/Structures/ChannelPermissions.js b/lib/Structures/ChannelPermissions.js index 8f2fccab3..81773a75e 100644 --- a/lib/Structures/ChannelPermissions.js +++ b/lib/Structures/ChannelPermissions.js @@ -75,4 +75,4 @@ var ChannelPermissions = (function () { })(); exports["default"] = ChannelPermissions; -module.exports = exports["default"]; \ No newline at end of file +module.exports = exports["default"]; diff --git a/lib/Structures/Invite.js b/lib/Structures/Invite.js index 12d349cae..27d470b9c 100644 --- a/lib/Structures/Invite.js +++ b/lib/Structures/Invite.js @@ -29,4 +29,4 @@ var Invite = (function () { })(); exports["default"] = Invite; -module.exports = exports["default"]; \ No newline at end of file +module.exports = exports["default"]; diff --git a/lib/Structures/Message.js b/lib/Structures/Message.js index 9c5578da9..94bad3f7a 100644 --- a/lib/Structures/Message.js +++ b/lib/Structures/Message.js @@ -102,4 +102,4 @@ var Message = (function (_Equality) { })(_UtilEquality2["default"]); exports["default"] = Message; -module.exports = exports["default"]; \ No newline at end of file +module.exports = exports["default"]; diff --git a/lib/Structures/PMChannel.js b/lib/Structures/PMChannel.js index b51830ea8..59eb39685 100644 --- a/lib/Structures/PMChannel.js +++ b/lib/Structures/PMChannel.js @@ -71,4 +71,4 @@ var PMChannel = (function (_Channel) { })(_Channel3["default"]); exports["default"] = PMChannel; -module.exports = exports["default"]; \ No newline at end of file +module.exports = exports["default"]; diff --git a/lib/Structures/PermissionOverwrite.js b/lib/Structures/PermissionOverwrite.js index ac539d4d5..6682c168a 100644 --- a/lib/Structures/PermissionOverwrite.js +++ b/lib/Structures/PermissionOverwrite.js @@ -86,4 +86,4 @@ var PermissionOverwrite = (function () { })(); exports["default"] = PermissionOverwrite; -module.exports = exports["default"]; \ No newline at end of file +module.exports = exports["default"]; diff --git a/lib/Structures/Role.js b/lib/Structures/Role.js index a9c796639..942eda733 100644 --- a/lib/Structures/Role.js +++ b/lib/Structures/Role.js @@ -5,6 +5,8 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons var _Constants = require("../Constants"); +var _UtilArgumentRegulariser = require("../Util/ArgumentRegulariser"); + /* example data @@ -135,8 +137,36 @@ var Role = (function () { return "#" + val; }; + Role.prototype["delete"] = function _delete() { + return this.client.deleteRole.apply(this.client, _UtilArgumentRegulariser.reg(this, arguments)); + }; + + Role.prototype.edit = function edit() { + return this.client.updateRole.apply(this.client, _UtilArgumentRegulariser.reg(this, arguments)); + }; + + Role.prototype.update = function update() { + return this.client.updateRole.apply(this.client, _UtilArgumentRegulariser.reg(this, arguments)); + }; + + Role.prototype.addMember = function addMember(member, callback) { + return this.client.addMemberToRole.apply(this.client, [member, this, callback]); + }; + + Role.prototype.addUser = function addUser(member, callback) { + return this.client.addMemberToRole.apply(this.client, [member, this, callback]); + }; + + Role.prototype.removeMember = function removeMember(member, callback) { + return this.client.removeMemberFromRole.apply(this.client, [member, this, callback]); + }; + + Role.prototype.removeUser = function removeUser(member, callback) { + return this.client.removeMemberFromRole.apply(this.client, [member, this, callback]); + }; + return Role; })(); exports["default"] = Role; -module.exports = exports["default"]; \ No newline at end of file +module.exports = exports["default"]; diff --git a/lib/Structures/Server.js b/lib/Structures/Server.js index e624654dc..57893d23d 100644 --- a/lib/Structures/Server.js +++ b/lib/Structures/Server.js @@ -202,4 +202,4 @@ var Server = (function (_Equality) { })(_UtilEquality2["default"]); exports["default"] = Server; -module.exports = exports["default"]; \ No newline at end of file +module.exports = exports["default"]; diff --git a/lib/Structures/ServerChannel.js b/lib/Structures/ServerChannel.js index 333f09f4e..57ad3f21f 100644 --- a/lib/Structures/ServerChannel.js +++ b/lib/Structures/ServerChannel.js @@ -131,4 +131,4 @@ var ServerChannel = (function (_Channel) { })(_Channel3["default"]); exports["default"] = ServerChannel; -module.exports = exports["default"]; \ No newline at end of file +module.exports = exports["default"]; diff --git a/lib/Structures/TextChannel.js b/lib/Structures/TextChannel.js index 1e832eb0e..6833c417f 100644 --- a/lib/Structures/TextChannel.js +++ b/lib/Structures/TextChannel.js @@ -74,4 +74,4 @@ var TextChannel = (function (_ServerChannel) { })(_ServerChannel3["default"]); exports["default"] = TextChannel; -module.exports = exports["default"]; \ No newline at end of file +module.exports = exports["default"]; diff --git a/lib/Structures/User.js b/lib/Structures/User.js index 6f1c50f61..17c63e040 100644 --- a/lib/Structures/User.js +++ b/lib/Structures/User.js @@ -16,6 +16,8 @@ var _UtilEquality2 = _interopRequireDefault(_UtilEquality); var _Constants = require("../Constants"); +var _UtilArgumentRegulariser = require("../Util/ArgumentRegulariser"); + var User = (function (_Equality) { _inherits(User, _Equality); @@ -52,6 +54,22 @@ var User = (function (_Equality) { if (obj instanceof User) return this.id === obj.id && this.username === obj.username && this.discriminator === obj.discriminator && this.avatar === obj.avatar;else return false; }; + User.prototype.sendMessage = function sendMessage() { + return this.client.sendMessage.apply(this.client, _UtilArgumentRegulariser.reg(this, arguments)); + }; + + User.prototype.send = function send() { + return this.client.sendMessage.apply(this.client, _UtilArgumentRegulariser.reg(this, arguments)); + }; + + User.prototype.sendTTSMessage = function sendTTSMessage() { + return this.client.sendTTSMessage.apply(this.client, _UtilArgumentRegulariser.reg(this, arguments)); + }; + + User.prototype.sendTTS = function sendTTS() { + return this.client.sendTTSMessage.apply(this.client, _UtilArgumentRegulariser.reg(this, arguments)); + }; + _createClass(User, [{ key: "avatarURL", get: function get() { @@ -67,4 +85,4 @@ var User = (function (_Equality) { })(_UtilEquality2["default"]); exports["default"] = User; -module.exports = exports["default"]; \ No newline at end of file +module.exports = exports["default"]; diff --git a/lib/Structures/VoiceChannel.js b/lib/Structures/VoiceChannel.js index 7dd54aa5c..b0c5421f0 100644 --- a/lib/Structures/VoiceChannel.js +++ b/lib/Structures/VoiceChannel.js @@ -12,6 +12,8 @@ var _ServerChannel2 = require("./ServerChannel"); var _ServerChannel3 = _interopRequireDefault(_ServerChannel2); +var _UtilArgumentRegulariser = require("../Util/ArgumentRegulariser"); + var VoiceChannel = (function (_ServerChannel) { _inherits(VoiceChannel, _ServerChannel); @@ -21,8 +23,14 @@ var VoiceChannel = (function (_ServerChannel) { _ServerChannel.call(this, data, client, server); } + VoiceChannel.prototype.join = function join() { + var callback = arguments.length <= 0 || arguments[0] === undefined ? function () {} : arguments[0]; + + return this.client.joinVoiceChannel.apply(this.client, [this, callback]); + }; + return VoiceChannel; })(_ServerChannel3["default"]); exports["default"] = VoiceChannel; -module.exports = exports["default"]; \ No newline at end of file +module.exports = exports["default"]; diff --git a/lib/Util/ArgumentRegulariser.js b/lib/Util/ArgumentRegulariser.js index e51909e5f..cee9d5a57 100644 --- a/lib/Util/ArgumentRegulariser.js +++ b/lib/Util/ArgumentRegulariser.js @@ -5,4 +5,4 @@ exports.reg = reg; function reg(c, a) { return [c].concat(Array.prototype.slice.call(a)); -} \ No newline at end of file +} diff --git a/lib/Util/Cache.js b/lib/Util/Cache.js index f3b22a70f..3932779be 100644 --- a/lib/Util/Cache.js +++ b/lib/Util/Cache.js @@ -106,4 +106,4 @@ var Cache = (function (_Array) { })(Array); exports["default"] = Cache; -module.exports = exports["default"]; \ No newline at end of file +module.exports = exports["default"]; diff --git a/lib/Util/Equality.js b/lib/Util/Equality.js index 2963f1d51..aab165350 100644 --- a/lib/Util/Equality.js +++ b/lib/Util/Equality.js @@ -45,4 +45,4 @@ var Equality = (function () { })(); exports["default"] = Equality; -module.exports = exports["default"]; \ No newline at end of file +module.exports = exports["default"]; diff --git a/lib/Voice/AudioEncoder.js b/lib/Voice/AudioEncoder.js index 6aecca898..4b8489b9b 100644 --- a/lib/Voice/AudioEncoder.js +++ b/lib/Voice/AudioEncoder.js @@ -132,4 +132,4 @@ var AudioEncoder = (function () { })(); exports["default"] = AudioEncoder; -module.exports = exports["default"]; \ No newline at end of file +module.exports = exports["default"]; diff --git a/lib/Voice/StreamIntent.js b/lib/Voice/StreamIntent.js index e3fda0e83..37b981a14 100644 --- a/lib/Voice/StreamIntent.js +++ b/lib/Voice/StreamIntent.js @@ -25,4 +25,4 @@ var StreamIntent = (function (_EventEmitter) { })(_events2["default"]); exports["default"] = StreamIntent; -module.exports = exports["default"]; \ No newline at end of file +module.exports = exports["default"]; diff --git a/lib/Voice/VoiceConnection.js b/lib/Voice/VoiceConnection.js index 886f2c1d4..ac43034ea 100644 --- a/lib/Voice/VoiceConnection.js +++ b/lib/Voice/VoiceConnection.js @@ -363,4 +363,4 @@ var VoiceConnection = (function (_EventEmitter) { })(_events2["default"]); exports["default"] = VoiceConnection; -module.exports = exports["default"]; \ No newline at end of file +module.exports = exports["default"]; diff --git a/lib/Voice/VoicePacket.js b/lib/Voice/VoicePacket.js index 71b9fbaaf..445f9d6c4 100644 --- a/lib/Voice/VoicePacket.js +++ b/lib/Voice/VoicePacket.js @@ -26,4 +26,4 @@ var VoicePacket = function VoicePacket(data, sequence, time, ssrc) { }; exports["default"] = VoicePacket; -module.exports = exports["default"]; \ No newline at end of file +module.exports = exports["default"]; diff --git a/lib/index.js b/lib/index.js index 3029911ad..f5ef732bc 100644 --- a/lib/index.js +++ b/lib/index.js @@ -76,4 +76,4 @@ exports["default"] = { VoiceChannel: _StructuresVoiceChannel2["default"], Constants: _Constants2["default"] }; -module.exports = exports["default"]; \ No newline at end of file +module.exports = exports["default"]; diff --git a/src/Structures/Role.js b/src/Structures/Role.js index 74cc3a342..339099452 100644 --- a/src/Structures/Role.js +++ b/src/Structures/Role.js @@ -1,5 +1,6 @@ "use strict"; import {Permissions} from "../Constants"; +import {reg} from "../Util/ArgumentRegulariser"; /* example data @@ -130,4 +131,32 @@ export default class Role { } return "#"+val; } + + delete() { + return this.client.deleteRole.apply(this.client, reg(this, arguments)); + } + + edit() { + return this.client.updateRole.apply(this.client, reg(this, arguments)); + } + + update() { + return this.client.updateRole.apply(this.client, reg(this, arguments)); + } + + addMember(member, callback) { + return this.client.addMemberToRole.apply(this.client, [member, this, callback]); + } + + addUser(member, callback) { + return this.client.addMemberToRole.apply(this.client, [member, this, callback]); + } + + removeMember(member, callback) { + return this.client.removeMemberFromRole.apply(this.client, [member, this, callback]); + } + + removeUser(member, callback) { + return this.client.removeMemberFromRole.apply(this.client, [member, this, callback]); + } } diff --git a/src/Structures/User.js b/src/Structures/User.js index dac9d1155..001981970 100644 --- a/src/Structures/User.js +++ b/src/Structures/User.js @@ -2,6 +2,7 @@ import Equality from "../Util/Equality"; import {Endpoints} from "../Constants"; +import {reg} from "../Util/ArgumentRegulariser"; export default class User extends Equality{ constructor(data, client){ @@ -60,4 +61,20 @@ export default class User extends Equality{ else return false; } + + sendMessage(){ + return this.client.sendMessage.apply(this.client, reg(this, arguments)); + } + + send() { + return this.client.sendMessage.apply(this.client, reg(this, arguments)); + } + + sendTTSMessage(){ + return this.client.sendTTSMessage.apply(this.client, reg(this, arguments)); + } + + sendTTS() { + return this.client.sendTTSMessage.apply(this.client, reg(this, arguments)); + } } diff --git a/src/Structures/VoiceChannel.js b/src/Structures/VoiceChannel.js index 26fa20fc8..8a5759655 100644 --- a/src/Structures/VoiceChannel.js +++ b/src/Structures/VoiceChannel.js @@ -1,9 +1,14 @@ "use strict"; import ServerChannel from "./ServerChannel"; +import {reg} from "../Util/ArgumentRegulariser"; export default class VoiceChannel extends ServerChannel{ constructor(data, client, server){ super(data, client, server); } + + join(callback = function () { }) { + return this.client.joinVoiceChannel.apply(this.client, [this, callback]); + } }