diff --git a/lxmf.py b/lxmf.py index f9223dd00..01e3be0e8 100644 --- a/lxmf.py +++ b/lxmf.py @@ -13,6 +13,7 @@ import pyqrcode from utils import get_attachment_property_value from utils import acct_dir from utils import load_json +from utils import string_contains VALID_LXMF_CHARS = set('0123456789abcdefghijklmnopqrstuvwxyz') @@ -75,7 +76,9 @@ def get_lxmf_address(actor_json: {}) -> str: name_value = property_value['schema:name'] if not name_value: continue - if not name_value.lower().startswith('lxmf'): + name_value_lower = name_value.lower() + if not string_contains(name_value_lower, + ('lxmf', 'reticulum', 'nomadnet')): continue if not property_value.get('type'): continue diff --git a/webapp_profile.py b/webapp_profile.py index 0d467e9c4..217bfa2e1 100644 --- a/webapp_profile.py +++ b/webapp_profile.py @@ -384,6 +384,7 @@ def html_profile_after_search(authorized: bool, pixelfed = get_pixelfed(profile_json) donate_url = get_donation_url(profile_json) blog_url = get_blog_address(profile_json) + lxmf_address = get_lxmf_address(profile_json) moved_to = '' if profile_json.get('movedTo') or profile_json.get('copiedTo'): @@ -523,6 +524,7 @@ def html_profile_after_search(authorized: bool, joined_date, actor_proxied, attached_shared_items, website_url, blog_url, + lxmf_address, repo_url, send_blocks_str, authorized, person_url, no_of_books, @@ -930,6 +932,7 @@ def _get_profile_header_after_search(base_dir: str, attached_shared_items: str, website_url: str, blog_url: str, + lxmf_address: str, repo_url: str, send_blocks_str: str, authorized: bool, @@ -1061,6 +1064,9 @@ def _get_profile_header_after_search(base_dir: str, blog_str = translate['Blog'] html_str += '

' + blog_str + ': ' + \ blog_url + '

\n' + if lxmf_address: + html_str += \ + '

LXMF: ' + lxmf_address + '

\n' if youtube: html_str += '

YouTube: ' + \ youtube + '

\n'