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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: punkweb_bb
-Version: 0.2.2
+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

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

@@ -1,4 +1,3 @@
-import datetime
 import math
 import os
 
@@ -12,7 +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_styled_username
+from punkweb_bb.utils import get_highest_priority_group, get_styled_username
 
 User = get_user_model()
 
@@ -30,6 +29,10 @@ 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)
@@ -38,7 +41,7 @@ class BoardProfile(UUIDPrimaryKeyMixin, TimestampMixin):
     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

{punkweb_bb-0.2.2 → 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(--oc-gray-0);
-  border: 1px solid var(--border);
-  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.2 → punkweb_bb-0.2.3}/punkweb_bb/templates/punkweb_bb/members.html

@@ -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.2 → punkweb_bb-0.2.3}/punkweb_bb/templates/punkweb_bb/profile.html

@@ -39,11 +39,15 @@
         <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.2 → punkweb_bb-0.2.3}/punkweb_bb/templates/punkweb_bb/shoutbox/shout_list.html

@@ -3,7 +3,7 @@
 {% for shout in shouts %}
 <div class="shoutbox__shout">
   <div class="shoutbox__shout__content">
-    <span>{{shout.created_at|date:'g:i 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>

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

@@ -101,7 +101,7 @@
                 {{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>

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

@@ -1,5 +1,5 @@
 {% extends 'punkweb_bb/base.html' %}
-{% load static can_delete can_edit can_post styled_username styled_group_name %}
+{% load static can_delete can_edit can_post styled_username %}
 
 {% block title_prefix %}{{thread.title}} | {% endblock %}
 {% block og_title_prefix %}{{thread.title}} | {% endblock %}
@@ -41,44 +41,48 @@
 
 <div class="pw-card fluid margin">
   <div class="pw-card-header">
-    <div class="thread__date">{{thread.created_at|date:'M d, Y'}}</div>
+    <div class="thread__date">
+      <time datetime="{{thread.created_at|date:'c'}}">{{thread.created_at | date:'M d, Y'}}</time>
+    </div>
   </div>
   <div class="thread">
     <div class="thread__user">
-      {% if thread.user.profile.image %}
-      <img class="pw-avatar" src="{{thread.user.profile.image.url}}" alt="{{thread.user.username}}" />
-      {% else %}
-      <img class="pw-avatar" src="{% static 'punkweb_bb/img/default-profile-image.png' %}" alt="{{thread.user.username}}" />
-      {% endif %}
-      <div class="thread__user__usernameContainer">
-        {% if thread.user.profile.is_online %}
-        <div class="onlineIndicator"></div>
-        {% endif %}
-        <a href="{% url 'punkweb_bb:profile' thread.user.id %}">
-          {{thread.user|styled_username}}
-        </a>
-      </div>
       <div class="thread__user__info">
-        <div class="thread__user__info__row">
-          <div class="thread__user__info__label">Joined:</div>
-          <div class="thread__user__info__value">
-            {{thread.user.date_joined|date:"M d, Y"}}
-          </div>
+        <div class="thread__user__image">
+          {% if thread.user.profile.image %}
+          <img class="pw-avatar" src="{{thread.user.profile.image.url}}" alt="{{thread.user.username}}" />
+          {% else %}
+          <img class="pw-avatar" src="{% static 'punkweb_bb/img/default-profile-image.png' %}" alt="{{thread.user.username}}" />
+          {% endif %}
         </div>
-        <div class="thread__user__info__row">
-          <div class="thread__user__info__label">Posts:</div>
-          <div class="thread__user__info__value">{{thread.user.profile.post_count}}</div>
+        <div class="thread__user__username">
+          {% if thread.user.profile.is_online %}
+          <div class="onlineIndicator"></div>
+          {% endif %}
+          <a href="{% url 'punkweb_bb:profile' thread.user.id %}">
+            {{thread.user|styled_username}}
+          </a>
         </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|styled_group_name}}
+          {% if thread.user.profile.priority_group %}
+          {{thread.user.profile.priority_group.name}}
+          {% else %}
+          Member
+          {% endif %}
+        </div>
+      </div>
+      <div class="thread__user__details">
+        <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>
+          </div>
+        </div>
+        <div class="thread__user__details__row">
+          <div class="thread__user__details__label">Posts:</div>
+          <div class="thread__user__details__value">{{thread.user.profile.post_count}}</div>
         </div>
-        {% endfor %}
       </div>
-      {% endif %}
     </div>
     <div class="thread__main">
       <div class="thread__content">
@@ -148,49 +152,53 @@
 {% for post in posts %}
 <div id="post-{{post.id}}" class="pw-card fluid margin">
   <div class="pw-card-header thread__header">
-    <div class="thread__date">{{post.created_at|date:'M d, Y'}}</div>
+    <div class="thread__date">
+      <time datetime="{{post.created_at|date:'c'}}">{{post.created_at | date:'M d, Y'}}</time>
+    </div>
     <a class="thread__index" href="{{post.get_absolute_url}}">#{{post.index}}</a>
   </div>
   <div class="thread">
     <div class="thread__user">
-      {% if post.user.profile.image %}
-      <div class="thread__user__image">
-        <img class="pw-avatar" src="{{post.user.profile.image.url}}" alt="{{post.user.username}}" />
-      </div>
-      {% else %}
-      <div class="thread__user__image">
-        <img class="pw-avatar" src="{% static 'punkweb_bb/img/default-profile-image.png' %}" alt="{{post.user.username}}" />
-      </div>
-      {% endif %}
-      <div class="thread__user__usernameContainer">
-        {% if post.user.profile.is_online %}
-        <div class="onlineIndicator"></div>
-        {% endif %}
-        <a href="{% url 'punkweb_bb:profile' post.user.id %}">
-          {{post.user|styled_username}}
-        </a>
-      </div>
       <div class="thread__user__info">
-        <div class="thread__user__info__row">
-          <div class="thread__user__info__label">Joined:</div>
-          <div class="thread__user__info__value">
-            {{post.user.date_joined|date:"M d, Y"}}
+        <div class="thread__user__image">
+          {% if post.user.profile.image %}
+          <div class="thread__user__image">
+            <img class="pw-avatar" src="{{post.user.profile.image.url}}" alt="{{post.user.username}}" />
+          </div>
+          {% else %}
+          <div class="thread__user__image">
+            <img class="pw-avatar" src="{% static 'punkweb_bb/img/default-profile-image.png' %}" alt="{{post.user.username}}" />
           </div>
+          {% endif %}
         </div>
-        <div class="thread__user__info__row">
-          <div class="thread__user__info__label">Posts:</div>
-          <div class="thread__user__info__value">{{post.user.profile.post_count}}</div>
+        <div class="thread__user__username">
+          {% if post.user.profile.is_online %}
+          <div class="onlineIndicator"></div>
+          {% endif %}
+          <a href="{% url 'punkweb_bb:profile' post.user.id %}">
+            {{post.user|styled_username}}
+          </a>
         </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|styled_group_name}}
+          {% if post.user.profile.priority_group %}
+          {{post.user.profile.priority_group.name}}
+          {% else %}
+          Member
+          {% endif %}
+        </div>
+      </div>
+      <div class="thread__user__details">
+        <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>
+          </div>
+        </div>
+        <div class="thread__user__details__row">
+          <div class="thread__user__details__label">Posts:</div>
+          <div class="thread__user__details__value">{{post.user.profile.post_count}}</div>
         </div>
-        {% endfor %}
       </div>
-      {% endif %}
     </div>
     <div class="thread__main">
       <div class="thread__content">

{punkweb_bb-0.2.2 → punkweb_bb-0.2.3}/punkweb_bb/templatetags/styled_group_name.py

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

{punkweb_bb-0.2.2 → punkweb_bb-0.2.3}/punkweb_bb/utils.py

@@ -18,8 +18,8 @@ def get_unique_slug(model, field):
     return slug
 
 
-def get_user_highest_priority_group(user):
-    groups = Group.objects.filter(user=user, style__isnull=False)
+def get_highest_priority_group(user):
+    groups = user.groups.filter(style__isnull=False)
 
     if groups.exists():
         return groups.order_by("-style__priority").first()
@@ -28,7 +28,7 @@ def get_user_highest_priority_group(user):
 
 
 def get_styled_username(user):
-    group = get_user_highest_priority_group(user)
+    group = get_highest_priority_group(user)
 
     if group:
         username_style = group.style.username_style
@@ -38,7 +38,7 @@ def get_styled_username(user):
         return user.username
 
 
-def get_group_name_styled(group):
+def get_styled_group_name(group):
     if group.style is None:
         return group.name
     else:

{punkweb_bb-0.2.2 → punkweb_bb-0.2.3}/punkweb_bb/views.py

@@ -1,5 +1,3 @@
-import datetime
-
 from django.contrib.auth import authenticate, get_user_model, login, logout
 from django.contrib.auth.decorators import login_required
 from django.http import HttpResponseForbidden
@@ -498,7 +496,7 @@ def post_delete_view(request, post_id):
 
 def current_shouts():
     return Shout.objects.filter(
-        created_at__gt=timezone.now() - datetime.timedelta(hours=12)
+        created_at__gt=timezone.now() - timezone.timedelta(hours=12)
     ).order_by("created_at")
 
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: punkweb-bb
-Version: 0.2.2
+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

{punkweb_bb-0.2.2 → punkweb_bb-0.2.3}/punkweb_bb.egg-info/SOURCES.txt

@@ -45,6 +45,7 @@ punkweb_bb/__pycache__/parsers.cpython-311.pyc
 punkweb_bb/__pycache__/response.cpython-311.pyc
 punkweb_bb/__pycache__/settings.cpython-311.pyc
 punkweb_bb/__pycache__/signals.cpython-311.pyc
+punkweb_bb/__pycache__/sitemap.cpython-311.pyc
 punkweb_bb/__pycache__/tests.cpython-311.pyc
 punkweb_bb/__pycache__/urls.cpython-311.pyc
 punkweb_bb/__pycache__/utils.cpython-311.pyc

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

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