rDrama
/
rDrama
9
10
Fork 7
Code Issues Pull Requests Packages Releases Wiki Activity

Can now use usernames as emojis!

pull/206/head
transbitch 2023-09-25 17:49:02 -04:00
parent ed3a2ee77b
commit ee2c3c943a
3 changed files with 76 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
files/assets/css/main.css
View File

@ -4108,7 +4108,7 @@ small, .small {
width: 28px;
height: 28px;
}
.profile-pic-20, .pp20, img[src^="/uid/"], img[src^="/pp/"]:not(img[alt^=":"]) {
.profile-pic-20, .pp20, img[src^="/uid/"], img[src^="/pp/"]:not(img[alt^=":"]):not(.marseyfx-emoji) {
margin-right: 0.25rem !important;
width: 20px;
height: 20px;

35
files/helpers/marseyfx/parser.py
View File

@ -2,6 +2,7 @@ from tokenize import Token
from bs4 import BeautifulSoup
from files.helpers.config.const import SITE_FULL_IMAGES
from files.helpers.get import get_user
from files.helpers.marseyfx.tokenizer import ArgsToken, DotToken, GroupToken, NumberLiteralToken, Tokenizer, WordToken
from files.helpers.marseyfx.modifiers import Modified, Modifier, modifier_whitelist
@ -33,15 +34,31 @@ class Emoji:
def create_el(self, tokenizer: Tokenizer):
soup = BeautifulSoup()
el = soup.new_tag(
'img',
loading='lazy',
src=f'{SITE_FULL_IMAGES}/e/{self.name}.webp',
attrs={
'class': f'marseyfx-emoji marseyfx-image',
}
)
el = None
if (self.is_user):
user = get_user(self.name, graceful=True)
src = None
if user:
src = f'/pp/{user.id}'
el = soup.new_tag(
'img',
loading='lazy',
src=src,
attrs={
'class': f'marseyfx-emoji marseyfx-image marseyfx-user',
}
)
else:
el = soup.new_tag(
'img',
loading='lazy',
src=f'{SITE_FULL_IMAGES}/e/{self.name}.webp',
attrs={
'class': f'marseyfx-emoji marseyfx-image',
}
)
soup.append(el)
el = el.wrap(
soup.new_tag('div', attrs={

71
files/helpers/sanitize.py
View File

@ -515,28 +515,6 @@ def sanitize(sanitized, golden=True, limit_pings=0, showmore=False, count_emojis
v = getattr(g, 'v', None)
names = set(m.group(1) for m in mention_regex.finditer(sanitized))
if limit_pings and len(names) > limit_pings and v.admin_level < PERMS['POST_COMMENT_INFINITE_PINGS']:
error("Max ping limit is 5 for comments and 50 for posts!")
users_list = get_users(names, graceful=True)
users_dict = {}
for u in users_list:
users_dict[u.username.lower()] = u
if u.original_username:
users_dict[u.original_username.lower()] = u
if u.prelock_username:
users_dict[u.prelock_username.lower()] = u
def replacer(m):
u = users_dict.get(m.group(1).lower())
if not u or (v and u.id in v.all_twoway_blocks) or (v and u.has_muted(v)):
return m.group(0)
return f'<a href="/id/{u.id}"><img loading="lazy" src="/pp/{u.id}">@{u.username}</a>'
sanitized = mention_regex.sub(replacer, sanitized)
if FEATURES['PING_GROUPS']:
def group_replacer(m):
name = m.group(1).lower()
@ -616,6 +594,7 @@ def sanitize(sanitized, golden=True, limit_pings=0, showmore=False, count_emojis
#doing this here cuz of the linkifyfilter right above it (therefore unifying all link processing logic) <-- i have no clue what this means lol
soup = BeautifulSoup(sanitized, 'lxml')
# -- EMOJI RENDERING --
emojis_used = set()
for text_el in soup.find_all(text=True):
@ -630,6 +609,54 @@ def sanitize(sanitized, golden=True, limit_pings=0, showmore=False, count_emojis
emoji.count += 1
g.db.add(emoji)
# -- @ MENTIONS --
ping_count = 0
names = set(m.group(1) for m in mention_regex.finditer(sanitized))
users_list = get_users(names, graceful=True)
users_dict = {}
for u in users_list:
users_dict[u.username.lower()] = u
if u.original_username:
users_dict[u.original_username.lower()] = u
if u.prelock_username:
users_dict[u.prelock_username.lower()] = u
for text_el in soup.find_all(text=True):
start = 0
tags = []
for match in mention_regex.finditer(text_el):
tags.append(text_el[start:match.start()])
start = match.end()
name = match.group(1).lower()
u = users_dict.get(name)
if not u or (v and u.id in v.all_twoway_blocks) or (v and u.has_muted(v)):
tags.append(match.group(0))
continue
else:
link = soup.new_tag("a", href=f"/id/{u.id}")
img = soup.new_tag("img", loading="lazy", src=f"/pp/{u.id}")
link.extend([img, f'@{u.username}'])
tags.append(link)
ping_count += 1
if limit_pings and ping_count >= limit_pings:
if limit_pings and len(names) > limit_pings and v.admin_level < PERMS['POST_COMMENT_INFINITE_PINGS']:
error("Max ping limit is 5 for comments and 50 for posts!")
def replacer(m):
u = users_dict.get(m.group(1).lower())
if not u or (v and u.id in v.all_twoway_blocks) or (v and u.has_muted(v)):
return m.group(0)
#return f'<a href="/id/{u.id}"><img loading="lazy" src="/pp/{u.id}">@{u.username}</a>'
if not text_el.parent or text_el.parent.name in {'code', 'pre', 'a'}:
continue
text_el.replace_with(*tags, text_el[start:])
sanitized = mention_regex.sub(replacer, sanitized)
# -- LINKS --
links = soup.find_all("a")
if g.v and g.v.admin_level >= PERMS["IGNORE_DOMAIN_BAN"]: