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

.github/workflows/test.yml

@@ -6,10 +6,11 @@ jobs:
   test:
     # Older Ubuntu required for testing on Python 3.6 which is not available in
     # later versions. Remove once support for 3.6 is dropped.
-    runs-on: ubuntu-20.04
+    # runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
 
     steps:
       - uses: actions/checkout@v3

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/.* .
 

README.rst

@@ -39,9 +39,9 @@ Terminal User Interface
 
 toot includes a terminal user interface (TUI). Run it with ``toot tui``.
 
-.. image :: https://raw.githubusercontent.com/ihabunek/toot/master/docs/_static/tui_list.png
+.. image :: https://raw.githubusercontent.com/ihabunek/toot/master/docs/images/tui_list.png
 
-.. image :: https://raw.githubusercontent.com/ihabunek/toot/master/docs/_static/tui_compose.png
+.. image :: https://raw.githubusercontent.com/ihabunek/toot/master/docs/images/tui_compose.png
 
 
 License

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/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):
@@ -250,6 +250,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)
@@ -274,8 +276,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']}")])
@@ -307,8 +311,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"))