Merge branch 'allow-specifying-listening-host'

It is possible that a private person is linked to in a tiddler with the
syntax `[[Jane|MsJaneDoe]]`.

Up to now, the text of the link was not redacted, which could lead to
unintentional privacy leaks.

Therefore, a new parameter `replace_text` is introduced for the
`replace_private_people` builder.

When that is set to True, then the link text is also replaced with the
initials.

Signed-off-by: Jacob Kiers <code@kiers.eu>

tzk/__main__.py

@@ -83,6 +83,12 @@ class ListenCommand(CliCommand):
 
     @classmethod
     def setup_arguments(cls, parser: argparse.ArgumentParser) -> None:
+        parser.add_argument(
+            "-h", "--host",
+            metavar="HOST",
+            help="Host to listen on.",
+            default=str(cm().listen_host or "127.0.0.1"),
+        )
         parser.add_argument(
             "-p", "--port",
             metavar="PORT",
@@ -109,6 +115,7 @@ class ListenCommand(CliCommand):
             tw.exec(
                 [
                     ("listen",
+                    f"host={args.host}",
                     f"port={args.port}",
                     f"username={args.username}",
                     f"password={args.password}")

tzk/builders.py

@@ -360,7 +360,7 @@ def _private_people_replacement_table(
 
 
 @tzk_builder
-def replace_private_people(initialer: Callable[[str], str] = None) -> None:
+def replace_private_people(initialer: Callable[[str], str] = None, replace_text = False) -> None:
     """
     Replace the names of people who are not marked Public with their initials.
 
@@ -384,6 +384,10 @@ def replace_private_people(initialer: Callable[[str], str] = None) -> None:
                          that takes one string argument
                          (a tiddler filename without the full path, e.g., ``MsJaneDoe.tid``)
                          and returns a string to be considered the "initials" of that person.
+
+    :param replace_text: If you have links in the form ``[[John|MrJohnDoe]]``, then enabling
+                         this option ensures that the link text `John` is also replaced with
+                         the initials.
     """
     assert 'public_wiki_folder' in build_state
 
@@ -401,8 +405,18 @@ def replace_private_people(initialer: Callable[[str], str] = None) -> None:
                     if '|' + replace_person + ']]' in lines[i]:
                         # link with the person as the target only;
                         # beware that you might have put something private in the text
-                        lines[i] = lines[i].replace(replace_person, 'PrivatePerson')
+                        if replace_text:
-                    elif '[[' + replace_person + ']]' in lines[i]:
+                            # with this option, the initials are also
+                            # put in the text, solving the warning before
+                            end = lines[i].find('|' + replace_person + ']]')
+                            start = lines[i].rfind('[[', 0, end) + 2
+                            search = f"[[{lines[i][start:end]}|{replace_person}]]"
+                            replace = f"[[{replace_initials}|PrivatePerson]]"
+
+                            lines[i] = lines[i].replace(search, replace)
+                        else:
+                            lines[i] = line.replace(replace_person, 'PrivatePerson')
+                    elif '[[' + replace_person + ']]' in line:
                         # link with the person as the target and text
                         lines[i] = lines[i].replace(
                                 replace_person,