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

get rid of the cursed "all" property

Browse source
This commit is contained in:
MathMan05 2024-12-23 13:30:45 -06:00
parent 919dfa480d
commit 8ab475061b
3 changed files with 8 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/webpage/channel.ts
View file

@ -490,8 +490,6 @@ class Channel extends SnowFlake {
return div; return div;
} }
} }
// @ts-ignore I dont wanna deal with this
div.all = this;
div.draggable = admin; div.draggable = admin;
div.addEventListener("dragstart", (e) => { div.addEventListener("dragstart", (e) => {
Channel.dragged = [this, div]; Channel.dragged = [this, div];
@ -530,8 +528,6 @@ class Channel extends SnowFlake {
decdiv.classList.add("channel"); decdiv.classList.add("channel");
Channel.contextmenu.bindContextmenu(decdiv, this, undefined); Channel.contextmenu.bindContextmenu(decdiv, this, undefined);
// @ts-ignore I dont wanna deal with this
decdiv.all = this;
for (const channel of this.children) { for (const channel of this.children) {
childrendiv.appendChild(channel.createguildHTML(admin)); childrendiv.appendChild(channel.createguildHTML(admin));
@ -567,8 +563,6 @@ class Channel extends SnowFlake {
if (admin) { if (admin) {
this.coatDropDiv(div); this.coatDropDiv(div);
} }
// @ts-ignore I dont wanna deal with this
div.all = this;
const button = document.createElement("button"); const button = document.createElement("button");
button.classList.add("channelbutton"); button.classList.add("channelbutton");
div.append(button); div.append(button);

9
src/webpage/localuser.ts
View file

@ -898,7 +898,6 @@ class Localuser {
div.classList.add("home", "servericon"); div.classList.add("home", "servericon");
home.classList.add("svgicon", "svg-home"); home.classList.add("svgicon", "svg-home");
home.all = this.guildids.get("@me");
(this.guildids.get("@me") as Guild).html = outdiv; (this.guildids.get("@me") as Guild).html = outdiv;
const unread = document.createElement("div"); const unread = document.createElement("div");
unread.classList.add("unread"); unread.classList.add("unread");
@ -908,9 +907,11 @@ class Localuser {
outdiv.classList.add("servernoti"); outdiv.classList.add("servernoti");
serverlist.append(outdiv); serverlist.append(outdiv);
home.onclick = function () { home.onclick = () => {
this.all.loadGuild(); const guild = this.guildids.get("@me");
this.all.loadChannel(); if (!guild) return;
guild.loadGuild();
guild.loadChannel();
}; };
const sentdms = document.createElement("div"); const sentdms = document.createElement("div");
sentdms.classList.add("sentdms"); sentdms.classList.add("sentdms");

15
src/webpage/message.ts
View file

@ -47,7 +47,7 @@ class Message extends SnowFlake {
return this.weakdiv?.deref(); return this.weakdiv?.deref();
} }
//*/ //*/
div: (HTMLDivElement & {pfpparent?: Message | undefined; txt?: HTMLElement}) | undefined; div: HTMLDivElement | undefined;
member: Member | undefined; member: Member | undefined;
reactions!: messagejson["reactions"]; reactions!: messagejson["reactions"];
static setup() { static setup() {
@ -474,14 +474,9 @@ class Message extends SnowFlake {
const messageTypes = new Set([0, 19]); const messageTypes = new Set([0, 19]);
if (messageTypes.has(this.type) || this.attachments.length !== 0) { if (messageTypes.has(this.type) || this.attachments.length !== 0) {
const pfpRow = document.createElement("div"); const pfpRow = document.createElement("div");
let pfpparent, current; let current = true;
if (premessage !== undefined) { if (premessage !== undefined) {
pfpparent ??= premessage; const old = new Date(premessage.timestamp).getTime() / 1000;
// @ts-ignore
// TODO: type this
let pfpparent2 = pfpparent.all;
pfpparent2 ??= pfpparent;
const old = new Date(pfpparent2.timestamp).getTime() / 1000;
const newt = new Date(this.timestamp).getTime() / 1000; const newt = new Date(this.timestamp).getTime() / 1000;
current = newt - old > 600; current = newt - old > 600;
} }
@ -494,8 +489,6 @@ class Message extends SnowFlake {
const pfp = this.author.buildpfp(); const pfp = this.author.buildpfp();
this.author.bind(pfp, this.guild, false); this.author.bind(pfp, this.guild, false);
pfpRow.appendChild(pfp); pfpRow.appendChild(pfp);
} else {
div.pfpparent = pfpparent;
} }
pfpRow.classList.add("pfprow"); pfpRow.classList.add("pfprow");
build.appendChild(pfpRow); build.appendChild(pfpRow);
@ -582,7 +575,6 @@ class Message extends SnowFlake {
} else { } else {
this.content.onUpdate = () => {}; this.content.onUpdate = () => {};
const messaged = this.content.makeHTML(); const messaged = this.content.makeHTML();
(div as any).txt = messaged;
messagedwrap.classList.add("flexttb"); messagedwrap.classList.add("flexttb");
messagedwrap.appendChild(messaged); messagedwrap.appendChild(messaged);
} }
@ -609,7 +601,6 @@ class Message extends SnowFlake {
const text = document.createElement("div"); const text = document.createElement("div");
build.appendChild(text); build.appendChild(text);
const messaged = document.createElement("span"); const messaged = document.createElement("span");
div.txt = messaged;
messaged.textContent = "welcome: "; messaged.textContent = "welcome: ";
text.appendChild(messaged); text.appendChild(messaged);