remove dupe code and fix bot bug
This commit is contained in:
parent
9970966f56
commit
d1d72451e4
1 changed files with 6 additions and 28 deletions
|
@ -27,34 +27,7 @@ class Member extends SnowFlake {
|
|||
if (this.localuser.userMap.has(this?.id)) {
|
||||
this.user = this.localuser.userMap.get(this?.id) as User;
|
||||
}
|
||||
for (const key of Object.keys(memberjson)) {
|
||||
if (key === "guild" || key === "owner" || key === "user") {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (key === "roles") {
|
||||
for (const strrole of memberjson.roles) {
|
||||
const role = this.guild.roleids.get(strrole);
|
||||
if (!role) continue;
|
||||
this.roles.push(role);
|
||||
}
|
||||
continue;
|
||||
}
|
||||
if (key === "presence") {
|
||||
this.getPresence(memberjson.presence);
|
||||
continue;
|
||||
}
|
||||
(this as any)[key] = (memberjson as any)[key];
|
||||
}
|
||||
|
||||
const everyone = this.guild.roleids.get(this.guild.id);
|
||||
if (everyone && this.roles.indexOf(everyone) === -1) {
|
||||
this.roles.push(everyone);
|
||||
}
|
||||
|
||||
this.roles.sort((a, b) => {
|
||||
return this.guild.roles.indexOf(a) - this.guild.roles.indexOf(b);
|
||||
});
|
||||
this.update(memberjson);
|
||||
}
|
||||
remove() {
|
||||
this.user.members.delete(this.guild);
|
||||
|
@ -336,6 +309,11 @@ class Member extends SnowFlake {
|
|||
(this as any)[key] = (memberjson as any)[key];
|
||||
}
|
||||
|
||||
const everyone = this.guild.roleids.get(this.guild.id);
|
||||
if (everyone && this.roles.indexOf(everyone) === -1) {
|
||||
this.roles.push(everyone);
|
||||
}
|
||||
|
||||
this.roles.sort((a, b) => {
|
||||
return this.guild.roles.indexOf(a) - this.guild.roles.indexOf(b);
|
||||
});
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue