carpathianflorist
/
MarseyWorld
forked from MarseyWorld/MarseyWorld
1
0
Fork 0
Code Pull Requests Activity

emote -> emoji

master
Aevann 2023-10-06 21:56:56 +03:00
parent b36d961278
commit d1108f1fad
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
files/assets/js/markdown.js
View File

@ -76,7 +76,7 @@ const MODIFIERS = {
LOVE: 8,
};
const findAllEmoteEndings = (word) => {
const findAllEmojiEndings = (word) => {
let hasReachedNonModifer = false;
let currWord = word;
const currEndings = [];
@ -176,7 +176,7 @@ function markdown(t) {
modifiers.add(MODIFIERS.LARGE);
}
let endingModifiers;
[endingModifiers, emoji] = findAllEmoteEndings(emoji);
[endingModifiers, emoji] = findAllEmojiEndings(emoji);
const isTalkingFirst = endingModifiers.indexOf(MODIFIERS.PAT) > endingModifiers.indexOf(MODIFIERS.TALKING);
endingModifiers.forEach(modifiers.add, modifiers)
@ -199,7 +199,7 @@ function markdown(t) {
const emojiClass = modifiers.has(MODIFIERS.LARGE) ? 'emoji-lg' : 'emoji';
const patClass = modifiers.has(MODIFIERS.PAT) ? 'pat-preview' : '';
// patted emotes cannot be flipped back easily so they don't support double flipping
// patted emojis cannot be flipped back easily so they don't support double flipping
const spanClass = modifiers.has(MODIFIERS.REVERSED) && (modifiers.has(MODIFIERS.PAT) || !modifiers.has(MODIFIERS.REVERSED_MODIFIER)) ? mirroredClass : '';
const imgClass = modifiers.has(MODIFIERS.REVERSED) && modifiers.has(MODIFIERS.REVERSED_MODIFIER) ? mirroredClass : ''
const lovedClass = modifiers.has(MODIFIERS.LOVE) ? 'love-preview' : '';

4
files/helpers/sanitize.py
View File

@ -218,7 +218,7 @@ def execute_blackjack(v, target, body, kind):
send_repeatable_notification_duplicated(id, f"Blackjack by @{v.username}: {extra_info}")
return True
def find_all_emote_endings(emoji):
def find_all_emoji_endings(emoji):
endings = []
if path.isfile(f'files/assets/images/emojis/{emoji}.webp'):
@ -295,7 +295,7 @@ def render_emoji(html, regexp, golden, emojis_used, b=False, is_title=False):
emoji_partial = '<img alt=":{0}:" data-bs-toggle="tooltip" loading="lazy" src="{1}" title=":{0}:"{2}>'
emoji_html = None
ending_modifiers, emoji = find_all_emote_endings(emoji)
ending_modifiers, emoji = find_all_emoji_endings(emoji)
is_talking = 'talking' in ending_modifiers
is_patted = 'pat' in ending_modifiers