Andromeda/jank-client-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix a bug with message create event and updated css

Browse source
This commit is contained in:
MathMan05 2024-07-27 11:15:24 -05:00
parent 58b79be7f2
commit 0d757b7d4e
3 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
.dist/member.js
View file

@ -9,6 +9,7 @@ class Member {
user; user;
roles; roles;
error; error;
id;
static contextmenu = new Contextmenu("User Menu"); static contextmenu = new Contextmenu("User Menu");
static setUpContextMenu() { static setUpContextMenu() {
this.contextmenu.addbutton("Copy user id", function () { this.contextmenu.addbutton("Copy user id", function () {
@ -30,7 +31,6 @@ class Member {
if (memberjson["guild_member"]) { if (memberjson["guild_member"]) {
memberjson = memberjson; memberjson = memberjson;
membery = memberjson.guild_member; membery = memberjson.guild_member;
this.user = new User(memberjson.user, this.localuser);
} }
} }
membery = membery; membery = membery;
@ -54,6 +54,11 @@ class Member {
this.user = memberjson; this.user = memberjson;
} }
else { else {
console.log(this.user, memberjson);
if (SnowFlake.getSnowFlakeFromID(this?.id, User)) {
this.user = SnowFlake.getSnowFlakeFromID(this.id, User).getObject();
return;
}
this.user = new User(this.user, owner.localuser); this.user = new User(this.user, owner.localuser);
} }
} }

7
webpage/member.ts
View file

@ -11,6 +11,7 @@ class Member{
user:User; user:User;
roles:Role[]; roles:Role[];
error:boolean; error:boolean;
id:string;
static contextmenu:Contextmenu=new Contextmenu("User Menu"); static contextmenu:Contextmenu=new Contextmenu("User Menu");
static setUpContextMenu(){ static setUpContextMenu(){
this.contextmenu.addbutton("Copy user id",function(){ this.contextmenu.addbutton("Copy user id",function(){
@ -33,7 +34,6 @@ class Member{
if(memberjson["guild_member"]){ if(memberjson["guild_member"]){
memberjson=memberjson as {guild_member:memberjson,user:userjson}; memberjson=memberjson as {guild_member:memberjson,user:userjson};
membery=memberjson.guild_member; membery=memberjson.guild_member;
this.user=new User(memberjson.user,this.localuser);
} }
} }
membery=membery as User|memberjson; membery=membery as User|memberjson;
@ -52,6 +52,11 @@ class Member{
if(error){ if(error){
this.user=memberjson as User; this.user=memberjson as User;
}else{ }else{
console.log(this.user,memberjson);
if(SnowFlake.getSnowFlakeFromID(this?.id,User)){
this.user=SnowFlake.getSnowFlakeFromID(this.id,User).getObject();
return;
}
this.user=new User(this.user,owner.localuser); this.user=new User(this.user,owner.localuser);
} }
} }

3
webpage/style.css
View file

@ -1438,3 +1438,6 @@ span {
content:'You can\'t chat here'; content:'You can\'t chat here';
color:color-mix(in hsl, var(--primary-bg),var(--primary-text)); color:color-mix(in hsl, var(--primary-bg),var(--primary-text));
} }
.scroller{
padding-bottom:.2in;
}