Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow passing a plain object to permissionsOf #1224

Merged
merged 3 commits into from
Jul 12, 2021
Merged

Allow passing a plain object to permissionsOf #1224

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2007c40
Allow passing a plain object to permissionsOf
bsian03 Jun 9, 2021
642b6ad
correct docs
bsian03 Jul 2, 2021
6791157
Fix reference
bsian03 Jul 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -796,6 +796,9 @@ declare namespace Eris {
id: string;
user: User;
}
interface MemberRoles extends BaseData {
roles: string[];
}
interface PartialUser {
avatar: string | null;
discriminator: string;
Expand Down Expand Up @@ -2044,7 +2047,7 @@ declare namespace Eris {
kickMember(userID: string, reason?: string): Promise<void>;
leave(): Promise<void>;
leaveVoiceChannel(): void;
permissionsOf(memberID: string | Member): Permission;
permissionsOf(memberID: string | Member | MemberRoles): Permission;
pruneMembers(options?: PruneMemberOptions): Promise<number>;
removeMemberRole(memberID: string, roleID: string, reason?: string): Promise<void>;
searchMembers(query: string, limit?: number): Promise<Member[]>;
Expand Down Expand Up @@ -2094,7 +2097,7 @@ declare namespace Eris {
): Promise<PermissionOverwrite>;
editPosition(position: number, options?: EditChannelPositionOptions): Promise<void>;
getInvites(): Promise<Invite[]>;
permissionsOf(memberID: string | Member): Permission;
permissionsOf(memberID: string | Member | MemberRoles): Permission;
}

export class GuildIntegration extends Base {
Expand Down
4 changes: 2 additions & 2 deletions lib/structures/Guild.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -894,11 +894,11 @@ class Guild extends Base {

/**
* Get the guild permissions of a member
* @arg {String | Member} memberID The ID of the member or a Member instance
* @arg {String | Member | Object} memberID The ID of the member or a Member object
* @returns {Permission}
*/
permissionsOf(memberID) {
const member = memberID instanceof Member ? memberID : this.members.get(memberID);
const member = typeof memberID === "string" ? this.guild.members.get(memberID) : memberID;
bsian03 marked this conversation as resolved.
Show resolved Hide resolved
if(member.id === this.ownerID) {
return new Permission(Permissions.all);
} else {
Expand Down
5 changes: 2 additions & 3 deletions lib/structures/GuildChannel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

const Channel = require("./Channel");
const Collection = require("../util/Collection");
const Member = require("./Member");
const Permission = require("./Permission");
const {Permissions} = require("../Constants");
const PermissionOverwrite = require("./PermissionOverwrite");
Expand Down Expand Up @@ -115,11 +114,11 @@ class GuildChannel extends Channel {

/**
* Get the channel-specific permissions of a member
* @arg {String | Member} memberID The ID of the member or a Member instance
* @arg {String | Member | Object} memberID The ID of the member or a Member object
* @returns {Permission}
*/
permissionsOf(memberID) {
const member = memberID instanceof Member ? memberID : this.guild.members.get(memberID);
const member = typeof memberID === "string" ? this.guild.members.get(memberID) : memberID;
let permission = this.guild.permissionsOf(member).allow;
if(permission & Permissions.administrator) {
return new Permission(Permissions.all);
Expand Down