Skip to content

Commit

Permalink
Merge branch mhorst314:master (PR #162)
Browse files Browse the repository at this point in the history
  • Loading branch information
Terrance committed Jan 10, 2021
2 parents 122ac84 + 39d2dd0 commit 76c5d84
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions skpy/msg.py
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,7 @@ def plain(self):
text = re.sub(r"</?(e|b|i|ss?|pre|quote|legacyquote)\b.*?>", "", self.content)
text = re.sub(r"""<a\b.*?href="(.*?)">.*?</a>""", r"\1", text)
text = re.sub(r"""<at\b.*?id="8:(.*?)">.*?</at>""", r"@\1", text)
text = re.sub(r"""<e_m\b.*?>.*?</e_m>""", r"", text)
text = (text.replace("&lt;", "<").replace("&gt;", ">").replace("&amp;", "&")
.replace("&quot;", "\"").replace("&apos;", "'"))
return text
Expand All @@ -346,6 +347,7 @@ def markup(self):
text = re.sub(r"</?pre\b.*?>", "{code}", text)
text = re.sub(r"""<a\b.*?href="(.*?)">.*?</a>""", r"\1", text)
text = re.sub(r"""<at\b.*?id="8:(.*?)">.*?</at>""", r"@\1", text)
text = re.sub(r"""<e_m\b.*?>.*?</e_m>""", r"", text)
text = (text.replace("&lt;", "<").replace("&gt;", ">").replace("&amp;", "&")
.replace("&quot;", "\"").replace("&apos;", "'"))
return text
Expand Down

0 comments on commit 76c5d84

Please sign in to comment.