Remove lxmf prefix

main
bashrc 2026-02-28 17:23:55 +00:00
parent c048ca1057
commit 730893a112
1 changed files with 17 additions and 5 deletions

22
lxmf.py
View File

@ -9,7 +9,6 @@ __module_group__ = "Profile Metadata"
from utils import get_attachment_property_value from utils import get_attachment_property_value
from utils import remove_html
VALID_LXMF_CHARS = set('0123456789abcdefghijklmnopqrstuvwxyz') VALID_LXMF_CHARS = set('0123456789abcdefghijklmnopqrstuvwxyz')
@ -54,11 +53,17 @@ def get_lxmf_address(actor_json: {}) -> str:
continue continue
if not property_value['type'].endswith('PropertyValue'): if not property_value['type'].endswith('PropertyValue'):
continue continue
property_value[prop_value_name] = \ lxmf_address = property_value[prop_value_name].strip()
property_value[prop_value_name].strip()
if not _is_valid_lxmf_address(property_value[prop_value_name]): # remove any prefix
if lxmf_address.startswith('lxmf://'):
lxmf_address = lxmf_address.replace('lxmf://', '')
elif lxmf_address.startswith('lxmf:'):
lxmf_address = lxmf_address.replace('lxmf:', '')
if not _is_valid_lxmf_address(lxmf_address):
continue continue
return property_value[prop_value_name] return lxmf_address
return '' return ''
@ -66,6 +71,13 @@ def set_lxmf_address(actor_json: {}, lxmf_address: str) -> None:
"""Sets an lxmf address for the given actor """Sets an lxmf address for the given actor
""" """
lxmf_address = lxmf_address.strip() lxmf_address = lxmf_address.strip()
# remove any prefix
if lxmf_address.startswith('lxmf://'):
lxmf_address = lxmf_address.replace('lxmf://', '')
elif lxmf_address.startswith('lxmf:'):
lxmf_address = lxmf_address.replace('lxmf:', '')
is_lxmfaddress = _is_valid_lxmf_address(lxmf_address) is_lxmfaddress = _is_valid_lxmf_address(lxmf_address)
if not actor_json.get('attachment'): if not actor_json.get('attachment'):