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

fix minor message combine bug

Browse source
This commit is contained in:
MathMan05 2024-11-29 16:18:59 -06:00
parent 4509605cc7
commit 38ca7ea280
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/webpage/message.ts
View file

@ -368,9 +368,7 @@ class Message extends SnowFlake{
let next: Message | undefined = this; let next: Message | undefined = this;
while(next?.author === this.author){ while(next?.author === this.author){
next.generateMessage(); next.generateMessage();
next = this.channel.messages.get( next = this.channel.messages.get(this.channel.idToNext.get(next.id) as string);
this.channel.idToNext.get(next.id) as string
);
} }
if(this.channel.infinite.scollDiv && scroll){ if(this.channel.infinite.scollDiv && scroll){
this.channel.infinite.scollDiv.scrollTop = scroll; this.channel.infinite.scollDiv.scrollTop = scroll;
@ -460,10 +458,11 @@ class Message extends SnowFlake{
div.appendChild(replyline); div.appendChild(replyline);
} }
div.appendChild(build); div.appendChild(build);
if({ 0: true, 19: true }[this.type] || this.attachments.length !== 0){ const messageTypes=new Set([0,19])
if(messageTypes.has(this.type) || this.attachments.length !== 0){
const pfpRow = document.createElement("div"); const pfpRow = document.createElement("div");
let pfpparent, current; let pfpparent, current;
if(premessage != null){ if(premessage !== null){
pfpparent ??= premessage; pfpparent ??= premessage;
// @ts-ignore // @ts-ignore
// TODO: type this // TODO: type this
@ -473,7 +472,7 @@ class Message extends SnowFlake{
const newt = new Date(this.timestamp).getTime() / 1000; const newt = new Date(this.timestamp).getTime() / 1000;
current = newt - old > 600; current = newt - old > 600;
} }
const combine = premessage?.author != this.author || current || this.message_reference; const combine = premessage?.author != this.author || current || this.message_reference || !messageTypes.has(premessage.type);
if(combine){ if(combine){
const pfp = this.author.buildpfp(); const pfp = this.author.buildpfp();
this.author.bind(pfp, this.guild, false); this.author.bind(pfp, this.guild, false);