dandri/Fermi
1
0
Fork 0
mirror of https://github.com/MathMan05/Fermi.git synced 2026-08-29 09:58:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

more bug fixing

Browse Source
This commit is contained in:
MathMan05
2026-01-27 13:54:17 -06:00
parent 05c0a09005
commit 358ce693c5
2 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/webpage/channel.ts
+13 -12
View File
@@ -1260,7 +1260,7 @@ class Channel extends SnowFlake {
}
await Promise.all(waits);
}
async focus(id: string) {
async focus(id: string, flash = true) {
const prom = this.getMessages(id);
if (await Promise.race([prom, new Promise((res) => setTimeout(() => res(true), 300))])) {
@@ -1278,7 +1278,7 @@ class Channel extends SnowFlake {
try {
await this.infinite.focus(id);
} catch {}
this.infinite.focus(id, true, true);
this.infinite.focus(id, flash, true);
}
editLast() {
let message: Message | undefined = this.lastmessage;
@@ -2849,8 +2849,7 @@ class Channel extends SnowFlake {
}
}
async goToBottom() {
if (this.localuser.channelfocus !== this) await this.tryfocusinfinate();
if (this.lastmessageid) this.infinite.focus(this.lastmessageid, false, true);
if (this.lastmessageid) this.focus(this.lastmessageid, false);
}
async messageCreate(messagep: messageCreateJson): Promise<void> {
if (!this.hasPermission("VIEW_CHANNEL")) {
@@ -2887,6 +2886,15 @@ class Channel extends SnowFlake {
}
this.setLastMessageId(messagez.id);
this.unreads();
this.guild.unreads();
if (this === this.localuser.channelfocus) {
if (!this.infinitefocus) {
await this.tryfocusinfinate();
}
await this.infinite.addedBottom();
}
if (messagez.author === this.localuser.user) {
const next = this.messages.get(this.idToNext.get(this.lastreadmessageid as string) as string);
this.lastSentMessage = messagez;
@@ -2902,14 +2910,7 @@ class Channel extends SnowFlake {
await this.goToBottom();
}
}
this.unreads();
this.guild.unreads();
if (this === this.localuser.channelfocus) {
if (!this.infinitefocus) {
await this.tryfocusinfinate();
}
await this.infinite.addedBottom();
}
if (messagez.author === this.localuser.user) {
return;
}
src/webpage/infiniteScroller.ts
+3 -3
View File
@@ -186,8 +186,8 @@ class InfiniteScroller {
}
async deleteId(id: string) {
const prev = this.backElm.get(id) || this.backElm.has(id) ? null : undefined;
const next = this.forElm.get(id) || this.forElm.has(id) ? null : undefined;
const prev = this.backElm.get(id) || (this.backElm.has(id) ? null : undefined);
const next = this.forElm.get(id) || (this.forElm.has(id) ? null : undefined);
await this.removeElm(id);
if (prev && next !== null) this.forElm.set(prev, next);
if (next && prev !== null) this.backElm.set(next, prev);
@@ -324,7 +324,7 @@ class InfiniteScroller {
break;
}
if (this.backElm.has(bottom) && this.curElms.has(bottom)) {
if (limit === 75) throw new Error("patchy?");
if (limit === 75) console.error("patchy?");
bottom = this.backElm.get(bottom);
} else if (count > limit) {
break;