Convert <s> and <strike> to correct IRC code

.github/workflows/pythonapp.yml

@@ -0,0 +1,24 @@
+# From https://docs.github.com/en/free-pro-team@latest/actions/guides/building-and-testing-python
+
+name: Test with pytest
+
+on: [push]
+
+jobs:
+  run-tests:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        python_version: [3.8, 3]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python ${{ matrix.python_version }}
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python_version }}
+    - name: Install dependencies
+      run: python -m pip install miniirc pytest 'requests>=2.22.0,<3'
+    - name: Run pytest
+      run: pytest

miniirc_matrix.py

@@ -8,11 +8,11 @@ from __future__ import annotations
 from collections.abc import Callable
 from typing import Any, Optional, TypeVar, overload
 from urllib.parse import quote as _url_quote, urlparse as _urlparse
-import functools, html.parser, itertools, json, math, re, threading, time, uuid
+import functools, html.parser, itertools, json, math, re, time, uuid
 import miniirc, requests, traceback  # type: ignore
 
 
-ver = (0, 0, 7)
+ver = (0, 0, 11)
 __version__ = '.'.join(map(str, ver))
 
 
@@ -234,6 +234,8 @@ class _MatrixHTMLParser(html.parser.HTMLParser):
     irc_codes['b'] = irc_codes['strong']
     irc_codes['i'] = irc_codes['em']
     irc_codes['br'] = '\n'
+    irc_codes['s'] = irc_codes['del']
+    irc_codes['strike'] = irc_codes['del']
 
     def __init__(self) -> None:
         super().__init__()
@@ -257,7 +259,9 @@ class _MatrixHTMLParser(html.parser.HTMLParser):
             if tag in ('mx-reply', 'script'):
                 self.in_reply -= 1
             return
-        if tag in self.irc_codes:
+        if tag == 'br':
+            return
+        elif tag in self.irc_codes:
             self.text.append(self.irc_codes[tag])
         elif tag != 'font':
             raise _UnknownTagError(tag)
@@ -478,8 +482,8 @@ class Matrix(miniirc.IRC):
             self.__numeric('001', f'Welcome to Matrix {self.current_nick}')
 
             next_batch: Optional[str] = None
+            self.connected = True
             while self.connected:
-                req_time = time.monotonic()
                 try:
                     res = self.__get('sync', 35, timeout='30000',
                                      since=next_batch)
@@ -495,6 +499,14 @@ class Matrix(miniirc.IRC):
                 if self.debug_file:
                     self.debug(json.dumps(res, indent=4))
                 if 'error' in res:
+                    # TODO: Use self.debug or something
+                    print(f'[miniirc_matrix] Error returned when trying to '
+                          f'fetch /sync: {res["error"]!r}')
+
+                    if self.persist:
+                        self.debug('Trying again in 15 seconds...')
+                        time.sleep(15)
+                        continue
                     break
                 next_batch = res['next_batch']
                 if 'rooms' in res:

setup.py

@@ -5,7 +5,7 @@ from setuptools import setup
 
 setup(
     name='miniirc_matrix',
-    version='0.0.7',
+    version='0.0.11',
     py_modules=['miniirc_matrix'],
     author='luk3yx',
     description='A Matrix wrapper for miniirc.',

test_formatting.py

@@ -0,0 +1,24 @@
+from miniirc_matrix import _Event, _irc_to_html, _matrix_html_to_irc
+
+
+def test_irc_to_html():
+    assert _irc_to_html('Hello world!') is None
+    assert _irc_to_html('\x02Bold text') == '<strong>Bold text</strong>'
+    assert (_irc_to_html('\x021 \x1d2\x02 3') ==
+            '<strong>1 <em>2</em></strong><em> 3</em>')
+
+
+def html_to_irc(html):
+    res, html_parsed_ok = _matrix_html_to_irc(_Event({
+        'format': 'org.matrix.custom.html',
+        'formatted_body': html,
+    }))
+    assert html_parsed_ok
+    return res
+
+
+def test_html_to_irc():
+    assert html_to_irc('Hello <b>world</b>!') == 'Hello \x02world\x02!'
+    assert html_to_irc('Hello\nworld!') == 'Hello\nworld!'
+    assert html_to_irc('Hello<br>world!') == 'Hello\nworld!'
+    assert html_to_irc('Hello<br/>world!') == 'Hello\nworld!'