Support to display a limited set of HTML tags (aligned with mastodon PR #23913) plus URL support

Makefile

@@ -8,7 +8,7 @@ publish :
 	twine upload dist/*.tar.gz dist/*.whl
 
 test:
-	pytest -v
+	pytest tests/*.py -v
 	flake8
 	vermin --target=3.6 --no-tips --violations --exclude-regex venv/.* .
 

requirements.txt

@@ -2,4 +2,4 @@ requests>=2.13,<3.0
 beautifulsoup4>=4.5.0,<5.0
 wcwidth>=0.1.7
 urwid>=2.0.0,<3.0
-
+urwidgets=>=0.1,<0.2

setup.py

@@ -38,6 +38,7 @@
         "beautifulsoup4>=4.5.0,<5.0",
         "wcwidth>=0.1.7",
         "urwid>=2.0.0,<3.0",
+        "urwidgets>=0.1,<0.2",
     ],
     entry_points={
         'console_scripts': [

toot/tui/app.py

@@ -119,7 +119,6 @@ def __init__(self, app, user, args):
     def run(self):
         self.loop.set_alarm_in(0, lambda *args: self.async_load_instance())
         self.loop.set_alarm_in(0, lambda *args: self.async_load_followed_accounts())
-        self.loop.set_alarm_in(0, lambda *args: self.async_load_followed_tags())
         self.loop.set_alarm_in(0, lambda *args: self.async_load_timeline(
             is_initial=True, timeline_name="home"))
         self.loop.run()
@@ -315,22 +314,6 @@ def _done_accounts(accounts):
 
         self.run_in_thread(_load_accounts, done_callback=_done_accounts)
 
-    def async_load_followed_tags(self):
-        def _load_tag_list():
-            try:
-                return api.followed_tags(self.app, self.user)
-            except ApiError:
-                # not supported by all Mastodon servers so fail silently if necessary
-                return []
-
-        def _done_tag_list(tags):
-            if len(tags) > 0:
-                self.followed_tags = [t["name"] for t in tags]
-            else:
-                self.followed_tags = []
-
-        self.run_in_thread(_load_tag_list, done_callback=_done_tag_list)
-
     def refresh_footer(self, timeline):
         """Show status details in footer."""
         status, index, count = timeline.get_focused_status_with_counts()

toot/tui/constants.py

@@ -37,7 +37,29 @@
     ('yellow_bold', 'yellow,bold', ''),
     ('red', 'dark red', ''),
     ('warning', 'light red', ''),
-    ('white_bold', 'white,bold', '')
+    ('white_bold', 'white,bold', ''),
+
+    # HTML tag styling
+    ('a', ',italics', ''),
+    # em tag is mapped to i
+    ('i', ',italics', ''),
+    # strong tag is mapped to b
+    ('b', ',bold', ''),
+    # special case for bold + italic nested tags
+    ('bi', ',bold,italics', ''),
+    ('u', ',underline', ''),
+    ('del', ',strikethrough', ''),
+    ('code', 'light gray, standout', ''),
+    ('pre', 'light gray, standout', ''),
+    ('blockquote', 'light gray', ''),
+    ('h1', ',bold', ''),
+    ('h2', ',bold', ''),
+    ('h3', ',bold', ''),
+    ('h4', ',bold', ''),
+    ('h5', ',bold', ''),
+    ('h6', ',bold', ''),
+    ('class_mention_hashtag', 'light cyan,bold', ''),
+    ('class_hashtag', 'light cyan,bold', ''),
 ]
 
 VISIBILITY_OPTIONS = [

toot/tui/overlays.py

@@ -4,10 +4,10 @@
 import webbrowser
 
 from toot import __version__
-from toot.utils import format_content
-from .utils import highlight_hashtags, highlight_keys
-from .widgets import Button, EditBox, SelectableText
 from toot import api
+from .utils import highlight_keys
+from .widgets import Button, EditBox, SelectableText
+from .richtext import ContentParser
 
 
 class StatusSource(urwid.Padding):
@@ -255,6 +255,8 @@ def setup_listbox(self):
         super().__init__(walker)
 
     def generate_contents(self, account, relationship=None, last_action=None):
+        parser = ContentParser()
+
         if self.last_action and not self.last_action.startswith("Confirm"):
             yield Button(f"Confirm {self.last_action}", on_press=take_action, user_data=self)
             yield Button("Cancel", on_press=cancel_action, user_data=self)
@@ -279,8 +281,10 @@ def generate_contents(self, account, relationship=None, last_action=None):
 
         if account["note"]:
             yield urwid.Divider()
-            for line in format_content(account["note"]):
-                yield urwid.Text(highlight_hashtags(line, followed_tags=set()))
+
+            widgetlist = parser.html_to_widgets(account["note"])
+            for line in widgetlist:
+                yield (line)
 
         yield urwid.Divider()
         yield urwid.Text(["ID: ", ("green", f"{account['id']}")])
@@ -312,8 +316,11 @@ def generate_contents(self, account, relationship=None, last_action=None):
                 name = field["name"].title()
                 yield urwid.Divider()
                 yield urwid.Text([("yellow", f"{name.rstrip(':')}"), ":"])
-                for line in format_content(field["value"]):
-                    yield urwid.Text(highlight_hashtags(line, followed_tags=set()))
+
+                widgetlist = parser.html_to_widgets(field["value"])
+                for line in widgetlist:
+                    yield (line)
+
                 if field["verified_at"]:
                     yield urwid.Text(("green", "✓ Verified"))
 

toot/tui/poll.py

@@ -2,9 +2,9 @@
 
 from toot import api
 from toot.exceptions import ApiError
-from toot.utils import format_content
-from .utils import highlight_hashtags, parse_datetime
+from .utils import parse_datetime
 from .widgets import Button, CheckBox, RadioButton
+from .richtext import ContentParser
 
 
 class Poll(urwid.ListBox):
@@ -85,8 +85,12 @@ def generate_poll_detail(self):
 
     def generate_contents(self, status):
         yield urwid.Divider()
-        for line in format_content(status.data["content"]):
-            yield urwid.Text(highlight_hashtags(line, set()))
+
+        parser = ContentParser()
+        widgetlist = parser.html_to_widgets(status.data["content"])
+
+        for line in widgetlist:
+            yield (line)
 
         yield urwid.Divider()
         yield self.build_linebox(self.generate_poll_detail())