darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-09 15:39:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

some fixes

Browse Source
This commit is contained in:
Kenneth Kehl
2025-03-27 14:47:43 -07:00
parent 9e5475cd43
commit 5741c572f0
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
notifications_utils/markdown.py
View File

@@ -127,15 +127,6 @@ class EmailRenderer(mistune.HTMLRenderer):
class PlainTextRenderer(mistune.HTMLRenderer): class PlainTextRenderer(mistune.HTMLRenderer):
COLUMN_WIDTH = 65 COLUMN_WIDTH = 65
def table(self, header, body):
return ""
def table_row(self, content):
return ""
def table_cell(self, content, **kwargs):
return ""
def heading(self, text, level): def heading(self, text, level):
if level == 1: if level == 1:
return f"\n\n\n{text}\n{'-' * self.COLUMN_WIDTH}" return f"\n\n\n{text}\n{'-' * self.COLUMN_WIDTH}"
@@ -159,9 +150,17 @@ class PlainTextRenderer(mistune.HTMLRenderer):
return "\n" return "\n"
def list(self, text, ordered, level=None, **kwargs): def list(self, text, ordered, level=None, **kwargs):
if ordered is True:
text = text.replace("•", "1.", 1)
text = text.replace("•", "2.", 1)
text = text.replace("•", "3.", 1)
# print(f"LIST ordered={ordered} text={text}")
return f"\n{text}" return f"\n{text}"
def list_item(self, text, level=None): def list_item(self, text, ordered=None, level=None):
# print(f"LIST ITEM = {text} ordered={ordered} level {level}")
return f"\n• {text.strip()}" return f"\n• {text.strip()}"
def link(self, link=None, text=None, title=None, url=None, **kwargs): def link(self, link=None, text=None, title=None, url=None, **kwargs):
@@ -194,13 +193,14 @@ class PlainTextRenderer(mistune.HTMLRenderer):
class PreheaderRenderer(PlainTextRenderer): class PreheaderRenderer(PlainTextRenderer):
def heading(self, text, level): def heading(self, text, level):
return self.paragraph(text) return html.unescape(self.paragraph(text))
def thematic_break(self): def thematic_break(self):
return "" return ""
def link(self, link, text=None, title=None): def link(self, link, text=None, title=None, url=None):
return text or link return text or link
def image(self, src, alt="", title=None, url=None): def image(self, src, alt="", title=None, url=None):
@@ -273,6 +273,7 @@ _notify_plain_text_email_markdown = mistune.create_markdown(
def notify_email_markdown(text): def notify_email_markdown(text):
text = escape_plus_lists(text)
return _notify_email_markdown(autolinkify(text)) return _notify_email_markdown(autolinkify(text))

5
tests/notifications_utils/test_markdown.py
View File

@@ -373,9 +373,8 @@ def test_unordered_list(markdown, markdown_function, expected):
( (
notify_email_markdown, notify_email_markdown,
( (
'<p style="Margin: 0 0 20px 0; font-size: 19px; line-height: 25px; color: #0B0C0C;">+ one</p>' '<p style="Margin: 0 0 20px 0; font-size: 19px; '
'<p style="Margin: 0 0 20px 0; font-size: 19px; line-height: 25px; color: #0B0C0C;">+ two</p>' 'line-height: 25px; color: #0B0C0C;">+ one<br />+ two<br />+ three</p>'
'<p style="Margin: 0 0 20px 0; font-size: 19px; line-height: 25px; color: #0B0C0C;">+ three</p>'
), ),
), ),
( (