diff --git a/.dist/channel.js b/.dist/channel.js index b1f096f..6646d45 100644 --- a/.dist/channel.js +++ b/.dist/channel.js @@ -20,7 +20,6 @@ class Channel { parent; children; guild_id; - messageids; permission_overwrites; permission_overwritesar; topic; @@ -217,14 +216,13 @@ class Channel { this.owner = owner; this.headers = this.owner.headers; this.name = json.name; - this.snowflake = new SnowFlake(json.id, this); + this.snowflake = new SnowFlake(json.id); if (json.parent_id) { this.parent_id = json.parent_id; } this.parent = null; this.children = []; this.guild_id = json.guild_id; - this.messageids = new Map(); this.permission_overwrites = new Map(); this.permission_overwritesar = []; for (const thing of json.permission_overwrites) { @@ -758,9 +756,6 @@ class Channel { this.lastmessageid = message.id; } prev = message; - if (this.messageids.get(message.snowflake) === undefined) { - this.messageids.set(message.snowflake, message); - } } } delChannel(json) { @@ -795,7 +790,6 @@ class Channel { this.idToPrev.set(messager.id, previd); this.idToNext.set(previd, messager.id); previd = messager.id; - this.messageids.set(messager.snowflake, messager); if (willbreak) { break; } @@ -834,7 +828,6 @@ class Channel { this.idToNext.set(messager.id, previd); this.idToPrev.set(previd, messager.id); previd = messager.id; - this.messageids.set(messager.snowflake, messager); if (Number(i) === response.length - 1 && response.length < 100) { this.topid = previd; } @@ -953,7 +946,6 @@ class Channel { } this.children = []; this.guild_id = json.guild_id; - this.messageids = new Map(); this.permission_overwrites = new Map(); for (const thing of json.permission_overwrites) { if (thing.id === "1182819038095799904" || thing.id === "1182820803700625444") { @@ -1055,7 +1047,6 @@ class Channel { this.idToPrev.set(messagez.id, this.lastmessageid); } this.lastmessageid = messagez.id; - this.messageids.set(messagez.snowflake, messagez); if (messagez.author === this.localuser.user) { this.lastreadmessageid = messagez.id; if (this.myhtml) { diff --git a/.dist/direct.js b/.dist/direct.js index c6bf18c..27c8fc9 100644 --- a/.dist/direct.js +++ b/.dist/direct.js @@ -15,7 +15,7 @@ class Direct extends Guild { this.headers = this.localuser.headers; this.channels = []; this.channelids = {}; - this.snowflake = new SnowFlake("@me", this); + this.snowflake = new SnowFlake("@me"); this.properties = {}; this.roles = []; this.roleids = new Map(); @@ -88,12 +88,11 @@ class Group extends Channel { this.user = this.localuser.user; } this.name ??= this.localuser.user.username; - this.snowflake = new SnowFlake(json.id, this); + this.snowflake = new SnowFlake(json.id); this.parent_id = null; this.parent = null; this.children = []; this.guild_id = "@me"; - this.messageids = new Map(); this.permission_overwrites = new Map(); this.lastmessageid = json.last_message_id; this.mentions = 0; @@ -142,7 +141,6 @@ class Group extends Channel { this.idToPrev.set(messagez.id, this.lastmessageid); } this.lastmessageid = messagez.id; - this.messageids.set(messagez.snowflake, messagez); if (messagez.author === this.localuser.user) { this.lastreadmessageid = messagez.id; if (this.myhtml) { diff --git a/.dist/guild.js b/.dist/guild.js index f18267e..5bc7b87 100644 --- a/.dist/guild.js +++ b/.dist/guild.js @@ -89,7 +89,7 @@ class Guild { this.headers = this.owner.headers; this.channels = []; this.channelids = {}; - this.snowflake = new SnowFlake(json.id, this); + this.snowflake = new SnowFlake(json.id); this.properties = json.properties; this.roles = []; this.roleids = new Map(); @@ -387,7 +387,7 @@ class Guild { const build = { read_states: [] }; for (const thing of this.channels) { if (thing.hasunreads) { - build.read_states.push({ channel_id: thing.snowflake, message_id: thing.lastmessageid, read_state_type: 0 }); + build.read_states.push({ channel_id: thing.id, message_id: thing.lastmessageid, read_state_type: 0 }); thing.lastreadmessageid = thing.lastmessageid; if (!thing.myhtml) continue; diff --git a/.dist/message.js b/.dist/message.js index fdd2b35..a24fd62 100644 --- a/.dist/message.js +++ b/.dist/message.js @@ -117,7 +117,7 @@ class Message { continue; } else if (thing === "id") { - this.snowflake = new SnowFlake(messagejson.id, this); + this.snowflake = new SnowFlake(messagejson.id); continue; } else if (thing === "member") { @@ -237,7 +237,6 @@ class Message { this.channel.idToPrev.set(next, prev); this.channel.idToNext.set(prev, next); } - this.channel.messageids.delete(this.snowflake); if (prev) { const prevmessage = this.channel.messages.get(prev); if (prevmessage) { diff --git a/.dist/role.js b/.dist/role.js index d2a91c9..213dda3 100644 --- a/.dist/role.js +++ b/.dist/role.js @@ -20,7 +20,7 @@ class Role { this.info = owner.info; for (const thing of Object.keys(json)) { if (thing === "id") { - this.snowflake = new SnowFlake(json.id, this); + this.snowflake = new SnowFlake(json.id); continue; } this[thing] = json[thing]; diff --git a/.dist/user.js b/.dist/user.js index 1527b15..a472c7c 100644 --- a/.dist/user.js +++ b/.dist/user.js @@ -152,7 +152,7 @@ class User { continue; } if (thing === "id") { - this.snowflake = new SnowFlake(userjson[thing], this); + this.snowflake = new SnowFlake(userjson[thing]); continue; } this[thing] = userjson[thing]; diff --git a/tsconfig.json b/tsconfig.json index e59ead1..71aba3f 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -9,7 +9,7 @@ "removeComments": false, "noImplicitThis":true, "useUnknownInCatchVariables":true, - "strictNullChecks":true + "strictNullChecks":false }, "include": [ "./webpage/*.ts" diff --git a/webpage/channel.ts b/webpage/channel.ts index 7004463..94905db 100644 --- a/webpage/channel.ts +++ b/webpage/channel.ts @@ -24,12 +24,11 @@ class Channel{ owner:Guild; headers:Localuser["headers"]; name:string; - snowflake:SnowFlake; + snowflake:SnowFlake; parent_id?:string; parent:Channel|null; children:Channel[]; guild_id:string; - messageids:Map,Message>; permission_overwrites:Map; permission_overwritesar:[Role,Permissions][]; topic:string; @@ -229,14 +228,13 @@ class Channel{ this.owner=owner; this.headers=this.owner.headers; this.name=json.name; - this.snowflake=new SnowFlake(json.id,this); + this.snowflake=new SnowFlake(json.id); if(json.parent_id){ this.parent_id=json.parent_id; } this.parent=null; this.children=[]; this.guild_id=json.guild_id; - this.messageids=new Map(); this.permission_overwrites=new Map(); this.permission_overwritesar=[]; for(const thing of json.permission_overwrites){ @@ -767,9 +765,6 @@ class Channel{ this.lastmessageid=message.id; } prev=message; - if(this.messageids.get(message.snowflake)===undefined){ - this.messageids.set(message.snowflake,message); - } } } delChannel(json:channeljson){ @@ -803,7 +798,6 @@ class Channel{ this.idToPrev.set(messager.id,previd); this.idToNext.set(previd,messager.id); previd=messager.id; - this.messageids.set(messager.snowflake,messager); if(willbreak){ break; } @@ -843,7 +837,6 @@ class Channel{ this.idToNext.set(messager.id,previd); this.idToPrev.set(previd,messager.id); previd=messager.id; - this.messageids.set(messager.snowflake,messager); if(Number(i)===response.length-1&&response.length<100){ this.topid=previd; @@ -958,7 +951,6 @@ class Channel{ this.children=[]; this.guild_id=json.guild_id; - this.messageids=new Map(); this.permission_overwrites=new Map(); for(const thing of json.permission_overwrites){ if(thing.id==="1182819038095799904"||thing.id==="1182820803700625444"){ @@ -1061,7 +1053,6 @@ class Channel{ } this.lastmessageid=messagez.id; - this.messageids.set(messagez.snowflake,messagez); if(messagez.author===this.localuser.user){ this.lastreadmessageid=messagez.id; diff --git a/webpage/direct.ts b/webpage/direct.ts index 685d3f1..9ab3988 100644 --- a/webpage/direct.ts +++ b/webpage/direct.ts @@ -19,7 +19,7 @@ class Direct extends Guild{ this.headers=this.localuser.headers; this.channels=[]; this.channelids={}; - this.snowflake=new SnowFlake("@me",this); + this.snowflake=new SnowFlake("@me"); this.properties={}; this.roles=[]; this.roleids=new Map(); @@ -94,12 +94,11 @@ class Group extends Channel{ this.user=this.localuser.user; } this.name??=this.localuser.user.username; - this.snowflake=new SnowFlake(json.id,this); + this.snowflake=new SnowFlake(json.id); this.parent_id=null; this.parent=null; this.children=[]; this.guild_id="@me"; - this.messageids=new Map(); this.permission_overwrites=new Map(); this.lastmessageid=json.last_message_id; this.mentions=0; @@ -148,7 +147,6 @@ class Group extends Channel{ this.idToPrev.set(messagez.id,this.lastmessageid); } this.lastmessageid=messagez.id; - this.messageids.set(messagez.snowflake,messagez); if(messagez.author===this.localuser.user){ this.lastreadmessageid=messagez.id; if(this.myhtml){ diff --git a/webpage/guild.ts b/webpage/guild.ts index 5676acc..2935c04 100644 --- a/webpage/guild.ts +++ b/webpage/guild.ts @@ -15,7 +15,7 @@ class Guild{ headers:Localuser["headers"]; channels:Channel[]; channelids:{[key:string]:Channel}; - snowflake:SnowFlake; + snowflake:SnowFlake; properties; roles:Role[]; roleids:Map; @@ -100,7 +100,7 @@ class Guild{ this.headers=this.owner.headers; this.channels=[]; this.channelids={}; - this.snowflake=new SnowFlake(json.id,this); + this.snowflake=new SnowFlake(json.id); this.properties=json.properties; this.roles=[]; this.roleids=new Map(); @@ -394,10 +394,10 @@ class Guild{ return this.member.isAdmin(); } async markAsRead(){ - const build:{read_states:{channel_id:SnowFlake,message_id:string|null|undefined,read_state_type:number}[]}={read_states: []}; + const build:{read_states:{channel_id:string,message_id:string|null|undefined,read_state_type:number}[]}={read_states: []}; for(const thing of this.channels){ if(thing.hasunreads){ - build.read_states.push({channel_id: thing.snowflake,message_id: thing.lastmessageid,read_state_type: 0}); + build.read_states.push({channel_id: thing.id,message_id: thing.lastmessageid,read_state_type: 0}); thing.lastreadmessageid=thing.lastmessageid; if(!thing.myhtml)continue; thing.myhtml.classList.remove("cunread"); diff --git a/webpage/message.ts b/webpage/message.ts index 97e29e1..593a181 100644 --- a/webpage/message.ts +++ b/webpage/message.ts @@ -20,7 +20,7 @@ class Message{ mentions:User[]; mention_roles:Role[]; attachments:File[];//probably should be its own class tbh, should be Attachments[] - snowflake:SnowFlake; + snowflake:SnowFlake; message_reference; type:number; timestamp:number; @@ -119,7 +119,7 @@ class Message{ this.content=new MarkDown(messagejson[thing],this.channel); continue; }else if(thing ==="id"){ - this.snowflake=new SnowFlake(messagejson.id,this); + this.snowflake=new SnowFlake(messagejson.id); continue; }else if(thing==="member"){ Member.new(messagejson.member as memberjson,this.guild).then(_=>{ @@ -235,7 +235,6 @@ class Message{ this.channel.idToPrev.set(next,prev); this.channel.idToNext.set(prev,next); } - this.channel.messageids.delete(this.snowflake); if(prev){ const prevmessage=this.channel.messages.get(prev); if(prevmessage){ diff --git a/webpage/role.ts b/webpage/role.ts index 3f0f21e..3ba0c37 100644 --- a/webpage/role.ts +++ b/webpage/role.ts @@ -8,7 +8,7 @@ class Role{ permissions:Permissions; owner:Guild; color:number; - readonly snowflake:SnowFlake; + readonly snowflake:SnowFlake; name:string; info:Guild["info"]; hoist:boolean; @@ -24,7 +24,7 @@ class Role{ this.info=owner.info; for(const thing of Object.keys(json)){ if(thing==="id"){ - this.snowflake=new SnowFlake(json.id,this); + this.snowflake=new SnowFlake(json.id); continue; } this[thing]=json[thing]; diff --git a/webpage/user.ts b/webpage/user.ts index 8944285..d666dac 100644 --- a/webpage/user.ts +++ b/webpage/user.ts @@ -10,7 +10,7 @@ import{ presencejson, userjson }from"./jsontypes.js"; class User{ owner:Localuser; hypotheticalpfp:boolean; - snowflake:SnowFlake; + snowflake:SnowFlake; avatar:string|null; username:string; nickname:string|null=null; @@ -153,7 +153,7 @@ class User{ continue; } if(thing === "id"){ - this.snowflake=new SnowFlake(userjson[thing],this); + this.snowflake=new SnowFlake(userjson[thing]); continue; } this[thing]=userjson[thing];