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

get rid of the odd complexity of the snowflake class

Browse source
This commit is contained in:
MathMan05 2024-09-03 10:34:40 -05:00
parent b72d7673f4
commit 03041cf9fd
13 changed files with 237 additions and 257 deletions
Download patch file Download diff file Expand all files Collapse all files

36
.dist/channel.js
View file

@ -5,7 +5,7 @@ import { Contextmenu } from "./contextmenu.js";
import { Dialog } from "./dialog.js"; import { Dialog } from "./dialog.js";
import { Permissions } from "./permissions.js"; import { Permissions } from "./permissions.js";
import { Settings } from "./settings.js"; import { Settings } from "./settings.js";
import { Role, RoleList } from "./role.js"; import { RoleList } from "./role.js";
import { InfiniteScroller } from "./infiniteScroller.js"; import { InfiniteScroller } from "./infiniteScroller.js";
import { SnowFlake } from "./snowflake.js"; import { SnowFlake } from "./snowflake.js";
import { MarkDown } from "./markdown.js"; import { MarkDown } from "./markdown.js";
@ -151,7 +151,7 @@ class Channel {
} }
sortPerms() { sortPerms() {
this.permission_overwritesar.sort((a, b) => { this.permission_overwritesar.sort((a, b) => {
return this.guild.roles.findIndex(_ => _.snowflake === a[0]) - this.guild.roles.findIndex(_ => _.snowflake === b[0]); return this.guild.roles.findIndex(_ => _ === a[0]) - this.guild.roles.findIndex(_ => _ === b[0]);
}); });
} }
setUpInfiniteScroller() { setUpInfiniteScroller() {
@ -219,7 +219,7 @@ class Channel {
this.name = json.name; this.name = json.name;
this.snowflake = new SnowFlake(json.id, this); this.snowflake = new SnowFlake(json.id, this);
if (json.parent_id) { if (json.parent_id) {
this.parent_id = SnowFlake.getSnowFlakeFromID(json.parent_id, Channel); this.parent_id = json.parent_id;
} }
this.parent = null; this.parent = null;
this.children = []; this.children = [];
@ -234,7 +234,10 @@ class Channel {
this.permission_overwrites.set(thing.id, new Permissions(thing.allow, thing.deny)); this.permission_overwrites.set(thing.id, new Permissions(thing.allow, thing.deny));
const permission = this.permission_overwrites.get(thing.id); const permission = this.permission_overwrites.get(thing.id);
if (permission) { if (permission) {
this.permission_overwritesar.push([SnowFlake.getSnowFlakeFromID(thing.id, Role), permission]); const role = this.guild.roleids.get(thing.id);
if (role) {
this.permission_overwritesar.push([role, permission]);
}
} }
} }
this.topic = json.topic; this.topic = json.topic;
@ -313,7 +316,7 @@ class Channel {
}); });
} }
resolveparent(guild) { resolveparent(guild) {
const parentid = this.parent_id?.id; const parentid = this.parent_id;
if (!parentid) if (!parentid)
return false; return false;
this.parent = guild.channelids[parentid]; this.parent = guild.channelids[parentid];
@ -335,7 +338,7 @@ class Channel {
if (thing.move_id && thing.move_id !== thing.parent_id) { if (thing.move_id && thing.move_id !== thing.parent_id) {
thing.parent_id = thing.move_id; thing.parent_id = thing.move_id;
thisthing.parent_id = thing.parent?.id; thisthing.parent_id = thing.parent?.id;
thing.move_id = null; thing.move_id = undefined;
//console.log(this.guild.channelids[thisthing.parent_id.id]); //console.log(this.guild.channelids[thisthing.parent_id.id]);
} }
if (thisthing.position || thisthing.parent_id) { if (thisthing.position || thisthing.parent_id) {
@ -515,7 +518,7 @@ class Channel {
return; return;
event.preventDefault(); event.preventDefault();
if (container) { if (container) {
that.move_id = this.snowflake; that.move_id = this.id;
if (that.parent) { if (that.parent) {
that.parent.children.splice(that.parent.children.indexOf(that), 1); that.parent.children.splice(that.parent.children.indexOf(that), 1);
} }
@ -782,12 +785,12 @@ class Channel {
for (const i in response) { for (const i in response) {
let messager; let messager;
let willbreak = false; let willbreak = false;
if (!SnowFlake.hasSnowFlakeFromID(response[i].id, Message)) { if (this.messages.has(response[i].id)) {
messager = new Message(response[i], this); messager = this.messages.get(response[i].id);
willbreak = true;
} }
else { else {
messager = SnowFlake.getSnowFlakeFromID(response[i].id, Message).getObject(); messager = new Message(response[i], this);
willbreak = true;
} }
this.idToPrev.set(messager.id, previd); this.idToPrev.set(messager.id, previd);
this.idToNext.set(previd, messager.id); this.idToNext.set(previd, messager.id);
@ -942,11 +945,11 @@ class Channel {
const parent = this.guild.channelids[json.parent_id]; const parent = this.guild.channelids[json.parent_id];
if (parent) { if (parent) {
this.parent = parent; this.parent = parent;
this.parent_id = parent.snowflake; this.parent_id = parent.id;
} }
else { else {
this.parent = null; this.parent = null;
this.parent_id = null; this.parent_id = undefined;
} }
this.children = []; this.children = [];
this.guild_id = json.guild_id; this.guild_id = json.guild_id;
@ -959,7 +962,10 @@ class Channel {
this.permission_overwrites.set(thing.id, new Permissions(thing.allow, thing.deny)); this.permission_overwrites.set(thing.id, new Permissions(thing.allow, thing.deny));
const permisions = this.permission_overwrites.get(thing.id); const permisions = this.permission_overwrites.get(thing.id);
if (permisions) { if (permisions) {
this.permission_overwritesar.push([SnowFlake.getSnowFlakeFromID(thing.id, Role), permisions]); const role = this.guild.roleids.get(thing.id);
if (role) {
this.permission_overwritesar.push([role, permisions]);
}
} }
} }
this.topic = json.topic; this.topic = json.topic;
@ -1136,7 +1142,7 @@ class Channel {
}); });
const perm = new Permissions("0", "0"); const perm = new Permissions("0", "0");
this.permission_overwrites.set(role.id, perm); this.permission_overwrites.set(role.id, perm);
this.permission_overwritesar.push([role.snowflake, perm]); this.permission_overwritesar.push([role, perm]);
} }
async updateRolePermissions(id, perms) { async updateRolePermissions(id, perms) {
const permission = this.permission_overwrites.get(id); const permission = this.permission_overwrites.get(id);

8
.dist/guild.js
View file

@ -72,7 +72,7 @@ class Guild {
const s1 = settings.addButton("roles"); const s1 = settings.addButton("roles");
const permlist = []; const permlist = [];
for (const thing of this.roles) { for (const thing of this.roles) {
permlist.push([thing.snowflake, thing.permissions]); permlist.push([thing, thing.permissions]);
} }
s1.options.push(new RoleList(permlist, this, this.updateRolePermissions.bind(this))); s1.options.push(new RoleList(permlist, this, this.updateRolePermissions.bind(this)));
settings.show(); settings.show();
@ -98,7 +98,7 @@ class Guild {
for (const roley of json.roles) { for (const roley of json.roles) {
const roleh = new Role(roley, this); const roleh = new Role(roley, this);
this.roles.push(roleh); this.roles.push(roleh);
this.roleids.set(roleh.snowflake, roleh); this.roleids.set(roleh.id, roleh);
} }
if (member instanceof User) { if (member instanceof User) {
Member.resolveMember(member, this).then(_ => { Member.resolveMember(member, this).then(_ => {
@ -220,7 +220,7 @@ class Guild {
if (thing.move_id && thing.move_id !== thing.parent_id) { if (thing.move_id && thing.move_id !== thing.parent_id) {
thing.parent_id = thing.move_id; thing.parent_id = thing.move_id;
thisthing.parent_id = thing.parent?.id; thisthing.parent_id = thing.parent?.id;
thing.move_id = null; thing.move_id = undefined;
} }
if (thisthing.position || thisthing.parent_id) { if (thisthing.position || thisthing.parent_id) {
build.push(thisthing); build.push(thisthing);
@ -539,7 +539,7 @@ class Guild {
}); });
const json = await fetched.json(); const json = await fetched.json();
const role = new Role(json, this); const role = new Role(json, this);
this.roleids.set(role.snowflake, role); this.roleids.set(role.id, role);
this.roles.push(role); this.roles.push(role);
return role; return role;
} }

99
.dist/localuser.js
View file

@ -4,8 +4,6 @@ import { Voice } from "./audio.js";
import { User } from "./user.js"; import { User } from "./user.js";
import { Dialog } from "./dialog.js"; import { Dialog } from "./dialog.js";
import { getapiurls, getBulkInfo, setTheme } from "./login.js"; import { getapiurls, getBulkInfo, setTheme } from "./login.js";
import { SnowFlake } from "./snowflake.js";
import { Message } from "./message.js";
import { Member } from "./member.js"; import { Member } from "./member.js";
import { FormError, Settings } from "./settings.js"; import { FormError, Settings } from "./settings.js";
import { MarkDown } from "./markdown.js"; import { MarkDown } from "./markdown.js";
@ -127,7 +125,6 @@ class Localuser {
if (this.ws) { if (this.ws) {
this.ws.close(4001); this.ws.close(4001);
} }
SnowFlake.clear();
} }
swapped = false; swapped = false;
async initwebsocket() { async initwebsocket() {
@ -310,16 +307,38 @@ class Localuser {
} }
break; break;
case "MESSAGE_DELETE": case "MESSAGE_DELETE":
console.log(temp.d); {
SnowFlake.getSnowFlakeFromID(temp.d.id, Message).getObject().deleteEvent(); temp.d.guild_id ??= "@me";
break; const guild = this.guildids.get(temp.d.guild_id);
if (!guild)
break;
const channel = guild.channelids[temp.d.channel_id];
if (!channel)
break;
const message = channel.messages.get(temp.d.id);
if (!message)
break;
message.deleteEvent();
break;
}
case "READY": case "READY":
this.gottenReady(temp); this.gottenReady(temp);
break; break;
case "MESSAGE_UPDATE": case "MESSAGE_UPDATE":
const message = SnowFlake.getSnowFlakeFromID(temp.d.id, Message).getObject(); {
message.giveData(temp.d); temp.d.guild_id ??= "@me";
break; const guild = this.guildids.get(temp.d.guild_id);
if (!guild)
break;
const channel = guild.channelids[temp.d.channel_id];
if (!channel)
break;
const message = channel.messages.get(temp.d.id);
if (!message)
break;
message.giveData(temp.d);
break;
}
case "TYPING_START": case "TYPING_START":
if (this.initialized) { if (this.initialized) {
this.typingStart(temp); this.typingStart(temp);
@ -367,10 +386,17 @@ class Localuser {
break; break;
} }
case "MESSAGE_REACTION_ADD": case "MESSAGE_REACTION_ADD":
if (SnowFlake.hasSnowFlakeFromID(temp.d.message_id, Message)) { {
temp.d.guild_id ??= "@me"; temp.d.guild_id ??= "@me";
const message = SnowFlake.getSnowFlakeFromID(temp.d.message_id, Message).getObject(); const guild = this.guildids.get(temp.d.guild_id);
const guild = SnowFlake.getSnowFlakeFromID(temp.d.guild_id, Guild).getObject(); if (!guild)
break;
const channel = guild.channelids[temp.d.channel_id];
if (!channel)
break;
const message = channel.messages.get(temp.d.message_id);
if (!message)
break;
let thing; let thing;
if (temp.d.member) { if (temp.d.member) {
thing = await Member.new(temp.d.member, guild); thing = await Member.new(temp.d.member, guild);
@ -382,22 +408,48 @@ class Localuser {
} }
break; break;
case "MESSAGE_REACTION_REMOVE": case "MESSAGE_REACTION_REMOVE":
if (SnowFlake.hasSnowFlakeFromID(temp.d.message_id, Message)) { {
const message = SnowFlake.getSnowFlakeFromID(temp.d.message_id, Message).getObject(); temp.d.guild_id ??= "@me";
console.log("test"); const guild = this.guildids.get(temp.d.guild_id);
if (!guild)
break;
const channel = guild.channelids[temp.d.channel_id];
if (!channel)
break;
const message = channel.messages.get(temp.d.message_id);
if (!message)
break;
message.reactionRemove(temp.d.emoji, temp.d.user_id); message.reactionRemove(temp.d.emoji, temp.d.user_id);
} }
break; break;
case "MESSAGE_REACTION_REMOVE_ALL": case "MESSAGE_REACTION_REMOVE_ALL":
if (SnowFlake.hasSnowFlakeFromID(temp.d.message_id, Message)) { {
const messageReactionRemoveAll = SnowFlake.getSnowFlakeFromID(temp.d.message_id, Message).getObject(); temp.d.guild_id ??= "@me";
messageReactionRemoveAll.reactionRemoveAll(); const guild = this.guildids.get(temp.d.guild_id);
if (!guild)
break;
const channel = guild.channelids[temp.d.channel_id];
if (!channel)
break;
const message = channel.messages.get(temp.d.message_id);
if (!message)
break;
message.reactionRemoveAll();
} }
break; break;
case "MESSAGE_REACTION_REMOVE_EMOJI": case "MESSAGE_REACTION_REMOVE_EMOJI":
if (SnowFlake.hasSnowFlakeFromID(temp.d.message_id, Message)) { {
const messageReactionRemoveEmoji = SnowFlake.getSnowFlakeFromID(temp.d.message_id, Message).getObject(); temp.d.guild_id ??= "@me";
messageReactionRemoveEmoji.reactionRemoveEmoji(temp.d.emoji); const guild = this.guildids.get(temp.d.guild_id);
if (!guild)
break;
const channel = guild.channelids[temp.d.channel_id];
if (!channel)
break;
const message = channel.messages.get(temp.d.message_id);
if (!message)
break;
message.reactionRemoveEmoji(temp.d.emoji);
} }
break; break;
case "GUILD_MEMBERS_CHUNK": case "GUILD_MEMBERS_CHUNK":
@ -441,7 +493,10 @@ class Localuser {
} }
createChannel(json) { createChannel(json) {
json.guild_id ??= "@me"; json.guild_id ??= "@me";
SnowFlake.getSnowFlakeFromID(json.guild_id, Guild).getObject().createChannelpac(json); const guild = this.guildids.get(json.guild_id);
if (!guild)
return;
guild.createChannelpac(json);
if (json.guild_id === this.lookingguild?.id) { if (json.guild_id === this.lookingguild?.id) {
this.loadGuild(json.guild_id); this.loadGuild(json.guild_id);
} }

6
.dist/member.js
View file

@ -1,6 +1,4 @@
import { User } from "./user.js"; import { User } from "./user.js";
import { Role } from "./role.js";
import { SnowFlake } from "./snowflake.js";
import { Dialog } from "./dialog.js"; import { Dialog } from "./dialog.js";
class Member { class Member {
static already = {}; static already = {};
@ -29,7 +27,9 @@ class Member {
} }
if (thing === "roles") { if (thing === "roles") {
for (const strrole of memberjson.roles) { for (const strrole of memberjson.roles) {
const role = SnowFlake.getSnowFlakeFromID(strrole, Role).getObject(); const role = this.guild.roleids.get(strrole);
if (!role)
continue;
this.roles.push(role); this.roles.push(role);
} }
continue; continue;

9
.dist/role.js
View file

@ -138,7 +138,7 @@ class RoleList extends Buttons {
} }
for (const i of permissions) { for (const i of permissions) {
console.log(i); console.log(i);
this.buttons.push([i[0].getObject().name, i[0].id]); // this.buttons.push([i[0].name, i[0].id]);
} }
this.options = options; this.options = options;
} }
@ -149,8 +149,11 @@ class RoleList extends Buttons {
const perm = arr[1]; const perm = arr[1];
this.permission.deny = perm.deny; this.permission.deny = perm.deny;
this.permission.allow = perm.allow; this.permission.allow = perm.allow;
this.options.name = SnowFlake.getSnowFlakeFromID(str, Role).getObject().name; const role = this.permissions.find(e => e[0].id === str);
this.options.haschanged = false; if (role) {
this.options.name = role[0].name;
this.options.haschanged = false;
}
} }
return this.options.generateHTML(); return this.options.generateHTML();
} }

81
.dist/snowflake.js
View file

@ -1,83 +1,7 @@
class SnowFlake { class SnowFlake {
id; id;
static SnowFlakes = new Map(); constructor(id) {
static FinalizationRegistry = new FinalizationRegistry((a) => {
SnowFlake.SnowFlakes.get(a[1]).delete(a[0]);
});
obj;
constructor(id, obj) {
if (!obj) {
this.id = id;
return;
}
if (!SnowFlake.SnowFlakes.get(obj.constructor)) {
SnowFlake.SnowFlakes.set(obj.constructor, new Map());
}
if (SnowFlake.SnowFlakes.get(obj.constructor).get(id)) {
const snowflake = SnowFlake.SnowFlakes.get(obj.constructor).get(id).deref();
if (snowflake) {
snowflake.obj = obj;
return snowflake;
}
else {
SnowFlake.SnowFlakes.get(obj.constructor).delete(id);
}
}
this.id = id; this.id = id;
SnowFlake.SnowFlakes.get(obj.constructor).set(id, new WeakRef(this));
SnowFlake.FinalizationRegistry.register(this, [id, obj.constructor]);
this.obj = obj;
}
static clear() {
this.SnowFlakes = new Map();
}
/**
* Just to clarify bc TS, it returns a SnowFlake\<type> which is what you entered with the type parameter
* @deprecated
**/
static getSnowFlakeFromID(id, type) {
if (!SnowFlake.SnowFlakes.get(type)) {
SnowFlake.SnowFlakes.set(type, new Map());
}
const snowflake = SnowFlake.SnowFlakes.get(type).get(id);
if (snowflake) {
const obj = snowflake.deref();
if (obj) {
return obj;
}
else {
SnowFlake.SnowFlakes.get(type).delete(id);
}
}
{
const snowflake = new SnowFlake(id, undefined);
SnowFlake.SnowFlakes.get(type).set(id, new WeakRef(snowflake));
SnowFlake.FinalizationRegistry.register(this, [id, type]);
return snowflake;
}
}
/**
* @deprecated
*
*
*/
static hasSnowFlakeFromID(id, type) {
if (!SnowFlake.SnowFlakes.get(type)) {
return false;
}
const flake = SnowFlake.SnowFlakes.get(type).get(id);
if (flake) {
const flake2 = flake.deref()?.getObject();
if (flake2) {
return true;
}
else {
return false;
}
}
else {
return false;
}
} }
getUnixTime() { getUnixTime() {
try { try {
@ -91,8 +15,5 @@ class SnowFlake {
toString() { toString() {
return this.id; return this.id;
} }
getObject() {
return this.obj;
}
} }
export { SnowFlake }; export { SnowFlake };

40
webpage/channel.ts
View file

@ -25,13 +25,13 @@ class Channel{
headers:Localuser["headers"]; headers:Localuser["headers"];
name:string; name:string;
snowflake:SnowFlake<Channel>; snowflake:SnowFlake<Channel>;
parent_id:SnowFlake<Channel>|null; parent_id?:string;
parent:Channel|null; parent:Channel|null;
children:Channel[]; children:Channel[];
guild_id:string; guild_id:string;
messageids:Map<SnowFlake<Message>,Message>; messageids:Map<SnowFlake<Message>,Message>;
permission_overwrites:Map<string,Permissions>; permission_overwrites:Map<string,Permissions>;
permission_overwritesar:[SnowFlake<Role>,Permissions][]; permission_overwritesar:[Role,Permissions][];
topic:string; topic:string;
nsfw:boolean; nsfw:boolean;
position:number; position:number;
@ -39,7 +39,7 @@ class Channel{
lastmessageid:string|undefined; lastmessageid:string|undefined;
mentions:number; mentions:number;
lastpin:string; lastpin:string;
move_id:SnowFlake<Channel>|null; move_id?:string;
typing:number; typing:number;
message_notifications:number; message_notifications:number;
allthewayup:boolean; allthewayup:boolean;
@ -167,7 +167,7 @@ class Channel{
} }
sortPerms(){ sortPerms(){
this.permission_overwritesar.sort((a,b)=>{ this.permission_overwritesar.sort((a,b)=>{
return this.guild.roles.findIndex(_=>_.snowflake===a[0])-this.guild.roles.findIndex(_=>_.snowflake===b[0]); return this.guild.roles.findIndex(_=>_===a[0])-this.guild.roles.findIndex(_=>_===b[0]);
}); });
} }
setUpInfiniteScroller(){ setUpInfiniteScroller(){
@ -231,7 +231,7 @@ class Channel{
this.name=json.name; this.name=json.name;
this.snowflake=new SnowFlake(json.id,this); this.snowflake=new SnowFlake(json.id,this);
if(json.parent_id){ if(json.parent_id){
this.parent_id=SnowFlake.getSnowFlakeFromID(json.parent_id,Channel); this.parent_id=json.parent_id;
} }
this.parent=null; this.parent=null;
this.children=[]; this.children=[];
@ -246,7 +246,10 @@ class Channel{
this.permission_overwrites.set(thing.id,new Permissions(thing.allow,thing.deny)); this.permission_overwrites.set(thing.id,new Permissions(thing.allow,thing.deny));
const permission=this.permission_overwrites.get(thing.id); const permission=this.permission_overwrites.get(thing.id);
if(permission){ if(permission){
this.permission_overwritesar.push([SnowFlake.getSnowFlakeFromID(thing.id,Role),permission]); const role=this.guild.roleids.get(thing.id);
if(role){
this.permission_overwritesar.push([role,permission]);
}
} }
} }
@ -325,7 +328,7 @@ class Channel{
}); });
} }
resolveparent(guild:Guild){ resolveparent(guild:Guild){
const parentid=this.parent_id?.id; const parentid=this.parent_id;
if(!parentid)return false; if(!parentid)return false;
this.parent=guild.channelids[parentid]; this.parent=guild.channelids[parentid];
this.parent??=null; this.parent??=null;
@ -346,7 +349,7 @@ class Channel{
if(thing.move_id&&thing.move_id!==thing.parent_id){ if(thing.move_id&&thing.move_id!==thing.parent_id){
thing.parent_id=thing.move_id; thing.parent_id=thing.move_id;
thisthing.parent_id=thing.parent?.id; thisthing.parent_id=thing.parent?.id;
thing.move_id=null; thing.move_id=undefined;
//console.log(this.guild.channelids[thisthing.parent_id.id]); //console.log(this.guild.channelids[thisthing.parent_id.id]);
} }
if(thisthing.position||thisthing.parent_id){ if(thisthing.position||thisthing.parent_id){
@ -525,7 +528,7 @@ class Channel{
if(!that)return; if(!that)return;
event.preventDefault(); event.preventDefault();
if(container){ if(container){
that.move_id=this.snowflake; that.move_id=this.id;
if(that.parent){ if(that.parent){
that.parent.children.splice(that.parent.children.indexOf(that),1); that.parent.children.splice(that.parent.children.indexOf(that),1);
} }
@ -791,11 +794,11 @@ class Channel{
for(const i in response){ for(const i in response){
let messager:Message; let messager:Message;
let willbreak=false; let willbreak=false;
if(!SnowFlake.hasSnowFlakeFromID(response[i].id,Message)){ if(this.messages.has(response[i].id)){
messager=new Message(response[i],this); messager=this.messages.get(response[i].id) as Message;
}else{
messager=SnowFlake.getSnowFlakeFromID(response[i].id,Message).getObject();
willbreak=true; willbreak=true;
}else{
messager=new Message(response[i],this);
} }
this.idToPrev.set(messager.id,previd); this.idToPrev.set(messager.id,previd);
this.idToNext.set(previd,messager.id); this.idToNext.set(previd,messager.id);
@ -947,10 +950,10 @@ class Channel{
const parent=this.guild.channelids[json.parent_id]; const parent=this.guild.channelids[json.parent_id];
if(parent){ if(parent){
this.parent=parent; this.parent=parent;
this.parent_id=parent.snowflake; this.parent_id=parent.id;
}else{ }else{
this.parent=null; this.parent=null;
this.parent_id=null; this.parent_id=undefined;
} }
this.children=[]; this.children=[];
@ -964,7 +967,10 @@ class Channel{
this.permission_overwrites.set(thing.id,new Permissions(thing.allow,thing.deny)); this.permission_overwrites.set(thing.id,new Permissions(thing.allow,thing.deny));
const permisions=this.permission_overwrites.get(thing.id); const permisions=this.permission_overwrites.get(thing.id);
if(permisions){ if(permisions){
this.permission_overwritesar.push([SnowFlake.getSnowFlakeFromID(thing.id,Role),permisions]); const role=this.guild.roleids.get(thing.id);
if(role){
this.permission_overwritesar.push([role,permisions]);
}
} }
} }
this.topic=json.topic; this.topic=json.topic;
@ -1140,7 +1146,7 @@ class Channel{
}); });
const perm=new Permissions("0","0"); const perm=new Permissions("0","0");
this.permission_overwrites.set(role.id,perm); this.permission_overwrites.set(role.id,perm);
this.permission_overwritesar.push([role.snowflake,perm]); this.permission_overwritesar.push([role,perm]);
} }
async updateRolePermissions(id:string,perms:Permissions){ async updateRolePermissions(id:string,perms:Permissions){
const permission=this.permission_overwrites.get(id); const permission=this.permission_overwrites.get(id);

12
webpage/guild.ts
View file

@ -18,7 +18,7 @@ class Guild{
snowflake:SnowFlake<Guild>; snowflake:SnowFlake<Guild>;
properties; properties;
roles:Role[]; roles:Role[];
roleids:Map<SnowFlake<Role>,Role>; roleids:Map<string,Role>;
prevchannel:Channel|undefined; prevchannel:Channel|undefined;
message_notifications:number; message_notifications:number;
headchannels:Channel[]; headchannels:Channel[];
@ -80,9 +80,9 @@ class Guild{
const settings=new Settings("Settings for "+this.properties.name); const settings=new Settings("Settings for "+this.properties.name);
const s1=settings.addButton("roles"); const s1=settings.addButton("roles");
const permlist:[SnowFlake<Role>,Permissions][]=[]; const permlist:[Role,Permissions][]=[];
for(const thing of this.roles){ for(const thing of this.roles){
permlist.push([thing.snowflake,thing.permissions]); permlist.push([thing,thing.permissions]);
} }
s1.options.push(new RoleList(permlist,this,this.updateRolePermissions.bind(this))); s1.options.push(new RoleList(permlist,this,this.updateRolePermissions.bind(this)));
settings.show(); settings.show();
@ -109,7 +109,7 @@ class Guild{
for(const roley of json.roles){ for(const roley of json.roles){
const roleh=new Role(roley,this); const roleh=new Role(roley,this);
this.roles.push(roleh); this.roles.push(roleh);
this.roleids.set(roleh.snowflake,roleh); this.roleids.set(roleh.id,roleh);
} }
if(member instanceof User){ if(member instanceof User){
Member.resolveMember(member,this).then(_=>{ Member.resolveMember(member,this).then(_=>{
@ -231,7 +231,7 @@ class Guild{
if(thing.move_id&&thing.move_id!==thing.parent_id){ if(thing.move_id&&thing.move_id!==thing.parent_id){
thing.parent_id=thing.move_id; thing.parent_id=thing.move_id;
thisthing.parent_id=thing.parent?.id; thisthing.parent_id=thing.parent?.id;
thing.move_id=null; thing.move_id=undefined;
} }
if(thisthing.position||thisthing.parent_id){ if(thisthing.position||thisthing.parent_id){
build.push(thisthing); build.push(thisthing);
@ -554,7 +554,7 @@ class Guild{
}); });
const json=await fetched.json(); const json=await fetched.json();
const role=new Role(json,this); const role=new Role(json,this);
this.roleids.set(role.snowflake,role); this.roleids.set(role.id,role);
this.roles.push(role); this.roles.push(role);
return role; return role;
} }

28
webpage/jsontypes.ts
View file

@ -354,11 +354,12 @@ type wsjson={
op:0, op:0,
d:any, d:any,
s:number, s:number,
t:"TYPING_START"|"USER_UPDATE"|"CHANNEL_UPDATE"|"CHANNEL_CREATE"|"CHANNEL_DELETE"|"GUILD_DELETE"|"GUILD_CREATE"|"MESSAGE_REACTION_ADD"|"MESSAGE_REACTION_REMOVE"|"MESSAGE_REACTION_REMOVE_ALL"|"MESSAGE_REACTION_REMOVE_EMOJI" t:"TYPING_START"|"USER_UPDATE"|"CHANNEL_UPDATE"|"CHANNEL_CREATE"|"CHANNEL_DELETE"|"GUILD_DELETE"|"GUILD_CREATE"|"MESSAGE_REACTION_REMOVE_ALL"|"MESSAGE_REACTION_REMOVE_EMOJI"
}|{ }|{
op:0, op:0,
t:"GUILD_MEMBERS_CHUNK", t:"GUILD_MEMBERS_CHUNK",
d:memberChunk d:memberChunk,
s:number
}|{ }|{
op:0, op:0,
d:{ d:{
@ -386,6 +387,29 @@ type wsjson={
d:{ d:{
heartbeat_interval:number heartbeat_interval:number
} }
}|{
op: 0,
t: "MESSAGE_REACTION_ADD",
d: {
user_id: string,
channel_id: string,
message_id: string,
guild_id?: string,
emoji: emojijson,
member?: memberjson
},
s: number
}|{
op: 0,
t: "MESSAGE_REACTION_REMOVE",
d: {
user_id: string,
channel_id: string,
message_id: string,
guild_id: string,
emoji: emojijson
},
"s": 3
} }
type memberChunk={ type memberChunk={
guild_id: string, guild_id: string,

78
webpage/localuser.ts
View file

@ -8,7 +8,7 @@ import{Dialog}from"./dialog.js";
import{getapiurls, getBulkInfo, setTheme, Specialuser}from"./login.js"; import{getapiurls, getBulkInfo, setTheme, Specialuser}from"./login.js";
import{ SnowFlake }from"./snowflake.js"; import{ SnowFlake }from"./snowflake.js";
import{ Message }from"./message.js"; import{ Message }from"./message.js";
import{ channeljson, memberjson, presencejson, readyjson }from"./jsontypes.js"; import{ channeljson, memberjson, presencejson, readyjson, wsjson }from"./jsontypes.js";
import{ Member }from"./member.js"; import{ Member }from"./member.js";
import{ FormError, Settings }from"./settings.js"; import{ FormError, Settings }from"./settings.js";
import{ MarkDown }from"./markdown.js"; import{ MarkDown }from"./markdown.js";
@ -137,7 +137,6 @@ class Localuser{
if(this.ws){ if(this.ws){
this.ws.close(4001); this.ws.close(4001);
} }
SnowFlake.clear();
} }
swapped=false; swapped=false;
async initwebsocket():Promise<void>{ async initwebsocket():Promise<void>{
@ -230,7 +229,7 @@ class Localuser{
if(temp.op===0&&temp.t==="READY"){ if(temp.op===0&&temp.t==="READY"){
returny(); returny();
} }
await this.handleEvent(temp); await this.handleEvent(temp as readyjson);
}catch(e){ }catch(e){
console.error(e); console.error(e);
}finally{ }finally{
@ -308,7 +307,7 @@ class Localuser{
await promise; await promise;
} }
async handleEvent(temp){ async handleEvent(temp:wsjson){
console.debug(temp); console.debug(temp);
if(temp.s)this.lastSequence=temp.s; if(temp.s)this.lastSequence=temp.s;
if(temp.op==0){ if(temp.op==0){
@ -319,16 +318,32 @@ class Localuser{
} }
break; break;
case"MESSAGE_DELETE": case"MESSAGE_DELETE":
console.log(temp.d); {
SnowFlake.getSnowFlakeFromID(temp.d.id,Message).getObject().deleteEvent(); temp.d.guild_id??="@me";
const guild=this.guildids.get(temp.d.guild_id);
if(!guild) break;
const channel=guild.channelids[temp.d.channel_id];
if(!channel) break;
const message=channel.messages.get(temp.d.id);
if(!message) break;
message.deleteEvent();
break; break;
}
case"READY": case"READY":
this.gottenReady(temp as readyjson); this.gottenReady(temp as readyjson);
break; break;
case"MESSAGE_UPDATE": case"MESSAGE_UPDATE":
const message=SnowFlake.getSnowFlakeFromID(temp.d.id,Message).getObject(); {
temp.d.guild_id??="@me";
const guild=this.guildids.get(temp.d.guild_id);
if(!guild) break;
const channel=guild.channelids[temp.d.channel_id];
if(!channel) break;
const message=channel.messages.get(temp.d.id);
if(!message) break;
message.giveData(temp.d); message.giveData(temp.d);
break; break;
}
case"TYPING_START": case"TYPING_START":
if(this.initialized){ if(this.initialized){
this.typingStart(temp); this.typingStart(temp);
@ -376,10 +391,14 @@ class Localuser{
break; break;
} }
case"MESSAGE_REACTION_ADD": case"MESSAGE_REACTION_ADD":
if(SnowFlake.hasSnowFlakeFromID(temp.d.message_id,Message)){ {
temp.d.guild_id??="@me"; temp.d.guild_id??="@me";
const message=SnowFlake.getSnowFlakeFromID(temp.d.message_id,Message).getObject(); const guild=this.guildids.get(temp.d.guild_id);
const guild=SnowFlake.getSnowFlakeFromID(temp.d.guild_id,Guild).getObject(); if(!guild) break;
const channel=guild.channelids[temp.d.channel_id];
if(!channel) break;
const message=channel.messages.get(temp.d.message_id);
if(!message) break;
let thing:Member|{id:string}; let thing:Member|{id:string};
if(temp.d.member){ if(temp.d.member){
thing=await Member.new(temp.d.member,guild) as Member; thing=await Member.new(temp.d.member,guild) as Member;
@ -390,22 +409,39 @@ class Localuser{
} }
break; break;
case"MESSAGE_REACTION_REMOVE": case"MESSAGE_REACTION_REMOVE":
if(SnowFlake.hasSnowFlakeFromID(temp.d.message_id,Message)){ {
const message=SnowFlake.getSnowFlakeFromID(temp.d.message_id,Message).getObject(); temp.d.guild_id??="@me";
console.log("test"); const guild=this.guildids.get(temp.d.guild_id);
if(!guild) break;
const channel=guild.channelids[temp.d.channel_id];
if(!channel) break;
const message=channel.messages.get(temp.d.message_id);
if(!message) break;
message.reactionRemove(temp.d.emoji,temp.d.user_id); message.reactionRemove(temp.d.emoji,temp.d.user_id);
} }
break; break;
case"MESSAGE_REACTION_REMOVE_ALL": case"MESSAGE_REACTION_REMOVE_ALL":
if(SnowFlake.hasSnowFlakeFromID(temp.d.message_id, Message)){ {
const messageReactionRemoveAll = SnowFlake.getSnowFlakeFromID(temp.d.message_id, Message).getObject(); temp.d.guild_id??="@me";
messageReactionRemoveAll.reactionRemoveAll(); const guild=this.guildids.get(temp.d.guild_id);
if(!guild) break;
const channel=guild.channelids[temp.d.channel_id];
if(!channel) break;
const message=channel.messages.get(temp.d.message_id);
if(!message) break;
message.reactionRemoveAll();
} }
break; break;
case"MESSAGE_REACTION_REMOVE_EMOJI": case"MESSAGE_REACTION_REMOVE_EMOJI":
if(SnowFlake.hasSnowFlakeFromID(temp.d.message_id, Message)){ {
const messageReactionRemoveEmoji = SnowFlake.getSnowFlakeFromID(temp.d.message_id, Message).getObject(); temp.d.guild_id??="@me";
messageReactionRemoveEmoji.reactionRemoveEmoji(temp.d.emoji); const guild=this.guildids.get(temp.d.guild_id);
if(!guild) break;
const channel=guild.channelids[temp.d.channel_id];
if(!channel) break;
const message=channel.messages.get(temp.d.message_id);
if(!message) break;
message.reactionRemoveEmoji(temp.d.emoji);
} }
break; break;
case"GUILD_MEMBERS_CHUNK": case"GUILD_MEMBERS_CHUNK":
@ -444,7 +480,9 @@ class Localuser{
} }
createChannel(json:channeljson):void{ createChannel(json:channeljson):void{
json.guild_id??="@me"; json.guild_id??="@me";
SnowFlake.getSnowFlakeFromID(json.guild_id,Guild).getObject().createChannelpac(json); const guild=this.guildids.get(json.guild_id);
if(!guild) return;
guild.createChannelpac(json);
if(json.guild_id===this.lookingguild?.id){ if(json.guild_id===this.lookingguild?.id){
this.loadGuild(json.guild_id); this.loadGuild(json.guild_id);
} }

3
webpage/member.ts
View file

@ -31,7 +31,8 @@ class Member{
} }
if(thing==="roles"){ if(thing==="roles"){
for(const strrole of memberjson.roles){ for(const strrole of memberjson.roles){
const role=SnowFlake.getSnowFlakeFromID(strrole,Role).getObject(); const role=this.guild.roleids.get(strrole);
if(!role) continue;
this.roles.push(role); this.roles.push(role);
} }
continue; continue;

13
webpage/role.ts
View file

@ -122,7 +122,7 @@ class PermissionToggle implements OptionsElement<number>{
} }
import{ OptionsElement,Buttons }from"./settings.js"; import{ OptionsElement,Buttons }from"./settings.js";
class RoleList extends Buttons{ class RoleList extends Buttons{
readonly permissions:[SnowFlake<Role>,Permissions][]; readonly permissions:[Role,Permissions][];
permission:Permissions; permission:Permissions;
readonly guild:Guild; readonly guild:Guild;
readonly channel:boolean; readonly channel:boolean;
@ -130,7 +130,7 @@ class RoleList extends Buttons{
readonly options:Options; readonly options:Options;
onchange:Function; onchange:Function;
curid:string; curid:string;
constructor(permissions:[SnowFlake<Role>,Permissions][],guild:Guild,onchange:Function,channel=false){ constructor(permissions:[Role,Permissions][],guild:Guild,onchange:Function,channel=false){
super("Roles"); super("Roles");
this.guild=guild; this.guild=guild;
this.permissions=permissions; this.permissions=permissions;
@ -147,7 +147,7 @@ class RoleList extends Buttons{
} }
for(const i of permissions){ for(const i of permissions){
console.log(i); console.log(i);
this.buttons.push([i[0].getObject().name,i[0].id]);// this.buttons.push([i[0].name,i[0].id]);
} }
this.options=options; this.options=options;
} }
@ -158,8 +158,11 @@ class RoleList extends Buttons{
const perm=arr[1]; const perm=arr[1];
this.permission.deny=perm.deny; this.permission.deny=perm.deny;
this.permission.allow=perm.allow; this.permission.allow=perm.allow;
this.options.name=SnowFlake.getSnowFlakeFromID(str,Role).getObject().name; const role=this.permissions.find(e=>e[0].id===str);
this.options.haschanged=false; if(role){
this.options.name=role[0].name;
this.options.haschanged=false;
}
} }
return this.options.generateHTML(); return this.options.generateHTML();
} }

81
webpage/snowflake.ts
View file

@ -1,81 +1,7 @@
class SnowFlake<x extends WeakKey>{ class SnowFlake{
public readonly id:string; public readonly id:string;
private static SnowFlakes:Map<any,Map<string,WeakRef<SnowFlake<any>>>>=new Map(); constructor(id:string){
private static readonly FinalizationRegistry=new FinalizationRegistry((a:[string,WeakKey])=>{
SnowFlake.SnowFlakes.get(a[1]).delete(a[0]);
});
private obj:x;
constructor(id:string,obj:x){
if(!obj){
this.id=id;
return;
}
if(!SnowFlake.SnowFlakes.get(obj.constructor)){
SnowFlake.SnowFlakes.set(obj.constructor,new Map());
}
if(SnowFlake.SnowFlakes.get(obj.constructor).get(id)){
const snowflake=SnowFlake.SnowFlakes.get(obj.constructor).get(id).deref();
if(snowflake){
snowflake.obj=obj;
return snowflake;
}else{
SnowFlake.SnowFlakes.get(obj.constructor).delete(id);
}
}
this.id=id; this.id=id;
SnowFlake.SnowFlakes.get(obj.constructor).set(id,new WeakRef(this));
SnowFlake.FinalizationRegistry.register(this,[id,obj.constructor]);
this.obj=obj;
}
static clear(){//this is kinda a temp solution, it should be fixed, though its not that easy to do so
this.SnowFlakes=new Map();
}
/**
* Just to clarify bc TS, it returns a SnowFlake\<type> which is what you entered with the type parameter
* @deprecated
**/
static getSnowFlakeFromID<T extends {}>(id:string,type: abstract new(...args: never) => T): SnowFlake<T>{
if(!SnowFlake.SnowFlakes.get(type)){
SnowFlake.SnowFlakes.set(type,new Map());
}
const snowflake=SnowFlake.SnowFlakes.get(type).get(id);
if(snowflake){
const obj=snowflake.deref();
if(obj){
return obj;
}else{
SnowFlake.SnowFlakes.get(type).delete(id);
}
}
{
const snowflake=new SnowFlake(id,undefined);
SnowFlake.SnowFlakes.get(type).set(id,new WeakRef(snowflake));
SnowFlake.FinalizationRegistry.register(this,[id,type]);
return snowflake;
}
}
/**
* @deprecated
*
*
*/
static hasSnowFlakeFromID(id:string,type:any){
if(!SnowFlake.SnowFlakes.get(type)){
return false;
}
const flake=SnowFlake.SnowFlakes.get(type).get(id);
if(flake){
const flake2=flake.deref()?.getObject();
if(flake2){
return true;
}else{
return false;
}
}else{
return false;
}
} }
getUnixTime():number{ getUnixTime():number{
try{ try{
@ -88,8 +14,5 @@ class SnowFlake<x extends WeakKey>{
toString(){ toString(){
return this.id; return this.id;
} }
getObject():x{
return this.obj;
}
} }
export{SnowFlake}; export{SnowFlake};