forked from rDrama/rDrama
Fix stuff (#223)
Fix the reversed genocide modifier. Fix the reversed genocide modifier. Co-authored-by: Chuck <dude@bussy.com> Reviewed-on: rDrama/rDrama#223 Co-authored-by: top <top@noreply.fsdfsd.net> Co-committed-by: top <top@noreply.fsdfsd.net>master
parent
c4bde854ec
commit
48b60fd813
|
@ -136,6 +136,7 @@ document.addEventListener("click", function(e) {
|
||||||
pop_instance = bootstrap.Popover.getOrCreateInstance(active, {
|
pop_instance = bootstrap.Popover.getOrCreateInstance(active, {
|
||||||
content: popover.innerHTML,
|
content: popover.innerHTML,
|
||||||
html: true,
|
html: true,
|
||||||
|
sanitize: false, // already done on the back end, fixes complex emotes
|
||||||
});
|
});
|
||||||
pop_instance.show()
|
pop_instance.show()
|
||||||
is_popover_visible = true
|
is_popover_visible = true
|
||||||
|
|
|
@ -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 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 url = modifiers.has(MODIFIERS.USER) ? `/@${emoji}/pic` : `${SITE_FULL_IMAGES}/e/${emoji}.webp`;
|
||||||
const modifierHtml = isTalkingFirst ? `${talkingHtml}${patHtml}${loveHtml}${typingHtml}` : `${patHtml}${talkingHtml}${loveHtml}${typingHtml}`;
|
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 {
|
} else {
|
||||||
input = input.replace(old, `<img loading="lazy" class="${emojiClass} ${modifiers.has(MODIFIERS.REVERSED) ? mirroredClass : ''}" src="${SITE_FULL_IMAGES}/e/${emoji}.webp">`);
|
input = input.replace(old, `<img loading="lazy" class="${emojiClass} ${modifiers.has(MODIFIERS.REVERSED) ? mirroredClass : ''}" src="${SITE_FULL_IMAGES}/e/${emoji}.webp">`);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1046,7 +1046,6 @@ class User(Base):
|
||||||
'id': self.id
|
'id': self.id
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
return {'username': self.username,
|
return {'username': self.username,
|
||||||
'original_username': self.original_username,
|
'original_username': self.original_username,
|
||||||
'url': self.url,
|
'url': self.url,
|
||||||
|
|
Loading…
Reference in New Issue