jacob.eva/openCom-Companion
1
0
Fork 0
mirror of https://github.com/liberatedsystems/openCom-Companion.git synced 2025-02-23 09:49:51 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Strip markup from notifications

Browse Source
This commit is contained in:
Mark Qvist 2025-01-18 23:48:35 +01:00
parent dd1399d7ce
commit 56add0bc50
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
sbapp/sideband/core.py
View File

@ -7,6 +7,7 @@ import struct
import sqlite3 import sqlite3
import random import random
import shlex import shlex
import re
import RNS.vendor.umsgpack as msgpack import RNS.vendor.umsgpack as msgpack
import RNS.Interfaces.Interface as Interface import RNS.Interfaces.Interface as Interface
@ -127,19 +128,20 @@ class SidebandCore():
# Add the announce to the directory announce # Add the announce to the directory announce
# stream logger # stream logger
link_stats = {"rssi": self.reticulum.get_packet_rssi(announce_packet_hash), if self.reticulum != None:
"snr": self.reticulum.get_packet_snr(announce_packet_hash), link_stats = {"rssi": self.reticulum.get_packet_rssi(announce_packet_hash),
"q": self.reticulum.get_packet_q(announce_packet_hash)} "snr": self.reticulum.get_packet_snr(announce_packet_hash),
"q": self.reticulum.get_packet_q(announce_packet_hash)}
# This reformats the new v0.5.0 announce data back to the expected format # This reformats the new v0.5.0 announce data back to the expected format
# for Sidebands database and other handling functions. # for Sidebands database and other handling functions.
dn = LXMF.display_name_from_app_data(app_data) dn = LXMF.display_name_from_app_data(app_data)
sc = LXMF.stamp_cost_from_app_data(app_data) sc = LXMF.stamp_cost_from_app_data(app_data)
app_data = b"" app_data = b""
if dn != None: if dn != None:
app_data = dn.encode("utf-8") app_data = dn.encode("utf-8")
self.log_announce(destination_hash, app_data, dest_type=SidebandCore.aspect_filter, stamp_cost=sc, link_stats=link_stats) self.log_announce(destination_hash, app_data, dest_type=SidebandCore.aspect_filter, stamp_cost=sc, link_stats=link_stats)
def __init__(self, owner_app, config_path = None, is_service=False, is_client=False, android_app_dir=None, verbose=False, owner_service=None, service_context=None, is_daemon=False, load_config_only=False): def __init__(self, owner_app, config_path = None, is_service=False, is_client=False, android_app_dir=None, verbose=False, owner_service=None, service_context=None, is_daemon=False, load_config_only=False):
self.is_service = is_service self.is_service = is_service
@ -4532,6 +4534,11 @@ class SidebandCore():
self.setstate("lxm_uri_ingest.result", response) self.setstate("lxm_uri_ingest.result", response)
def strip_markup(self, text):
if not hasattr(self, "smr") or self.smr == None:
self.smr = re.compile(r'\[\/?(?:b|i|u|url|quote|code|img|color|size)*?.*?\]',re.IGNORECASE | re.MULTILINE )
return self.smr.sub("", text)
def lxm_ingest(self, message, originator = False): def lxm_ingest(self, message, originator = False):
should_notify = False should_notify = False
is_trusted = False is_trusted = False
@ -4614,7 +4621,7 @@ class SidebandCore():
if should_notify: if should_notify:
nlen = 128 nlen = 128
text = message.content.decode("utf-8") text = message.content.decode("utf-8")
notification_content = text[:nlen] notification_content = self.strip_markup(text[:nlen])
if len(text) > nlen: if len(text) > nlen:
notification_content += " [...]" notification_content += " [...]"