punkweb-bb 0.4.2__py3-none-any.whl → 0.5.0__py3-none-any.whl

punkweb_bb/bbcode.py

@@ -56,8 +56,8 @@ def add_url_tag(parser):
 def add_quote_tag(parser):
     def _render_quote(name, value, options, parent, context):
         if "quote" in options:
-            return f'<blockquote><cite>{options["quote"]} said: </cite>{value}</blockquote>'
-        return f"<blockquote>{value}</blockquote>"
+            return f'<blockquote class="pw-blockquote"><cite>{options["quote"]} said: </cite>{value}</blockquote>'
+        return f'<blockquote class="pw-blockquote">{value}</blockquote>'
 
     parser.add_formatter(
         "quote", _render_quote, strip=True, swallow_trailing_newline=True
@@ -114,7 +114,8 @@ def add_spoiler_tag(parser):
     def _render_spoiler(name, value, options, parent, context):
         if "spoiler" in options:
             summary = options["spoiler"]
-            return f"<details><summary>{summary}</summary>{value}</details>"
+            return f'<details class="pw-details"><summary>{summary}</summary>{value}</details>'
+        return f'<details class="pw-details"><summary>Click to reveal</summary>{value}</details>'
 
     parser.add_formatter(
         "spoiler", _render_spoiler, strip=True, swallow_trailing_newline=True

punkweb_bb/decorators.py

@@ -0,0 +1,17 @@
+from functools import wraps
+
+from django.core.exceptions import PermissionDenied
+from django.shortcuts import redirect
+
+
+def redirect_if_authenticated(redirect_url="punkweb_bb:index"):
+    def decorator(view_func):
+        @wraps(view_func)
+        def _wrapper_view(request, *args, **kwargs):
+            if request.user.is_authenticated:
+                return redirect(redirect_url)
+            return view_func(request, *args, **kwargs)
+
+        return _wrapper_view
+
+    return decorator

punkweb_bb/forms.py

@@ -6,10 +6,7 @@ from punkweb_bb.utils import get_editor_widget
 
 
 class LoginForm(AuthenticationForm):
-    """
-    Override the default AuthenticationForm to add CSS classes to the
-    username and password fields.
-    """
+    template_name = "punkweb_bb/forms/stacked_form.html"
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -21,6 +18,8 @@ class LoginForm(AuthenticationForm):
 
 
 class SignUpForm(UserCreationForm):
+    template_name = "punkweb_bb/forms/stacked_form.html"
+
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
@@ -31,19 +30,45 @@ class SignUpForm(UserCreationForm):
         self.fields["password2"].widget.attrs.update({"class": "pw-input fluid"})
 
 
+class FilterUsersForm(forms.Form):
+    template_name = "punkweb_bb/forms/inline_form.html"
+
+    search = forms.CharField(
+        required=False,
+        widget=forms.TextInput(attrs={"class": "pw-input", "placeholder": "Search"}),
+    )
+    sort_by = forms.ChoiceField(
+        required=False,
+        choices=(
+            ("", "-----------"),
+            ("username", "Username (A-Z)"),
+            ("-username", "Username (Z-A)"),
+            ("date_joined", "Date Joined (Oldest)"),
+            ("-date_joined", "Date Joined (Newest)"),
+        ),
+        widget=forms.Select(attrs={"class": "pw-input"}),
+    )
+
+
 class BoardProfileModelForm(forms.ModelForm):
+    template_name = "punkweb_bb/forms/stacked_form.html"
+
     class Meta:
         model = BoardProfile
         fields = (
             "image",
+            "bio",
             "signature",
         )
         widgets = {
+            "bio": get_editor_widget(),
             "signature": get_editor_widget(),
         }
 
 
 class CategoryModelForm(forms.ModelForm):
+    template_name = "punkweb_bb/forms/stacked_form.html"
+
     class Meta:
         model = Category
         fields = (
@@ -59,6 +84,8 @@ class CategoryModelForm(forms.ModelForm):
 
 
 class PostModelForm(forms.ModelForm):
+    template_name = "punkweb_bb/forms/stacked_form.html"
+
     class Meta:
         model = Post
         fields = ("content",)
@@ -77,24 +104,30 @@ class ShoutModelForm(forms.ModelForm):
 
 
 class SubcategoryModelForm(forms.ModelForm):
+    template_name = "punkweb_bb/forms/stacked_form.html"
+
     class Meta:
         model = Subcategory
         fields = (
+            "category",
             "name",
             "description",
             "order",
             "staff_post_only",
         )
         widgets = {
-            "name": forms.TextInput(attrs={"autofocus": True, "class": "pw-input"}),
-            "description": get_editor_widget(),
-            "order": forms.TextInput(
-                attrs={"class": "pw-input", "min": "0", "type": "number"}
+            "name": forms.TextInput(
+                attrs={"autofocus": True, "class": "pw-input fluid"}
             ),
+            "category": forms.Select(attrs={"class": "pw-input fluid"}),
+            "description": get_editor_widget(),
+            "order": forms.NumberInput(attrs={"class": "pw-input", "min": "0"}),
         }
 
 
 class ThreadModelForm(forms.ModelForm):
+    template_name = "punkweb_bb/forms/stacked_form.html"
+
     class Meta:
         model = Thread
         fields = (
@@ -102,14 +135,18 @@ class ThreadModelForm(forms.ModelForm):
             "content",
         )
         widgets = {
-            "title": forms.TextInput(attrs={"autofocus": True, "class": "pw-input"}),
+            "title": forms.TextInput(
+                attrs={"autofocus": True, "class": "pw-input fluid"}
+            ),
             "content": get_editor_widget(),
         }
 
 
 class ThreadMoveForm(forms.Form):
+    template_name = "punkweb_bb/forms/stacked_form.html"
+
     subcategory = forms.ModelChoiceField(
         queryset=Subcategory.objects.all(),
         empty_label="Select a subcategory",
-        widget=forms.Select(attrs={"class": "pw-input"}),
+        widget=forms.Select(attrs={"class": "pw-input fluid"}),
     )

punkweb_bb/middleware.py

@@ -1,4 +1,6 @@
 from django.core.cache import cache
+from django.core.exceptions import ValidationError
+from django.core.validators import validate_ipv46_address
 from django.utils import timezone
 
 from punkweb_bb.guests import guest_list
@@ -14,7 +16,7 @@ class ProfileOnlineCacheMiddleware:
                 f"profile_online_{request.user.profile.id}", timezone.now(), 60 * 5
             )
         else:
-            ip = request.META.get("REMOTE_ADDR")
+            ip = self.get_client_ip(request)
             guest_list.add(ip)
 
         guest_list.clear_expired()
@@ -22,3 +24,26 @@ class ProfileOnlineCacheMiddleware:
         response = self.get_response(request)
 
         return response
+
+    def get_client_ip(self, request):
+        headers = (
+            "HTTP_X_FORWARDED_FOR",
+            "HTTP_X_REAL_IP",
+            "HTTP_CLIENT_IP",
+            "HTTP_X_CLIENT_IP",
+            "HTTP_X_CLUSTER_CLIENT_IP",
+            "HTTP_FORWARDED_FOR",
+            "HTTP_FORWARDED",
+            "REMOTE_ADDR",
+        )
+
+        for header in headers:
+            if request.META.get(header, None):
+                ip = request.META[header].split(",")[0].strip()
+                try:
+                    validate_ipv46_address(ip)
+                    return ip
+                except ValidationError:
+                    pass
+
+        return ""

punkweb_bb/migrations/0001_initial.py

@@ -3,7 +3,6 @@
 from django.conf import settings
 from django.db import migrations, models
 import django.db.models.deletion
-import precise_bbcode.fields
 import punkweb_bb.models
 import uuid
 
@@ -57,15 +56,9 @@ class Migration(migrations.Migration):
                 ("updated_at", models.DateTimeField(auto_now=True)),
                 ("name", models.CharField(max_length=255)),
                 ("slug", models.SlugField(max_length=1024, unique=True)),
-                (
-                    "_description_rendered",
-                    models.TextField(blank=True, editable=False, null=True),
-                ),
                 (
                     "description",
-                    precise_bbcode.fields.BBCodeTextField(
-                        blank=True, no_rendered_field=True, null=True
-                    ),
+                    models.TextField(blank=True, null=True),
                 ),
                 ("order", models.PositiveIntegerField(default=0)),
                 ("staff_post_only", models.BooleanField(default=False)),
@@ -99,13 +92,9 @@ class Migration(migrations.Migration):
                 ("created_at", models.DateTimeField(auto_now_add=True)),
                 ("updated_at", models.DateTimeField(auto_now=True)),
                 ("title", models.CharField(max_length=255)),
-                (
-                    "_content_rendered",
-                    models.TextField(blank=True, editable=False, null=True),
-                ),
                 (
                     "content",
-                    precise_bbcode.fields.BBCodeTextField(no_rendered_field=True),
+                    models.TextField(),
                 ),
                 ("is_pinned", models.BooleanField(default=False)),
                 ("is_closed", models.BooleanField(default=False)),
@@ -173,13 +162,9 @@ class Migration(migrations.Migration):
                 ),
                 ("created_at", models.DateTimeField(auto_now_add=True)),
                 ("updated_at", models.DateTimeField(auto_now=True)),
-                (
-                    "_content_rendered",
-                    models.TextField(blank=True, editable=False, null=True),
-                ),
                 (
                     "content",
-                    precise_bbcode.fields.BBCodeTextField(no_rendered_field=True),
+                    models.TextField(),
                 ),
                 (
                     "thread",
@@ -224,15 +209,9 @@ class Migration(migrations.Migration):
                         upload_to=punkweb_bb.models.profile_image_upload_to,
                     ),
                 ),
-                (
-                    "_signature_rendered",
-                    models.TextField(blank=True, editable=False, null=True),
-                ),
                 (
                     "signature",
-                    precise_bbcode.fields.BBCodeTextField(
-                        blank=True, max_length=1024, no_rendered_field=True, null=True
-                    ),
+                    models.TextField(blank=True, max_length=1024, null=True),
                 ),
                 (
                     "user",

punkweb_bb/migrations/0004_groupstyle.py

@@ -2,7 +2,6 @@
 
 from django.db import migrations, models
 import django.db.models.deletion
-import precise_bbcode.fields
 import uuid
 
 
@@ -34,13 +33,9 @@ class Migration(migrations.Migration):
                         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),
+                    models.TextField(),
                 ),
                 (
                     "group",

punkweb_bb/migrations/0006_remove_boardprofile__signature_rendered_and_more.py

@@ -10,26 +10,6 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.RemoveField(
-            model_name="boardprofile",
-            name="_signature_rendered",
-        ),
-        migrations.RemoveField(
-            model_name="groupstyle",
-            name="_username_style_rendered",
-        ),
-        migrations.RemoveField(
-            model_name="post",
-            name="_content_rendered",
-        ),
-        migrations.RemoveField(
-            model_name="subcategory",
-            name="_description_rendered",
-        ),
-        migrations.RemoveField(
-            model_name="thread",
-            name="_content_rendered",
-        ),
         migrations.AlterField(
             model_name="boardprofile",
             name="signature",

punkweb_bb/migrations/0007_boardprofile_bio.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.11 on 2024-06-06 02:56
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("punkweb_bb", "0006_remove_boardprofile__signature_rendered_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="boardprofile",
+            name="bio",
+            field=models.TextField(blank=True, max_length=1024),
+        ),
+    ]

punkweb_bb/models.py

@@ -23,6 +23,7 @@ def profile_image_upload_to(instance, filename):
 class BoardProfile(UUIDPrimaryKeyMixin, TimestampMixin):
     user = models.OneToOneField(User, related_name="profile", on_delete=models.CASCADE)
     image = models.ImageField(upload_to=profile_image_upload_to, blank=True, null=True)
+    bio = models.TextField(max_length=1024, blank=True)
     signature = models.TextField(max_length=1024, blank=True)
 
     class Meta:

punkweb_bb/pagination.py

@@ -1,7 +1,7 @@
 from django.core.paginator import EmptyPage, PageNotAnInteger, Paginator
 
 
-def paginate_qs(request, qs, page_size=10):
+def paginate(request, qs, page_size=10):
     paginator = Paginator(qs, page_size)
 
     page = request.GET.get("page", 1)

punkweb_bb/searching.py

@@ -0,0 +1,10 @@
+from django.db.models import Q
+from punkweb_bb.models import Thread
+
+
+def search_threads(query):
+    query_parts = query.split()
+    q_objects = Q()
+    for part in query_parts:
+        q_objects |= Q(title__icontains=part) | Q(content__icontains=part)
+    return Thread.objects.filter(q_objects)

punkweb_bb/settings.py

@@ -8,6 +8,8 @@ PARSER = PUNKWEB_BB.get("PARSER", "bbcode")
 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)
+SHOUTBOX_POLLING_ENABLED = PUNKWEB_BB.get("SHOUTBOX_POLLING_ENABLED", True)
+SHOUTBOX_POLLING_INTERVAL = PUNKWEB_BB.get("SHOUTBOX_POLLING_INTERVAL", 30)
 DISCORD_WIDGET_ENABLED = PUNKWEB_BB.get("DISCORD_WIDGET_ENABLED", False)
 DISCORD_WIDGET_THEME = PUNKWEB_BB.get("DISCORD_WIDGET_THEME", "dark")
 DISCORD_SERVER_ID = PUNKWEB_BB.get("DISCORD_SERVER_ID", None)

punkweb_bb/static/punkweb_bb/css/bbcode-editor-content.css

@@ -0,0 +1,108 @@
+/*! SCEditor | (C) 2011-2013, Sam Clarke | sceditor.com/license */
+html,
+body,
+p,
+code:before,
+table {
+  color: #212529;
+  font-family: Arial, Helvetica sans-serif;
+  font-size: 16px;
+  font-weight: 400;
+  line-height: 1.5;
+  margin: 0;
+  overflow: visible;
+  padding: 0;
+}
+
+*,
+*:before,
+*:after {
+  box-sizing: border-box;
+}
+
+html {
+  height: 100%;
+}
+
+.ios {
+  /* Needed for iOS scrolling bug fix */
+  overflow: auto;
+  -webkit-overflow-scrolling: touch;
+}
+.ios body {
+  /* Needed for iOS scrolling bug fix */
+  position: relative;
+  overflow: auto;
+}
+body {
+  /* Needed to make sure body covers the whole editor and that
+		long lines don't cause horizontal scrolling */
+  min-height: 100%;
+  word-wrap: break-word;
+}
+
+body.placeholder::before {
+  content: attr(placeholder);
+  color: #555;
+  font-style: italic;
+}
+
+table,
+td {
+  border: 1px dotted #000;
+  empty-cells: show;
+}
+
+table td {
+  min-width: 5px;
+}
+
+a {
+  text-decoration: none;
+}
+
+code {
+  display: block;
+  background: #f5f2f0;
+  font-family: Consolas, Monaco, "Andale Mono", "Ubuntu Mono", monospace;
+  white-space: pre;
+  padding: 1em;
+  text-align: left;
+  margin: 0.5em 0;
+  direction: ltr;
+}
+
+blockquote {
+  background: #f1f3f5;
+  margin: 0.25rem 0;
+  border-left: 2px solid #ced4da;
+  padding: 0.5rem 1rem;
+}
+
+blockquote cite {
+  font-weight: 700;
+  display: block;
+  font-size: 1rem;
+}
+
+hr {
+  border: none;
+  border-top: 1px solid #ced4da;
+  margin: 1rem 0;
+}
+
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+  padding: 0;
+  margin: 0;
+}
+
+/* Prevent empty paragraphs from collapsing */
+div,
+p {
+  min-height: 1.25em;
+}

punkweb_bb/static/punkweb_bb/css/index.css

@@ -17,11 +17,10 @@
   flex: 0 0 20rem;
 }
 
-.index__recentThreads__content {
+.index__recentThreads {
   display: flex;
   flex-direction: column;
   gap: 1rem;
-  padding: 1rem;
 }
 
 .index__recentThreads__thread {
@@ -35,18 +34,18 @@
   font-size: 0.75rem;
 }
 
-.index__recentThreads__thread__info__title {
+.index__recentThreads__thread__title {
   display: block;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
+  max-width: 15rem;
 }
 
-.index__statistics__content {
+.index__statistics {
   display: flex;
   flex-direction: column;
   gap: 1rem;
-  padding: 1rem;
 }
 
 .index__statistics__list {
@@ -80,6 +79,7 @@
 
 .subcategory__latestThread__info__title {
   display: block;
+  max-width: 15rem;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
@@ -88,6 +88,5 @@
 @media screen and (max-width: 1024px) {
   .index__main {
     flex-direction: column;
-    gap: 0;
   }
 }

punkweb_bb/static/punkweb_bb/css/members.css

@@ -1,6 +1,19 @@
+.members__header {
+  align-items: center;
+  display: flex;
+  justify-content: space-between;
+  gap: 1rem;
+  margin-bottom: 1rem;
+}
+
+.members__header h1 {
+  margin: 0;
+}
+
 .members__list {
   list-style: none;
-  padding: 0.5rem;
+  padding: 0;
+  margin: 0;
 }
 
 .members__user {
@@ -10,11 +23,15 @@
 }
 
 .members__user:not(:last-of-type) {
-  border-bottom: 1px solid var(--border);
+  border-bottom: 1px solid var(--oc-gray-4);
 }
 
 .members__user__username {
+  align-items: center;
+  display: flex;
   font-size: 1.25rem;
+  gap: 0.25rem;
+  position: relative;
 }
 
 .members__user__stat {
@@ -23,5 +40,5 @@
 }
 
 .members__user__stat__value {
-  color: var(--text-dark);
+  color: var(--oc-gray-9);
 }

punkweb_bb/static/punkweb_bb/css/profile.css

@@ -12,7 +12,10 @@
 }
 
 .profile__info__username {
+  align-items: center;
+  display: flex;
   font-size: 1.5rem;
+  gap: 0.5rem;
 }
 
 .profile__info__stat {
@@ -20,12 +23,13 @@
 }
 
 .profile__info__stat__value {
-  color: var(--text-dark);
+  color: var(--oc-gray-9);
 }
 
 .profile__thread__list {
   list-style: none;
   padding: 0;
+  margin: 0;
 }
 
 .profile__thread {
@@ -51,7 +55,7 @@
 }
 
 .profile__thread:not(:last-of-type) {
-  border-bottom: 1px solid var(--border);
+  border-bottom: 1px solid var(--oc-gray-4);
 }
 
 @media screen and (max-width: 768px) {