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

punkweb_bb/templates/punkweb_bb/partials/subcategory_delete.html

@@ -1,11 +1,7 @@
-{% extends 'punkweb_bb/base_modal.html' %}
+{% extends 'punkweb_bb/base_delete_modal.html' %}
 
 {% block title %}Delete Subcategory{% endblock %}
 
-{% block content %}
-<p>Are you sure you want to delete this subcategory? This action cannot be undone!</p>
-<div class="modal__actions">
-  <button class="modal__cancel pw-button default">Cancel</button>
-  <button class="pw-button raised danger" hx-delete="{% url 'punkweb_bb:subcategory_delete' subcategory.slug %}">Delete</button>
-</div>
-{% endblock %}
+{% block object_type %}subcategory{% endblock %}
+
+{% block delete_url %}{% url 'punkweb_bb:subcategory_delete' subcategory.slug %}{% endblock %}

punkweb_bb/templates/punkweb_bb/partials/thread_delete.html

@@ -1,11 +1,7 @@
-{% extends 'punkweb_bb/base_modal.html' %}
+{% extends 'punkweb_bb/base_delete_modal.html' %}
 
 {% block title %}Delete Thread{% endblock %}
 
-{% block content %}
-<p>Are you sure you want to delete this thread? This action cannot be undone!</p>
-<div class="modal__actions">
-  <button class="modal__cancel pw-button default">Cancel</button>
-  <button class="pw-button raised danger" hx-delete="{% url 'punkweb_bb:thread_delete' thread.id %}">Delete</button>
-</div>
-{% endblock %}
+{% block object_type %}thread{% endblock %}
+
+{% block delete_url %}{% url 'punkweb_bb:thread_delete' thread.id %}{% endblock %}

punkweb_bb/templates/punkweb_bb/partials/thread_move.html

@@ -0,0 +1,24 @@
+{% extends 'punkweb_bb/base_modal.html' %}
+
+{% block title %}Move Thread{% endblock %}
+
+{% block content %}
+<form class="threadMoveForm" action="{% url 'punkweb_bb:thread_move' thread.id %}" method="post">
+  {% csrf_token %}
+  {% for field in form %}
+  <div class="threadMoveForm__field">
+    <label class="pw-input-label" for="{{ field.id_for_label }}">{{ field.label }}</label>
+    {{ field }}
+  </div>
+  {% endfor %}
+  {% if form.non_field_errors %}
+  {{ form.non_field_errors }}
+  {% endif %}
+  <div class="threadMoveForm__actions">
+    <button class="modal__cancel pw-button default">Cancel</button>
+    <button class="pw-button raised primary" type="submit">Move</button>
+  </div>
+</form>
+{{form.media.css}}
+{{form.media.js}}
+{% endblock %}

punkweb_bb/templates/punkweb_bb/profile.html

@@ -1,5 +1,5 @@
 {% extends 'punkweb_bb/base.html' %}
-{% load static styled_username %}
+{% load static render styled_username %}
 
 {% block title_prefix %}{{ user.username }} | {% endblock%}
 {% block og_title_prefix %}{{ user.username }} | {% endblock %}
@@ -76,7 +76,7 @@
               <a href="{% url 'punkweb_bb:thread' thread.id %}">{{ thread.title }}</a>
             </div>
             <p class="profile__thread__preview">
-              {{ thread.content.rendered|striptags|truncatechars:120 }}
+              {{ thread.content|render|striptags|truncatechars:120 }}
             </p>
             <div class="profile__thread__date">
               <time datetime="{{thread.created_at|date:'c'}}">

punkweb_bb/templates/punkweb_bb/shoutbox/shout_list.html

@@ -1,11 +1,11 @@
-{% load shoutbox_bbcode can_delete styled_username %}
+{% load render styled_username can_delete %}
 
 {% for shout in shouts %}
 <div class="shoutbox__shout">
   <div class="shoutbox__shout__content">
     <time datetime="{{shout.created_at|date:'c'}}">{{shout.created_at | date:'g:i A'}}</time>
     <span><a href="{% url 'punkweb_bb:profile' shout.user.id %}">{{shout.user|styled_username}}</a>: </span>
-    <span>{{ shout.content | safe | shoutbox_bbcode }}</span>
+    <span>{{ shout.content|render_shout }}</span>
   </div>
   {% if shout|can_delete:request.user %}
   <div class="shoutbox__shout__actions">

punkweb_bb/templates/punkweb_bb/subcategory.html

@@ -101,7 +101,7 @@
                 {{thread.user|styled_username}}
               </a>
               •
-              <time datetime="{{thread.created_at|date:'c'}}">{{thread.created_at | date:'m j, Y'}}</time>
+              <time datetime="{{thread.created_at|date:'c'}}">{{thread.created_at | date:'M j, Y'}}</time>
           </td>
           <td>{{thread.post_count}}</td>
           <td>{{thread.view_count | humanize_int}}</td>

punkweb_bb/templates/punkweb_bb/thread.html

@@ -1,12 +1,12 @@
 {% extends 'punkweb_bb/base.html' %}
-{% load static can_delete can_edit can_post styled_username %}
+{% load static render styled_username can_delete can_edit can_post %}
 
 {% block title_prefix %}{{thread.title}} | {% endblock %}
 {% block og_title_prefix %}{{thread.title}} | {% endblock %}
 
 {% block extra_head %}
-<meta name="description" content="{{thread.content.rendered|striptags|truncatechars:120}}" />
-<meta property="og:description" content="{{thread.content.rendered|striptags|truncatechars:120}}" />
+<meta name="description" content="{{thread.content|render|striptags|truncatechars:120}}" />
+<meta property="og:description" content="{{thread.content|render|striptags|truncatechars:120}}" />
 <link rel="stylesheet" href="{% static 'punkweb_bb/css/post-form.css' %}" />
 <link rel="stylesheet" href="{% static 'punkweb_bb/css/thread.css' %}" />
 <link rel="stylesheet" href="{% static 'punkweb_bb/css/thread-form.css' %}" />
@@ -42,7 +42,7 @@
 <div class="pw-card fluid margin">
   <div class="pw-card-header">
     <div class="thread__date">
-      <time datetime="{{thread.created_at|date:'c'}}">{{thread.created_at | date:'M d, Y'}}</time>
+      <time datetime="{{thread.created_at|date:'c'}}">{{thread.created_at | date:'M j, Y'}}</time>
     </div>
   </div>
   <div class="thread">
@@ -75,7 +75,7 @@
         <div class="thread__user__details__row">
           <div class="thread__user__details__label">Joined:</div>
           <div class="thread__user__details__value">
-            <time datetime="{{thread.user.date_joined|date:'c'}}">{{thread.user.date_joined | date:'M d, Y'}}</time>
+            <time datetime="{{thread.user.date_joined|date:'c'}}">{{thread.user.date_joined | date:'M j, Y'}}</time>
           </div>
         </div>
         <div class="thread__user__details__row">
@@ -86,10 +86,20 @@
     </div>
     <div class="thread__main">
       <div class="thread__content">
-        {{thread.content.rendered}}
+        {{thread.content|render}}
       </div>
-      {% if thread|can_delete:request.user or thread|can_edit:request.user or perms.punkweb_bb.pin_thread or perms.punkweb_bb.close_thread %}
+      {% if thread|can_delete:request.user or thread|can_edit:request.user or perms.punkweb_bb.pin_thread or perms.punkweb_bb.close_thread or perms.punkweb_bb.move_thread %}
       <div class="thread__actions">
+        {% if perms.punkweb_bb.move_thread %}
+        <a 
+          class="pw-icon-button default rounded"
+          title="Move"
+          hx-get="{% url 'punkweb_bb:thread_move' thread.id %}"
+          hx-target="#modal-portal"
+        >
+          <span class="material-symbols-outlined">move_item</span>
+        </a>
+        {% endif %}
         {% if perms.punkweb_bb.pin_thread %}
         <a 
           class="pw-icon-button default rounded"
@@ -139,9 +149,9 @@
         {% endif %}
       </div>
       {% endif %}
-      {% if thread.user.profile.signature.rendered %}
+      {% if thread.user.profile.signature|render %}
       <div class="thread__signature">
-        {{thread.user.profile.signature.rendered}}
+        {{thread.user.profile.signature|render}}
       </div>
       {% endif %}
     </div>
@@ -153,7 +163,7 @@
 <div id="post-{{post.id}}" class="pw-card fluid margin">
   <div class="pw-card-header thread__header">
     <div class="thread__date">
-      <time datetime="{{post.created_at|date:'c'}}">{{post.created_at | date:'M d, Y'}}</time>
+      <time datetime="{{post.created_at|date:'c'}}">{{post.created_at | date:'M j, Y'}}</time>
     </div>
     <a class="thread__index" href="{{post.get_absolute_url}}">#{{post.index}}</a>
   </div>
@@ -191,7 +201,7 @@
         <div class="thread__user__details__row">
           <div class="thread__user__details__label">Joined:</div>
           <div class="thread__user__details__value">
-            <time datetime="{{post.user.date_joined|date:'c'}}">{{post.user.date_joined | date:'M d, Y'}}</time>
+            <time datetime="{{post.user.date_joined|date:'c'}}">{{post.user.date_joined | date:'M j, Y'}}</time>
           </div>
         </div>
         <div class="thread__user__details__row">
@@ -202,7 +212,7 @@
     </div>
     <div class="thread__main">
       <div class="thread__content">
-        {{post.content.rendered}}
+        {{post.content|render}}
       </div>
       {% if post|can_delete:request.user or post|can_edit:request.user %}
       <div class="thread__actions">
@@ -228,9 +238,9 @@
         {% endif %}
       </div>
       {% endif %}
-      {% if post.user.profile.signature.rendered %}
+      {% if post.user.profile.signature|render %}
       <div class="thread__signature">
-        {{post.user.profile.signature.rendered}}
+        {{post.user.profile.signature|render}}
       </div>
       {% endif %}
     </div>

punkweb_bb/templates/punkweb_bb/widgets/markdown-editor.html

@@ -0,0 +1,4 @@
+<div class="markdown-editor-container">
+  <div id="markdown-editor-toolbar"></div>
+  {% include "django/forms/widgets/textarea.html" %}
+</div>

punkweb_bb/templatetags/render.py

@@ -0,0 +1,35 @@
+import html
+
+import markdown as md
+from django import template
+from django.template.defaultfilters import stringfilter
+from django.utils.safestring import mark_safe
+
+from punkweb_bb.bbcode import get_parser, get_shoutbox_parser
+from punkweb_bb.settings import PARSER
+
+register = template.Library()
+
+
+@register.filter(is_safe=True)
+@stringfilter
+def render(value):
+    if PARSER == "bbcode":
+        parser = get_parser()
+        rendered = parser.format(value)
+        return mark_safe(rendered)
+    elif PARSER == "markdown":
+        escaped = html.escape(value)
+        rendered = md.markdown(escaped, extensions=["markdown.extensions.fenced_code"])
+        return mark_safe(rendered)
+    return value
+
+
+@register.filter(is_safe=True)
+@stringfilter
+def render_shout(value):
+    if PARSER == "bbcode":
+        parser = get_shoutbox_parser()
+        rendered = parser.format(value)
+        return mark_safe(rendered)
+    return value

punkweb_bb/tests.py

@@ -422,7 +422,7 @@ class SettingsViewTestCase(TestCase):
         )
 
         self.user.profile.refresh_from_db()
-        self.assertEqual(self.user.profile._signature_rendered, "<strong>test</strong>")
+        self.assertEqual(self.user.profile.signature, "[b]test[/b]")
 
         self.assertEqual(response.status_code, 200)
 
@@ -546,7 +546,7 @@ class ThreadUpdateViewTestCase(TestCase):
         self.assertRedirects(response, self.thread.get_absolute_url())
         self.thread.refresh_from_db()
         self.assertEqual(self.thread.title, "edit")
-        self.assertEqual(self.thread._content_rendered, "edit")
+        self.assertEqual(self.thread.content, "edit")
 
 
 class ThreadDeleteViewTestCase(TestCase):
@@ -675,7 +675,7 @@ class PostUpdateViewTestCase(TestCase):
 
         self.assertRedirects(response, self.post.get_absolute_url())
         self.post.refresh_from_db()
-        self.assertEqual(self.post._content_rendered, "edit")
+        self.assertEqual(self.post.content, "edit")
 
 
 class PostDeleteViewTestCase(TestCase):

punkweb_bb/urls.py

@@ -61,6 +61,7 @@ urlpatterns = [
     ),
     path("thread/<str:thread_id>/pin/", views.thread_pin_view, name="thread_pin"),
     path("thread/<str:thread_id>/close/", views.thread_close_view, name="thread_close"),
+    path("thread/<str:thread_id>/move/", views.thread_move_view, name="thread_move"),
     path("post/<str:post_id>/delete/", views.post_delete_view, name="post_delete"),
     path("post/<str:post_id>/update/", views.post_update_view, name="post_update"),
     path("shout-list/", views.shout_list_view, name="shout_list"),

punkweb_bb/utils.py

@@ -1,6 +1,18 @@
-from django.contrib.auth.models import Group
+from django.forms import Textarea
 from django.utils.text import slugify
 
+from punkweb_bb.bbcode import get_parser
+from punkweb_bb.settings import PARSER
+from punkweb_bb.widgets import BBCodeEditorWidget, MarkdownEditorWidget
+
+
+def get_editor_widget():
+    if PARSER == "bbcode":
+        return BBCodeEditorWidget()
+    elif PARSER == "markdown":
+        return MarkdownEditorWidget()
+    return Textarea(attrs={"class": "pw-input"})
+
 
 def get_unique_slug(model, field):
     base_slug = slugify(field)
@@ -31,17 +43,19 @@ def get_styled_username(user):
     group = get_highest_priority_group(user)
 
     if group:
+        parser = get_parser()
         username_style = group.style.username_style
-        styled_username = username_style.rendered.replace("{USER}", user.username)
-        return styled_username
-    else:
-        return user.username
+        rendered = parser.format(username_style.replace("{USER}", user.username))
+        return rendered
+
+    return user.username
 
 
 def get_styled_group_name(group):
-    if group.style is None:
-        return group.name
-    else:
+    if group.style is not None:
+        parser = get_parser()
         username_style = group.style.username_style
-        styled_group_name = username_style.rendered.replace("{USER}", group.name)
-        return styled_group_name
+        rendered = parser.format(username_style.replace("{USER}", group.name))
+        return rendered
+
+    return group.name

punkweb_bb/views.py

@@ -14,6 +14,7 @@ from punkweb_bb.forms import (
     SignUpForm,
     SubcategoryModelForm,
     ThreadModelForm,
+    ThreadMoveForm,
 )
 from punkweb_bb.guests import guest_list
 from punkweb_bb.models import Category, Post, Shout, Subcategory, Thread
@@ -406,11 +407,11 @@ def thread_delete_view(request, thread_id):
 
 @login_required(login_url="/login/")
 def thread_pin_view(request, thread_id):
-    thread = get_object_or_404(Thread, pk=thread_id)
-
     if not request.user.has_perm("punkweb_bb.pin_thread"):
         return HttpResponseForbidden("You do not have permission to pin threads.")
 
+    thread = get_object_or_404(Thread, pk=thread_id)
+
     thread.is_pinned = not thread.is_pinned
     thread.save()
 
@@ -419,17 +420,47 @@ def thread_pin_view(request, thread_id):
 
 @login_required(login_url="/login/")
 def thread_close_view(request, thread_id):
-    thread = get_object_or_404(Thread, pk=thread_id)
-
     if not request.user.has_perm("punkweb_bb.close_thread"):
         return HttpResponseForbidden("You do not have permission to close threads.")
 
+    thread = get_object_or_404(Thread, pk=thread_id)
+
     thread.is_closed = not thread.is_closed
     thread.save()
 
     return htmx_redirect(thread.get_absolute_url())
 
 
+@login_required(login_url="/login/")
+def thread_move_view(request, thread_id):
+    if not request.user.has_perm("punkweb_bb.move_thread"):
+        return HttpResponseForbidden("You do not have permission to move threads.")
+
+    thread = get_object_or_404(Thread, pk=thread_id)
+
+    if request.method == "POST":
+        form = ThreadMoveForm(request.POST)
+
+        if form.is_valid():
+            thread.subcategory = form.cleaned_data["subcategory"]
+            thread.save()
+
+            return redirect(thread)
+
+    initial_data = {
+        "subcategory": thread.subcategory,
+    }
+
+    form = ThreadMoveForm(data=initial_data)
+
+    context = {
+        "thread": thread,
+        "form": form,
+    }
+
+    return render(request, "punkweb_bb/partials/thread_move.html", context=context)
+
+
 @login_required(login_url="/login/")
 def post_create_view(request, thread_id):
     thread = get_object_or_404(Thread, pk=thread_id)
@@ -557,16 +588,22 @@ def bbcode_view(request):
         ("Italic", "[i]Italic Text[/i]"),
         ("Underline", "[u]Underlined Text[/u]"),
         ("Strikethrough", "[s]Strikethrough Text[/s]"),
-        ("Quote", "[quote=Example]Quoted Text[/quote]"),
-        ("Center", "[center]Centered Text[/center]"),
         ("Color", "[color=red]Red Text[/color]"),
+        ("Font", "[font=serif]Serif Text[/font]"),
+        ("Shadow", "[shadow=red]Red Shadow Text[/shadow]"),
+        ("Size", "[size=7]Size 7 Text[/size]"),
+        ("Superscript", "Sup [sup]Superscript Text[/sup]"),
+        ("Subscript", "Sub [sub]Subscript Text[/sub]"),
+        ("Horizontal Rule", "[hr]"),
+        ("Left", "[left]Left Text[/left]"),
+        ("Center", "[center]Centered Text[/center]"),
+        ("Right", "[right]Right Text[/right]"),
+        ("Quote", "[quote=Example]Quoted Text[/quote]"),
         ("Url", "[url=https://google.com]Link Text[/url]"),
         (
             "Image",
             "[img]https://placehold.co/400[/img]",
         ),
-        # Custom
-        ("Horizontal Rule", "[hr]"),
         (
             "Code",
             """
@@ -585,23 +622,8 @@ class ThreadModelForm(forms.ModelForm):
 [/code]
 """,
         ),
-        ("Email", "[email=test@example.com]Example[/email]"),
-        ("Font", "[font=serif]Serif Text[/font]"),
         ("Ordered List", "[ol][li]Item 1[/li][li]Item 2[/li][/ol]"),
         ("Unordered List", "[ul][li]Item 1[/li][li]Item 2[/li][/ul]"),
-        ("Shadow", "[shadow=red]Red Shadow Text[/shadow]"),
-        ("Size", "[size=7]Size 7 Text[/size]"),
-        (
-            "Checkbox",
-            """
-[n]Unchecked
-[y]Checked
-            """,
-        ),
-        ("Superscript", "Sup [sup]Superscript Text[/sup]"),
-        ("Subscript", "Sub [sub]Subscript Text[/sub]"),
-        ("Left", "[left]Left Text[/left]"),
-        ("Right", "[right]Right Text[/right]"),
         ("Escape", "[escape][b]Escaped bbcode[/b][/escape]"),
     )
 

punkweb_bb/widgets.py

@@ -20,3 +20,23 @@ class BBCodeEditorWidget(forms.Textarea):
             "/static/punkweb_bb/editor/bbcode-editor-tags.js",
             "/static/punkweb_bb/editor/bbcode-editor.js",
         )
+
+
+class MarkdownEditorWidget(forms.Textarea):
+    template_name = "punkweb_bb/widgets/markdown-editor.html"
+
+    def __init__(self, *args, **kwargs):
+        super(MarkdownEditorWidget, self).__init__(*args, **kwargs)
+        self.attrs["class"] = "markdown-editor"
+
+    class Media:
+        css = {
+            "all": (
+                "/static/punkweb_bb/vendor/tiny-markdown-editor/dist/tiny-mde.min.css",
+            )
+        }
+        js = (
+            "/static/punkweb_bb/vendor/jquery-3.7.0.min.js",
+            "/static/punkweb_bb/vendor/tiny-markdown-editor/dist/tiny-mde.min.js",
+            "/static/punkweb_bb/editor/markdown-editor.js",
+        )