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

various fixes

Browse source
This commit is contained in:
MathMan05 2024-08-18 11:11:36 -05:00
parent 302341bb99
commit fa1db8cf5d
6 changed files with 65 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.dist/guild.js
View file

@ -77,6 +77,9 @@ class Guild {
if (json === -1) { if (json === -1) {
return; return;
} }
if (json.stickers.length) {
console.log(json.stickers, ":3");
}
this.emojis = json.emojis; this.emojis = json.emojis;
this.owner = owner; this.owner = owner;
this.headers = this.owner.headers; this.headers = this.owner.headers;

4
.dist/infiniteScroller.js
View file

@ -164,7 +164,7 @@ class InfiniteScroller {
return; return;
} }
const out = await Promise.allSettled([this.watchForTop(), this.watchForBottom()]); const out = await Promise.allSettled([this.watchForTop(), this.watchForBottom()]);
const changed = (out[0] || out[1]); const changed = (out[0].value || out[1].value);
if (null === this.timeout && changed) { if (null === this.timeout && changed) {
this.timeout = setTimeout(this.updatestuff.bind(this), 300); this.timeout = setTimeout(this.updatestuff.bind(this), 300);
} }
@ -217,7 +217,7 @@ class InfiniteScroller {
await this.destroyFromID(thing[1]); await this.destroyFromID(thing[1]);
} }
this.HTMLElements = []; this.HTMLElements = [];
clearInterval(this.timeout); clearTimeout(this.timeout);
if (this.div) { if (this.div) {
this.div.remove(); this.div.remove();
} }

28
.dist/login.js
View file

@ -17,6 +17,34 @@ function getBulkUsers() {
} }
return json; return json;
} }
function trimswitcher() {
const json = getBulkInfo();
const map = new Map();
for (const thing in json.users) {
const user = json.users[thing];
console.log(user, json.users);
let wellknown = user.serverurls.wellknown;
if (wellknown[wellknown.length - 1] !== "/") {
wellknown += "/";
}
if (map.has(wellknown)) {
const otheruser = map.get(wellknown);
if (otheruser[1].serverurls.wellknown[otheruser[1].serverurls.wellknown.length - 1] === "/") {
delete json.users[otheruser[0]];
map.set(wellknown, [thing, user]);
}
else {
delete json.users[thing];
}
}
else {
map.set(wellknown, [thing, user]);
}
}
localStorage.setItem("userinfos", JSON.stringify(json));
console.log(json);
}
trimswitcher();
function getBulkInfo() { function getBulkInfo() {
return JSON.parse(localStorage.getItem("userinfos")); return JSON.parse(localStorage.getItem("userinfos"));
} }

3
webpage/guild.ts
View file

@ -86,6 +86,9 @@ class Guild{
if(json===-1){ if(json===-1){
return; return;
} }
if(json.stickers.length){
console.log(json.stickers,":3")
}
this.emojis = json.emojis this.emojis = json.emojis
this.owner=owner; this.owner=owner;
this.headers=this.owner.headers; this.headers=this.owner.headers;

6
webpage/infiniteScroller.ts
View file

@ -163,8 +163,8 @@ class InfiniteScroller{
this.currrunning=true; this.currrunning=true;
} }
if(!this.div){this.currrunning=false;return} if(!this.div){this.currrunning=false;return}
const out=await Promise.allSettled([this.watchForTop(),this.watchForBottom()]) const out=await Promise.allSettled([this.watchForTop(),this.watchForBottom()]) as {value:boolean}[];
const changed=(out[0]||out[1]); const changed=(out[0].value||out[1].value);
if(null===this.timeout&&changed){ if(null===this.timeout&&changed){
this.timeout=setTimeout(this.updatestuff.bind(this),300); this.timeout=setTimeout(this.updatestuff.bind(this),300);
} }
@ -213,7 +213,7 @@ class InfiniteScroller{
await this.destroyFromID(thing[1]); await this.destroyFromID(thing[1]);
} }
this.HTMLElements=[]; this.HTMLElements=[];
clearInterval(this.timeout); clearTimeout(this.timeout);
if(this.div){ if(this.div){
this.div.remove(); this.div.remove();
} }

27
webpage/login.ts
View file

@ -18,7 +18,32 @@ function getBulkUsers(){
} }
return json; return json;
} }
function trimswitcher(){
const json=getBulkInfo()
const map=new Map();
for(const thing in json.users){
const user=json.users[thing];
console.log(user,json.users);
let wellknown=user.serverurls.wellknown;
if(wellknown[wellknown.length-1]!=="/"){
wellknown+="/";
}
if(map.has(wellknown)){
const otheruser=map.get(wellknown);
if(otheruser[1].serverurls.wellknown[otheruser[1].serverurls.wellknown.length-1]==="/"){
delete json.users[otheruser[0]];
map.set(wellknown,[thing,user]);
}else{
delete json.users[thing];
}
}else{
map.set(wellknown,[thing,user]);
}
}
localStorage.setItem("userinfos",JSON.stringify(json));
console.log(json);
}
trimswitcher();
function getBulkInfo(){ function getBulkInfo(){
return JSON.parse(localStorage.getItem("userinfos")); return JSON.parse(localStorage.getItem("userinfos"));
} }