Fix stuff #223

Merged
Aevann merged 3 commits from top/rDrama:top/bug/profile-marsey-love into master 2024-02-19 00:31:36 +00:00
3 changed files with 2 additions and 2 deletions

View File

@ -136,6 +136,7 @@ document.addEventListener("click", function(e) {
pop_instance = bootstrap.Popover.getOrCreateInstance(active, {
content: popover.innerHTML,
html: true,
sanitize: false, // already done on the back end, fixes complex emotes
});
pop_instance.show()
is_popover_visible = true

View File

@ -222,7 +222,7 @@ function markdown(t) {
const loveHtml = modifiers.has(MODIFIERS.LOVE) ? `<img loading="lazy" class="${emojiClass}" src="${SITE_FULL_IMAGES}/i/love-foreground.webp"><img loading="lazy" class="${emojiClass}" src="${SITE_FULL_IMAGES}/i/love-background.webp">` : '';
const url = modifiers.has(MODIFIERS.USER) ? `/@${emoji}/pic` : `${SITE_FULL_IMAGES}/e/${emoji}.webp`;
const modifierHtml = isTalkingFirst ? `${talkingHtml}${patHtml}${loveHtml}${typingHtml}` : `${patHtml}${talkingHtml}${loveHtml}${typingHtml}`;
input = input.replace(old, `<span class="${patClass} ${spanClass} ${genocideClass}" data-bs-toggle="tooltip">${modifierHtml}<img loading="lazy" class="${emojiClass} ${imgClass} ${lovedClass}" src="${url}"></span>`);
input = input.replace(old, `<span class="${patClass} ${spanClass} ${genocideClass}" data-bs-toggle="tooltip">${modifierHtml}<img loading="lazy" class="${emojiClass} ${imgClass} ${lovedClass} ${modifiers.has(MODIFIERS.REVERSED) ? mirroredClass : ''}" src="${url}"></span>`);
} else {
input = input.replace(old, `<img loading="lazy" class="${emojiClass} ${modifiers.has(MODIFIERS.REVERSED) ? mirroredClass : ''}" src="${SITE_FULL_IMAGES}/e/${emoji}.webp">`);
}

View File

@ -1046,7 +1046,6 @@ class User(Base):
'id': self.id
}
return {'username': self.username,
'original_username': self.original_username,
'url': self.url,