Merge remote-tracking branch 'upstream/rewrite' into rewrite

src/Structures/Channel.js

@@ -3,6 +3,7 @@
 var Equality = require("../Util/Equality.js");
 var Cache = require("../Util/Cache.js");
 var PermissionOverwrite = require("./PermissionOverwrite.js");
+var reg = require("../Util/ArgumentRegulariser.js").reg;
 
 class Channel extends Equality{
 
@@ -12,6 +13,10 @@ class Channel extends Equality{
 		this.client = client;
 	}
 
+	delete(){
+		return this.client.deleteChannel.apply(this.client, reg(this, arguments));
+	}
+
 }
 
 module.exports = Channel;

src/Structures/Message.js

@@ -2,6 +2,7 @@
 
 var Cache = require("../Util/Cache.js");
 var User = require("./User.js");
+var reg = require("../Util/ArgumentRegulariser.js").reg;
 
 class Message{
 	constructor(data, channel, client){
@@ -40,6 +41,22 @@ class Message{
 	toString(){
 		return this.content;
 	}
+	
+	delete(){
+		return this.client.deleteMessage.apply(this.client, reg(this, arguments));
+	}
+	
+	update(){
+		return this.client.updateMessage.apply(this.client, reg(this, arguments));
+	}
+	
+	reply(){
+		return this.client.reply.apply(this.client, reg(this, arguments));
+	}
+	
+	replyTTS(){
+		return this.client.replyTTS.apply(this.client, reg(this, arguments));
+	}
 }
 
 module.exports = Message;

src/Structures/PMChannel.js

@@ -4,6 +4,7 @@ var Channel = require("./Channel.js");
 var User = require("./User.js");
 var Equality = require("../Util/Equality.js");
 var Cache = require("../Util/Cache.js");
+var reg = require("../Util/ArgumentRegulariser.js").reg;
 
 class PMChannel extends Equality{
 	constructor(data, client){
@@ -25,6 +26,14 @@ class PMChannel extends Equality{
 	toString(){
 		return this.recipient.toString();
 	}
+	
+	sendMessage(){
+		return this.client.sendMessage.apply(this.client, reg(this, arguments));
+	}
+	
+	sendTTSMessage(){
+		return this.client.sendTTSMessage.apply(this.client, reg(this, arguments));
+	}
 }
 
 module.exports = PMChannel;

src/Structures/ServerChannel.js

@@ -4,6 +4,7 @@ var Channel = require("./Channel.js");
 var Cache = require("../Util/Cache.js");
 var PermissionOverwrite = require("./PermissionOverwrite.js");
 var ChannelPermissions = require("./ChannelPermissions.js");
+var reg = require("../Util/ArgumentRegulariser.js").reg;
 
 class ServerChannel extends Channel{
 	constructor(data, client, server){
@@ -63,6 +64,10 @@ class ServerChannel extends Channel{
 	toString(){
 		return this.name;
 	}
+	
+	setName(){
+		return this.client.setChannelName.apply(this.client, reg(this, arguments));
+	}
 }
 
 module.exports = ServerChannel;

src/Structures/TextChannel.js

@@ -2,6 +2,7 @@
 
 var ServerChannel = require("./ServerChannel.js");
 var Cache = require("../Util/Cache.js");
+var reg = require("../Util/ArgumentRegulariser.js").reg;
 
 class TextChannel extends ServerChannel{
 	constructor(data, client, server){
@@ -18,6 +19,26 @@ class TextChannel extends ServerChannel{
 	get lastMessage(){
 		return this.messages.get("id", this.lastMessageID);
 	}
+	
+	setTopic(){
+		return this.client.setTopic.apply(this.client, reg(this, arguments));
+	}
+	
+	setNameAndTopic(){
+		return this.client.setChannelNameAndTopic.apply(this.client, reg(this, arguments));
+	}
+	
+	update(){
+		return this.client.updateChannel.apply(this.client, reg(this, arguments));
+	}
+	
+	sendMessage(){
+		return this.client.sendMessage.apply(this.client, reg(this, arguments));
+	}
+	
+	sendTTSMessage(){
+		return this.client.sendTTSMessage.apply(this.client, reg(this, arguments));
+	}
 }
 
 module.exports = TextChannel;