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

memberHasRole, membersWithRole

Browse Source
This commit is contained in:
abalabahaha
2016-01-29 17:02:40 -08:00
parent 2c8747995a
commit ee2172c1d5
8 changed files with 83 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
lib/Client/Client.js
View File

@@ -397,6 +397,20 @@ var Client = (function (_EventEmitter) {
return this.addMemberToRole(member, role, callback);
};
// def addUserToRole
Client.prototype.memberHasRole = function memberHasRole(member, role) {
return this.internal.memberHasRole(member, role);
};
// def addUserToRole
Client.prototype.userHasRole = function userHasRole(member, role) {
var callback = arguments.length <= 2 || arguments[2] === undefined ? function () /*err, {}*/{} : arguments[2];
return this.memberHasRole(member, role, callback);
};
// def removeMemberFromRole
Client.prototype.removeMemberFromRole = function removeMemberFromRole(member, role) {
@@ -413,38 +427,6 @@ var Client = (function (_EventEmitter) {
return this.removeMemberFromRole(member, role, callback);
};
// def addMemberToRole
Client.prototype.addMemberToRoles = function addMemberToRoles(member, roles) {
var callback = arguments.length <= 2 || arguments[2] === undefined ? function () /*err, {}*/{} : arguments[2];
return this.internal.addMemberToRoles(member, roles).then(dataCallback(callback), errorCallback(callback));
};
// def addUserToRole
Client.prototype.addUserToRoles = function addUserToRoles(member, roles) {
var callback = arguments.length <= 2 || arguments[2] === undefined ? function () /*err, {}*/{} : arguments[2];
return this.addMemberToRoles(member, roles, callback);
};
// def removeMemberFromRole
Client.prototype.removeMemberFromRoles = function removeMemberFromRoles(member, roles) {
var callback = arguments.length <= 2 || arguments[2] === undefined ? function () /*err, {}*/{} : arguments[2];
return this.internal.removeMemberFromRoles(member, roles).then(dataCallback(callback), errorCallback(callback));
};
// def removeUserFromRole
Client.prototype.removeUserFromRoles = function removeUserFromRoles(member, roles) {
var callback = arguments.length <= 2 || arguments[2] === undefined ? function () /*err, {}*/{} : arguments[2];
return this.removeMemberFromRoles(member, roles, callback);
};
// def createInvite
Client.prototype.createInvite = function createInvite(chanServ, options) {

16
lib/Client/InternalClient.js
View File

@@ -801,7 +801,7 @@ var InternalClient = (function () {
member = this.resolver.resolveUser(member);
if (!member) {
return Promise.reject(new Error("member not in server"));
return Promise.reject(new Error("user not found"));
}
if (!Array.isArray(roles) || roles.length === 0) {
@@ -833,13 +833,25 @@ var InternalClient = (function () {
});
};
InternalClient.prototype.memberHasRole = function memberHasRole(member, role) {
member = this.resolver.resolveUser(member);
if (!member) {
throw new Error("user not found");
}
return !!role.server.rolesOf(member).find(function (r) {
return r.id == role.id;
});
};
//def removeMemberFromRole
InternalClient.prototype.removeMemberFromRole = function removeMemberFromRole(member, roles) {
member = this.resolver.resolveUser(member);
if (!member) {
return Promise.reject(new Error("member not in server"));
return Promise.reject(new Error("user not found"));
}
if (!Array.isArray(roles) || roles.length === 0) {

14
lib/Structures/Server.js
View File

@@ -187,6 +187,10 @@ var Server = (function (_Equality) {
}
};
Server.prototype.rolesOfMember = function rolesOfMember(member) {
return this.rolesOfUser(member);
};
Server.prototype.rolesOf = function rolesOf(user) {
return this.rolesOfUser(user);
};
@@ -322,6 +326,16 @@ var Server = (function (_Equality) {
return this.client.createChannel.apply(this.client, _UtilArgumentRegulariser.reg(this, arguments));
};
Server.prototype.membersWithRole = function membersWithRole(role) {
return this.members.filter(function (m) {
return m.hasRole(role);
});
};
Server.prototype.usersWithRole = function usersWithRole(role) {
return this.membersWithRole(role);
};
_createClass(Server, [{
key: "iconURL",
get: function get() {

4
lib/Structures/User.js
View File

@@ -95,6 +95,10 @@ var User = (function (_Equality) {
return this.client.getChannelLogs.apply(this.client, _UtilArgumentRegulariser.reg(this, arguments));
};
User.prototype.hasRole = function hasRole(role) {
return this.client.memberHasRole.apply(this.client, [this, role]);
};
_createClass(User, [{
key: "avatarURL",
get: function get() {

32
src/Client/Client.js
View File

@@ -338,6 +338,16 @@ export default class Client extends EventEmitter {
return this.addMemberToRole(member, role, callback);
}
// def addUserToRole
memberHasRole(member, role) {
return this.internal.memberHasRole(member, role);
}
// def addUserToRole
userHasRole(member, role, callback = (/*err, {}*/) => { }) {
return this.memberHasRole(member, role, callback);
}
// def removeMemberFromRole
removeMemberFromRole(member, role, callback = (/*err, {}*/) => { }) {
return this.internal.removeMemberFromRole(member, role)
@@ -349,28 +359,6 @@ export default class Client extends EventEmitter {
return this.removeMemberFromRole(member, role, callback);
}
// def addMemberToRole
addMemberToRoles(member, roles, callback = (/*err, {}*/) => { }) {
return this.internal.addMemberToRoles(member, roles)
.then(dataCallback(callback), errorCallback(callback));
}
// def addUserToRole
addUserToRoles(member, roles, callback = (/*err, {}*/) => { }) {
return this.addMemberToRoles(member, roles, callback);
}
// def removeMemberFromRole
removeMemberFromRoles(member, roles, callback = (/*err, {}*/) => { }) {
return this.internal.removeMemberFromRoles(member, roles)
.then(dataCallback(callback), errorCallback(callback));
}
// def removeUserFromRole
removeUserFromRoles(member, roles, callback = (/*err, {}*/) => { }) {
return this.removeMemberFromRoles(member, roles, callback);
}
// def createInvite
createInvite(chanServ, options, callback = (/*err, invite*/) => { }) {
if (typeof options === "function") {

14
src/Client/InternalClient.js
View File

@@ -657,7 +657,7 @@ export default class InternalClient {
member = this.resolver.resolveUser(member);
if (!member) {
return Promise.reject(new Error("member not in server"));
return Promise.reject(new Error("user not found"));
}
if (!Array.isArray(roles) || roles.length === 0) {
@@ -690,12 +690,22 @@ export default class InternalClient {
);
}
memberHasRole(member, role) {
member = this.resolver.resolveUser(member);
if (!member) {
throw new Error("user not found");
}
return !!role.server.rolesOf(member).find(r => r.id == role.id);
}
//def removeMemberFromRole
removeMemberFromRole(member, roles) {
member = this.resolver.resolveUser(member);
if (!member) {
return Promise.reject(new Error("member not in server"));
return Promise.reject(new Error("user not found"));
}
if (!Array.isArray(roles) || roles.length === 0) {

11
src/Structures/Server.js
View File

@@ -121,6 +121,10 @@ export default class Server extends Equality {
}
}
rolesOfMember(member) {
return this.rolesOfUser(member);
}
rolesOf(user) {
return this.rolesOfUser(user);
}
@@ -258,4 +262,11 @@ export default class Server extends Equality {
return this.client.createChannel.apply(this.client, reg(this, arguments));
}
membersWithRole(role) {
return this.members.filter(m => m.hasRole(role));
}
usersWithRole(role) {
return this.membersWithRole(role);
}
}

4
src/Structures/User.js
View File

@@ -106,4 +106,8 @@ export default class User extends Equality{
getLogs() {
return this.client.getChannelLogs.apply(this.client, reg(this, arguments));
}
hasRole(role) {
return this.client.memberHasRole.apply(this.client, [this, role]);
}
}