lightcordwarez
/
BetterDiscordApp-v2
mirror of https://github.com/JsSucks/BetterDiscordApp
1
0
Fork 0
Code Issues 3 Releases Wiki Activity

Fix friend source flags

This commit is contained in:
Samuel Elliott 2018-06-24 19:50:21 +01:00
parent 2c38433a2b
commit c8ca4fcfce
No known key found for this signature in database
GPG Key ID: 8420C7CDE43DC4D6
3 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/src/modules/discordapi.js
View File

@ -194,10 +194,10 @@ export class UserSettings {
* Configurable in the privacy and safety panel.
*/
static get friendSourceFlags() { return Object.keys(Modules.UserSettingsStore.friendSourceFlags) }
static get friendSourceEveryone() { return this.friend_source_flags.include('all') }
static get friendSourceMutual_friends() { return this.friend_source_flags.include('all') || this.friend_source_flags.include('mutual_friends') }
static get friendSourceMutual_guilds() { return this.friend_source_flags.include('all') || this.friend_source_flags.include('mutual_guilds') }
static get friendSourceAnyone() { return this.friend_source_flags.length > 0 }
static get friendSourceEveryone() { return this.friendSourceFlags.include('all') }
static get friendSourceMutual_friends() { return this.friendSourceFlags.include('all') || this.friendSourceFlags.include('mutual_friends') }
static get friendSourceMutual_guilds() { return this.friendSourceFlags.include('all') || this.friendSourceFlags.include('mutual_guilds') }
static get friendSourceAnyone() { return this.friendSourceFlags.length > 0 }
/**
* Whether to automatically add accounts from other platforms running on the user's computer.

18
client/src/structs/discord/guild.js
View File

@ -211,13 +211,23 @@ export class Guild {
return Modules.GuildPermissions.getGuildPermissions(this.id);
}
getMember(id) {
const member = Modules.GuildMemberStore.getMember(this.id, id);
/**
* Returns the GuildMember object for a user.
* @param {User|GuildMember|Number} user A User or GuildMember object or a user ID
* @return {GuildMember}
*/
getMember(user) {
const member = Modules.GuildMemberStore.getMember(this.id, user.userId || user.id || user);
if (member) return new GuildMember(member, this.id);
}
isMember(id) {
return Modules.GuildMemberStore.isMember(this.id, id);
/**
* Checks if a user is a member of this guild.
* @param {User|GuildMember|Number} user A User or GuildMember object or a user ID
* @return {Boolean}
*/
isMember(user) {
return Modules.GuildMemberStore.isMember(this.id, user.userId || user.id || user);
}
/**

2
client/src/structs/discord/user.js
View File

@ -34,6 +34,8 @@ export class User {
if (user) return User.from(user);
}
static get GuildMember() { return GuildMember }
get id() { return this.discordObject.id }
get username() { return this.discordObject.username }
get usernameLowerCase() { return this.discordObject.usernameLowerCase }