mirror
/
meshtastic-matrix-relay
kopia lustrzana https://github.com/mate-dev/meshtastic-matrix-relay
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Fixed shortened prefix formatting issue!

pull/1/head
Jeremiah K 2023-04-24 11:33:19 -05:00
rodzic c49d36c0f5
commit 02fb62d6cc
2 zmienionych plików z 10 dodań i 10 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

1
.gitignore vendored
Wyświetl plik

@ -2,3 +2,4 @@
.vscode .vscode
config.yaml config.yaml
meshtastic.sqlite meshtastic.sqlite
__pycache__

19
main.py
Wyświetl plik

@ -332,12 +332,15 @@ async def on_room_message(
if longname and meshnet_name: if longname and meshnet_name:
full_display_name = f"{longname}/{meshnet_name}" full_display_name = f"{longname}/{meshnet_name}"
if meshnet_name != local_meshnet_name: if meshnet_name != local_meshnet_name:
logger.info(f"Processing message from remote meshnet: {text}")
short_longname = longname[:3] short_longname = longname[:3]
short_meshnet_name = meshnet_name[:4] short_meshnet_name = meshnet_name[:4]
prefix = f"{short_longname}/{short_meshnet_name}: " prefix = f"{short_longname}/{short_meshnet_name}: "
logger.info(f"Processing message from remote meshnet: {text}") text = re.sub(rf"^\[{full_display_name}\]: ", "", text) # Remove the original prefix from the text
text = truncate_message(text)
full_message = f"{prefix}{text}"
else: else:
logger.info(f"Processing message from local meshnet: {text}") logger.info(f"Ignoring message from local meshnet: {text}")
return return
else: else:
display_name_response = await matrix_client.get_displayname( display_name_response = await matrix_client.get_displayname(
@ -346,12 +349,9 @@ async def on_room_message(
full_display_name = display_name_response.displayname or event.sender full_display_name = display_name_response.displayname or event.sender
short_display_name = full_display_name[:5] short_display_name = full_display_name[:5]
prefix = f"{short_display_name}[M]: " prefix = f"{short_display_name}[M]: "
logger.info( logger.info(f"Processing matrix message from [{full_display_name}]: {text}")
f"Processing matrix message from [{full_display_name}]: {text}" text = truncate_message(text)
) full_message = f"{prefix}{text}"
text = truncate_message(text)
full_message = f"{prefix}{text}"
room_config = None room_config = None
for config in matrix_rooms: for config in matrix_rooms:
@ -366,8 +366,7 @@ async def on_room_message(
logger.info( logger.info(
f"Sending radio message from {full_display_name} to radio broadcast" f"Sending radio message from {full_display_name} to radio broadcast"
) )
meshtastic_interface.sendText( meshtastic_interface.sendText(text=full_message, channelIndex=meshtastic_channel
text=full_message, channelIndex=meshtastic_channel
) )
else: else:
logger.debug( logger.debug(