Reticulum/LXMF-Tools
1
0
Fork 0
mirror of https://github.com/SebastianObi/LXMF-Tools.git synced 2025-12-23 17:00:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Renamed class

Browse Source
This commit is contained in:
SebastianObi
2024-12-20 07:19:30 +01:00
parent 4a964347f7
commit b8c6c23df6
12 changed files with 347 additions and 457 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
lxmf_bridge_matrix/lxmf_bridge_matrix.py
View File

@@ -92,8 +92,8 @@ CONFIG = None
DATA = {}
ROUTING_TABLE = {}
RNS_CONNECTION = None
LXMF_CONNECTION = None
MATRIX_CONNECTION = None
LXMF_PEER = None
MATRIX_PEER = None
MSG_FIELD_EMBEDDED_LXMS = 0x01
MSG_FIELD_TELEMETRY = 0x02
@@ -156,7 +156,7 @@ MSG_FIELD_VOICE = 0xBF
# LXMF Class
class lxmf_connection:
class LXMFPeer:
message_received_callback = None
message_notification_callback = None
message_notification_success_callback = None
@@ -281,7 +281,7 @@ class lxmf_connection:
self.destination.set_link_established_callback(self.client_connected)
if self.propagation_node_auto:
self.propagation_callback = lxmf_connection_propagation(self, "lxmf.propagation")
self.propagation_callback = LXMFPeerPropagation(self, "lxmf.propagation")
RNS.Transport.register_announce_handler(self.propagation_callback)
if self.propagation_node_active:
self.propagation_node_set(self.propagation_node_active)
@@ -684,7 +684,7 @@ class lxmf_connection:
log("- App Data: " + message.app_data, LOG_DEBUG)
class lxmf_connection_propagation():
class LXMFPeerPropagation():
def __init__(self, owner, aspect_filter=None):
self.owner = owner
self.aspect_filter = aspect_filter
@@ -725,7 +725,7 @@ class lxmf_connection_propagation():
# Matrix Class
class matrix_connection:
class MatrixPeer:
message_received_callback = None
message_send_callback = None
@@ -1019,12 +1019,12 @@ def lxmf_message_received_callback(message):
else:
content = {"msgtype": "m.text", "body": content}
MATRIX_CONNECTION.send(routing_destination, content, hash)
MATRIX_PEER.send(routing_destination, content, hash)
# TODO
#if message.fields and MSG_FIELD_ATTACHMENT in message.fields:
# for attachment in message.fields[MSG_FIELD_ATTACHMENT]:
# MATRIX_CONNECTION.send_file(routing_destination, attachment["name"], attachment["size"], attachment["data"])
# MATRIX_PEER.send_file(routing_destination, attachment["name"], attachment["size"], attachment["data"])
else:
log("LXMF - Source " + RNS.prettyhexrep(message.source_hash) + " not allowed", LOG_DEBUG)
return
@@ -1108,7 +1108,7 @@ def matrix_message_received_callback(room: MatrixRoom, event: RoomMessage):
fields[MSG_FIELD_SRC] = [b"", replace(config_get(CONFIG, "message", "matrix_to_lxmf"), source_address=event.sender, source_name=user_name, destination_address=room.room_id, destination_name=room.display_name, routing_table=routing_table)]
result = LXMF_CONNECTION.send(routing_destination, content, "", fields=fields)
result = LXMF_PEER.send(routing_destination, content, "", fields=fields)
if result:
if MSG_FIELD_ANSWER in fields:
@@ -1541,8 +1541,8 @@ def setup(path=None, path_rns=None, path_log=None, loglevel=None, service=False,
global LOG_FILE
global ROUTING_TABLE
global RNS_CONNECTION
global LXMF_CONNECTION
global MATRIX_CONNECTION
global LXMF_PEER
global MATRIX_PEER
if path is not None:
if path.endswith("/"):
@@ -1617,16 +1617,6 @@ def setup(path=None, path_rns=None, path_log=None, loglevel=None, service=False,
log("LXMF - Connecting ...", LOG_DEBUG)
if CONFIG.has_option("lxmf", "propagation_node"):
config_propagation_node = CONFIG["lxmf"]["propagation_node"]
else:
config_propagation_node = None
if CONFIG.has_option("lxmf", "propagation_node_active"):
config_propagation_node_active = CONFIG["lxmf"]["propagation_node_active"]
else:
config_propagation_node_active = None
if path is None:
path = PATH
@@ -1647,7 +1637,7 @@ def setup(path=None, path_rns=None, path_log=None, loglevel=None, service=False,
except:
pass
LXMF_CONNECTION = lxmf_connection(
LXMF_PEER = LXMFPeer(
storage_path=path,
destination_name=CONFIG["lxmf"]["destination_name"],
destination_type=CONFIG["lxmf"]["destination_type"],
@@ -1656,9 +1646,9 @@ def setup(path=None, path_rns=None, path_log=None, loglevel=None, service=False,
announce_hidden=CONFIG["lxmf"].getboolean("announce_hidden"),
send_delay=CONFIG["lxmf"]["send_delay"],
method=CONFIG["lxmf"]["method"],
propagation_node=config_propagation_node,
propagation_node=CONFIG["lxmf"]["propagation_node"] if CONFIG.has_option("lxmf", "propagation_node") else None,
propagation_node_auto=CONFIG["lxmf"].getboolean("propagation_node_auto"),
propagation_node_active=config_propagation_node_active,
propagation_node_active=CONFIG["lxmf"]["propagation_node_active"] if CONFIG.has_option("lxmf", "propagation_node_active") else None,
stamps_enabled=CONFIG["lxmf"].getboolean("stamps_enabled"),
stamps_required=CONFIG["lxmf"].getboolean("stamps_required"),
stamps_cost=CONFIG["lxmf"]["stamps_cost"],
@@ -1672,26 +1662,26 @@ def setup(path=None, path_rns=None, path_log=None, loglevel=None, service=False,
sync_periodic=CONFIG["lxmf"].getboolean("sync_periodic"),
sync_periodic_interval=CONFIG["lxmf"]["sync_periodic_interval"])
LXMF_CONNECTION.register_announce_callback(lxmf_announce_callback)
LXMF_CONNECTION.register_message_received_callback(lxmf_message_received_callback)
LXMF_CONNECTION.register_config_set_callback(config_set)
LXMF_PEER.register_announce_callback(lxmf_announce_callback)
LXMF_PEER.register_message_received_callback(lxmf_message_received_callback)
LXMF_PEER.register_config_set_callback(config_set)
log("LXMF - Connected", LOG_DEBUG)
log("...............................................................................", LOG_FORCE)
log("LXMF - Address: " + RNS.prettyhexrep(LXMF_CONNECTION.destination_hash()), LOG_FORCE)
log("LXMF - Address: " + RNS.prettyhexrep(LXMF_PEER.destination_hash()), LOG_FORCE)
log("...............................................................................", LOG_FORCE)
log("Matrix - Connecting ...", LOG_DEBUG)
MATRIX_CONNECTION = matrix_connection(
MATRIX_PEER = MatrixPeer(
storage_path=path,
address=CONFIG["matrix"]["address"],
username=CONFIG["matrix"]["username"],
password=CONFIG["matrix"]["password"]
)
MATRIX_CONNECTION.register_message_received_callback(matrix_message_received_callback)
MATRIX_CONNECTION.register_message_send_callback(matrix_message_send_callback)
MATRIX_CONNECTION.loop_forever()
MATRIX_PEER.register_message_received_callback(matrix_message_received_callback)
MATRIX_PEER.register_message_send_callback(matrix_message_send_callback)
MATRIX_PEER.loop_forever()
while True:
time.sleep(1)

42
lxmf_bridge_mqtt/lxmf_bridge_mqtt.py
View File

@@ -86,7 +86,7 @@ PATH_RNS = None
#### Global Variables - System (Not changeable) ####
CONFIG = None
RNS_CONNECTION = None
LXMF_CONNECTION = None
LXMF_PEER = None
MQTT_CONNECTION = None
MSG_FIELD_EMBEDDED_LXMS = 0x01
@@ -150,7 +150,7 @@ MSG_FIELD_VOICE = 0xBF
# LXMF Class
class lxmf_connection:
class LXMFPeer:
message_received_callback = None
message_notification_callback = None
message_notification_success_callback = None
@@ -275,7 +275,7 @@ class lxmf_connection:
self.destination.set_link_established_callback(self.client_connected)
if self.propagation_node_auto:
self.propagation_callback = lxmf_connection_propagation(self, "lxmf.propagation")
self.propagation_callback = LXMFPeerPropagation(self, "lxmf.propagation")
RNS.Transport.register_announce_handler(self.propagation_callback)
if self.propagation_node_active:
self.propagation_node_set(self.propagation_node_active)
@@ -678,7 +678,7 @@ class lxmf_connection:
log("- App Data: " + message.app_data, LOG_DEBUG)
class lxmf_connection_propagation():
class LXMFPeerPropagation():
def __init__(self, owner, aspect_filter=None):
self.owner = owner
self.aspect_filter = aspect_filter
@@ -898,9 +898,9 @@ def mqtt_state_now():
message_out = json.dumps({
"power": power,
"identity": str(LXMF_CONNECTION.identity),
"destination": str(LXMF_CONNECTION.destination),
"hash": RNS.hexrep(LXMF_CONNECTION.destination_hash(), False),
"identity": str(LXMF_PEER.identity),
"destination": str(LXMF_PEER.destination),
"hash": RNS.hexrep(LXMF_PEER.destination_hash(), False),
#"interfaces": interfaces,
"file_info": __file__,
"path_info": PATH,
@@ -1011,7 +1011,7 @@ def mqtt_message_received_callback_send(client, userdata, message):
if message_data["date_time"] != "":
timestamp = time.mktime(datetime.datetime.strptime(message_data["date_time"], '%Y-%m-%d %H:%M:%S').timetuple())
LXMF_CONNECTION.send(message_data["destination"].strip(), content, message_data["title"].strip(), fields, timestamp)
LXMF_PEER.send(message_data["destination"].strip(), content, message_data["title"].strip(), fields, timestamp)
##############################################################################################################
@@ -1337,7 +1337,7 @@ def setup(path=None, path_rns=None, path_log=None, loglevel=None, service=False,
global LOG_LEVEL
global LOG_FILE
global RNS_CONNECTION
global LXMF_CONNECTION
global LXMF_PEER
global MQTT_CONNECTION
if path is not None:
@@ -1395,16 +1395,6 @@ def setup(path=None, path_rns=None, path_log=None, loglevel=None, service=False,
log("LXMF - Connecting ...", LOG_DEBUG)
if CONFIG.has_option("lxmf", "propagation_node"):
config_propagation_node = CONFIG["lxmf"]["propagation_node"]
else:
config_propagation_node = None
if CONFIG.has_option("lxmf", "propagation_node_active"):
config_propagation_node_active = CONFIG["lxmf"]["propagation_node_active"]
else:
config_propagation_node_active = None
if path is None:
path = PATH
@@ -1425,7 +1415,7 @@ def setup(path=None, path_rns=None, path_log=None, loglevel=None, service=False,
except:
pass
LXMF_CONNECTION = lxmf_connection(
LXMF_PEER = LXMFPeer(
storage_path=path,
destination_name=CONFIG["lxmf"]["destination_name"],
destination_type=CONFIG["lxmf"]["destination_type"],
@@ -1434,9 +1424,9 @@ def setup(path=None, path_rns=None, path_log=None, loglevel=None, service=False,
announce_hidden=CONFIG["lxmf"].getboolean("announce_hidden"),
send_delay=CONFIG["lxmf"]["send_delay"],
method=CONFIG["lxmf"]["method"],
propagation_node=config_propagation_node,
propagation_node=CONFIG["lxmf"]["propagation_node"] if CONFIG.has_option("lxmf", "propagation_node") else None,
propagation_node_auto=CONFIG["lxmf"].getboolean("propagation_node_auto"),
propagation_node_active=config_propagation_node_active,
propagation_node_active=CONFIG["lxmf"]["propagation_node_active"] if CONFIG.has_option("lxmf", "propagation_node_active") else None,
stamps_enabled=CONFIG["lxmf"].getboolean("stamps_enabled"),
stamps_required=CONFIG["lxmf"].getboolean("stamps_required"),
stamps_cost=CONFIG["lxmf"]["stamps_cost"],
@@ -1450,14 +1440,14 @@ def setup(path=None, path_rns=None, path_log=None, loglevel=None, service=False,
sync_periodic=CONFIG["lxmf"].getboolean("sync_periodic"),
sync_periodic_interval=CONFIG["lxmf"]["sync_periodic_interval"])
LXMF_CONNECTION.register_announce_callback(lxmf_announce_callback)
LXMF_CONNECTION.register_message_received_callback(lxmf_message_received_callback)
LXMF_CONNECTION.register_config_set_callback(config_set)
LXMF_PEER.register_announce_callback(lxmf_announce_callback)
LXMF_PEER.register_message_received_callback(lxmf_message_received_callback)
LXMF_PEER.register_config_set_callback(config_set)
log("LXMF - Connected", LOG_DEBUG)
log("...............................................................................", LOG_FORCE)
log("LXMF - Address: " + RNS.prettyhexrep(LXMF_CONNECTION.destination_hash()), LOG_FORCE)
log("LXMF - Address: " + RNS.prettyhexrep(LXMF_PEER.destination_hash()), LOG_FORCE)
log("...............................................................................", LOG_FORCE)
log("MQTT - Connecting ...", LOG_DEBUG)

36
lxmf_chatbot/lxmf_chatbot.py
View File

@@ -84,7 +84,7 @@ PATH_RNS = None
#### Global Variables - System (Not changeable) ####
CONFIG = None
RNS_CONNECTION = None
LXMF_CONNECTION = None
LXMF_PEER = None
RIVESCRIPT_CONNECTION = None
MSG_FIELD_EMBEDDED_LXMS = 0x01
@@ -148,7 +148,7 @@ MSG_FIELD_VOICE = 0xBF
# LXMF Class
class lxmf_connection:
class LXMFPeer:
message_received_callback = None
message_notification_callback = None
message_notification_success_callback = None
@@ -273,7 +273,7 @@ class lxmf_connection:
self.destination.set_link_established_callback(self.client_connected)
if self.propagation_node_auto:
self.propagation_callback = lxmf_connection_propagation(self, "lxmf.propagation")
self.propagation_callback = LXMFPeerPropagation(self, "lxmf.propagation")
RNS.Transport.register_announce_handler(self.propagation_callback)
if self.propagation_node_active:
self.propagation_node_set(self.propagation_node_active)
@@ -676,7 +676,7 @@ class lxmf_connection:
log("- App Data: " + message.app_data, LOG_DEBUG)
class lxmf_connection_propagation():
class LXMFPeerPropagation():
def __init__(self, owner, aspect_filter=None):
self.owner = owner
self.aspect_filter = aspect_filter
@@ -832,7 +832,7 @@ def lxmf_message_received_callback(message):
content = content_prefix + content + content_suffix
LXMF_CONNECTION.send(message.source_hash, content, message.title.decode("utf-8").strip())
LXMF_PEER.send(message.source_hash, content, message.title.decode("utf-8").strip())
else:
log("LXMF - Source " + RNS.prettyhexrep(message.source_hash) + " not allowed", LOG_DEBUG)
return
@@ -1163,7 +1163,7 @@ def setup(path=None, path_rns=None, path_log=None, loglevel=None, service=False,
global LOG_LEVEL
global LOG_FILE
global RNS_CONNECTION
global LXMF_CONNECTION
global LXMF_PEER
global RIVESCRIPT_CONNECTION
if path is not None:
@@ -1221,16 +1221,6 @@ def setup(path=None, path_rns=None, path_log=None, loglevel=None, service=False,
log("LXMF - Connecting ...", LOG_DEBUG)
if CONFIG.has_option("lxmf", "propagation_node"):
config_propagation_node = CONFIG["lxmf"]["propagation_node"]
else:
config_propagation_node = None
if CONFIG.has_option("lxmf", "propagation_node_active"):
config_propagation_node_active = CONFIG["lxmf"]["propagation_node_active"]
else:
config_propagation_node_active = None
if path is None:
path = PATH
@@ -1251,7 +1241,7 @@ def setup(path=None, path_rns=None, path_log=None, loglevel=None, service=False,
except:
pass
LXMF_CONNECTION = lxmf_connection(
LXMF_PEER = LXMFPeer(
storage_path=path,
destination_name=CONFIG["lxmf"]["destination_name"],
destination_type=CONFIG["lxmf"]["destination_type"],
@@ -1260,9 +1250,9 @@ def setup(path=None, path_rns=None, path_log=None, loglevel=None, service=False,
announce_hidden=CONFIG["lxmf"].getboolean("announce_hidden"),
send_delay=CONFIG["lxmf"]["send_delay"],
method=CONFIG["lxmf"]["method"],
propagation_node=config_propagation_node,
propagation_node=CONFIG["lxmf"]["propagation_node"] if CONFIG.has_option("lxmf", "propagation_node") else None,
propagation_node_auto=CONFIG["lxmf"].getboolean("propagation_node_auto"),
propagation_node_active=config_propagation_node_active,
propagation_node_active=CONFIG["lxmf"]["propagation_node_active"] if CONFIG.has_option("lxmf", "propagation_node_active") else None,
stamps_enabled=CONFIG["lxmf"].getboolean("stamps_enabled"),
stamps_required=CONFIG["lxmf"].getboolean("stamps_required"),
stamps_cost=CONFIG["lxmf"]["stamps_cost"],
@@ -1276,14 +1266,14 @@ def setup(path=None, path_rns=None, path_log=None, loglevel=None, service=False,
sync_periodic=CONFIG["lxmf"].getboolean("sync_periodic"),
sync_periodic_interval=CONFIG["lxmf"]["sync_periodic_interval"])
LXMF_CONNECTION.register_announce_callback(lxmf_announce_callback)
LXMF_CONNECTION.register_message_received_callback(lxmf_message_received_callback)
LXMF_CONNECTION.register_config_set_callback(config_set)
LXMF_PEER.register_announce_callback(lxmf_announce_callback)
LXMF_PEER.register_message_received_callback(lxmf_message_received_callback)
LXMF_PEER.register_config_set_callback(config_set)
log("LXMF - Connected", LOG_DEBUG)
log("...............................................................................", LOG_FORCE)
log("LXMF - Address: " + RNS.prettyhexrep(LXMF_CONNECTION.destination_hash()), LOG_FORCE)
log("LXMF - Address: " + RNS.prettyhexrep(LXMF_PEER.destination_hash()), LOG_FORCE)
log("...............................................................................", LOG_FORCE)
log("RiveScript - Connecting ...", LOG_DEBUG)

36
lxmf_cmd/lxmf_cmd.py
View File

@@ -83,7 +83,7 @@ PATH_RNS = None
#### Global Variables - System (Not changeable) ####
CONFIG = None
RNS_CONNECTION = None
LXMF_CONNECTION = None
LXMF_PEER = None
MSG_FIELD_EMBEDDED_LXMS = 0x01
MSG_FIELD_TELEMETRY = 0x02
@@ -146,7 +146,7 @@ MSG_FIELD_VOICE = 0xBF
# LXMF Class
class lxmf_connection:
class LXMFPeer:
message_received_callback = None
message_notification_callback = None
message_notification_success_callback = None
@@ -271,7 +271,7 @@ class lxmf_connection:
self.destination.set_link_established_callback(self.client_connected)
if self.propagation_node_auto:
self.propagation_callback = lxmf_connection_propagation(self, "lxmf.propagation")
self.propagation_callback = LXMFPeerPropagation(self, "lxmf.propagation")
RNS.Transport.register_announce_handler(self.propagation_callback)
if self.propagation_node_active:
self.propagation_node_set(self.propagation_node_active)
@@ -674,7 +674,7 @@ class lxmf_connection:
log("- App Data: " + message.app_data, LOG_DEBUG)
class lxmf_connection_propagation():
class LXMFPeerPropagation():
def __init__(self, owner, aspect_filter=None):
self.owner = owner
self.aspect_filter = aspect_filter
@@ -831,7 +831,7 @@ def lxmf_message_received_callback(message):
if search != "":
content = re.sub(search, config_get(CONFIG, "message", "send_regex_replace"), content)
LXMF_CONNECTION.send(message.source_hash, content_prefix + content + content_suffix)
LXMF_PEER.send(message.source_hash, content_prefix + content + content_suffix)
else:
log("LXMF - Source " + RNS.prettyhexrep(message.source_hash) + " not allowed", LOG_DEBUG)
return
@@ -1195,7 +1195,7 @@ def setup(path=None, path_rns=None, path_log=None, loglevel=None, service=False,
global LOG_LEVEL
global LOG_FILE
global RNS_CONNECTION
global LXMF_CONNECTION
global LXMF_PEER
if path is not None:
if path.endswith("/"):
@@ -1252,16 +1252,6 @@ def setup(path=None, path_rns=None, path_log=None, loglevel=None, service=False,
log("LXMF - Connecting ...", LOG_DEBUG)
if CONFIG.has_option("lxmf", "propagation_node"):
config_propagation_node = CONFIG["lxmf"]["propagation_node"]
else:
config_propagation_node = None
if CONFIG.has_option("lxmf", "propagation_node_active"):
config_propagation_node_active = CONFIG["lxmf"]["propagation_node_active"]
else:
config_propagation_node_active = None
if path is None:
path = PATH
@@ -1282,7 +1272,7 @@ def setup(path=None, path_rns=None, path_log=None, loglevel=None, service=False,
except:
pass
LXMF_CONNECTION = lxmf_connection(
LXMF_PEER = LXMFPeer(
storage_path=path,
destination_name=CONFIG["lxmf"]["destination_name"],
destination_type=CONFIG["lxmf"]["destination_type"],
@@ -1291,9 +1281,9 @@ def setup(path=None, path_rns=None, path_log=None, loglevel=None, service=False,
announce_hidden=CONFIG["lxmf"].getboolean("announce_hidden"),
send_delay=CONFIG["lxmf"]["send_delay"],
method=CONFIG["lxmf"]["method"],
propagation_node=config_propagation_node,
propagation_node=CONFIG["lxmf"]["propagation_node"] if CONFIG.has_option("lxmf", "propagation_node") else None,
propagation_node_auto=CONFIG["lxmf"].getboolean("propagation_node_auto"),
propagation_node_active=config_propagation_node_active,
propagation_node_active=CONFIG["lxmf"]["propagation_node_active"] if CONFIG.has_option("lxmf", "propagation_node_active") else None,
stamps_enabled=CONFIG["lxmf"].getboolean("stamps_enabled"),
stamps_required=CONFIG["lxmf"].getboolean("stamps_required"),
stamps_cost=CONFIG["lxmf"]["stamps_cost"],
@@ -1307,14 +1297,14 @@ def setup(path=None, path_rns=None, path_log=None, loglevel=None, service=False,
sync_periodic=CONFIG["lxmf"].getboolean("sync_periodic"),
sync_periodic_interval=CONFIG["lxmf"]["sync_periodic_interval"])
LXMF_CONNECTION.register_announce_callback(lxmf_announce_callback)
LXMF_CONNECTION.register_message_received_callback(lxmf_message_received_callback)
LXMF_CONNECTION.register_config_set_callback(config_set)
LXMF_PEER.register_announce_callback(lxmf_announce_callback)
LXMF_PEER.register_message_received_callback(lxmf_message_received_callback)
LXMF_PEER.register_config_set_callback(config_set)
log("LXMF - Connected", LOG_DEBUG)
log("...............................................................................", LOG_FORCE)
log("LXMF - Address: " + RNS.prettyhexrep(LXMF_CONNECTION.destination_hash()), LOG_FORCE)
log("LXMF - Address: " + RNS.prettyhexrep(LXMF_PEER.destination_hash()), LOG_FORCE)
log("...............................................................................", LOG_FORCE)
while True:

218
lxmf_distribution_group/lxmf_distribution_group.py
View File

@@ -87,7 +87,7 @@ PATH_RNS = None
DATA = None
CONFIG = None
RNS_CONNECTION = None
LXMF_CONNECTION = None
LXMF_PEER = None
CONV_P2P = 0x01
CONV_GROUP = 0x02
@@ -155,7 +155,7 @@ MSG_FIELD_VOICE = 0xBF
# LXMF Class
class lxmf_connection:
class LXMFPeer:
message_received_callback = None
message_notification_callback = None
message_notification_success_callback = None
@@ -280,7 +280,7 @@ class lxmf_connection:
self.destination.set_link_established_callback(self.client_connected)
if self.propagation_node_auto:
self.propagation_callback = lxmf_connection_propagation(self, "lxmf.propagation")
self.propagation_callback = LXMFPeerPropagation(self, "lxmf.propagation")
RNS.Transport.register_announce_handler(self.propagation_callback)
if self.propagation_node_active:
self.propagation_node_set(self.propagation_node_active)
@@ -683,7 +683,7 @@ class lxmf_connection:
log("- App Data: " + message.app_data, LOG_DEBUG)
class lxmf_connection_propagation():
class LXMFPeerPropagation():
def __init__(self, owner, aspect_filter=None):
self.owner = owner
self.aspect_filter = aspect_filter
@@ -807,14 +807,14 @@ class lxmf_announce_callback:
if "receive_join" in config_get(CONFIG, "rights", section).split(","):
for (key, val) in DATA.items(section):
if key != source_hash:
LXMF_CONNECTION.send(key, "", "", fields)
LXMF_PEER.send(key, "", "", fields)
if CONFIG["main"].getboolean("auto_save_data"):
DATA.remove_option("main", "unsaved")
if not data_save(PATH + "/data.cfg"):
DATA["main"]["unsaved"] = "True"
else:
DATA["main"]["unsaved"] = "True"
LXMF_CONNECTION.send(source_hash, DATA["main"]["welcome"].replace("!n!", "\n"), "", fields_generate(members=True, data=True, cmd=source_right, config=source_right, result_key="join", result_value=True))
LXMF_PEER.send(source_hash, DATA["main"]["welcome"].replace("!n!", "\n"), "", fields_generate(members=True, data=True, cmd=source_right, config=source_right, result_key="join", result_value=True))
return
elif source_right == "":
log("LXMF - Source " + RNS.prettyhexrep(message.source_hash) + " not exist (auto add disabled)", LOG_DEBUG)
@@ -933,14 +933,14 @@ def lxmf_message_received_callback(message):
if "receive_join" in config_get(CONFIG, "rights", section).split(","):
for (key, val) in DATA.items(section):
if key != source_hash:
LXMF_CONNECTION.send(key, "", title, fields)
LXMF_PEER.send(key, "", title, fields)
if CONFIG["main"].getboolean("auto_save_data"):
DATA.remove_option("main", "unsaved")
if not data_save(PATH + "/data.cfg"):
DATA["main"]["unsaved"] = "True"
else:
DATA["main"]["unsaved"] = "True"
LXMF_CONNECTION.send(source_hash, DATA["main"]["welcome"].replace("!n!", "\n"), title, fields_generate(members=True, data=True, cmd=source_right, config=source_right, result_key="join", result_value=True))
LXMF_PEER.send(source_hash, DATA["main"]["welcome"].replace("!n!", "\n"), title, fields_generate(members=True, data=True, cmd=source_right, config=source_right, result_key="join", result_value=True))
return
elif source_right == "":
log("LXMF - Source " + RNS.prettyhexrep(message.source_hash) + " not exist (auto add disabled)", LOG_DEBUG)
@@ -975,7 +975,7 @@ def lxmf_message_received_callback(message):
cmd, value = cmd.split(" ", 1)
user_section = DATA["main"]["allow_user_type"]
if DATA.has_section(user_section) and user_section != "main":
value = LXMF_CONNECTION.destination_correct(value)
value = LXMF_PEER.destination_correct(value)
if value != "":
executed = False
section = "wait"
@@ -987,15 +987,15 @@ def lxmf_message_received_callback(message):
DATA[user_section][key] = val
DATA.remove_option(section, key)
if executed:
LXMF_CONNECTION.send(value, "", "", fields_generate(members=True, data=True, cmd=user_section, config=user_section, result_key="allow", result_value=True))
LXMF_PEER.send(value, "", "", fields_generate(members=True, data=True, cmd=user_section, config=user_section, result_key="allow", result_value=True))
fields = fields_generate(src_hash=bytes.fromhex(value), src_name=user_name, members=True, result_key="allow", result_value=True)
for section in sections:
if "receive_allow" in config_get(CONFIG, "rights", section).split(","):
for (key, val) in DATA.items(section):
LXMF_CONNECTION.send(key, "", "", fields)
LXMF_PEER.send(key, "", "", fields)
LXMF_CONNECTION.send(source_hash, "", "", fields_generate(src_hash=bytes.fromhex(value), src_name=user_name, members=True, result_key="allow", result_value=True))
LXMF_PEER.send(source_hash, "", "", fields_generate(src_hash=bytes.fromhex(value), src_name=user_name, members=True, result_key="allow", result_value=True))
if CONFIG["main"].getboolean("auto_save_data"):
DATA.remove_option("main", "unsaved")
@@ -1004,26 +1004,26 @@ def lxmf_message_received_callback(message):
else:
DATA["main"]["unsaved"] = "True"
else:
LXMF_CONNECTION.send(source_hash, "", "", fields_generate(result_key="allow", result_value=False))
LXMF_PEER.send(source_hash, "", "", fields_generate(result_key="allow", result_value=False))
else:
LXMF_CONNECTION.send(source_hash, "", "", fields_generate(result_key="allow", result_value=False))
LXMF_PEER.send(source_hash, "", "", fields_generate(result_key="allow", result_value=False))
else:
LXMF_CONNECTION.send(source_hash, "", "", fields_generate(result_key="allow", result_value=False))
LXMF_PEER.send(source_hash, "", "", fields_generate(result_key="allow", result_value=False))
except:
LXMF_CONNECTION.send(source_hash, "", "", fields_generate(result_key="allow", result_value=False))
LXMF_PEER.send(source_hash, "", "", fields_generate(result_key="allow", result_value=False))
# announce
elif cmd == "announce" and "announce" in source_rights:
LXMF_CONNECTION.send(source_hash, content, "", fields_generate(result_key="announce", result_value=True))
LXMF_CONNECTION.announce_now()
LXMF_PEER.send(source_hash, content, "", fields_generate(result_key="announce", result_value=True))
LXMF_PEER.announce_now()
# block
elif cmd.startswith("block ") and "block" in source_rights:
try:
cmd, value = cmd.split(" ", 1)
value = LXMF_CONNECTION.destination_correct(value)
value = LXMF_PEER.destination_correct(value)
if value != "":
executed = False
for section in sections:
@@ -1037,16 +1037,16 @@ def lxmf_message_received_callback(message):
DATA["block_"+section][key] = val
DATA.remove_option(section, key)
if executed:
LXMF_CONNECTION.send(value, "", "", {MSG_FIELD_DATA: None, MSG_FIELD_COMMANDS_RESULT: [{"block": True}]})
LXMF_PEER.send(value, "", "", {MSG_FIELD_DATA: None, MSG_FIELD_COMMANDS_RESULT: [{"block": True}]})
fields = fields_generate(src_hash=bytes.fromhex(value), src_name=user_name, members=True, result_key="block", result_value=True)
for section in sections:
if "receive_block" in config_get(CONFIG, "rights", section).split(","):
for (key, val) in DATA.items(section):
if key != source_hash and key != value:
LXMF_CONNECTION.send(key, "", "", fields)
LXMF_PEER.send(key, "", "", fields)
LXMF_CONNECTION.send(source_hash, "", "", fields_generate(src_hash=bytes.fromhex(value), src_name=user_name, members=True, result_key="block", result_value=True))
LXMF_PEER.send(source_hash, "", "", fields_generate(src_hash=bytes.fromhex(value), src_name=user_name, members=True, result_key="block", result_value=True))
if CONFIG["main"].getboolean("auto_save_data"):
DATA.remove_option("main", "unsaved")
@@ -1055,11 +1055,11 @@ def lxmf_message_received_callback(message):
else:
DATA["main"]["unsaved"] = "True"
else:
LXMF_CONNECTION.send(source_hash, "", "", fields_generate(result_key="block", result_value=False))
LXMF_PEER.send(source_hash, "", "", fields_generate(result_key="block", result_value=False))
else:
LXMF_CONNECTION.send(source_hash, "", "", fields_generate(result_key="block", result_value=False))
LXMF_PEER.send(source_hash, "", "", fields_generate(result_key="block", result_value=False))
except:
LXMF_CONNECTION.send(source_hash, "", "", fields_generate(result_key="block", result_value=False))
LXMF_PEER.send(source_hash, "", "", fields_generate(result_key="block", result_value=False))
# deny
@@ -1068,7 +1068,7 @@ def lxmf_message_received_callback(message):
cmd, value = cmd.split(" ", 1)
user_section = DATA["main"]["deny_user_type"]
if DATA.has_section(user_section) and user_section != "main":
value = LXMF_CONNECTION.destination_correct(value)
value = LXMF_PEER.destination_correct(value)
if value != "":
executed = False
for section in sections:
@@ -1079,15 +1079,15 @@ def lxmf_message_received_callback(message):
DATA[user_section][key] = val
DATA.remove_option(section, key)
if executed:
LXMF_CONNECTION.send(value, "", "", fields_generate(result_key="deny", result_value=True))
LXMF_PEER.send(value, "", "", fields_generate(result_key="deny", result_value=True))
fields = fields_generate(src_hash=bytes.fromhex(value), src_name=user_name, members=True, result_key="deny", result_value=True)
for section in sections:
if "receive_deny" in config_get(CONFIG, "rights", section).split(","):
for (key, val) in DATA.items(section):
LXMF_CONNECTION.send(key, "", "", fields)
LXMF_PEER.send(key, "", "", fields)
LXMF_CONNECTION.send(source_hash, "", "", fields_generate(src_hash=bytes.fromhex(value), src_name=user_name, members=True, result_key="deny", result_value=True))
LXMF_PEER.send(source_hash, "", "", fields_generate(src_hash=bytes.fromhex(value), src_name=user_name, members=True, result_key="deny", result_value=True))
if CONFIG["main"].getboolean("auto_save_data"):
DATA.remove_option("main", "unsaved")
@@ -1096,13 +1096,13 @@ def lxmf_message_received_callback(message):
else:
DATA["main"]["unsaved"] = "True"
else:
LXMF_CONNECTION.send(source_hash, "", "", fields_generate(result_key="deny", result_value=False))
LXMF_PEER.send(source_hash, "", "", fields_generate(result_key="deny", result_value=False))
else:
LXMF_CONNECTION.send(source_hash, "", "", fields_generate(result_key="deny", result_value=False))
LXMF_PEER.send(source_hash, "", "", fields_generate(result_key="deny", result_value=False))
else:
LXMF_CONNECTION.send(source_hash, "", "", fields_generate(result_key="deny", result_value=False))
LXMF_PEER.send(source_hash, "", "", fields_generate(result_key="deny", result_value=False))
except:
LXMF_CONNECTION.send(source_hash, "", "", fields_generate(result_key="deny", result_value=False))
LXMF_PEER.send(source_hash, "", "", fields_generate(result_key="deny", result_value=False))
# invite
@@ -1112,7 +1112,7 @@ def lxmf_message_received_callback(message):
cmd, value = cmd.split(" ", 1)
key = DATA["main"]["invite_user_type"]
if DATA.has_section(key) and key != "main":
value = LXMF_CONNECTION.destination_correct(value)
value = LXMF_PEER.destination_correct(value)
if value != "":
user_name = ""
if CONFIG["main"].getboolean("auto_name_add"):
@@ -1121,16 +1121,16 @@ def lxmf_message_received_callback(message):
user_name = app_data.decode("utf-8")
DATA[key][value] = user_name
LXMF_CONNECTION.send(value, DATA["main"]["welcome"].replace("!n!", "\n"), "", fields_generate(members=True, data=True, cmd=key, config=key, result_key="invite", result_value=True))
LXMF_PEER.send(value, DATA["main"]["welcome"].replace("!n!", "\n"), "", fields_generate(members=True, data=True, cmd=key, config=key, result_key="invite", result_value=True))
fields = fields_generate(src_hash=bytes.fromhex(value), src_name=user_name, members=True, result_key="invite", result_value=True)
for section in sections:
if "receive_invite" in config_get(CONFIG, "rights", section).split(","):
for (key, val) in DATA.items(section):
if key != source_hash and key != value:
LXMF_CONNECTION.send(key, "", "", fields)
LXMF_PEER.send(key, "", "", fields)
LXMF_CONNECTION.send(source_hash, "", "", fields_generate(src_hash=bytes.fromhex(value), src_name=user_name, members=True, result_key="invite", result_value=True))
LXMF_PEER.send(source_hash, "", "", fields_generate(src_hash=bytes.fromhex(value), src_name=user_name, members=True, result_key="invite", result_value=True))
if CONFIG["main"].getboolean("auto_save_data"):
DATA.remove_option("main", "unsaved")
@@ -1139,28 +1139,28 @@ def lxmf_message_received_callback(message):
else:
DATA["main"]["unsaved"] = "True"
else:
LXMF_CONNECTION.send(source_hash, "", "", fields_generate(result_key="invite", result_value=False))
LXMF_PEER.send(source_hash, "", "", fields_generate(result_key="invite", result_value=False))
else:
LXMF_CONNECTION.send(source_hash, "", "", fields_generate(result_key="invite", result_value=False))
LXMF_PEER.send(source_hash, "", "", fields_generate(result_key="invite", result_value=False))
except:
LXMF_CONNECTION.send(source_hash, "", "", fields_generate(result_key="invite", result_value=False))
LXMF_PEER.send(source_hash, "", "", fields_generate(result_key="invite", result_value=False))
else:
LXMF_CONNECTION.send(source_hash, "", "", fields_generate(result_key="invite", result_value=False))
LXMF_PEER.send(source_hash, "", "", fields_generate(result_key="invite", result_value=False))
# join
elif cmd == "join" and "join" in source_rights:
try:
LXMF_CONNECTION.send(source_hash, DATA["main"]["welcome"].replace("!n!", "\n"), "", fields_generate(members=True, data=True, cmd=source_right, config=source_right, result_key="join", result_value=True))
LXMF_PEER.send(source_hash, DATA["main"]["welcome"].replace("!n!", "\n"), "", fields_generate(members=True, data=True, cmd=source_right, config=source_right, result_key="join", result_value=True))
except:
LXMF_CONNECTION.send(source_hash, "", "", fields_generate(result_key="join", result_value=False))
LXMF_PEER.send(source_hash, "", "", fields_generate(result_key="join", result_value=False))
# kick
elif cmd.startswith("kick ") and "kick" in source_rights:
try:
cmd, value = cmd.split(" ", 1)
value = LXMF_CONNECTION.destination_correct(value)
value = LXMF_PEER.destination_correct(value)
if value != "":
executed = False
for section in sections:
@@ -1171,16 +1171,16 @@ def lxmf_message_received_callback(message):
executed = True
DATA.remove_option(section, key)
if executed:
LXMF_CONNECTION.send(value, "", "", {MSG_FIELD_DATA: None, MSG_FIELD_COMMANDS_RESULT: [{"kick": True}]})
LXMF_PEER.send(value, "", "", {MSG_FIELD_DATA: None, MSG_FIELD_COMMANDS_RESULT: [{"kick": True}]})
fields = fields_generate(src_hash=bytes.fromhex(value), src_name=user_name, members=True, result_key="kick", result_value=True)
for section in sections:
if "receive_kick" in config_get(CONFIG, "rights", section).split(","):
for (key, val) in DATA.items(section):
if key != source_hash and key != value:
LXMF_CONNECTION.send(key, "", "", fields)
LXMF_PEER.send(key, "", "", fields)
LXMF_CONNECTION.send(source_hash, "", "", fields_generate(src_hash=bytes.fromhex(value), src_name=user_name, members=True, result_key="kick", result_value=True))
LXMF_PEER.send(source_hash, "", "", fields_generate(src_hash=bytes.fromhex(value), src_name=user_name, members=True, result_key="kick", result_value=True))
if CONFIG["main"].getboolean("auto_save_data"):
DATA.remove_option("main", "unsaved")
@@ -1189,11 +1189,11 @@ def lxmf_message_received_callback(message):
else:
DATA["main"]["unsaved"] = "True"
else:
LXMF_CONNECTION.send(source_hash, "", "", fields_generate(result_key="kick", result_value=False))
LXMF_PEER.send(source_hash, "", "", fields_generate(result_key="kick", result_value=False))
else:
LXMF_CONNECTION.send(source_hash, "", "", fields_generate(result_key="kick", result_value=False))
LXMF_PEER.send(source_hash, "", "", fields_generate(result_key="kick", result_value=False))
except:
LXMF_CONNECTION.send(source_hash, "", "", fields_generate(result_key="kick", result_value=False))
LXMF_PEER.send(source_hash, "", "", fields_generate(result_key="kick", result_value=False))
# leave
@@ -1208,9 +1208,9 @@ def lxmf_message_received_callback(message):
for section in sections:
if "receive_leave" in config_get(CONFIG, "rights", section).split(","):
for (key, val) in DATA.items(section):
LXMF_CONNECTION.send(key, "", "", fields)
LXMF_PEER.send(key, "", "", fields)
LXMF_CONNECTION.send(source_hash, "", "", {MSG_FIELD_DATA: None, MSG_FIELD_COMMANDS_RESULT: [{"leave": True}]})
LXMF_PEER.send(source_hash, "", "", {MSG_FIELD_DATA: None, MSG_FIELD_COMMANDS_RESULT: [{"leave": True}]})
if CONFIG["main"].getboolean("auto_save_data"):
DATA.remove_option("main", "unsaved")
@@ -1219,7 +1219,7 @@ def lxmf_message_received_callback(message):
else:
DATA["main"]["unsaved"] = "True"
except:
LXMF_CONNECTION.send(source_hash, "", "", {MSG_FIELD_DATA: None, MSG_FIELD_COMMANDS_RESULT: [{"leave": False}]})
LXMF_PEER.send(source_hash, "", "", {MSG_FIELD_DATA: None, MSG_FIELD_COMMANDS_RESULT: [{"leave": False}]})
# right_admin
@@ -1228,7 +1228,7 @@ def lxmf_message_received_callback(message):
cmd, value = cmd.split(" ", 1)
key = "admin"
if DATA.has_section(key) and key != "main":
value = LXMF_CONNECTION.destination_correct(value)
value = LXMF_PEER.destination_correct(value)
if value != "":
for section in DATA.sections():
if section != "main":
@@ -1237,16 +1237,16 @@ def lxmf_message_received_callback(message):
DATA.remove_option(section, key_old)
DATA[key][value] = val_old
LXMF_CONNECTION.send(value, "", "", fields_generate(members=True, data=True, cmd=key, config=key, result_key="right_admin", result_value=True))
LXMF_PEER.send(value, "", "", fields_generate(members=True, data=True, cmd=key, config=key, result_key="right_admin", result_value=True))
fields = fields_generate(src_hash=bytes.fromhex(value), src_name=val_old, members=True, result_key="right_admin", result_value=True)
for section in sections:
if "receive_right" in config_get(CONFIG, "rights", section).split(","):
for (key, val) in DATA.items(section):
if key != source_hash and key != value:
LXMF_CONNECTION.send(key, "", "", fields)
LXMF_PEER.send(key, "", "", fields)
LXMF_CONNECTION.send(source_hash, "", "", fields_generate(src_hash=bytes.fromhex(value), src_name=val_old, members=True, result_key="right_admin", result_value=True))
LXMF_PEER.send(source_hash, "", "", fields_generate(src_hash=bytes.fromhex(value), src_name=val_old, members=True, result_key="right_admin", result_value=True))
if CONFIG["main"].getboolean("auto_save_data"):
DATA.remove_option("main", "unsaved")
@@ -1255,11 +1255,11 @@ def lxmf_message_received_callback(message):
else:
DATA["main"]["unsaved"] = "True"
else:
LXMF_CONNECTION.send(source_hash, "", "", fields_generate(result_key="right_admin", result_value=False))
LXMF_PEER.send(source_hash, "", "", fields_generate(result_key="right_admin", result_value=False))
else:
LXMF_CONNECTION.send(source_hash, "", "", fields_generate(result_key="right_admin", result_value=False))
LXMF_PEER.send(source_hash, "", "", fields_generate(result_key="right_admin", result_value=False))
except:
LXMF_CONNECTION.send(source_hash, "", "", fields_generate(result_key="right_admin", result_value=False))
LXMF_PEER.send(source_hash, "", "", fields_generate(result_key="right_admin", result_value=False))
# right_guest
@@ -1268,7 +1268,7 @@ def lxmf_message_received_callback(message):
cmd, value = cmd.split(" ", 1)
key = "guest"
if DATA.has_section(key) and key != "main":
value = LXMF_CONNECTION.destination_correct(value)
value = LXMF_PEER.destination_correct(value)
if value != "":
for section in DATA.sections():
if section != "main":
@@ -1277,16 +1277,16 @@ def lxmf_message_received_callback(message):
DATA.remove_option(section, key_old)
DATA[key][value] = val_old
LXMF_CONNECTION.send(value, "", "", fields_generate(members=True, data=True, cmd=key, config=key, result_key="right_guest", result_value=True))
LXMF_PEER.send(value, "", "", fields_generate(members=True, data=True, cmd=key, config=key, result_key="right_guest", result_value=True))
fields = fields_generate(src_hash=bytes.fromhex(value), src_name=val_old, members=True, result_key="right_guest", result_value=True)
for section in sections:
if "receive_right" in config_get(CONFIG, "rights", section).split(","):
for (key, val) in DATA.items(section):
if key != source_hash and key != value:
LXMF_CONNECTION.send(key, "", "", fields)
LXMF_PEER.send(key, "", "", fields)
LXMF_CONNECTION.send(source_hash, "", "", fields_generate(src_hash=bytes.fromhex(value), src_name=val_old, members=True, result_key="right_guest", result_value=True))
LXMF_PEER.send(source_hash, "", "", fields_generate(src_hash=bytes.fromhex(value), src_name=val_old, members=True, result_key="right_guest", result_value=True))
if CONFIG["main"].getboolean("auto_save_data"):
DATA.remove_option("main", "unsaved")
@@ -1295,11 +1295,11 @@ def lxmf_message_received_callback(message):
else:
DATA["main"]["unsaved"] = "True"
else:
LXMF_CONNECTION.send(source_hash, "", "", fields_generate(result_key="right_guest", result_value=False))
LXMF_PEER.send(source_hash, "", "", fields_generate(result_key="right_guest", result_value=False))
else:
LXMF_CONNECTION.send(source_hash, "", "", fields_generate(result_key="right_guest", result_value=False))
LXMF_PEER.send(source_hash, "", "", fields_generate(result_key="right_guest", result_value=False))
except:
LXMF_CONNECTION.send(source_hash, "", "", fields_generate(result_key="right_guest", result_value=False))
LXMF_PEER.send(source_hash, "", "", fields_generate(result_key="right_guest", result_value=False))
# right_mod
@@ -1308,7 +1308,7 @@ def lxmf_message_received_callback(message):
cmd, value = cmd.split(" ", 1)
key = "mod"
if DATA.has_section(key) and key != "main":
value = LXMF_CONNECTION.destination_correct(value)
value = LXMF_PEER.destination_correct(value)
if value != "":
for section in DATA.sections():
if section != "main":
@@ -1317,16 +1317,16 @@ def lxmf_message_received_callback(message):
DATA.remove_option(section, key_old)
DATA[key][value] = val_old
LXMF_CONNECTION.send(value, "", "", fields_generate(members=True, data=True, cmd=key, config=key, result_key="right_mod", result_value=True))
LXMF_PEER.send(value, "", "", fields_generate(members=True, data=True, cmd=key, config=key, result_key="right_mod", result_value=True))
fields = fields_generate(src_hash=bytes.fromhex(value), src_name=val_old, members=True, result_key="right_mod", result_value=True)
for section in sections:
if "receive_right" in config_get(CONFIG, "rights", section).split(","):
for (key, val) in DATA.items(section):
if key != source_hash and key != value:
LXMF_CONNECTION.send(key, "", "", fields)
LXMF_PEER.send(key, "", "", fields)
LXMF_CONNECTION.send(source_hash, "", "", fields_generate(src_hash=bytes.fromhex(value), src_name=val_old, members=True, result_key="right_mod", result_value=True))
LXMF_PEER.send(source_hash, "", "", fields_generate(src_hash=bytes.fromhex(value), src_name=val_old, members=True, result_key="right_mod", result_value=True))
if CONFIG["main"].getboolean("auto_save_data"):
DATA.remove_option("main", "unsaved")
@@ -1335,11 +1335,11 @@ def lxmf_message_received_callback(message):
else:
DATA["main"]["unsaved"] = "True"
else:
LXMF_CONNECTION.send(source_hash, "", "", fields_generate(result_key="right_mod", result_value=False))
LXMF_PEER.send(source_hash, "", "", fields_generate(result_key="right_mod", result_value=False))
else:
LXMF_CONNECTION.send(source_hash, "", "", fields_generate(result_key="right_mod", result_value=False))
LXMF_PEER.send(source_hash, "", "", fields_generate(result_key="right_mod", result_value=False))
except:
LXMF_CONNECTION.send(source_hash, "", "", fields_generate(result_key="right_mod", result_value=False))
LXMF_PEER.send(source_hash, "", "", fields_generate(result_key="right_mod", result_value=False))
# right_user
@@ -1348,7 +1348,7 @@ def lxmf_message_received_callback(message):
cmd, value = cmd.split(" ", 1)
key = "user"
if DATA.has_section(key) and key != "main":
value = LXMF_CONNECTION.destination_correct(value)
value = LXMF_PEER.destination_correct(value)
if value != "":
for section in DATA.sections():
if section != "main":
@@ -1357,16 +1357,16 @@ def lxmf_message_received_callback(message):
DATA.remove_option(section, key_old)
DATA[key][value] = val_old
LXMF_CONNECTION.send(value, "", "", fields_generate(members=True, data=True, cmd=key, config=key, result_key="right_user", result_value=True))
LXMF_PEER.send(value, "", "", fields_generate(members=True, data=True, cmd=key, config=key, result_key="right_user", result_value=True))
fields = fields_generate(src_hash=bytes.fromhex(value), src_name=val_old, members=True, result_key="right_user", result_value=True)
for section in sections:
if "receive_right" in config_get(CONFIG, "rights", section).split(","):
for (key, val) in DATA.items(section):
if key != source_hash and key != value:
LXMF_CONNECTION.send(key, "", "", fields)
LXMF_PEER.send(key, "", "", fields)
LXMF_CONNECTION.send(source_hash, "", "", fields_generate(src_hash=bytes.fromhex(value), src_name=val_old, members=True, result_key="right_user", result_value=True))
LXMF_PEER.send(source_hash, "", "", fields_generate(src_hash=bytes.fromhex(value), src_name=val_old, members=True, result_key="right_user", result_value=True))
if CONFIG["main"].getboolean("auto_save_data"):
DATA.remove_option("main", "unsaved")
@@ -1375,24 +1375,24 @@ def lxmf_message_received_callback(message):
else:
DATA["main"]["unsaved"] = "True"
else:
LXMF_CONNECTION.send(source_hash, "", "", fields_generate(result_key="right_user", result_value=False))
LXMF_PEER.send(source_hash, "", "", fields_generate(result_key="right_user", result_value=False))
else:
LXMF_CONNECTION.send(source_hash, "", "", fields_generate(result_key="right_user", result_value=False))
LXMF_PEER.send(source_hash, "", "", fields_generate(result_key="right_user", result_value=False))
except:
LXMF_CONNECTION.send(source_hash, "", "", fields_generate(result_key="right_user", result_value=False))
LXMF_PEER.send(source_hash, "", "", fields_generate(result_key="right_user", result_value=False))
# sync
elif cmd == "sync" and "sync" in source_rights:
LXMF_CONNECTION.send(source_hash, content, "", fields_generate(result_key="sync", result_value=True))
LXMF_CONNECTION.sync_now()
LXMF_PEER.send(source_hash, content, "", fields_generate(result_key="sync", result_value=True))
LXMF_PEER.sync_now()
# unblock
elif cmd.startswith("unblock ") and "unblock" in source_rights:
try:
cmd, value = cmd.split(" ", 1)
value = LXMF_CONNECTION.destination_correct(value)
value = LXMF_PEER.destination_correct(value)
if value != "":
executed = False
for section in DATA.sections():
@@ -1407,16 +1407,16 @@ def lxmf_message_received_callback(message):
DATA[user_section][key] = val
DATA.remove_option(section, key)
if executed:
LXMF_CONNECTION.send(value, "", "", fields_generate(members=True, data=True, cmd=user_section, config=user_section, result_key="unblock", result_value=True))
LXMF_PEER.send(value, "", "", fields_generate(members=True, data=True, cmd=user_section, config=user_section, result_key="unblock", result_value=True))
fields = fields_generate(src_hash=bytes.fromhex(value), src_name=user_name, members=True, result_key="unblock", result_value=True)
for section in sections:
if "receive_unblock" in config_get(CONFIG, "rights", section).split(","):
for (key, val) in DATA.items(section):
if key != source_hash and key != value:
LXMF_CONNECTION.send(key, "", "", fields)
LXMF_PEER.send(key, "", "", fields)
LXMF_CONNECTION.send(source_hash, "", "", fields_generate(src_hash=bytes.fromhex(value), src_name=user_name, members=True, result_key="unblock", result_value=True))
LXMF_PEER.send(source_hash, "", "", fields_generate(src_hash=bytes.fromhex(value), src_name=user_name, members=True, result_key="unblock", result_value=True))
if CONFIG["main"].getboolean("auto_save_data"):
DATA.remove_option("main", "unsaved")
@@ -1425,19 +1425,19 @@ def lxmf_message_received_callback(message):
else:
DATA["main"]["unsaved"] = "True"
else:
LXMF_CONNECTION.send(source_hash, "", "", fields_generate(result_key="unblock", result_value=False))
LXMF_PEER.send(source_hash, "", "", fields_generate(result_key="unblock", result_value=False))
else:
LXMF_CONNECTION.send(source_hash, "", "", fields_generate(result_key="unblock", result_value=False))
LXMF_PEER.send(source_hash, "", "", fields_generate(result_key="unblock", result_value=False))
except:
LXMF_CONNECTION.send(source_hash, "", "", fields_generate(result_key="unblock", result_value=False))
LXMF_PEER.send(source_hash, "", "", fields_generate(result_key="unblock", result_value=False))
# update
elif cmd == "update" and "update" in source_rights:
try:
LXMF_CONNECTION.send(source_hash, "", "", fields_generate(members=True, data=True, cmd=source_right, config=source_right, result_key="update", result_value=True))
LXMF_PEER.send(source_hash, "", "", fields_generate(members=True, data=True, cmd=source_right, config=source_right, result_key="update", result_value=True))
except:
LXMF_CONNECTION.send(source_hash, "", "", fields_generate(result_key="update", result_value=False))
LXMF_PEER.send(source_hash, "", "", fields_generate(result_key="update", result_value=False))
# update_all
@@ -1445,9 +1445,9 @@ def lxmf_message_received_callback(message):
try:
for section in sections:
for (key, val) in DATA.items(section):
LXMF_CONNECTION.send(key, "", "", fields_generate(members=True, data=True, cmd=section, config=section, result_key="update", result_value=True))
LXMF_PEER.send(key, "", "", fields_generate(members=True, data=True, cmd=section, config=section, result_key="update", result_value=True))
except:
LXMF_CONNECTION.send(source_hash, "", "", fields_generate(result_key="update", result_value=False))
LXMF_PEER.send(source_hash, "", "", fields_generate(result_key="update", result_value=False))
# unsaved
@@ -1489,7 +1489,7 @@ def lxmf_message_received_callback(message):
if "receive" in config_get(CONFIG, "rights", section).split(","):
for (key, val) in DATA.items(section):
if key != source_hash:
LXMF_CONNECTION.send(key, content, title, fields, timestamp)
LXMF_PEER.send(key, content, title, fields, timestamp)
return
else:
log("LXMF - Source " + RNS.prettyhexrep(message.source_hash) + " 'send' not allowed", LOG_DEBUG)
@@ -1536,7 +1536,7 @@ def fields_generate(fields=None, src_hash=None, src_name=None, members=False, da
fields[MSG_FIELD_DATA]["m"][key] = {}
for (section_key, section_val) in DATA.items(key):
try:
h = bytes.fromhex(LXMF_CONNECTION.destination_correct(section_key))
h = bytes.fromhex(LXMF_PEER.destination_correct(section_key))
fields[MSG_FIELD_DATA]["m"][key][h] = section_val
except:
pass
@@ -2084,7 +2084,7 @@ def setup(path=None, path_rns=None, path_log=None, loglevel=None, service=False,
global LOG_LEVEL
global LOG_FILE
global RNS_CONNECTION
global LXMF_CONNECTION
global LXMF_PEER
if path is not None:
if path.endswith("/"):
@@ -2161,16 +2161,6 @@ def setup(path=None, path_rns=None, path_log=None, loglevel=None, service=False,
log("LXMF - Connecting ...", LOG_DEBUG)
if CONFIG.has_option("lxmf", "propagation_node"):
config_propagation_node = CONFIG["lxmf"]["propagation_node"]
else:
config_propagation_node = None
if CONFIG.has_option("lxmf", "propagation_node_active"):
config_propagation_node_active = CONFIG["lxmf"]["propagation_node_active"]
else:
config_propagation_node_active = None
if path is None:
path = PATH
@@ -2196,7 +2186,7 @@ def setup(path=None, path_rns=None, path_log=None, loglevel=None, service=False,
except:
pass
LXMF_CONNECTION = lxmf_connection(
LXMF_PEER = LXMFPeer(
storage_path=path,
identity_file="identity",
identity=None,
@@ -2207,9 +2197,9 @@ def setup(path=None, path_rns=None, path_log=None, loglevel=None, service=False,
announce_hidden=CONFIG["lxmf"].getboolean("announce_hidden"),
send_delay=CONFIG["lxmf"]["send_delay"],
method=CONFIG["lxmf"]["method"],
propagation_node=config_propagation_node,
propagation_node=CONFIG["lxmf"]["propagation_node"] if CONFIG.has_option("lxmf", "propagation_node") else None,
propagation_node_auto=CONFIG["lxmf"].getboolean("propagation_node_auto"),
propagation_node_active=config_propagation_node_active,
propagation_node_active=CONFIG["lxmf"]["propagation_node_active"] if CONFIG.has_option("lxmf", "propagation_node_active") else None,
stamps_enabled=CONFIG["lxmf"].getboolean("stamps_enabled"),
stamps_required=CONFIG["lxmf"].getboolean("stamps_required"),
stamps_cost=CONFIG["lxmf"]["stamps_cost"],
@@ -2223,14 +2213,14 @@ def setup(path=None, path_rns=None, path_log=None, loglevel=None, service=False,
sync_periodic=CONFIG["lxmf"].getboolean("sync_periodic"),
sync_periodic_interval=CONFIG["lxmf"]["sync_periodic_interval"])
LXMF_CONNECTION.register_announce_callback(lxmf_announce_callback)
LXMF_CONNECTION.register_message_received_callback(lxmf_message_received_callback)
LXMF_CONNECTION.register_config_set_callback(config_set)
LXMF_PEER.register_announce_callback(lxmf_announce_callback)
LXMF_PEER.register_message_received_callback(lxmf_message_received_callback)
LXMF_PEER.register_config_set_callback(config_set)
log("LXMF - Connected", LOG_DEBUG)
log("...............................................................................", LOG_FORCE)
log("LXMF - Address: " + RNS.prettyhexrep(LXMF_CONNECTION.destination_hash()), LOG_FORCE)
log("LXMF - Address: " + RNS.prettyhexrep(LXMF_PEER.destination_hash()), LOG_FORCE)
log("...............................................................................", LOG_FORCE)
if CONFIG["main"].getboolean("periodic_save_data"):

214
lxmf_distribution_group_extended/lxmf_distribution_group_extended.py
View File

@@ -88,7 +88,7 @@ DATA = None
CONFIG = None
STATISTIC = None
RNS_MAIN_CONNECTION = None
LXMF_CONNECTION = None
LXMF_PEER = None
RNS_CONNECTION = None
CONV_P2P = 0x01
@@ -157,7 +157,7 @@ MSG_FIELD_VOICE = 0xBF
# LXMF Class
class lxmf_connection:
class LXMFPeer:
message_received_callback = None
message_notification_callback = None
message_notification_success_callback = None
@@ -282,7 +282,7 @@ class lxmf_connection:
self.destination.set_link_established_callback(self.client_connected)
if self.propagation_node_auto:
self.propagation_callback = lxmf_connection_propagation(self, "lxmf.propagation")
self.propagation_callback = LXMFPeerPropagation(self, "lxmf.propagation")
RNS.Transport.register_announce_handler(self.propagation_callback)
if self.propagation_node_active:
self.propagation_node_set(self.propagation_node_active)
@@ -685,7 +685,7 @@ class lxmf_connection:
log("- App Data: " + message.app_data, LOG_DEBUG)
class lxmf_connection_propagation():
class LXMFPeerPropagation():
def __init__(self, owner, aspect_filter=None):
self.owner = owner
self.aspect_filter = aspect_filter
@@ -975,7 +975,7 @@ class lxmf_announce_callback:
if "receive_join" in config_get(CONFIG, "rights", section).split(","):
for (key, val) in DATA.items(section):
if key != source_hash:
LXMF_CONNECTION.send(key, content_group, "", fields, None, "interface_send")
LXMF_PEER.send(key, content_group, "", fields, None, "interface_send")
if CONFIG["main"].getboolean("auto_save_data"):
DATA.remove_option("main", "unsaved")
if not data_save(PATH + "/data.cfg"):
@@ -983,7 +983,7 @@ class lxmf_announce_callback:
else:
DATA["main"]["unsaved"] = "True"
content = replace(content, source_hash, source_name, source_right, lng_key)
LXMF_CONNECTION.send(source_hash, content, "", fields_generate(members=True, data=True, cmd=source_right, config=source_right, result_key="join", lng_key=lng_key), None, "interface_send")
LXMF_PEER.send(source_hash, content, "", fields_generate(members=True, data=True, cmd=source_right, config=source_right, result_key="join", lng_key=lng_key), None, "interface_send")
return
elif source_right == "":
log("LXMF - Source " + RNS.prettyhexrep(message.source_hash) + " not exist (auto add disabled)", LOG_DEBUG)
@@ -1015,7 +1015,7 @@ class lxmf_announce_callback:
if "receive_auto_"+content_type in config_get(CONFIG, "rights", section).split(","):
for (key, val) in DATA.items(section):
if key != source_hash:
LXMF_CONNECTION.send(key, content_group, "", fields, None, "interface_send")
LXMF_PEER.send(key, content_group, "", fields, None, "interface_send")
if CONFIG["main"].getboolean("auto_save_data"):
DATA.remove_option("main", "unsaved")
@@ -1091,7 +1091,7 @@ def lxmf_message_received_callback(message):
content_user = config_get(CONFIG, "interface_messages", "reply_block", "", lng_key)
content_user = replace(content_user, source_hash, source_name, source_right, lng_key)
if content_user != "":
LXMF_CONNECTION.send(source_hash, content_user, "", fields_generate(lng_key=lng_key), None, "interface_send")
LXMF_PEER.send(source_hash, content_user, "", fields_generate(lng_key=lng_key), None, "interface_send")
return
source_rights = []
@@ -1156,7 +1156,7 @@ def lxmf_message_received_callback(message):
if "receive_cluster" in config_get(CONFIG, "rights", section).split(","):
for (key, val) in DATA.items(section):
if key != source_hash:
LXMF_CONNECTION.send(key, content, title, fields, timestamp, "cluster_send")
LXMF_PEER.send(key, content, title, fields, timestamp, "cluster_send")
elif fields["m_t"] == "pin":
delimiter = CONFIG["interface"]["delimiter_output"]
@@ -1183,7 +1183,7 @@ def lxmf_message_received_callback(message):
if "receive_cluster_pin_add" in config_get(CONFIG, "rights", section).split(","):
for (key, val) in DATA.items(section):
if key != source_hash:
LXMF_CONNECTION.send(key, content_group, "", fields, None, "cluster_send")
LXMF_PEER.send(key, content_group, "", fields, None, "cluster_send")
if CONFIG["main"].getboolean("auto_save_data"):
DATA.remove_option("main", "unsaved")
@@ -1223,7 +1223,7 @@ def lxmf_message_received_callback(message):
if "receive_join" in config_get(CONFIG, "rights", section).split(","):
for (key, val) in DATA.items(section):
if key != source_hash:
LXMF_CONNECTION.send(key, content_group, title, fields, None, "interface_send")
LXMF_PEER.send(key, content_group, title, fields, None, "interface_send")
if CONFIG["main"].getboolean("auto_save_data"):
DATA.remove_option("main", "unsaved")
if not data_save(PATH + "/data.cfg"):
@@ -1231,7 +1231,7 @@ def lxmf_message_received_callback(message):
else:
DATA["main"]["unsaved"] = "True"
content = replace(content, source_hash, source_name, source_right, lng_key)
LXMF_CONNECTION.send(source_hash, content, title, fields_generate(members=True, data=True, cmd=source_right, config=source_right, result_key="join", lng_key=lng_key), None, "interface_send")
LXMF_PEER.send(source_hash, content, title, fields_generate(members=True, data=True, cmd=source_right, config=source_right, result_key="join", lng_key=lng_key), None, "interface_send")
return
elif source_right == "":
log("LXMF - Source " + RNS.prettyhexrep(message.source_hash) + " not exist (auto add disabled)", LOG_DEBUG)
@@ -1251,7 +1251,7 @@ def lxmf_message_received_callback(message):
content_user = config_get(CONFIG, "interface_messages", "reply_signature", "", lng_key)
content_user = replace(content_user, source_hash, source_name, source_right, lng_key)
if content_user != "":
LXMF_CONNECTION.send(source_hash, content_user, "", fields_generate(lng_key=lng_key), None, "interface_send")
LXMF_PEER.send(source_hash, content_user, "", fields_generate(lng_key=lng_key), None, "interface_send")
return
@@ -1262,7 +1262,7 @@ def lxmf_message_received_callback(message):
content_user = config_get(CONFIG, "interface_messages", "reply_length_min", "", lng_key)
content_user = replace(content_user, source_hash, source_name, source_right, lng_key)
if content_user != "":
LXMF_CONNECTION.send(source_hash, content_user, "", fields_generate(lng_key=lng_key), None, "interface_send")
LXMF_PEER.send(source_hash, content_user, "", fields_generate(lng_key=lng_key), None, "interface_send")
return
@@ -1273,7 +1273,7 @@ def lxmf_message_received_callback(message):
content_user = config_get(CONFIG, "interface_messages", "reply_length_max", "", lng_key)
content_user = replace(content_user, source_hash, source_name, source_right, lng_key)
if content_user != "":
LXMF_CONNECTION.send(source_hash, content_user, "", fields_generate(lng_key=lng_key), None, "interface_send")
LXMF_PEER.send(source_hash, content_user, "", fields_generate(lng_key=lng_key), None, "interface_send")
return
@@ -1313,7 +1313,7 @@ def lxmf_message_received_callback(message):
content_user = config_get(CONFIG, "interface_messages", "reply_interface_enabled", "", lng_key)
content_user = replace(content_user, source_hash, source_name, source_right, lng_key)
if content_user != "":
LXMF_CONNECTION.send(source_hash, content_user, "", fields_generate(lng_key=lng_key), None, "interface_send")
LXMF_PEER.send(source_hash, content_user, "", fields_generate(lng_key=lng_key), None, "interface_send")
return
if "interface" not in source_rights:
@@ -1322,7 +1322,7 @@ def lxmf_message_received_callback(message):
content_user = config_get(CONFIG, "interface_messages", "reply_interface_right", "", lng_key)
content_user = replace(content_user, source_hash, source_name, source_right, lng_key)
if content_user != "":
LXMF_CONNECTION.send(source_hash, content_user, "", fields_generate(lng_key=lng_key), None, "interface_send")
LXMF_PEER.send(source_hash, content_user, "", fields_generate(lng_key=lng_key), None, "interface_send")
return
content = interface(command, source_hash, source_name, source_right, source_rights, lng_key, message)
@@ -1337,7 +1337,7 @@ def lxmf_message_received_callback(message):
statistic("value_set", source_hash, "activity", time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(time.time())))
statistic("value_set", source_hash, "activity_receive", time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(time.time())))
LXMF_CONNECTION.send(source_hash, content, "", fields_generate(lng_key=lng_key), None, "interface_send")
LXMF_PEER.send(source_hash, content, "", fields_generate(lng_key=lng_key), None, "interface_send")
return
@@ -1349,7 +1349,7 @@ def lxmf_message_received_callback(message):
content_user = config_get(CONFIG, "interface_messages", "reply_cluster_enabled", "", lng_key)
content_user = replace(content_user, source_hash, source_name, source_right, lng_key)
if content_user != "":
LXMF_CONNECTION.send(source_hash, content_user, "", fields_generate(lng_key=lng_key), None, "interface_send")
LXMF_PEER.send(source_hash, content_user, "", fields_generate(lng_key=lng_key), None, "interface_send")
return
if "send_cluster" not in source_rights:
@@ -1358,14 +1358,14 @@ def lxmf_message_received_callback(message):
content_user = config_get(CONFIG, "interface_messages", "reply_cluster_right", "", lng_key)
content_user = replace(content_user, source_hash, source_name, source_right, lng_key)
if content_user != "":
LXMF_CONNECTION.send(source_hash, content_user, "", fields_generate(lng_key=lng_key), None, "interface_send")
LXMF_PEER.send(source_hash, content_user, "", fields_generate(lng_key=lng_key), None, "interface_send")
return
try:
content = content[len(CONFIG["cluster"]["delimiter_input"]):]
destination, content = content.split(" ", 1)
except:
LXMF_CONNECTION.send(source_hash, config_get(CONFIG, "interface_menu", "cluster_format_error", "", lng_key) , "", fields_generate(lng_key=lng_key), None, "interface_send")
LXMF_PEER.send(source_hash, config_get(CONFIG, "interface_menu", "cluster_format_error", "", lng_key) , "", fields_generate(lng_key=lng_key), None, "interface_send")
return
destinations = []
@@ -1374,7 +1374,7 @@ def lxmf_message_received_callback(message):
destinations.append(key)
if len(destinations) == 0:
LXMF_CONNECTION.send(source_hash, config_get(CONFIG, "interface_menu", "cluster_found_error", "", lng_key) , "", fields_generate(lng_key=lng_key), None, "interface_send")
LXMF_PEER.send(source_hash, config_get(CONFIG, "interface_menu", "cluster_found_error", "", lng_key) , "", fields_generate(lng_key=lng_key), None, "interface_send")
return
length = config_getint(CONFIG, "message", "cluster_send_length_min", 0, lng_key)
@@ -1384,7 +1384,7 @@ def lxmf_message_received_callback(message):
content_user = config_get(CONFIG, "interface_messages", "reply_length_min", "", lng_key)
content_user = replace(content_user, source_hash, source_name, source_right, lng_key)
if content_user != "":
LXMF_CONNECTION.send(source_hash, content_user, "", fields_generate(lng_key=lng_key), None, "interface_send")
LXMF_PEER.send(source_hash, content_user, "", fields_generate(lng_key=lng_key), None, "interface_send")
return
length = config_getint(CONFIG, "message", "cluster_send_length_max", 0, lng_key)
@@ -1394,7 +1394,7 @@ def lxmf_message_received_callback(message):
content_user = config_get(CONFIG, "interface_messages", "reply_length_max", "", lng_key)
content_user = replace(content_user, source_hash, source_name, source_right, lng_key)
if content_user != "":
LXMF_CONNECTION.send(source_hash, content_user, "", fields_generate(lng_key=lng_key), None, "interface_send")
LXMF_PEER.send(source_hash, content_user, "", fields_generate(lng_key=lng_key), None, "interface_send")
return
title_prefix = config_get(CONFIG, "message", "cluster_send_title_prefix", "", lng_key)
@@ -1466,7 +1466,7 @@ def lxmf_message_received_callback(message):
statistic("value_set", source_hash, "activity_receive", time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(time.time())))
for val in destinations:
LXMF_CONNECTION.send(key, content, title, fields, timestamp, "cluster_out")
LXMF_PEER.send(key, content, title, fields, timestamp, "cluster_out")
cluster_loop = False
if destination in config_get(CONFIG, "cluster", "display_name", "", lng_key).split("/"):
@@ -1492,7 +1492,7 @@ def lxmf_message_received_callback(message):
if "receive_cluster_send" in config_get(CONFIG, "rights", section).split(",") or (cluster_loop and "receive_cluster_loop" in config_get(CONFIG, "rights", section).split(",")):
for (key, val) in DATA.items(section):
if key != source_hash:
LXMF_CONNECTION.send(key, content, title, fields, timestamp, "local_send")
LXMF_PEER.send(key, content, title, fields, timestamp, "local_send")
return
@@ -1508,7 +1508,7 @@ def lxmf_message_received_callback(message):
content_user = config_get(CONFIG, "interface_messages", "reply_length_min", "", lng_key)
content_user = replace(content_user, source_hash, source_name, source_right, lng_key)
if content_user != "":
LXMF_CONNECTION.send(source_hash, content_user, "", fields_generate(lng_key=lng_key), None, "interface_send")
LXMF_PEER.send(source_hash, content_user, "", fields_generate(lng_key=lng_key), None, "interface_send")
return
length = config_getint(CONFIG, "message", "send_length_max", 0, lng_key)
@@ -1518,7 +1518,7 @@ def lxmf_message_received_callback(message):
content_user = config_get(CONFIG, "interface_messages", "reply_length_max", "", lng_key)
content_user = replace(content_user, source_hash, source_name, source_right, lng_key)
if content_user != "":
LXMF_CONNECTION.send(source_hash, content_user, "", fields_generate(lng_key=lng_key), None, "interface_send")
LXMF_PEER.send(source_hash, content_user, "", fields_generate(lng_key=lng_key), None, "interface_send")
return
title_prefix = config_get(CONFIG, "message", "send_title_prefix", "", lng_key)
@@ -1578,7 +1578,7 @@ def lxmf_message_received_callback(message):
if "receive_local" in config_get(CONFIG, "rights", section).split(","):
for (key, val) in DATA.items(section):
if key != source_hash:
LXMF_CONNECTION.send(key, content, title, fields, timestamp, "local_send")
LXMF_PEER.send(key, content, title, fields, timestamp, "local_send")
return
else:
log("LXMF - Source " + RNS.prettyhexrep(message.source_hash) + " 'send' not allowed", LOG_DEBUG)
@@ -1586,13 +1586,13 @@ def lxmf_message_received_callback(message):
content_user = config_get(CONFIG, "interface_messages", "reply_local_right", "", lng_key)
content_user = replace(content_user, source_hash, source_name, source_right, lng_key)
if content_user != "":
LXMF_CONNECTION.send(source_hash, content_user, "", fields_generate(lng_key=lng_key), None, "interface_send")
LXMF_PEER.send(source_hash, content_user, "", fields_generate(lng_key=lng_key), None, "interface_send")
else:
if "reply_local_enabled" in source_rights:
content_user = config_get(CONFIG, "interface_messages", "reply_local_enabled", "", lng_key)
content_user = replace(content_user, source_hash, source_name, source_right, lng_key)
if content_user != "":
LXMF_CONNECTION.send(source_hash, content_user, "", fields_generate(lng_key=lng_key), None, "interface_send")
LXMF_PEER.send(source_hash, content_user, "", fields_generate(lng_key=lng_key), None, "interface_send")
return
@@ -1668,7 +1668,7 @@ class rns_announce_callback:
for section in sections:
if "receive_cluster_join" in config_get(CONFIG, "rights", section).split(","):
for (key, val) in DATA.items(section):
LXMF_CONNECTION.send(key, content_group, "", fields_generate(lng_key=lng_key), None, "interface_send")
LXMF_PEER.send(key, content_group, "", fields_generate(lng_key=lng_key), None, "interface_send")
DATA["cluster"][receive["h"]] = receive["c_n"]
executed = True
@@ -1720,7 +1720,7 @@ def interface(cmd, source_hash, source_name, source_right, source_rights, lng_ke
elif (cmd == "update") and "update" in source_rights:
try:
content = config_get(CONFIG, "interface_menu", "update_ok", "", lng_key)
LXMF_CONNECTION.send(source_hash, content, "", fields_generate(members=True, data=True, cmd=source_right, config=source_right, result_key="update", lng_key=lng_key), None, "interface_send")
LXMF_PEER.send(source_hash, content, "", fields_generate(members=True, data=True, cmd=source_right, config=source_right, result_key="update", lng_key=lng_key), None, "interface_send")
content = ""
except:
content = config_get(CONFIG, "interface_menu", "update_error", "", lng_key)
@@ -1732,7 +1732,7 @@ def interface(cmd, source_hash, source_name, source_right, source_rights, lng_ke
content = config_get(CONFIG, "interface_menu", "update_all_ok", "", lng_key)
for section in sections:
for (key, val) in DATA.items(section):
LXMF_CONNECTION.send(key, content, "", fields_generate(members=True, data=True, cmd=section, config=section, result_key="update", lng_key=lng_key), None, "interface_send")
LXMF_PEER.send(key, content, "", fields_generate(members=True, data=True, cmd=section, config=section, result_key="update", lng_key=lng_key), None, "interface_send")
content = ""
except:
content = config_get(CONFIG, "interface_menu", "update_all_error", "", lng_key)
@@ -1743,7 +1743,7 @@ def interface(cmd, source_hash, source_name, source_right, source_rights, lng_ke
try:
content = config_get(CONFIG, "interface_messages", "auto_add_"+source_right, "", lng_key)
content = replace(content, source_hash, source_name, source_right, lng_key)
LXMF_CONNECTION.send(source_hash, content, "", fields_generate(members=True, data=True, cmd=source_right, config=source_right, result_key="join", lng_key=lng_key), None, "interface_send")
LXMF_PEER.send(source_hash, content, "", fields_generate(members=True, data=True, cmd=source_right, config=source_right, result_key="join", lng_key=lng_key), None, "interface_send")
content = ""
except:
content = config_get(CONFIG, "interface_menu", "join_error", "", lng_key)
@@ -1766,11 +1766,11 @@ def interface(cmd, source_hash, source_name, source_right, source_rights, lng_ke
for section in sections:
if "receive_leave" in config_get(CONFIG, "rights", section).split(","):
for (key, val) in DATA.items(section):
LXMF_CONNECTION.send(key, content_group, "", fields, None, "interface_send")
LXMF_PEER.send(key, content_group, "", fields, None, "interface_send")
content = config_get(CONFIG, "interface_menu", "leave_ok", "", lng_key)
content = replace(content, source_hash, source_name, source_right, lng_key)
LXMF_CONNECTION.send(source_hash, content, "", {MSG_FIELD_DATA: None, MSG_FIELD_COMMANDS_RESULT: [{"leave": True}]}, None, "interface_send")
LXMF_PEER.send(source_hash, content, "", {MSG_FIELD_DATA: None, MSG_FIELD_COMMANDS_RESULT: [{"leave": True}]}, None, "interface_send")
content = ""
if CONFIG["main"].getboolean("auto_save_data"):
@@ -1812,7 +1812,7 @@ def interface(cmd, source_hash, source_name, source_right, source_rights, lng_ke
if "receive_"+content_type in config_get(CONFIG, "rights", section).split(","):
for (key, val) in DATA.items(section):
if key != source_hash:
LXMF_CONNECTION.send(key, content_group, "", fields, None, "interface_send")
LXMF_PEER.send(key, content_group, "", fields, None, "interface_send")
content = config_get(CONFIG, "interface_menu", "name_ok", "", lng_key) + " " + value
@@ -1874,7 +1874,7 @@ def interface(cmd, source_hash, source_name, source_right, source_rights, lng_ke
if "receive_pin_add" in config_get(CONFIG, "rights", section).split(","):
for (key, val) in DATA.items(section):
if key != source_hash:
LXMF_CONNECTION.send(key, content_group, "", fields_generate(src_hash=message.source_hash, src_name=source_name, lng_key=lng_key), None, "interface_send")
LXMF_PEER.send(key, content_group, "", fields_generate(src_hash=message.source_hash, src_name=source_name, lng_key=lng_key), None, "interface_send")
content = config_get(CONFIG, "interface_menu", "pin_add_ok", "", lng_key)
@@ -1905,7 +1905,7 @@ def interface(cmd, source_hash, source_name, source_right, source_rights, lng_ke
if "receive_pin_add" in config_get(CONFIG, "rights", section).split(","):
for (key, val) in DATA.items(section):
if key != source_hash:
LXMF_CONNECTION.send(key, content_group, "", fields_generate(src_hash=message.source_hash, src_name=source_name, lng_key=lng_key), None, "interface_send")
LXMF_PEER.send(key, content_group, "", fields_generate(src_hash=message.source_hash, src_name=source_name, lng_key=lng_key), None, "interface_send")
content = config_get(CONFIG, "interface_menu", "pin_remove_ok", "", lng_key)
@@ -2420,7 +2420,7 @@ def interface(cmd, source_hash, source_name, source_right, source_rights, lng_ke
if "receive_description" in config_get(CONFIG, "rights", section).split(","):
for (key, val) in DATA.items(section):
if key != source_hash:
LXMF_CONNECTION.send(key, content_group, "", fields_generate(src_hash=message.source_hash, src_name=source_name, result_key="description", lng_key=lng_key), None, "interface_send")
LXMF_PEER.send(key, content_group, "", fields_generate(src_hash=message.source_hash, src_name=source_name, result_key="description", lng_key=lng_key), None, "interface_send")
content = config_get(CONFIG, "interface_menu", "description", "", lng_key) + " " + value
DATA["main"]["unsaved"] = "True"
@@ -2445,9 +2445,9 @@ def interface(cmd, source_hash, source_name, source_right, source_rights, lng_ke
elif cmd == "announce" and "announce" in source_rights:
content = config_get(CONFIG, "interface_menu", "announce", "", lng_key)
content = replace(content, source_hash, source_name, source_right, lng_key)
LXMF_CONNECTION.send(source_hash, content, "", fields_generate(result_key="announce", lng_key=lng_key), None, "interface_send")
LXMF_PEER.send(source_hash, content, "", fields_generate(result_key="announce", lng_key=lng_key), None, "interface_send")
content = ""
LXMF_CONNECTION.announce_now()
LXMF_PEER.announce_now()
if CONFIG["cluster"].getboolean("enabled"):
RNS_CONNECTION.announce_now()
@@ -2456,9 +2456,9 @@ def interface(cmd, source_hash, source_name, source_right, source_rights, lng_ke
elif cmd == "sync" and "sync" in source_rights:
content = config_get(CONFIG, "interface_menu", "sync", "", lng_key)
content = replace(content, source_hash, source_name, source_right, lng_key)
LXMF_CONNECTION.send(source_hash, content, "", fields_generate(result_key="sync", lng_key=lng_key), None, "interface_send")
LXMF_PEER.send(source_hash, content, "", fields_generate(result_key="sync", lng_key=lng_key), None, "interface_send")
content = ""
LXMF_CONNECTION.sync_now()
LXMF_PEER.sync_now()
# "/show run" command.
@@ -2497,7 +2497,7 @@ def interface(cmd, source_hash, source_name, source_right, source_rights, lng_ke
try:
cmd, key, value, name = cmd.split(" ", 3)
if DATA.has_section(key) and key != "main":
value = LXMF_CONNECTION.destination_correct(value)
value = LXMF_PEER.destination_correct(value)
if value != "":
for section in DATA.sections():
if section != "main":
@@ -2520,7 +2520,7 @@ def interface(cmd, source_hash, source_name, source_right, source_rights, lng_ke
try:
cmd, key, value = cmd.split(" ", 2)
if DATA.has_section(key) and key != "main":
value = LXMF_CONNECTION.destination_correct(value)
value = LXMF_PEER.destination_correct(value)
if value != "":
if DATA.has_option(key, value):
DATA.remove_option(key, value)
@@ -2539,7 +2539,7 @@ def interface(cmd, source_hash, source_name, source_right, source_rights, lng_ke
except:
try:
cmd, value = cmd.split(" ", 1)
value = LXMF_CONNECTION.destination_correct(value)
value = LXMF_PEER.destination_correct(value)
if value != "":
for section in DATA.sections():
if section != "main":
@@ -2561,7 +2561,7 @@ def interface(cmd, source_hash, source_name, source_right, source_rights, lng_ke
try:
cmd, key, value = cmd.split(" ", 2)
if DATA.has_section(key) and key != "main":
value = LXMF_CONNECTION.destination_correct(value)
value = LXMF_PEER.destination_correct(value)
if value != "":
for section in DATA.sections():
if section != "main":
@@ -2585,7 +2585,7 @@ def interface(cmd, source_hash, source_name, source_right, source_rights, lng_ke
elif cmd.startswith("rename ") and "rename" in source_rights:
try:
cmd, key, value = cmd.split(" ", 2)
key = LXMF_CONNECTION.destination_correct(key)
key = LXMF_PEER.destination_correct(key)
if key != "":
executed = False
for section in sections:
@@ -2615,7 +2615,7 @@ def interface(cmd, source_hash, source_name, source_right, source_rights, lng_ke
cmd, value = cmd.split(" ", 1)
key = DATA["main"]["invite_user_type"]
if DATA.has_section(key) and key != "main":
value = LXMF_CONNECTION.destination_correct(value)
value = LXMF_PEER.destination_correct(value)
if value != "":
user_name = ""
if CONFIG["main"].getboolean("auto_name_add"):
@@ -2627,7 +2627,7 @@ def interface(cmd, source_hash, source_name, source_right, source_rights, lng_ke
content_user = config_get(CONFIG, "interface_messages", "invite_"+key, "", lng_key)
content_user = replace(content_user, source_hash, source_name, source_right, lng_key)
content_user = content_user.replace(delimiter+"user_name"+delimiter, user_name)
LXMF_CONNECTION.send(value, content_user, "", fields_generate(members=True, data=True, cmd=key, config=key, result_key="invite", lng_key=lng_key), None, "interface_send")
LXMF_PEER.send(value, content_user, "", fields_generate(members=True, data=True, cmd=key, config=key, result_key="invite", lng_key=lng_key), None, "interface_send")
content_group = config_get(CONFIG, "interface_messages", "member_invite", "", lng_key)
content_group = replace(content_group, source_hash, source_name, source_right, lng_key)
@@ -2638,12 +2638,12 @@ def interface(cmd, source_hash, source_name, source_right, source_rights, lng_ke
if "receive_invite" in config_get(CONFIG, "rights", section).split(","):
for (key, val) in DATA.items(section):
if key != source_hash and key != value:
LXMF_CONNECTION.send(key, content_group, "", fields, None, "interface_send")
LXMF_PEER.send(key, content_group, "", fields, None, "interface_send")
content = config_get(CONFIG, "interface_menu", "invite_ok", "", lng_key)
content = content.replace(delimiter+"user_address"+delimiter, value)
content = content.replace(delimiter+"user_name"+delimiter, user_name)
LXMF_CONNECTION.send(source_hash, content, "", fields_generate(src_hash=bytes.fromhex(value), src_name=user_name, members=True, result_key="invite", lng_key=lng_key), None, "interface_send")
LXMF_PEER.send(source_hash, content, "", fields_generate(src_hash=bytes.fromhex(value), src_name=user_name, members=True, result_key="invite", lng_key=lng_key), None, "interface_send")
content = ""
if CONFIG["main"].getboolean("auto_save_data"):
@@ -2666,7 +2666,7 @@ def interface(cmd, source_hash, source_name, source_right, source_rights, lng_ke
elif cmd.startswith("kick ") and "kick" in source_rights:
try:
cmd, value = cmd.split(" ", 1)
value = LXMF_CONNECTION.destination_correct(value)
value = LXMF_PEER.destination_correct(value)
if value != "":
executed = False
for section in sections:
@@ -2682,7 +2682,7 @@ def interface(cmd, source_hash, source_name, source_right, source_rights, lng_ke
content_user = config_get(CONFIG, "interface_messages", "kick_"+user_section, "", lng_key)
content_user = replace(content_user, source_hash, source_name, source_right, lng_key)
LXMF_CONNECTION.send(value, content_user, "", {MSG_FIELD_DATA: None, MSG_FIELD_COMMANDS_RESULT: [{"kick": True}]}, None, "interface_send")
LXMF_PEER.send(value, content_user, "", {MSG_FIELD_DATA: None, MSG_FIELD_COMMANDS_RESULT: [{"kick": True}]}, None, "interface_send")
content_group = config_get(CONFIG, "interface_messages", "member_kick", "", lng_key)
content_group = replace(content_group, source_hash, source_name, source_right, lng_key)
@@ -2693,12 +2693,12 @@ def interface(cmd, source_hash, source_name, source_right, source_rights, lng_ke
if "receive_kick" in config_get(CONFIG, "rights", section).split(","):
for (key, val) in DATA.items(section):
if key != source_hash and key != value:
LXMF_CONNECTION.send(key, content_group, "", fields, None, "interface_send")
LXMF_PEER.send(key, content_group, "", fields, None, "interface_send")
content = config_get(CONFIG, "interface_menu", "kick_ok", "", lng_key)
content = content.replace(delimiter+"user_address"+delimiter, value)
content = content.replace(delimiter+"user_name"+delimiter, user_name)
LXMF_CONNECTION.send(source_hash, content, "", fields_generate(src_hash=bytes.fromhex(value), src_name=user_name, members=True, result_key="kick", lng_key=lng_key), None, "interface_send")
LXMF_PEER.send(source_hash, content, "", fields_generate(src_hash=bytes.fromhex(value), src_name=user_name, members=True, result_key="kick", lng_key=lng_key), None, "interface_send")
content = ""
if CONFIG["main"].getboolean("auto_save_data"):
@@ -2719,7 +2719,7 @@ def interface(cmd, source_hash, source_name, source_right, source_rights, lng_ke
elif (cmd.startswith("block ") or cmd.startswith("ban ")) and "block" in source_rights:
try:
cmd, value = cmd.split(" ", 1)
value = LXMF_CONNECTION.destination_correct(value)
value = LXMF_PEER.destination_correct(value)
if value != "":
executed = False
for section in sections:
@@ -2735,7 +2735,7 @@ def interface(cmd, source_hash, source_name, source_right, source_rights, lng_ke
if executed:
content_user = config_get(CONFIG, "interface_messages", "block_"+user_section, "", lng_key)
content_user = replace(content_user, source_hash, source_name, source_right, lng_key)
LXMF_CONNECTION.send(value, content_user, "", {MSG_FIELD_DATA: None, MSG_FIELD_COMMANDS_RESULT: [{"block": True}]}, None, "interface_send")
LXMF_PEER.send(value, content_user, "", {MSG_FIELD_DATA: None, MSG_FIELD_COMMANDS_RESULT: [{"block": True}]}, None, "interface_send")
content_group = config_get(CONFIG, "interface_messages", "member_block", "", lng_key)
content_group = replace(content_group, source_hash, source_name, source_right, lng_key)
@@ -2746,12 +2746,12 @@ def interface(cmd, source_hash, source_name, source_right, source_rights, lng_ke
if "receive_block" in config_get(CONFIG, "rights", section).split(","):
for (key, val) in DATA.items(section):
if key != source_hash and key != value:
LXMF_CONNECTION.send(key, content_group, "", fields, None, "interface_send")
LXMF_PEER.send(key, content_group, "", fields, None, "interface_send")
content = config_get(CONFIG, "interface_menu", "block_ok", "", lng_key)
content = content.replace(delimiter+"user_address"+delimiter, value)
content = content.replace(delimiter+"user_name"+delimiter, user_name)
LXMF_CONNECTION.send(source_hash, content, "", fields_generate(src_hash=bytes.fromhex(value), src_name=user_name, members=True, result_key="block", lng_key=lng_key), None, "interface_send")
LXMF_PEER.send(source_hash, content, "", fields_generate(src_hash=bytes.fromhex(value), src_name=user_name, members=True, result_key="block", lng_key=lng_key), None, "interface_send")
content = ""
if CONFIG["main"].getboolean("auto_save_data"):
@@ -2772,7 +2772,7 @@ def interface(cmd, source_hash, source_name, source_right, source_rights, lng_ke
elif (cmd.startswith("unblock ") or cmd.startswith("unban ")) and "unblock" in source_rights:
try:
cmd, value = cmd.split(" ", 1)
value = LXMF_CONNECTION.destination_correct(value)
value = LXMF_PEER.destination_correct(value)
if value != "":
executed = False
for section in DATA.sections():
@@ -2789,7 +2789,7 @@ def interface(cmd, source_hash, source_name, source_right, source_rights, lng_ke
if executed:
content_user = config_get(CONFIG, "interface_messages", "unblock_"+user_section, "", lng_key)
content_user = replace(content_user, source_hash, source_name, source_right, lng_key)
LXMF_CONNECTION.send(value, content_user, "", fields_generate(members=True, data=True, cmd=user_section, config=user_section, result_key="unblock", lng_key=lng_key), None, "interface_send")
LXMF_PEER.send(value, content_user, "", fields_generate(members=True, data=True, cmd=user_section, config=user_section, result_key="unblock", lng_key=lng_key), None, "interface_send")
content_group = config_get(CONFIG, "interface_messages", "member_unblock", "", lng_key)
content_group = replace(content_group, source_hash, source_name, source_right, lng_key)
@@ -2800,12 +2800,12 @@ def interface(cmd, source_hash, source_name, source_right, source_rights, lng_ke
if "receive_unblock" in config_get(CONFIG, "rights", section).split(","):
for (key, val) in DATA.items(section):
if key != source_hash and key != value:
LXMF_CONNECTION.send(key, content_group, "", fields, None, "interface_send")
LXMF_PEER.send(key, content_group, "", fields, None, "interface_send")
content = config_get(CONFIG, "interface_menu", "unblock_ok", "", lng_key)
content = content.replace(delimiter+"user_address"+delimiter, value)
content = content.replace(delimiter+"user_name"+delimiter, user_name)
LXMF_CONNECTION.send(source_hash, content, "", fields_generate(src_hash=bytes.fromhex(value), src_name=user_name, members=True, result_key="unblock", lng_key=lng_key), None, "interface_send")
LXMF_PEER.send(source_hash, content, "", fields_generate(src_hash=bytes.fromhex(value), src_name=user_name, members=True, result_key="unblock", lng_key=lng_key), None, "interface_send")
content = ""
if CONFIG["main"].getboolean("auto_save_data"):
@@ -2828,7 +2828,7 @@ def interface(cmd, source_hash, source_name, source_right, source_rights, lng_ke
cmd, value = cmd.split(" ", 1)
user_section = DATA["main"]["allow_user_type"]
if DATA.has_section(user_section) and user_section != "main":
value = LXMF_CONNECTION.destination_correct(value)
value = LXMF_PEER.destination_correct(value)
if value != "":
executed = False
section = "wait"
@@ -2843,7 +2843,7 @@ def interface(cmd, source_hash, source_name, source_right, source_rights, lng_ke
content_user = config_get(CONFIG, "interface_messages", "allow_"+user_section, "", lng_key)
content_user = replace(content_user, source_hash, source_name, source_right, lng_key)
if content_user != "":
LXMF_CONNECTION.send(value, content_user, "", fields_generate(members=True, data=True, cmd=user_section, config=user_section, lng_key=lng_key), None, "interface_send")
LXMF_PEER.send(value, content_user, "", fields_generate(members=True, data=True, cmd=user_section, config=user_section, lng_key=lng_key), None, "interface_send")
content_group = config_get(CONFIG, "interface_messages", "member_allow", "", lng_key)
content_group = replace(content_group, source_hash, source_name, source_right, lng_key)
@@ -2854,7 +2854,7 @@ def interface(cmd, source_hash, source_name, source_right, source_rights, lng_ke
for section in sections:
if "receive_allow" in config_get(CONFIG, "rights", section).split(","):
for (key, val) in DATA.items(section):
LXMF_CONNECTION.send(key, content_group, "", fields, None, "interface_send")
LXMF_PEER.send(key, content_group, "", fields, None, "interface_send")
content = config_get(CONFIG, "interface_menu", "allow_ok", "", lng_key)
content = content.replace(delimiter+"user_address"+delimiter, value)
@@ -2882,7 +2882,7 @@ def interface(cmd, source_hash, source_name, source_right, source_rights, lng_ke
cmd, value = cmd.split(" ", 1)
user_section = DATA["main"]["deny_user_type"]
if DATA.has_section(user_section) and user_section != "main":
value = LXMF_CONNECTION.destination_correct(value)
value = LXMF_PEER.destination_correct(value)
if value != "":
executed = False
for section in sections:
@@ -2896,7 +2896,7 @@ def interface(cmd, source_hash, source_name, source_right, source_rights, lng_ke
content_user = config_get(CONFIG, "interface_messages", "deny_"+user_section, "", lng_key)
content_user = replace(content_user, source_hash, source_name, source_right, lng_key)
if content_user != "":
LXMF_CONNECTION.send(value, content_user, "", fields_generate(lng_key=lng_key), None, "interface_send")
LXMF_PEER.send(value, content_user, "", fields_generate(lng_key=lng_key), None, "interface_send")
content_group = config_get(CONFIG, "interface_messages", "member_deny", "", lng_key)
content_group = replace(content_group, source_hash, source_name, source_right, lng_key)
@@ -2907,7 +2907,7 @@ def interface(cmd, source_hash, source_name, source_right, source_rights, lng_ke
for section in sections:
if "receive_deny" in config_get(CONFIG, "rights", section).split(","):
for (key, val) in DATA.items(section):
LXMF_CONNECTION.send(key, content_group, "", fields, None, "interface_send")
LXMF_PEER.send(key, content_group, "", fields, None, "interface_send")
content = config_get(CONFIG, "interface_menu", "deny_ok", "", lng_key)
content = content.replace(delimiter+"user_address"+delimiter, value)
@@ -2935,7 +2935,7 @@ def interface(cmd, source_hash, source_name, source_right, source_rights, lng_ke
cmd, value = cmd.split(" ", 1)
key = "admin"
if DATA.has_section(key) and key != "main":
value = LXMF_CONNECTION.destination_correct(value)
value = LXMF_PEER.destination_correct(value)
if value != "":
for section in DATA.sections():
if section != "main":
@@ -2947,7 +2947,7 @@ def interface(cmd, source_hash, source_name, source_right, source_rights, lng_ke
content_user = config_get(CONFIG, "interface_messages", "right", "", lng_key)
content_user = replace(content_user, source_hash, source_name, source_right, lng_key)
content_user = content_user.replace(delimiter+"user_name"+delimiter, val_old)
LXMF_CONNECTION.send(value, content_user, "", fields_generate(members=True, data=True, cmd=key, config=key, result_key="right_admin", lng_key=lng_key), None, "interface_send")
LXMF_PEER.send(value, content_user, "", fields_generate(members=True, data=True, cmd=key, config=key, result_key="right_admin", lng_key=lng_key), None, "interface_send")
content_group = config_get(CONFIG, "interface_messages", "member_right", "", lng_key)
content_group = replace(content_group, source_hash, source_name, source_right, lng_key)
content_group = content_group.replace(delimiter+"user_address"+delimiter, value)
@@ -2957,11 +2957,11 @@ def interface(cmd, source_hash, source_name, source_right, source_rights, lng_ke
if "receive_right" in config_get(CONFIG, "rights", section).split(","):
for (key, val) in DATA.items(section):
if key != source_hash and key != value:
LXMF_CONNECTION.send(key, content_group, "", fields, None, "interface_send")
LXMF_PEER.send(key, content_group, "", fields, None, "interface_send")
content = config_get(CONFIG, "interface_menu", "right_ok", "", lng_key)
content = content.replace(delimiter+"user_address"+delimiter, value)
content = content.replace(delimiter+"user_name"+delimiter, val_old)
LXMF_CONNECTION.send(source_hash, content, "", fields_generate(src_hash=bytes.fromhex(value), src_name=val_old, members=True, result_key="right_admin", lng_key=lng_key), None, "interface_send")
LXMF_PEER.send(source_hash, content, "", fields_generate(src_hash=bytes.fromhex(value), src_name=val_old, members=True, result_key="right_admin", lng_key=lng_key), None, "interface_send")
content = ""
if CONFIG["main"].getboolean("auto_save_data"):
DATA.remove_option("main", "unsaved")
@@ -2983,7 +2983,7 @@ def interface(cmd, source_hash, source_name, source_right, source_rights, lng_ke
cmd, value = cmd.split(" ", 1)
key = "mod"
if DATA.has_section(key) and key != "main":
value = LXMF_CONNECTION.destination_correct(value)
value = LXMF_PEER.destination_correct(value)
if value != "":
for section in DATA.sections():
if section != "main":
@@ -2995,7 +2995,7 @@ def interface(cmd, source_hash, source_name, source_right, source_rights, lng_ke
content_user = config_get(CONFIG, "interface_messages", "right", "", lng_key)
content_user = replace(content_user, source_hash, source_name, source_right, lng_key)
content_user = content_user.replace(delimiter+"user_name"+delimiter, val_old)
LXMF_CONNECTION.send(value, content_user, "", fields_generate(members=True, data=True, cmd=key, config=key, result_key="right_mod", lng_key=lng_key), None, "interface_send")
LXMF_PEER.send(value, content_user, "", fields_generate(members=True, data=True, cmd=key, config=key, result_key="right_mod", lng_key=lng_key), None, "interface_send")
content_group = config_get(CONFIG, "interface_messages", "member_right", "", lng_key)
content_group = replace(content_group, source_hash, source_name, source_right, lng_key)
@@ -3006,12 +3006,12 @@ def interface(cmd, source_hash, source_name, source_right, source_rights, lng_ke
if "receive_right" in config_get(CONFIG, "rights", section).split(","):
for (key, val) in DATA.items(section):
if key != source_hash and key != value:
LXMF_CONNECTION.send(key, content_group, "", fields, None, "interface_send")
LXMF_PEER.send(key, content_group, "", fields, None, "interface_send")
content = config_get(CONFIG, "interface_menu", "right_ok", "", lng_key)
content = content.replace(delimiter+"user_address"+delimiter, value)
content = content.replace(delimiter+"user_name"+delimiter, val_old)
LXMF_CONNECTION.send(source_hash, content, "", fields_generate(src_hash=bytes.fromhex(value), src_name=val_old, members=True, result_key="right_mod", lng_key=lng_key), None, "interface_send")
LXMF_PEER.send(source_hash, content, "", fields_generate(src_hash=bytes.fromhex(value), src_name=val_old, members=True, result_key="right_mod", lng_key=lng_key), None, "interface_send")
content = ""
if CONFIG["main"].getboolean("auto_save_data"):
@@ -3034,7 +3034,7 @@ def interface(cmd, source_hash, source_name, source_right, source_rights, lng_ke
cmd, value = cmd.split(" ", 1)
key = "user"
if DATA.has_section(key) and key != "main":
value = LXMF_CONNECTION.destination_correct(value)
value = LXMF_PEER.destination_correct(value)
if value != "":
for section in DATA.sections():
if section != "main":
@@ -3046,7 +3046,7 @@ def interface(cmd, source_hash, source_name, source_right, source_rights, lng_ke
content_user = config_get(CONFIG, "interface_messages", "right", "", lng_key)
content_user = replace(content_user, source_hash, source_name, source_right, lng_key)
content_user = content_user.replace(delimiter+"user_name"+delimiter, val_old)
LXMF_CONNECTION.send(value, content_user, "", fields_generate(members=True, data=True, cmd=key, config=key, result_key="right_user", lng_key=lng_key), None, "interface_send")
LXMF_PEER.send(value, content_user, "", fields_generate(members=True, data=True, cmd=key, config=key, result_key="right_user", lng_key=lng_key), None, "interface_send")
content_group = config_get(CONFIG, "interface_messages", "member_right", "", lng_key)
content_group = replace(content_group, source_hash, source_name, source_right, lng_key)
@@ -3057,12 +3057,12 @@ def interface(cmd, source_hash, source_name, source_right, source_rights, lng_ke
if "receive_right" in config_get(CONFIG, "rights", section).split(","):
for (key, val) in DATA.items(section):
if key != source_hash and key != value:
LXMF_CONNECTION.send(key, content_group, "", fields, None, "interface_send")
LXMF_PEER.send(key, content_group, "", fields, None, "interface_send")
content = config_get(CONFIG, "interface_menu", "right_ok", "", lng_key)
content = content.replace(delimiter+"user_address"+delimiter, value)
content = content.replace(delimiter+"user_name"+delimiter, val_old)
LXMF_CONNECTION.send(source_hash, content, "", fields_generate(src_hash=bytes.fromhex(value), src_name=val_old, members=True, result_key="right_user", lng_key=lng_key), None, "interface_send")
LXMF_PEER.send(source_hash, content, "", fields_generate(src_hash=bytes.fromhex(value), src_name=val_old, members=True, result_key="right_user", lng_key=lng_key), None, "interface_send")
content = ""
if CONFIG["main"].getboolean("auto_save_data"):
@@ -3085,7 +3085,7 @@ def interface(cmd, source_hash, source_name, source_right, source_rights, lng_ke
cmd, value = cmd.split(" ", 1)
key = "guest"
if DATA.has_section(key) and key != "main":
value = LXMF_CONNECTION.destination_correct(value)
value = LXMF_PEER.destination_correct(value)
if value != "":
for section in DATA.sections():
if section != "main":
@@ -3097,7 +3097,7 @@ def interface(cmd, source_hash, source_name, source_right, source_rights, lng_ke
content_user = config_get(CONFIG, "interface_messages", "right", "", lng_key)
content_user = replace(content_user, source_hash, source_name, source_right, lng_key)
content_user = content_user.replace(delimiter+"user_name"+delimiter, val_old)
LXMF_CONNECTION.send(value, content_user, "", fields_generate(members=True, data=True, cmd=key, config=key, result_key="right_guest", lng_key=lng_key), None, "interface_send")
LXMF_PEER.send(value, content_user, "", fields_generate(members=True, data=True, cmd=key, config=key, result_key="right_guest", lng_key=lng_key), None, "interface_send")
content_group = config_get(CONFIG, "interface_messages", "member_right", "", lng_key)
content_group = replace(content_group, source_hash, source_name, source_right, lng_key)
@@ -3108,12 +3108,12 @@ def interface(cmd, source_hash, source_name, source_right, source_rights, lng_ke
if "receive_right" in config_get(CONFIG, "rights", section).split(","):
for (key, val) in DATA.items(section):
if key != source_hash and key != value:
LXMF_CONNECTION.send(key, content_group, "", fields, None, "interface_send")
LXMF_PEER.send(key, content_group, "", fields, None, "interface_send")
content = config_get(CONFIG, "interface_menu", "right_ok", "", lng_key)
content = content.replace(delimiter+"user_address"+delimiter, value)
content = content.replace(delimiter+"user_name"+delimiter, val_old)
LXMF_CONNECTION.send(source_hash, content, "", fields_generate(src_hash=bytes.fromhex(value), src_name=val_old, members=True, result_key="right_guest", lng_key=lng_key), None, "interface_send")
LXMF_PEER.send(source_hash, content, "", fields_generate(src_hash=bytes.fromhex(value), src_name=val_old, members=True, result_key="right_guest", lng_key=lng_key), None, "interface_send")
content = ""
if CONFIG["main"].getboolean("auto_save_data"):
@@ -3311,7 +3311,7 @@ def fields_generate(fields=None, src_hash=None, src_name=None, members=False, da
fields[MSG_FIELD_DATA]["m"][key] = {}
for (section_key, section_val) in DATA.items(key):
try:
h = bytes.fromhex(LXMF_CONNECTION.destination_correct(section_key))
h = bytes.fromhex(LXMF_PEER.destination_correct(section_key))
fields[MSG_FIELD_DATA]["m"][key][h] = section_val
except:
pass
@@ -3371,7 +3371,7 @@ def replace(text, source_hash, source_name, source_right, lng_key):
text = text.replace(delimiter+"name"+delimiter, config_get(CONFIG, "main", "name", "", lng_key))
text = text.replace(delimiter+"display_name"+delimiter, config_get(CONFIG, "lxmf", "display_name", "", lng_key))
text = text.replace(delimiter+"description"+delimiter, config_get(DATA, "main", "description", "", lng_key))
text = text.replace(delimiter+"destination_address"+delimiter, LXMF_CONNECTION.destination_hash_str())
text = text.replace(delimiter+"destination_address"+delimiter, LXMF_PEER.destination_hash_str())
text = text.replace(delimiter+"propagation_node"+delimiter, config_get(CONFIG, "lxmf", "propagation_node", "", lng_key))
text = text.replace(delimiter+"cluster_name"+delimiter, config_get(CONFIG, "cluster", "display_name", "", lng_key).rsplit('/', 1)[-1])
@@ -4171,7 +4171,7 @@ def setup(path=None, path_rns=None, path_log=None, loglevel=None, service=False,
global LOG_LEVEL
global LOG_FILE
global RNS_MAIN_CONNECTION
global LXMF_CONNECTION
global LXMF_PEER
global RNS_CONNECTION
if path is not None:
@@ -4253,16 +4253,6 @@ def setup(path=None, path_rns=None, path_log=None, loglevel=None, service=False,
log("LXMF - Connecting ...", LOG_DEBUG)
if CONFIG.has_option("lxmf", "propagation_node"):
config_propagation_node = CONFIG["lxmf"]["propagation_node"]
else:
config_propagation_node = None
if CONFIG.has_option("lxmf", "propagation_node_active"):
config_propagation_node_active = CONFIG["lxmf"]["propagation_node_active"]
else:
config_propagation_node_active = None
if path is None:
path = PATH
@@ -4288,7 +4278,7 @@ def setup(path=None, path_rns=None, path_log=None, loglevel=None, service=False,
except:
pass
LXMF_CONNECTION = lxmf_connection(
LXMF_PEER = LXMFPeer(
storage_path=path,
identity_file="identity",
identity=None,
@@ -4299,9 +4289,9 @@ def setup(path=None, path_rns=None, path_log=None, loglevel=None, service=False,
announce_hidden=CONFIG["lxmf"].getboolean("announce_hidden"),
send_delay=CONFIG["lxmf"]["send_delay"],
method=CONFIG["lxmf"]["method"],
propagation_node=config_propagation_node,
propagation_node=CONFIG["lxmf"]["propagation_node"] if CONFIG.has_option("lxmf", "propagation_node") else None,
propagation_node_auto=CONFIG["lxmf"].getboolean("propagation_node_auto"),
propagation_node_active=config_propagation_node_active,
propagation_node_active=CONFIG["lxmf"]["propagation_node_active"] if CONFIG.has_option("lxmf", "propagation_node_active") else None,
stamps_enabled=CONFIG["lxmf"].getboolean("stamps_enabled"),
stamps_required=CONFIG["lxmf"].getboolean("stamps_required"),
stamps_cost=CONFIG["lxmf"]["stamps_cost"],
@@ -4315,24 +4305,24 @@ def setup(path=None, path_rns=None, path_log=None, loglevel=None, service=False,
sync_periodic=CONFIG["lxmf"].getboolean("sync_periodic"),
sync_periodic_interval=CONFIG["lxmf"]["sync_periodic_interval"])
LXMF_CONNECTION.register_announce_callback(lxmf_announce_callback)
LXMF_CONNECTION.register_message_received_callback(lxmf_message_received_callback)
LXMF_CONNECTION.register_config_set_callback(config_set)
LXMF_PEER.register_announce_callback(lxmf_announce_callback)
LXMF_PEER.register_message_received_callback(lxmf_message_received_callback)
LXMF_PEER.register_config_set_callback(config_set)
if CONFIG["statistic"].getboolean("enabled"):
LXMF_CONNECTION.register_message_notification_success_callback(lxmf_message_notification_success_callback)
LXMF_CONNECTION.register_message_notification_failed_callback(lxmf_message_notification_failed_callback)
LXMF_PEER.register_message_notification_success_callback(lxmf_message_notification_success_callback)
LXMF_PEER.register_message_notification_failed_callback(lxmf_message_notification_failed_callback)
log("LXMF - Connected", LOG_DEBUG)
log("...............................................................................", LOG_FORCE)
log("LXMF - Address: " + RNS.prettyhexrep(LXMF_CONNECTION.destination_hash()), LOG_FORCE)
log("LXMF - Address: " + RNS.prettyhexrep(LXMF_PEER.destination_hash()), LOG_FORCE)
log("...............................................................................", LOG_FORCE)
if CONFIG["cluster"].getboolean("enabled") or CONFIG["router"].getboolean("enabled") or CONFIG["high_availability"].getboolean("enabled"):
announce_data = defaultdict(dict)
announce_data["h"] = LXMF_CONNECTION.destination_hash_str()
announce_data["h"] = LXMF_PEER.destination_hash_str()
if CONFIG["high_availability"].getboolean("enabled"):
announce_data["ha"] = "1"
@@ -4356,7 +4346,7 @@ def setup(path=None, path_rns=None, path_log=None, loglevel=None, service=False,
RNS_CONNECTION = rns_connection(
storage_path=path,
identity_file="identity",
identity=LXMF_CONNECTION.identity,
identity=LXMF_PEER.identity,
destination_name=CONFIG["cluster"]["name"],
destination_type=CONFIG["cluster"]["type"],
announce_startup=CONFIG["rns"].getboolean("announce_startup"),

36
lxmf_distribution_group_minimal/lxmf_distribution_group_minimal.py
View File

@@ -81,7 +81,7 @@ PATH_RNS = None
DATA = None
CONFIG = None
RNS_CONNECTION = None
LXMF_CONNECTION = None
LXMF_PEER = None
MSG_FIELD_EMBEDDED_LXMS = 0x01
MSG_FIELD_TELEMETRY = 0x02
@@ -144,7 +144,7 @@ MSG_FIELD_VOICE = 0xBF
# LXMF Class
class lxmf_connection:
class LXMFPeer:
message_received_callback = None
message_notification_callback = None
message_notification_success_callback = None
@@ -269,7 +269,7 @@ class lxmf_connection:
self.destination.set_link_established_callback(self.client_connected)
if self.propagation_node_auto:
self.propagation_callback = lxmf_connection_propagation(self, "lxmf.propagation")
self.propagation_callback = LXMFPeerPropagation(self, "lxmf.propagation")
RNS.Transport.register_announce_handler(self.propagation_callback)
if self.propagation_node_active:
self.propagation_node_set(self.propagation_node_active)
@@ -672,7 +672,7 @@ class lxmf_connection:
log("- App Data: " + message.app_data, LOG_DEBUG)
class lxmf_connection_propagation():
class LXMFPeerPropagation():
def __init__(self, owner, aspect_filter=None):
self.owner = owner
self.aspect_filter = aspect_filter
@@ -864,7 +864,7 @@ def lxmf_message_received_callback(message):
if "receive" in section:
for (key, val) in DATA.items(section):
if key != source_hash:
LXMF_CONNECTION.send(key, content, title, fields, timestamp)
LXMF_PEER.send(key, content, title, fields, timestamp)
return
else:
log("LXMF - Source " + RNS.prettyhexrep(message.source_hash) + " 'send' not allowed", LOG_DEBUG)
@@ -1279,7 +1279,7 @@ def setup(path=None, path_rns=None, path_log=None, loglevel=None, service=False,
global LOG_LEVEL
global LOG_FILE
global RNS_CONNECTION
global LXMF_CONNECTION
global LXMF_PEER
if path is not None:
if path.endswith("/"):
@@ -1341,16 +1341,6 @@ def setup(path=None, path_rns=None, path_log=None, loglevel=None, service=False,
log("LXMF - Connecting ...", LOG_DEBUG)
if CONFIG.has_option("lxmf", "propagation_node"):
config_propagation_node = CONFIG["lxmf"]["propagation_node"]
else:
config_propagation_node = None
if CONFIG.has_option("lxmf", "propagation_node_active"):
config_propagation_node_active = CONFIG["lxmf"]["propagation_node_active"]
else:
config_propagation_node_active = None
if path is None:
path = PATH
@@ -1371,7 +1361,7 @@ def setup(path=None, path_rns=None, path_log=None, loglevel=None, service=False,
except:
pass
LXMF_CONNECTION = lxmf_connection(
LXMF_PEER = LXMFPeer(
storage_path=path,
destination_name=CONFIG["lxmf"]["destination_name"],
destination_type=CONFIG["lxmf"]["destination_type"],
@@ -1380,9 +1370,9 @@ def setup(path=None, path_rns=None, path_log=None, loglevel=None, service=False,
announce_hidden=CONFIG["lxmf"].getboolean("announce_hidden"),
send_delay=CONFIG["lxmf"]["send_delay"],
method=CONFIG["lxmf"]["method"],
propagation_node=config_propagation_node,
propagation_node=CONFIG["lxmf"]["propagation_node"] if CONFIG.has_option("lxmf", "propagation_node") else None,
propagation_node_auto=CONFIG["lxmf"].getboolean("propagation_node_auto"),
propagation_node_active=config_propagation_node_active,
propagation_node_active=CONFIG["lxmf"]["propagation_node_active"] if CONFIG.has_option("lxmf", "propagation_node_active") else None,
stamps_enabled=CONFIG["lxmf"].getboolean("stamps_enabled"),
stamps_required=CONFIG["lxmf"].getboolean("stamps_required"),
stamps_cost=CONFIG["lxmf"]["stamps_cost"],
@@ -1396,14 +1386,14 @@ def setup(path=None, path_rns=None, path_log=None, loglevel=None, service=False,
sync_periodic=CONFIG["lxmf"].getboolean("sync_periodic"),
sync_periodic_interval=CONFIG["lxmf"]["sync_periodic_interval"])
LXMF_CONNECTION.register_announce_callback(lxmf_announce_callback)
LXMF_CONNECTION.register_message_received_callback(lxmf_message_received_callback)
LXMF_CONNECTION.register_config_set_callback(config_set)
LXMF_PEER.register_announce_callback(lxmf_announce_callback)
LXMF_PEER.register_message_received_callback(lxmf_message_received_callback)
LXMF_PEER.register_config_set_callback(config_set)
log("LXMF - Connected", LOG_DEBUG)
log("...............................................................................", LOG_FORCE)
log("LXMF - Address: " + RNS.prettyhexrep(LXMF_CONNECTION.destination_hash()), LOG_FORCE)
log("LXMF - Address: " + RNS.prettyhexrep(LXMF_PEER.destination_hash()), LOG_FORCE)
log("...............................................................................", LOG_FORCE)
while True:

38
lxmf_echo/lxmf_echo.py
View File

@@ -80,7 +80,7 @@ PATH_RNS = None
DATA = None
CONFIG = None
RNS_CONNECTION = None
LXMF_CONNECTION = None
LXMF_PEER = None
MSG_FIELD_EMBEDDED_LXMS = 0x01
MSG_FIELD_TELEMETRY = 0x02
@@ -143,7 +143,7 @@ MSG_FIELD_VOICE = 0xBF
# LXMF Class
class lxmf_connection:
class LXMFPeer:
message_received_callback = None
message_notification_callback = None
message_notification_success_callback = None
@@ -268,7 +268,7 @@ class lxmf_connection:
self.destination.set_link_established_callback(self.client_connected)
if self.propagation_node_auto:
self.propagation_callback = lxmf_connection_propagation(self, "lxmf.propagation")
self.propagation_callback = LXMFPeerPropagation(self, "lxmf.propagation")
RNS.Transport.register_announce_handler(self.propagation_callback)
if self.propagation_node_active:
self.propagation_node_set(self.propagation_node_active)
@@ -671,7 +671,7 @@ class lxmf_connection:
log("- App Data: " + message.app_data, LOG_DEBUG)
class lxmf_connection_propagation():
class LXMFPeerPropagation():
def __init__(self, owner, aspect_filter=None):
self.owner = owner
self.aspect_filter = aspect_filter
@@ -787,7 +787,7 @@ class lxmf_announce_callback:
DATA["main"]["unsaved"] = "True"
else:
DATA["main"]["unsaved"] = "True"
LXMF_CONNECTION.send(source_hash, config_get(CONFIG, "lxmf", "announce_auto_message_content", "").replace("!n!", "\n"), "")
LXMF_PEER.send(source_hash, config_get(CONFIG, "lxmf", "announce_auto_message_content", "").replace("!n!", "\n"), "")
#### LXMF - Message ####
@@ -887,7 +887,7 @@ def lxmf_message_received_callback(message):
else:
fields = None
LXMF_CONNECTION.send(message.source_hash, content, title, fields)
LXMF_PEER.send(message.source_hash, content, title, fields)
else:
log("LXMF - Source " + RNS.prettyhexrep(message.source_hash) + " not allowed", LOG_DEBUG)
return
@@ -1300,7 +1300,7 @@ def setup(path=None, path_rns=None, path_log=None, loglevel=None, service=False,
global LOG_LEVEL
global LOG_FILE
global RNS_CONNECTION
global LXMF_CONNECTION
global LXMF_PEER
if path is not None:
if path.endswith("/"):
@@ -1362,16 +1362,6 @@ def setup(path=None, path_rns=None, path_log=None, loglevel=None, service=False,
log("LXMF - Connecting ...", LOG_DEBUG)
if CONFIG.has_option("lxmf", "propagation_node"):
config_propagation_node = CONFIG["lxmf"]["propagation_node"]
else:
config_propagation_node = None
if CONFIG.has_option("lxmf", "propagation_node_active"):
config_propagation_node_active = CONFIG["lxmf"]["propagation_node_active"]
else:
config_propagation_node_active = None
if path is None:
path = PATH
@@ -1392,7 +1382,7 @@ def setup(path=None, path_rns=None, path_log=None, loglevel=None, service=False,
except:
pass
LXMF_CONNECTION = lxmf_connection(
LXMF_PEER = LXMFPeer(
storage_path=path,
destination_name=CONFIG["lxmf"]["destination_name"],
destination_type=CONFIG["lxmf"]["destination_type"],
@@ -1401,9 +1391,9 @@ def setup(path=None, path_rns=None, path_log=None, loglevel=None, service=False,
announce_hidden=CONFIG["lxmf"].getboolean("announce_hidden"),
send_delay=CONFIG["lxmf"]["send_delay"],
method=CONFIG["lxmf"]["method"],
propagation_node=config_propagation_node,
propagation_node=CONFIG["lxmf"]["propagation_node"] if CONFIG.has_option("lxmf", "propagation_node") else None,
propagation_node_auto=CONFIG["lxmf"].getboolean("propagation_node_auto"),
propagation_node_active=config_propagation_node_active,
propagation_node_active=CONFIG["lxmf"]["propagation_node_active"] if CONFIG.has_option("lxmf", "propagation_node_active") else None,
stamps_enabled=CONFIG["lxmf"].getboolean("stamps_enabled"),
stamps_required=CONFIG["lxmf"].getboolean("stamps_required"),
stamps_cost=CONFIG["lxmf"]["stamps_cost"],
@@ -1417,14 +1407,14 @@ def setup(path=None, path_rns=None, path_log=None, loglevel=None, service=False,
sync_periodic=CONFIG["lxmf"].getboolean("sync_periodic"),
sync_periodic_interval=CONFIG["lxmf"]["sync_periodic_interval"])
LXMF_CONNECTION.register_announce_callback(lxmf_announce_callback)
LXMF_CONNECTION.register_message_received_callback(lxmf_message_received_callback)
LXMF_CONNECTION.register_config_set_callback(config_set)
LXMF_PEER.register_announce_callback(lxmf_announce_callback)
LXMF_PEER.register_message_received_callback(lxmf_message_received_callback)
LXMF_PEER.register_config_set_callback(config_set)
log("LXMF - Connected", LOG_DEBUG)
log("...............................................................................", LOG_FORCE)
log("LXMF - Address: " + RNS.prettyhexrep(LXMF_CONNECTION.destination_hash()), LOG_FORCE)
log("LXMF - Address: " + RNS.prettyhexrep(LXMF_PEER.destination_hash()), LOG_FORCE)
log("...............................................................................", LOG_FORCE)
if CONFIG["main"].getboolean("periodic_save_data"):

38
lxmf_provisioning/lxmf_provisioning.py
View File

@@ -96,7 +96,7 @@ CACHE["out"] = {}
CACHE_CHANGE = False
CONFIG = None
RNS_CONNECTION = None
LXMF_CONNECTION = None
LXMF_PEER = None
DB_CONNECTION = None
MSG_FIELD_EMBEDDED_LXMS = 0x01
@@ -162,7 +162,7 @@ TYPE_PROV = 0xAE
# LXMF Class
class lxmf_connection:
class LXMFPeer:
message_received_callback = None
message_notification_callback = None
message_notification_success_callback = None
@@ -287,7 +287,7 @@ class lxmf_connection:
self.destination.set_link_established_callback(self.client_connected)
if self.propagation_node_auto:
self.propagation_callback = lxmf_connection_propagation(self, "lxmf.propagation")
self.propagation_callback = LXMFPeerPropagation(self, "lxmf.propagation")
RNS.Transport.register_announce_handler(self.propagation_callback)
if self.propagation_node_active:
self.propagation_node_set(self.propagation_node_active)
@@ -690,7 +690,7 @@ class lxmf_connection:
log("- App Data: " + message.app_data, LOG_DEBUG)
class lxmf_connection_propagation():
class LXMFPeerPropagation():
def __init__(self, owner, aspect_filter=None):
self.owner = owner
self.aspect_filter = aspect_filter
@@ -1039,7 +1039,7 @@ def jobs_out():
if CONFIG["lxmf"]["destination_type_conv"] != "":
fields[MSG_FIELD_TYPE] = CONFIG["lxmf"].getint("destination_type_conv")
fields[MSG_FIELD_TYPE_FIELDS] = value["fields"]
LXMF_CONNECTION.send(value["hash_destination"], "", "", fields=fields, app_data=key, destination_name="lxmf", destination_type="delivery")
LXMF_PEER.send(value["hash_destination"], "", "", fields=fields, app_data=key, destination_name="lxmf", destination_type="delivery")
except:
pass
@@ -1421,7 +1421,7 @@ def setup(path=None, path_rns=None, path_log=None, loglevel=None, service=False,
global LOG_LEVEL
global LOG_FILE
global RNS_CONNECTION
global LXMF_CONNECTION
global LXMF_PEER
if path is not None:
if path.endswith("/"):
@@ -1482,16 +1482,6 @@ def setup(path=None, path_rns=None, path_log=None, loglevel=None, service=False,
log("LXMF - Connecting ...", LOG_DEBUG)
if CONFIG.has_option("lxmf", "propagation_node"):
config_propagation_node = CONFIG["lxmf"]["propagation_node"]
else:
config_propagation_node = None
if CONFIG.has_option("lxmf", "propagation_node_active"):
config_propagation_node_active = CONFIG["lxmf"]["propagation_node_active"]
else:
config_propagation_node_active = None
if path is None:
path = PATH
@@ -1538,7 +1528,7 @@ def setup(path=None, path_rns=None, path_log=None, loglevel=None, service=False,
if len(type_fields) > 0:
announce_fields[MSG_FIELD_TYPE_FIELDS] = type_fields
LXMF_CONNECTION = lxmf_connection(
LXMF_PEER = LXMFPeer(
storage_path=path,
destination_name=CONFIG["lxmf"]["destination_name"],
destination_type=CONFIG["lxmf"]["destination_type"],
@@ -1547,9 +1537,9 @@ def setup(path=None, path_rns=None, path_log=None, loglevel=None, service=False,
announce_hidden=CONFIG["lxmf"].getboolean("announce_hidden"),
send_delay=CONFIG["lxmf"]["send_delay"],
method=CONFIG["lxmf"]["method"],
propagation_node=config_propagation_node,
propagation_node=CONFIG["lxmf"]["propagation_node"] if CONFIG.has_option("lxmf", "propagation_node") else None,
propagation_node_auto=CONFIG["lxmf"].getboolean("propagation_node_auto"),
propagation_node_active=config_propagation_node_active,
propagation_node_active=CONFIG["lxmf"]["propagation_node_active"] if CONFIG.has_option("lxmf", "propagation_node_active") else None,
stamps_enabled=CONFIG["lxmf"].getboolean("stamps_enabled"),
stamps_required=CONFIG["lxmf"].getboolean("stamps_required"),
stamps_cost=CONFIG["lxmf"]["stamps_cost"],
@@ -1563,15 +1553,15 @@ def setup(path=None, path_rns=None, path_log=None, loglevel=None, service=False,
sync_periodic=CONFIG["lxmf"].getboolean("sync_periodic"),
sync_periodic_interval=CONFIG["lxmf"]["sync_periodic_interval"])
LXMF_CONNECTION.register_announce_callback(lxmf_announce_callback)
LXMF_CONNECTION.register_message_received_callback(lxmf_message_received_callback)
LXMF_CONNECTION.register_message_notification_success_callback(lxmf_message_notification_success_callback)
LXMF_CONNECTION.register_config_set_callback(config_set)
LXMF_PEER.register_announce_callback(lxmf_announce_callback)
LXMF_PEER.register_message_received_callback(lxmf_message_received_callback)
LXMF_PEER.register_message_notification_success_callback(lxmf_message_notification_success_callback)
LXMF_PEER.register_config_set_callback(config_set)
log("LXMF - Connected", LOG_DEBUG)
log("...............................................................................", LOG_FORCE)
log("LXMF - Address: " + RNS.prettyhexrep(LXMF_CONNECTION.destination_hash()), LOG_FORCE)
log("LXMF - Address: " + RNS.prettyhexrep(LXMF_PEER.destination_hash()), LOG_FORCE)
log("...............................................................................", LOG_FORCE)
log("...............................................................................", LOG_EXTREME)

36
lxmf_terminal/lxmf_terminal.py
View File

@@ -88,7 +88,7 @@ PATH_RNS = None
#### Global Variables - System (Not changeable) ####
CONFIG = None
RNS_CONNECTION = None
LXMF_CONNECTION = None
LXMF_PEER = None
SESSION = {}
TERMINAL = None
@@ -153,7 +153,7 @@ MSG_FIELD_VOICE = 0xBF
# Terminal Class
class lxmf_connection:
class LXMFPeer:
message_received_callback = None
message_notification_callback = None
message_notification_success_callback = None
@@ -278,7 +278,7 @@ class lxmf_connection:
self.destination.set_link_established_callback(self.client_connected)
if self.propagation_node_auto:
self.propagation_callback = lxmf_connection_propagation(self, "lxmf.propagation")
self.propagation_callback = LXMFPeerPropagation(self, "lxmf.propagation")
RNS.Transport.register_announce_handler(self.propagation_callback)
if self.propagation_node_active:
self.propagation_node_set(self.propagation_node_active)
@@ -681,7 +681,7 @@ class lxmf_connection:
log("- App Data: " + message.app_data, LOG_DEBUG)
class lxmf_connection_propagation():
class LXMFPeerPropagation():
def __init__(self, owner, aspect_filter=None):
self.owner = owner
self.aspect_filter = aspect_filter
@@ -912,7 +912,7 @@ def output_now():
if search != "":
output = re.sub(search, config_get(CONFIG, "message", "send_regex_replace"), output)
LXMF_CONNECTION.send(SESSION["source"], content_prefix + output + content_suffix)
LXMF_PEER.send(SESSION["source"], content_prefix + output + content_suffix)
return True
@@ -1240,7 +1240,7 @@ def setup(path=None, path_rns=None, path_log=None, loglevel=None, service=False,
global LOG_LEVEL
global LOG_FILE
global RNS_CONNECTION
global LXMF_CONNECTION
global LXMF_PEER
global TERMINAL
if path is not None:
@@ -1298,16 +1298,6 @@ def setup(path=None, path_rns=None, path_log=None, loglevel=None, service=False,
log("LXMF - Connecting ...", LOG_DEBUG)
if CONFIG.has_option("lxmf", "propagation_node"):
config_propagation_node = CONFIG["lxmf"]["propagation_node"]
else:
config_propagation_node = None
if CONFIG.has_option("lxmf", "propagation_node_active"):
config_propagation_node_active = CONFIG["lxmf"]["propagation_node_active"]
else:
config_propagation_node_active = None
if path is None:
path = PATH
@@ -1328,7 +1318,7 @@ def setup(path=None, path_rns=None, path_log=None, loglevel=None, service=False,
except:
pass
LXMF_CONNECTION = lxmf_connection(
LXMF_PEER = LXMFPeer(
storage_path=path,
destination_name=CONFIG["lxmf"]["destination_name"],
destination_type=CONFIG["lxmf"]["destination_type"],
@@ -1337,9 +1327,9 @@ def setup(path=None, path_rns=None, path_log=None, loglevel=None, service=False,
announce_hidden=CONFIG["lxmf"].getboolean("announce_hidden"),
send_delay=CONFIG["lxmf"]["send_delay"],
method=CONFIG["lxmf"]["method"],
propagation_node=config_propagation_node,
propagation_node=CONFIG["lxmf"]["propagation_node"] if CONFIG.has_option("lxmf", "propagation_node") else None,
propagation_node_auto=CONFIG["lxmf"].getboolean("propagation_node_auto"),
propagation_node_active=config_propagation_node_active,
propagation_node_active=CONFIG["lxmf"]["propagation_node_active"] if CONFIG.has_option("lxmf", "propagation_node_active") else None,
stamps_enabled=CONFIG["lxmf"].getboolean("stamps_enabled"),
stamps_required=CONFIG["lxmf"].getboolean("stamps_required"),
stamps_cost=CONFIG["lxmf"]["stamps_cost"],
@@ -1353,14 +1343,14 @@ def setup(path=None, path_rns=None, path_log=None, loglevel=None, service=False,
sync_periodic=CONFIG["lxmf"].getboolean("sync_periodic"),
sync_periodic_interval=CONFIG["lxmf"]["sync_periodic_interval"])
LXMF_CONNECTION.register_announce_callback(lxmf_announce_callback)
LXMF_CONNECTION.register_message_received_callback(lxmf_message_received_callback)
LXMF_CONNECTION.register_config_set_callback(config_set)
LXMF_PEER.register_announce_callback(lxmf_announce_callback)
LXMF_PEER.register_message_received_callback(lxmf_message_received_callback)
LXMF_PEER.register_config_set_callback(config_set)
log("LXMF - Connected", LOG_DEBUG)
log("...............................................................................", LOG_FORCE)
log("LXMF - Address: " + RNS.prettyhexrep(LXMF_CONNECTION.destination_hash()), LOG_FORCE)
log("LXMF - Address: " + RNS.prettyhexrep(LXMF_PEER.destination_hash()), LOG_FORCE)
log("...............................................................................", LOG_FORCE)
log("Terminal - Connecting ...", LOG_DEBUG)

22
lxmf_test/lxmf_test.py
View File

@@ -80,14 +80,14 @@ PATH_RNS = None
#### Global Variables - System (Not changeable) ####
DATA = None
RNS_CONNECTION = None
LXMF_CONNECTION = None
LXMF_PEER = None
##############################################################################################################
# LXMF Class
class lxmf_connection:
class LXMFPeer:
message_received_callback = None
message_notification_callback = None
message_notification_success_callback = None
@@ -212,7 +212,7 @@ class lxmf_connection:
self.destination.set_link_established_callback(self.client_connected)
if self.propagation_node_auto:
self.propagation_callback = lxmf_connection_propagation(self, "lxmf.propagation")
self.propagation_callback = LXMFPeerPropagation(self, "lxmf.propagation")
RNS.Transport.register_announce_handler(self.propagation_callback)
if self.propagation_node_active:
self.propagation_node_set(self.propagation_node_active)
@@ -615,7 +615,7 @@ class lxmf_connection:
log("- App Data: " + message.app_data, LOG_DEBUG)
class lxmf_connection_propagation():
class LXMFPeerPropagation():
def __init__(self, owner, aspect_filter=None):
self.owner = owner
self.aspect_filter = aspect_filter
@@ -833,7 +833,7 @@ def setup(path=None, path_rns=None, path_log=None, loglevel=None, require_shared
global LOG_LEVEL
global LOG_FILE
global RNS_CONNECTION
global LXMF_CONNECTION
global LXMF_PEER
if path is not None:
if path.endswith("/"):
@@ -865,15 +865,15 @@ def setup(path=None, path_rns=None, path_log=None, loglevel=None, require_shared
if path is None:
path = PATH
LXMF_CONNECTION = lxmf_connection(storage_path=path)
LXMF_PEER = LXMFPeer(storage_path=path)
LXMF_CONNECTION.register_message_notification_success_callback(lxmf_success)
LXMF_CONNECTION.register_message_notification_failed_callback(lxmf_failed)
LXMF_PEER.register_message_notification_success_callback(lxmf_success)
LXMF_PEER.register_message_notification_failed_callback(lxmf_failed)
log("LXMF - Connected", LOG_DEBUG)
log("...............................................................................", LOG_FORCE)
log("LXMF - Address: " + RNS.prettyhexrep(LXMF_CONNECTION.destination_hash()), LOG_FORCE)
log("LXMF - Address: " + RNS.prettyhexrep(LXMF_PEER.destination_hash()), LOG_FORCE)
log("...............................................................................", LOG_FORCE)
DATA = {}
@@ -899,9 +899,9 @@ def setup(path=None, path_rns=None, path_log=None, loglevel=None, require_shared
content = "#"+ str(DATA[key]["count"]) + " " + content
content = content[:size]
if key == ".":
LXMF_CONNECTION.send(secrets.token_hex(nbytes=10), content)
LXMF_PEER.send(secrets.token_hex(nbytes=10), content)
else:
LXMF_CONNECTION.send(key, content)
LXMF_PEER.send(key, content)
print("Destination: " + str (key) + " | #: " + str(DATA[key]["count"]) + " | Messages delivered: " + str(DATA[key]["count_success"]) + "/" + str(DATA[key]["count"]) + " (" + str(round(100/DATA[key]["count"]*DATA[key]["count_success"], 2)) + "%) | Time (min / max / avg): " + str(DATA[key]["time_min"]) + " / " + str(DATA[key]["time_max"]) + " / " + str(DATA[key]["time_avg"]) + " | Info: Sending/Queued")
time.sleep(interval)
else:

34
lxmf_welcome/lxmf_welcome.py
View File

@@ -80,7 +80,7 @@ PATH_RNS = None
DATA = None
CONFIG = None
RNS_CONNECTION = None
LXMF_CONNECTION = None
LXMF_PEER = None
MSG_FIELD_EMBEDDED_LXMS = 0x01
MSG_FIELD_TELEMETRY = 0x02
@@ -143,7 +143,7 @@ MSG_FIELD_VOICE = 0xBF
# LXMF Class
class lxmf_connection:
class LXMFPeer:
message_received_callback = None
message_notification_callback = None
message_notification_success_callback = None
@@ -268,7 +268,7 @@ class lxmf_connection:
self.destination.set_link_established_callback(self.client_connected)
if self.propagation_node_auto:
self.propagation_callback = lxmf_connection_propagation(self, "lxmf.propagation")
self.propagation_callback = LXMFPeerPropagation(self, "lxmf.propagation")
RNS.Transport.register_announce_handler(self.propagation_callback)
if self.propagation_node_active:
self.propagation_node_set(self.propagation_node_active)
@@ -671,7 +671,7 @@ class lxmf_connection:
log("- App Data: " + message.app_data, LOG_DEBUG)
class lxmf_connection_propagation():
class LXMFPeerPropagation():
def __init__(self, owner, aspect_filter=None):
self.owner = owner
self.aspect_filter = aspect_filter
@@ -784,7 +784,7 @@ class lxmf_announce_callback:
DATA["main"]["unsaved"] = "True"
else:
DATA["main"]["unsaved"] = "True"
LXMF_CONNECTION.send(source_hash, config_get(CONFIG, "lxmf", "content", "").replace("!n!", "\n"), "")
LXMF_PEER.send(source_hash, config_get(CONFIG, "lxmf", "content", "").replace("!n!", "\n"), "")
##############################################################################################################
@@ -1194,7 +1194,7 @@ def setup(path=None, path_rns=None, path_log=None, loglevel=None, service=False,
global LOG_LEVEL
global LOG_FILE
global RNS_CONNECTION
global LXMF_CONNECTION
global LXMF_PEER
if path is not None:
if path.endswith("/"):
@@ -1256,37 +1256,27 @@ def setup(path=None, path_rns=None, path_log=None, loglevel=None, service=False,
log("LXMF - Connecting ...", LOG_DEBUG)
if CONFIG.has_option("lxmf", "propagation_node"):
config_propagation_node = CONFIG["lxmf"]["propagation_node"]
else:
config_propagation_node = None
if CONFIG.has_option("lxmf", "propagation_node_active"):
config_propagation_node_active = CONFIG["lxmf"]["propagation_node_active"]
else:
config_propagation_node_active = None
if path is None:
path = PATH
LXMF_CONNECTION = lxmf_connection(
LXMF_PEER = LXMFPeer(
storage_path=path,
destination_name=CONFIG["lxmf"]["destination_name"],
destination_type=CONFIG["lxmf"]["destination_type"],
send_delay=CONFIG["lxmf"]["send_delay"],
method=CONFIG["lxmf"]["method"],
propagation_node=config_propagation_node,
propagation_node=CONFIG["lxmf"]["propagation_node"] if CONFIG.has_option("lxmf", "propagation_node") else None,
propagation_node_auto=CONFIG["lxmf"].getboolean("propagation_node_auto"),
propagation_node_active=config_propagation_node_active,
propagation_node_active=CONFIG["lxmf"]["propagation_node_active"] if CONFIG.has_option("lxmf", "propagation_node_active") else None,
)
LXMF_CONNECTION.register_announce_callback(lxmf_announce_callback)
LXMF_CONNECTION.register_config_set_callback(config_set)
LXMF_PEER.register_announce_callback(lxmf_announce_callback)
LXMF_PEER.register_config_set_callback(config_set)
log("LXMF - Connected", LOG_DEBUG)
log("...............................................................................", LOG_FORCE)
log("LXMF - Address: " + RNS.prettyhexrep(LXMF_CONNECTION.destination_hash()), LOG_FORCE)
log("LXMF - Address: " + RNS.prettyhexrep(LXMF_PEER.destination_hash()), LOG_FORCE)
log("...............................................................................", LOG_FORCE)
if CONFIG["main"].getboolean("periodic_save_data"):