@imaentity/selfjs 2.9.11 → 3.1.0

package/self.js

@@ -2,7 +2,7 @@
  * @name SelfJS
  * @description Breaking Discord's TOS to bot user accounts.
  * @author Эмберс
- * @version 2.9.11
+ * @version 3.1.0
  */
 
 const https = require("https");
@@ -21,7 +21,6 @@ module.exports = {
 	},
 
 	status: {
-		DEFAULT: -1,
 		PLAYING: 0,
 		STREAMING: 1,
 		LISTENING: 2,
@@ -47,36 +46,67 @@ module.exports = {
 	},
 
 	sendWebhookMessage: function(webhookID, webhookToken, inputData) {
-		let options = null;
-		let msgData = null;
+		const boundary = "X-SELFJS-BOUNDARY";
 
-		if(inputData) {
-			msgData = module.exports.jsonEncode(inputData);
-			options = {
-				...module.exports.APIBaseOpt,
-				method: "POST",
-				path: `/api/webhooks/${webhookID}/${webhookToken}`,
-				headers: {
-					"Content-Type": "application/json",
-					"Content-Length": msgData.length
-				}
-			};
-		} else {
-			msgData = module.exports.jsonEncode(webhookToken);
-			options = {
-				...module.exports.APIBaseOpt,
-				method: "POST",
-				path: webhookID.split("//")[1].split('/').slice(1).join('/'),
-				headers: {
-					"Content-Type": "application/json",
-					"Content-Length": msgData.length
-				}
-			};
+		let contentType = "application/json";
+		if(inputData.attachments && inputData.attachments.length > 0)
+			contentType = `multipart/form-data; boundary=${boundary}`; 
+
+		const webID  = inputData ? webhookID    : webhookID.split("//")[1].split('/')[3];
+		const webTok = inputData ? webhookToken : webhookID.split("//")[1].split('/')[4];
+		const inData = inputData ? inputData    : webhookToken;
+
+		let msgData = Buffer.from(module.exports.jsonEncode(inData));
+
+		if(inputData.attachments && inputData.attachments.length > 0) {
+			let msgFiles = [...inData.files];
+
+			delete inData.files;
+			msgData = Buffer.from(module.exports.jsonEncode(inData));
+
+			msgData = Buffer.concat([Buffer.from("Content-Type: application/json\r\n\r\n"), msgData]);
+			msgData = Buffer.concat([Buffer.from('Content-Disposition: form-data; name="payload_json"\r\n'), msgData]);
+			msgData = Buffer.concat([Buffer.from(`--${boundary}\r\n`), msgData]);
+			msgData = Buffer.concat([msgData, Buffer.from("\r\n")]);
+
+			for(const i in inData.attachments) {
+				const attach = inData.attachments[i];
+
+				msgData = Buffer.concat([msgData, Buffer.from(`--${boundary}\r\n`)]);
+				msgData = Buffer.concat([msgData, Buffer.from(`Content-Disposition: form-data; name="files[${i}]"; filename="${attach.filename}"\r\n`)]);
+				msgData = Buffer.concat([msgData, Buffer.from(`Content-Type: ${attach.content_type}\r\n\r\n`)]);
+				msgData = Buffer.concat([msgData, fs.existsSync(msgFiles[i]) ? fs.readFileSync(msgFiles[i], "") : Buffer.from("")]);
+				msgData = Buffer.concat([msgData, Buffer.from("\r\n")]);
+			}
+
+			msgData = Buffer.concat([msgData, Buffer.from(`--${boundary}--`)]);
 		}
 
+		const options = {
+			...module.exports.APIBaseOpt,
+			method: "POST",
+			path: `/api/webhooks/${webID}/${webTok}`,
+			headers: {
+				"Content-Type": contentType,
+				"Content-Length": Buffer.byteLength(msgData)
+			}
+		};
+
 		return new Promise(function(resolve) {
 			const req = https.request(options, function(res) {
-				res.on("end", resolve);
+				const chunks = [];
+
+				res.on("data", function(chunk) {
+					chunks.push(chunk);
+				}).on("end", function() {
+					const data = Buffer.concat(chunks);
+
+					try {
+						resolve(JSON.parse(data));
+					} catch(e) {
+						resolve({});
+					}
+				});
 			});
 
 			req.write(msgData);
@@ -213,6 +243,41 @@ module.exports = {
 			}.bind(this));
 		}
 
+		makeRequest(options = {}, base = module.exports.APIBaseOpt) {
+			const path    = options.path    || '/';
+			const method  = options.method  || "GET";
+			const headers = options.headers || {};
+			const body    = options.body    || undefined;
+		
+			const strBody = module.exports.jsonEncode(body) ?? "";
+
+			headers["Authorization"] = this.token;
+			headers["Content-Type"] = "application/json";
+			headers["Content-Length"] = strBody.length;
+
+			const reqOptions = {
+				...base,
+				path,
+				method,
+				headers
+			};
+
+			return new Promise(function(resolve) {
+				const req = https.request(reqOptions, function(res) {
+					const chunks = [];
+
+					res.on("data", function(chunk) {
+						chunks.push(chunk);
+					}).on("end", function() {
+						resolve(JSON.parse(Buffer.concat(chunks)));
+					});
+				});
+
+				if(strBody) req.write(strBody);
+				req.end();
+			});
+		}
+
 		onMessage(msgFunc) {
 			this.onMessageFunction = msgFunc;
 		}
@@ -229,58 +294,21 @@ module.exports = {
 			this.statusUpdateFunction = statusFunc;
 		}
 
-		getDMChannel(userID) {
-			const channelData = module.exports.jsonEncode({recipients: [userID]});
-			const options = {
-				...module.exports.APIBaseOpt,
+		async getDMChannel(userID) {
+			return await this.makeRequest({
 				method: "POST",
 				path: "/api/v10/users/@me/channels",
-				headers: {
-					"Authorization": this.token,
-					"Content-Type": "application/json",
-					"Content-Length": channelData.length
+				body: {
+					recipients: [userID]
 				}
-			};
-
-			return new Promise(function(resolve) {
-				const req = https.request(options, function(res) {
-					const chunks = [];
-
-					res.on("data", function(chunk) {
-						chunks.push(chunk);
-					}).on("end", function() {
-						resolve(JSON.parse(Buffer.concat(chunks)));
-					});
-				});
-
-				req.write(channelData);
-				req.end();
 			});
 		}
 
-		getRoles(serverID, userID) {
-			const options = {
-				...module.exports.APIBaseOpt,
+		async getRoles(serverID, userID) {
+			return (await this.makeRequest({
 				method: "GET",
-				path: `/api/v10/users/${userID}/profile?with_mutual_guilds=false&guild_id=${serverID}`,
-				headers: {
-					"Authorization": this.token
-				}
-			};
-
-			return new Promise(function(resolve) {
-				const req = https.request(options, function(res) {
-					const chunks = [];
-
-					res.on("data", function(chunk) {
-						chunks.push(chunk);
-					}).on("end", function() {
-						resolve(JSON.parse(Buffer.concat(chunks)).guild_member.roles);
-					});
-				});
-
-				req.end();
-			});
+				path: `/api/v10/guilds/${serverID}/members/${userID}`,
+			})).guild_member.roles;
 		}
 
 		uploadFile(channelID, fileName, isSpoiled = false, msgContent = "", messageID = null) {
@@ -425,7 +453,7 @@ module.exports = {
 			}.bind(this));
 		}
 
-		search(channelID, options) {
+		async search(channelID, options) {
 			options = options || {};
 
 			const pinned = options.pinned ?? null;
@@ -448,346 +476,136 @@ module.exports = {
 			if(mentions != null) path += mentions.map((e) => `mentions=${e}`).join('&') + '&';
 			if(has != null) path += has.map((e) => `has=${e}`).join('&');
 
-			const requestOptions = {
-				...module.exports.APIBaseOpt,
+			return await this.makeRequest({
 				method: "GET",
-				path,
-				headers: {
-					"Authorization": this.token
-				}
-			};
-			
-			return new Promise(function(resolve) {
-				const req = https.request(requestOptions, function(res) {
-					const chunks = [];
-
-					res.on("data", function(chunk) {
-						chunks.push(chunk);
-					}).on("end", function() {
-						resolve(JSON.parse(Buffer.concat(chunks)));
-					});
-				});
-
-				req.end();
+				path: path
 			});
 		}
 
-		getUserData(userID) {
-			const options = {
-				...module.exports.APIBaseOpt,
+		async getUserProfile(userID) {
+			return await this.makeRequest({
 				method: "GET",
-				path: `/api/v10/users/${userID}/profile?with_mutual_guilds=false`,
-				headers: {
-					"Authorization": this.token
-				}
-			};
-
-			return new Promise(function(resolve) {
-				const req = https.request(options, function(res) {
-					const chunks = [];
-
-					res.on("data", function(chunk) {
-						chunks.push(chunk);
-					}).on("end", function() {
-						resolve(JSON.parse(Buffer.concat(chunks)));
-					});
-				});
+				path: `/api/v10/users/${userID}/profile?with_mutual_guilds=false`
+			});
+		}
 
-				req.end();
+		async getUserData(userID) {
+			return await this.makeRequest({
+				method: "GET",
+				path: `/api/v10/users/${userID}`
 			});
 		}
 
-		setRolesForMemeber(serverID, userID, roleIDs) {
-			const roleData = module.exports.jsonEncode(roleIDs);
-			const options = {
-				...module.exports.APIBaseOpt,
+		async setRolesForMemeber(serverID, userID, roleIDs) {
+			return await this.makeRequest({
 				method: "PATCH",
 				path: `/api/v10/guilds/${serverID}/members/${userID}`,
-				headers: {
-					"Content-Type": "application/json",
-					"Content-Length": roleData.length,
-					"Authorization": this.token
-				}
-			};
-
-			return new Promise(function(resolve) {
-				const req = https.request(options, function(res) {
-					res.on("end", resolve);
-				});
-
-				req.write(roleData);
-				req.end();
+				body: roleIDs
 			});
 		}
 
-		sendMessage(channelID, message) {
-			const msgData = module.exports.jsonEncode({content: message});
-			const options = {
-				...module.exports.APIBaseOpt,
+		async sendMessage(channelID, message) {
+			return await this.makeRequest({
 				method: "POST",
 				path: `/api/v10/channels/${channelID}/messages`,
-				headers: {
-					"Authorization": this.token,
-					"Content-Type": "application/json",
-					"Content-Length": msgData.length
+				body: {
+					content: message
 				}
-			};
-
-			return new Promise(function(resolve) {
-				const req = https.request(options, function(res) {
-					const chunks = [];
-
-					res.on("data", function(chunk) {
-						chunks.push(chunk);
-					}).on("end", function() {
-						resolve(JSON.parse(Buffer.concat(chunks)));
-					});
-				});
-
-				req.write(msgData);
-				req.end();
 			});
 		}
 
-		replyToMessage(channelID, messageID, message) {
-			const msgData = module.exports.jsonEncode({content: message, message_reference: {channel_id: channelID, message_id: messageID}});
-			const options = {
-				...module.exports.APIBaseOpt,
+		async replyToMessage(channelID, messageID, message) {
+			return await this.makeRequest({
 				method: "POST",
 				path: `/api/v10/channels/${channelID}/messages`,
-				headers: {
-					"Authorization": this.token,
-					"Content-Type": "application/json",
-					"Content-Length": msgData.length
+				body: {
+					content: message,
+					message_reference: {
+						channel_id: channelID,
+						message_id: messageID
+					}
 				}
-			};
-
-			return new Promise(function(resolve) {
-				const req = https.request(options, function(res) {
-					const chunks = [];
-
-					res.on("data", function(chunk) {
-						chunks.push(chunk);
-					}).on("end", function() {
-						resolve(JSON.parse(Buffer.concat(chunks)));
-					});
-				});
-
-				req.write(msgData);
-				req.end();
 			});
 		}
 
-		createChannel(guildID, name, type, parentID = null) {
-			const channelData = module.exports.jsonEncode({name, type, parent_id: parentID});
-			const options = {
-				...module.exports.APIBaseOpt,
+		async createChannel(guildID, name, type, parentID = null) {
+			return await this.makeRequest({
 				method: "POST",
 				path: `/api/v10/guilds/${guildID}/channels`,
-				headers: {
-					"Authorization": this.token,
-					"Content-Type": "application/json",
-					"Content-Length": channelData.length
+				body: {
+					name,
+					type,
+					parent_id: parentID
 				}
-			};
-
-			return new Promise(function(resolve) {
-				const req = https.request(options, function(res) {
-					const chunks = [];
-
-					res.on("data", function(chunk) {
-						chunks.push(chunk);
-					}).on("end", function() {
-						resolve(JSON.parse(Buffer.concat(chunks)));
-					});
-				});
-
-				req.write(channelData);
-				req.end();
 			});
 		}
 
-		setChannelPermissions(channelID, userID, allow, deny) {
-			const permissionData = module.exports.jsonEncode({id: userID, allow, deny, type: 1});
-			const options = {
-				...module.exports.APIBaseOpt,
+		async setChannelPermissions(channelID, userID, allow, deny) {
+			return await this.makeRequest({
 				method: "PUT",
 				path: `/api/v10/channels/${channelID}/permissions/${userID}`,
-				headers: {
-					"Authorization": this.token,
-					"Content-Type": "application/json",
-					"Content-Length": permissionData.length
+				body: {
+					id: userID,
+					allow,
+					deny,
+					type: 1
 				}
-			};
-
-			return new Promise(function(resolve) {
-				const req = https.request(options, function(res) {
-					const chunks = [];
-
-					res.on("data", function(chunk) {
-						chunks.push(chunk);
-					}).on("end", function() {
-						resolve(JSON.parse(Buffer.concat(chunks)));
-					});
-				});
-
-				req.write(permissionData);
-				req.end();
 			});
 		}
 
-		getMessages(channelID, limit) {
-			const options = {
-				...module.exports.APIBaseOpt,
+		async getMessages(channelID, limit) {
+			return await this.makeRequest({
 				method: "GET",
-				path: `/api/v10/channels/${channelID}/messages?limit=${limit}`,
-				headers: {
-					"Authorization": this.token
-				}
-			};
-
-			return new Promise(function(resolve) {
-				const req = https.request(options, function(res) {
-					const chunks = [];
-
-					res.on("data", function(chunk) {
-						chunks.push(chunk);
-					}).on("end", function() {
-						resolve(JSON.parse(Buffer.concat(chunks)));
-					});
-				});
-
-				req.end();
+				path: `/api/v10/channels/${channelID}/messages?limit=${limit}`
 			});
 		}
 
-		getUsers(guildID) {
-			const options = {
-				...module.exports.APIBaseOpt,
+		async getUsers(guildID) {
+			return await this.makeRequest({
 				method: "GET",
-				path: `/api/v10/guilds/${guildID}/members`,
-				headers: {
-					"Authorization": this.token
-				}
-			};
-
-			return new Promise(function(resolve) {
-				const req = https.request(options, function(res) {
-					const chunks = [];
-
-					res.on("data", function(chunk) {
-						chunks.push(chunk);
-					}).on("end", function() {
-						resolve(JSON.parse(Buffer.concat(chunks)));
-					});
-				});
-
-				req.end();
+				path: `/api/v10/guilds/${guildID}/members`
 			});
 		}
 
-		removeFromChannel(channelID, userID) {
-			const options = {
-				...module.exports.APIBaseOpt,
+		async removeFromChannel(channelID, userID) {
+			return await this.makeRequest({
 				method: "DELETE",
-				path: `/api/v10/channels/${channelID}/recipients/${userID}`,
-				headers: {
-					"Authorization": this.token
-				}
-			};
-
-			return new Promise(function(resolve) {
-				const req = https.request(options, function(res) {
-					res.on("end", resolve);
-				});
-
-				req.end();
+				path: `/api/v10/channels/${channelID}/recipients/${userID}`
 			});
 		}
 
-		leaveChannel(channelID) {
-			const options = {
-				...module.exports.APIBaseOpt,
+		async leaveChannel(channelID) {
+			return await this.makeRequest({
 				method: "DELETE",
-				path: `/api/v10/channels/${channelID}`,
-				headers: {
-					"Authorization": this.token
-				}
-			};
-
-			return new Promise(function(resolve) {
-				const req = https.request(options, function(res) {
-					res.on("end", resolve);
-				});
-				
-				req.end();
-			}.bind(this));
+				path: `/api/v10/channels/${channelID}`
+			});
 		}
 
-		ring(channelID, userIDs) {
-			const ringData = module.exports.jsonEncode({recipients: userIDs});
-			const options = {
-				...module.exports.APIBaseOpt,
+		async ring(channelID, userIDs) {
+			return await this.makeRequest({
 				method: "POST",
 				path: `/api/v10/channels/${channelID}/call/ring`,
-				headers: {
-					"Authorization": this.token,
-					"Content-Type": "application/json",
-					"Content-Length": ringData.length
+				body: {
+					recipients: userIDs
 				}
-			};
-
-			return new Promise(function(resolve) {
-				const req = https.request(options, function(res) {
-					res.on("end", resolve);
-				});
-
-				req.write(ringData);
-				req.end();
 			});
 		}
 
-		stopRinging(channelID, userIDs) {
-			const ringData = module.exports.jsonEncode({recipients: userIDs});
-			const options = {
-				...module.exports.APIBaseOpt,
+		async stopRinging(channelID, userIDs) {
+			return await this.makeRequest({
 				method: "POST",
 				path: `/api/v10/channels/${channelID}/call/stop-ringing`,
-				headers: {
-					"Authorization": this.token,
-					"Content-Type": "application/json",
-					"Content-Length": ringData.length
+				body: {
+					recipients: userIDs
 				}
-			};
-
-			return new Promise(function(resolve) {
-				const req = https.request(options, function(res) {
-					res.on("end", resolve);
-				});
-
-				req.write(ringData);
-				req.end();
 			});
 		}
 
-		addToChannel(channelID, userID) {
-			const options = {
-				...module.exports.APIBaseOpt,
+		async addToChannel(channelID, userID) {
+			return await this.makeRequest({
 				method: "PUT",
 				path: `/api/v10/channels/${channelID}/recipients/${userID}`,
-				headers: {
-					"Authorization": this.token,
-					"Content-Length": 0
-				}
-			};
-
-			return new Promise(function(resolve) {
-				const req = https.request(options, function(res) {
-					res.on("end", resolve);
-				});
-
-				req.write("");
-				req.end();
+				body: "junkValue"
 			});
 		}
 
@@ -796,138 +614,78 @@ module.exports = {
 
 			try {
 				avatarID = await this.getUserData(userID);
-				avatarID = avatarID.user.avatar;
+				avatarID = avatarID.avatar;
 			} catch(e) {
 				return null;
 			}
 
-			const options = {
-				...module.exports.CDNBaseOpt,
+			return await this.makeRequest({
 				method: "GET",
-				path: `/avatars/${userID}/${avatarID}.webp?size=${size}`
-			};
-
-			return new Promise(function(resolve) {
-				const req = https.request(options, function(res) {
-					const chunks = [];
-
-					res.on("data", function(chunk) {
-						chunks.push(chunk);
-					}).on("end", function() {
-						resolve(Buffer.concat(chunks));
-					});
-				});
-
-				req.end();
-			});
+				path: `/avatars/${userID}/${avatarID}.png?size=${size}`
+			}, module.exports.CDNBaseOpt);
 		}
 
-		addFriend(userID) {
-			const options = {
-				...module.exports.APIBaseOpt,
+		async addFriend(userID) {
+			return await this.makeRequest({
 				method: "PUT",
 				path: `/api/v10/users/@me/relationships/${userID}`,
-				headers: {
-					"Authorization": this.token,
-					"Content-Length": 0
-				}
-			};
+				body: "junkValue"
+			});
+		}
 
-			return new Promise(function(resolve) {
-				const req = https.request(options, function(res) {
-					res.on("end", resolve);
-				});
+		async createServer(options) {
+			options = options || {};
 
-				req.write("");
-				req.end();
+			const name = options.name ?? "Server";
+			const icon = options.icon ?? null;
+
+			return await this.makeRequest({
+				method: "POST",
+				path: "/api/v10/guilds",
+				body: {
+					channels: [],
+					guild_template_code: null,
+					system_channel_id: null,
+					name,
+					icon,
+				}
 			});
 		}
 
-		editMessage(channelID, messageID, newMessage) {
-			const msgData = module.exports.jsonEncode({content: newMessage});
-			const options = {
-				...module.exports.APIBaseOpt,
+		async editMessage(channelID, messageID, newMessage) {
+			return await this.makeRequest({
 				method: "PATCH",
 				path: `/api/v10/channels/${channelID}/messages/${messageID}`,
-				headers: {
-					"Authorization": this.token,
-					"Content-Type": "application/json",
-					"Content-Length": msgData.length
+				body: {
+					content: newMessage
 				}
-			};
-
-			return new Promise(function(resolve) {
-				const req = https.request(options, function(res) {
-					res.on("end", resolve);
-				});
-
-				req.write(msgData);
-				req.end();
 			});
 		}
 
-		removeFriend(userID) {
-			const options = {
-				...module.exports.APIBaseOpt,
+		async removeFriend(userID) {
+			return await this.makeRequest({
 				method: "DELETE",
-				path: `/api/v10/users/@me/relationships/${userID}`,
-				headers: {
-					"Authorization": this.token
-				}
-			};
-
-			return new Promise(function(resolve) {
-				const req = https.request(options, function(res) {
-					res.on("end", resolve);
-				});
-
-				req.end();
+				path: `/api/v10/users/@me/relationships/${userID}`
 			});
 		}
 
-		renameChannel(channelID, channelName) {
-			const nameData = module.exports.jsonEncode({name: channelName});
-			const options = {
-				...module.exports.APIBaseOpt,
+		async renameChannel(channelID, channelName) {
+			return await this.makeRequest({
 				method: "PATCH",
 				path: `/api/v10/channels/${channelID}`,
-				headers: {
-					"Authorization": this.token,
-					"Content-Type": "application/json",
-					"Content-Length": nameData.length
+				body: {
+					name: channelName
 				}
-			};
-
-			return new Promise(function(resolve) {
-				const req = https.request(options, function(res) {
-					res.on("end", resolve);
-				});
-
-				req.write(nameData);
-				req.end();
 			});
 		}
 
-		block(userID) {
-			const blockData = module.exports.jsonEncode({type: 2});
-			const options = {
-				...module.exports.APIBaseOpt,
+		async block(userID) {
+			return await this.makeRequest({
 				method: "PUT",
 				path: `/api/v10/users/@me/relationships/${userID}`,
-				headers: {
-					"Authorization": this.token,
-					"Content-Type": "application/json",
-					"Content-Length": blockData.length
+				body: {
+					type: 2
 				}
-			};
-
-			return new Promise(function(resolve) {
-				const req = https.request(options, function(res) {
-					res.on("end", resolve);
-				});
-
-				req.write(blockData);
-				req.end();
 			});
 		}
 
@@ -937,22 +695,10 @@ module.exports = {
 			}.bind(this));
 		}
 
-		deleteMessage(channelID, messageID) {
-			const options = {
-				...module.exports.APIBaseOpt,
+		async deleteMessage(channelID, messageID) {
+			return await this.makeRequest({
 				method: "DELETE",
-				path: `/api/v10/channels/${channelID}/messages/${messageID}`,
-				headers: {
-					"Authorization": this.token
-				}
-			};
-
-			return new Promise(function(resolve) {
-				const req = https.request(options, function(res) {
-					res.on("end", resolve);
-				});
-
-				req.end();
+				path: `/api/v10/channels/${channelID}/messages/${messageID}`
 			});
 		}
 
@@ -972,164 +718,63 @@ module.exports = {
 			}.bind(this));
 		}
 
-		createGroupChat(userIDs) {
-			const userData = module.exports.jsonEncode({recipients: userIDs});
-			const options = {
-				...module.exports.APIBaseOpt,
+		async createGroupChat(userIDs) {
+			return await this.makeRequest({
 				method: "POST",
 				path: `/api/v10/users/@me/channels`,
-				headers: {
-					"Authorization": this.token,
-					"Content-Type": "application/json",
-					"Content-Length": userData.length
+				body: {
+					recipients: userIDs
 				}
-			};
-
-			return new Promise(function(resolve) {
-				const req = https.request(options, function(res) {
-					const chunks = [];
-
-					res.on("data", function(chunk) {
-						chunks.push(chunk);
-					}).on("end", function() {
-						resolve(JSON.parse(Buffer.concat(chunks)));
-					});
-				});
-
-				req.write(userData);
-				req.end();
 			});
 		}
 
-		startTyping(channelID) {
-			const options = {
-				...module.exports.APIBaseOpt,
+		async startTyping(channelID) {
+			return await this.makeRequest({
 				method: "POST",
 				path: `/api/v10/channels/${channelID}/typing`,
-				headers: {
-					"Authorization": this.token,
-					"Content-Length": 0
-				}
-			};
-
-			return new Promise(function(resolve) {
-				const req = https.request(options, function(res) {
-					res.on("end", resolve);
-				});
-
-				req.write("");
-				req.end();
+				body: "junkValue"
 			});
 		}
 
-		pinMessage(channelID, messageID) {
-			const options = {
-				...module.exports.APIBaseOpt,
+		async pinMessage(channelID, messageID) {
+			return await this.makeRequest({
 				method: "PUT",
 				path: `/api/v10/channels/${channelID}/pins/${messageID}`,
-				headers: {
-					"Authorization": this.token,
-					"Content-Length": 0
-				}
-			};
-
-			return new Promise(function(resolve) {
-				const req = https.request(options, function(res) {
-					res.on("end", resolve);
-				});
-
-				req.write("");
-				req.end();
+				body: "junkValue"
 			});
 		}
 
-		unpinMessage(channelID, messageID) {
-			const options = {
-				...module.exports.APIBaseOpt,
+		async unpinMessage(channelID, messageID) {
+			return await this.makeRequest({
 				method: "DELETE",
-				path: `/api/v10/channels/${channelID}/pins/${messageID}`,
-				headers: {
-					"Authorization": this.token
-				}
-			};
-
-			return new Promise(function(resolve) {
-				const req = https.request(options, function(res) {
-					res.on("end", resolve);
-				});
-
-				req.end();
+				path: `/api/v10/channels/${channelID}/pins/${messageID}`
 			});
 		}
 
-		editNote(userID, note) {
-			const noteData = module.exports.jsonEncode({note});
-			const options = {
-				...module.exports.APIBaseOpt,
+		async editNote(userID, note) {
+			return await this.makeRequest({
 				method: "PUT",
 				path: `/api/v10/users/@me/notes/${userID}`,
-				headers: {
-					"Authorization": this.token,
-					"Content-Type": "application/json",
-					"Content-Length": noteData.length
+				body: {
+					note
 				}
-			};
-
-			return new Promise(function(resolve) {
-				const req = https.request(options, function(res) {
-					res.on("end", resolve);
-				});
-
-				req.write(noteData);
-				req.end();
 			});
 		}
 
-		getChannelData(channelID) {
-			const options = {
-				...module.exports.APIBaseOpt,
+		async getChannelData(channelID) {
+			return await this.makeRequest({
 				method: "GET",
-				path: `/api/v10/channels/${channelID}`,
-				headers: {
-					"Authorization": this.token
-				}
-			};
-
-			return new Promise(function(resolve) {
-				const req = https.request(options, function(res) {
-					let chunks = [];
-
-					res.on("data", function(chunk) {
-						chunks.push(chunk);
-					}).on("end", function() {
-						resolve(JSON.parse(Buffer.concat(chunks)));
-					});
-				});
-
-				req.end();
+				path: `/api/v10/channels/${channelID}`
 			});
 		}
 
-		transferOwnership(channelID, userID) {
-			const ownershipData = module.exports.jsonEncode({owner: userID});
-			const options = {
-				...module.exports.APIBaseOpt,
+		async transferOwnership(channelID, userID) {
+			return await this.makeRequest({
 				method: "PATCH",
 				path: `/api/v10/channels/${channelID}`,
-				headers: {
-					"Authorization": this.token,
-					"Content-Type": "application/json",
-					"Content-Length": ownershipData.length
+				body: {
+					owner: userID
 				}
-			};
-
-			return new Promise(function(resolve) {
-				const req = https.request(options, function(res) {
-					res.on("end", resolve);
-				});
-
-				req.write(ownershipData);
-				req.end();
 			});
 		}
 	}