Merge branch 'develop'

Author: pablodiegoss

.envs/.example

@@ -44,8 +44,7 @@ SMTP_USER=
 SMTP_PASSWORD=
 SMTP_SENDER_MAIL="jandig@memelab.com.br"
 
-# Recaptcha
-RECAPTCHA_ENABLED=False
-RECAPTCHA_PROJECT_ID=
-RECAPTCHA_GCLOUD_API_KEY=
-RECAPTCHA_SITE_KEY=
+# Turnstile
+TURNSTILE_ENABLED=False
+TURNSTILE_SITE_KEY=
+TURNSTILE_SECRET_KEY=

Makefile

@@ -1,5 +1,7 @@
 RUNNING_CONTAINER := $(shell docker compose ps --services --filter "status=running" | grep django )
 
+.PHONY: test test-ui test-all lint check migrations migrate collectstatic gen translate_es translate_pt
+
 test:
 	@if [ -n "${RUNNING_CONTAINER}" ]; then \
 		docker compose exec django pytest src/core src/users src/blog; \

docs/_static/logo.png

@@ -0,0 +1,22 @@
+{#
+    Override Alabaster's logo block so the sidebar logo points to the
+    main Jandig site instead of the docs index.
+#}
+{%- if theme_logo %}
+<p class="logo">
+  <a href="https://jandig.app">
+    <img class="logo" src="{{ pathto('_static/' ~ theme_logo, 1) }}" alt="Logo" />
+  </a>
+</p>
+{%- endif %}
+
+{%- if theme_description %}
+<p class="blurb">{{ theme_description }}</p>
+{%- endif %}
+
+{%- if theme_github_user and theme_github_repo %}
+{%- if theme_github_button|lower == 'true' %}
+<iframe src="https://ghbtns.com/github-btn.html?user={{ theme_github_user }}&repo={{ theme_github_repo }}&type={{ theme_github_type }}&count={{ theme_github_count }}&size=large&v=2"
+        allowtransparency="true" frameborder="0" scrolling="0" width="200px" height="35px"></iframe>
+{%- endif %}
+{%- endif %}

docs/_templates/about.html

@@ -18,7 +18,11 @@
 # -- Project information -----------------------------------------------------
 
 project = "Jandig ARte Help"
-copyright = "2019, pablodiegoss, rodrigocam, vjpixel, hvalois"
+copyright = (
+    "Conteúdo sob licenciamento "
+    '<a href="https://creativecommons.org/licenses/by-sa/4.0/">CC BY-SA 4.0</a>, '
+    "a não ser quando explicitado o contrário."
+)
 author = "pablodiegoss, rodrigocam, vjpixel, hvalois"
 
 
@@ -42,7 +46,10 @@
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
 # This pattern also affects html_static_path and html_extra_path.
-exclude_patterns = []
+# about.rst clashes with the Alabaster sidebar template `about.html`
+# (renaming it would also work; excluding keeps the file as a draft
+# document without breaking the build).
+exclude_patterns = ["about.rst"]
 
 
 # -- Options for HTML output -------------------------------------------------
@@ -61,12 +68,6 @@
     "logo": "logo.png",
     "github_user": "memeLab",
     "github_repo": "Jandig",
-    "html_sidebars": {
-        "**": [
-            "search.html",
-            "navigation.html",
-        ]
-    },
     "extra_nav_links": {
         "Official Site": "https://jandig.app",
         "Github": "https://github.com/memelab/Jandig",

docs/conf.py

@@ -1,6 +1,6 @@
 [project]
 name = "Jandig"
-version = "2.0.10"
+version = "2.0.11"
 description = "Add your description here"
 readme = "README.md"
 requires-python = ">=3.13"
@@ -22,7 +22,7 @@ dependencies = [
   "granian[reload]>=2.5.0",
   "jinja2~=3.1",
   "markupsafe~=3.0",
-  "pillow~=11.1",
+  "pillow~=12.2",
   "psycopg[binary,pool]>=3.2.9",
   "pymarker~=1.2",
   "sentry-sdk[django]~=2.20",
@@ -42,7 +42,7 @@ dev = [
   "pytest-django~=4.9",
   "pytest-playwright~=0.4",
   "pytest-xdist~=3.6",
-  "pytest~=8.3",
+  "pytest~=9.0",
   "ruff>=0.11.4",
 ]
 

pyproject.toml

@@ -89,6 +89,3 @@ class Post(TimeStampedModel):
 
     def __str__(self):
         return self.title
-
-    def get_absolute_url(self):
-        return f"/memories/{self.slug}/"

src/blog/models.py

@@ -1,5 +1,5 @@
 from django.core.paginator import Paginator
-from django.shortcuts import render
+from django.shortcuts import get_object_or_404, render
 
 from blog.models import Category, Clipping, Post, PostStatus
 
@@ -40,7 +40,10 @@ def blog_index(request):
 
 
 def post_detail(request, pk):
-    post = Post.objects.prefetch_related("images", "categories").get(pk=pk)
+    post = get_object_or_404(
+        Post.objects.prefetch_related("images", "categories"),
+        pk=pk,
+    )
 
     context = {"post": post, "images": post.images.all()}
 

src/blog/views.py

@@ -52,7 +52,7 @@
 SENTRY_TRACES_SAMPLE_RATE = env("SENTRY_TRACES_SAMPLE_RATE", default=0.1)
 SENTRY_PROFILES_SAMPLE_RATE = env("SENTRY_PROFILES_SAMPLE_RATE", default=0.1)
 SENTRY_ENVIRONMENT = env("SENTRY_ENVIRONMENT", default="")
-SENTRY_RELEASE = env("SENTRY_RELEASE", default="2.0.10")
+SENTRY_RELEASE = env("SENTRY_RELEASE", default="2.0.11")
 
 
 def traces_sampler(sampling_context):
@@ -271,11 +271,10 @@ def debug(_):
 EMAIL_HOST_PASSWORD = env("SMTP_PASSWORD", default="")
 EMAIL_USE_SSL = False
 
-# Recaptcha
-RECAPTCHA_ENABLED = env("RECAPTCHA_ENABLED", default=False)
-RECAPTCHA_SITE_KEY = env("RECAPTCHA_SITE_KEY", default="")
-RECAPTCHA_PROJECT_ID = env("RECAPTCHA_PROJECT_ID", default="")
-RECAPTCHA_GCLOUD_API_KEY = env("RECAPTCHA_GCLOUD_API_KEY", default="")
+# Turnstile
+TURNSTILE_ENABLED = env("TURNSTILE_ENABLED", default=False)
+TURNSTILE_SITE_KEY = env("TURNSTILE_SITE_KEY", default="")
+TURNSTILE_SECRET_KEY = env("TURNSTILE_SECRET_KEY", default="")
 
 ###########################
 #### Storage settings  ####

src/config/settings.py

@@ -184,7 +184,7 @@ class ArtworkForm(forms.ModelForm):
         widget=RangeInput(attrs={"class": "slider", "step": "0.1"}),
     )
     selected_sound = forms.ModelChoiceField(
-        queryset=Sound.objects.exclude(file_extension=ObjectExtensions.GLB),
+        queryset=Sound.objects.all(),
         required=False,
         widget=forms.Select(attrs={"class": "form-control"}),
     )
@@ -256,6 +256,20 @@ def __init__(self, *args, **kwargs):
         self.fields["slug"].widget.attrs["placeholder"] = _(
             "Complete with your Exhibit URL here"
         )
+        # On edit, pre-populate the hidden M2M inputs with the current
+        # selections so a user who only changes name/URL doesn't end
+        # up posting empty strings that clobber the data. The JS in
+        # exhibit_create_*.jinja2 still rewrites the input on click.
+        if self.instance.pk:
+            self.fields["artworks"].initial = ",".join(
+                str(a.id) for a in self.instance.artworks.all()
+            )
+            self.fields["augmenteds"].initial = ",".join(
+                str(o.id) for o in self.instance.augmenteds.all()
+            )
+            self.fields["sounds"].initial = ",".join(
+                str(s.id) for s in self.instance.sounds.all()
+            )
 
     class Meta:
         model = Exhibit
@@ -337,8 +351,8 @@ def clean_sounds(self):
 
     def clean(self):
         cleaned_data = super().clean()
-        artworks = cleaned_data.get("artworks", [])
-        augmenteds = cleaned_data.get("augmenteds", [])
+        artworks = cleaned_data.get("artworks") or []
+        augmenteds = cleaned_data.get("augmenteds") or []
 
         if not artworks and not augmenteds:
             raise forms.ValidationError(