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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: punkweb_bb
-Version: 0.2.1
+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.1 → 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.1 → 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.1 → 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/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.1 → 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}")
@@ -205,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.1 → 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.1 → 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;

{punkweb_bb-0.2.1 → 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' %}" />
@@ -101,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>
@@ -125,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>
@@ -175,7 +175,7 @@
                 </time>
                 •
                 <a href="{% url 'punkweb_bb:profile' thread.user.id %}">
-                  {{thread.user.username}}
+                  {{thread.user|styled_username}}
                 </a>
               </div>
             </div>
@@ -206,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.1 → punkweb_bb-0.2.2}/punkweb_bb/templates/punkweb_bb/members.html

@@ -1,5 +1,5 @@
 {% extends "punkweb_bb/base.html" %}
-{% load static %}
+{% load static styled_username %}
 
 {% block title_prefix %}Members | {% endblock%}
 {% block og_title_prefix %}Members | {% endblock %}
@@ -33,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.1 → punkweb_bb-0.2.2}/punkweb_bb/templates/punkweb_bb/profile.html

@@ -1,5 +1,5 @@
 {% extends 'punkweb_bb/base.html' %}
-{% load static %}
+{% load static styled_username %}
 
 {% block title_prefix %}{{ user.username }} | {% endblock%}
 {% block og_title_prefix %}{{ user.username }} | {% endblock %}
@@ -35,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.1 → punkweb_bb-0.2.2}/punkweb_bb/templates/punkweb_bb/shoutbox/shout_list.html

@@ -1,10 +1,10 @@
-{% load shoutbox_bbcode can_delete %}
+{% load shoutbox_bbcode can_delete styled_username %}
 
 {% for shout in shouts %}
 <div class="shoutbox__shout">
   <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><a href="{% url 'punkweb_bb:profile' shout.user.id %}">{{shout.user|styled_username}}</a>: </span>
     <span>{{ shout.content | safe | shoutbox_bbcode }}</span>
   </div>
   {% if shout|can_delete:request.user %}

{punkweb_bb-0.2.1 → punkweb_bb-0.2.2}/punkweb_bb/templates/punkweb_bb/subcategory.html

@@ -1,5 +1,5 @@
 {% extends 'punkweb_bb/base.html' %}
-{% load static humanize_int can_post %}
+{% load static humanize_int can_post styled_username %}
 
 {% block title_prefix %}{{subcategory.name}} | {% endblock%}
 {% block og_title_prefix %}{{subcategory.name}} | {% endblock %}
@@ -70,10 +70,10 @@
   <div class="pw-table-container">
     <table class="pw-table">
       <colgroup>
-        <col span="1">
-        <col span="1" width="96px">
-        <col span="1" width="96px">
-        <col span="1" width="160px">
+        <col>
+        <col width="96px">
+        <col width="96px">
+        <col width="192px">
       </colgroup>
       <thead>
         <tr>
@@ -98,7 +98,7 @@
             </div>
             <div>
               <a href="{% url 'punkweb_bb:profile' thread.user.id %}">
-                {{thread.user.username}}
+                {{thread.user|styled_username}}
               </a>
               •
               {{thread.created_at|date:'M j, Y'}}</div>
@@ -117,7 +117,7 @@
                 </a>
                 <div>
                   <a href="{% url 'punkweb_bb:profile' thread.latest_post.user.id %}">
-                    {{thread.latest_post.user.username}}
+                    {{thread.latest_post.user|styled_username}}
                   </a>
                 </div>
               </div>

{punkweb_bb-0.2.1 → punkweb_bb-0.2.2}/punkweb_bb/templates/punkweb_bb/thread.html

@@ -1,5 +1,5 @@
 {% extends 'punkweb_bb/base.html' %}
-{% load static can_delete can_edit can_post %}
+{% load static can_delete can_edit can_post styled_username styled_group_name %}
 
 {% block title_prefix %}{{thread.title}} | {% endblock %}
 {% block og_title_prefix %}{{thread.title}} | {% endblock %}
@@ -55,7 +55,7 @@
         <div class="onlineIndicator"></div>
         {% endif %}
         <a href="{% url 'punkweb_bb:profile' thread.user.id %}">
-          {{thread.user.username}}
+          {{thread.user|styled_username}}
         </a>
       </div>
       <div class="thread__user__info">
@@ -73,7 +73,9 @@
       {% 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>
+        <div class="thread__user__group">
+          {{group|styled_group_name}}
+        </div>
         {% endfor %}
       </div>
       {% endif %}
@@ -165,7 +167,7 @@
         <div class="onlineIndicator"></div>
         {% endif %}
         <a href="{% url 'punkweb_bb:profile' post.user.id %}">
-          {{post.user.username}}
+          {{post.user|styled_username}}
         </a>
       </div>
       <div class="thread__user__info">
@@ -183,7 +185,9 @@
       {% 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>
+        <div class="thread__user__group">
+          {{group|styled_group_name}}
+        </div>
         {% endfor %}
       </div>
       {% endif %}

punkweb_bb-0.2.2/punkweb_bb/templatetags/styled_group_name.py

@@ -0,0 +1,11 @@
+from django import template
+from django.utils.safestring import mark_safe
+
+from punkweb_bb.utils import get_group_name_styled
+
+register = template.Library()
+
+
+@register.filter
+def styled_group_name(group):
+    return mark_safe(get_group_name_styled(group))

punkweb_bb-0.2.2/punkweb_bb/templatetags/styled_username.py

@@ -0,0 +1,9 @@
+from django import template
+from django.utils.safestring import mark_safe
+
+register = template.Library()
+
+
+@register.filter
+def styled_username(user):
+    return mark_safe(user.profile.styled_username)

punkweb_bb-0.2.2/punkweb_bb/utils.py

@@ -0,0 +1,47 @@
+from django.contrib.auth.models import Group
+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
+
+
+def get_user_highest_priority_group(user):
+    groups = Group.objects.filter(user=user, style__isnull=False)
+
+    if groups.exists():
+        return groups.order_by("-style__priority").first()
+
+    return None
+
+
+def get_styled_username(user):
+    group = get_user_highest_priority_group(user)
+
+    if group:
+        username_style = group.style.username_style
+        styled_username = username_style.rendered.replace("{USER}", user.username)
+        return styled_username
+    else:
+        return user.username
+
+
+def get_group_name_styled(group):
+    if group.style is None:
+        return group.name
+    else:
+        username_style = group.style.username_style
+        styled_group_name = username_style.rendered.replace("{USER}", group.name)
+        return styled_group_name

{punkweb_bb-0.2.1 → punkweb_bb-0.2.2}/punkweb_bb.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: punkweb-bb
-Version: 0.2.1
+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.1 → punkweb_bb-0.2.2}/punkweb_bb.egg-info/SOURCES.txt

@@ -53,10 +53,12 @@ punkweb_bb/__pycache__/widgets.cpython-311.pyc
 punkweb_bb/migrations/0001_initial.py
 punkweb_bb/migrations/0002_thread_view_count.py
 punkweb_bb/migrations/0003_alter_thread_options.py
+punkweb_bb/migrations/0004_groupstyle.py
 punkweb_bb/migrations/__init__.py
 punkweb_bb/migrations/__pycache__/0001_initial.cpython-311.pyc
 punkweb_bb/migrations/__pycache__/0002_thread_view_count.cpython-311.pyc
 punkweb_bb/migrations/__pycache__/0003_alter_thread_options.cpython-311.pyc
+punkweb_bb/migrations/__pycache__/0004_groupstyle.cpython-311.pyc
 punkweb_bb/migrations/__pycache__/__init__.cpython-311.pyc
 punkweb_bb/static/punkweb_bb/favicon.ico
 punkweb_bb/static/punkweb_bb/css/category-form.css
@@ -237,10 +239,15 @@ punkweb_bb/templatetags/can_edit.py
 punkweb_bb/templatetags/can_post.py
 punkweb_bb/templatetags/humanize_int.py
 punkweb_bb/templatetags/shoutbox_bbcode.py
+punkweb_bb/templatetags/styled_group_name.py
+punkweb_bb/templatetags/styled_username.py
 punkweb_bb/templatetags/__pycache__/__init__.cpython-311.pyc
 punkweb_bb/templatetags/__pycache__/can_delete.cpython-311.pyc
 punkweb_bb/templatetags/__pycache__/can_edit.cpython-311.pyc
 punkweb_bb/templatetags/__pycache__/can_post.cpython-311.pyc
 punkweb_bb/templatetags/__pycache__/humanize_count.cpython-311.pyc
 punkweb_bb/templatetags/__pycache__/humanize_int.cpython-311.pyc
-punkweb_bb/templatetags/__pycache__/shoutbox_bbcode.cpython-311.pyc
+punkweb_bb/templatetags/__pycache__/shoutbox_bbcode.cpython-311.pyc
+punkweb_bb/templatetags/__pycache__/styled_group_name.cpython-311.pyc
+punkweb_bb/templatetags/__pycache__/styled_username.cpython-311.pyc
+punkweb_bb/templatetags/__pycache__/username.cpython-311.pyc

{punkweb_bb-0.2.1 → punkweb_bb-0.2.2}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup
 
 setup(
     name="punkweb_bb",
-    version="0.2.1",
+    version="0.2.2",
     author="Punkweb",
     author_email="punkwebnet@gmail.com",
     packages=["punkweb_bb"],

punkweb_bb-0.2.1/punkweb_bb/utils.py

@@ -1,17 +0,0 @@
-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