Fixing emojis

merge-requests/30/head
Bob Mottram 2025-01-17 19:28:38 +00:00
parent 54a5507b1c
commit c341f87816
3 changed files with 40 additions and 5 deletions

View File

@ -476,7 +476,7 @@ def replace_emoji_from_tags(session, base_dir: str,
icon_name = tag_url.split('/')[-1]
if len(icon_name) <= 1:
continue
if not (icon_name[0].isdigit() and '.' in icon_name):
if '.' not in icon_name:
continue
icon_name = icon_name.split('.')[0]
# see https://unicode.org/

View File

@ -227,6 +227,7 @@ from reading import get_reading_status
from reading import store_book_events
from conversation import conversation_tag_to_convthread_id
from conversation import convthread_id_to_conversation_tag
from webapp_utils import add_emoji_to_display_name
TEST_SERVER_GROUP_RUNNING = False
@ -4103,6 +4104,44 @@ def _test_addemoji(base_dir: str):
print('content_modified: ' + content_modified)
assert content_modified == expected_content
profile_description = \
"<p>Software engineer developing federated and decentralized " + \
"systems for a more habitable, resillient and human-scale " + \
"internet, respecting people and the planet. Founder of the " + \
"<a href=\"https://epicyon.libreserver.org/tags/LibreServer\" " \
"class=\"mention hashtag\" rel=\"tag\" tabindex=\"10\">" + \
"<span aria-hidden=\"true\">#</span><span>LibreServer</span>" + \
"</a> and <a href=\"https://epicyon.libreserver.org/" + \
"tags/Epicyon\" class=\"mention hashtag\" rel=\"tag\" " + \
"tabindex=\"10\"><span aria-hidden=\"true\">#</span><span>" + \
"Epicyon</span></a> projects. Anarcho-gardener. " + \
":cupofcoffee: <a href=\"https://epicyon.libreserver.org" + \
"/tags/fedi22\" class=\"mention hashtag\" rel=\"tag\" " + \
"tabindex=\"10\"><span aria-hidden=\"true\">#</span><span>" + \
"fedi22</span></a> <a href=\"https://epicyon.libreserver.org" + \
"/tags/debian\" class=\"mention hashtag\" rel=\"tag\" " + \
"tabindex=\"10\"><span aria-hidden=\"true\">#</span>" + \
"<span>debian</span></a> <a href=\"https://epicyon." + \
"libreserver.org/tags/python\" class=\"mention hashtag\" " + \
"rel=\"tag\" tabindex=\"10\"><span aria-hidden=\"true\">#" + \
"</span><span>python</span></a> <a href=\"https://epicyon." + \
"libreserver.org/tags/selfhosting\" class=\"mention hashtag\" " + \
"rel=\"tag\" tabindex=\"10\"><span aria-hidden=\"true\">#" + \
"</span><span>selfhosting</span></a> <a href=\"https://epicyon" + \
".libreserver.org/tags/smalltech\" class=\"mention hashtag\" " + \
"rel=\"tag\" tabindex=\"10\"><span aria-hidden=\"true\">#" + \
"</span><span>smalltech</span></a> <a href=\"https://epicyon." + \
"libreserver.org/tags/nobridge\" class=\"mention hashtag\" " + \
"rel=\"tag\" tabindex=\"10\"><span aria-hidden=\"true\">#" + \
"</span><span>nobridge</span></a></p>"
session = None
profile_description2 = \
add_emoji_to_display_name(session, base_dir, http_prefix,
nickname, domain,
profile_description, False, translate)
assert ':cupofcoffee:' in profile_description
assert ':cupofcoffee:' not in profile_description2
os.chdir(base_dir_original)
shutil.rmtree(base_dir_original + '/.tests',
ignore_errors=False)

View File

@ -1095,18 +1095,14 @@ def html_profile(signing_priv_key_pem: str,
profile_description = profile_json['summary']
else:
profile_description = remove_html(profile_json['summary'])
print('TEST profile description 1: ' + profile_description)
profile_description = \
remove_link_trackers_from_content(profile_description)
print('TEST profile description 2: ' + profile_description)
profile_description = \
add_emoji_to_display_name(session, base_dir, http_prefix,
nickname, domain,
profile_description, False, translate)
print('TEST profile description 3: ' + profile_description)
if profile_description:
profile_description = standardize_text(profile_description)
print('TEST profile description 4: ' + profile_description)
featured_hashtags = \
get_featured_hashtags_as_html(profile_json, profile_description)
posts_button = 'button'