From 2d7ea8693e116d5ce79948cd730ab0418f20c2dc Mon Sep 17 00:00:00 2001 From: MathMan05 Date: Wed, 18 Mar 2026 21:55:38 -0500 Subject: [PATCH] better pos the comps --- src/webpage/localuser.ts | 21 ++++++++++++--------- src/webpage/message.ts | 13 ++++++++----- src/webpage/style.css | 5 ++--- 3 files changed, 22 insertions(+), 17 deletions(-) diff --git a/src/webpage/localuser.ts b/src/webpage/localuser.ts index f738827..47892bb 100644 --- a/src/webpage/localuser.ts +++ b/src/webpage/localuser.ts @@ -3452,15 +3452,18 @@ class Localuser { devSettings.addButtonInput("", I18n.devSettings.clearWellKnowns(), async () => { const currentUserInfos = JSON.parse(localStorage.getItem("userinfos")!); - for (const user of Object.keys(currentUserInfos.users)) { - const key = - currentUserInfos.users[user].serverurls.value ?? - currentUserInfos.users[user].serverurls.wellknown ?? - currentUserInfos.users[user].serverurls.api; - currentUserInfos.users[user].serverurls = await getapiurls(key); - console.log(key, currentUserInfos.users[user].serverurls); - localStorage.setItem("userinfos", JSON.stringify(currentUserInfos)); - } + await Promise.all( + Object.keys(currentUserInfos.users).map(async (user) => { + const key = + currentUserInfos.users[user].serverurls.value ?? + currentUserInfos.users[user].serverurls.wellknown ?? + currentUserInfos.users[user].serverurls.api; + currentUserInfos.users[user].serverurls = await getapiurls(key); + console.log(key, currentUserInfos.users[user].serverurls); + localStorage.setItem("userinfos", JSON.stringify(currentUserInfos)); + }), + ); + localStorage.removeItem("instanceinfo"); await SW.postMessage({ code: "clearCdnCache", diff --git a/src/webpage/message.ts b/src/webpage/message.ts index 8f08d21..b3dce75 100644 --- a/src/webpage/message.ts +++ b/src/webpage/message.ts @@ -834,6 +834,9 @@ class Message extends SnowFlake { div.appendChild(replyline); } div.appendChild(build); + const text = document.createElement("div"); + text.classList.add("commentrow", "flexttb"); + const messageTypes = new Set([0, 19, 20]); if (messageTypes.has(this.type) || this.attachments.length !== 0) { const pfpRow = document.createElement("div"); @@ -856,8 +859,7 @@ class Message extends SnowFlake { } pfpRow.classList.add("pfprow"); build.appendChild(pfpRow); - const text = document.createElement("div"); - text.classList.add("commentrow", "flexttb"); + if (combine) { const username = document.createElement("span"); username.classList.add("username", "ellipsis"); @@ -978,7 +980,7 @@ class Message extends SnowFlake { } } text.appendChild(messagedwrap); - build.appendChild(text); + if (this.attachments.length) { const attach = document.createElement("div"); attach.classList.add("flexltr", "attachments"); @@ -1119,6 +1121,7 @@ class Message extends SnowFlake { text.append(time); div.classList.add("topMessage"); } + build.appendChild(text); const stickerArea = document.createElement("div"); stickerArea.classList.add("flexltr", "stickerMArea"); for (const sticker of this.stickers) { @@ -1129,12 +1132,12 @@ class Message extends SnowFlake { if (this.components && this.components.components.length) { const cdiv = this.components.getHTML(); cdiv.classList.add("messageComps"); - div.append(cdiv); + text.append(cdiv); const ndiv = document.createElement("div"); ndiv.classList.add("compAppStatus"); this.interactionDiv = ndiv; - div.append(ndiv); + text.append(ndiv); } const reactions = document.createElement("div"); reactions.classList.add("flexltr", "reactiondiv"); diff --git a/src/webpage/style.css b/src/webpage/style.css index bda1bdd..5e96ff2 100644 --- a/src/webpage/style.css +++ b/src/webpage/style.css @@ -237,8 +237,6 @@ body { } } .messageComps { - padding: 6px; - padding-left: 48px; > .flexltr { display: flex; flex-wrap: wrap; @@ -2049,7 +2047,8 @@ span.instanceStatus { flex-shrink: 0; margin-bottom: 4px; transition: background 0.2s; - &.viewChannel, &.viewChannel:hover { + &.viewChannel, + &.viewChannel:hover { background: var(--channel-selected); color: var(--primary-text-prominent); font-weight: bold;