From 6a7a7a15e471f90452807f112a0a933ab9b3ce5e Mon Sep 17 00:00:00 2001 From: MathMan05 Date: Thu, 19 Sep 2024 14:53:54 -0500 Subject: [PATCH] fix TS errors --- src/webpage/channel.ts | 11 ++++++----- src/webpage/direct.ts | 2 +- src/webpage/emoji.ts | 3 +++ src/webpage/guild.ts | 6 +++--- src/webpage/localuser.ts | 2 +- src/webpage/member.ts | 2 +- src/webpage/message.ts | 2 +- src/webpage/user.ts | 4 ++-- tsconfig.json | 4 ++-- 9 files changed, 20 insertions(+), 16 deletions(-) diff --git a/src/webpage/channel.ts b/src/webpage/channel.ts index 2718da1..9635961 100644 --- a/src/webpage/channel.ts +++ b/src/webpage/channel.ts @@ -248,6 +248,7 @@ class Channel extends SnowFlake{ } } + return undefined; }, async (id: string): Promise=>{ //await new Promise(_=>{setTimeout(_,Math.random()*10)}) @@ -367,7 +368,7 @@ class Channel extends SnowFlake{ return( Boolean(this.lastmessageid) && (!this.lastreadmessageid || - SnowFlake.stringToUnixTime(this.lastmessageid) > + SnowFlake.stringToUnixTime(this.lastmessageid as string) > SnowFlake.stringToUnixTime(this.lastreadmessageid)) && this.type !== 4 ); @@ -504,7 +505,7 @@ class Channel extends SnowFlake{ decdiv.classList.add("channeleffects"); decdiv.classList.add("channel"); - Channel.contextmenu.bindContextmenu(decdiv, this); + Channel.contextmenu.bindContextmenu(decdiv, this,undefined); // @ts-ignore I dont wanna deal with this decdiv.all = this; @@ -540,7 +541,7 @@ class Channel extends SnowFlake{ if(this.hasunreads){ div.classList.add("cunread"); } - Channel.contextmenu.bindContextmenu(div, this); + Channel.contextmenu.bindContextmenu(div, this,undefined); if(admin){ this.coatDropDiv(div); } @@ -576,7 +577,7 @@ class Channel extends SnowFlake{ if(this.html){ return this.html.deref(); }else{ - + return; } } readbottom(){ @@ -781,7 +782,7 @@ class Channel extends SnowFlake{ } } async getmessage(id: string): Promise{ - console.log("getting:"+id) + console.log("getting:"+id); const message = this.messages.get(id); if(message){ return message; diff --git a/src/webpage/direct.ts b/src/webpage/direct.ts index 189e935..b4c0807 100644 --- a/src/webpage/direct.ts +++ b/src/webpage/direct.ts @@ -150,7 +150,7 @@ class Group extends Channel{ } createguildHTML(){ const div = document.createElement("div"); - Group.contextmenu.bindContextmenu(div, this); + Group.contextmenu.bindContextmenu(div, this,undefined); this.html = new WeakRef(div); div.classList.add("channeleffects"); const myhtml = document.createElement("span"); diff --git a/src/webpage/emoji.ts b/src/webpage/emoji.ts index 883c7f8..6273d66 100644 --- a/src/webpage/emoji.ts +++ b/src/webpage/emoji.ts @@ -17,6 +17,8 @@ class Emoji{ get guild(){ if(this.owner instanceof Guild){ return this.owner; + }else{ + return undefined; } } get localuser(){ @@ -121,6 +123,7 @@ class Emoji{ return e.arrayBuffer(); }) .then(e=>{ + console.log(e); Emoji.decodeEmojiList(e); }); } diff --git a/src/webpage/guild.ts b/src/webpage/guild.ts index 33c1504..af0ceb9 100644 --- a/src/webpage/guild.ts +++ b/src/webpage/guild.ts @@ -72,7 +72,7 @@ class Guild extends SnowFlake{ Guild.contextmenu.addbutton( "Create invite", - (this: Guild)=>{}, + function(this: Guild){}, null, _=>true, _=>false @@ -377,7 +377,7 @@ class Guild extends SnowFlake{ guild.loadGuild(); guild.loadChannel(); }; - Guild.contextmenu.bindContextmenu(img, guild); + Guild.contextmenu.bindContextmenu(img, guild,undefined); } }else{ const div = document.createElement("div"); @@ -399,7 +399,7 @@ class Guild extends SnowFlake{ guild.loadGuild(); guild.loadChannel(); }; - Guild.contextmenu.bindContextmenu(div, guild); + Guild.contextmenu.bindContextmenu(div, guild,undefined); } } return divy; diff --git a/src/webpage/localuser.ts b/src/webpage/localuser.ts index 3a49410..7011c71 100644 --- a/src/webpage/localuser.ts +++ b/src/webpage/localuser.ts @@ -1769,7 +1769,7 @@ class Localuser{ value.delete(thing); continue; } - func(); + func(undefined); value.delete(thing); } } diff --git a/src/webpage/member.ts b/src/webpage/member.ts index a67f5dd..ef2b3cf 100644 --- a/src/webpage/member.ts +++ b/src/webpage/member.ts @@ -94,7 +94,7 @@ static async resolveMember( const promise = new Promise(async res=>{ const membjson = await membpromise; if(membjson === undefined){ - return res(); + return res(undefined); }else{ const member = new Member(membjson, guild); const map = guild.localuser.presences; diff --git a/src/webpage/message.ts b/src/webpage/message.ts index 4fbc0f9..fc79a6f 100644 --- a/src/webpage/message.ts +++ b/src/webpage/message.ts @@ -227,7 +227,7 @@ class Message extends SnowFlake{ }else if(userd instanceof Member){ return this.mentions.includes(userd.user); }else{ - + return false; } } getimages(){ diff --git a/src/webpage/user.ts b/src/webpage/user.ts index 2f06f4c..661f48e 100644 --- a/src/webpage/user.ts +++ b/src/webpage/user.ts @@ -140,7 +140,7 @@ class User extends SnowFlake{ }); this.contextmenu.addbutton( "Kick member", - (this: User, member: Member | undefined)=>{ + function(this: User, member: Member | undefined){ member?.kick(); }, null, @@ -158,7 +158,7 @@ class User extends SnowFlake{ ); this.contextmenu.addbutton( "Ban member", - (this: User, member: Member | undefined)=>{ + function(this: User, member: Member | undefined){ member?.ban(); }, null, diff --git a/tsconfig.json b/tsconfig.json index 64d78e8..0b4a564 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -29,7 +29,7 @@ "useDefineForClassFields": true, "resolvePackageJsonImports": true, "skipLibCheck": true, - "outDir": "./dist", + "outDir": "./dist" }, "include": [ "src/**/*.ts" @@ -37,4 +37,4 @@ "exclude": [ "node_modules" ] -} \ No newline at end of file +}