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

get rid of snowflake stuff more

Browse source
This commit is contained in:
MathMan05 2024-09-03 10:41:17 -05:00
parent 03041cf9fd
commit 004beb4955
13 changed files with 23 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

11
.dist/channel.js
View file

@ -20,7 +20,6 @@ class Channel {
parent; parent;
children; children;
guild_id; guild_id;
messageids;
permission_overwrites; permission_overwrites;
permission_overwritesar; permission_overwritesar;
topic; topic;
@ -217,14 +216,13 @@ class Channel {
this.owner = owner; this.owner = owner;
this.headers = this.owner.headers; this.headers = this.owner.headers;
this.name = json.name; this.name = json.name;
this.snowflake = new SnowFlake(json.id, this); this.snowflake = new SnowFlake(json.id);
if (json.parent_id) { if (json.parent_id) {
this.parent_id = json.parent_id; this.parent_id = json.parent_id;
} }
this.parent = null; this.parent = null;
this.children = []; this.children = [];
this.guild_id = json.guild_id; this.guild_id = json.guild_id;
this.messageids = new Map();
this.permission_overwrites = new Map(); this.permission_overwrites = new Map();
this.permission_overwritesar = []; this.permission_overwritesar = [];
for (const thing of json.permission_overwrites) { for (const thing of json.permission_overwrites) {
@ -758,9 +756,6 @@ class Channel {
this.lastmessageid = message.id; this.lastmessageid = message.id;
} }
prev = message; prev = message;
if (this.messageids.get(message.snowflake) === undefined) {
this.messageids.set(message.snowflake, message);
}
} }
} }
delChannel(json) { delChannel(json) {
@ -795,7 +790,6 @@ class Channel {
this.idToPrev.set(messager.id, previd); this.idToPrev.set(messager.id, previd);
this.idToNext.set(previd, messager.id); this.idToNext.set(previd, messager.id);
previd = messager.id; previd = messager.id;
this.messageids.set(messager.snowflake, messager);
if (willbreak) { if (willbreak) {
break; break;
} }
@ -834,7 +828,6 @@ class Channel {
this.idToNext.set(messager.id, previd); this.idToNext.set(messager.id, previd);
this.idToPrev.set(previd, messager.id); this.idToPrev.set(previd, messager.id);
previd = messager.id; previd = messager.id;
this.messageids.set(messager.snowflake, messager);
if (Number(i) === response.length - 1 && response.length < 100) { if (Number(i) === response.length - 1 && response.length < 100) {
this.topid = previd; this.topid = previd;
} }
@ -953,7 +946,6 @@ class Channel {
} }
this.children = []; this.children = [];
this.guild_id = json.guild_id; this.guild_id = json.guild_id;
this.messageids = new Map();
this.permission_overwrites = new Map(); this.permission_overwrites = new Map();
for (const thing of json.permission_overwrites) { for (const thing of json.permission_overwrites) {
if (thing.id === "1182819038095799904" || thing.id === "1182820803700625444") { if (thing.id === "1182819038095799904" || thing.id === "1182820803700625444") {
@ -1055,7 +1047,6 @@ class Channel {
this.idToPrev.set(messagez.id, this.lastmessageid); this.idToPrev.set(messagez.id, this.lastmessageid);
} }
this.lastmessageid = messagez.id; this.lastmessageid = messagez.id;
this.messageids.set(messagez.snowflake, messagez);
if (messagez.author === this.localuser.user) { if (messagez.author === this.localuser.user) {
this.lastreadmessageid = messagez.id; this.lastreadmessageid = messagez.id;
if (this.myhtml) { if (this.myhtml) {

6
.dist/direct.js
View file

@ -15,7 +15,7 @@ class Direct extends Guild {
this.headers = this.localuser.headers; this.headers = this.localuser.headers;
this.channels = []; this.channels = [];
this.channelids = {}; this.channelids = {};
this.snowflake = new SnowFlake("@me", this); this.snowflake = new SnowFlake("@me");
this.properties = {}; this.properties = {};
this.roles = []; this.roles = [];
this.roleids = new Map(); this.roleids = new Map();
@ -88,12 +88,11 @@ class Group extends Channel {
this.user = this.localuser.user; this.user = this.localuser.user;
} }
this.name ??= this.localuser.user.username; 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_id = null;
this.parent = null; this.parent = null;
this.children = []; this.children = [];
this.guild_id = "@me"; this.guild_id = "@me";
this.messageids = new Map();
this.permission_overwrites = new Map(); this.permission_overwrites = new Map();
this.lastmessageid = json.last_message_id; this.lastmessageid = json.last_message_id;
this.mentions = 0; this.mentions = 0;
@ -142,7 +141,6 @@ class Group extends Channel {
this.idToPrev.set(messagez.id, this.lastmessageid); this.idToPrev.set(messagez.id, this.lastmessageid);
} }
this.lastmessageid = messagez.id; this.lastmessageid = messagez.id;
this.messageids.set(messagez.snowflake, messagez);
if (messagez.author === this.localuser.user) { if (messagez.author === this.localuser.user) {
this.lastreadmessageid = messagez.id; this.lastreadmessageid = messagez.id;
if (this.myhtml) { if (this.myhtml) {

4
.dist/guild.js
View file

@ -89,7 +89,7 @@ class Guild {
this.headers = this.owner.headers; this.headers = this.owner.headers;
this.channels = []; this.channels = [];
this.channelids = {}; this.channelids = {};
this.snowflake = new SnowFlake(json.id, this); this.snowflake = new SnowFlake(json.id);
this.properties = json.properties; this.properties = json.properties;
this.roles = []; this.roles = [];
this.roleids = new Map(); this.roleids = new Map();
@ -387,7 +387,7 @@ class Guild {
const build = { read_states: [] }; const build = { read_states: [] };
for (const thing of this.channels) { for (const thing of this.channels) {
if (thing.hasunreads) { 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; thing.lastreadmessageid = thing.lastmessageid;
if (!thing.myhtml) if (!thing.myhtml)
continue; continue;

3
.dist/message.js
View file

@ -117,7 +117,7 @@ class Message {
continue; continue;
} }
else if (thing === "id") { else if (thing === "id") {
this.snowflake = new SnowFlake(messagejson.id, this); this.snowflake = new SnowFlake(messagejson.id);
continue; continue;
} }
else if (thing === "member") { else if (thing === "member") {
@ -237,7 +237,6 @@ class Message {
this.channel.idToPrev.set(next, prev); this.channel.idToPrev.set(next, prev);
this.channel.idToNext.set(prev, next); this.channel.idToNext.set(prev, next);
} }
this.channel.messageids.delete(this.snowflake);
if (prev) { if (prev) {
const prevmessage = this.channel.messages.get(prev); const prevmessage = this.channel.messages.get(prev);
if (prevmessage) { if (prevmessage) {

2
.dist/role.js
View file

@ -20,7 +20,7 @@ class Role {
this.info = owner.info; this.info = owner.info;
for (const thing of Object.keys(json)) { for (const thing of Object.keys(json)) {
if (thing === "id") { if (thing === "id") {
this.snowflake = new SnowFlake(json.id, this); this.snowflake = new SnowFlake(json.id);
continue; continue;
} }
this[thing] = json[thing]; this[thing] = json[thing];

2
.dist/user.js
View file

@ -152,7 +152,7 @@ class User {
continue; continue;
} }
if (thing === "id") { if (thing === "id") {
this.snowflake = new SnowFlake(userjson[thing], this); this.snowflake = new SnowFlake(userjson[thing]);
continue; continue;
} }
this[thing] = userjson[thing]; this[thing] = userjson[thing];

2
tsconfig.json
View file

@ -9,7 +9,7 @@
"removeComments": false, "removeComments": false,
"noImplicitThis":true, "noImplicitThis":true,
"useUnknownInCatchVariables":true, "useUnknownInCatchVariables":true,
"strictNullChecks":true "strictNullChecks":false
}, },
"include": [ "include": [
"./webpage/*.ts" "./webpage/*.ts"

13
webpage/channel.ts
View file

@ -24,12 +24,11 @@ class Channel{
owner:Guild; owner:Guild;
headers:Localuser["headers"]; headers:Localuser["headers"];
name:string; name:string;
snowflake:SnowFlake<Channel>; snowflake:SnowFlake;
parent_id?:string; parent_id?:string;
parent:Channel|null; parent:Channel|null;
children:Channel[]; children:Channel[];
guild_id:string; guild_id:string;
messageids:Map<SnowFlake<Message>,Message>;
permission_overwrites:Map<string,Permissions>; permission_overwrites:Map<string,Permissions>;
permission_overwritesar:[Role,Permissions][]; permission_overwritesar:[Role,Permissions][];
topic:string; topic:string;
@ -229,14 +228,13 @@ class Channel{
this.owner=owner; this.owner=owner;
this.headers=this.owner.headers; this.headers=this.owner.headers;
this.name=json.name; this.name=json.name;
this.snowflake=new SnowFlake(json.id,this); this.snowflake=new SnowFlake(json.id);
if(json.parent_id){ if(json.parent_id){
this.parent_id=json.parent_id; this.parent_id=json.parent_id;
} }
this.parent=null; this.parent=null;
this.children=[]; this.children=[];
this.guild_id=json.guild_id; this.guild_id=json.guild_id;
this.messageids=new Map();
this.permission_overwrites=new Map(); this.permission_overwrites=new Map();
this.permission_overwritesar=[]; this.permission_overwritesar=[];
for(const thing of json.permission_overwrites){ for(const thing of json.permission_overwrites){
@ -767,9 +765,6 @@ class Channel{
this.lastmessageid=message.id; this.lastmessageid=message.id;
} }
prev=message; prev=message;
if(this.messageids.get(message.snowflake)===undefined){
this.messageids.set(message.snowflake,message);
}
} }
} }
delChannel(json:channeljson){ delChannel(json:channeljson){
@ -803,7 +798,6 @@ class Channel{
this.idToPrev.set(messager.id,previd); this.idToPrev.set(messager.id,previd);
this.idToNext.set(previd,messager.id); this.idToNext.set(previd,messager.id);
previd=messager.id; previd=messager.id;
this.messageids.set(messager.snowflake,messager);
if(willbreak){ if(willbreak){
break; break;
} }
@ -843,7 +837,6 @@ class Channel{
this.idToNext.set(messager.id,previd); this.idToNext.set(messager.id,previd);
this.idToPrev.set(previd,messager.id); this.idToPrev.set(previd,messager.id);
previd=messager.id; previd=messager.id;
this.messageids.set(messager.snowflake,messager);
if(Number(i)===response.length-1&&response.length<100){ if(Number(i)===response.length-1&&response.length<100){
this.topid=previd; this.topid=previd;
@ -958,7 +951,6 @@ class Channel{
this.children=[]; this.children=[];
this.guild_id=json.guild_id; this.guild_id=json.guild_id;
this.messageids=new Map();
this.permission_overwrites=new Map(); this.permission_overwrites=new Map();
for(const thing of json.permission_overwrites){ for(const thing of json.permission_overwrites){
if(thing.id==="1182819038095799904"||thing.id==="1182820803700625444"){ if(thing.id==="1182819038095799904"||thing.id==="1182820803700625444"){
@ -1061,7 +1053,6 @@ class Channel{
} }
this.lastmessageid=messagez.id; this.lastmessageid=messagez.id;
this.messageids.set(messagez.snowflake,messagez);
if(messagez.author===this.localuser.user){ if(messagez.author===this.localuser.user){
this.lastreadmessageid=messagez.id; this.lastreadmessageid=messagez.id;

6
webpage/direct.ts
View file

@ -19,7 +19,7 @@ class Direct extends Guild{
this.headers=this.localuser.headers; this.headers=this.localuser.headers;
this.channels=[]; this.channels=[];
this.channelids={}; this.channelids={};
this.snowflake=new SnowFlake("@me",this); this.snowflake=new SnowFlake("@me");
this.properties={}; this.properties={};
this.roles=[]; this.roles=[];
this.roleids=new Map(); this.roleids=new Map();
@ -94,12 +94,11 @@ class Group extends Channel{
this.user=this.localuser.user; this.user=this.localuser.user;
} }
this.name??=this.localuser.user.username; 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_id=null;
this.parent=null; this.parent=null;
this.children=[]; this.children=[];
this.guild_id="@me"; this.guild_id="@me";
this.messageids=new Map();
this.permission_overwrites=new Map(); this.permission_overwrites=new Map();
this.lastmessageid=json.last_message_id; this.lastmessageid=json.last_message_id;
this.mentions=0; this.mentions=0;
@ -148,7 +147,6 @@ class Group extends Channel{
this.idToPrev.set(messagez.id,this.lastmessageid); this.idToPrev.set(messagez.id,this.lastmessageid);
} }
this.lastmessageid=messagez.id; this.lastmessageid=messagez.id;
this.messageids.set(messagez.snowflake,messagez);
if(messagez.author===this.localuser.user){ if(messagez.author===this.localuser.user){
this.lastreadmessageid=messagez.id; this.lastreadmessageid=messagez.id;
if(this.myhtml){ if(this.myhtml){

8
webpage/guild.ts
View file

@ -15,7 +15,7 @@ class Guild{
headers:Localuser["headers"]; headers:Localuser["headers"];
channels:Channel[]; channels:Channel[];
channelids:{[key:string]:Channel}; channelids:{[key:string]:Channel};
snowflake:SnowFlake<Guild>; snowflake:SnowFlake;
properties; properties;
roles:Role[]; roles:Role[];
roleids:Map<string,Role>; roleids:Map<string,Role>;
@ -100,7 +100,7 @@ class Guild{
this.headers=this.owner.headers; this.headers=this.owner.headers;
this.channels=[]; this.channels=[];
this.channelids={}; this.channelids={};
this.snowflake=new SnowFlake(json.id,this); this.snowflake=new SnowFlake(json.id);
this.properties=json.properties; this.properties=json.properties;
this.roles=[]; this.roles=[];
this.roleids=new Map(); this.roleids=new Map();
@ -394,10 +394,10 @@ class Guild{
return this.member.isAdmin(); return this.member.isAdmin();
} }
async markAsRead(){ async markAsRead(){
const build:{read_states:{channel_id:SnowFlake<Channel>,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){ for(const thing of this.channels){
if(thing.hasunreads){ 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; thing.lastreadmessageid=thing.lastmessageid;
if(!thing.myhtml)continue; if(!thing.myhtml)continue;
thing.myhtml.classList.remove("cunread"); thing.myhtml.classList.remove("cunread");

5
webpage/message.ts
View file

@ -20,7 +20,7 @@ class Message{
mentions:User[]; mentions:User[];
mention_roles:Role[]; mention_roles:Role[];
attachments:File[];//probably should be its own class tbh, should be Attachments[] attachments:File[];//probably should be its own class tbh, should be Attachments[]
snowflake:SnowFlake<Message>; snowflake:SnowFlake;
message_reference; message_reference;
type:number; type:number;
timestamp:number; timestamp:number;
@ -119,7 +119,7 @@ class Message{
this.content=new MarkDown(messagejson[thing],this.channel); this.content=new MarkDown(messagejson[thing],this.channel);
continue; continue;
}else if(thing ==="id"){ }else if(thing ==="id"){
this.snowflake=new SnowFlake(messagejson.id,this); this.snowflake=new SnowFlake(messagejson.id);
continue; continue;
}else if(thing==="member"){ }else if(thing==="member"){
Member.new(messagejson.member as memberjson,this.guild).then(_=>{ Member.new(messagejson.member as memberjson,this.guild).then(_=>{
@ -235,7 +235,6 @@ class Message{
this.channel.idToPrev.set(next,prev); this.channel.idToPrev.set(next,prev);
this.channel.idToNext.set(prev,next); this.channel.idToNext.set(prev,next);
} }
this.channel.messageids.delete(this.snowflake);
if(prev){ if(prev){
const prevmessage=this.channel.messages.get(prev); const prevmessage=this.channel.messages.get(prev);
if(prevmessage){ if(prevmessage){

4
webpage/role.ts
View file

@ -8,7 +8,7 @@ class Role{
permissions:Permissions; permissions:Permissions;
owner:Guild; owner:Guild;
color:number; color:number;
readonly snowflake:SnowFlake<Role>; readonly snowflake:SnowFlake;
name:string; name:string;
info:Guild["info"]; info:Guild["info"];
hoist:boolean; hoist:boolean;
@ -24,7 +24,7 @@ class Role{
this.info=owner.info; this.info=owner.info;
for(const thing of Object.keys(json)){ for(const thing of Object.keys(json)){
if(thing==="id"){ if(thing==="id"){
this.snowflake=new SnowFlake(json.id,this); this.snowflake=new SnowFlake(json.id);
continue; continue;
} }
this[thing]=json[thing]; this[thing]=json[thing];

4
webpage/user.ts
View file

@ -10,7 +10,7 @@ import{ presencejson, userjson }from"./jsontypes.js";
class User{ class User{
owner:Localuser; owner:Localuser;
hypotheticalpfp:boolean; hypotheticalpfp:boolean;
snowflake:SnowFlake<User>; snowflake:SnowFlake;
avatar:string|null; avatar:string|null;
username:string; username:string;
nickname:string|null=null; nickname:string|null=null;
@ -153,7 +153,7 @@ class User{
continue; continue;
} }
if(thing === "id"){ if(thing === "id"){
this.snowflake=new SnowFlake(userjson[thing],this); this.snowflake=new SnowFlake(userjson[thing]);
continue; continue;
} }
this[thing]=userjson[thing]; this[thing]=userjson[thing];