flaskbb-plugin-conversations 2.0.1__tar.gz → 2.1.0.dev0__tar.gz

{flaskbb_plugin_conversations-2.0.1 → flaskbb_plugin_conversations-2.1.0.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: flaskbb-plugin-conversations
-Version: 2.0.1
+Version: 2.1.0.dev0
 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
@@ -23,7 +23,7 @@ Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.12
-Requires-Dist: flaskbb>=2.1.0
+Requires-Dist: flaskbb>=3.0.0
 Description-Content-Type: text/markdown
 
 Conversations

{flaskbb_plugin_conversations-2.0.1 → flaskbb_plugin_conversations-2.1.0.dev0}/conversations/__init__.py

@@ -13,6 +13,7 @@ import os
 
 from flask import Flask
 from flask_login import current_user
+from flaskbb.core.settings.definitions import IntSetting, SettingGroup
 from flaskbb.forum.models import Post
 from flaskbb.user.models import User
 from flaskbb.utils.helpers import real, render_template
@@ -21,11 +22,28 @@ from pluggy import HookimplMarker
 from .utils import get_latest_messages, get_message_count, get_unread_count
 from .views import conversations_bp
 
-# Temp fix until https://github.com/flaskbb/flaskbb/pull/509 is merged
-SETTINGS = None
-
 hookimpl = HookimplMarker("flaskbb")
 
+SETTINGS = SettingGroup(
+    key="conversations",
+    name="Conversations Settings",
+    description="Settings for the conversations plugin.",
+    settings=(
+        IntSetting(
+            key="MESSAGE_QUOTA",
+            value=50,
+            min=0,
+            name="Private Message Quota",
+            description="The amount of messages a user can have.",
+        ),
+    ),
+)
+
+
+@hookimpl
+def flaskbb_load_setting_groups():
+    return SETTINGS
+
 
 # connect the hooks
 @hookimpl

{flaskbb_plugin_conversations-2.0.1 → flaskbb_plugin_conversations-2.1.0.dev0}/conversations/migrations/201802171929_0625bc75ab77_add_conversations.py

@@ -8,7 +8,6 @@ Create Date: 2018-02-17 19:29:12.376395
 
 import flaskbb
 import sqlalchemy as sa
-import sqlalchemy_utils
 from alembic import op
 
 # revision identifiers, used by Alembic.
@@ -29,11 +28,7 @@ def upgrade():
             sa.Column("user_id", sa.Integer(), nullable=False),
             sa.Column("from_user_id", sa.Integer(), nullable=True),
             sa.Column("to_user_id", sa.Integer(), nullable=True),
-            sa.Column(
-                "shared_id",
-                sqlalchemy_utils.types.uuid.UUIDType(binary=16),
-                nullable=False,
-            ),
+            sa.Column("shared_id", sa.Uuid(), nullable=False),
             sa.Column("subject", sa.String(length=255), nullable=True),
             sa.Column(
                 "date_created",

flaskbb_plugin_conversations-2.1.0.dev0/conversations/migrations/202607311750_1785520254_move_message_quota_setting.py

@@ -0,0 +1,54 @@
+"""move message quota setting
+
+Revision ID: 1785520254
+Revises: 1770409336
+Create Date: 2026-07-31 17:50:54.000000
+
+"""
+
+import sqlalchemy as sa
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "1785520254"
+down_revision = "1770409336"
+branch_labels = ()
+depends_on = None
+
+
+def upgrade():
+    conn = op.get_bind()
+
+    settings_table = sa.table(
+        "settings",
+        sa.column("key", sa.String),
+        sa.column("group_key", sa.String),
+    )
+
+    conn.execute(
+        settings_table.update()
+        .where(
+            sa.func.lower(settings_table.c.key) == "message_quota",
+            settings_table.c.group_key == "misc",
+        )
+        .values(group_key="conversations")
+    )
+
+
+def downgrade():
+    conn = op.get_bind()
+
+    settings_table = sa.table(
+        "settings",
+        sa.column("key", sa.String),
+        sa.column("group_key", sa.String),
+    )
+
+    conn.execute(
+        settings_table.update()
+        .where(
+            sa.func.lower(settings_table.c.key) == "message_quota",
+            settings_table.c.group_key == "conversations",
+        )
+        .values(group_key="misc")
+    )

{flaskbb_plugin_conversations-2.0.1 → flaskbb_plugin_conversations-2.1.0.dev0}/conversations/templates/conversation_list.html

@@ -8,7 +8,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["MESSAGE_QUOTA"] }}
+                    {{ current_user.message_count or 0 }}/{{ flaskbb_config["CONVERSATIONS_MESSAGE_QUOTA"] }}
                 </span>
             </div>
         </div>

{flaskbb_plugin_conversations-2.0.1 → flaskbb_plugin_conversations-2.1.0.dev0}/conversations/views.py

@@ -48,7 +48,8 @@ def check_message_box_space(redirect_to: str | None = None):
                         will redirect to the ``conversations_bp.inbox``
                         endpoint.
     """
-    if get_message_count(real(current_user).id) >= flaskbb_config["MESSAGE_QUOTA"]:
+    quota = flaskbb_config["CONVERSATIONS_MESSAGE_QUOTA"]
+    if get_message_count(real(current_user).id) >= quota:
         flash(
             _(
                 "You cannot send any messages anymore because you have "
@@ -78,18 +79,18 @@ class Inbox(MethodView):
     def get(self):
         page = request.args.get("page", 1, type=int)
         # the inbox will display both, the recieved and the sent messages
-        conversations = (
-            Conversation.query.filter(
+        stmt = (
+            select(Conversation)
+            .where(
                 Conversation.user_id == current_user.id,
-                Conversation.draft == False,
-                Conversation.trash == False,
+                Conversation.draft.is_(False),
+                Conversation.trash.is_(False),
             )
             .order_by(Conversation.date_modified.desc())
-            .paginate(
-                page=page, per_page=flaskbb_config["TOPICS_PER_PAGE"], error_out=False
-            )
         )
-
+        conversations = db.paginate(
+            stmt, page=page, per_page=flaskbb_config["TOPICS_PER_PAGE"], error_out=False
+        )
         return render_template("inbox.html", conversations=conversations)
 
 
@@ -347,9 +348,9 @@ class RestoreConversation(MethodView):
     decorators = [login_required]
 
     def post(self, conversation_id: int):
-        conversation = Conversation.query.filter_by(
-            id=conversation_id, user_id=current_user.id
-        ).first_or_404()
+        conversation = Conversation.get_or_404(
+            Conversation.id == conversation_id, Conversation.user_id == current_user.id
+        )
 
         conversation.trash = False
         conversation.save()
@@ -360,9 +361,9 @@ class DeleteConversation(MethodView):
     decorators = [login_required]
 
     def post(self, conversation_id: int):
-        conversation = Conversation.query.filter_by(
-            id=conversation_id, user_id=current_user.id
-        ).first_or_404()
+        conversation = Conversation.get_or_404(
+            Conversation.id == conversation_id, Conversation.user_id == current_user.id
+        )
 
         conversation.delete()
         invalidate_cache(real(current_user).id)

{flaskbb_plugin_conversations-2.0.1 → flaskbb_plugin_conversations-2.1.0.dev0}/pyproject.toml

@@ -1,8 +1,8 @@
 [project]
 name = "flaskbb-plugin-conversations"
-version = "2.0.1"
+version = "2.1.0.dev"
 dependencies = [
-    "FlaskBB>=2.1.0",
+    "FlaskBB>=3.0.0",
 ]
 requires-python = ">=3.12"
 authors = [