punkweb-bb 0.2.2__py3-none-any.whl → 0.3.0__py3-none-any.whl

punkweb_bb/admin.py

@@ -34,10 +34,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/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

@@ -1,4 +1,3 @@
-import datetime
 import math
 import os
 
@@ -9,10 +8,9 @@ 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_styled_username
+from punkweb_bb.utils import get_highest_priority_group, get_styled_username
 
 User = get_user_model()
 
@@ -25,11 +23,15 @@ 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",)
 
+    @property
+    def priority_group(self):
+        return get_highest_priority_group(self.user)
+
     @property
     def styled_username(self):
         return get_styled_username(self.user)
@@ -38,7 +40,7 @@ class BoardProfile(UUIDPrimaryKeyMixin, TimestampMixin):
     def is_online(self):
         last_seen = cache.get(f"profile_online_{self.id}")
         if last_seen:
-            return timezone.now() < last_seen + datetime.timedelta(minutes=5)
+            return timezone.now() < last_seen + timezone.timedelta(minutes=5)
         return False
 
     @property
@@ -73,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)
 
@@ -113,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)
@@ -126,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"),
         )
@@ -157,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",)
@@ -219,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")
+RENDERER = PUNKWEB_BB.get("RENDERER", "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/thread.css

@@ -28,13 +28,25 @@
   padding: 1rem;
 }
 
-.thread__user__usernameContainer {
+.thread__user__info {
   align-items: center;
   display: flex;
+  flex-direction: column;
   gap: 0.25rem;
 }
 
-.thread__user__info {
+.thread__user__username {
+  align-items: center;
+  display: flex;
+  gap: 0.25rem;
+}
+
+.thread__user__group {
+  font-size: 0.75rem;
+  font-weight: 700;
+}
+
+.thread__user__details {
   background-color: var(--oc-gray-0);
   border: 1px solid var(--border);
   border-radius: 0.25rem;
@@ -45,35 +57,16 @@
   width: 100%;
 }
 
-.thread__user__info__row {
+.thread__user__details__row {
   align-items: center;
   display: flex;
   justify-content: space-between;
 }
 
-.thread__user__info__label {
+.thread__user__details__label {
   color: var(--body-fg);
 }
 
-.thread__user__groups {
-  display: flex;
-  flex-direction: column;
-  gap: 0.5rem;
-  width: 100%;
-}
-
-.thread__user__group {
-  background-color: var(--oc-gray-0);
-  border: 1px solid var(--border);
-  border-radius: 0.25rem;
-  color: var(--text-on-primary);
-  display: flex;
-  font-size: 0.875rem;
-  justify-content: center;
-  padding: 0.5rem;
-  width: 100%;
-}
-
 .thread__main {
   display: flex;
   flex-direction: column;
@@ -85,11 +78,6 @@
   padding: 1rem;
 }
 
-.thread__signature {
-  border-top: 1px solid var(--border);
-  padding: 1rem;
-}
-
 .thread__actions {
   align-items: center;
   display: flex;
@@ -98,12 +86,41 @@
   padding: 1rem;
 }
 
+.thread__signature {
+  border-top: 1px solid var(--border);
+  padding: 1rem;
+}
+
 .thread__reply__content {
   display: flex;
   flex-direction: column;
   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/markdown-editor.js

@@ -0,0 +1,23 @@
+function initMarkdownEditor(element) {
+  var editor = new TinyMDE.Editor({
+    textarea: element,
+  });
+
+  var toolbarElement = document.createElement("div");
+  toolbarElement.id = "markdown-editor-toolbar";
+  element.parentNode.insertBefore(toolbarElement, element);
+
+  new TinyMDE.CommandBar({
+    element: toolbarElement,
+    editor: editor,
+  });
+}
+
+$(function () {
+  $(document).ready(function () {
+    var editorElements = document.querySelectorAll(".markdown-editor");
+    editorElements.forEach((element) => {
+      initMarkdownEditor(element);
+    });
+  });
+});

punkweb_bb/static/punkweb_bb/vendor/tiny-markdown-editor/.eslintrc.json

@@ -0,0 +1,15 @@
+{
+    "env": {
+        "browser": true,
+        "es2020": true
+    },
+    "extends": ["eslint:recommended"],
+    "parserOptions": {
+        "ecmaVersion": 2019,
+        "sourceType": "module"
+    },
+    "ignorePatterns": ["gulpfile.js", "jest*.config.js", "jest/**/*.js", "node_modules/"],
+    "rules": {
+        "no-fallthrough": "off"
+    }
+}

punkweb_bb/static/punkweb_bb/vendor/tiny-markdown-editor/.gitignore

@@ -0,0 +1,108 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+lerna-debug.log*
+
+# Diagnostic reports (https://nodejs.org/api/report.html)
+report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+*.lcov
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (https://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# TypeScript v1 declaration files
+typings/
+
+# TypeScript cache
+*.tsbuildinfo
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Microbundle cache
+.rpt2_cache/
+.rts2_cache_cjs/
+.rts2_cache_es/
+.rts2_cache_umd/
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variables file
+.env
+.env.test
+
+# parcel-bundler cache (https://parceljs.org/)
+.cache
+
+# Next.js build output
+.next
+
+# Nuxt.js build / generate output
+.nuxt
+dist
+
+# Gatsby files
+.cache/
+# Comment in the public line in if your project uses Gatsby and *not* Next.js
+# https://nextjs.org/blog/next-9-1#public-directory-support
+# public
+
+# vuepress build output
+.vuepress/dist
+
+# Serverless directories
+.serverless/
+
+# FuseBox cache
+.fusebox/
+
+# DynamoDB Local files
+.dynamodb/
+
+# TernJS port file
+.tern-port
+
+.DS_Store
+
+lib

punkweb_bb/static/punkweb_bb/vendor/tiny-markdown-editor/.prettierrc.json

@@ -0,0 +1 @@
+{}

punkweb_bb/static/punkweb_bb/vendor/tiny-markdown-editor/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020 Jens-Fabian Goetzmann
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.