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

resolve members better and with the WS

Browse source
This commit is contained in:
MathMan05 2024-08-14 14:01:51 -05:00
parent a45188c1fc
commit 6f97a06cd3
10 changed files with 170 additions and 159 deletions
Download patch file Download diff file Expand all files Collapse all files

8
.dist/guild.js
View file

@ -5,6 +5,7 @@ import { Dialog } from "./dialog.js";
import { Member } from "./member.js";
import { Settings, RoleList } from "./settings.js";
import { SnowFlake } from "./snowflake.js";
import { User } from "./user.js";
class Guild {
owner;
headers;
@ -92,7 +93,12 @@ class Guild {
this.roles.push(roleh);
this.roleids.set(roleh.snowflake, roleh);
}
Member.resolve(member, this).then(_ => this.member = _);
if (member instanceof User) {
Member.resolveMember(member, this).then(_ => this.member = _);
}
else {
Member.new(member, this).then(_ => this.member = _);
}
for (const thing of json.channels) {
const temp = new Channel(thing, this);
this.channels.push(temp);

10
.dist/localuser.js
View file

@ -161,7 +161,7 @@ class Localuser {
if (temp.op === 0 && temp.t === "READY") {
returny();
}
this.handleEvent(temp);
await this.handleEvent(temp);
}
catch { }
}
@ -196,7 +196,7 @@ class Localuser {
if (temp.op === 0 && temp.t === "READY") {
returny();
}
this.handleEvent(temp);
await this.handleEvent(temp);
}
catch (e) {
console.error(e);
@ -240,7 +240,7 @@ class Localuser {
await promise;
return;
}
handleEvent(temp) {
async handleEvent(temp) {
console.debug(temp);
if (temp.s)
this.lastSequence = temp.s;
@ -314,7 +314,7 @@ class Localuser {
const guild = SnowFlake.getSnowFlakeFromID(temp.d.guild_id, Guild).getObject();
let thing;
if (temp.d.member) {
thing = new Member(temp.d.member, guild);
thing = await Member.new(temp.d.member, guild);
}
else {
thing = { id: temp.d.user_id };
@ -1033,8 +1033,6 @@ class Localuser {
//---------- resolving members code -----------
waitingmembers = new Map();
async resolvemember(id, guildid) {
console.warn("this function may or may not work on any instance, use at your own risk");
//throw new Error("Not implemented on the server side and not fully implemented, do not use");
if (!this.waitingmembers.has(guildid)) {
this.waitingmembers.set(guildid, new Map());
}

134
.dist/member.js
View file

@ -1,14 +1,12 @@
import { User } from "./user.js";
import { Role } from "./role.js";
import { Guild } from "./guild.js";
import { Contextmenu } from "./contextmenu.js";
import { SnowFlake } from "./snowflake.js";
class Member {
static already = {};
owner;
user;
roles;
error;
roles = [];
id;
static contextmenu = new Contextmenu("User Menu");
static setUpContextMenu() {
@ -22,19 +20,15 @@ class Member {
});
});
}
constructor(memberjson, owner, error = false) {
this.error = error;
this.owner = owner;
let membery = memberjson;
this.roles = [];
if (!error) {
if (memberjson["guild_member"]) {
memberjson = memberjson;
membery = memberjson.guild_member;
}
constructor(memberjson, owner) {
if (User.userids[memberjson.id]) {
this.user = User.userids[memberjson.id];
}
membery = membery;
for (const thing of Object.keys(membery)) {
else {
this.user = new User(memberjson.user, owner.localuser);
}
this.owner = owner;
for (const thing of Object.keys(memberjson)) {
if (thing === "guild") {
continue;
}
@ -42,23 +36,17 @@ class Member {
continue;
}
if (thing === "roles") {
for (const strrole of membery["roles"]) {
for (const strrole of memberjson["roles"]) {
const role = SnowFlake.getSnowFlakeFromID(strrole, Role).getObject();
this.roles.push(role);
}
continue;
}
this[thing] = membery[thing];
this[thing] = memberjson[thing];
}
if (error) {
this.user = memberjson;
}
else {
if (SnowFlake.getSnowFlakeFromID(this?.id, User)) {
this.user = SnowFlake.getSnowFlakeFromID(this.id, User).getObject();
return;
}
this.user = new User(membery.user, owner.localuser);
if (SnowFlake.getSnowFlakeFromID(this?.id, User)) {
this.user = SnowFlake.getSnowFlakeFromID(this.id, User).getObject();
return;
}
}
get guild() {
@ -70,53 +58,59 @@ class Member {
get info() {
return this.owner.info;
}
static async resolve(unkown, guild) {
if (!(guild instanceof Guild)) {
console.error(guild);
}
let user;
let id;
if (unkown instanceof User) {
user = unkown;
id = user.snowflake;
}
else if (typeof unkown === typeof "") {
id = new SnowFlake(unkown, undefined);
static async new(memberjson, owner) {
const user = new User(memberjson.user, owner.localuser);
if (user.members.has(owner)) {
let memb = user.members.get(owner);
if (memb === undefined) {
memb = new Member(memberjson, owner);
user.members.set(owner, memb);
return memb;
}
else if (memb instanceof Promise) {
return await memb; //I should do something else, though for now this is "good enough"
}
else {
return memb;
}
}
else {
return new Member(unkown, guild);
const memb = new Member(memberjson, owner);
user.members.set(owner, memb);
return memb;
}
if (guild.id === "@me") {
return null;
}
if (!Member.already[guild.id]) {
Member.already[guild.id] = {};
}
else if (Member.already[guild.id][id]) {
const memb = Member.already[guild.id][id];
if (memb instanceof Promise) {
return await memb;
}
static async resolveMember(user, guild) {
const maybe = user.members.get(guild);
if (!user.members.has(guild)) {
const membpromise = guild.localuser.resolvemember(user.id, guild.id);
let res;
const promise = new Promise(r => { res = r; });
user.members.set(guild, promise);
const membjson = await membpromise;
if (membjson === undefined) {
res(undefined);
return undefined;
}
else {
const member = new Member(membjson, guild);
res(member);
return member;
}
return memb;
}
guild.localuser.resolvemember(id.id, guild.id);
const prom1 = fetch(guild.info.api.toString() + "/users/" + id + "/profile?with_mutual_guilds=true&with_mutual_friends_count=true&guild_id=" + guild.snowflake, { headers: guild.headers });
prom1.catch(_ => { console.log(_); });
const promoise = prom1.then(_ => _.json()).then(json => {
const memb = new Member(json, guild);
Member.already[guild.id][id] = memb;
return memb;
});
Member.already[guild.id][id] = promoise;
try {
return await promoise;
if (maybe instanceof Promise) {
return await maybe;
}
catch (_) {
const memb = new Member(user, guild, true);
Member.already[guild.id][id] = memb;
return memb;
else {
return maybe;
}
}
/**
* @todo
*/
highInfo() {
fetch(this.info.api + "/users/" + this.id + "/profile?with_mutual_guilds=true&with_mutual_friends_count=true&guild_id=" + this.guild.id, { headers: this.guild.headers });
}
hasRole(ID) {
console.log(this.roles, ID);
for (const thing of this.roles) {
@ -149,13 +143,11 @@ class Member {
return;
}
;
if (this.error) {
const error = document.createElement("span");
error.textContent = "!";
error.classList.add("membererror");
html.after(error);
return;
/*
if(this.error){
}
*/
html.style.color = this.getColor();
}
this.profileclick(html);

2
.dist/message.js
View file

@ -107,7 +107,7 @@ class Message {
continue;
}
else if (thing === "member") {
this.member = new Member(messagejson.member, this.guild);
Member.new(messagejson.member, this.guild).then(_ => { this.member = _; });
continue;
}
else if (thing === "embeds") {

12
.dist/user.js
View file

@ -21,6 +21,7 @@ class User {
premium_type;
theme_colors;
badge_ids;
members = new WeakMap();
clone() {
return new User({
username: this.username,
@ -97,7 +98,7 @@ class User {
}
}
async resolvemember(guild) {
return await Member.resolve(this, guild);
return await Member.resolveMember(this, guild);
}
buildpfp() {
const pfp = document.createElement('img');
@ -114,7 +115,14 @@ class User {
}
bind(html, guild = null) {
if (guild && guild.id !== "@me") {
Member.resolve(this, guild).then(_ => {
Member.resolveMember(this, guild).then(_ => {
if (_ === undefined) {
const error = document.createElement("span");
error.textContent = "!";
error.classList.add("membererror");
html.after(error);
return;
}
_.bind(html);
}).catch(_ => {
console.log(_);