diff --git a/src/webpage/channel.ts b/src/webpage/channel.ts index cd043d4..1ea91cb 100644 --- a/src/webpage/channel.ts +++ b/src/webpage/channel.ts @@ -490,8 +490,6 @@ class Channel extends SnowFlake { return div; } } - // @ts-ignore I dont wanna deal with this - div.all = this; div.draggable = admin; div.addEventListener("dragstart", (e) => { Channel.dragged = [this, div]; @@ -530,8 +528,6 @@ class Channel extends SnowFlake { decdiv.classList.add("channel"); Channel.contextmenu.bindContextmenu(decdiv, this, undefined); - // @ts-ignore I dont wanna deal with this - decdiv.all = this; for (const channel of this.children) { childrendiv.appendChild(channel.createguildHTML(admin)); @@ -567,8 +563,6 @@ class Channel extends SnowFlake { if (admin) { this.coatDropDiv(div); } - // @ts-ignore I dont wanna deal with this - div.all = this; const button = document.createElement("button"); button.classList.add("channelbutton"); div.append(button); diff --git a/src/webpage/localuser.ts b/src/webpage/localuser.ts index 03d4eb9..ddb7b6e 100644 --- a/src/webpage/localuser.ts +++ b/src/webpage/localuser.ts @@ -898,7 +898,6 @@ class Localuser { div.classList.add("home", "servericon"); home.classList.add("svgicon", "svg-home"); - home.all = this.guildids.get("@me"); (this.guildids.get("@me") as Guild).html = outdiv; const unread = document.createElement("div"); unread.classList.add("unread"); @@ -908,9 +907,11 @@ class Localuser { outdiv.classList.add("servernoti"); serverlist.append(outdiv); - home.onclick = function () { - this.all.loadGuild(); - this.all.loadChannel(); + home.onclick = () => { + const guild = this.guildids.get("@me"); + if (!guild) return; + guild.loadGuild(); + guild.loadChannel(); }; const sentdms = document.createElement("div"); sentdms.classList.add("sentdms"); diff --git a/src/webpage/message.ts b/src/webpage/message.ts index 77682c9..9a8a04b 100644 --- a/src/webpage/message.ts +++ b/src/webpage/message.ts @@ -47,7 +47,7 @@ class Message extends SnowFlake { return this.weakdiv?.deref(); } //*/ - div: (HTMLDivElement & {pfpparent?: Message | undefined; txt?: HTMLElement}) | undefined; + div: HTMLDivElement | undefined; member: Member | undefined; reactions!: messagejson["reactions"]; static setup() { @@ -474,14 +474,9 @@ class Message extends SnowFlake { const messageTypes = new Set([0, 19]); if (messageTypes.has(this.type) || this.attachments.length !== 0) { const pfpRow = document.createElement("div"); - let pfpparent, current; + let current = true; if (premessage !== undefined) { - pfpparent ??= premessage; - // @ts-ignore - // TODO: type this - let pfpparent2 = pfpparent.all; - pfpparent2 ??= pfpparent; - const old = new Date(pfpparent2.timestamp).getTime() / 1000; + const old = new Date(premessage.timestamp).getTime() / 1000; const newt = new Date(this.timestamp).getTime() / 1000; current = newt - old > 600; } @@ -494,8 +489,6 @@ class Message extends SnowFlake { const pfp = this.author.buildpfp(); this.author.bind(pfp, this.guild, false); pfpRow.appendChild(pfp); - } else { - div.pfpparent = pfpparent; } pfpRow.classList.add("pfprow"); build.appendChild(pfpRow); @@ -582,7 +575,6 @@ class Message extends SnowFlake { } else { this.content.onUpdate = () => {}; const messaged = this.content.makeHTML(); - (div as any).txt = messaged; messagedwrap.classList.add("flexttb"); messagedwrap.appendChild(messaged); } @@ -609,7 +601,6 @@ class Message extends SnowFlake { const text = document.createElement("div"); build.appendChild(text); const messaged = document.createElement("span"); - div.txt = messaged; messaged.textContent = "welcome: "; text.appendChild(messaged);