fix TS errors
This commit is contained in:
parent
4e0fa3fdbb
commit
6a7a7a15e4
9 changed files with 20 additions and 16 deletions
|
@ -248,6 +248,7 @@ class Channel extends SnowFlake{
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
return undefined;
|
||||||
},
|
},
|
||||||
async (id: string): Promise<HTMLElement>=>{
|
async (id: string): Promise<HTMLElement>=>{
|
||||||
//await new Promise(_=>{setTimeout(_,Math.random()*10)})
|
//await new Promise(_=>{setTimeout(_,Math.random()*10)})
|
||||||
|
@ -367,7 +368,7 @@ class Channel extends SnowFlake{
|
||||||
return(
|
return(
|
||||||
Boolean(this.lastmessageid) &&
|
Boolean(this.lastmessageid) &&
|
||||||
(!this.lastreadmessageid ||
|
(!this.lastreadmessageid ||
|
||||||
SnowFlake.stringToUnixTime(this.lastmessageid) >
|
SnowFlake.stringToUnixTime(this.lastmessageid as string) >
|
||||||
SnowFlake.stringToUnixTime(this.lastreadmessageid)) &&
|
SnowFlake.stringToUnixTime(this.lastreadmessageid)) &&
|
||||||
this.type !== 4
|
this.type !== 4
|
||||||
);
|
);
|
||||||
|
@ -504,7 +505,7 @@ class Channel extends SnowFlake{
|
||||||
decdiv.classList.add("channeleffects");
|
decdiv.classList.add("channeleffects");
|
||||||
decdiv.classList.add("channel");
|
decdiv.classList.add("channel");
|
||||||
|
|
||||||
Channel.contextmenu.bindContextmenu(decdiv, this);
|
Channel.contextmenu.bindContextmenu(decdiv, this,undefined);
|
||||||
// @ts-ignore I dont wanna deal with this
|
// @ts-ignore I dont wanna deal with this
|
||||||
decdiv.all = this;
|
decdiv.all = this;
|
||||||
|
|
||||||
|
@ -540,7 +541,7 @@ class Channel extends SnowFlake{
|
||||||
if(this.hasunreads){
|
if(this.hasunreads){
|
||||||
div.classList.add("cunread");
|
div.classList.add("cunread");
|
||||||
}
|
}
|
||||||
Channel.contextmenu.bindContextmenu(div, this);
|
Channel.contextmenu.bindContextmenu(div, this,undefined);
|
||||||
if(admin){
|
if(admin){
|
||||||
this.coatDropDiv(div);
|
this.coatDropDiv(div);
|
||||||
}
|
}
|
||||||
|
@ -576,7 +577,7 @@ class Channel extends SnowFlake{
|
||||||
if(this.html){
|
if(this.html){
|
||||||
return this.html.deref();
|
return this.html.deref();
|
||||||
}else{
|
}else{
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
readbottom(){
|
readbottom(){
|
||||||
|
@ -781,7 +782,7 @@ class Channel extends SnowFlake{
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
async getmessage(id: string): Promise<Message>{
|
async getmessage(id: string): Promise<Message>{
|
||||||
console.log("getting:"+id)
|
console.log("getting:"+id);
|
||||||
const message = this.messages.get(id);
|
const message = this.messages.get(id);
|
||||||
if(message){
|
if(message){
|
||||||
return message;
|
return message;
|
||||||
|
|
|
@ -150,7 +150,7 @@ class Group extends Channel{
|
||||||
}
|
}
|
||||||
createguildHTML(){
|
createguildHTML(){
|
||||||
const div = document.createElement("div");
|
const div = document.createElement("div");
|
||||||
Group.contextmenu.bindContextmenu(div, this);
|
Group.contextmenu.bindContextmenu(div, this,undefined);
|
||||||
this.html = new WeakRef(div);
|
this.html = new WeakRef(div);
|
||||||
div.classList.add("channeleffects");
|
div.classList.add("channeleffects");
|
||||||
const myhtml = document.createElement("span");
|
const myhtml = document.createElement("span");
|
||||||
|
|
|
@ -17,6 +17,8 @@ class Emoji{
|
||||||
get guild(){
|
get guild(){
|
||||||
if(this.owner instanceof Guild){
|
if(this.owner instanceof Guild){
|
||||||
return this.owner;
|
return this.owner;
|
||||||
|
}else{
|
||||||
|
return undefined;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
get localuser(){
|
get localuser(){
|
||||||
|
@ -121,6 +123,7 @@ class Emoji{
|
||||||
return e.arrayBuffer();
|
return e.arrayBuffer();
|
||||||
})
|
})
|
||||||
.then(e=>{
|
.then(e=>{
|
||||||
|
console.log(e);
|
||||||
Emoji.decodeEmojiList(e);
|
Emoji.decodeEmojiList(e);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
@ -72,7 +72,7 @@ class Guild extends SnowFlake{
|
||||||
|
|
||||||
Guild.contextmenu.addbutton(
|
Guild.contextmenu.addbutton(
|
||||||
"Create invite",
|
"Create invite",
|
||||||
(this: Guild)=>{},
|
function(this: Guild){},
|
||||||
null,
|
null,
|
||||||
_=>true,
|
_=>true,
|
||||||
_=>false
|
_=>false
|
||||||
|
@ -377,7 +377,7 @@ class Guild extends SnowFlake{
|
||||||
guild.loadGuild();
|
guild.loadGuild();
|
||||||
guild.loadChannel();
|
guild.loadChannel();
|
||||||
};
|
};
|
||||||
Guild.contextmenu.bindContextmenu(img, guild);
|
Guild.contextmenu.bindContextmenu(img, guild,undefined);
|
||||||
}
|
}
|
||||||
}else{
|
}else{
|
||||||
const div = document.createElement("div");
|
const div = document.createElement("div");
|
||||||
|
@ -399,7 +399,7 @@ class Guild extends SnowFlake{
|
||||||
guild.loadGuild();
|
guild.loadGuild();
|
||||||
guild.loadChannel();
|
guild.loadChannel();
|
||||||
};
|
};
|
||||||
Guild.contextmenu.bindContextmenu(div, guild);
|
Guild.contextmenu.bindContextmenu(div, guild,undefined);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return divy;
|
return divy;
|
||||||
|
|
|
@ -1769,7 +1769,7 @@ class Localuser{
|
||||||
value.delete(thing);
|
value.delete(thing);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
func();
|
func(undefined);
|
||||||
value.delete(thing);
|
value.delete(thing);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -94,7 +94,7 @@ static async resolveMember(
|
||||||
const promise = new Promise<Member | undefined>(async res=>{
|
const promise = new Promise<Member | undefined>(async res=>{
|
||||||
const membjson = await membpromise;
|
const membjson = await membpromise;
|
||||||
if(membjson === undefined){
|
if(membjson === undefined){
|
||||||
return res();
|
return res(undefined);
|
||||||
}else{
|
}else{
|
||||||
const member = new Member(membjson, guild);
|
const member = new Member(membjson, guild);
|
||||||
const map = guild.localuser.presences;
|
const map = guild.localuser.presences;
|
||||||
|
|
|
@ -227,7 +227,7 @@ class Message extends SnowFlake{
|
||||||
}else if(userd instanceof Member){
|
}else if(userd instanceof Member){
|
||||||
return this.mentions.includes(userd.user);
|
return this.mentions.includes(userd.user);
|
||||||
}else{
|
}else{
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
getimages(){
|
getimages(){
|
||||||
|
|
|
@ -140,7 +140,7 @@ class User extends SnowFlake{
|
||||||
});
|
});
|
||||||
this.contextmenu.addbutton(
|
this.contextmenu.addbutton(
|
||||||
"Kick member",
|
"Kick member",
|
||||||
(this: User, member: Member | undefined)=>{
|
function(this: User, member: Member | undefined){
|
||||||
member?.kick();
|
member?.kick();
|
||||||
},
|
},
|
||||||
null,
|
null,
|
||||||
|
@ -158,7 +158,7 @@ class User extends SnowFlake{
|
||||||
);
|
);
|
||||||
this.contextmenu.addbutton(
|
this.contextmenu.addbutton(
|
||||||
"Ban member",
|
"Ban member",
|
||||||
(this: User, member: Member | undefined)=>{
|
function(this: User, member: Member | undefined){
|
||||||
member?.ban();
|
member?.ban();
|
||||||
},
|
},
|
||||||
null,
|
null,
|
||||||
|
|
|
@ -29,7 +29,7 @@
|
||||||
"useDefineForClassFields": true,
|
"useDefineForClassFields": true,
|
||||||
"resolvePackageJsonImports": true,
|
"resolvePackageJsonImports": true,
|
||||||
"skipLibCheck": true,
|
"skipLibCheck": true,
|
||||||
"outDir": "./dist",
|
"outDir": "./dist"
|
||||||
},
|
},
|
||||||
"include": [
|
"include": [
|
||||||
"src/**/*.ts"
|
"src/**/*.ts"
|
||||||
|
@ -37,4 +37,4 @@
|
||||||
"exclude": [
|
"exclude": [
|
||||||
"node_modules"
|
"node_modules"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue