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

got rid of message tables and fixed pre reply bug

Browse source
This commit is contained in:
MathMan05 2024-07-04 17:28:22 -05:00
parent cd82bd6c26
commit 78fd7f4622
7 changed files with 170 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.dist/localuser.js
View file

@ -425,7 +425,7 @@ class Localuser {
content.textContent = "Loading...";
const full = new Fullscreen(["html", content]);
full.show();
const res = await fetch(this.info.api.toString() + "/v9/discoverable-guilds?limit=16", {
const res = await fetch(this.info.api.toString() + "/v9/discoverable-guilds?limit=50", {
headers: this.headers
});
const json = await res.json();

49
.dist/markdown.js
View file

@ -120,6 +120,11 @@ function markdown(text, { keep = false, stdsize = false } = {}) {
build += txt[j];
}
}
if (stdsize) {
console.log(build);
build = build.replaceAll("\n", "");
console.log(build, JSON.stringify(build));
}
if (find === count) {
appendcurrent();
i = j;
@ -350,6 +355,50 @@ function markdown(text, { keep = false, stdsize = false } = {}) {
continue;
}
}
if (txt[i] === "<" && txt[i + 1] === "t" && txt[i + 2] === ":") {
let found = false;
const build = ["<", "t", ":"];
let j = i + 3;
for (; txt[j] !== void 0; j++) {
build.push(txt[j]);
if (txt[j] === ">") {
found = true;
break;
}
}
if (found) {
appendcurrent();
i = j;
const parts = build.join("").match(/^<t:([0-9]{1,16})(:([tTdDfFR]))?>$/);
const dateInput = new Date(Number.parseInt(parts[1]) * 1000);
let time = "";
if (Number.isNaN(dateInput.getTime()))
time = build.join("");
else {
if (parts[3] === "d")
time = dateInput.toLocaleString(void 0, { day: "2-digit", month: "2-digit", year: "numeric" });
else if (parts[3] === "D")
time = dateInput.toLocaleString(void 0, { day: "numeric", month: "long", year: "numeric" });
else if (!parts[3] || parts[3] === "f")
time = dateInput.toLocaleString(void 0, { day: "numeric", month: "long", year: "numeric" }) + " " +
dateInput.toLocaleString(void 0, { hour: "2-digit", minute: "2-digit" });
else if (parts[3] === "F")
time = dateInput.toLocaleString(void 0, { day: "numeric", month: "long", year: "numeric", weekday: "long" }) + " " +
dateInput.toLocaleString(void 0, { hour: "2-digit", minute: "2-digit" });
else if (parts[3] === "t")
time = dateInput.toLocaleString(void 0, { hour: "2-digit", minute: "2-digit" });
else if (parts[3] === "T")
time = dateInput.toLocaleString(void 0, { hour: "2-digit", minute: "2-digit", second: "2-digit" });
else if (parts[3] === "R")
time = Math.round((Date.now() - (Number.parseInt(parts[1]) * 1000)) / 1000 / 60) + " minutes ago";
}
const timeElem = document.createElement("span");
timeElem.classList.add("markdown-timestamp");
timeElem.textContent = time;
span.appendChild(timeElem);
continue;
}
}
current.textContent += txt[i];
}
appendcurrent();

42
.dist/message.js
View file

@ -153,7 +153,8 @@ class Message {
div.classList.add("replying");
}
div.innerHTML = "";
const build = document.createElement('table');
const build = document.createElement('div');
build.classList.add("flexltr");
if (this.message_reference) {
const replyline = document.createElement("div");
const line = document.createElement("hr");
@ -206,7 +207,8 @@ class Message {
build.classList.add("message");
div.appendChild(build);
if ({ 0: true, 19: true }[this.type] || this.attachments.length !== 0) {
const pfpRow = document.createElement('th');
const pfpRow = document.createElement('div');
pfpRow.classList.add("flexltr");
let pfpparent, current;
if (premessage != null) {
pfpparent ??= premessage;
@ -227,16 +229,19 @@ class Message {
}
pfpRow.classList.add("pfprow");
build.appendChild(pfpRow);
const text = document.createElement("th");
const texttxt = document.createElement("table");
texttxt.classList.add("commentrow");
const text = document.createElement("div");
text.classList.add("flexttb");
const texttxt = document.createElement("div");
texttxt.classList.add("commentrow", "flexttb");
text.appendChild(texttxt);
if (combine) {
const username = document.createElement("span");
username.classList.add("username");
this.author.bind(username, this.guild);
div.classList.add("topMessage");
username.textContent = this.author.username;
const userwrap = document.createElement("tr");
const userwrap = document.createElement("div");
userwrap.classList.add("flexltr");
userwrap.appendChild(username);
if (this.author.bot) {
const username = document.createElement("span");
@ -250,22 +255,28 @@ class Message {
userwrap.appendChild(time);
texttxt.appendChild(userwrap);
}
else {
div.classList.remove("topMessage");
}
const messaged = markdown(this.content);
div["txt"] = messaged;
const messagedwrap = document.createElement("tr");
const messagedwrap = document.createElement("div");
messagedwrap.classList.add("flexttb");
messagedwrap.appendChild(messaged);
texttxt.appendChild(messagedwrap);
build.appendChild(text);
if (this.attachments.length) {
console.log(this.attachments);
const attach = document.createElement("tr");
const attach = document.createElement("div");
attach.classList.add("flexltr");
for (const thing of this.attachments) {
attach.appendChild(thing.getHTML());
}
messagedwrap.appendChild(attach);
}
if (this.embeds.length) {
const embeds = document.createElement("tr");
const embeds = document.createElement("div");
embeds.classList.add("flexltr");
for (const thing of this.embeds) {
embeds.appendChild(thing.generateHTML());
}
@ -274,20 +285,21 @@ class Message {
//
}
else if (this.type === 7) {
const text = document.createElement("th");
const texttxt = document.createElement("table");
const text = document.createElement("div");
text.classList.add("flexttb");
const texttxt = document.createElement("div");
text.appendChild(texttxt);
build.appendChild(text);
texttxt.classList.add("flexltr");
const messaged = document.createElement("p");
div["txt"] = messaged;
messaged.textContent = "welcome: " + this.author.username;
const messagedwrap = document.createElement("tr");
messagedwrap.appendChild(messaged);
texttxt.appendChild(messaged);
const time = document.createElement("span");
time.textContent = " " + formatTime(new Date(this.timestamp));
time.classList.add("timestamp");
messagedwrap.append(time);
texttxt.appendChild(messagedwrap);
texttxt.append(time);
div.classList.add("topMessage");
}
div["all"] = this;
return (div);