@@ -27,34 +27,7 @@ class Member extends SnowFlake {
27
27
if ( this . localuser . userMap . has ( this ?. id ) ) {
28
28
this . user = this . localuser . userMap . get ( this ?. id ) as User ;
29
29
}
30
- for ( const key of Object . keys ( memberjson ) ) {
31
- if ( key === "guild" || key === "owner" || key === "user" ) {
32
- continue ;
33
- }
34
-
35
- if ( key === "roles" ) {
36
- for ( const strrole of memberjson . roles ) {
37
- const role = this . guild . roleids . get ( strrole ) ;
38
- if ( ! role ) continue ;
39
- this . roles . push ( role ) ;
40
- }
41
- continue ;
42
- }
43
- if ( key === "presence" ) {
44
- this . getPresence ( memberjson . presence ) ;
45
- continue ;
46
- }
47
- ( this as any ) [ key ] = ( memberjson as any ) [ key ] ;
48
- }
49
-
50
- const everyone = this . guild . roleids . get ( this . guild . id ) ;
51
- if ( everyone && this . roles . indexOf ( everyone ) === - 1 ) {
52
- this . roles . push ( everyone ) ;
53
- }
54
-
55
- this . roles . sort ( ( a , b ) => {
56
- return this . guild . roles . indexOf ( a ) - this . guild . roles . indexOf ( b ) ;
57
- } ) ;
30
+ this . update ( memberjson ) ;
58
31
}
59
32
remove ( ) {
60
33
this . user . members . delete ( this . guild ) ;
@@ -336,6 +309,11 @@ class Member extends SnowFlake {
336
309
( this as any ) [ key ] = ( memberjson as any ) [ key ] ;
337
310
}
338
311
312
+ const everyone = this . guild . roleids . get ( this . guild . id ) ;
313
+ if ( everyone && this . roles . indexOf ( everyone ) === - 1 ) {
314
+ this . roles . push ( everyone ) ;
315
+ }
316
+
339
317
this . roles . sort ( ( a , b ) => {
340
318
return this . guild . roles . indexOf ( a ) - this . guild . roles . indexOf ( b ) ;
341
319
} ) ;
0 commit comments