mirror of
https://github.com/liberatedsystems/openCom-Companion.git
synced 2025-02-23 01:39:52 +01:00
Set LXMF renderer field if message has BB-code markup
This commit is contained in:
parent
95fec8219b
commit
a90a451865
@ -4396,6 +4396,8 @@ class SidebandCore():
|
|||||||
fields[LXMF.FIELD_IMAGE] = image
|
fields[LXMF.FIELD_IMAGE] = image
|
||||||
if audio != None:
|
if audio != None:
|
||||||
fields[LXMF.FIELD_AUDIO] = audio
|
fields[LXMF.FIELD_AUDIO] = audio
|
||||||
|
if self.has_bb_markup(content):
|
||||||
|
fields[LXMF.FIELD_RENDERER] = LXMF.RENDERER_BBCODE
|
||||||
|
|
||||||
lxm = LXMF.LXMessage(dest, source, content, title="", desired_method=desired_method, fields = fields, include_ticket=self.is_trusted(destination_hash))
|
lxm = LXMF.LXMessage(dest, source, content, title="", desired_method=desired_method, fields = fields, include_ticket=self.is_trusted(destination_hash))
|
||||||
|
|
||||||
@ -4534,11 +4536,19 @@ class SidebandCore():
|
|||||||
|
|
||||||
self.setstate("lxm_uri_ingest.result", response)
|
self.setstate("lxm_uri_ingest.result", response)
|
||||||
|
|
||||||
def strip_markup(self, text):
|
def strip_bb_markup(self, text):
|
||||||
if not hasattr(self, "smr") or self.smr == None:
|
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 )
|
self.smr = re.compile(r'\[\/?(?:b|i|u|url|quote|code|img|color|size)*?.*?\]',re.IGNORECASE | re.MULTILINE )
|
||||||
return self.smr.sub("", text)
|
return self.smr.sub("", text)
|
||||||
|
|
||||||
|
def has_bb_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 )
|
||||||
|
if self.smr.match(text):
|
||||||
|
return True
|
||||||
|
else:
|
||||||
|
return False
|
||||||
|
|
||||||
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
|
||||||
@ -4621,7 +4631,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 = self.strip_markup(text[:nlen])
|
notification_content = self.strip_bb_markup(text[:nlen])
|
||||||
if len(text) > nlen:
|
if len(text) > nlen:
|
||||||
notification_content += " [...]"
|
notification_content += " [...]"
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user