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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: punkweb_bb
-Version: 0.2.1
+Version: 0.2.3
 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.3}/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.3}/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.3}/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.3/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.3}/punkweb_bb/models.py

@@ -1,8 +1,8 @@
-import datetime
 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 +11,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_highest_priority_group, get_styled_username
 
 User = get_user_model()
 
@@ -28,11 +29,19 @@ class BoardProfile(UUIDPrimaryKeyMixin, TimestampMixin):
     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)
+
     @property
     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
@@ -205,3 +214,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.3}/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.3}/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(--primary-8);
-  border: 1px solid var(--primary-9);
-  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,6 +86,11 @@
   padding: 1rem;
 }
 
+.thread__signature {
+  border-top: 1px solid var(--border);
+  padding: 1rem;
+}
+
 .thread__reply__content {
   display: flex;
   flex-direction: column;

{punkweb_bb-0.2.1 → punkweb_bb-0.2.3}/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.3}/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:
@@ -41,7 +41,9 @@
           </div>
           <div class="members__user__stat">
             Date Joined:
-            <span class="members__user__stat__value">{{user.date_joined | date:'m/d/Y'}}</span>
+            <span class="members__user__stat__value">
+              <time datetime="{{user.date_joined|date:'c'}}">{{user.date_joined | date:'m/d/Y'}}</time>
+            </span>
           </div>
         </div>
       </div>

{punkweb_bb-0.2.1 → punkweb_bb-0.2.3}/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,15 +35,19 @@
         {% 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:
-            <span class="profile__info__stat__value">{{user.date_joined | date:'m/d/Y'}}</span>
+            <span class="profile__info__stat__value">
+              <time datetime="{{user.date_joined|date:'c'}}">{{user.date_joined | date:'m/d/Y'}}</time>
+            </span>
           </div>
           <div class="profile__info__stat">
             Last Login:
-            <span class="profile__info__stat__value">{{user.last_login | date:'m/d/Y'}}</span>
+            <span class="profile__info__stat__value">
+              <time datetime="{{user.last_login|date:'c'}}">{{user.last_login | date:'m/d/Y'}}</time>
+            </span>
           </div>
           <div class="profile__info__stat">
             Posts:

{punkweb_bb-0.2.1 → punkweb_bb-0.2.3}/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>
+    <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>
   </div>
   {% if shout|can_delete:request.user %}

{punkweb_bb-0.2.1 → punkweb_bb-0.2.3}/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,10 +98,10 @@
             </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>
+              <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>
@@ -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>