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

remove more uses of the deprictated function

Browse source
This commit is contained in:
MathMan05 2024-08-26 14:16:01 -05:00
parent 00946b500a
commit 3894fcb976
8 changed files with 156 additions and 145 deletions
Download patch file Download diff file Expand all files Collapse all files

36
webpage/message.ts
View file

@ -60,7 +60,7 @@ class Message{
Message.contextmenu.addbutton("Copy message id",function(this:Message){
navigator.clipboard.writeText(this.id);
});
Message.contextmenu.addsubmenu("Add reaction",function(this:Message,e:{x:number,y:number}){
Message.contextmenu.addsubmenu("Add reaction",function(this:Message,arg,e:MouseEvent){
Emoji.emojiPicker(e.x,e.y,this.localuser).then(_=>{
this.reactionToggle(_);
});
@ -224,25 +224,28 @@ class Message{
this.div.innerHTML="";
this.div=undefined;
}
const prev=this.channel.idToPrev.get(this.snowflake) as SnowFlake<Message> | null;
const next=this.channel.idToNext.get(this.snowflake) as SnowFlake<Message> | null;
const prev=this.channel.idToPrev.get(this.id);
const next=this.channel.idToNext.get(this.id);
if(prev){
this.channel.idToPrev.delete(this.snowflake)
this.channel.idToPrev.delete(this.id)
}
if(next){
this.channel.idToNext.delete(this.snowflake)
this.channel.idToNext.delete(this.id)
}
if(prev&&next){
this.channel.idToPrev.set(next,prev);
this.channel.idToNext.set(prev,next);
}
this.channel.messageids.delete(this.snowflake);
if(prev&&prev.getObject()){
prev.getObject().generateMessage();
if(prev){
const prevmessage=this.channel.messages.get(prev);
if(prevmessage){
prevmessage.generateMessage();
}
}
if(this.channel.lastmessage===this){
if(prev){
this.channel.lastmessage=prev.getObject();
this.channel.lastmessage=this.channel.messages.get(prev);
}else{
this.channel.lastmessage=undefined;
}
@ -250,7 +253,12 @@ class Message{
}
reactdiv:WeakRef<HTMLDivElement>;
blockedPropigate(){
const premessage=this.channel.idToPrev.get(this.snowflake)?.getObject();
const previd=this.channel.idToPrev.get(this.id);
if(!previd){
this.generateMessage();
return;
}
const premessage=this.channel.messages.get(previd);
if(premessage?.author===this.author){
premessage.blockedPropigate();
}else{
@ -260,7 +268,7 @@ class Message{
generateMessage(premessage:Message|undefined=undefined,ignoredblock=false){
if(!this.div) return;
if(!premessage){
premessage=this.channel.idToPrev.get(this.snowflake)?.getObject();
premessage=this.channel.messages.get(this.channel.idToPrev.get(this.id) as string);
}
const div=this.div;
if(this===this.channel.replyingto){
@ -283,7 +291,7 @@ class Message{
let next:Message|undefined=this;
while(next?.author===this.author){
next.generateMessage(undefined);
next=this.channel.idToNext.get(next.snowflake)?.getObject();
next=this.channel.messages.get(this.channel.idToNext.get(next.id) as string);
}
if(this.channel.infinite.scroll&&scroll){
this.channel.infinite.scroll.scrollTop=scroll;
@ -301,10 +309,10 @@ class Message{
build.classList.add("blocked","topMessage")
const span=document.createElement("span");
let count=1;
let next=this.channel.idToNext.get(this.snowflake)?.getObject()
let next=this.channel.messages.get(this.channel.idToNext.get(this.id) as string);
while(next?.author===this.author){
count++;
next=this.channel.idToNext.get(next.snowflake)?.getObject()
next=this.channel.messages.get(this.channel.idToNext.get(next.id) as string);
}
span.textContent=`You have this user blocked, click to see the ${count} blocked messages.`;
build.append(span);
@ -314,7 +322,7 @@ class Message{
let next:Message|undefined=this;
while(next?.author===this.author){
next.generateMessage(undefined,true);
next=this.channel.idToNext.get(next.snowflake)?.getObject();
next=this.channel.messages.get(this.channel.idToNext.get(next.id) as string);
console.log("loopy")
}
if(this.channel.infinite.scroll&&scroll){