flaskbb-plugin-portal 2.0.0__tar.gz → 2.1.0.dev2__tar.gz

{flaskbb_plugin_portal-2.0.0 → flaskbb_plugin_portal-2.1.0.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: flaskbb-plugin-portal
-Version: 2.0.0
+Version: 2.1.0.dev2
 Summary: A portal plugin for FlaskBB.
 Project-URL: Homepage, https://github.com/flaskbb/flaskbb-plugin-portal
 Project-URL: Repository, https://github.com/flaskbb/flaskbb-plugin-portal
@@ -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
 
 # Portal Plugin for FlaskBB
@@ -56,6 +56,6 @@ $ pip install flaskbb-plugin-portal
 
 # Links
 
-* [FlaskBB Website](https://flaskbb.org)
+* [FlaskBB Website](https://flaskbb.com)
 * [Source Code](https://github.com/flaskbb/flaskbb-plugin-portal)
 * [Issue Tracker](https://github.com/flaskbb/flaskbb-plugin-portal/issues)

{flaskbb_plugin_portal-2.0.0 → flaskbb_plugin_portal-2.1.0.dev2}/README.md

@@ -28,6 +28,6 @@ $ pip install flaskbb-plugin-portal
 
 # Links
 
-* [FlaskBB Website](https://flaskbb.org)
+* [FlaskBB Website](https://flaskbb.com)
 * [Source Code](https://github.com/flaskbb/flaskbb-plugin-portal)
 * [Issue Tracker](https://github.com/flaskbb/flaskbb-plugin-portal/issues)

{flaskbb_plugin_portal-2.0.0 → flaskbb_plugin_portal-2.1.0.dev2}/portal/__init__.py

@@ -13,10 +13,11 @@ import os
 
 from flask import Flask
 from flask_babelplus import gettext as _
+from flaskbb.core.settings import SelectMultipleSetting
+from flaskbb.core.settings.definitions import IntSetting, SettingGroup, StringSetting
 from flaskbb.display.navigation import NavigationLink
 from flaskbb.extensions import db
 from flaskbb.forum.models import Forum
-from flaskbb.utils.forms import SettingValueType
 from pluggy import HookimplMarker
 from sqlalchemy import select
 
@@ -61,22 +62,35 @@ def flaskbb_tpl_navigation_before():
     )
 
 
-SETTINGS = {
-    "forum_ids": {
-        "value": [1],
-        "value_type": SettingValueType.selectmultiple,
-        "name": "Forum IDs",
-        "description": (
-            "The forum ids from which forums the posts "
-            "should be displayed on the portal."
+impl = HookimplMarker("flaskbb")
+
+SETTINGS = SettingGroup(
+    key="portal",
+    name="Portal Settings",
+    description="Portal settings for your FlaskBB forum.",
+    settings=(
+        SelectMultipleSetting(
+            key="FORUM_IDS",
+            value=[1],
+            name="Forums",
+            description=(
+                "The forum ids from which forums the posts "
+                "should be displayed on the portal."
+            ),
+            choices=available_forums,
+            coerce=int,
         ),
-        "extra": {"choices": available_forums, "coerce": int},
-    },
-    "recent_topics": {
-        "value": 10,
-        "value_type": SettingValueType.integer,
-        "name": "Number of Recent Topics",
-        "description": "The number of topics in Recent Topics.",
-        "extra": {"min": 1},
-    },
-}
+        IntSetting(
+            key="RECENT_TOPICS",
+            value=10,
+            min=1,
+            name="Number of Recent Topics",
+            description="The number of topics in Recent Topics.",
+        ),
+    ),
+)
+
+
+@impl
+def flaskbb_load_setting_groups():
+    return SETTINGS

{flaskbb_plugin_portal-2.0.0 → flaskbb_plugin_portal-2.1.0.dev2}/portal/views.py

@@ -10,14 +10,15 @@ This module contains the portal view.
 """
 
 from flask import Blueprint, current_app, flash, request
+from flask.helpers import redirect
 from flask_babelplus import gettext as _
 from flask_login import current_user
+from flaskbb.core.settings import flaskbb_config
 from flaskbb.extensions import db
 from flaskbb.forum.models import Forum, Post, Topic
 from flaskbb.plugins.models import PluginRegistry
 from flaskbb.user.models import Group, User
 from flaskbb.utils.helpers import get_online_users, render_template, time_diff
-from flaskbb.utils.settings import flaskbb_config
 from sqlalchemy import select
 
 portal = Blueprint("portal", __name__, template_folder="templates")
@@ -29,7 +30,13 @@ def index():
     forum_ids = []
 
     plugin = PluginRegistry.get_by(name="portal")
-    if plugin and not plugin.settings:
+    if not plugin:
+        flash(
+            _("Plugin 'portal' could not be found in the plugin registry."),
+            "warning",
+        )
+        return redirect("forum.index")
+    if not plugin.settings:
         flash(
             _(
                 "Please install the plugin first to configure the forums "
@@ -38,7 +45,7 @@ def index():
             "warning",
         )
     else:
-        forum_ids: list[int] = plugin.settings["forum_ids"]
+        forum_ids: list[int] = plugin.settings["FORUM_IDS"]
     group_ids = [group.id for group in current_user.groups]
 
     forums = (
@@ -54,7 +61,9 @@ def index():
     # get the news forums - check for permissions
     news_ids = [f.id for f in forums]
     news = db.paginate(
-        select(Topic).where(Topic.forum_id.in_(news_ids)).order_by(Topic.id.desc()),
+        select(Topic)
+        .where(Topic.forum_id.in_(news_ids), Topic.first_post_id.is_not(None))
+        .order_by(Topic.id.desc()),
         page=page,
         per_page=flaskbb_config["TOPICS_PER_PAGE"],
         error_out=True,

{flaskbb_plugin_portal-2.0.0 → flaskbb_plugin_portal-2.1.0.dev2}/pyproject.toml

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