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

Merge remote-tracking branch 'upstream/main'

Browse source
This commit is contained in:
ygg2 2024-10-30 21:52:25 -04:00
commit d28dee3ceb
3 changed files with 18 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/webpage/localuser.ts
View file

@ -602,13 +602,14 @@ class Localuser{
} }
} }
const elms:Map<Role|"offline"|"online",Member[]>=new Map([["offline",[]],["online",[]]]); const elms:Map<Role|"offline"|"online",Member[]>=new Map([]);
for(const role of guild.roles){ for(const role of guild.roles){
console.log(guild.roles);
if(role.hoist){ if(role.hoist){
elms.set(role,[]); elms.set(role,[]);
} }
} }
elms.set("online",[]);
elms.set("offline",[])
const members=new Set(guild.members); const members=new Set(guild.members);
members.forEach((member)=>{ members.forEach((member)=>{
if(!channel.hasPermission("VIEW_CHANNEL",member)){ if(!channel.hasPermission("VIEW_CHANNEL",member)){
@ -626,6 +627,9 @@ class Localuser{
} }
return; return;
} }
if(member.user.status === "offline"){
return;
}
if(role !== "online"&&member.hasRole(role.id)){ if(role !== "online"&&member.hasRole(role.id)){
list.push(member); list.push(member);
members.delete(member); members.delete(member);
@ -671,7 +675,7 @@ class Localuser{
membershtml.append(memberdiv); membershtml.append(memberdiv);
} }
category.append(membershtml); category.append(membershtml);
div.prepend(category); div.append(category);
} }
console.log(elms); console.log(elms);

4
src/webpage/login.ts
View file

@ -474,9 +474,7 @@ async function login(username: string, password: string, captcha: string){
console.warn(res); console.warn(res);
if(!res.token)return; if(!res.token)return;
adduser({ adduser({
serverurls: JSON.parse( serverurls: JSON.parse(localStorage.getItem("instanceinfo") as string),
localStorage.getItem("instanceinfo")!
),
email: username, email: username,
token: res.token, token: res.token,
}).username = username; }).username = username;

17
src/webpage/role.ts
View file

@ -338,18 +338,21 @@ class RoleList extends Buttons{
console.log(found); console.log(found);
this.onchange(found.id,new Permissions("0","0")); this.onchange(found.id,new Permissions("0","0"));
}else{ }else{
const div=document.createElement("div");
const bar=document.createElement("input"); const bar=document.createElement("input");
bar.classList.add("fixedsearch"); div.classList.add("fixedsearch","OptionList");
bar.style.left=(box.left^0)+"px"; bar.type="text";
bar.style.top=(box.top^0)+"px"; div.style.left=(box.left^0)+"px";
document.body.append(bar); div.style.top=(box.top^0)+"px";
div.append(bar)
document.body.append(div);
if(Contextmenu.currentmenu != ""){ if(Contextmenu.currentmenu != ""){
Contextmenu.currentmenu.remove(); Contextmenu.currentmenu.remove();
} }
Contextmenu.currentmenu=bar; Contextmenu.currentmenu=div;
Contextmenu.keepOnScreen(bar); Contextmenu.keepOnScreen(div);
bar.onchange=()=>{ bar.onchange=()=>{
bar.remove(); div.remove();
console.log(bar.value) console.log(bar.value)
if(bar.value==="") return; if(bar.value==="") return;
fetch(this.info.api+`/guilds/${this.guild.id}/roles`,{ fetch(this.info.api+`/guilds/${this.guild.id}/roles`,{