From 655fb521be7021fb717f7f38beb3764a885ba442 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@libreserver.org>
Date: Mon, 11 Jul 2022 10:41:25 +0100
Subject: [PATCH 1/4] Extra newline

---
 webapp_create_post.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapp_create_post.py b/webapp_create_post.py
index f8653a685..4daf7284a 100644
--- a/webapp_create_post.py
+++ b/webapp_create_post.py
@@ -914,11 +914,11 @@ def html_new_post(css_cache: {}, media_instance: bool, translate: {},
     if in_reply_to or endpoint == 'newdm':
         if in_reply_to:
             new_post_form += \
-                '    <label class="labels">' + placeholder_mentions + \
+                '    <br><label class="labels">' + placeholder_mentions + \
                 '</label><br>\n'
         else:
             new_post_form += \
-                '    <a href="/users/' + nickname + \
+                '    <br><a href="/users/' + nickname + \
                 '/followingaccounts" title="' + \
                 translate['Show a list of addresses to send to'] + '">' \
                 '<label class="labels">' + \

From 4e72f36a1c656adfb977418d0439d7178a886549 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@libreserver.org>
Date: Mon, 11 Jul 2022 15:45:40 +0100
Subject: [PATCH 2/4] Combining lines within paragraphs to work around the lack
 of word-wrap within Lynx textarea

---
 content.py | 18 ++++++++++++++++++
 tests.py   | 38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+)

diff --git a/content.py b/content.py
index 113c359fc..58fd6eeea 100644
--- a/content.py
+++ b/content.py
@@ -1474,6 +1474,22 @@ def save_media_in_form_post(media_bytes, debug: bool,
     return filename, attachment_media_type
 
 
+def combine_textarea_lines(text: str) -> str:
+    """Combines separate lines
+    """
+    result = ''
+    ctr = 0
+    paragraphs = text.split('\n\n')
+    for para in paragraphs:
+        para = para.replace('\n', ' ')
+        para = para.replace('  ', ' ')
+        if ctr > 0:
+            result += '\n\n'
+        result += para
+        ctr += 1
+    return result
+
+
 def extract_text_fields_in_post(post_bytes, boundary: str, debug: bool,
                                 unit_test_data: str = None) -> {}:
     """Returns a dictionary containing the text fields of a http form POST
@@ -1546,6 +1562,8 @@ def extract_text_fields_in_post(post_bytes, boundary: str, debug: bool,
                     post_value += '\n'
                 post_value += post_lines[line]
         fields[post_key] = urllib.parse.unquote(post_value)
+        if boundary == '--LYNX' and post_key in ('message', 'bio'):
+            fields[post_key] = combine_textarea_lines(fields[post_key])
     return fields
 
 
diff --git a/tests.py b/tests.py
index b56e03bc7..1570202c1 100644
--- a/tests.py
+++ b/tests.py
@@ -133,6 +133,7 @@ from inbox import valid_inbox
 from inbox import valid_inbox_filenames
 from inbox import cache_svg_images
 from categories import guess_hashtag_category
+from content import combine_textarea_lines
 from content import detect_dogwhistles
 from content import remove_script
 from content import create_edits_html
@@ -7412,6 +7413,42 @@ def _test_text_standardize():
     assert result == expected
 
 
+def _test_combine_lines():
+    print('combine_lines')
+    text = 'This is a test'
+    expected = text
+    result = combine_textarea_lines(text)
+    if result != expected:
+        print('expected: ' + expected)
+        print('result: ' + result)
+    assert result == expected
+
+    text = 'First line.\n\nSecond line.'
+    expected = text
+    result = combine_textarea_lines(text)
+    if result != expected:
+        print('expected: ' + expected)
+        print('result: ' + result)
+    assert result == expected
+
+    text = 'First\nline.\n\nSecond\nline.'
+    expected = 'First line.\n\nSecond line.'
+    result = combine_textarea_lines(text)
+    if result != expected:
+        print('expected: ' + expected)
+        print('result: ' + result)
+    assert result == expected
+
+    # with extra space
+    text = 'First\nline.\n\nSecond \nline.'
+    expected = 'First line.\n\nSecond line.'
+    result = combine_textarea_lines(text)
+    if result != expected:
+        print('expected: ' + expected)
+        print('result: ' + result)
+    assert result == expected
+
+
 def run_all_tests():
     base_dir = os.getcwd()
     print('Running tests...')
@@ -7429,6 +7466,7 @@ def run_all_tests():
     _test_checkbox_names()
     _test_thread_functions()
     _test_functions()
+    _test_combine_lines()
     _test_text_standardize()
     _test_dogwhistles()
     _test_remove_end_of_line()

From ab62dcfe7374774d98c770c53a6bb2ceeb828f91 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@libreserver.org>
Date: Mon, 11 Jul 2022 16:13:39 +0100
Subject: [PATCH 3/4] Add paragraphs

---
 content.py | 2 +-
 tests.py   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/content.py b/content.py
index 58fd6eeea..e198ce33f 100644
--- a/content.py
+++ b/content.py
@@ -1484,7 +1484,7 @@ def combine_textarea_lines(text: str) -> str:
         para = para.replace('\n', ' ')
         para = para.replace('  ', ' ')
         if ctr > 0:
-            result += '\n\n'
+            result += '</p><p>'
         result += para
         ctr += 1
     return result
diff --git a/tests.py b/tests.py
index 1570202c1..d2f5bf2ef 100644
--- a/tests.py
+++ b/tests.py
@@ -7424,7 +7424,7 @@ def _test_combine_lines():
     assert result == expected
 
     text = 'First line.\n\nSecond line.'
-    expected = text
+    expected = 'First line.</p><p>Second line.'
     result = combine_textarea_lines(text)
     if result != expected:
         print('expected: ' + expected)
@@ -7432,7 +7432,7 @@ def _test_combine_lines():
     assert result == expected
 
     text = 'First\nline.\n\nSecond\nline.'
-    expected = 'First line.\n\nSecond line.'
+    expected = 'First line.</p><p>Second line.'
     result = combine_textarea_lines(text)
     if result != expected:
         print('expected: ' + expected)
@@ -7441,7 +7441,7 @@ def _test_combine_lines():
 
     # with extra space
     text = 'First\nline.\n\nSecond \nline.'
-    expected = 'First line.\n\nSecond line.'
+    expected = 'First line.</p><p>Second line.'
     result = combine_textarea_lines(text)
     if result != expected:
         print('expected: ' + expected)

From 0b76ccf2083812ca8b3adfea394bed1f2a8b2271 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@libreserver.org>
Date: Mon, 11 Jul 2022 16:52:50 +0100
Subject: [PATCH 4/4] Handle bullet points

---
 content.py |  6 ++++++
 tests.py   | 10 ++++++++++
 2 files changed, 16 insertions(+)

diff --git a/content.py b/content.py
index e198ce33f..03d9d9b77 100644
--- a/content.py
+++ b/content.py
@@ -1481,8 +1481,14 @@ def combine_textarea_lines(text: str) -> str:
     ctr = 0
     paragraphs = text.split('\n\n')
     for para in paragraphs:
+        para = para.replace('\n* ', '***BULLET POINT*** ')
+        para = para.replace('\n * ', '***BULLET POINT*** ')
+        para = para.replace('\n- ', '***DASH POINT*** ')
+        para = para.replace('\n - ', '***DASH POINT*** ')
         para = para.replace('\n', ' ')
         para = para.replace('  ', ' ')
+        para = para.replace('***BULLET POINT*** ', '\n* ')
+        para = para.replace('***DASH POINT*** ', '\n- ')
         if ctr > 0:
             result += '</p><p>'
         result += para
diff --git a/tests.py b/tests.py
index d2f5bf2ef..4bcc5c234 100644
--- a/tests.py
+++ b/tests.py
@@ -7448,6 +7448,16 @@ def _test_combine_lines():
         print('result: ' + result)
     assert result == expected
 
+    text = 'Introduction blurb.\n\n* List item 1\n' + \
+        '* List item 2\n* List item 3\n\nFinal blurb.'
+    expected = 'Introduction blurb.</p><p>* List item 1\n' + \
+        '* List item 2\n* List item 3</p><p>Final blurb.'
+    result = combine_textarea_lines(text)
+    if result != expected:
+        print('expected: ' + expected)
+        print('result: ' + result)
+    assert result == expected
+
 
 def run_all_tests():
     base_dir = os.getcwd()