punkweb-bb 0.2.3__tar.gz → 0.4.0__tar.gz

punkweb_bb-0.4.0/MANIFEST.in

@@ -0,0 +1,4 @@
+include LICENSE
+include README.md
+recursive-include punkweb_bb *
+recursive-exclude punkweb_bb/static/punkweb_bb/vendor/tiny-markdown-editor/node_modules *

{punkweb_bb-0.2.3 → punkweb_bb-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: punkweb_bb
-Version: 0.2.3
+Version: 0.4.0
 Summary: Django application that provides a simple and modern forum board software for your Django website.
 Home-page: https://github.com/Punkweb/PunkwebBB
 Author: Punkweb
@@ -20,55 +20,53 @@ License-File: LICENSE
 
 PunkwebBB is a Django application that provides a simple and modern forum board software for your Django website.
 
-This is the successor to [punkweb-boards](https://github.com/Punkweb/punkweb-boards).
-
 Check out [punkweb.net](https://punkweb.net/board/) for documentation, support and a live demonstration of the software.
 
 ## Built with
 
 - [Django](https://www.djangoproject.com/)
-- [django-precise-bbcode](https://github.com/ellmetha/django-precise-bbcode)
 - [HTMX](https://htmx.org/)
 - [jQuery](https://jquery.com/)
+- [bbcode](https://pypi.org/project/bbcode/)
+- [Markdown](https://pypi.org/project/Markdown/)
 - [SCEditor](https://www.sceditor.com/)
+- [TinyMDE](https://github.com/jefago/tiny-markdown-editor)
 - [PrismJS](https://prismjs.com/)
 
 ## Requirements
 
 - Python 3.9+
-- Django 4.2+
-- django-precise-bbcode 1.2+
-- Pillow
+- Django 4.0+
 
 It may work with older versions of Python and Django, but it has not been tested.
 
+## BBCode or Markdown?
+
+PunkwebBB supports both BBCode and Markdown. You'll want to decide before installing which parser you want to use, as switching between them will cause existing threads, posts, signatures, etc. to render incorrectly! Switching will not affect the database schema, but it will affect the content.
+
+BBCode is the default parser, but you can switch to Markdown by setting the following in your Django settings module:
+
+```python
+PUNKWEB_BB = {
+  "PARSER": "markdown",
+}
+```
+
 ## Installation
 
 ```bash
 pip install punkweb-bb
 ```
 
-Add `precise_bbcode` and `punkweb_bb` to your `INSTALLED_APPS` in your Django settings module:
+Add `punkweb_bb` to your `INSTALLED_APPS` in your Django settings module:
 
 ```python
 INSTALLED_APPS = [
     ...
-    "precise_bbcode",
     "punkweb_bb",
 ]
 ```
 
-_Note_: `precise_bbcode` is required. It must be installed before `punkweb_bb`.
-
-Add the following middleware to your `MIDDLEWARE` setting:
-
-```python
-MIDDLEWARE = [
-    ...
-    "punkweb_bb.middleware.ProfileOnlineCacheMiddleware",
-]
-```
-
 Add the following context processor to your `TEMPLATES` setting:
 
 ```python
@@ -110,6 +108,7 @@ These are the default settings for PunkwebBB, which can be overridden in your Dj
 PUNKWEB_BB = {
   "SITE_NAME": "PUNKWEB",
   "SITE_TITLE": "PunkwebBB",
+  "PARSER": "bbcode", # "bbcode" or "markdown"
   "FAVICON": "punkweb_bb/favicon.ico",
   "OG_IMAGE": None, # Used for Open Graph meta tags, must be a full URL!
   "SHOUTBOX_ENABLED": True,
@@ -134,39 +133,46 @@ coverage run && coverage html
 ```
 
 ```bash
-Found 57 test(s).
+Found 59 test(s).
 Creating test database for alias 'default'...
 System check identified no issues (0 silenced).
-.........................................................
+...........................................................
 ----------------------------------------------------------------------
-Ran 57 tests in 8.824s
+Ran 59 tests in 9.166s
 
 OK
 Destroying test database for alias 'default'...
-Name                                         Stmts   Miss  Cover
-----------------------------------------------------------------
-punkweb_bb/__init__.py                           0      0   100%
-punkweb_bb/admin.py                             41      1    98%
-punkweb_bb/admin_forms.py                       28      0   100%
-punkweb_bb/apps.py                               6      0   100%
-punkweb_bb/bbcode_tags.py                      115      3    97%
-punkweb_bb/context_processors.py                 3      0   100%
-punkweb_bb/forms.py                             35      0   100%
-punkweb_bb/middleware.py                        10      0   100%
-punkweb_bb/mixins.py                            11      0   100%
-punkweb_bb/models.py                           124      0   100%
-punkweb_bb/pagination.py                        11      4    64%
-punkweb_bb/parsers.py                           50      2    96%
-punkweb_bb/response.py                           3      0   100%
-punkweb_bb/settings.py                           6      0   100%
-punkweb_bb/signals.py                            9      0   100%
-punkweb_bb/templatetags/__init__.py              0      0   100%
-punkweb_bb/templatetags/humanize_int.py          9      5    44%
-punkweb_bb/templatetags/shoutbox_bbcode.py       9      0   100%
-punkweb_bb/tests.py                            410      0   100%
-punkweb_bb/urls.py                               4      0   100%
-punkweb_bb/views.py                            174     17    90%
-punkweb_bb/widgets.py                            8      0   100%
-----------------------------------------------------------------
-TOTAL                                         1066     32    97%
+Name                                           Stmts   Miss  Cover
+------------------------------------------------------------------
+punkweb_bb/__init__.py                             0      0   100%
+punkweb_bb/admin.py                               43      0   100%
+punkweb_bb/admin_forms.py                         34      0   100%
+punkweb_bb/apps.py                                 6      0   100%
+punkweb_bb/context_processors.py                   3      0   100%
+punkweb_bb/forms.py                               47      0   100%
+punkweb_bb/guests.py                              13      0   100%
+punkweb_bb/middleware.py                          14      0   100%
+punkweb_bb/mixins.py                              11      0   100%
+punkweb_bb/models.py                             153      1    99%
+punkweb_bb/pagination.py                          11      4    64%
+punkweb_bb/parsers.py                             50     36    28%
+punkweb_bb/response.py                             3      0   100%
+punkweb_bb/settings.py                            11      0   100%
+punkweb_bb/signals.py                              9      0   100%
+punkweb_bb/templatetags/__init__.py                0      0   100%
+punkweb_bb/templatetags/can_delete.py              5      0   100%
+punkweb_bb/templatetags/can_edit.py                5      0   100%
+punkweb_bb/templatetags/can_post.py                5      0   100%
+punkweb_bb/templatetags/humanize_int.py            9      5    44%
+punkweb_bb/templatetags/render.py                 36     12    67%
+punkweb_bb/templatetags/shoutbox_render.py        18      2    89%
+punkweb_bb/templatetags/styled_group_name.py       7      1    86%
+punkweb_bb/templatetags/styled_username.py         6      0   100%
+punkweb_bb/tests.py                              418      0   100%
+punkweb_bb/urls.py                                 4      0   100%
+punkweb_bb/utils.py                               42     24    43%
+punkweb_bb/views.py                              304    118    61%
+punkweb_bb/widgets.py                             16      0   100%
+------------------------------------------------------------------
+TOTAL                                           1283    203    84%
 ```

punkweb_bb-0.4.0/README.md

@@ -0,0 +1,160 @@
+# PunkwebBB
+
+PunkwebBB is a Django application that provides a simple and modern forum board software for your Django website.
+
+Check out [punkweb.net](https://punkweb.net/board/) for documentation, support and a live demonstration of the software.
+
+## Built with
+
+- [Django](https://www.djangoproject.com/)
+- [HTMX](https://htmx.org/)
+- [jQuery](https://jquery.com/)
+- [bbcode](https://pypi.org/project/bbcode/)
+- [Markdown](https://pypi.org/project/Markdown/)
+- [SCEditor](https://www.sceditor.com/)
+- [TinyMDE](https://github.com/jefago/tiny-markdown-editor)
+- [PrismJS](https://prismjs.com/)
+
+## Requirements
+
+- Python 3.9+
+- Django 4.0+
+
+It may work with older versions of Python and Django, but it has not been tested.
+
+## BBCode or Markdown?
+
+PunkwebBB supports both BBCode and Markdown. You'll want to decide before installing which parser you want to use, as switching between them will cause existing threads, posts, signatures, etc. to render incorrectly! Switching will not affect the database schema, but it will affect the content.
+
+BBCode is the default parser, but you can switch to Markdown by setting the following in your Django settings module:
+
+```python
+PUNKWEB_BB = {
+  "PARSER": "markdown",
+}
+```
+
+## Installation
+
+```bash
+pip install punkweb-bb
+```
+
+Add `punkweb_bb` to your `INSTALLED_APPS` in your Django settings module:
+
+```python
+INSTALLED_APPS = [
+    ...
+    "punkweb_bb",
+]
+```
+
+Add the following context processor to your `TEMPLATES` setting:
+
+```python
+TEMPLATES = [
+    {
+        ...
+        "OPTIONS": {
+            "context_processors": [
+                ...
+                "punkweb_bb.context_processors.punkweb_bb",
+            ],
+        },
+    },
+]
+```
+
+Add the following URL pattern to your `urls.py`:
+
+```python
+from django.urls import path, include
+
+urlpatterns = [
+    ...
+    path("forum/", include("punkweb_bb.urls")), # or any other path you want
+]
+```
+
+And finally, install the models:
+
+```bash
+python manage.py migrate
+```
+
+## Configuration
+
+These are the default settings for PunkwebBB, which can be overridden in your Django settings module:
+
+```python
+PUNKWEB_BB = {
+  "SITE_NAME": "PUNKWEB",
+  "SITE_TITLE": "PunkwebBB",
+  "PARSER": "bbcode", # "bbcode" or "markdown"
+  "FAVICON": "punkweb_bb/favicon.ico",
+  "OG_IMAGE": None, # Used for Open Graph meta tags, must be a full URL!
+  "SHOUTBOX_ENABLED": True,
+  "DISCORD_WIDGET_ENABLED": False,
+  "DISCORD_WIDGET_THEME": "dark",
+  "DISCORD_SERVER_ID": None, # Found under Server Settings > Widget > Server ID
+}
+```
+
+## Testing
+
+Report:
+
+```bash
+coverage run && coverage report
+```
+
+HTML:
+
+```bash
+coverage run && coverage html
+```
+
+```bash
+Found 59 test(s).
+Creating test database for alias 'default'...
+System check identified no issues (0 silenced).
+...........................................................
+----------------------------------------------------------------------
+Ran 59 tests in 9.166s
+
+OK
+Destroying test database for alias 'default'...
+Name                                           Stmts   Miss  Cover
+------------------------------------------------------------------
+punkweb_bb/__init__.py                             0      0   100%
+punkweb_bb/admin.py                               43      0   100%
+punkweb_bb/admin_forms.py                         34      0   100%
+punkweb_bb/apps.py                                 6      0   100%
+punkweb_bb/context_processors.py                   3      0   100%
+punkweb_bb/forms.py                               47      0   100%
+punkweb_bb/guests.py                              13      0   100%
+punkweb_bb/middleware.py                          14      0   100%
+punkweb_bb/mixins.py                              11      0   100%
+punkweb_bb/models.py                             153      1    99%
+punkweb_bb/pagination.py                          11      4    64%
+punkweb_bb/parsers.py                             50     36    28%
+punkweb_bb/response.py                             3      0   100%
+punkweb_bb/settings.py                            11      0   100%
+punkweb_bb/signals.py                              9      0   100%
+punkweb_bb/templatetags/__init__.py                0      0   100%
+punkweb_bb/templatetags/can_delete.py              5      0   100%
+punkweb_bb/templatetags/can_edit.py                5      0   100%
+punkweb_bb/templatetags/can_post.py                5      0   100%
+punkweb_bb/templatetags/humanize_int.py            9      5    44%
+punkweb_bb/templatetags/render.py                 36     12    67%
+punkweb_bb/templatetags/shoutbox_render.py        18      2    89%
+punkweb_bb/templatetags/styled_group_name.py       7      1    86%
+punkweb_bb/templatetags/styled_username.py         6      0   100%
+punkweb_bb/tests.py                              418      0   100%
+punkweb_bb/urls.py                                 4      0   100%
+punkweb_bb/utils.py                               42     24    43%
+punkweb_bb/views.py                              304    118    61%
+punkweb_bb/widgets.py                             16      0   100%
+------------------------------------------------------------------
+TOTAL                                           1283    203    84%
+```

{punkweb_bb-0.2.3 → punkweb_bb-0.4.0}/punkweb_bb/admin.py

@@ -1,5 +1,4 @@
 from django.contrib import admin
-from django.utils.safestring import mark_safe
 
 from punkweb_bb.admin_forms import (
     BoardProfileAdminModelForm,
@@ -34,10 +33,6 @@ class BoardProfileModelAdmin(admin.ModelAdmin):
         "user__username",
         "user__email",
     )
-    readonly_fields = ("signature_rendered",)
-
-    def signature_rendered(self, obj):
-        return mark_safe(obj.signature.rendered)
 
 
 @admin.register(Category)

{punkweb_bb-0.2.3 → punkweb_bb-0.4.0}/punkweb_bb/admin_forms.py

@@ -8,6 +8,7 @@ from punkweb_bb.models import (
     Subcategory,
     Thread,
 )
+from punkweb_bb.utils import get_editor_widget
 from punkweb_bb.widgets import BBCodeEditorWidget
 
 
@@ -16,7 +17,7 @@ class BoardProfileAdminModelForm(forms.ModelForm):
         model = BoardProfile
         fields = "__all__"
         widgets = {
-            "signature": BBCodeEditorWidget(),
+            "signature": get_editor_widget(),
         }
 
 
@@ -25,7 +26,7 @@ class CategoryAdminModelForm(forms.ModelForm):
         model = Category
         fields = "__all__"
         widgets = {
-            "description": BBCodeEditorWidget(),
+            "description": get_editor_widget(),
         }
 
 
@@ -34,7 +35,7 @@ class SubcategoryAdminModelForm(forms.ModelForm):
         model = Subcategory
         fields = "__all__"
         widgets = {
-            "description": BBCodeEditorWidget(),
+            "description": get_editor_widget(),
         }
 
 
@@ -43,7 +44,7 @@ class ThreadAdminModelForm(forms.ModelForm):
         model = Thread
         fields = "__all__"
         widgets = {
-            "content": BBCodeEditorWidget(),
+            "content": get_editor_widget(),
         }
 
 
@@ -52,7 +53,7 @@ class PostAdminModelForm(forms.ModelForm):
         model = Post
         fields = "__all__"
         widgets = {
-            "content": BBCodeEditorWidget(),
+            "content": get_editor_widget(),
         }
 
 

punkweb_bb-0.4.0/punkweb_bb/bbcode.py

@@ -0,0 +1,155 @@
+import bbcode
+
+
+def render_color(name, value, options, parent, context):
+    if "color" in options:
+        color = options["color"].strip()
+        return f'<span style="color: {color}">{value}</span>'
+    return value
+
+
+def render_shadow(name, value, options, parent, context):
+    if "shadow" in options:
+        shadow = options["shadow"].strip()
+        return f'<span id="bbcode-shadow" style="text-shadow: 0px 0px 1em {shadow}">{value}</span>'
+    return value
+
+
+def render_font(name, value, options, parent, context):
+    if "font" in options:
+        font = options["font"].strip()
+        return f'<span style="font-family:{font};">{value}</span>'
+    return value
+
+
+def render_quote(name, value, options, parent, context):
+    if "quote" in options:
+        return f'<blockquote><cite>{options["quote"]} said: </cite>{value}</blockquote>'
+    return f"<blockquote>{value}</blockquote>"
+
+
+def render_code(name, value, options, parent, context):
+    if "code" in options:
+        language = options["code"].strip()
+        return f'<pre><code class="language-{language}">{value}</code></pre>'
+    return f"<pre><code>{value}</code></pre>"
+
+
+def render_img(name, value, options, parent, context):
+    if "width" in options:
+        width = options["width"]
+    if "height" in options:
+        height = options["height"]
+
+    if "width" in options and "height" in options:
+        return f'<img src="{value}" alt="{value}" width="{width}" height="{height}" />'
+    elif "width" in options:
+        return f'<img src="{value}" alt="{value}" width="{width}" />'
+    elif "height" in options:
+        return f'<img src="{value}" alt="{value}" height="{height}" />'
+
+    return f'<img src="{value}" alt="{value}" />'
+
+
+def render_url(name, value, options, parent, context):
+    if "url" in options:
+        url = options["url"]
+        return f'<a href="{url}">{value}</a>'
+    return f'<a href="{value}">{value}</a>'
+
+
+def render_size(name, value, options, parent, context):
+    if "size" in options:
+        size = options["size"].strip()
+        return f'<font size="{size}">{value}</font>'
+    return value
+
+
+def init_default_tags(parser):
+    parser.add_simple_formatter("b", "<strong>%(value)s</strong>")
+    parser.add_simple_formatter("i", "<em>%(value)s</em>")
+    parser.add_simple_formatter("u", "<u>%(value)s</u>")
+    parser.add_simple_formatter("s", "<s>%(value)s</s>")
+    parser.add_simple_formatter("sub", "<sub>%(value)s</sub>")
+    parser.add_simple_formatter("sup", "<sup>%(value)s</sup>")
+    parser.add_simple_formatter("escape", "%(value)s", render_embedded=False)
+
+    parser.add_formatter("font", render_font)
+    parser.add_formatter("color", render_color)
+    parser.add_formatter("shadow", render_shadow)
+    parser.add_formatter("url", render_url, replace_links=False, replace_cosmetic=False)
+
+
+_parser = None
+_shoutbox_parser = None
+
+
+def get_parser():
+    global _parser
+    if _parser is None:
+        _parser = bbcode.Parser(install_defaults=False)
+        init_default_tags(_parser)
+
+        _parser.add_simple_formatter("hr", "<hr />", standalone=True)
+        _parser.add_simple_formatter(
+            "center", '<div style="text-align: center">%(value)s</div>'
+        )
+        _parser.add_simple_formatter(
+            "left", '<div style="text-align: left">%(value)s</div>'
+        )
+        _parser.add_simple_formatter(
+            "right", '<div style="text-align: right">%(value)s</div>'
+        )
+        _parser.add_simple_formatter(
+            "ol",
+            "<ol>%(value)s</ol>",
+            transform_newlines=False,
+            strip=True,
+            swallow_trailing_newline=True,
+        )
+        _parser.add_simple_formatter(
+            "ul",
+            "<ul>%(value)s</ul>",
+            transform_newlines=False,
+            strip=True,
+            swallow_trailing_newline=True,
+        )
+        _parser.add_simple_formatter(
+            "li",
+            "<li>%(value)s</li>",
+            newline_closes=True,
+            transform_newlines=False,
+            same_tag_closes=True,
+            strip=True,
+        )
+
+        _parser.add_formatter("size", render_size)
+        _parser.add_formatter(
+            "img",
+            render_img,
+            render_embedded=False,
+            replace_links=False,
+            replace_cosmetic=False,
+        )
+        _parser.add_formatter(
+            "quote", render_quote, strip=True, swallow_trailing_newline=True
+        )
+        _parser.add_formatter(
+            "code",
+            render_code,
+            render_embedded=False,
+            transform_newlines=False,
+            replace_links=False,
+            replace_cosmetic=False,
+            strip=True,
+            swallow_trailing_newline=True,
+        )
+    return _parser
+
+
+def get_shoutbox_parser():
+    global _shoutbox_parser
+    if _shoutbox_parser is None:
+        _shoutbox_parser = bbcode.Parser(install_defaults=False)
+        init_default_tags(_shoutbox_parser)
+    return _shoutbox_parser

{punkweb_bb-0.2.3 → punkweb_bb-0.4.0}/punkweb_bb/forms.py

@@ -2,7 +2,7 @@ from django import forms
 from django.contrib.auth.forms import AuthenticationForm, UserCreationForm
 
 from punkweb_bb.models import BoardProfile, Category, Post, Shout, Subcategory, Thread
-from punkweb_bb.widgets import BBCodeEditorWidget
+from punkweb_bb.utils import get_editor_widget
 
 
 class LoginForm(AuthenticationForm):
@@ -39,7 +39,7 @@ class BoardProfileModelForm(forms.ModelForm):
             "signature",
         )
         widgets = {
-            "signature": BBCodeEditorWidget(),
+            "signature": get_editor_widget(),
         }
 
 
@@ -66,7 +66,7 @@ class PostModelForm(forms.ModelForm):
             "content": "",
         }
         widgets = {
-            "content": BBCodeEditorWidget(),
+            "content": get_editor_widget(),
         }
 
 
@@ -87,7 +87,7 @@ class SubcategoryModelForm(forms.ModelForm):
         )
         widgets = {
             "name": forms.TextInput(attrs={"autofocus": True, "class": "pw-input"}),
-            "description": BBCodeEditorWidget(),
+            "description": get_editor_widget(),
             "order": forms.TextInput(
                 attrs={"class": "pw-input", "min": "0", "type": "number"}
             ),
@@ -103,5 +103,13 @@ class ThreadModelForm(forms.ModelForm):
         )
         widgets = {
             "title": forms.TextInput(attrs={"autofocus": True, "class": "pw-input"}),
-            "content": BBCodeEditorWidget(),
+            "content": get_editor_widget(),
         }
+
+
+class ThreadMoveForm(forms.Form):
+    subcategory = forms.ModelChoiceField(
+        queryset=Subcategory.objects.all(),
+        empty_label="Select a subcategory",
+        widget=forms.Select(attrs={"class": "pw-input"}),
+    )

punkweb_bb-0.4.0/punkweb_bb/migrations/0005_alter_thread_options.py

@@ -0,0 +1,24 @@
+# Generated by Django 4.2.11 on 2024-05-30 02:25
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("punkweb_bb", "0004_groupstyle"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="thread",
+            options={
+                "ordering": ("subcategory", "-is_pinned", "-last_post_created_at"),
+                "permissions": (
+                    ("move_thread", "Can move thread"),
+                    ("pin_thread", "Can pin thread"),
+                    ("close_thread", "Can close thread"),
+                ),
+            },
+        ),
+    ]