punkweb-bb 0.1.3__py3-none-any.whl → 0.2.0__py3-none-any.whl

punkweb_bb/templates/punkweb_bb/shoutbox/shout_list.html

@@ -1,9 +1,19 @@
-{% load shoutbox_bbcode %}
+{% load shoutbox_bbcode can_delete %}
 
 {% for shout in shouts %}
 <div class="shoutbox__shout">
-  <span>{{shout.created_at|date:'g:i A'}}</span>
-  <span><a href="{% url 'punkweb_bb:profile' shout.user.id %}">{{shout.user.username}}</a>: </span>
-  <span>{{ shout.content | safe | shoutbox_bbcode }}</span>
+  <div class="shoutbox__shout__content">
+    <span>{{shout.created_at|date:'g:i A'}}</span>
+    <span><a href="{% url 'punkweb_bb:profile' shout.user.id %}">{{shout.user.username}}</a>: </span>
+    <span>{{ shout.content | safe | shoutbox_bbcode }}</span>
+  </div>
+  {% if shout|can_delete:request.user %}
+  <div class="shoutbox__shout__actions">
+    <button class="pw-icon-button danger xs" hx-get="{% url 'punkweb_bb:shout_delete' shout.id %}"
+      hx-target="#modal-portal">
+      <span class="material-symbols-outlined">close</span>
+    </button>
+  </div>
+  {% endif %}
 </div>
 {% endfor %}

punkweb_bb/templates/punkweb_bb/subcategory.html

@@ -1,5 +1,5 @@
 {% extends 'punkweb_bb/base.html' %}
-{% load static humanize_int %}
+{% load static humanize_int can_post %}
 
 {% block title_prefix %}{{subcategory.name}} | {% endblock%}
 
@@ -24,21 +24,36 @@
 </nav>
 
 <div class="subcategory__header">
-  <h1>{{subcategory.name}}</h1>
-  {% if request.user.is_authenticated %}
-  {% if not subcategory.staff_post_only or request.user.is_staff %}
+  <div class="subcategory__header__name">
+    <h1>{{subcategory.name}}</h1>
+    {% if perms.punkweb_bb.change_subcategory or perms.punkweb_bb.delete_subcategory %}
+    <div class="subcategory__header__actions">
+      {% if perms.punkweb_bb.change_subcategory %}
+      <a class="pw-button ghost xs" href="{% url 'punkweb_bb:subcategory_update' subcategory.slug %}">
+        Edit
+      </a>
+      {% endif %}
+      {% if perms.punkweb_bb.delete_subcategory %}
+      <a class="pw-button ghost danger xs" hx-get="{% url 'punkweb_bb:subcategory_delete' subcategory.slug %}" hx-target="#modal-portal">
+        Delete
+      </a>
+      {% endif %}
+    </div>
+    {% endif %}
+  </div>
+
+  {% if subcategory|can_post:request.user %}
   <a class="pw-button ghost primary" href="{% url 'punkweb_bb:thread_create' subcategory.slug %}">Create Thread</a>
   {% else %}
   <button
     class="pw-button ghost primary"
     disabled
     href="{% url 'punkweb_bb:thread_create' subcategory.slug %}"
-    title="Only staff can create threads in this subcategory"
+    title="You do not have permission to create a thread in this subcategory."
   >
     Create Thread
   </button>
   {% endif %}
-  {% endif %}
 </div>
 
 <div class="pw-card fluid margin">

punkweb_bb/templates/punkweb_bb/subcategory_create.html

@@ -0,0 +1,53 @@
+{% extends 'punkweb_bb/base.html' %}
+{% load static %}
+
+{% block title_prefix %}Create Subcategory | {% endblock %}
+
+{% block extra_head %}
+{{form.media.css}}
+<link rel="stylesheet" href="{% static 'punkweb_bb/css/subcategory-form.css' %}" />
+{% endblock %}
+
+{% block content %}
+
+<nav>
+  <ul class="pw-breadcrumb">
+    <li class="pw-breadcrumb-item">
+      <a href="{% url 'punkweb_bb:index' %}">Home</a>
+    </li>
+    <li class="pw-breadcrumb-item">
+      <a href="{{category.get_absolute_url}}">{{category.name}}</a>
+    </li>
+    <li class="pw-breadcrumb-item active">
+      Create Subcategory
+    </li>
+  </ul>
+</nav>
+
+<div class="pw-card fluid">
+  <div class="pw-card-header">Create Subcategory</div>
+  <div class="pw-card-content">
+    <form class="subcategoryForm" action="{% url 'punkweb_bb:subcategory_create' category.slug %}" method="post">
+      {% csrf_token %}
+      {% for field in form %}
+      <div class="subcategoryForm__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="subcategoryForm__actions">
+        <a class="pw-button default" href="{% url 'punkweb_bb:index' %}" type="submit">Cancel</a>
+        <button class="pw-button raised primary" type="submit">Create</button>
+      </div>
+    </form>
+  </div>
+</div>
+
+{% endblock %}
+
+{% block extra_script %}
+{{form.media.js}}
+{% endblock %}

punkweb_bb/templates/punkweb_bb/subcategory_update.html

@@ -0,0 +1,56 @@
+{% extends 'punkweb_bb/base.html' %}
+{% load static %}
+
+{% block title_prefix %}Edit Subcategory | {% endblock %}
+
+{% block extra_head %}
+{{form.media.css}}
+<link rel="stylesheet" href="{% static 'punkweb_bb/css/subcategory-form.css' %}" />
+{% endblock %}
+
+{% block content %}
+
+<nav>
+  <ul class="pw-breadcrumb">
+    <li class="pw-breadcrumb-item">
+      <a href="{% url 'punkweb_bb:index' %}">Home</a>
+    </li>
+    <li class="pw-breadcrumb-item">
+      <a href="{{subcategory.category.get_absolute_url}}">{{subcategory.category.name}}</a>
+    </li>
+    <li class="pw-breadcrumb-item">
+      <a href="{{subcategory.get_absolute_url}}">{{subcategory.name}}</a>
+    </li>
+    <li class="pw-breadcrumb-item active">
+      Edit
+    </li>
+  </ul>
+</nav>
+
+<div class="pw-card fluid">
+  <div class="pw-card-header">Edit Subcategory</div>
+  <div class="pw-card-content">
+    <form class="subcategoryForm" action="{% url 'punkweb_bb:subcategory_update' subcategory.slug %}" method="post">
+      {% csrf_token %}
+      {% for field in form %}
+      <div class="subcategoryForm__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="subcategoryForm__actions">
+        <a class="pw-button default" href="{{subcategory.get_absolute_url}}">Cancel</a>
+        <button class="pw-button raised primary" type="submit">Save</button>
+      </div>
+    </form>
+  </div>
+</div>
+
+{% endblock %}
+
+{% block extra_script %}
+{{form.media.js}}
+{% endblock %}

punkweb_bb/templates/punkweb_bb/thread.html

@@ -1,5 +1,5 @@
 {% extends 'punkweb_bb/base.html' %}
-{% load static %}
+{% load static can_delete can_edit can_post %}
 
 {% block title_prefix %}{{thread.title}} | {% endblock %}
 
@@ -67,6 +67,13 @@
           <div class="thread__user__info__value">{{thread.user.profile.post_count}}</div>
         </div>
       </div>
+      {% if thread.user.groups.all|length > 0 %}
+      <div class="thread__user__groups">
+        {% for group in thread.user.groups.all %}
+        <div class="thread__user__group">{{group.name}}</div>
+        {% endfor %}
+      </div>
+      {% endif %}
     </div>
     <div class="thread__main">
       <div class="thread__content">
@@ -77,13 +84,17 @@
         {{thread.user.profile.signature.rendered}}
       </div>
       {% endif %}
-      {% if thread.user == request.user %}
+      {% if thread|can_delete:request.user or thread|can_edit:request.user %}
       <div class="thread__actions">
+        {% if thread|can_edit:request.user %}
         <a class="pw-button ghost sm" href="{% url 'punkweb_bb:thread_update' thread.id %}">Edit</a>
+        {% endif %}
+        {% if thread|can_delete:request.user %}
         <a class="pw-button ghost danger sm" hx-get="{% url 'punkweb_bb:thread_delete' thread.id %}"
           hx-target="#modal-portal">
           Delete
         </a>
+        {% endif %}
       </div>
       {% endif %}
     </div>
@@ -128,6 +139,13 @@
           <div class="thread__user__info__value">{{post.user.profile.post_count}}</div>
         </div>
       </div>
+      {% if post.user.groups.all|length > 0 %}
+      <div class="thread__user__groups">
+        {% for group in post.user.groups.all %}
+        <div class="thread__user__group">{{group.name}}</div>
+        {% endfor %}
+      </div>
+      {% endif %}
     </div>
     <div class="thread__main">
       <div class="thread__content">
@@ -138,13 +156,17 @@
         {{post.user.profile.signature.rendered}}
       </div>
       {% endif %}
-      {% if post.user == request.user %}
+      {% if post|can_delete:request.user or post|can_edit:request.user %}
       <div class="thread__actions">
+        {% if post|can_edit:request.user %}
         <a class="pw-button ghost sm" hx-get="{% url 'punkweb_bb:post_update' post.id %}" hx-target="#modal-portal">Edit</a>
+        {% endif %}
+        {% if post|can_delete:request.user %}
         <a class="pw-button ghost danger sm" hx-get="{% url 'punkweb_bb:post_delete' post.id %}"
           hx-target="#modal-portal">
           Delete
         </a>
+        {% endif %}
       </div>
       {% endif %}
     </div>
@@ -198,8 +220,7 @@
 </nav>
 {% endif %}
 
-{% if request.user.is_authenticated %}
-{% if not thread.is_closed %}
+{% if thread|can_post:request.user %}
 <div class="pw-card fluid margin">
   <div class="pw-card-header">Reply to thread</div>
   <div class="pw-card-content">
@@ -229,6 +250,5 @@
   </div>
 </div>
 {% endif %}
-{% endif %}
 
 {% endblock %}

punkweb_bb/templates/punkweb_bb/thread_create.html

@@ -42,6 +42,7 @@
       {{ form.non_field_errors }}
       {% endif %}
       <div class="threadForm__actions">
+        <a class="pw-button default" href="{{subcategory.get_absolute_url}}" type="submit">Cancel</a>
         <button class="pw-button raised primary" type="submit">Create Thread</button>
       </div>
     </form>

punkweb_bb/templatetags/can_delete.py

@@ -0,0 +1,8 @@
+from django import template
+
+register = template.Library()
+
+
+@register.filter
+def can_delete(obj, user):
+    return obj.can_delete(user)

punkweb_bb/templatetags/can_edit.py

@@ -0,0 +1,8 @@
+from django import template
+
+register = template.Library()
+
+
+@register.filter
+def can_edit(obj, user):
+    return obj.can_edit(user)

punkweb_bb/templatetags/can_post.py

@@ -0,0 +1,8 @@
+from django import template
+
+register = template.Library()
+
+
+@register.filter
+def can_post(obj, user):
+    return obj.can_post(user)

punkweb_bb/tests.py

@@ -299,14 +299,14 @@ class IndexViewTestCase(TestCase):
             username="staff", password="staff", is_staff=True
         )
 
-    def test_users_online(self):
+    def test_members_online(self):
         response = self.client.get(self.url)
-        self.assertEqual(len(response.context["users_online"]), 0)
+        self.assertEqual(len(response.context["members_online"]), 0)
 
         self.client.force_login(self.user)
         response = self.client.get(self.url)
 
-        self.assertEqual(len(response.context["users_online"]), 1)
+        self.assertEqual(len(response.context["members_online"]), 1)
 
     def test_staff_online(self):
         response = self.client.get(self.url)
@@ -317,6 +317,17 @@ class IndexViewTestCase(TestCase):
 
         self.assertEqual(len(response.context["staff_online"]), 1)
 
+    def test_guests_online(self):
+        response = self.client.get(self.url)
+        self.assertEqual(response.context["guests_online"], 1)
+
+    def test_total_online(self):
+        response = self.client.get(self.url)
+        self.client.force_login(self.user)
+        response = self.client.get(self.url)
+
+        self.assertEqual(response.context["total_online"], 2)
+
     def test_newest_user(self):
         response = self.client.get(self.url)
         self.assertEqual(response.context["newest_user"], self.staff_user)
@@ -463,7 +474,7 @@ class ThreadCreateViewTestCase(TestCase):
         self.client.force_login(self.user)
         response = self.client.get(self.staff_only_url)
 
-        self.assertRedirects(response, self.staff_subcategory.get_absolute_url())
+        self.assertEqual(response.status_code, 403)
 
 
 class ThreadViewTestCase(TestCase):
@@ -511,7 +522,7 @@ class ThreadUpdateViewTestCase(TestCase):
     def test_is_author(self):
         self.client.force_login(self.other_user)
         response = self.client.get(self.url)
-        self.assertEqual(response.status_code, 404)
+        self.assertEqual(response.status_code, 403)
 
         self.client.force_login(self.user)
         response = self.client.get(self.url)
@@ -560,7 +571,7 @@ class ThreadDeleteViewTestCase(TestCase):
     def test_is_author(self):
         self.client.force_login(self.other_user)
         response = self.client.get(self.url)
-        self.assertEqual(response.status_code, 404)
+        self.assertEqual(response.status_code, 403)
 
         self.client.force_login(self.user)
         response = self.client.get(self.url)
@@ -642,7 +653,7 @@ class PostUpdateViewTestCase(TestCase):
     def test_is_author(self):
         self.client.force_login(self.other_user)
         response = self.client.get(self.url)
-        self.assertEqual(response.status_code, 404)
+        self.assertEqual(response.status_code, 403)
 
         self.client.force_login(self.user)
         response = self.client.get(self.url)
@@ -692,7 +703,7 @@ class PostDeleteViewTestCase(TestCase):
     def test_is_author(self):
         self.client.force_login(self.other_user)
         response = self.client.get(self.url)
-        self.assertEqual(response.status_code, 404)
+        self.assertEqual(response.status_code, 403)
 
         self.client.force_login(self.user)
         response = self.client.get(self.url)

punkweb_bb/urls.py

@@ -11,11 +11,37 @@ urlpatterns = [
     path("settings/", views.settings_view, name="settings"),
     path("members/", views.members_view, name="members"),
     path("members/<path:user_id>/", views.profile_view, name="profile"),
+    path("create-category/", views.category_create_view, name="category_create"),
+    path(
+        "category/<str:category_slug>/update/",
+        views.category_update_view,
+        name="category_update",
+    ),
+    path(
+        "category/<str:category_slug>/delete/",
+        views.category_delete_view,
+        name="category_delete",
+    ),
     path(
         "subcategory/<str:subcategory_slug>/",
         views.subcategory_view,
         name="subcategory",
     ),
+    path(
+        "category/<str:category_slug>/create-subcategory/",
+        views.subcategory_create_view,
+        name="subcategory_create",
+    ),
+    path(
+        "subcategory/<str:subcategory_slug>/update/",
+        views.subcategory_update_view,
+        name="subcategory_update",
+    ),
+    path(
+        "subcategory/<str:subcategory_slug>/delete/",
+        views.subcategory_delete_view,
+        name="subcategory_delete",
+    ),
     path(
         "subcategory/<str:subcategory_slug>/create-thread/",
         views.thread_create_view,
@@ -37,5 +63,6 @@ urlpatterns = [
     path("post/<str:post_id>/update/", views.post_update_view, name="post_update"),
     path("shout-list/", views.shout_list_view, name="shout_list"),
     path("shout-create/", views.shout_create_view, name="shout_create"),
+    path("shout/<str:shout_id>/delete/", views.shout_delete_view, name="shout_delete"),
     path("bbcode/", views.bbcode_view, name="bbcode"),
 ]

punkweb_bb/utils.py

@@ -0,0 +1,17 @@
+from django.utils.text import slugify
+
+
+def get_unique_slug(model, field):
+    base_slug = slugify(field)
+    slug = base_slug
+    unique_slug_exists = True
+
+    counter = 1
+    while unique_slug_exists:
+        if model.objects.filter(slug=slug).exists():
+            slug = f"{base_slug}-{counter}"
+            counter += 1
+        else:
+            unique_slug_exists = False
+
+    return slug