ticket #82 attempt 1

devplacepy/static/js/MessagesLayout.js

@@ -16,7 +16,7 @@ export class MessagesLayout {
         }
         this.thread = document.querySelector(".messages-thread");
         this.form = document.querySelector(".messages-input-area");
-        this.input = this.form ? this.form.querySelector('input[name="content"]') : null;
+        this.input = this.form ? this.form.querySelector('textarea[name="content"]') : null;
         this.upload = this.form ? this.form.querySelector("dp-upload") : null;
         this.sendBtn = this.form ? this.form.querySelector(".messages-send-btn") : null;
         this._uploading = false;

devplacepy/templates/_comment.html

@@ -1,4 +1,4 @@
-{% macro comment_cell(item, depth, parent_author=None, parent_url=None) %}
+{% macro comment_cell(item, depth, parent_author=None) %}
 <div class="comment" style="--comment-depth: {{ depth }};" data-depth="{{ depth }}">
     <div class="comment-votes" role="group" aria-label="Comment votes">
         <form method="POST" action="/votes/comment/{{ item.comment['uid'] }}">
@@ -26,7 +26,6 @@
         {% endif %}
         <div class="comment-actions">
             <button type="button" class="comment-action-btn" data-action="reply"{{ guest_disabled(user) }}><span class="icon">💬</span><span class="label"> Reply</span></button>
-            <button type="button" class="comment-action-btn" data-share="{{ parent_url }}#comment-{{ item.comment['uid'] }}"><span class="icon">&#x1F517;</span><span class="label"> Share</span></button>
             {% if owns(item.comment, user) %}
             <button type="button" class="comment-action-btn" data-action="edit" data-edit-url="/comments/edit/{{ item.comment['uid'] }}"><span class="icon">✏️</span><span class="label"> Edit</span></button>
             <form method="POST" action="/comments/delete/{{ item.comment['uid'] }}" class="inline-form comment-delete-form" data-comment-uid="{{ item.comment['uid'] }}">
@@ -40,21 +39,21 @@
 </div>
 {% endmacro %}
 
-{% macro render_comment(item, depth=0, parent_url=None) %}
+{% macro render_comment(item, depth=0) %}
 {% set max_depth = 2 %}
 {% set visual_depth = depth if depth < max_depth else max_depth %}
-{% call comment_cell(item, visual_depth, parent_url=parent_url) %}
+{% call comment_cell(item, visual_depth) %}
     {% if item.children %}
     {% if depth < max_depth %}
     <div class="comment-replies">
         {% for child in item.children %}
-        {{ render_comment(child, depth + 1, parent_url) }}
+        {{ render_comment(child, depth + 1) }}
         {% endfor %}
     </div>
     {% else %}
     <div class="comment-replies comment-replies-flat">
         {% for child in item.children %}
-        {{ render_comment_flat(child, max_depth, item.author, parent_url) }}
+        {{ render_comment_flat(child, max_depth, item.author) }}
         {% endfor %}
     </div>
     {% endif %}
@@ -62,9 +61,9 @@
 {% endcall %}
 {% endmacro %}
 
-{% macro render_comment_flat(item, depth, parent_author, parent_url=None) %}
-{% call comment_cell(item, depth, parent_author, parent_url=parent_url) %}{% endcall %}
+{% macro render_comment_flat(item, depth, parent_author) %}
+{% call comment_cell(item, depth, parent_author) %}{% endcall %}
 {% for child in item.children %}
-{{ render_comment_flat(child, depth, item.author, parent_url) }}
+{{ render_comment_flat(child, depth, item.author) }}
 {% endfor %}
 {% endmacro %}

devplacepy/templates/_comment_section.html

@@ -3,10 +3,8 @@
 
     {% from "_comment.html" import render_comment with context %}
 
-    {% set parent_url = resolve_object_url(target_type, target_uid) %}
-
     {% for item in comments %}
-    {{ render_comment(item, 0, parent_url) }}
+    {{ render_comment(item, 0) }}
     {% else %}
     <p class="no-comments-msg">No comments yet. Start the discussion.</p>
     {% endfor %}

devplacepy/templating.py

@@ -9,7 +9,6 @@ from devplacepy.cache import TTLCache
 from devplacepy.config import STATIC_VERSION, TEMPLATES_DIR, TEMPLATE_AUTO_RELOAD, PRESENCE_TIMEOUT_SECONDS
 from devplacepy.constants import TOPICS, REACTION_EMOJI
 from devplacepy.database import get_int_setting, get_setting, get_table
-from devplacepy.database.content import resolve_object_url
 from devplacepy.avatar import avatar_url, avatar_seed
 from devplacepy.utils import format_date as _format_date
 from devplacepy.utils import time_ago as _time_ago
@@ -50,7 +49,6 @@ templates.env.globals["is_self"] = is_self
 templates.env.globals["guest_disabled"] = guest_disabled
 templates.env.globals["is_online"] = presence.is_online
 templates.env.globals["presence_timeout"] = PRESENCE_TIMEOUT_SECONDS
-templates.env.globals["resolve_object_url"] = resolve_object_url
 
 from devplacepy.docs_devrant import devrant_endpoints
 

tests/e2e/messages.py

@@ -176,7 +176,7 @@ def test_send_message_appears_in_thread(alice):
         f"{BASE_URL}/messages?with_uid={bob['uid']}", wait_until="domcontentloaded"
     )
     msg = f"Hello bob {int(time.time() * 1000)}"
-    page.fill("input[name='content']", msg)
+    page.fill("textarea[name='content']", msg)
     page.locator(".messages-send-btn").click()
     page.wait_for_url("**/messages**", wait_until="domcontentloaded")
     page.locator(f".message-bubble:has-text('{msg}')").first.wait_for(state="visible")

tests/e2e/notifications/index.py

@@ -440,7 +440,7 @@ def test_message_notification(app_server, browser, seeded_db):
     pb.goto(f"{BASE_URL}/messages?search=alice_test", wait_until="domcontentloaded")
     pb.wait_for_timeout(2000)
 
-    msg_input = pb.locator("input[name='content']").first
+    msg_input = pb.locator("textarea[name='content']").first
     msg_input.wait_for(state="visible", timeout=10000)
     msg_input.fill("Hello from bob_test!")
     pb.locator("button[type='submit']").last.click()
@@ -753,7 +753,7 @@ def test_message_notification_click_opens_conversation(app_server, browser, seed
 
     pb.goto(f"{BASE_URL}/messages?search=alice_test", wait_until="domcontentloaded")
     pb.wait_for_timeout(2000)
-    msg_input = pb.locator("input[name='content']").first
+    msg_input = pb.locator("textarea[name='content']").first
     msg_input.wait_for(state="visible", timeout=10000)
     msg_input.fill("Click-through message from bob")
     pb.locator("button[type='submit']").last.click()