Nomchy/discord.js
1
0
Fork 0
mirror of https://github.com/discordjs/discord.js.git synced 2026-03-19 21:13:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Reformatted internals

Browse Source
This commit is contained in:
hydrabolt
2015-11-08 20:40:18 +00:00
parent ad536445d9
commit 821c12f82c
1 changed files with 203 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

264
src/Client/InternalClient.js
View File

@@ -45,63 +45,63 @@ class InternalClient {
} }
//def leaveVoiceChannel //def leaveVoiceChannel
leaveVoiceChannel(){ leaveVoiceChannel() {
var self = this; var self = this;
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
if(self.voiceConnection){ if (self.voiceConnection) {
self.voiceConnection.destroy(); self.voiceConnection.destroy();
self.voiceConnection = null; self.voiceConnection = null;
resolve(); resolve();
}else{ } else {
resolve(); resolve();
} }
}); });
} }
//def joinVoiceChannel //def joinVoiceChannel
joinVoiceChannel(chann){ joinVoiceChannel(chann) {
var self = this; var self = this;
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
var channel = self.resolver.resolveVoiceChannel(chann); var channel = self.resolver.resolveVoiceChannel(chann);
if(channel){ if (channel) {
self.leaveVoiceChannel().then(next); self.leaveVoiceChannel().then(next);
function next(){ function next() {
var session, token, server = channel.server, endpoint; var session, token, server = channel.server, endpoint;
var check = (m) => { var check = (m) => {
var data = JSON.parse(m); var data = JSON.parse(m);
if(data.t === "VOICE_STATE_UPDATE"){ if (data.t === "VOICE_STATE_UPDATE") {
session = data.d.session_id; session = data.d.session_id;
}else if(data.t === "VOICE_SERVER_UPDATE"){ } else if (data.t === "VOICE_SERVER_UPDATE") {
token = data.d.token; token = data.d.token;
endpoint = data.d.endpoint; endpoint = data.d.endpoint;
var chan = self.voiceConnection = new VoiceConnection(channel, self.client, session, token, server, endpoint); var chan = self.voiceConnection = new VoiceConnection(channel, self.client, session, token, server, endpoint);
chan.on("ready", resolve); chan.on("ready", resolve);
chan.on("error", reject); chan.on("error", reject);
self.client.emit("debug", "removed temporary voice websocket listeners"); self.client.emit("debug", "removed temporary voice websocket listeners");
self.websocket.removeListener("message", check); self.websocket.removeListener("message", check);
} }
}; };
self.websocket.on("message", check); self.websocket.on("message", check);
self.sendWS({ self.sendWS({
op : 4, op: 4,
d : { d: {
"guild_id" : server.id, "guild_id": server.id,
"channel_id" : channel.id, "channel_id": channel.id,
"self_mute" : false, "self_mute": false,
"self_deaf" : false "self_deaf": false
} }
}); });
} }
}else{ } else {
reject(new Error("voice channel does not exist")); reject(new Error("voice channel does not exist"));
} }
@@ -514,20 +514,20 @@ class InternalClient {
} }
// def deleteChannel // def deleteChannel
deleteChannel(_channel){ deleteChannel(_channel) {
var self = this; var self = this;
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
self.resolver.resolveChannel(_channel).then(next).catch(reject); self.resolver.resolveChannel(_channel).then(next).catch(reject);
function next(channel){ function next(channel) {
request request
.del(Endpoints.CHANNEL(channel.id)) .del(Endpoints.CHANNEL(channel.id))
.set("authorization", self.token) .set("authorization", self.token)
.end(function(err, res){ .end(function (err, res) {
if(err){ if (err) {
reject(err); reject(err);
}else{ } else {
channel.server.channels.remove(channel); channel.server.channels.remove(channel);
self.channels.remove(channel); self.channels.remove(channel);
resolve(); resolve();
@@ -538,7 +538,7 @@ class InternalClient {
} }
// def banMember // def banMember
banMember(user, server, length=1){ banMember(user, server, length = 1) {
var self = this; var self = this;
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
@@ -546,12 +546,12 @@ class InternalClient {
server = self.resolver.resolveServer(server); server = self.resolver.resolveServer(server);
request request
.put(`${Endpoints.SERVER_BANS(server.id)}/${user.id}/?delete-message-days=${length}`) .put(`${Endpoints.SERVER_BANS(server.id) }/${user.id}/?delete-message-days=${length}`)
.set("authorization", self.token) .set("authorization", self.token)
.end((err, res) => { .end((err, res) => {
if(err){ if (err) {
reject(err); reject(err);
}else{ } else {
resolve(); resolve();
} }
}); });
@@ -559,7 +559,7 @@ class InternalClient {
} }
// def createRole // def createRole
createRole(server, data){ createRole(server, data) {
var self = this; var self = this;
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
@@ -568,20 +568,20 @@ class InternalClient {
request request
.post(Endpoints.SERVER_ROLES(server.id)) .post(Endpoints.SERVER_ROLES(server.id))
.set("authorization", self.token) .set("authorization", self.token)
.end( (err, res) => { .end((err, res) => {
if(err){ if (err) {
reject(err); reject(err);
}else{ } else {
var role = server.roles.add(new Role(res.body, server, self.client)); var role = server.roles.add(new Role(res.body, server, self.client));
if(data){ if (data) {
self.updateRole(role, data) self.updateRole(role, data)
.then(resolve) .then(resolve)
.catch(reject); .catch(reject);
}else{ } else {
resolve(role); resolve(role);
} }
@@ -591,7 +591,7 @@ class InternalClient {
}); });
} }
// def updateRole // def updateRole
updateRole(role, data){ updateRole(role, data) {
var self = this; var self = this;
data = data || {}; data = data || {};
data.permissions = data.permissions || []; data.permissions = data.permissions || [];
@@ -600,10 +600,10 @@ class InternalClient {
var server = self.resolver.resolveServer(role.server); var server = self.resolver.resolveServer(role.server);
var permissions = 0; var permissions = 0;
for(var perm of data.permissions){ for (var perm of data.permissions) {
if(perm instanceof String || typeof perm === "string"){ if (perm instanceof String || typeof perm === "string") {
permissions |= (Constants.Permissions[perm] || 0); permissions |= (Constants.Permissions[perm] || 0);
}else{ } else {
permissions |= perm; permissions |= perm;
} }
} }
@@ -611,39 +611,39 @@ class InternalClient {
data.color = data.color || 0; data.color = data.color || 0;
request request
.patch(Endpoints.SERVER_ROLES(server.id)+"/"+role.id) .patch(Endpoints.SERVER_ROLES(server.id) + "/" + role.id)
.set("authorization", self.token) .set("authorization", self.token)
.send({ .send({
color : data.color || role.color, color: data.color || role.color,
hoist : data.hoist || role.hoist, hoist: data.hoist || role.hoist,
name : data.name || role.name, name: data.name || role.name,
permissions : permissions permissions: permissions
}) })
.end((err, res) => { .end((err, res) => {
if(err){ if (err) {
reject(err); reject(err);
}else{ } else {
var nrole = new Role(res.body, server, self.client); var nrole = new Role(res.body, server, self.client);
resolve( resolve(
server.roles.update(role, nrole) server.roles.update(role, nrole)
); );
} }
}); });
}); });
} }
// def deleteRole // def deleteRole
deleteRole(role){ deleteRole(role) {
var self = this; var self = this;
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
request request
.del(Endpoints.SERVER_ROLES(role.server.id)+"/"+role.id) .del(Endpoints.SERVER_ROLES(role.server.id) + "/" + role.id)
.set("authorization", self.token) .set("authorization", self.token)
.end((err, res) => { .end((err, res) => {
if(err){ if (err) {
reject(err); reject(err);
}else{ } else {
resolve(); resolve();
// the ws cache will handle it // the ws cache will handle it
// role.server.roles.remove(role); // role.server.roles.remove(role);
@@ -654,36 +654,36 @@ class InternalClient {
} }
//def addMemberToRole //def addMemberToRole
addMemberToRole(member, role){ addMemberToRole(member, role) {
var self = this; var self = this;
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
member = self.resolver.resolveUser(member); member = self.resolver.resolveUser(member);
if(!member || !role){ if (!member || !role) {
reject(new Error("member/role not in server")); reject(new Error("member/role not in server"));
return; return;
} }
if(role.server.memberMap[member.id]){ if (role.server.memberMap[member.id]) {
var roleIDS = role.server.memberMap[member.id].roles.map(r => r.id).concat(role.id); var roleIDS = role.server.memberMap[member.id].roles.map(r => r.id).concat(role.id);
request request
.patch(Endpoints.SERVER_MEMBERS(role.server.id)+"/"+member.id) .patch(Endpoints.SERVER_MEMBERS(role.server.id) + "/" + member.id)
.set("authorization", self.token) .set("authorization", self.token)
.send({ .send({
roles : roleIDS roles: roleIDS
}) })
.end((err) => { .end((err) => {
if(err){ if (err) {
reject(err); reject(err);
}else{ } else {
resolve(); resolve();
} }
}); });
}else{ } else {
reject(new Error("member not in server")); reject(new Error("member not in server"));
} }
@@ -691,42 +691,42 @@ class InternalClient {
} }
//def removeMemberFromRole //def removeMemberFromRole
removeMemberFromRole(member, role){ removeMemberFromRole(member, role) {
var self = this; var self = this;
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
member = self.resolver.resolveUser(member); member = self.resolver.resolveUser(member);
if(!member || !role){ if (!member || !role) {
reject(new Error("member/role not in server")); reject(new Error("member/role not in server"));
return; return;
} }
if(role.server.memberMap[member.id]){ if (role.server.memberMap[member.id]) {
var roleIDS = role.server.memberMap[member.id].roles.map(r => r.id); var roleIDS = role.server.memberMap[member.id].roles.map(r => r.id);
for(var item in roleIDS){ for (var item in roleIDS) {
if(roleIDS[item] === role.id){ if (roleIDS[item] === role.id) {
roleIDS.splice(item, 1); roleIDS.splice(item, 1);
} }
} }
request request
.patch(Endpoints.SERVER_MEMBERS(role.server.id)+"/"+member.id) .patch(Endpoints.SERVER_MEMBERS(role.server.id) + "/" + member.id)
.set("authorization", self.token) .set("authorization", self.token)
.send({ .send({
roles : roleIDS roles: roleIDS
}) })
.end((err) => { .end((err) => {
if(err){ if (err) {
reject(err); reject(err);
}else{ } else {
resolve(); resolve();
} }
}); });
}else{ } else {
reject(new Error("member not in server")); reject(new Error("member not in server"));
} }
@@ -734,26 +734,26 @@ class InternalClient {
} }
// def createInvite // def createInvite
createInvite(chanServ, options){ createInvite(chanServ, options) {
var self = this; var self = this;
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
if(chanServ instanceof Channel){ if (chanServ instanceof Channel) {
// do something // do something
}else if(chanServ instanceof Server){ } else if (chanServ instanceof Server) {
// do something // do something
}else{ } else {
chanServ = self.resolver.resolveServer(chanServ) || self.resolver.resolveChannel(chanServ); chanServ = self.resolver.resolveServer(chanServ) || self.resolver.resolveChannel(chanServ);
} }
if(!chanServ){ if (!chanServ) {
reject(new Error("couldn't resolve where")); reject(new Error("couldn't resolve where"));
return; return;
} }
if(!options){ if (!options) {
options = {validate:null}; options = { validate: null };
}else{ } else {
options.max_age = options.maxAge || 0; options.max_age = options.maxAge || 0;
options.max_uses = options.maxUses || 0; options.max_uses = options.maxUses || 0;
options.temporary = options.temporary || false; options.temporary = options.temporary || false;
@@ -761,9 +761,9 @@ class InternalClient {
} }
var epoint; var epoint;
if(chanServ instanceof Channel){ if (chanServ instanceof Channel) {
epoint = Endpoints.CHANNEL_INVITES(chanServ.id); epoint = Endpoints.CHANNEL_INVITES(chanServ.id);
}else{ } else {
epoint = Endpoints.SERVER_INVITES(chanServ.id); epoint = Endpoints.SERVER_INVITES(chanServ.id);
} }
@@ -772,9 +772,9 @@ class InternalClient {
.set("authorization", self.token) .set("authorization", self.token)
.send(options) .send(options)
.end((err, res) => { .end((err, res) => {
if(err){ if (err) {
reject(err); reject(err);
}else{ } else {
resolve(new Invite(res.body, self.channels.get("id", res.body.channel.id), self.client)); resolve(new Invite(res.body, self.channels.get("id", res.body.channel.id), self.client));
} }
}); });
@@ -783,14 +783,14 @@ class InternalClient {
} }
//def overwritePermissions //def overwritePermissions
overwritePermissions(channel, role, updated){ overwritePermissions(channel, role, updated) {
var self = this; var self = this;
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
channel = self.resolver.resolveChannel(channel).catch(reject).then(next); channel = self.resolver.resolveChannel(channel).catch(reject).then(next);
function next(channel){ function next(channel) {
var user; var user;
if(role instanceof User){ if (role instanceof User) {
user = role; user = role;
} }
@@ -801,35 +801,35 @@ class InternalClient {
updated.allow = updated.allow || []; updated.allow = updated.allow || [];
updated.deny = updated.deny || []; updated.deny = updated.deny || [];
if(role instanceof Role){ if (role instanceof Role) {
data.id = role.id; data.id = role.id;
data.type = "role"; data.type = "role";
}else if(user){ } else if (user) {
data.id = user.id; data.id = user.id;
data.type = "member"; data.type = "member";
}else{ } else {
reject(new Error("role incorrect")); reject(new Error("role incorrect"));
return; return;
} }
for(var perm in updated){ for (var perm in updated) {
if(updated[perm]){ if (updated[perm]) {
if(perm instanceof String || typeof perm === "string"){ if (perm instanceof String || typeof perm === "string") {
data.allow |= (Constants.Permissions[perm] || 0); data.allow |= (Constants.Permissions[perm] || 0);
}else{ } else {
data.allow |= perm; data.allow |= perm;
} }
}else{ } else {
if(perm instanceof String || typeof perm === "string"){ if (perm instanceof String || typeof perm === "string") {
data.deny |= (Constants.Permissions[perm] || 0); data.deny |= (Constants.Permissions[perm] || 0);
}else{ } else {
data.deny |= perm; data.deny |= perm;
} }
} }
} }
request request
.put(Endpoints.CHANNEL_PERMISSIONS(channel.id)+"/"+data.id) .put(Endpoints.CHANNEL_PERMISSIONS(channel.id) + "/" + data.id)
.set("authorization", self.token) .set("authorization", self.token)
.send(data) .send(data)
.end(function (err) { .end(function (err) {
@@ -839,31 +839,31 @@ class InternalClient {
resolve(); resolve();
} }
}); });
} }
}); });
} }
//def setTopic //def setTopic
setTopic(chann, topic=""){ setTopic(chann, topic = "") {
var self = this; var self = this;
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
self.resolver.resolveChannel(chann).then(next).catch(reject); self.resolver.resolveChannel(chann).then(next).catch(reject);
function next(channel){ function next(channel) {
request request
.patch(Endpoints.CHANNEL(channel.id)) .patch(Endpoints.CHANNEL(channel.id))
.set("authorization", self.token) .set("authorization", self.token)
.send({ .send({
name : channel.name, name: channel.name,
position : 0, position: 0,
topic : topic topic: topic
}) })
.end((err, res) => { .end((err, res) => {
if(err){ if (err) {
reject(err); reject(err);
}else{ } else {
channel.topic = res.body.topic; channel.topic = res.body.topic;
resolve(); resolve();
} }
@@ -874,26 +874,26 @@ class InternalClient {
}); });
} }
//def setChannelName //def setChannelName
setChannelName(chann, name="discordjs_is_the_best"){ setChannelName(chann, name = "discordjs_is_the_best") {
var self = this; var self = this;
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
self.resolver.resolveChannel(chann).then(next).catch(reject); self.resolver.resolveChannel(chann).then(next).catch(reject);
function next(channel){ function next(channel) {
request request
.patch(Endpoints.CHANNEL(channel.id)) .patch(Endpoints.CHANNEL(channel.id))
.set("authorization", self.token) .set("authorization", self.token)
.send({ .send({
name : name, name: name,
position : 0, position: 0,
topic : channel.topic topic: channel.topic
}) })
.end((err, res) => { .end((err, res) => {
if(err){ if (err) {
reject(err); reject(err);
}else{ } else {
channel.name = res.body.name; channel.name = res.body.name;
resolve(); resolve();
} }
@@ -904,26 +904,26 @@ class InternalClient {
}); });
} }
//def setChannelNameAndTopic //def setChannelNameAndTopic
setChannelNameAndTopic(chann, name="discordjs_is_the_best", topic=""){ setChannelNameAndTopic(chann, name = "discordjs_is_the_best", topic = "") {
var self = this; var self = this;
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
self.resolver.resolveChannel(chann).then(next).catch(reject); self.resolver.resolveChannel(chann).then(next).catch(reject);
function next(channel){ function next(channel) {
request request
.patch(Endpoints.CHANNEL(channel.id)) .patch(Endpoints.CHANNEL(channel.id))
.set("authorization", self.token) .set("authorization", self.token)
.send({ .send({
name : name, name: name,
position : 0, position: 0,
topic : topic topic: topic
}) })
.end((err, res) => { .end((err, res) => {
if(err){ if (err) {
reject(err); reject(err);
}else{ } else {
channel.name = res.body.name; channel.name = res.body.name;
channel.topic = res.body.topic; channel.topic = res.body.topic;
resolve(); resolve();
@@ -936,7 +936,7 @@ class InternalClient {
} }
//def updateChannel //def updateChannel
updateChannel(chann, data){ updateChannel(chann, data) {
return this.setChannelNameAndTopic(chann, data.name, data.topic); return this.setChannelNameAndTopic(chann, data.name, data.topic);
} }