request flow

froide/account/forms.py

@@ -12,14 +12,14 @@
 from django.http import HttpRequest
 from django.utils.functional import SimpleLazyObject
 from django.utils.html import format_html
-from django.utils.safestring import mark_safe
 from django.utils.translation import gettext_lazy as _
 
 from froide.helper.content_urls import get_content_url
 from froide.helper.form_utils import JSONMixin
 from froide.helper.spam import SpamProtectionMixin
 from froide.helper.widgets import (
     BootstrapCheckboxInput,
+    BootstrapRadioSelect,
     BootstrapSelect,
     ImageFileInput,
 )
@@ -32,6 +32,7 @@
 from .widgets import ConfirmationWidget, PinInputWidget
 
 USER_CAN_HIDE_WEB = settings.FROIDE_CONFIG.get("user_can_hide_web", True)
+USER_CAN_CLAIM_VIP = settings.FROIDE_CONFIG.get("user_can_claim_vip", False)
 ALLOW_PSEUDONYM = settings.FROIDE_CONFIG.get("allow_pseudonym", False)
 
 
@@ -92,6 +93,7 @@ def get_user(self):
 
     def clean_address(self) -> str:
         address = self.cleaned_data["address"]
+        # TODO validate like clientside? cf. addressRegex in user-address.vue
         if not address:
             return address
         if self.ALLOW_BLOCKED_ADDRESS:
@@ -134,18 +136,41 @@ class NewUserBaseForm(AddressBaseForm):
         ),
     )
 
+    if USER_CAN_CLAIM_VIP:
+        claims_vip = forms.TypedChoiceField(
+            required=False,
+            initial=False,
+            widget=BootstrapRadioSelect,
+            label=_("{site_name} for journalists").format(site_name=settings.SITE_NAME),
+            help_text=_(
+                _(
+                    "You work in journalism and would like to use {site_name} for your research? Shortly after your sign-up is completed, we will send you additional information about extra functionality for journalists."
+                ).format(site_name=settings.SITE_NAME)
+            ),
+            choices=[
+                (False, _("No, I am <strong>not a journalist</strong>")),
+                (True, _("Yes, I am <strong>a journalist</strong>")),
+            ],
+            coerce=lambda x: x != "False",
+        )
+
     ALLOW_BLOCKED_ADDRESS = True
 
     if USER_CAN_HIDE_WEB:
-        private = forms.BooleanField(
+        private = forms.TypedChoiceField(
             required=False,
-            widget=BootstrapCheckboxInput,
+            widget=BootstrapRadioSelect,
             label=_("Hide my name from public view"),
-            help_text=mark_safe(
-                _(
-                    "If you check this, your name will still appear in requests to public bodies, but we will do our best to not display it publicly. However, we cannot guarantee your anonymity"
-                )
-            ),
+            choices=[
+                (
+                    False,
+                    _(
+                        "My name may appear on the website in <strong>plain text</strong>"
+                    ),
+                ),
+                (True, _("My name must be <strong>redacted</strong>")),
+            ],
+            coerce=lambda x: x != "False",
         )
 
     field_order = ["first_name", "last_name", "user_email"]

froide/account/templates/account/new.html

@@ -1,6 +1,7 @@
 {% extends 'account/base.html' %}
 {% load i18n %}
 {% load static %}
+{% load frontendbuild %}
 {% block title %}
     {% trans "New account" %}
 {% endblock %}

froide/account/tests/test_account.py

@@ -127,6 +127,7 @@ def test_signup(world, client):
         "first_name": "Horst",
         "last_name": "Porst",
         "terms": "on",
+        "private": True,
         "user_email": "horst.porst",
         "time": (datetime.now(timezone.utc) - timedelta(seconds=30)).timestamp(),
     }
@@ -180,6 +181,7 @@ def test_overlong_name_signup(world, client):
         "first_name": "Horst" * 6 + "a",
         "last_name": "Porst" * 6,
         "terms": "on",
+        "private": True,
         "user_email": "horst.porst@example.com",
         "address": "MyOwnPrivateStree 5\n31415 Pi-Ville",
         "time": (datetime.now(timezone.utc) - timedelta(seconds=30)).timestamp(),
@@ -199,6 +201,7 @@ def test_signup_too_fast(world, client):
         "first_name": "Horst",
         "last_name": "Porst",
         "terms": "on",
+        "private": True,
         "user_email": "horst.porst@example.com",
         "address": "MyOwnPrivateStree 5\n31415 Pi-Ville",
         # Signup in less than 5 seconds
@@ -216,6 +219,7 @@ def test_signup_same_name(world, client):
         "first_name": "Horst",
         "last_name": "Porst",
         "terms": "on",
+        "private": True,
         "user_email": "horst.porst@example.com",
         "address": "MyOwnPrivateStree 5\n31415 Pi-Ville",
         "time": (datetime.now(timezone.utc) - timedelta(seconds=30)).timestamp(),
@@ -308,6 +312,7 @@ def test_next_link_signup(world, client):
         "first_name": "Horst",
         "last_name": "Porst",
         "terms": "on",
+        "private": True,
         "user_email": "horst.porst@example.com",
         "address": "MyOwnPrivateStree 5\n31415 Pi-Ville",
         "next": url,
@@ -439,7 +444,7 @@ def test_private_name(world, client):
     post = {
         "subject": "Request - Private name",
         "body": "This is a test body",
-        "public": "on",
+        "public": True,
         "publicbody": pb.pk,
         "law": pb.default_law.pk,
     }
@@ -787,6 +792,7 @@ def test_signup_blocklisted(world, client):
         "first_name": "Horst",
         "last_name": "Porst",
         "terms": "on",
+        "private": True,
         "user_email": "horst.porst@example.com",
         "time": (datetime.now(timezone.utc) - timedelta(seconds=30)).timestamp(),
     }

froide/account/views.py

@@ -290,7 +290,10 @@ def get_context_data(self, **kwargs):
 @require_POST
 def logout(request: HttpRequest) -> HttpResponseRedirect:
     auth.logout(request)
-    messages.add_message(request, messages.INFO, _("You have been logged out."))
+    # we use the extra_tags to communicate a logout to purgestorage.ts (via main.ts)
+    messages.add_message(
+        request, messages.INFO, _("You have been logged out."), "info alert-loggedout"
+    )
     return redirect("/")
 
 

froide/campaign/migrations/0008_campaign_logo_campaign_short_description.py

@@ -0,0 +1,29 @@
+# Generated by Django 5.2.6 on 2025-12-08 11:55
+
+import froide.helper.storage
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("campaign", "0007_campaign_report_url"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="campaign",
+            name="logo",
+            field=models.ImageField(
+                blank=True,
+                null=True,
+                storage=froide.helper.storage.HashedFilenameStorage(),
+                upload_to="campaign-logos",
+            ),
+        ),
+        migrations.AddField(
+            model_name="campaign",
+            name="short_description",
+            field=models.TextField(blank=True),
+        ),
+    ]

froide/campaign/models.py

@@ -6,6 +6,8 @@
 from django.template.loader import select_template
 from django.utils.translation import gettext_lazy as _
 
+from froide.helper.storage import HashedFilenameStorage
+
 
 class CampaignManager(models.Manager):
     def get_filter_list(self) -> QuerySet:
@@ -24,9 +26,16 @@ class Campaign(models.Model):
     url = models.URLField(blank=True)
     report_url = models.URLField(blank=True)
     description = models.TextField(blank=True)
+    short_description = models.TextField(blank=True)
     start_date = models.DateTimeField(null=True)
     public = models.BooleanField(default=False)
     active = models.BooleanField(default=False)
+    logo = models.ImageField(
+        null=True,
+        blank=True,
+        upload_to="campaign-logos",
+        storage=HashedFilenameStorage(),
+    )
 
     request_match = models.TextField(blank=True)
     request_hint = models.TextField(blank=True)

froide/foirequest/api_views/request.py

@@ -1,5 +1,6 @@
 from django.contrib.auth import get_user_model
 from django.db.models import Q
+from django.utils.translation import gettext_lazy as _
 
 from django_filters import rest_framework as filters
 from rest_framework import mixins, permissions, status, throttling, viewsets
@@ -80,7 +81,7 @@ class FoiRequestFilter(filters.FilterSet):
     campaign = filters.ModelChoiceFilter(
         queryset=Campaign.objects.filter(public=True),
         null_value="-",
-        null_label="No Campaign",
+        null_label=_("no campaign"),
         lookup_expr="isnull",
         method="campaign_filter",
     )

froide/foirequest/filters.py

@@ -1,4 +1,5 @@
 from collections import namedtuple
+from functools import cache
 
 from django import forms
 from django.utils import timezone
@@ -137,6 +138,16 @@ def get_status_filter_by_slug(slug):
             return status_filter
 
 
+# jurisdictions seldomly change, so it's okay to cache until app restart
+@cache
+def get_jurisdictions_by_rank(rank: int) -> list[int]:
+    return list(
+        Jurisdiction.objects.get_visible()
+        .filter(rank=rank)
+        .values_list("id", flat=True)
+    )
+
+
 class DropDownStatusFilterWidget(DropDownFilterWidget):
     def create_option(
         self, name, value, label, selected, index, subindex=None, attrs=None
@@ -177,6 +188,9 @@ class BaseFoiRequestFilterSet(BaseSearchFilterSet):
         widget=BootstrapSelect,
         method="filter_jurisdiction",
     )
+    jurisdiction_rank = django_filters.NumberFilter(
+        label=("jurisdiction rank"), method="filter_jurisdiction_rank"
+    )
     category = django_filters.ModelChoiceFilter(
         queryset=Category.objects.get_category_list(),
         to_field_name="slug",
@@ -234,6 +248,7 @@ class BaseFoiRequestFilterSet(BaseSearchFilterSet):
     last = django_filters.DateFromToRangeFilter(
         method="filter_last", widget=DateRangeWidget, label=_("last message")
     )
+
     sort = django_filters.ChoiceFilter(
         choices=[
             ("-last", _("last message (newest first)")),
@@ -253,6 +268,7 @@ class Meta:
             "q",
             "status",
             "jurisdiction",
+            "jurisdiction_rank",
             "campaign",
             "category",
             "classification",
@@ -274,6 +290,11 @@ def filter_status(self, qs, name, value):
     def filter_jurisdiction(self, qs, name, value):
         return self.apply_filter(qs, name, jurisdiction=value.id)
 
+    def filter_jurisdiction_rank(self, qs, name, value):
+        return self.apply_filter(
+            qs, name, jurisdiction=get_jurisdictions_by_rank(int(value))
+        )
+
     def filter_campaign(self, qs, name, value):
         if value == "-":
             return self.apply_filter(

froide/foirequest/forms/preferences.py

@@ -3,7 +3,7 @@
 from froide.account.preferences import PreferenceForm, registry
 
 
-class RequestPageTourForm(PreferenceForm):
+class BooleanPreferenceForm(PreferenceForm):
     value = forms.TypedChoiceField(
         widget=forms.HiddenInput,
         choices=(
@@ -15,13 +15,17 @@ class RequestPageTourForm(PreferenceForm):
 
 
 request_page_tour_pref = registry.register(
-    "foirequest_requestpage_tour", RequestPageTourForm
+    "foirequest_requestpage_tour", BooleanPreferenceForm
 )
 
 message_received_tour_pref = registry.register(
-    "foirequest_messagereceived_tour", RequestPageTourForm
+    "foirequest_messagereceived_tour", BooleanPreferenceForm
 )
 
 postal_reply_tour_pref = registry.register(
-    "foirequest_postalreply_tour", RequestPageTourForm
+    "foirequest_postalreply_tour", BooleanPreferenceForm
+)
+
+make_request_intro_skip_howto_pref = registry.register(
+    "foirequest_skiphowto_make", BooleanPreferenceForm
 )

froide/foirequest/forms/request.py

@@ -60,15 +60,28 @@ class RequestForm(JSONMixin, forms.Form):
         label=_("Don't wrap in template"),
         widget=forms.CheckboxInput(attrs={"tabindex": "-1"}),
     )
-    public = forms.BooleanField(
-        required=False,
-        initial=True,
+    public = forms.TypedChoiceField(
         label=_("This request is public."),
-        help_text=_(
-            "If you don't want your request to be public right now,"
-            " uncheck this. You can always decide to make it public later."
-        ),
+        initial=True,
+        required=False,
+        widget=BootstrapRadioSelect,
+        choices=[
+            (
+                True,
+                _(
+                    "I want the request to be immediately accessible to the <strong>public</strong> on this website. (Default)"
+                ),
+            ),
+            (
+                False,
+                _(
+                    "I want the request to remain <strong>not public</strong> for now, and publish it later."
+                ),
+            ),
+        ],
+        coerce=lambda x: x != "False",
     )
+
     reference = forms.CharField(widget=forms.HiddenInput, required=False)
     law_type = forms.CharField(widget=forms.HiddenInput, required=False)
     redirect_url = forms.CharField(widget=forms.HiddenInput, required=False)

froide/foirequest/models/request.py

@@ -553,11 +553,25 @@ def status_representation(self):
     def status_settable(self):
         return self.awaits_classification()
 
+    @property
+    def jurisdiction_name(self):
+        if self.jurisdiction:
+            return self.jurisdiction.name
+
     @property
     def project_number(self):
-        if self.project_order is not None:
+        if self.project_order:
             return self.project_order + 1
-        return None
+
+    @property
+    def project_site_url(self):
+        if self.project:
+            return self.project.get_absolute_domain_url()
+
+    @property
+    def project_request_count(self):
+        if self.project:
+            return self.project.request_count
 
     @property
     def has_fee(self):