Git-Mirrors/LXMF
1
0
Fork 0
mirror of https://github.com/markqvist/LXMF.git synced 2025-11-21 16:01:02 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleanup

Browse source
This commit is contained in:
Mark Qvist 2025-10-30 13:14:59 +01:00
parent e17263d25a
commit 6cf7852271
1 changed files with 13 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

40
LXMF/LXMF.py
View file

@ -99,21 +99,17 @@ RENDERER_BBCODE = 0x03
import RNS import RNS
import RNS.vendor.umsgpack as msgpack import RNS.vendor.umsgpack as msgpack
def display_name_from_app_data(app_data=None): def display_name_from_app_data(app_data=None):
if app_data == None: if app_data == None: return None
return None elif len(app_data) == 0: return None
elif len(app_data) == 0:
return None
else: else:
# Version 0.5.0+ announce format # Version 0.5.0+ announce format
if (app_data[0] >= 0x90 and app_data[0] <= 0x9f) or app_data[0] == 0xdc: if (app_data[0] >= 0x90 and app_data[0] <= 0x9f) or app_data[0] == 0xdc:
peer_data = msgpack.unpackb(app_data) peer_data = msgpack.unpackb(app_data)
if type(peer_data) == list: if type(peer_data) == list:
if len(peer_data) < 1: if len(peer_data) < 1: return None
return None
else: else:
dn = peer_data[0] dn = peer_data[0]
if dn == None: if dn == None: return None
return None
else: else:
try: try:
decoded = dn.decode("utf-8") decoded = dn.decode("utf-8")
@ -127,36 +123,26 @@ def display_name_from_app_data(app_data=None):
return app_data.decode("utf-8") return app_data.decode("utf-8")
def stamp_cost_from_app_data(app_data=None): def stamp_cost_from_app_data(app_data=None):
if app_data == None or app_data == b"": if app_data == None or app_data == b"": return None
return None
else: else:
# Version 0.5.0+ announce format # Version 0.5.0+ announce format
if (app_data[0] >= 0x90 and app_data[0] <= 0x9f) or app_data[0] == 0xdc: if (app_data[0] >= 0x90 and app_data[0] <= 0x9f) or app_data[0] == 0xdc:
peer_data = msgpack.unpackb(app_data) peer_data = msgpack.unpackb(app_data)
if type(peer_data) == list: if type(peer_data) == list:
if len(peer_data) < 2: if len(peer_data) < 2: return None
return None else: return peer_data[1]
else:
return peer_data[1]
# Original announce format # Original announce format
else: else: return None
return None
def pn_announce_data_is_valid(data): def pn_announce_data_is_valid(data):
try: try:
if type(data) == bytes: if type(data) == bytes: data = msgpack.unpackb(data)
data = msgpack.unpackb(data) if len(data) < 3: raise ValueError("Invalid announce data: Insufficient peer data")
if len(data) < 3:
raise ValueError("Invalid announce data: Insufficient peer data")
else: else:
if data[0] != True and data[0] != False: if data[0] != True and data[0] != False: raise ValueError("Invalid announce data: Indeterminate propagation node status")
raise ValueError("Invalid announce data: Indeterminate propagation node status") try: int(data[1])
try: except: raise ValueError("Invalid announce data: Could not decode peer timebase")
int(data[1])
except:
raise ValueError("Invalid announce data: Could not decode peer timebase")
except Exception as e: except Exception as e:
RNS.log(f"Could not validate propagation node announce data: {e}", RNS.LOG_DEBUG) RNS.log(f"Could not validate propagation node announce data: {e}", RNS.LOG_DEBUG)