Merge remote-tracking branch 'upstream/main'

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

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

View file

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

View file

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