indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

Support for chat FEP

merge-requests/30/head
Bob Mottram 2023-07-09 11:41:51 +01:00
parent 3327960baf
commit a6aa49b540
2 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
utils.py
View File

@ -4065,6 +4065,9 @@ def get_attachment_property_value(property_value: {}) -> (str, str):
elif property_value.get('https://schema.org#value'): elif property_value.get('https://schema.org#value'):
prop_value_name = 'https://schema.org#value' prop_value_name = 'https://schema.org#value'
prop_value = property_value[prop_value_name] prop_value = property_value[prop_value_name]
elif property_value.get('href'):
prop_value_name = 'href'
prop_value = property_value[prop_value_name]
return prop_value_name, prop_value return prop_value_name, prop_value

36
xmpp.py
View File

@ -25,7 +25,8 @@ def get_xmpp_address(actor_json: {}) -> str:
if not name_value: if not name_value:
continue continue
if not (name_value.startswith('xmpp') or if not (name_value.startswith('xmpp') or
name_value.startswith('jabber')): name_value.startswith('jabber') or
name_value == 'chat'):
continue continue
if not property_value.get('type'): if not property_value.get('type'):
continue continue
@ -33,12 +34,16 @@ def get_xmpp_address(actor_json: {}) -> str:
get_attachment_property_value(property_value) get_attachment_property_value(property_value)
if not prop_value_name: if not prop_value_name:
continue continue
if not property_value['type'].endswith('PropertyValue'): if not property_value['type'].endswith('PropertyValue') and \
not property_value['type'] == 'Link':
continue continue
if '@' not in property_value[prop_value_name]: if '@' not in property_value[prop_value_name]:
continue continue
if '"' in property_value[prop_value_name]: if '"' in property_value[prop_value_name]:
continue continue
if property_value[prop_value_name].startswith('xmpp://'):
property_value[prop_value_name] = \
property_value[prop_value_name].split('xmpp://', 1)[1]
return property_value[prop_value_name] return property_value[prop_value_name]
return '' return ''
@ -72,8 +77,16 @@ def set_xmpp_address(actor_json: {}, xmpp_address: str) -> None:
if not property_value.get('type'): if not property_value.get('type'):
continue continue
if not (name_value.lower().startswith('xmpp') or if not (name_value.lower().startswith('xmpp') or
name_value.lower().startswith('jabber')): name_value.lower().startswith('jabber') or
name_value == 'chat'):
continue continue
if name_value == 'chat':
if not property_value.get('href'):
continue
if not isinstance(property_value['href'], str):
continue
if not property_value['href'].startswith('xmpp://'):
continue
property_found = property_value property_found = property_value
break break
if property_found: if property_found:
@ -93,9 +106,11 @@ def set_xmpp_address(actor_json: {}, xmpp_address: str) -> None:
continue continue
name_value = name_value.lower() name_value = name_value.lower()
if not (name_value.startswith('xmpp') or if not (name_value.startswith('xmpp') or
name_value.startswith('jabber')): name_value.startswith('jabber') or
name_value == 'chat'):
continue continue
if not property_value['type'].endswith('PropertyValue'): if not property_value['type'].endswith('PropertyValue') and \
not property_value['type'] == 'Link':
continue continue
prop_value_name, _ = \ prop_value_name, _ = \
get_attachment_property_value(property_value) get_attachment_property_value(property_value)
@ -104,9 +119,14 @@ def set_xmpp_address(actor_json: {}, xmpp_address: str) -> None:
property_value[prop_value_name] = xmpp_address property_value[prop_value_name] = xmpp_address
return return
if not xmpp_address.startswith('xmpp://'):
xmpp_address = 'xmpp://' + xmpp_address
# https://codeberg.org/fediverse/fep/src/branch/main/fep/1970/fep-1970.md
new_xmpp_address = { new_xmpp_address = {
"name": "XMPP", "type": "Link",
"type": "PropertyValue", "name": "Chat",
"value": xmpp_address "rel": "discussion",
"href": xmpp_address
} }
actor_json['attachment'].append(new_xmpp_address) actor_json['attachment'].append(new_xmpp_address)