punkweb-bb 0.2.0__tar.gz → 0.2.2__tar.gz

{punkweb_bb-0.2.0 → punkweb_bb-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: punkweb_bb
-Version: 0.2.0
+Version: 0.2.2
 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
@@ -35,7 +35,7 @@ Check out [punkweb.net](https://punkweb.net/board/) for documentation, support a
 
 ## Requirements
 
-- Python 3.11+
+- Python 3.9+
 - Django 4.2+
 - django-precise-bbcode 1.2+
 - Pillow
@@ -111,6 +111,7 @@ PUNKWEB_BB = {
   "SITE_NAME": "PUNKWEB",
   "SITE_TITLE": "PunkwebBB",
   "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",

{punkweb_bb-0.2.0 → punkweb_bb-0.2.2}/README.md

@@ -17,7 +17,7 @@ Check out [punkweb.net](https://punkweb.net/board/) for documentation, support a
 
 ## Requirements
 
-- Python 3.11+
+- Python 3.9+
 - Django 4.2+
 - django-precise-bbcode 1.2+
 - Pillow
@@ -93,6 +93,7 @@ PUNKWEB_BB = {
   "SITE_NAME": "PUNKWEB",
   "SITE_TITLE": "PunkwebBB",
   "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",

{punkweb_bb-0.2.0 → punkweb_bb-0.2.2}/punkweb_bb/admin.py

@@ -4,11 +4,20 @@ from django.utils.safestring import mark_safe
 from punkweb_bb.admin_forms import (
     BoardProfileAdminModelForm,
     CategoryAdminModelForm,
+    GroupStyleAdminModelForm,
     PostAdminModelForm,
     SubcategoryAdminModelForm,
     ThreadAdminModelForm,
 )
-from punkweb_bb.models import BoardProfile, Category, Post, Shout, Subcategory, Thread
+from punkweb_bb.models import (
+    BoardProfile,
+    Category,
+    GroupStyle,
+    Post,
+    Shout,
+    Subcategory,
+    Thread,
+)
 
 
 @admin.register(BoardProfile)
@@ -114,3 +123,16 @@ class ShoutModelAdmin(admin.ModelAdmin):
         "user__email",
         "content",
     )
+
+
+@admin.register(GroupStyle)
+class GroupStyleModelAdmin(admin.ModelAdmin):
+    form = GroupStyleAdminModelForm
+    list_display = (
+        "group",
+        "priority",
+    )
+    search_fields = (
+        "group__name",
+        "username_style",
+    )

{punkweb_bb-0.2.0 → punkweb_bb-0.2.2}/punkweb_bb/admin_forms.py

@@ -1,6 +1,13 @@
 from django import forms
 
-from punkweb_bb.models import BoardProfile, Category, Post, Subcategory, Thread
+from punkweb_bb.models import (
+    BoardProfile,
+    Category,
+    GroupStyle,
+    Post,
+    Subcategory,
+    Thread,
+)
 from punkweb_bb.widgets import BBCodeEditorWidget
 
 
@@ -47,3 +54,12 @@ class PostAdminModelForm(forms.ModelForm):
         widgets = {
             "content": BBCodeEditorWidget(),
         }
+
+
+class GroupStyleAdminModelForm(forms.ModelForm):
+    class Meta:
+        model = GroupStyle
+        fields = "__all__"
+        widgets = {
+            "username_style": BBCodeEditorWidget(),
+        }

punkweb_bb-0.2.2/punkweb_bb/migrations/0003_alter_thread_options.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.2.11 on 2024-05-29 01:03
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("punkweb_bb", "0002_thread_view_count"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="thread",
+            options={
+                "ordering": ("subcategory", "-is_pinned", "-last_post_created_at"),
+                "permissions": (
+                    ("pin_thread", "Can pin thread"),
+                    ("close_thread", "Can close thread"),
+                ),
+            },
+        ),
+    ]

punkweb_bb-0.2.2/punkweb_bb/migrations/0004_groupstyle.py

@@ -0,0 +1,58 @@
+# Generated by Django 4.2.11 on 2024-05-29 19:48
+
+from django.db import migrations, models
+import django.db.models.deletion
+import precise_bbcode.fields
+import uuid
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("auth", "0012_alter_user_first_name_max_length"),
+        ("punkweb_bb", "0003_alter_thread_options"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="GroupStyle",
+            fields=[
+                (
+                    "id",
+                    models.UUIDField(
+                        default=uuid.uuid4,
+                        editable=False,
+                        primary_key=True,
+                        serialize=False,
+                    ),
+                ),
+                ("created_at", models.DateTimeField(auto_now_add=True)),
+                ("updated_at", models.DateTimeField(auto_now=True)),
+                (
+                    "priority",
+                    models.PositiveIntegerField(
+                        default=0, help_text="Highest priority is displayed"
+                    ),
+                ),
+                (
+                    "_username_style_rendered",
+                    models.TextField(blank=True, editable=False, null=True),
+                ),
+                (
+                    "username_style",
+                    precise_bbcode.fields.BBCodeTextField(no_rendered_field=True),
+                ),
+                (
+                    "group",
+                    models.OneToOneField(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="style",
+                        to="auth.group",
+                    ),
+                ),
+            ],
+            options={
+                "ordering": ("-priority",),
+            },
+        ),
+    ]

{punkweb_bb-0.2.0 → punkweb_bb-0.2.2}/punkweb_bb/models.py

@@ -3,6 +3,7 @@ import math
 import os
 
 from django.contrib.auth import get_user_model
+from django.contrib.auth.models import Group
 from django.core.cache import cache
 from django.db import models
 from django.forms import ValidationError
@@ -11,6 +12,7 @@ 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
 
 User = get_user_model()
 
@@ -28,6 +30,10 @@ class BoardProfile(UUIDPrimaryKeyMixin, TimestampMixin):
     class Meta:
         ordering = ("user__username",)
 
+    @property
+    def styled_username(self):
+        return get_styled_username(self.user)
+
     @property
     def is_online(self):
         last_seen = cache.get(f"profile_online_{self.id}")
@@ -119,6 +125,10 @@ class Thread(UUIDPrimaryKeyMixin, TimestampMixin):
             "-is_pinned",
             "-last_post_created_at",
         )
+        permissions = (
+            ("pin_thread", "Can pin thread"),
+            ("close_thread", "Can close thread"),
+        )
 
     def __str__(self):
         return f"{self.title}"
@@ -201,3 +211,18 @@ class Shout(UUIDPrimaryKeyMixin, TimestampMixin):
 
     def can_delete(self, user):
         return user == self.user or user.has_perm("punkweb_bb.delete_shout")
+
+
+class GroupStyle(UUIDPrimaryKeyMixin, TimestampMixin):
+    group = models.OneToOneField(Group, related_name="style", on_delete=models.CASCADE)
+    priority = models.PositiveIntegerField(
+        default=0,
+        help_text="Highest priority is displayed",
+    )
+    username_style = BBCodeTextField()
+
+    class Meta:
+        ordering = ("-priority",)
+
+    def __str__(self):
+        return f"{self.group} > {self.priority}"

{punkweb_bb-0.2.0 → punkweb_bb-0.2.2}/punkweb_bb/settings.py

@@ -5,6 +5,7 @@ PUNKWEB_BB = getattr(settings, "PUNKWEB_BB", {})
 SITE_NAME = PUNKWEB_BB.get("SITE_NAME", "PUNKWEB")
 SITE_TITLE = PUNKWEB_BB.get("SITE_TITLE", "PunkwebBB")
 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)
 DISCORD_WIDGET_ENABLED = PUNKWEB_BB.get("DISCORD_WIDGET_ENABLED", False)
 DISCORD_WIDGET_THEME = PUNKWEB_BB.get("DISCORD_WIDGET_THEME", "dark")

{punkweb_bb-0.2.0 → punkweb_bb-0.2.2}/punkweb_bb/static/punkweb_bb/css/index.css

@@ -7,10 +7,10 @@
   flex: 1;
 }
 
-.index__category__actions {
+.index__category__title {
   align-items: center;
   display: flex;
-  gap: 0.25rem;
+  gap: 0.5rem;
 }
 
 .index__sidebar {

{punkweb_bb-0.2.0 → punkweb_bb-0.2.2}/punkweb_bb/static/punkweb_bb/css/punkweb.css

@@ -390,12 +390,13 @@ blockquote cite {
 /** Icon Button **/
 
 .pw-icon-button {
+  align-items: center;
   border-radius: 0.25rem;
   cursor: pointer;
-  display: inline-block;
+  display: flex;
+  justify-content: center;
   font-weight: 500;
   transition: all 0.15s ease;
-  text-align: center;
 
   height: 2rem;
   line-height: 2rem;
@@ -463,7 +464,7 @@ blockquote cite {
   width: 3rem;
 }
 
-.pw-icon-button.sl .material-symbols-outlined {
+.pw-icon-button.xl .material-symbols-outlined {
   font-size: 1.5rem;
 }
 
@@ -492,6 +493,30 @@ blockquote cite {
   background-color: var(--oc-gray-1);
 }
 
+.pw-icon-button.default.primary {
+  color: var(--primary-9);
+}
+
+.pw-icon-button.default.primary:hover {
+  background-color: var(--primary-0);
+}
+
+.pw-icon-button.default.primary:active {
+  background-color: var(--primary-1);
+}
+
+.pw-icon-button.default.danger {
+  color: var(--oc-red-9);
+}
+
+.pw-icon-button.default.danger:hover {
+  background-color: var(--oc-red-0);
+}
+
+.pw-icon-button.default.danger:active {
+  background-color: var(--oc-red-1);
+}
+
 /* Outlined */
 
 .pw-icon-button.outlined {
@@ -507,7 +532,33 @@ blockquote cite {
   background-color: var(--oc-gray-1);
 }
 
-/* Outlined */
+.pw-icon-button.outlined.primary {
+  border-color: var(--primary-9);
+  color: var(--primary-9);
+}
+
+.pw-icon-button.outlined.primary:hover {
+  background-color: var(--primary-0);
+}
+
+.pw-icon-button.outlined.primary:active {
+  background-color: var(--primary-1);
+}
+
+.pw-icon-button.outlined.danger {
+  border-color: var(--oc-red-9);
+  color: var(--oc-red-9);
+}
+
+.pw-icon-button.outlined.danger:hover {
+  background-color: var(--oc-red-0);
+}
+
+.pw-icon-button.outlined.danger:active {
+  background-color: var(--oc-red-1);
+}
+
+/* Ghost */
 
 .pw-icon-button.ghost {
   border: 1px solid var(--oc-gray-9);
@@ -525,6 +576,38 @@ blockquote cite {
   color: white;
 }
 
+.pw-icon-button.ghost.primary {
+  border: 1px solid var(--primary-9);
+  color: var(--primary-9);
+}
+
+.pw-icon-button.ghost.primary:not(:disabled):hover {
+  background-color: var(--primary-9);
+  color: white;
+}
+
+.pw-icon-button.ghost.primary:not(:disabled):active {
+  background-color: var(--primary-9);
+  box-shadow: 0 0.125rem 0.25rem 0 rgba(0, 0, 0, 0.25);
+  color: white;
+}
+
+.pw-icon-button.ghost.danger {
+  border: 1px solid var(--oc-red-9);
+  color: var(--oc-red-9);
+}
+
+.pw-icon-button.ghost.danger:not(:disabled):hover {
+  background-color: var(--oc-red-9);
+  color: white;
+}
+
+.pw-icon-button.ghost.danger:not(:disabled):active {
+  background-color: var(--oc-red-9);
+  box-shadow: 0 0.125rem 0.25rem 0 rgba(0, 0, 0, 0.25);
+  color: white;
+}
+
 /* Raised */
 
 .pw-icon-button.raised {
@@ -533,6 +616,14 @@ blockquote cite {
   color: white;
 }
 
+.pw-icon-button.raised.primary {
+  background-color: var(--primary-9);
+}
+
+.pw-icon-button.raised.danger {
+  background-color: var(--oc-red-9);
+}
+
 .pw-icon-button.raised:not(:disabled):hover {
   box-shadow: 0 0.125rem 0.25rem 0 rgba(0, 0, 0, 0.25);
 }

{punkweb_bb-0.2.0 → punkweb_bb-0.2.2}/punkweb_bb/static/punkweb_bb/css/subcategory.css

@@ -30,6 +30,7 @@
 .thread__latestPost {
   align-items: center;
   display: flex;
+  justify-content: end;
   gap: 0.75rem;
 }
 

{punkweb_bb-0.2.0 → punkweb_bb-0.2.2}/punkweb_bb/static/punkweb_bb/css/thread.css

@@ -63,8 +63,8 @@
 }
 
 .thread__user__group {
-  background-color: var(--primary-8);
-  border: 1px solid var(--primary-9);
+  background-color: var(--oc-gray-0);
+  border: 1px solid var(--border);
   border-radius: 0.25rem;
   color: var(--text-on-primary);
   display: flex;
@@ -94,7 +94,7 @@
   align-items: center;
   display: flex;
   justify-content: flex-end;
-  gap: 1rem;
+  gap: 0.25rem;
   padding: 1rem;
 }
 

{punkweb_bb-0.2.0 → punkweb_bb-0.2.2}/punkweb_bb/static/punkweb_bb/editor/bbcode-editor.js

@@ -2,7 +2,7 @@ $(function () {
   $(document).ready(function () {
     $(".bbcode-editor").sceditor({
       emoticonsCompat: true,
-      emoticonsEnabled: true,
+      emoticonsEnabled: false,
       emoticonsRoot: "/media/precise_bbcode/smilies/",
       emoticons: {
         dropdown: {},

{punkweb_bb-0.2.0 → punkweb_bb-0.2.2}/punkweb_bb/templates/punkweb_bb/base.html

@@ -6,6 +6,12 @@
   <meta charset="UTF-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <title>{% block title_prefix %}{% endblock %}{{ punkweb_bb.settings.SITE_TITLE|default:"PunkwebBB" }}</title>
+  <meta property="og:title" content="{% block og_title_prefix %}{% endblock %}{{ punkweb_bb.settings.SITE_TITLE|default:"PunkwebBB" }}" />
+  <meta property="og:type" content="website" />
+  <meta property="og:url" content="{{ request.build_absolute_uri }}" />
+  {% if punkweb_bb.settings.OG_IMAGE %}
+  <meta property="og:image" content="{{ punkweb_bb.settings.OG_IMAGE }}" />
+  {% endif %}
   <link rel="icon" href="{% static punkweb_bb.settings.FAVICON %}" />
   <link rel="stylesheet" href="{% static 'punkweb_bb/vendor/open-color.css' %}" />
   <link rel="stylesheet" href="{% static 'punkweb_bb/vendor/prism.css' %}" />

{punkweb_bb-0.2.0 → punkweb_bb-0.2.2}/punkweb_bb/templates/punkweb_bb/index.html

@@ -1,6 +1,6 @@
 {% extends 'punkweb_bb/base.html' %}
 
-{% load static %}
+{% load static bbcode_tags styled_username %}
 
 {% block extra_head %}
 <link rel="stylesheet" href="{% static 'punkweb_bb/css/index.css' %}" />
@@ -31,36 +31,45 @@
             </colgroup>
             <thead>
               <tr>
-                <th><a href="{{category.get_absolute_url}}">{{category.name}}</a></th>
-                <th>Threads</th>
-                <th>Posts</th>
-                <th></th>
-              </tr>
-            </thead>
-            <tbody>
-              {% if perms.punkweb_bb.add_subcategory or perms.punkweb_bb.change_category or perms.punkweb_bb.delete_category %}
-              <tr>
-                <td colspan="4">
-                  <div class="index__category__actions">
+                <th>
+                  <div class="index__category__title">
+                    <a href="{{category.get_absolute_url}}">{{category.name}}</a>
                     {% if perms.punkweb_bb.add_subcategory %}
-                    <a class="pw-button ghost xs" href="{% url 'punkweb_bb:subcategory_create' category.slug %}">
-                      Create Subcategory
+                    <a
+                      class="pw-icon-button default rounded sm"
+                      href="{% url 'punkweb_bb:subcategory_create' category.slug %}"
+                      title="Create subcategory"
+                    >
+                      <span class="material-symbols-outlined">add</span>
                     </a>
                     {% endif %}
                     {% if perms.punkweb_bb.change_category %}
-                    <a class="pw-button ghost xs" href="{% url 'punkweb_bb:category_update' category.slug %}">
-                      Edit
+                    <a
+                      class="pw-icon-button default rounded sm"
+                      href="{% url 'punkweb_bb:category_update' category.slug %}"
+                      title="Edit category"
+                    >
+                      <span class="material-symbols-outlined">edit</span>
                     </a>
                     {% endif %}
                     {% if perms.punkweb_bb.delete_category %}
-                    <a class="pw-button ghost danger xs" hx-get="{% url 'punkweb_bb:category_delete' category.slug %}" hx-target="#modal-portal">
-                      Delete
+                    <a
+                      class="pw-icon-button default danger rounded sm"
+                      title="Delete category"
+                      hx-get="{% url 'punkweb_bb:category_delete' category.slug %}"
+                      hx-target="#modal-portal"
+                    >
+                    <span class="material-symbols-outlined">delete</span>
                     </a>
                     {% endif %}
                   </div>
-                </td>
+                </th>
+                <th>Threads</th>
+                <th>Posts</th>
+                <th></th>
               </tr>
-              {% endif %}
+            </thead>
+            <tbody>
               {% for subcategory in category.subcategories.all %}
               <tr>
                 <td>
@@ -92,7 +101,7 @@
                         </time>
                         •
                         <a href="{% url 'punkweb_bb:profile' subcategory.latest_thread.latest_post.user.id %}">
-                          {{subcategory.latest_thread.latest_post.user.username}}
+                          {{subcategory.latest_thread.latest_post.user|styled_username}}
                         </a>
                       </div>
                     </div>
@@ -116,7 +125,7 @@
                         </time>
                         •
                         <a href="{% url 'punkweb_bb:profile' subcategory.latest_thread.user.id %}">
-                          {{subcategory.latest_thread.user.username}}
+                          {{subcategory.latest_thread.user|styled_username}}
                         </a>
                       </div>
                     </div>
@@ -134,7 +143,13 @@
       </div>
       {% endfor %}
       {% if perms.punkweb_bb.add_category %}
-      <a class="pw-button ghost xs" href="{% url 'punkweb_bb:category_create' %}">Create Category</a>
+      <a
+        class="pw-icon-button raised primary rounded"
+        href="{% url 'punkweb_bb:category_create' %}"
+        title="Create category"
+      >
+        <span class="material-symbols-outlined">add</span>
+      </a>
       {% endif %}
     </div>
     <div class="index__sidebar">
@@ -160,7 +175,7 @@
                 </time>
                 •
                 <a href="{% url 'punkweb_bb:profile' thread.user.id %}">
-                  {{thread.user.username}}
+                  {{thread.user|styled_username}}
                 </a>
               </div>
             </div>
@@ -191,7 +206,7 @@
               <div class="index__statistics__label">Newest member:</div>
               <div class="index__statistics__value">
                 <a href="{% url 'punkweb_bb:profile' newest_user.id %}">
-                  {{newest_user.username}}
+                  {{newest_user|styled_username}}
                 </a>
               </div>
             </div>

{punkweb_bb-0.2.0 → punkweb_bb-0.2.2}/punkweb_bb/templates/punkweb_bb/login.html

@@ -2,6 +2,7 @@
 {% load static %}
 
 {% block title_prefix %}Login | {% endblock%}
+{% block og_title_prefix %}Login | {% endblock %}
 
 {% block extra_head %}
 <link rel="stylesheet" href="{% static 'punkweb_bb/css/login.css' %}" />

{punkweb_bb-0.2.0 → punkweb_bb-0.2.2}/punkweb_bb/templates/punkweb_bb/members.html

@@ -1,7 +1,8 @@
 {% extends "punkweb_bb/base.html" %}
-{% load static %}
+{% load static styled_username %}
 
 {% block title_prefix %}Members | {% endblock%}
+{% block og_title_prefix %}Members | {% endblock %}
 
 {% block extra_head %}
 <link rel="stylesheet" href="{% static 'punkweb_bb/css/members.css' %}" />
@@ -32,7 +33,7 @@
         {% endif %}
       </div>
       <div class="members__user__info">
-        <div class="members__user__username"><a href="{% url 'punkweb_bb:profile' user.id %}">{{ user.username }}</a></div>
+        <div class="members__user__username"><a href="{% url 'punkweb_bb:profile' user.id %}">{{ user|styled_username }}</a></div>
         <div class="members__user__stats">
           <div class="members__user__stat">
             Posts:

{punkweb_bb-0.2.0 → punkweb_bb-0.2.2}/punkweb_bb/templates/punkweb_bb/profile.html

@@ -1,7 +1,8 @@
 {% extends 'punkweb_bb/base.html' %}
-{% load static %}
+{% load static styled_username %}
 
 {% block title_prefix %}{{ user.username }} | {% endblock%}
+{% block og_title_prefix %}{{ user.username }} | {% endblock %}
 
 {% block extra_head %}
 <link rel="stylesheet" href="{% static 'punkweb_bb/css/profile.css' %}">
@@ -34,7 +35,7 @@
         {% endif %}
       </div>
       <div class="profile__info__details">
-        <div class="profile__info__username">{{user.username}}</div>
+        <div class="profile__info__username">{{user|styled_username}}</div>
         <div class="profile__info__stats">
           <div class="profile__info__stat">
             Date Joined:

{punkweb_bb-0.2.0 → punkweb_bb-0.2.2}/punkweb_bb/templates/punkweb_bb/settings.html

@@ -2,6 +2,7 @@
 {% load static %}
 
 {% block title_prefix %}Settings | {% endblock %}
+{% block og_title_prefix %}Settings | {% endblock %}
 
 {% block extra_head %}
 {{form.media.css}}