flaskbb-plugin-conversations 3.0.1__tar.gz → 3.0.2__tar.gz

{flaskbb_plugin_conversations-3.0.1 → flaskbb_plugin_conversations-3.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: flaskbb-plugin-conversations
-Version: 3.0.1
+Version: 3.0.2
 Summary: A private messaging plugin for FlaskBB
 Project-URL: Homepage, https://github.com/flaskbb/flaskbb-plugin-conversations
 Project-URL: Repository, https://github.com/flaskbb/flaskbb-plugin-conversations

{flaskbb_plugin_conversations-3.0.1 → flaskbb_plugin_conversations-3.0.2}/conversations/__init__.py

@@ -14,7 +14,7 @@ from typing import Any, cast
 from flask import Flask
 from flask_login import current_user
 from flaskbb.forum.models import Post
-from flaskbb.settings.definitions import IntSetting, SettingGroup
+from flaskbb.settings.definitions import BoolSetting, IntSetting, SettingGroup
 from flaskbb.user.models import User
 from flaskbb.utils.helpers import real, render_template
 from pluggy import HookimplMarker
@@ -29,6 +29,13 @@ SETTINGS = SettingGroup(
     name="Conversations Settings",
     description="Settings for the conversations plugin.",
     settings=(
+        BoolSetting(
+            key="MESSAGE_QUOTA_ENABLED",
+            value=True,
+            name="Enable Private Message Quota",
+            description="Limit the amount of messages a user can have. "
+            "If disabled, users can have unlimited messages.",
+        ),
         IntSetting(
             key="MESSAGE_QUOTA",
             value=50,

{flaskbb_plugin_conversations-3.0.1 → flaskbb_plugin_conversations-3.0.2}/conversations/forms.py

@@ -29,6 +29,7 @@ class ConversationForm(FlaskForm):
     to_user = StringField(
         _("Recipient"),
         validators=[DataRequired(message=_("A valid username is required."))],
+        render_kw={"data-user-lookup": "", "autocomplete": "off"},
     )
 
     subject = StringField(

{flaskbb_plugin_conversations-3.0.1 → flaskbb_plugin_conversations-3.0.2}/conversations/templates/conversations/conversation.html

@@ -33,7 +33,7 @@
                         <div class="author-title"><h5>{{ message.user.primary_group.name }}</h5></div>
 
                         {% if message.user.avatar %}
-                            <div class="author-avatar"><img src="{{ message.user.avatar }}" alt="avatar"></div>
+                            <div class="author-avatar"><img src="{{ message.user.avatar_url }}" alt="avatar"></div>
                         {% endif %}
 
                         <div class="author-registered">{% trans %}Joined{% endtrans %}: {{ message.user.date_joined|format_date }}</div>
@@ -84,7 +84,7 @@
                         <div class="author-title"><h5>{{ message.user.primary_group.name }}</h5></div>
 
                         {% if message.user.avatar %}
-                            <div class="author-avatar"><img src="{{ message.user.avatar }}" alt="avatar"></div>
+                            <div class="author-avatar"><img src="{{ message.user.avatar_url }}" alt="avatar"></div>
                         {% endif %}
 
                         <div class="author-registered">{% trans %}Joined{% endtrans %}: {{ message.user.date_joined|format_date }}</div>

{flaskbb_plugin_conversations-3.0.1 → flaskbb_plugin_conversations-3.0.2}/conversations/templates/conversations/conversation_list.html

@@ -9,7 +9,7 @@
 
             <div class="col-auto">
                 <span class="badge bg-info" title="The amount of all conversations" data-bs-toggle="tooltip">
-                    {{ current_user.message_count or 0 }}/{{ flaskbb_config["CONVERSATIONS_MESSAGE_QUOTA"] }}
+                    {{ current_user.message_count or 0 }}{% if flaskbb_config["CONVERSATIONS_MESSAGE_QUOTA_ENABLED"] is not sameas false %}/{{ flaskbb_config["CONVERSATIONS_MESSAGE_QUOTA"] }}{% endif %}
                 </span>
             </div>
         </div>
@@ -21,7 +21,7 @@
             <!-- avatar -->
             <div class="col-md-1 col-sm-2 col-2 conversation-avatar">
                 {% if conversation.from_user and conversation.from_user.avatar %}
-                <img src="{{ conversation.from_user.avatar }}" class="rounded" alt="avatar" width="65px" height="65px" />
+                <img src="{{ conversation.from_user.avatar_url }}" class="rounded" alt="avatar" width="65px" height="65px" />
                 {% else %}
                 <img src="{{ url_for('static', filename='avatar80x80.png') }}" class="rounded" alt="avatar" width="65px" height="65px" />
                 {% endif %}

{flaskbb_plugin_conversations-3.0.1 → flaskbb_plugin_conversations-3.0.2}/conversations/templates/conversations/message_layout.html

@@ -40,15 +40,16 @@
 
         const editor = document.querySelector(".flaskbb-editor");
         fetch(button.dataset.rawUrl)
-            .then((response) => response.text())
-            .then((data) => {
-                editor.value = data;
-                editor.selectionStart = editor.selectionEnd = editor.value.length;
-                editor.scrollTop = editor.scrollHeight;
-                window.location.href = "#content";
+            .then((response) => {
+                // an expired session redirects to the login page
+                if (response.redirected || !response.ok) {
+                    throw new Error(`could not load ${button.dataset.rawUrl}`);
+                }
+                return response.text();
             })
+            .then((quote) => window.app.insertQuote(editor, quote))
             .catch((error) => {
-                console.error("something bad happened", error);
+                console.error("could not quote the message", error);
             });
     });
 </script>

{flaskbb_plugin_conversations-3.0.1 → flaskbb_plugin_conversations-3.0.2}/conversations/views.py

@@ -50,6 +50,10 @@ def check_message_box_space(redirect_to: str | None = None):
                         will redirect to the ``conversations_bp.inbox``
                         endpoint.
     """
+    # an unset value (settings not yet upgraded) keeps the quota enforced
+    if flaskbb_config["CONVERSATIONS_MESSAGE_QUOTA_ENABLED"] is False:
+        return None
+
     quota = flaskbb_config["CONVERSATIONS_MESSAGE_QUOTA"]
     if get_message_count(real(current_user).id) >= quota:
         flash(

{flaskbb_plugin_conversations-3.0.1 → flaskbb_plugin_conversations-3.0.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "flaskbb-plugin-conversations"
-version = "3.0.1"
+version = "3.0.2"
 dependencies = [
     "FlaskBB>=3.0.0",
 ]

{flaskbb_plugin_conversations-3.0.1 → flaskbb_plugin_conversations-3.0.2}/tests/test_views.py

@@ -12,6 +12,7 @@ from flask_login import login_user, logout_user
 from flaskbb.extensions import db
 
 from conversations import views
+from conversations.forms import ConversationForm
 from conversations.models import Conversation
 
 
@@ -63,7 +64,11 @@ def test_delete_returns_to_the_page_it_was_sent_from(application, conversation,
 
 
 def test_reply_over_the_quota_loads_the_inbox(application, conversation, user, monkeypatch):
-    monkeypatch.setattr(views, "flaskbb_config", {"CONVERSATIONS_MESSAGE_QUOTA": 0})
+    monkeypatch.setattr(
+        views,
+        "flaskbb_config",
+        {"CONVERSATIONS_MESSAGE_QUOTA_ENABLED": True, "CONVERSATIONS_MESSAGE_QUOTA": 0},
+    )
 
     response, messages = _htmx_post(
         application,
@@ -113,7 +118,11 @@ def no_csrf(application):
 
 @pytest.fixture
 def no_quota(monkeypatch):
-    monkeypatch.setattr(views, "flaskbb_config", {"CONVERSATIONS_MESSAGE_QUOTA": 0})
+    monkeypatch.setattr(
+        views,
+        "flaskbb_config",
+        {"CONVERSATIONS_MESSAGE_QUOTA_ENABLED": True, "CONVERSATIONS_MESSAGE_QUOTA": 0},
+    )
 
 
 def _send(application, view, actor, recipient, **kwargs):
@@ -164,3 +173,28 @@ def test_draft_over_the_quota_is_not_sent(
     assert conversation_msgs.draft
     # sending would have put a copy into the recipient's inbox
     assert Conversation.count() == 1
+
+
+def test_disabled_quota_allows_sending_over_the_limit(
+    application, default_settings, no_csrf, user, admin_user, monkeypatch
+):
+    monkeypatch.setattr(
+        views,
+        "flaskbb_config",
+        {"CONVERSATIONS_MESSAGE_QUOTA_ENABLED": False, "CONVERSATIONS_MESSAGE_QUOTA": 0},
+    )
+
+    _response, messages = _send(
+        application, views.NewConversation.as_view("new_conversation"), user, admin_user
+    )
+
+    assert QUOTA_EXCEEDED not in messages
+    assert Conversation.count() == 2
+
+
+def test_recipient_field_opts_into_the_user_lookup(application):
+    with application.test_request_context():
+        field = ConversationForm(meta={"csrf": False}).to_user()
+
+    assert "data-user-lookup" in field
+    assert 'autocomplete="off"' in field