punkweb-bb 0.2.3__py3-none-any.whl → 0.4.0__py3-none-any.whl

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/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/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/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/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"),
+                ),
+            },
+        ),
+    ]

punkweb_bb/migrations/0006_remove_boardprofile__signature_rendered_and_more.py

@@ -0,0 +1,60 @@
+# Generated by Django 4.2.11 on 2024-05-30 21:37
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("punkweb_bb", "0005_alter_thread_options"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="boardprofile",
+            name="_signature_rendered",
+        ),
+        migrations.RemoveField(
+            model_name="groupstyle",
+            name="_username_style_rendered",
+        ),
+        migrations.RemoveField(
+            model_name="post",
+            name="_content_rendered",
+        ),
+        migrations.RemoveField(
+            model_name="subcategory",
+            name="_description_rendered",
+        ),
+        migrations.RemoveField(
+            model_name="thread",
+            name="_content_rendered",
+        ),
+        migrations.AlterField(
+            model_name="boardprofile",
+            name="signature",
+            field=models.TextField(blank=True, default="", max_length=1024),
+            preserve_default=False,
+        ),
+        migrations.AlterField(
+            model_name="groupstyle",
+            name="username_style",
+            field=models.TextField(),
+        ),
+        migrations.AlterField(
+            model_name="post",
+            name="content",
+            field=models.TextField(),
+        ),
+        migrations.AlterField(
+            model_name="subcategory",
+            name="description",
+            field=models.TextField(blank=True, default=""),
+            preserve_default=False,
+        ),
+        migrations.AlterField(
+            model_name="thread",
+            name="content",
+            field=models.TextField(),
+        ),
+    ]

punkweb_bb/models.py

@@ -8,7 +8,6 @@ from django.db import models
 from django.forms import ValidationError
 from django.urls import reverse
 from django.utils import timezone
-from precise_bbcode.fields import BBCodeTextField
 
 from punkweb_bb.mixins import TimestampMixin, UUIDPrimaryKeyMixin
 from punkweb_bb.utils import get_highest_priority_group, get_styled_username
@@ -24,7 +23,7 @@ def profile_image_upload_to(instance, filename):
 class BoardProfile(UUIDPrimaryKeyMixin, TimestampMixin):
     user = models.OneToOneField(User, related_name="profile", on_delete=models.CASCADE)
     image = models.ImageField(upload_to=profile_image_upload_to, blank=True, null=True)
-    signature = BBCodeTextField(max_length=1024, blank=True, null=True)
+    signature = models.TextField(max_length=1024, blank=True)
 
     class Meta:
         ordering = ("user__username",)
@@ -76,7 +75,7 @@ class Subcategory(UUIDPrimaryKeyMixin, TimestampMixin):
     )
     name = models.CharField(max_length=255)
     slug = models.SlugField(max_length=1024, unique=True)
-    description = BBCodeTextField(blank=True, null=True)
+    description = models.TextField(blank=True)
     order = models.PositiveIntegerField(default=0)
     staff_post_only = models.BooleanField(default=False)
 
@@ -116,7 +115,7 @@ class Thread(UUIDPrimaryKeyMixin, TimestampMixin):
     )
     user = models.ForeignKey(User, related_name="threads", on_delete=models.CASCADE)
     title = models.CharField(max_length=255)
-    content = BBCodeTextField()
+    content = models.TextField()
     is_pinned = models.BooleanField(default=False)
     is_closed = models.BooleanField(default=False)
     last_post_created_at = models.DateTimeField(auto_now_add=True)
@@ -129,6 +128,7 @@ class Thread(UUIDPrimaryKeyMixin, TimestampMixin):
             "-last_post_created_at",
         )
         permissions = (
+            ("move_thread", "Can move thread"),
             ("pin_thread", "Can pin thread"),
             ("close_thread", "Can close thread"),
         )
@@ -160,7 +160,7 @@ class Thread(UUIDPrimaryKeyMixin, TimestampMixin):
 class Post(UUIDPrimaryKeyMixin, TimestampMixin):
     thread = models.ForeignKey(Thread, related_name="posts", on_delete=models.CASCADE)
     user = models.ForeignKey(User, related_name="posts", on_delete=models.CASCADE)
-    content = BBCodeTextField()
+    content = models.TextField()
 
     class Meta:
         ordering = ("created_at",)
@@ -222,7 +222,7 @@ class GroupStyle(UUIDPrimaryKeyMixin, TimestampMixin):
         default=0,
         help_text="Highest priority is displayed",
     )
-    username_style = BBCodeTextField()
+    username_style = models.TextField()
 
     class Meta:
         ordering = ("-priority",)

punkweb_bb/settings.py

@@ -4,6 +4,7 @@ PUNKWEB_BB = getattr(settings, "PUNKWEB_BB", {})
 
 SITE_NAME = PUNKWEB_BB.get("SITE_NAME", "PUNKWEB")
 SITE_TITLE = PUNKWEB_BB.get("SITE_TITLE", "PunkwebBB")
+PARSER = PUNKWEB_BB.get("PARSER", "bbcode")
 FAVICON = PUNKWEB_BB.get("FAVICON", "punkweb_bb/favicon.ico")
 OG_IMAGE = PUNKWEB_BB.get("OG_IMAGE", None)
 SHOUTBOX_ENABLED = PUNKWEB_BB.get("SHOUTBOX_ENABLED", True)

punkweb_bb/static/punkweb_bb/css/defaults.css

@@ -1,7 +1,5 @@
 * {
   box-sizing: border-box;
-  margin: 0;
-  padding: 0;
 }
 
 *:before,
@@ -13,6 +11,8 @@
 body {
   line-height: 1;
   min-width: 20rem;
+  margin: 0;
+  padding: 0;
 }
 
 /* set cursor to pointer on buttons */

punkweb_bb/static/punkweb_bb/css/punkweb-modal.css

@@ -4,6 +4,7 @@
   display: flex;
   flex-direction: column;
   justify-content: center;
+  padding: 2rem;
 
   position: fixed;
   top: 0;
@@ -28,6 +29,7 @@
   border-radius: 0.25rem;
   box-shadow: 0 0.5rem 1rem 0 rgba(0, 0, 0, 0.25);
   background-color: white;
+  overflow: auto;
   position: relative;
   width: fit-content;
 

punkweb_bb/static/punkweb_bb/css/punkweb.css

@@ -181,7 +181,7 @@ blockquote cite {
   border-bottom: 1px solid var(--border);
   color: var(--table-header-text);
   font-size: 0.875rem;
-  font-weight: 500;
+  font-weight: 700;
   padding: 0.75rem 1rem;
   text-align: left;
 }
@@ -664,7 +664,7 @@ blockquote cite {
 .pw-input-label {
   display: block;
   font-size: 0.875rem;
-  font-weight: 500;
+  font-weight: 700;
 }
 
 /** Card **/

punkweb_bb/static/punkweb_bb/css/subcategory.css

@@ -11,6 +11,10 @@
   gap: 1rem;
 }
 
+.subcategory__header__name h1 {
+  margin: 0;
+}
+
 .subcategory__header__actions {
   align-items: center;
   display: flex;

punkweb_bb/static/punkweb_bb/css/thread.css

@@ -97,6 +97,30 @@
   gap: 1rem;
 }
 
+.threadMoveForm {
+  display: flex;
+  flex-direction: column;
+  gap: 1rem;
+}
+
+.threadMoveForm__field {
+  display: flex;
+  flex-direction: column;
+  gap: 0.5rem;
+}
+
+.threadMoveForm .errorlist {
+  color: var(--oc-red-9);
+  margin: 0;
+}
+
+.threadMoveForm__actions {
+  align-items: center;
+  display: flex;
+  justify-content: flex-end;
+  gap: 1rem;
+}
+
 @media screen and (max-width: 1024px) {
   .thread {
     flex-direction: column;

punkweb_bb/static/punkweb_bb/editor/bbcode-editor-content.css

@@ -8,12 +8,16 @@ body {
   line-height: 1.5;
   overflow: visible;
 }
+
 html {
   height: 100%;
 }
 
 * {
   box-sizing: border-box;
+}
+
+body {
   margin: 0;
   padding: 0;
 }
@@ -56,11 +60,6 @@ a {
   text-decoration: none;
 }
 
-ul,
-ol {
-  padding-inline-start: 2rem;
-}
-
 code {
   display: block;
   background: #f5f2f0;

punkweb_bb/static/punkweb_bb/editor/bbcode-editor.js

@@ -1,12 +1,7 @@
 $(function () {
   $(document).ready(function () {
     $(".bbcode-editor").sceditor({
-      emoticonsCompat: true,
       emoticonsEnabled: false,
-      emoticonsRoot: "/media/precise_bbcode/smilies/",
-      emoticons: {
-        dropdown: {},
-      },
       format: "bbcode",
       icons: "material",
       style: "/static/punkweb_bb/editor/bbcode-editor-content.css",

punkweb_bb/static/punkweb_bb/editor/markdown-editor.js

@@ -0,0 +1,49 @@
+function initMarkdownEditor(containerElement) {
+  var editorElement = containerElement.querySelector(".markdown-editor");
+  var toolbarElement = containerElement.querySelector(
+    "#markdown-editor-toolbar"
+  );
+
+  var editor = null;
+
+  if (!containerElement.querySelector(".TinyMDE")) {
+    editor = new TinyMDE.Editor({
+      textarea: editorElement,
+    });
+  }
+
+  if (editor && !toolbarElement.querySelector(".TMCommandBar")) {
+    var toolbar = new TinyMDE.CommandBar({
+      element: toolbarElement,
+      editor: editor,
+      commands: [
+        "bold",
+        "italic",
+        "strikethrough",
+        "|",
+        "h1",
+        "h2",
+        "|",
+        "ul",
+        "ol",
+        "|",
+        "blockquote",
+        "code",
+        "insertLink",
+        "insertImage",
+        "hr",
+      ],
+    });
+  }
+}
+
+$(function () {
+  $(document).ready(function () {
+    var editorElements = document.querySelectorAll(
+      ".markdown-editor-container"
+    );
+    editorElements.forEach((element) => {
+      initMarkdownEditor(element);
+    });
+  });
+});