move form test into a class TestElectionForm

* Add an error message when looking at a public election without being logged in
* Add correct value for blank vote on single vote field
* Redirect to view with an error message if an invalid form has been submitted

.pre-commit-config.yaml

@@ -1,7 +1,7 @@
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.15.0
+    rev: v0.14.4
     hooks:
       - id: ruff-check  # just check the code, and print the errors
       - id: ruff-check  # actually fix the fixable errors, but print nothing
@@ -12,7 +12,7 @@ repos:
     rev: v0.6.1
     hooks:
       - id: biome-check
-        additional_dependencies: ["@biomejs/biome@2.3.14"]
+        additional_dependencies: ["@biomejs/biome@1.9.4"]
   - repo: https://github.com/rtts/djhtml
     rev: 3.0.10
     hooks:

biome.json

@@ -7,34 +7,20 @@
   },
   "files": {
     "ignoreUnknown": false,
-    "includes": ["**/static/**"]
+    "ignore": ["*.min.*", "staticfiles/generated"]
   },
   "formatter": {
     "enabled": true,
     "indentStyle": "space",
     "lineWidth": 88
   },
+  "organizeImports": {
+    "enabled": true
+  },
   "linter": {
     "enabled": true,
     "rules": {
-      "recommended": true,
-      "style": {
-        "useNamingConvention": "error"
-      },
-      "performance": {
-        "noNamespaceImport": "error"
-      },
-      "suspicious": {
-        "noConsole": {
-          "level": "error",
-          "options": { "allow": ["error", "warn"] }
-        }
-      },
-      "correctness": {
-        "noUnusedVariables": "error",
-        "noUndeclaredVariables": "error",
-        "noUndeclaredDependencies": "error"
-      }
+      "all": true
     }
   },
   "javascript": {

club/models.py

@@ -26,6 +26,7 @@ from __future__ import annotations
 from typing import Iterable, Self
 
 from django.conf import settings
+from django.core.cache import cache
 from django.core.exceptions import ObjectDoesNotExist, ValidationError
 from django.core.validators import RegexValidator, validate_email
 from django.db import models, transaction
@@ -186,6 +187,9 @@ class Club(models.Model):
         self.page.save(force_lock=True)
 
     def delete(self, *args, **kwargs) -> tuple[int, dict[str, int]]:
+        # Invalidate the cache of this club and of its memberships
+        for membership in self.members.ongoing().select_related("user"):
+            cache.delete(f"membership_{self.id}_{membership.user.id}")
         self.board_group.delete()
         self.members_group.delete()
         return super().delete(*args, **kwargs)
@@ -206,15 +210,24 @@ class Club(models.Model):
         """Method to see if that object can be edited by the given user."""
         return self.has_rights_in_club(user)
 
-    @cached_property
-    def current_members(self) -> list[Membership]:
-        return list(self.members.ongoing().select_related("user").order_by("-role"))
-
     def get_membership_for(self, user: User) -> Membership | None:
-        """Return the current membership of the given user."""
+        """Return the current membership the given user.
+
+        Note:
+            The result is cached.
+        """
         if user.is_anonymous:
             return None
-        return next((m for m in self.current_members if m.user_id == user.id), None)
+        membership = cache.get(f"membership_{self.id}_{user.id}")
+        if membership == "not_member":
+            return None
+        if membership is None:
+            membership = self.members.filter(user=user, end_date=None).first()
+            if membership is None:
+                cache.set(f"membership_{self.id}_{user.id}", "not_member")
+            else:
+                cache.set(f"membership_{self.id}_{user.id}", membership)
+        return membership
 
     def has_rights_in_club(self, user: User) -> bool:
         return user.is_in_group(pk=self.board_group_id)
@@ -232,7 +245,7 @@ class MembershipQuerySet(models.QuerySet):
         are included, even if there are no more members.
 
         If you want to get the users who are currently in the board,
-        mind combining this with the `ongoing` queryset method
+        mind combining this with the :meth:`ongoing` queryset method
         """
         return self.filter(role__gt=settings.SITH_MAXIMUM_FREE_ROLE)
 
@@ -275,29 +288,42 @@ class MembershipQuerySet(models.QuerySet):
         )
 
     def update(self, **kwargs) -> int:
-        """Remove users from club groups they are no more in
+        """Refresh the cache and edit group ownership.
+
+        Update the cache, when necessary, remove
+        users from club groups they are no more in
         and add them in the club groups they should be in.
 
         Be aware that this adds three db queries :
-
-        - one to retrieve the updated memberships
-        - one to perform group removal
-        - and one to perform group attribution.
+        one to retrieve the updated memberships,
+        one to perform group removal and one to perform
+        group attribution.
         """
         nb_rows = super().update(**kwargs)
         if nb_rows == 0:
-            # if no row was affected, no need to edit club groups
+            # if no row was affected, no need to refresh the cache
             return 0
 
+        cache_memberships = {}
         memberships = set(self.select_related("club"))
         # delete all User-Group relations and recreate the necessary ones
+        # It's more concise to write and more reliable
         Membership._remove_club_groups(memberships)
         Membership._add_club_groups(memberships)
+        for member in memberships:
+            cache_key = f"membership_{member.club_id}_{member.user_id}"
+            if member.end_date is None:
+                cache_memberships[cache_key] = member
+            else:
+                cache_memberships[cache_key] = "not_member"
+        cache.set_many(cache_memberships)
         return nb_rows
 
     def delete(self) -> tuple[int, dict[str, int]]:
         """Work just like the default Django's delete() method,
-        but also remove the concerned users from the club groups.
+        but add a cache invalidation for the elements of the queryset
+        before the deletion,
+        and a removal of the user from the club groups.
 
         Be aware that this adds some db queries :
 
@@ -313,6 +339,12 @@ class MembershipQuerySet(models.QuerySet):
         nb_rows, rows_counts = super().delete()
         if nb_rows > 0:
             Membership._remove_club_groups(memberships)
+            cache.set_many(
+                {
+                    f"membership_{m.club_id}_{m.user_id}": "not_member"
+                    for m in memberships
+                }
+            )
         return nb_rows, rows_counts
 
 
@@ -376,6 +408,9 @@ class Membership(models.Model):
         self._remove_club_groups([self])
         if self.end_date is None:
             self._add_club_groups([self])
+            cache.set(f"membership_{self.club_id}_{self.user_id}", self)
+        else:
+            cache.set(f"membership_{self.club_id}_{self.user_id}", "not_member")
 
     def get_absolute_url(self):
         return reverse("club:club_members", kwargs={"club_id": self.club_id})
@@ -396,6 +431,7 @@ class Membership(models.Model):
     def delete(self, *args, **kwargs):
         self._remove_club_groups([self])
         super().delete(*args, **kwargs)
+        cache.delete(f"membership_{self.club_id}_{self.user_id}")
 
     @staticmethod
     def _remove_club_groups(

club/static/bundled/club/components/ajax-select-index.ts

@@ -1,7 +1,7 @@
+import { AjaxSelect } from "#core:core/components/ajax-select-base";
+import { registerComponent } from "#core:utils/web-components";
 import type { TomOption } from "tom-select/dist/types/types";
 import type { escape_html } from "tom-select/dist/types/utils";
-import { AjaxSelect } from "#core:core/components/ajax-select-base.ts";
-import { registerComponent } from "#core:utils/web-components.ts";
 import { type ClubSchema, clubSearchClub } from "#openapi";
 
 @registerComponent("club-ajax-select")

club/tests/test_membership.py

@@ -72,6 +72,25 @@ class TestMembershipQuerySet(TestClub):
         expected.sort(key=lambda i: i.id)
         assert members == expected
 
+    def test_update_invalidate_cache(self):
+        """Test that the `update` queryset method properly invalidate cache."""
+        mem_skia = self.simple_board_member.memberships.get(club=self.club)
+        cache.set(f"membership_{mem_skia.club_id}_{mem_skia.user_id}", mem_skia)
+        self.simple_board_member.memberships.update(end_date=localtime(now()).date())
+        assert (
+            cache.get(f"membership_{mem_skia.club_id}_{mem_skia.user_id}")
+            == "not_member"
+        )
+
+        mem_richard = self.richard.memberships.get(club=self.club)
+        cache.set(
+            f"membership_{mem_richard.club_id}_{mem_richard.user_id}", mem_richard
+        )
+        self.richard.memberships.update(role=5)
+        new_mem = self.richard.memberships.get(club=self.club)
+        assert new_mem != "not_member"
+        assert new_mem.role == 5
+
     def test_update_change_club_groups(self):
         """Test that `update` set the user groups accordingly."""
         user = baker.make(User)
@@ -93,6 +112,24 @@ class TestMembershipQuerySet(TestClub):
         assert not user.groups.contains(members_group)
         assert not user.groups.contains(board_group)
 
+    def test_delete_invalidate_cache(self):
+        """Test that the `delete` queryset properly invalidate cache."""
+        mem_skia = self.simple_board_member.memberships.get(club=self.club)
+        mem_comptable = self.president.memberships.get(club=self.club)
+        cache.set(f"membership_{mem_skia.club_id}_{mem_skia.user_id}", mem_skia)
+        cache.set(
+            f"membership_{mem_comptable.club_id}_{mem_comptable.user_id}", mem_comptable
+        )
+
+        # should delete the subscriptions of simple_board_member and president
+        self.club.members.ongoing().board().delete()
+
+        for membership in (mem_skia, mem_comptable):
+            cached_mem = cache.get(
+                f"membership_{membership.club_id}_{membership.user_id}"
+            )
+            assert cached_mem == "not_member"
+
     def test_delete_remove_from_groups(self):
         """Test that `delete` removes from club groups"""
         user = baker.make(User)

com/static/bundled/com/components/ics-calendar-index.ts

@@ -1,3 +1,5 @@
+import { makeUrl } from "#core:utils/api";
+import { inheritHtmlElement, registerComponent } from "#core:utils/web-components";
 import { Calendar, type EventClickArg, type EventContentArg } from "@fullcalendar/core";
 import type { EventImpl } from "@fullcalendar/core/internal";
 import enLocale from "@fullcalendar/core/locales/en-gb";
@@ -6,8 +8,6 @@ import dayGridPlugin from "@fullcalendar/daygrid";
 import iCalendarPlugin from "@fullcalendar/icalendar";
 import listPlugin from "@fullcalendar/list";
 import { type HTMLTemplateResult, html, render } from "lit-html";
-import { makeUrl } from "#core:utils/api.ts";
-import { inheritHtmlElement, registerComponent } from "#core:utils/web-components.ts";
 import {
   calendarCalendarInternal,
   calendarCalendarUnpublished,
@@ -95,7 +95,6 @@ export class IcsCalendar extends inheritHtmlElement("div") {
         .split("/")
         .filter((s) => s) // Remove blank characters
         .pop(),
-      10,
     );
   }
 

com/static/bundled/com/moderation-alert-index.ts

@@ -1,4 +1,4 @@
-import { exportToHtml } from "#core:utils/globals.ts";
+import { exportToHtml } from "#core:utils/globals";
 import { newsDeleteNews, newsFetchNewsDates, newsPublishNews } from "#openapi";
 
 // This will be used in jinja templates,

core/admin.py

@@ -98,9 +98,9 @@ class PageAdmin(admin.ModelAdmin):
 
 @admin.register(SithFile)
 class SithFileAdmin(admin.ModelAdmin):
-    list_display = ("name", "owner", "size", "date")
+    list_display = ("name", "owner", "size", "date", "is_in_sas")
     autocomplete_fields = ("parent", "owner", "moderator")
-    search_fields = ("name",)
+    search_fields = ("name", "parent__name")
 
 
 @admin.register(OperationLog)

core/api.py

@@ -110,7 +110,7 @@ class SithFileController(ControllerBase):
     )
     @paginate(PageNumberPaginationExtra, page_size=50)
     def search_files(self, search: Annotated[str, MinLen(1)]):
-        return SithFile.objects.filter(name__icontains=search)
+        return SithFile.objects.filter(is_in_sas=False).filter(name__icontains=search)
 
 
 @api_controller("/group")

core/management/commands/populate.py

@@ -110,6 +110,7 @@ class Command(BaseCommand):
         p.save(force_lock=True)
 
         club_root = SithFile.objects.create(name="clubs", owner=root)
+        sas = SithFile.objects.create(name="SAS", owner=root)
         main_club = Club.objects.create(
             id=1, name="AE", address="6 Boulevard Anatole France, 90000 Belfort"
         )
@@ -693,21 +694,33 @@ class Command(BaseCommand):
         # SAS
         for f in self.SAS_FIXTURE_PATH.glob("*"):
             if f.is_dir():
-                album = Album.objects.create(name=f.name, is_moderated=True)
+                album = Album(
+                    parent=sas,
+                    name=f.name,
+                    owner=root,
+                    is_folder=True,
+                    is_in_sas=True,
+                    is_moderated=True,
+                )
+                album.clean()
+                album.save()
                 for p in f.iterdir():
                     file = resize_image(Image.open(p), 1000, "WEBP")
                     pict = Picture(
                         parent=album,
                         name=p.name,
-                        original=file,
+                        file=file,
                         owner=root,
+                        is_folder=False,
+                        is_in_sas=True,
                         is_moderated=True,
+                        mime_type="image/webp",
+                        size=file.size,
                     )
-                    pict.original.name = pict.name
-                    pict.generate_thumbnails()
+                    pict.file.name = p.name
                     pict.full_clean()
+                    pict.generate_thumbnails()
                     pict.save()
-                album.generate_thumbnail()
 
         img_skia = Picture.objects.get(name="skia.jpg")
         img_sli = Picture.objects.get(name="sli.jpg")

core/migrations/0048_remove_sithfiles.py

@@ -1,27 +0,0 @@
-# Generated by Django 4.2.17 on 2025-01-26 15:01
-
-from typing import TYPE_CHECKING
-
-from django.db import migrations
-from django.db.migrations.state import StateApps
-
-if TYPE_CHECKING:
-    import core.models
-
-
-def remove_sas_sithfiles(apps: StateApps, schema_editor):
-    SithFile: type[core.models.SithFile] = apps.get_model("core", "SithFile")
-    SithFile.objects.filter(is_in_sas=True).delete()
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("core", "0047_alter_notification_date_alter_notification_type"),
-        ("sas", "0007_alter_peoplepicturerelation_picture_and_more"),
-    ]
-
-    operations = [
-        migrations.RunPython(
-            remove_sas_sithfiles, reverse_code=migrations.RunPython.noop, elidable=True
-        )
-    ]

core/migrations/0049_remove_sithfile_is_in_sas.py

@@ -1,9 +0,0 @@
-# Generated by Django 4.2.17 on 2025-02-14 11:58
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-    dependencies = [("core", "0048_remove_sithfiles")]
-
-    operations = [migrations.RemoveField(model_name="sithfile", name="is_in_sas")]

core/models.py

@@ -833,6 +833,9 @@ class SithFile(models.Model):
         on_delete=models.CASCADE,
     )
     asked_for_removal = models.BooleanField(_("asked for removal"), default=False)
+    is_in_sas = models.BooleanField(
+        _("is in the SAS"), default=False, db_index=True
+    )  # Allows to query this flag, updated at each call to save()
 
     class Meta:
         verbose_name = _("file")
@@ -841,10 +844,22 @@ class SithFile(models.Model):
         return self.get_parent_path() + "/" + self.name
 
     def save(self, *args, **kwargs):
+        sas = SithFile.objects.filter(id=settings.SITH_SAS_ROOT_DIR_ID).first()
+        self.is_in_sas = sas in self.get_parent_list() or self == sas
         adding = self._state.adding
         super().save(*args, **kwargs)
         if adding:
             self.copy_rights()
+        if self.is_in_sas:
+            for user in User.objects.filter(
+                groups__id__in=[settings.SITH_GROUP_SAS_ADMIN_ID]
+            ):
+                Notification(
+                    user=user,
+                    url=reverse("sas:moderation"),
+                    type="SAS_MODERATION",
+                    param="1",
+                ).save()
 
     def is_owned_by(self, user: User) -> bool:
         if user.is_anonymous:
@@ -857,6 +872,8 @@ class SithFile(models.Model):
             return user.is_board_member
         if user.is_com_admin:
             return True
+        if self.is_in_sas and user.is_in_group(pk=settings.SITH_GROUP_SAS_ADMIN_ID):
+            return True
         return user.id == self.owner_id
 
     def can_be_viewed_by(self, user: User) -> bool:
@@ -883,6 +900,8 @@ class SithFile(models.Model):
         super().clean()
         if "/" in self.name:
             raise ValidationError(_("Character '/' not authorized in name"))
+        if self == self.parent:
+            raise ValidationError(_("Loop in folder tree"), code="loop")
         if self == self.parent or (
             self.parent is not None and self in self.get_parent_list()
         ):
@@ -963,6 +982,18 @@ class SithFile(models.Model):
     def is_file(self):
         return not self.is_folder
 
+    @cached_property
+    def as_picture(self):
+        from sas.models import Picture
+
+        return Picture.objects.filter(id=self.id).first()
+
+    @cached_property
+    def as_album(self):
+        from sas.models import Album
+
+        return Album.objects.filter(id=self.id).first()
+
     def get_parent_list(self):
         parents = []
         current = self.parent

core/static/bundled/alpine-index.js

@@ -1,7 +1,7 @@
+import { limitedChoices } from "#core:alpine/limited-choices";
+import { alpinePlugin as notificationPlugin } from "#core:utils/notifications";
 import sort from "@alpinejs/sort";
 import Alpine from "alpinejs";
-import { limitedChoices } from "#core:alpine/limited-choices.ts";
-import { alpinePlugin as notificationPlugin } from "#core:utils/notifications.ts";
 
 Alpine.plugin([sort, limitedChoices]);
 Alpine.magic("notifications", notificationPlugin);

core/static/bundled/alpine/limited-choices.ts

@@ -56,7 +56,7 @@ export function limitedChoices(Alpine: AlpineType) {
       effect(() => {
         getMaxChoices((value: string) => {
           const previousValue = maxChoices;
-          maxChoices = Number.parseInt(value, 10);
+          maxChoices = Number.parseInt(value);
           if (maxChoices < previousValue) {
             // The maximum number of selectable items has been lowered.
             // Some currently selected elements may need to be removed

core/static/bundled/core/components/ajax-select-base.ts

@@ -1,3 +1,4 @@
+import { inheritHtmlElement } from "#core:utils/web-components";
 import TomSelect from "tom-select";
 import type {
   RecursivePartial,
@@ -6,7 +7,6 @@ import type {
   TomSettings,
 } from "tom-select/dist/types/types";
 import type { escape_html } from "tom-select/dist/types/utils";
-import { inheritHtmlElement } from "#core:utils/web-components.ts";
 
 export class AutoCompleteSelectBase extends inheritHtmlElement("select") {
   static observedAttributes = [
@@ -29,7 +29,7 @@ export class AutoCompleteSelectBase extends inheritHtmlElement("select") {
   ) {
     switch (name) {
       case "delay": {
-        this.delay = Number.parseInt(newValue, 10) ?? null;
+        this.delay = Number.parseInt(newValue) ?? null;
         break;
       }
       case "placeholder": {
@@ -37,11 +37,11 @@ export class AutoCompleteSelectBase extends inheritHtmlElement("select") {
         break;
       }
       case "max": {
-        this.max = Number.parseInt(newValue, 10) ?? null;
+        this.max = Number.parseInt(newValue) ?? null;
         break;
       }
       case "min-characters-for-search": {
-        this.minCharNumberForSearch = Number.parseInt(newValue, 10) ?? 0;
+        this.minCharNumberForSearch = Number.parseInt(newValue) ?? 0;
         break;
       }
       default: {

core/static/bundled/core/components/ajax-select-index.ts

@@ -1,20 +1,21 @@
 import "tom-select/dist/css/tom-select.default.css";
+import { registerComponent } from "#core:utils/web-components";
 import type { TomOption } from "tom-select/dist/types/types";
 import type { escape_html } from "tom-select/dist/types/utils";
-import {
-  AjaxSelect,
-  AutoCompleteSelectBase,
-} from "#core:core/components/ajax-select-base.ts";
-import { registerComponent } from "#core:utils/web-components.ts";
 import {
   type GroupSchema,
-  groupSearchGroup,
   type SithFileSchema,
-  sithfileSearchFiles,
   type UserProfileSchema,
+  groupSearchGroup,
+  sithfileSearchFiles,
   userSearchUsers,
 } from "#openapi";
 
+import {
+  AjaxSelect,
+  AutoCompleteSelectBase,
+} from "#core:core/components/ajax-select-base";
+
 @registerComponent("autocomplete-select")
 export class AutoCompleteSelect extends AutoCompleteSelectBase {}
 

core/static/bundled/core/components/easymde-index.ts

@@ -1,14 +1,14 @@
 // biome-ignore lint/correctness/noUndeclaredDependencies: shipped by easymde
 import "codemirror/lib/codemirror.css";
 import "easymde/src/css/easymde.css";
+import { inheritHtmlElement, registerComponent } from "#core:utils/web-components";
 // biome-ignore lint/correctness/noUndeclaredDependencies: Imported by EasyMDE
 import type CodeMirror from "codemirror";
 // biome-ignore lint/style/useNamingConvention: This is how they called their namespace
 import EasyMDE from "easymde";
-import { inheritHtmlElement, registerComponent } from "#core:utils/web-components.ts";
 import {
-  markdownRenderMarkdown,
   type UploadUploadImageErrors,
+  markdownRenderMarkdown,
   uploadUploadImage,
 } from "#openapi";
 

core/static/bundled/core/components/include-index.ts

@@ -1,4 +1,4 @@
-import { inheritHtmlElement, registerComponent } from "#core:utils/web-components.ts";
+import { inheritHtmlElement, registerComponent } from "#core:utils/web-components";
 
 /**
  * Web component used to import css files only once

core/static/bundled/core/components/nfc-input-index.ts

@@ -1,4 +1,4 @@
-import { inheritHtmlElement, registerComponent } from "#core:utils/web-components.ts";
+import { inheritHtmlElement, registerComponent } from "#core:utils/web-components";
 
 @registerComponent("nfc-input")
 export class NfcInput extends inheritHtmlElement("input") {

core/static/bundled/core/components/tabs-index.ts

@@ -1,6 +1,6 @@
+import { registerComponent } from "#core:utils/web-components";
 import { html, render } from "lit-html";
 import { unsafeHTML } from "lit-html/directives/unsafe-html.js";
-import { registerComponent } from "#core:utils/web-components.ts";
 
 @registerComponent("ui-tab")
 export class Tab extends HTMLElement {

core/static/bundled/core/navbar-index.ts

@@ -1,4 +1,4 @@
-import { exportToHtml } from "#core:utils/globals.ts";
+import { exportToHtml } from "#core:utils/globals";
 
 exportToHtml("showMenu", () => {
   const navbar = document.getElementById("navbar-content");

core/static/bundled/core/read-more-index.ts

@@ -26,7 +26,7 @@ function showMore(element: HTMLElement) {
   const fullContent = element.innerHTML;
   const clippedContent = clip(
     element.innerHTML,
-    Number.parseInt(element.getAttribute("show-more") as string, 10),
+    Number.parseInt(element.getAttribute("show-more") as string),
     {
       html: true,
     },

core/static/bundled/core/tooltips-index.ts

@@ -1,9 +1,9 @@
 import {
+  type Placement,
   autoPlacement,
   computePosition,
   flip,
   offset,
-  type Placement,
   size,
 } from "@floating-ui/dom";
 

core/static/bundled/sentry-popup-index.ts

@@ -1,6 +1,6 @@
-// biome-ignore lint/performance/noNamespaceImport: this is the recommended way from the documentation
+import { exportToHtml } from "#core:utils/globals";
+// biome-ignore lint/style/noNamespaceImport: this is the recommended way from the documentation
 import * as Sentry from "@sentry/browser";
-import { exportToHtml } from "#core:utils/globals.ts";
 
 interface LoggedUser {
   name: string;

core/static/bundled/types/web-nfc.d.ts

@@ -8,6 +8,7 @@
 
 // This has been modified to not trigger biome linting
 
+// biome-ignore lint/correctness/noUnusedVariables: this is the official definition
 interface Window {
   // biome-ignore lint/style/useNamingConvention: this is the official API name
   NDEFMessage: NDEFMessage;
@@ -27,6 +28,7 @@ declare interface NDEFMessageInit {
 // biome-ignore lint/style/useNamingConvention: this is the official API name
 declare type NDEFRecordDataSource = string | BufferSource | NDEFMessageInit;
 
+// biome-ignore lint/correctness/noUnusedVariables: this is the official definition
 interface Window {
   // biome-ignore lint/style/useNamingConvention: this is the official API name
   NDEFRecord: NDEFRecord;
@@ -72,6 +74,7 @@ declare class NDEFReader extends EventTarget {
   makeReadOnly: (options?: NDEFMakeReadOnlyOptions) => Promise<void>;
 }
 
+// biome-ignore lint/correctness/noUnusedVariables: this is the official definition
 interface Window {
   // biome-ignore lint/style/useNamingConvention: this is the official API name
   NDEFReadingEvent: NDEFReadingEvent;

core/static/bundled/user/family-graph-index.ts

@@ -1,3 +1,4 @@
+import { History, initialUrlParams, updateQueryString } from "#core:utils/history";
 import cytoscape, {
   type ElementDefinition,
   type NodeSingular,
@@ -5,8 +6,7 @@ import cytoscape, {
 } from "cytoscape";
 import cxtmenu from "cytoscape-cxtmenu";
 import klay, { type KlayLayoutOptions } from "cytoscape-klay";
-import { History, initialUrlParams, updateQueryString } from "#core:utils/history.ts";
-import { familyGetFamilyGraph, type UserProfileSchema } from "#openapi";
+import { type UserProfileSchema, familyGetFamilyGraph } from "#openapi";
 
 cytoscape.use(klay);
 cytoscape.use(cxtmenu);
@@ -200,7 +200,7 @@ document.addEventListener("alpine:init", () => {
     isZoomEnabled: !isMobile(),
 
     getInitialDepth(prop: string) {
-      const value = Number.parseInt(initialUrlParams.get(prop), 10);
+      const value = Number.parseInt(initialUrlParams.get(prop));
       if (Number.isNaN(value) || value < config.depthMin || value > config.depthMax) {
         return defaultDepth;
       }

core/static/bundled/utils/api.ts

@@ -1,5 +1,5 @@
-import { client, type Options } from "#openapi";
 import type { Client, RequestResult, TDataShape } from "#openapi:client";
+import { type Options, client } from "#openapi";
 
 export interface PaginatedResponse<T> {
   count: number;

core/static/bundled/utils/csv.ts

@@ -1,4 +1,4 @@
-import type { NestedKeyOf } from "#core:utils/types.ts";
+import type { NestedKeyOf } from "#core:utils/types";
 
 interface StringifyOptions<T extends object> {
   /** The columns to include in the resulting CSV. */

core/static/bundled/utils/web-components.ts

@@ -10,6 +10,7 @@ export function registerComponent(name: string, options?: ElementDefinitionOptio
       window.customElements.define(name, component, options);
     } catch (e) {
       if (e instanceof DOMException) {
+        // biome-ignore lint/suspicious/noConsole: it's handy to troobleshot
         console.warn(e.message);
         return;
       }

core/static/core/js/shorten.min.js

@@ -0,0 +1,124 @@
+// Copyright 2013 Viral Patel and other contributors
+// http://viralpatel.net
+
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+!(function (e) {
+	e.fn.shorten = function (s) {
+		"use strict";
+		var t = {
+			showChars: 100,
+			minHideChars: 10,
+			ellipsesText: "...",
+			moreText: "more",
+			lessText: "less",
+			onLess: function () {},
+			onMore: function () {},
+			errMsg: null,
+			force: !1,
+		};
+		return (
+			s && e.extend(t, s),
+			(!e(this).data("jquery.shorten") || !!t.force) &&
+				(e(this).data("jquery.shorten", !0),
+				e(document).off("click", ".morelink"),
+				e(document).on(
+					{
+						click: function () {
+							var s = e(this);
+							return (
+								s.hasClass("less")
+									? (s.removeClass("less"),
+										s.html(t.moreText),
+										s
+											.parent()
+											.prev()
+											.animate({}, function () {
+												s.parent().prev().prev().show();
+											})
+											.hide("fast", function () {
+												t.onLess();
+											}))
+									: (s.addClass("less"),
+										s.html(t.lessText),
+										s
+											.parent()
+											.prev()
+											.animate({}, function () {
+												s.parent().prev().prev().hide();
+											})
+											.show("fast", function () {
+												t.onMore();
+											})),
+								!1
+							);
+						},
+					},
+					".morelink",
+				),
+				this.each(function () {
+					var s = e(this),
+						n = s.html();
+					if (s.text().length > t.showChars + t.minHideChars) {
+						var r = n.substr(0, t.showChars);
+						if (r.indexOf("<") >= 0) {
+							for (
+								var a = !1, o = "", i = 0, l = [], h = null, c = 0, f = 0;
+								f <= t.showChars;
+								c++
+							)
+								if (
+									("<" != n[c] ||
+										a ||
+										((a = !0),
+										"/" == (h = n.substring(c + 1, n.indexOf(">", c)))[0]
+											? h != "/" + l[0]
+												? (t.errMsg =
+														"ERROR en HTML: the top of the stack should be the tag that closes")
+												: l.shift()
+											: "br" != h.toLowerCase() && l.unshift(h)),
+									a && ">" == n[c] && (a = !1),
+									a)
+								)
+									o += n.charAt(c);
+								else if ((f++, i <= t.showChars)) (o += n.charAt(c)), i++;
+								else if (l.length > 0) {
+									for (j = 0; j < l.length; j++) o += "</" + l[j] + ">";
+									break;
+								}
+							r = e("<div/>")
+								.html(o + '<span class="ellip">' + t.ellipsesText + "</span>")
+								.html();
+						} else r += t.ellipsesText;
+						var p =
+							'<div class="shortcontent">' +
+							r +
+							'</div><div class="allcontent">' +
+							n +
+							'</div><span><a href="javascript://nop/" class="morelink">' +
+							t.moreText +
+							"</a></span>";
+						s.html(p),
+							s.find(".allcontent").hide(),
+							e(".shortcontent p:last", s).css("margin-bottom", 0);
+					}
+				}))
+		);
+	};
+})(jQuery);

core/tests/test_core.py

@@ -22,17 +22,19 @@ from bs4 import BeautifulSoup
 from django.contrib.auth.hashers import make_password
 from django.contrib.auth.models import Permission
 from django.core import mail
+from django.core.cache import cache
 from django.core.exceptions import ValidationError
 from django.core.mail import EmailMessage
 from django.test import Client, RequestFactory, TestCase
 from django.urls import reverse
+from django.utils.timezone import now
 from django.views.generic import View
 from django.views.generic.base import ContextMixin
 from model_bakery import baker
 from pytest_django.asserts import assertInHTML, assertRedirects
 
 from antispam.models import ToxicDomain
-from club.models import Club
+from club.models import Club, Membership
 from core.baker_recipes import subscriber_user
 from core.markdown import markdown
 from core.models import AnonymousUser, Group, Page, User, validate_promo
@@ -434,6 +436,23 @@ class TestUserIsInGroup(TestCase):
         with self.assertNumQueries(0):
             self.public_user.is_in_group(pk=group_not_in.id)
 
+    def test_cache_properly_cleared_membership(self):
+        """Test that when the membership of a user end,
+        the cache is properly invalidated.
+        """
+        membership = baker.make(Membership, club=self.club, user=self.public_user)
+        cache.clear()
+        self.club.get_membership_for(self.public_user)  # this should populate the cache
+        assert membership == cache.get(
+            f"membership_{self.club.id}_{self.public_user.id}"
+        )
+        membership.end_date = now() - timedelta(minutes=5)
+        membership.save()
+        cached_membership = cache.get(
+            f"membership_{self.club.id}_{self.public_user.id}"
+        )
+        assert cached_membership == "not_member"
+
     def test_not_existing_group(self):
         """Test that searching for a not existing group
         returns False.

core/tests/test_files.py

@@ -5,7 +5,6 @@ from typing import Callable
 from uuid import uuid4
 
 import pytest
-from django.conf import settings
 from django.core.cache import cache
 from django.core.files.uploadedfile import SimpleUploadedFile, UploadedFile
 from django.test import Client, TestCase
@@ -18,8 +17,8 @@ from pytest_django.asserts import assertNumQueries
 from core.baker_recipes import board_user, old_subscriber_user, subscriber_user
 from core.models import Group, QuickUploadImage, SithFile, User
 from core.utils import RED_PIXEL_PNG
-from sas.baker_recipes import picture_recipe
 from sas.models import Picture
+from sith import settings
 
 
 @pytest.mark.django_db
@@ -31,19 +30,24 @@ class TestImageAccess:
             lambda: baker.make(
                 User, groups=[Group.objects.get(pk=settings.SITH_GROUP_SAS_ADMIN_ID)]
             ),
+            lambda: baker.make(
+                User, groups=[Group.objects.get(pk=settings.SITH_GROUP_COM_ADMIN_ID)]
+            ),
         ],
     )
     def test_sas_image_access(self, user_factory: Callable[[], User]):
         """Test that only authorized users can access the sas image."""
         user = user_factory()
-        picture = picture_recipe.make()
-        assert user.can_edit(picture)
+        picture: SithFile = baker.make(
+            Picture, parent=SithFile.objects.get(pk=settings.SITH_SAS_ROOT_DIR_ID)
+        )
+        assert picture.is_owned_by(user)
 
     def test_sas_image_access_owner(self):
         """Test that the owner of the image can access it."""
         user = baker.make(User)
-        picture = picture_recipe.make(owner=user)
-        assert user.can_edit(picture)
+        picture: Picture = baker.make(Picture, owner=user)
+        assert picture.is_owned_by(user)
 
     @pytest.mark.parametrize(
         "user_factory",
@@ -59,41 +63,7 @@ class TestImageAccess:
         user = user_factory()
         owner = baker.make(User)
         picture: Picture = baker.make(Picture, owner=owner)
-        assert not user.can_edit(picture)
-
-
-@pytest.mark.django_db
-class TestUserPicture:
-    def test_anonymous_user_unauthorized(self, client):
-        """An anonymous user shouldn't have access to an user's photo page."""
-        response = client.get(
-            reverse(
-                "core:user_pictures",
-                kwargs={"user_id": User.objects.get(username="sli").pk},
-            )
-        )
-        assert response.status_code == 403
-
-    @pytest.mark.parametrize(
-        ("username", "status"),
-        [
-            ("guy", 403),
-            ("root", 200),
-            ("skia", 200),
-            ("sli", 200),
-        ],
-    )
-    def test_page_is_working(self, client, username, status):
-        """Only user that subscribed (or admins) should be able to see the page."""
-        # Test for simple user
-        client.force_login(User.objects.get(username=username))
-        response = client.get(
-            reverse(
-                "core:user_pictures",
-                kwargs={"user_id": User.objects.get(username="sli").pk},
-            )
-        )
-        assert response.status_code == status
+        assert not picture.is_owned_by(user)
 
 
 # TODO: many tests on the pages:
@@ -148,9 +118,9 @@ class TestFileModerationView:
             (lambda: None, 403),  # Anonymous user
             (lambda: baker.make(User, is_superuser=True), 200),
             (lambda: baker.make(User), 403),
-            (subscriber_user.make, 403),
-            (old_subscriber_user.make, 403),
-            (board_user.make, 403),
+            (lambda: subscriber_user.make(), 403),
+            (lambda: old_subscriber_user.make(), 403),
+            (lambda: board_user.make(), 403),
         ],
     )
     def test_view_access(
@@ -292,7 +262,7 @@ def test_apply_rights_recursively():
 
 @pytest.mark.django_db
 @pytest.mark.parametrize(
-    ("user_recipe", "file", "expected_status"),
+    ("user_receipe", "file", "expected_status"),
     [
         (
             lambda: None,
@@ -309,21 +279,21 @@ def test_apply_rights_recursively():
             403,
         ),
         (
-            subscriber_user.make,
+            lambda: subscriber_user.make(),
             SimpleUploadedFile(
                 "test.jpg", content=RED_PIXEL_PNG, content_type="image/jpg"
             ),
             200,
         ),
         (
-            old_subscriber_user.make,
+            lambda: old_subscriber_user.make(),
             SimpleUploadedFile(
                 "test.jpg", content=RED_PIXEL_PNG, content_type="image/jpg"
             ),
             200,
         ),
         (
-            old_subscriber_user.make,
+            lambda: old_subscriber_user.make(),
             SimpleUploadedFile(
                 "ttesttesttesttesttesttesttesttesttesttesttesttesttesttesttestesttesttesttesttesttesttesttesttesttesttesttest.jpg",
                 content=RED_PIXEL_PNG,
@@ -332,21 +302,21 @@ def test_apply_rights_recursively():
             200,
         ),  # very long file name
         (
-            old_subscriber_user.make,
+            lambda: old_subscriber_user.make(),
             SimpleUploadedFile(
                 "test.jpg", content=b"invalid", content_type="image/jpg"
             ),
             422,
         ),
         (
-            old_subscriber_user.make,
+            lambda: old_subscriber_user.make(),
             SimpleUploadedFile(
                 "test.jpg", content=RED_PIXEL_PNG, content_type="invalid"
             ),
             200,  # PIL can guess
         ),
         (
-            old_subscriber_user.make,
+            lambda: old_subscriber_user.make(),
             SimpleUploadedFile("test.jpg", content=b"invalid", content_type="invalid"),
             422,
         ),
@@ -354,11 +324,11 @@ def test_apply_rights_recursively():
 )
 def test_quick_upload_image(
     client: Client,
-    user_recipe: Callable[[], User | None],
+    user_receipe: Callable[[], User | None],
     file: UploadedFile | None,
     expected_status: int,
 ):
-    if (user := user_recipe()) is not None:
+    if (user := user_receipe()) is not None:
         client.force_login(user)
     resp = client.post(
         reverse("api:quick_upload_image"), {"file": file} if file is not None else {}

core/tests/test_user.py

@@ -27,7 +27,6 @@ from counter.baker_recipes import sale_recipe
 from counter.models import Counter, Customer, Permanency, Refilling, Selling
 from counter.utils import is_logged_in_counter
 from eboutic.models import Invoice, InvoiceItem
-from sas.models import Picture
 
 
 class TestSearchUsers(TestCase):
@@ -35,7 +34,6 @@ class TestSearchUsers(TestCase):
     def setUpTestData(cls):
         # News.author has on_delete=PROTECT, so news must be deleted beforehand
         News.objects.all().delete()
-        Picture.objects.all().delete()  # same for pictures
         User.objects.all().delete()
         user_recipe = Recipe(
             User,
@@ -420,7 +418,9 @@ class TestUserQuerySetViewableBy:
         viewable = User.objects.filter(id__in=[u.id for u in users]).viewable_by(user)
         assert set(viewable) == {users[0], users[1]}
 
-    @pytest.mark.parametrize("user_factory", [lambda: baker.make(User), AnonymousUser])
+    @pytest.mark.parametrize(
+        "user_factory", [lambda: baker.make(User), lambda: AnonymousUser()]
+    )
     def test_not_subscriber(self, users: list[User], user_factory):
         user = user_factory()
         viewable = User.objects.filter(id__in=[u.id for u in users]).viewable_by(user)

core/utils.py

@@ -12,23 +12,18 @@
 # OR WITHIN THE LOCAL FILE "LICENSE"
 #
 #
-from dataclasses import dataclass
+
 from datetime import date, timedelta
 
 # Image utils
 from io import BytesIO
-from typing import Any, Final, Unpack
+from typing import Final
 
 import PIL
 from django.conf import settings
 from django.core.files.base import ContentFile
 from django.core.files.uploadedfile import UploadedFile
-from django.db import models
-from django.forms import BaseForm
-from django.http import Http404, HttpRequest
-from django.shortcuts import get_list_or_404
-from django.template.loader import render_to_string
-from django.utils.safestring import SafeString
+from django.http import HttpRequest
 from django.utils.timezone import localdate
 from PIL import ExifTags
 from PIL.Image import Image, Resampling
@@ -47,21 +42,6 @@ to generate a dummy image that is considered valid nonetheless
 """
 
 
-@dataclass
-class FormFragmentTemplateData[T: BaseForm]:
-    """Dataclass used to pre-render form fragments"""
-
-    form: T
-    template: str
-    context: dict[str, Any]
-
-    def render(self, request: HttpRequest) -> SafeString:
-        # Request is needed for csrf_tokens
-        return render_to_string(
-            self.template, context={"form": self.form, **self.context}, request=request
-        )
-
-
 def get_start_of_semester(today: date | None = None) -> date:
     """Return the date of the start of the semester of the given date.
     If no date is given, return the start date of the current semester.
@@ -225,56 +205,3 @@ def get_client_ip(request: HttpRequest) -> str | None:
             return ip
 
     return None
-
-
-Filterable = models.Model | models.QuerySet | models.Manager
-ListFilter = dict[str, list | tuple | set]
-
-
-def get_list_exact_or_404(klass: Filterable, **kwargs: Unpack[ListFilter]) -> list:
-    """Use filter() to return a list of objects from a list of unique keys (like ids)
-    or raises Http404 if the list has not the same length as the given one.
-
-    Work like `get_object_or_404()` but for lists of objects, with some caveats :
-
-    - The filter must be a list, a tuple or a set.
-    - There can't be more than exactly one filter.
-    - There must be no duplicate in the filter.
-    - The filter should consist in unique keys (like ids), or it could fail randomly.
-
-    klass may be a Model, Manager, or QuerySet object. All other passed
-    arguments and keyword arguments are used in the filter() query.
-
-    Raises:
-        Http404: If the list is empty or doesn't have as many elements as the keys list.
-        ValueError: If the first argument is not a Model, Manager, or QuerySet object.
-        ValueError: If more than one filter is passed.
-        TypeError: If the given filter is not a list, a tuple or a set.
-
-    Examples:
-        Get all the products with ids 1, 2, 3: ::
-
-            products = get_list_exact_or_404(Product, id__in=[1, 2, 3])
-
-        Don't work with duplicate ids: ::
-
-            products = get_list_exact_or_404(Product, id__in=[1, 2, 3, 3])
-            # Raises Http404: "The list of keys must contain no duplicates."
-    """
-    if len(kwargs) > 1:
-        raise ValueError("get_list_exact_or_404() only accepts one filter.")
-    key, list_filter = next(iter(kwargs.items()))
-    if not isinstance(list_filter, (list, tuple, set)):
-        raise TypeError(
-            f"The given filter must be a list, a tuple or a set, not {type(list_filter)}"
-        )
-    if len(list_filter) != len(set(list_filter)):
-        raise ValueError("The list of keys must contain no duplicates.")
-    kwargs = {key: list_filter}
-    obj_list = get_list_or_404(klass, **kwargs)
-    if len(obj_list) != len(list_filter):
-        raise Http404(
-            "The given list of keys doesn't match the number of objects found."
-            f"Expected {len(list_filter)} items, got {len(obj_list)}."
-        )
-    return obj_list

core/views/files.py

@@ -374,7 +374,7 @@ class FileDeleteView(AllowFragment, CanEditPropMixin, DeleteView):
 class FileModerationView(AllowFragment, ListView):
     model = SithFile
     template_name = "core/file_moderation.jinja"
-    queryset = SithFile.objects.filter(is_moderated=False)
+    queryset = SithFile.objects.filter(is_moderated=False, is_in_sas=False)
     ordering = "id"
     paginate_by = 100
 

counter/management/commands/dump_accounts.py

@@ -65,10 +65,10 @@ class Command(BaseCommand):
         """Fetch the users which have a pending account dump."""
         threshold = now() - settings.SITH_ACCOUNT_DUMP_DELTA
         ongoing_dump_operations: QuerySet[AccountDump] = (
-            AccountDump.objects.ongoing().filter(
-                customer__user=OuterRef("pk"), warning_mail_sent_at__lt=threshold
-            )
-        )
+            AccountDump.objects.ongoing()
+            .filter(customer__user=OuterRef("pk"), warning_mail_sent_at__lt=threshold)
+        )  # fmt: off
+        # cf. https://github.com/astral-sh/ruff/issues/14103
         return (
             User.objects.filter(Exists(ongoing_dump_operations))
             .annotate(

counter/models.py

@@ -447,7 +447,8 @@ class Product(models.Model):
         buying_groups = list(self.buying_groups.all())
         if not buying_groups:
             return True
-        return any(user.is_in_group(pk=group.id) for group in buying_groups)
+        res = any(user.is_in_group(pk=group.id) for group in buying_groups)
+        return res
 
     @property
     def profit(self):

counter/static/bundled/counter/basket.ts

@@ -1,4 +1,4 @@
-import type { Product } from "#counter:counter/types.ts";
+import type { Product } from "#counter:counter/types";
 
 export class BasketItem {
   quantity: number;

counter/static/bundled/counter/components/ajax-select-index.ts

@@ -1,14 +1,14 @@
+import { AjaxSelect } from "#core:core/components/ajax-select-base";
+import { registerComponent } from "#core:utils/web-components";
 import type { TomOption } from "tom-select/dist/types/types";
 import type { escape_html } from "tom-select/dist/types/utils";
-import { AjaxSelect } from "#core:core/components/ajax-select-base.ts";
-import { registerComponent } from "#core:utils/web-components.ts";
 import {
   type CounterSchema,
-  counterSearchCounter,
   type ProductTypeSchema,
+  type SimpleProductSchema,
+  counterSearchCounter,
   productSearchProducts,
   producttypeFetchAll,
-  type SimpleProductSchema,
 } from "#openapi";
 
 @registerComponent("product-ajax-select")

counter/static/bundled/counter/components/counter-product-select-index.ts

@@ -1,13 +1,13 @@
+import { AutoCompleteSelectBase } from "#core:core/components/ajax-select-base";
+import { registerComponent } from "#core:utils/web-components";
 import type { RecursivePartial, TomSettings } from "tom-select/dist/types/types";
-import { AutoCompleteSelectBase } from "#core:core/components/ajax-select-base.ts";
-import { registerComponent } from "#core:utils/web-components.ts";
 
 const productParsingRegex = /^(\d+x)?(.*)/i;
 const codeParsingRegex = / \((\w+)\)$/;
 
 function parseProduct(query: string): [number, string] {
   const parsed = productParsingRegex.exec(query);
-  return [Number.parseInt(parsed[1] || "1", 10), parsed[2]];
+  return [Number.parseInt(parsed[1] || "1"), parsed[2]];
 }
 
 @registerComponent("counter-product-select")
@@ -80,9 +80,9 @@ export class CounterProductSelect extends AutoCompleteSelectBase {
       // We need to manually set weights or it results on an inconsistent
       // behavior between production and development environment
       searchField: [
-        // @ts-expect-error documentation says it's fine, specified type is wrong
+        // @ts-ignore documentation says it's fine, specified type is wrong
         { field: "code", weight: 2 },
-        // @ts-expect-error documentation says it's fine, specified type is wrong
+        // @ts-ignore documentation says it's fine, specified type is wrong
         { field: "text", weight: 0.5 },
       ],
     };

counter/static/bundled/counter/counter-click-index.ts

@@ -1,6 +1,6 @@
-import { AlertMessage } from "#core:utils/alert-message.ts";
-import { BasketItem } from "#counter:counter/basket.ts";
-import type { CounterConfig, ErrorMessage } from "#counter:counter/types.ts";
+import { AlertMessage } from "#core:utils/alert-message";
+import { BasketItem } from "#counter:counter/basket";
+import type { CounterConfig, ErrorMessage } from "#counter:counter/types";
 import type { CounterProductSelect } from "./components/counter-product-select-index.ts";
 
 document.addEventListener("alpine:init", () => {

counter/static/bundled/counter/product-list-index.ts

@@ -1,13 +1,9 @@
+import { paginated } from "#core:utils/api";
+import { csv } from "#core:utils/csv";
+import { History, getCurrentUrlParams, updateQueryString } from "#core:utils/history";
+import type { NestedKeyOf } from "#core:utils/types";
 import { showSaveFilePicker } from "native-file-system-adapter";
 import type TomSelect from "tom-select";
-import { paginated } from "#core:utils/api.ts";
-import { csv } from "#core:utils/csv.ts";
-import {
-  getCurrentUrlParams,
-  History,
-  updateQueryString,
-} from "#core:utils/history.ts";
-import type { NestedKeyOf } from "#core:utils/types.ts";
 import {
   type ProductSchema,
   type ProductSearchProductsDetailedData,

counter/static/bundled/counter/product-type-index.ts

@@ -1,5 +1,5 @@
+import { AlertMessage } from "#core:utils/alert-message";
 import Alpine from "alpinejs";
-import { AlertMessage } from "#core:utils/alert-message.ts";
 import { producttypeReorder } from "#openapi";
 
 document.addEventListener("alpine:init", () => {
@@ -22,7 +22,7 @@ document.addEventListener("alpine:init", () => {
       const productTypes = this.$refs.productTypes
         .childNodes as NodeListOf<HTMLLIElement>;
       const getId = (elem: HTMLLIElement) =>
-        Number.parseInt(elem.getAttribute("x-sort:item"), 10);
+        Number.parseInt(elem.getAttribute("x-sort:item"));
       const query =
         newPosition === 0
           ? { above: getId(productTypes.item(1)) }

counter/templates/counter/counter_click.jinja

@@ -104,7 +104,7 @@
             </div>
             <ul>
               <li x-show="getBasketSize() === 0">{% trans %}This basket is empty{% endtrans %}</li>
-              <template x-for="(item, index) in Object.values(basket)" :key="item.product.id">
+              <template x-for="(item, index) in Object.values(basket)">
                 <li>
                   <template x-for="error in item.errors">
                     <div class="alert alert-red" x-text="error">

docs/tutorial/groups.md

@@ -263,35 +263,3 @@ avec un unique champ permettant de sélectionner des groupes.
 Par défaut, seuls les utilisateurs avec la permission
 `auth.change_permission` auront accès à ce formulaire
 (donc, normalement, uniquement les utilisateurs Root).
-
-```mermaid
-sequenceDiagram
-    participant A as Utilisateur
-    participant B as ReverseProxy
-    participant C as MarkdownImage
-    participant D as Model
-
-    A->>B: GET /page/foo
-    B->>C: GET /page/foo
-    C-->>B: La page, avec les urls
-    B-->>A: La page, avec les urls
-    alt image publique 
-        A->>B: GET markdown/public/2025/img.webp
-        B-->>A: img.webp
-    end
-    alt image privée 
-        A->>B: GET markdown_image/{id}
-        B->>C: GET markdown_image/{id}
-        C->>D: user.can_view(image)
-        alt l'utilisateur a le droit de voir l'image
-            D-->>C: True
-            C-->>B: 200 (avec le X-Accel-Redirect)
-            B-->>A: img.webp
-        end
-        alt l'utilisateur n'a pas le droit de l'image
-            D-->>C: False
-            C-->>B: 403
-            B-->>A: 403
-        end
-    end
-```

eboutic/models.py

@@ -43,13 +43,12 @@ def get_eboutic_products(user: User) -> list[Product]:
     products = (
         get_eboutic()
         .products.filter(product_type__isnull=False)
-        .filter(archived=False, limit_age__lte=user.age)
-        .annotate(
-            order=F("product_type__order"),
-            category=F("product_type__name"),
-            category_comment=F("product_type__comment"),
-            price=F("selling_price"),  # <-- selected price for basket validation
-        )
+        .filter(archived=False)
+        .filter(limit_age__lte=user.age)
+        .annotate(order=F("product_type__order"))
+        .annotate(category=F("product_type__name"))
+        .annotate(category_comment=F("product_type__comment"))
+        .annotate(price=F("selling_price"))  # <-- selected price for basket validation
         .prefetch_related("buying_groups")  # <-- used in `Product.can_be_sold_to`
     )
     return [p for p in products if p.can_be_sold_to(user)]

eboutic/static/bundled/eboutic/eboutic-index.ts

@@ -21,7 +21,7 @@ document.addEventListener("alpine:init", () => {
       if (lastPurchaseTime !== null && localStorage.basketTimestamp !== undefined) {
         if (
           new Date(lastPurchaseTime) >=
-          new Date(Number.parseInt(localStorage.basketTimestamp, 10))
+          new Date(Number.parseInt(localStorage.basketTimestamp))
         ) {
           this.basket = [];
         }

eboutic/static/eboutic/css/eboutic.css

@@ -18,9 +18,7 @@
 #basket {
   min-width: 300px;
   border-radius: 8px;
-  box-shadow:
-    rgb(60 64 67 / 30%) 0 1px 3px 0,
-    rgb(60 64 67 / 15%) 0 4px 8px 3px;
+  box-shadow: rgb(60 64 67 / 30%) 0 1px 3px 0, rgb(60 64 67 / 15%) 0 4px 8px 3px;
   padding: 10px;
 }
 

eboutic/templates/eboutic/eboutic_checkout.jinja

@@ -77,14 +77,6 @@
           value="{% trans %}Pay with credit card{% endtrans %}"
         />
       </form>
-    {% else %}
-      <div class="alert alert-yellow">
-        {% trans trimmed %}
-          Credit card payments are currently disabled on the eboutic.
-          You may still refill your account in one of the AE counters.
-          Please excuse us for the inconvenience.
-        {% endtrans %}
-      </div>
     {% endif %}
     {% if basket.contains_refilling_item %}
       <p>{% trans %}AE account payment disabled because your basket contains refilling items.{% endtrans %}</p>

election/templates/election/election_detail.jinja

@@ -14,9 +14,9 @@
 
 {% block content %}
   <h3 class="election__title">{{ election.title }}</h3>
-  {% if not user.has_perm("core.view_user") %}
+  {% if user.is_anonymous %}
     <div class="alert alert-red">
-      {% trans %}Candidate pictures won't display for privacy reasons.{% endtrans %}
+      {% trans %}You are not logged in, candidate pictures won't display for privacy reasons.{% endtrans %}
     </div>
   {% endif %}
   <p class="election__description">{{ election.description }}</p>

election/tests.py

@@ -1,6 +1,7 @@
 from datetime import timedelta
 
 import pytest
+from pytest_django.asserts import assertRedirects
 from django.conf import settings
 from django.test import Client, TestCase
 from django.urls import reverse
@@ -51,7 +52,137 @@ class TestElectionUpdateView(TestElection):
         )
         assert response.status_code == 403
 
+class TestElectionForm(TestCase):
+    @classmethod
+    def setUpTestData(cls):
+        cls.election = baker.make(
+            Election, 
+            end_date = now() + timedelta(days=1),
+        )
+        cls.group = baker.make(Group)
+        cls.election.vote_groups.add(cls.group)
+        cls.election.edit_groups.add(cls.group)
+        lists = baker.make(ElectionList, election=cls.election, _quantity=2, _bulk_create=True)
+        cls.roles = baker.make(Role, election=cls.election, _quantity=2, _bulk_create=True)
+        users = baker.make(User, _quantity=4, _bulk_create=True)
+        cls.cand = [
+            baker.make(Candidature, role=cls.roles[0], user=users[0], election_list=lists[0]),
+            baker.make(Candidature, role=cls.roles[0], user=users[1], election_list=lists[1]),
+            baker.make(Candidature, role=cls.roles[1], user=users[2], election_list=lists[0]),
+            baker.make(Candidature, role=cls.roles[1], user=users[3], election_list=lists[1]),
+        ]
+        cls.url = reverse("election:vote", kwargs={"election_id": cls.election.id})
 
+    def test_election_good_form(self):
+        election = self.election
+        group = self.group
+        roles = self.roles
+        cand = self.cand
+    
+        votes = [
+            {
+                roles[0].title : "", 
+                roles[1].title : str(cand[2].id),
+                },
+
+            {
+                roles[0].title : "", 
+                roles[1].title : "",
+                },
+
+            {
+                roles[0].title : str(cand[0].id), 
+                roles[1].title : str(cand[2].id),
+                },
+
+            {
+                roles[0].title : str(cand[0].id), 
+                roles[1].title : str(cand[3].id),
+                },
+        ]
+
+        voters = subscriber_user.make(_quantity=len(votes), _bulk_create=True)
+        group.users.set(voters)
+        
+        for voter, vote in zip(voters, votes):
+            assert election.can_vote(voter)
+            self.client.force_login(voter)
+            response = self.client.post(self.url, data = vote)
+            assertRedirects(
+                response,
+                reverse("election:detail", kwargs={"election_id": election.id})
+            )
+        
+        assert set(election.voters.all()) == set(voters)
+        assert election.results == {
+            roles[0].title: {
+                cand[0].user.username: {"percent": 50.0, "vote": 2},
+                cand[1].user.username: {"percent": 0.0, "vote": 0},
+                "blank vote": {"percent": 50.0, "vote": 2},
+                "total vote": 4,
+            },
+            roles[1].title: {
+                cand[2].user.username: {"percent": 50.0, "vote": 2},
+                cand[3].user.username: {"percent": 25.0, "vote": 1},
+                "blank vote": {"percent": 25.0, "vote": 1},
+                "total vote": 4,
+            },
+        }
+
+    def test_election_bad_form(self):
+        election = self.election
+        group = self.group
+        roles = self.roles
+        cand = self.cand
+        unknow_user = baker.make(User, _quantity=1, _bulk_create=True)
+
+        votes = [
+            {
+                roles[0].title : "", 
+                roles[1].title : str(cand[0].id), #wrong candidate
+                },
+
+            {
+                roles[0].title : "",
+                },
+
+            {
+                roles[0].title : "0123456789", #unknow users
+                roles[1].title : str(unknow_user[0].id), #not a candidate
+                },
+
+            {
+                },
+        ]
+
+        voters = subscriber_user.make(_quantity=len(votes), _bulk_create=True)
+        group.users.set(voters)
+
+        for voter, vote in zip(voters, votes):
+            assert election.can_vote(voter)
+            self.client.force_login(voter)
+            response = self.client.post(self.url, data = vote)
+            assertRedirects(
+                response,
+                reverse("election:detail", kwargs={"election_id": election.id})
+            )
+
+        assert election.results == {
+            roles[0].title: {
+                cand[0].user.username: {"percent": 0.0, "vote": 0},
+                cand[1].user.username: {"percent": 0.0, "vote": 0},
+                "blank vote": {"percent": 100.0, "vote": 2},
+                "total vote": 2,
+            },
+            roles[1].title: {
+                cand[2].user.username: {"percent": 0.0, "vote": 0},
+                cand[3].user.username: {"percent": 0.0, "vote": 0},
+                "blank vote": {"percent": 100.0, "vote": 2},
+                "total vote": 2,
+            },
+        }
+    
+        
 @pytest.mark.django_db
 def test_election_create_list_permission(client: Client):
     election = baker.make(Election, end_candidature=now() + timedelta(hours=1))
@@ -114,4 +245,4 @@ def test_election_results():
             "blank vote": {"percent": 25.0, "vote": 25},
             "total vote": 100,
         },
-    }
+    }

galaxy/management/commands/generate_galaxy_test_data.py

@@ -25,12 +25,13 @@ import warnings
 from datetime import timedelta
 from typing import Final, Optional
 
+from django.conf import settings
 from django.core.files.base import ContentFile
 from django.core.management.base import BaseCommand
 from django.utils import timezone
 
 from club.models import Club, Membership
-from core.models import Group, Page, User
+from core.models import Group, Page, SithFile, User
 from core.utils import RED_PIXEL_PNG
 from sas.models import Album, PeoplePictureRelation, Picture
 from subscription.models import Subscription
@@ -90,8 +91,13 @@ class Command(BaseCommand):
         self.NB_CLUBS = options["club_count"]
 
         root = User.objects.filter(username="root").first()
+        sas = SithFile.objects.get(id=settings.SITH_SAS_ROOT_DIR_ID)
         self.galaxy_album = Album.objects.create(
-            name="galaxy-register-file", owner=root, is_moderated=True
+            name="galaxy-register-file",
+            owner=root,
+            is_moderated=True,
+            is_in_sas=True,
+            parent=sas,
         )
 
         self.make_clubs()
@@ -279,10 +285,14 @@ class Command(BaseCommand):
                     owner=u,
                     name=f"galaxy-picture {u} {i // self.NB_USERS}",
                     is_moderated=True,
+                    is_folder=False,
                     parent=self.galaxy_album,
-                    original=ContentFile(RED_PIXEL_PNG),
+                    is_in_sas=True,
+                    file=ContentFile(RED_PIXEL_PNG),
                     compressed=ContentFile(RED_PIXEL_PNG),
                     thumbnail=ContentFile(RED_PIXEL_PNG),
+                    mime_type="image/png",
+                    size=len(RED_PIXEL_PNG),
                 )
             )
             self.picts[i].file.name = self.picts[i].name

galaxy/static/bundled/galaxy/galaxy-index.js

@@ -1,6 +1,6 @@
 import { default as ForceGraph3D } from "3d-force-graph";
 import { forceX, forceY, forceZ } from "d3-force-3d";
-// biome-ignore lint/performance/noNamespaceImport: This is how it should be imported
+// biome-ignore lint/style/noNamespaceImport: This is how it should be imported
 import * as Three from "three";
 import SpriteText from "three-spritetext";
 

locale/fr/LC_MESSAGES/django.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-02-08 16:14+0100\n"
+"POT-Creation-Date: 2026-01-14 11:34+0100\n"
 "PO-Revision-Date: 2016-07-18\n"
 "Last-Translator: Maréchal <thomas.girod@utbm.fr\n"
 "Language-Team: AE info <ae.info@utbm.fr>\n"
@@ -16,767 +16,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: accounting/models.py club/models.py com/models.py counter/models.py
-#: forum/models.py launderette/models.py sas/models.py
-msgid "name"
-msgstr "nom"
-
-#: accounting/models.py
-msgid "street"
-msgstr "rue"
-
-#: accounting/models.py
-msgid "city"
-msgstr "ville"
-
-#: accounting/models.py
-msgid "postcode"
-msgstr "code postal"
-
-#: accounting/models.py
-msgid "country"
-msgstr "pays"
-
-#: accounting/models.py core/models.py
-msgid "phone"
-msgstr "téléphone"
-
-#: accounting/models.py
-msgid "email"
-msgstr "email"
-
-#: accounting/models.py
-msgid "website"
-msgstr "site internet"
-
-#: accounting/models.py
-msgid "company"
-msgstr "entreprise"
-
-#: accounting/models.py
-msgid "iban"
-msgstr "IBAN"
-
-#: accounting/models.py
-msgid "account number"
-msgstr "numéro de compte"
-
-#: accounting/models.py club/models.py com/models.py counter/models.py
-#: trombi/models.py
-msgid "club"
-msgstr "club"
-
-#: accounting/models.py
-msgid "Bank account"
-msgstr "Compte en banque"
-
-#: accounting/models.py
-msgid "bank account"
-msgstr "compte en banque"
-
-#: accounting/models.py
-msgid "Club account"
-msgstr "Compte club"
-
-#: accounting/models.py
-#, python-format
-msgid "%(club_account)s on %(bank_account)s"
-msgstr "%(club_account)s sur %(bank_account)s"
-
-#: accounting/models.py club/models.py counter/models.py election/models.py
-#: launderette/models.py
-msgid "start date"
-msgstr "date de début"
-
-#: accounting/models.py club/models.py counter/models.py election/models.py
-msgid "end date"
-msgstr "date de fin"
-
-#: accounting/models.py
-msgid "is closed"
-msgstr "est fermé"
-
-#: accounting/models.py
-msgid "club account"
-msgstr "compte club"
-
-#: accounting/models.py counter/models.py
-msgid "amount"
-msgstr "montant"
-
-#: accounting/models.py
-msgid "effective_amount"
-msgstr "montant effectif"
-
-#: accounting/models.py
-msgid "General journal"
-msgstr "Classeur"
-
-#: accounting/models.py
-msgid "number"
-msgstr "numéro"
-
-#: accounting/models.py
-msgid "journal"
-msgstr "classeur"
-
-#: accounting/models.py core/models.py counter/models.py eboutic/models.py
-#: forum/models.py
-msgid "date"
-msgstr "date"
-
-#: accounting/models.py counter/models.py pedagogy/models.py
-msgid "comment"
-msgstr "commentaire"
-
-#: accounting/models.py counter/models.py subscription/models.py
-msgid "payment method"
-msgstr "méthode de paiement"
-
-#: accounting/models.py
-msgid "cheque number"
-msgstr "numéro de chèque"
-
-#: accounting/models.py eboutic/models.py
-msgid "invoice"
-msgstr "facture"
-
-#: accounting/models.py
-msgid "is done"
-msgstr "est fait"
-
-#: accounting/models.py
-msgid "simple type"
-msgstr "type simplifié"
-
-#: accounting/models.py
-msgid "accounting type"
-msgstr "type comptable"
-
-#: accounting/models.py core/models.py counter/models.py
-msgid "label"
-msgstr "étiquette"
-
-#: accounting/models.py
-msgid "target type"
-msgstr "type de cible"
-
-#: accounting/models.py club/models.py club/templates/club/club_members.jinja
-#: club/templates/club/club_old_members.jinja club/templates/club/mailing.jinja
-#: counter/templates/counter/cash_summary_list.jinja
-#: counter/templates/counter/stats.jinja
-#: launderette/templates/launderette/launderette_admin.jinja
-msgid "User"
-msgstr "Utilisateur"
-
-#: accounting/models.py club/models.py club/templates/club/club_detail.jinja
-#: com/templates/com/mailing_admin.jinja
-#: com/templates/com/news_admin_list.jinja com/templates/com/weekmail.jinja
-#: core/templates/core/user_clubs.jinja
-#: counter/templates/counter/invoices_call.jinja
-#: trombi/templates/trombi/edit_profile.jinja
-#: trombi/templates/trombi/export.jinja
-#: trombi/templates/trombi/user_profile.jinja
-msgid "Club"
-msgstr "Club"
-
-#: accounting/models.py core/views/user.py
-msgid "Account"
-msgstr "Compte"
-
-#: accounting/models.py
-msgid "Company"
-msgstr "Entreprise"
-
-#: accounting/models.py core/models.py sith/settings.py
-msgid "Other"
-msgstr "Autre"
-
-#: accounting/models.py
-msgid "target id"
-msgstr "id de la cible"
-
-#: accounting/models.py
-msgid "target label"
-msgstr "nom de la cible"
-
-#: accounting/models.py
-msgid "linked operation"
-msgstr "opération liée"
-
-#: accounting/models.py
-msgid "The date must be set."
-msgstr "La date doit être indiquée."
-
-#: accounting/models.py
-#, python-format
-msgid ""
-"The date can not be before the start date of the journal, which is\n"
-"%(start_date)s."
-msgstr ""
-"La date ne peut pas être avant la date de début du journal, qui est\n"
-"%(start_date)s."
-
-#: accounting/models.py
-msgid "Target does not exists"
-msgstr "La cible n'existe pas."
-
-#: accounting/models.py
-msgid "Please add a target label if you set no existing target"
-msgstr ""
-"Merci d'ajouter un nom de cible si vous ne spécifiez pas de cible existante"
-
-#: accounting/models.py
-msgid ""
-"You need to provide ether a simplified accounting type or a standard "
-"accounting type"
-msgstr ""
-"Vous devez fournir soit un type comptable simplifié ou un type comptable "
-"standard"
-
-#: accounting/models.py counter/models.py pedagogy/models.py
-msgid "code"
-msgstr "code"
-
-#: accounting/models.py
-msgid "An accounting type code contains only numbers"
-msgstr "Un code comptable ne contient que des numéros"
-
-#: accounting/models.py
-msgid "movement type"
-msgstr "type de mouvement"
-
-#: accounting/models.py
-#: accounting/templates/accounting/journal_statement_nature.jinja
-#: accounting/templates/accounting/journal_statement_person.jinja
-#: accounting/views.py
-msgid "Credit"
-msgstr "Crédit"
-
-#: accounting/models.py
-#: accounting/templates/accounting/journal_statement_nature.jinja
-#: accounting/templates/accounting/journal_statement_person.jinja
-#: accounting/views.py
-msgid "Debit"
-msgstr "Débit"
-
-#: accounting/models.py
-msgid "Neutral"
-msgstr "Neutre"
-
-#: accounting/models.py
-msgid "simplified accounting types"
-msgstr "type simplifié"
-
-#: accounting/models.py
-msgid "simplified type"
-msgstr "type simplifié"
-
-#: accounting/templates/accounting/accountingtype_list.jinja
-msgid "Accounting type list"
-msgstr "Liste des types comptable"
-
-#: accounting/templates/accounting/accountingtype_list.jinja
-#: accounting/templates/accounting/bank_account_details.jinja
-#: accounting/templates/accounting/bank_account_list.jinja
-#: accounting/templates/accounting/club_account_details.jinja
-#: accounting/templates/accounting/journal_details.jinja
-#: accounting/templates/accounting/label_list.jinja
-#: accounting/templates/accounting/operation_edit.jinja
-#: accounting/templates/accounting/simplifiedaccountingtype_list.jinja
-#: core/templates/core/user_tools.jinja
-msgid "Accounting"
-msgstr "Comptabilité"
-
-#: accounting/templates/accounting/accountingtype_list.jinja
-msgid "Accounting types"
-msgstr "Type comptable"
-
-#: accounting/templates/accounting/accountingtype_list.jinja
-msgid "New accounting type"
-msgstr "Nouveau type comptable"
-
-#: accounting/templates/accounting/accountingtype_list.jinja
-#: accounting/templates/accounting/simplifiedaccountingtype_list.jinja
-msgid "There is no types in this website."
-msgstr "Il n'y a pas de types comptable dans ce site web."
-
-#: accounting/templates/accounting/bank_account_details.jinja
-#: core/templates/core/user_tools.jinja
-msgid "Bank account: "
-msgstr "Compte en banque : "
-
-#: accounting/templates/accounting/bank_account_details.jinja
-#: accounting/templates/accounting/club_account_details.jinja
-#: accounting/templates/accounting/label_list.jinja
-#: club/templates/club/club_sellings.jinja club/templates/club/mailing.jinja
-#: com/templates/com/macros.jinja com/templates/com/mailing_admin.jinja
-#: com/templates/com/news_admin_list.jinja com/templates/com/poster_edit.jinja
-#: com/templates/com/screen_edit.jinja com/templates/com/weekmail.jinja
-#: core/templates/core/file_detail.jinja
-#: core/templates/core/file_moderation.jinja
-#: core/templates/core/group_detail.jinja core/templates/core/group_list.jinja
-#: core/templates/core/macros.jinja core/templates/core/page_prop.jinja
-#: core/templates/core/user_account_detail.jinja
-#: core/templates/core/user_clubs.jinja core/templates/core/user_edit.jinja
-#: counter/templates/counter/fragments/create_student_card.jinja
-#: counter/templates/counter/last_ops.jinja
-#: election/templates/election/election_detail.jinja
-#: forum/templates/forum/macros.jinja
-#: launderette/templates/launderette/launderette_admin.jinja
-#: launderette/views.py pedagogy/templates/pedagogy/guide.jinja
-#: pedagogy/templates/pedagogy/uv_detail.jinja sas/templates/sas/album.jinja
-#: sas/templates/sas/moderation.jinja sas/templates/sas/picture.jinja
-#: trombi/templates/trombi/detail.jinja
-#: trombi/templates/trombi/edit_profile.jinja
-msgid "Delete"
-msgstr "Supprimer"
-
-#: accounting/templates/accounting/bank_account_details.jinja club/views.py
-#: core/views/user.py sas/templates/sas/picture.jinja
-msgid "Infos"
-msgstr "Infos"
-
-#: accounting/templates/accounting/bank_account_details.jinja
-msgid "IBAN: "
-msgstr "IBAN : "
-
-#: accounting/templates/accounting/bank_account_details.jinja
-msgid "Number: "
-msgstr "Numéro : "
-
-#: accounting/templates/accounting/bank_account_details.jinja
-msgid "New club account"
-msgstr "Nouveau compte club"
-
-#: accounting/templates/accounting/bank_account_details.jinja
-#: accounting/templates/accounting/bank_account_list.jinja
-#: accounting/templates/accounting/club_account_details.jinja
-#: accounting/templates/accounting/journal_details.jinja club/views.py
-#: com/templates/com/news_admin_list.jinja com/templates/com/poster_list.jinja
-#: com/templates/com/screen_list.jinja com/templates/com/weekmail.jinja
-#: core/templates/core/file.jinja core/templates/core/group_list.jinja
-#: core/templates/core/page.jinja core/templates/core/user_tools.jinja
-#: core/views/user.py counter/templates/counter/cash_summary_list.jinja
-#: counter/templates/counter/counter_list.jinja
-#: election/templates/election/election_detail.jinja
-#: forum/templates/forum/macros.jinja
-#: launderette/templates/launderette/launderette_list.jinja
-#: pedagogy/templates/pedagogy/guide.jinja
-#: pedagogy/templates/pedagogy/uv_detail.jinja sas/templates/sas/album.jinja
-#: trombi/templates/trombi/detail.jinja
-#: trombi/templates/trombi/edit_profile.jinja
-msgid "Edit"
-msgstr "Éditer"
-
-#: accounting/templates/accounting/bank_account_list.jinja
-msgid "Bank account list"
-msgstr "Liste des comptes en banque"
-
-#: accounting/templates/accounting/bank_account_list.jinja
-msgid "Manage simplified types"
-msgstr "Gérer les types simplifiés"
-
-#: accounting/templates/accounting/bank_account_list.jinja
-msgid "Manage accounting types"
-msgstr "Gérer les types comptable"
-
-#: accounting/templates/accounting/bank_account_list.jinja
-msgid "New bank account"
-msgstr "Nouveau compte en banque"
-
-#: accounting/templates/accounting/bank_account_list.jinja
-msgid "There is no accounts in this website."
-msgstr "Il n'y a pas de comptes dans ce site web."
-
-#: accounting/templates/accounting/club_account_details.jinja
-msgid "Club account:"
-msgstr "Compte club : "
-
-#: accounting/templates/accounting/club_account_details.jinja
-#: accounting/templates/accounting/journal_details.jinja
-#: accounting/templates/accounting/label_list.jinja
-msgid "New label"
-msgstr "Nouvelle étiquette"
-
-#: accounting/templates/accounting/club_account_details.jinja
-#: accounting/templates/accounting/journal_details.jinja
-#: accounting/templates/accounting/label_list.jinja
-msgid "Label list"
-msgstr "Liste des étiquettes"
-
-#: accounting/templates/accounting/club_account_details.jinja
-msgid "New journal"
-msgstr "Nouveau classeur"
-
-#: accounting/templates/accounting/club_account_details.jinja
-msgid "You can not create new journal while you still have one opened"
-msgstr "Vous ne pouvez pas créer de journal tant qu'il y en a un d'ouvert"
-
-#: accounting/templates/accounting/club_account_details.jinja
-#: launderette/templates/launderette/launderette_admin.jinja
-msgid "Name"
-msgstr "Nom"
-
-#: accounting/templates/accounting/club_account_details.jinja
-#: com/templates/com/news_admin_list.jinja
-msgid "Start"
-msgstr "Début"
-
-#: accounting/templates/accounting/club_account_details.jinja
-#: com/templates/com/news_admin_list.jinja
-msgid "End"
-msgstr "Fin"
-
-#: accounting/templates/accounting/club_account_details.jinja
-#: accounting/templates/accounting/journal_details.jinja
-#: core/templates/core/user_account_detail.jinja
-#: counter/templates/counter/last_ops.jinja
-#: counter/templates/counter/refilling_list.jinja
-msgid "Amount"
-msgstr "Montant"
-
-#: accounting/templates/accounting/club_account_details.jinja
-msgid "Effective amount"
-msgstr "Montant effectif"
-
-#: accounting/templates/accounting/club_account_details.jinja sith/settings.py
-msgid "Closed"
-msgstr "Fermé"
-
-#: accounting/templates/accounting/club_account_details.jinja
-#: accounting/templates/accounting/journal_details.jinja
-#: com/templates/com/mailing_admin.jinja
-#: com/templates/com/news_admin_list.jinja com/templates/com/weekmail.jinja
-#: counter/templates/counter/refilling_list.jinja
-msgid "Actions"
-msgstr "Actions"
-
-#: accounting/templates/accounting/club_account_details.jinja
-#: accounting/templates/accounting/journal_details.jinja
-msgid "Yes"
-msgstr "Oui"
-
-#: accounting/templates/accounting/club_account_details.jinja
-#: accounting/templates/accounting/journal_details.jinja
-msgid "No"
-msgstr "Non"
-
-#: accounting/templates/accounting/club_account_details.jinja
-#: com/templates/com/news_admin_list.jinja core/templates/core/file.jinja
-#: core/templates/core/page.jinja
-msgid "View"
-msgstr "Voir"
-
-#: accounting/templates/accounting/co_list.jinja
-#: accounting/templates/accounting/journal_details.jinja
-#: core/templates/core/user_tools.jinja
-msgid "Company list"
-msgstr "Liste des entreprises"
-
-#: accounting/templates/accounting/co_list.jinja
-msgid "Create new company"
-msgstr "Nouvelle entreprise"
-
-#: accounting/templates/accounting/co_list.jinja
-msgid "Companies"
-msgstr "Entreprises"
-
-#: accounting/templates/accounting/journal_details.jinja
-#: accounting/templates/accounting/journal_statement_accounting.jinja
-#: accounting/templates/accounting/journal_statement_nature.jinja
-#: accounting/templates/accounting/journal_statement_person.jinja
-msgid "General journal:"
-msgstr "Classeur : "
-
-#: accounting/templates/accounting/journal_details.jinja
-#: accounting/templates/accounting/journal_statement_accounting.jinja
-#: core/templates/core/user_account.jinja
-#: core/templates/core/user_account_detail.jinja
-#: counter/templates/counter/counter_click.jinja
-msgid "Amount: "
-msgstr "Montant : "
-
-#: accounting/templates/accounting/journal_details.jinja
-#: accounting/templates/accounting/journal_statement_accounting.jinja
-msgid "Effective amount: "
-msgstr "Montant effectif: "
-
-#: accounting/templates/accounting/journal_details.jinja
-msgid "Journal is closed, you can not create operation"
-msgstr "Le classeur est fermé, vous ne pouvez pas créer d'opération"
-
-#: accounting/templates/accounting/journal_details.jinja
-msgid "New operation"
-msgstr "Nouvelle opération"
-
-#: accounting/templates/accounting/journal_details.jinja
-msgid "Nb"
-msgstr "No"
-
-#: accounting/templates/accounting/journal_details.jinja
-#: club/templates/club/club_sellings.jinja
-#: core/templates/core/user_account_detail.jinja
-#: counter/templates/counter/cash_summary_list.jinja
-#: counter/templates/counter/last_ops.jinja
-#: counter/templates/counter/refilling_list.jinja
-#: rootplace/templates/rootplace/logs.jinja sas/forms.py
-#: trombi/templates/trombi/user_profile.jinja
-msgid "Date"
-msgstr "Date"
-
-#: accounting/templates/accounting/journal_details.jinja
-#: club/templates/club/club_sellings.jinja
-#: core/templates/core/user_account_detail.jinja
-#: counter/templates/counter/last_ops.jinja
-#: rootplace/templates/rootplace/logs.jinja
-msgid "Label"
-msgstr "Étiquette"
-
-#: accounting/templates/accounting/journal_details.jinja
-msgid "Payment mode"
-msgstr "Méthode de paiement"
-
-#: accounting/templates/accounting/journal_details.jinja
-msgid "Target"
-msgstr "Cible"
-
-#: accounting/templates/accounting/journal_details.jinja
-msgid "Code"
-msgstr "Code"
-
-#: accounting/templates/accounting/journal_details.jinja
-msgid "Nature"
-msgstr "Nature"
-
-#: accounting/templates/accounting/journal_details.jinja
-msgid "Done"
-msgstr "Effectuées"
-
-#: accounting/templates/accounting/journal_details.jinja
-#: counter/templates/counter/cash_summary_list.jinja counter/views/cash.py
-#: pedagogy/templates/pedagogy/moderation.jinja
-#: pedagogy/templates/pedagogy/uv_detail.jinja
-#: trombi/templates/trombi/comment.jinja
-#: trombi/templates/trombi/user_tools.jinja
-msgid "Comment"
-msgstr "Commentaire"
-
-#: accounting/templates/accounting/journal_details.jinja
-msgid "File"
-msgstr "Fichier"
-
-#: accounting/templates/accounting/journal_details.jinja
-msgid "PDF"
-msgstr "PDF"
-
-#: accounting/templates/accounting/journal_details.jinja
-msgid ""
-"Warning: this operation has no linked operation because the targeted club "
-"account has no opened journal."
-msgstr ""
-"Attention: cette opération n'a pas d'opération liée parce qu'il n'y a pas de "
-"classeur ouvert dans le compte club cible"
-
-#: accounting/templates/accounting/journal_details.jinja
-#, python-format
-msgid ""
-"Open a journal in <a href=\"%(url)s\">this club account</a>, then save this "
-"operation again to make the linked operation."
-msgstr ""
-"Ouvrez un classeur dans <a href=\"%(url)s\">ce compte club</a>, puis sauver "
-"cette opération à nouveau pour créer l'opération liée."
-
-#: accounting/templates/accounting/journal_details.jinja
-msgid "Generate"
-msgstr "Générer"
-
-#: accounting/templates/accounting/journal_statement_accounting.jinja
-msgid "Accounting statement: "
-msgstr "Bilan comptable : "
-
-#: accounting/templates/accounting/journal_statement_accounting.jinja
-#: rootplace/templates/rootplace/logs.jinja
-msgid "Operation type"
-msgstr "Type d'opération"
-
-#: accounting/templates/accounting/journal_statement_accounting.jinja
-#: accounting/templates/accounting/journal_statement_nature.jinja
-#: accounting/templates/accounting/journal_statement_person.jinja
-#: counter/templates/counter/invoices_call.jinja
-msgid "Sum"
-msgstr "Somme"
-
-#: accounting/templates/accounting/journal_statement_nature.jinja
-msgid "Nature of operation"
-msgstr "Nature de l'opération"
-
-#: accounting/templates/accounting/journal_statement_nature.jinja
-#: club/templates/club/club_sellings.jinja
-#: counter/templates/counter/counter_main.jinja
-msgid "Total: "
-msgstr "Total : "
-
-#: accounting/templates/accounting/journal_statement_nature.jinja
-msgid "Statement by nature: "
-msgstr "Bilan par nature : "
-
-#: accounting/templates/accounting/journal_statement_person.jinja
-msgid "Statement by person: "
-msgstr "Bilan par personne : "
-
-#: accounting/templates/accounting/journal_statement_person.jinja
-msgid "Target of the operation"
-msgstr "Cible de l'opération"
-
-#: accounting/templates/accounting/label_list.jinja
-msgid "Back to club account"
-msgstr "Retour au compte club"
-
-#: accounting/templates/accounting/label_list.jinja
-msgid "There is no label in this club account."
-msgstr "Il n'y a pas d'étiquette dans ce compte club."
-
-#: accounting/templates/accounting/operation_edit.jinja
-msgid "Edit operation"
-msgstr "Éditer l'opération"
-
-#: accounting/templates/accounting/operation_edit.jinja
-msgid ""
-"Warning: if you select <em>Account</em>, the opposite operation will be "
-"created in the target account. If you don't want that, select <em>Club</em> "
-"instead of <em>Account</em>."
-msgstr ""
-"Attention : si vous sélectionnez <em>Compte</em>, l'opération inverse sera "
-"créée dans le compte cible. Si vous ne le voulez pas, sélectionnez <em>Club</"
-"em> à la place de <em>Compte</em>."
-
-#: accounting/templates/accounting/operation_edit.jinja
-msgid "Linked operation:"
-msgstr "Opération liée : "
-
-#: accounting/templates/accounting/operation_edit.jinja
-#: com/templates/com/news_edit.jinja com/templates/com/poster_edit.jinja
-#: com/templates/com/screen_edit.jinja com/templates/com/weekmail.jinja
-#: core/templates/core/create.jinja core/templates/core/edit.jinja
-#: core/templates/core/file_edit.jinja core/templates/core/macros_pages.jinja
-#: core/templates/core/page_prop.jinja
-#: core/templates/core/user_godfathers.jinja
-#: core/templates/core/user_godfathers_tree.jinja
-#: core/templates/core/user_preferences.jinja
-#: counter/templates/counter/cash_register_summary.jinja
-#: forum/templates/forum/reply.jinja
-#: subscription/templates/subscription/fragments/creation_form.jinja
-#: trombi/templates/trombi/comment.jinja
-#: trombi/templates/trombi/edit_profile.jinja
-#: trombi/templates/trombi/user_tools.jinja
-msgid "Save"
-msgstr "Sauver"
-
-#: accounting/templates/accounting/refound_account.jinja accounting/views.py
-msgid "Refound account"
-msgstr "Remboursement de compte"
-
-#: accounting/templates/accounting/refound_account.jinja
-msgid "Refound"
-msgstr "Rembourser"
-
-#: accounting/templates/accounting/simplifiedaccountingtype_list.jinja
-msgid "Simplified type list"
-msgstr "Liste des types simplifiés"
-
-#: accounting/templates/accounting/simplifiedaccountingtype_list.jinja
-msgid "Simplified types"
-msgstr "Types simplifiés"
-
-#: accounting/templates/accounting/simplifiedaccountingtype_list.jinja
-msgid "New simplified type"
-msgstr "Nouveau type simplifié"
-
-#: accounting/views.py
-msgid "Journal"
-msgstr "Classeur"
-
-#: accounting/views.py
-msgid "Statement by nature"
-msgstr "Bilan par nature"
-
-#: accounting/views.py
-msgid "Statement by person"
-msgstr "Bilan par personne"
-
-#: accounting/views.py
-msgid "Accounting statement"
-msgstr "Bilan comptable"
-
-#: accounting/views.py
-msgid "Link this operation to the target account"
-msgstr "Lier cette opération au compte cible"
-
-#: accounting/views.py
-msgid "The target must be set."
-msgstr "La cible doit être indiquée."
-
-#: accounting/views.py
-msgid "The amount must be set."
-msgstr "Le montant doit être indiqué."
-
-#: accounting/views.py
-msgid "Operation"
-msgstr "Opération"
-
-#: accounting/views.py
-msgid "Financial proof: "
-msgstr "Justificatif de libellé : "
-
-#: accounting/views.py
-#, python-format
-msgid "Club: %(club_name)s"
-msgstr "Club : %(club_name)s"
-
-#: accounting/views.py
-#, python-format
-msgid "Label: %(op_label)s"
-msgstr "Libellé : %(op_label)s"
-
-#: accounting/views.py
-#, python-format
-msgid "Date: %(date)s"
-msgstr "Date : %(date)s"
-
-#: accounting/views.py
-#, python-format
-msgid "Amount: %(amount).2f €"
-msgstr "Montant : %(amount).2f €"
-
-#: accounting/views.py
-msgid "Debtor"
-msgstr "Débiteur"
-
-#: accounting/views.py
-msgid "Creditor"
-msgstr "Créditeur"
-
-#: accounting/views.py
-msgid "Comment:"
-msgstr "Commentaire :"
-
-#: accounting/views.py
-msgid "Signature:"
-msgstr "Signature :"
-
-#: accounting/views.py
-msgid "General statement"
-msgstr "Bilan général"
-
-#: accounting/views.py
-msgid "No label operations"
-msgstr "Opérations sans étiquette"
-
-#: accounting/views.py
-msgid "Refound this account"
-msgstr "Rembourser ce compte"
-
 #: antispam/forms.py
 msgid "Email domain is not allowed."
 msgstr "Le domaine de l'addresse e-mail n'est pas autorisé."
@@ -1027,7 +266,7 @@ msgid "Enter a valid address. Only the root of the address is needed."
 msgstr ""
 "Entrez une adresse valide. Seule la racine de l'adresse est nécessaire."
 
-#: club/models.py com/models.py core/models.py sas/models.py
+#: club/models.py com/models.py core/models.py
 msgid "is moderated"
 msgstr "est modéré"
 
@@ -2372,11 +1611,11 @@ msgstr "avoir une notification pour chaque click"
 msgid "get a notification for every refilling"
 msgstr "avoir une notification pour chaque rechargement"
 
-#: core/models.py sas/models.py
+#: core/models.py sas/forms.py
 msgid "file name"
 msgstr "nom du fichier"
 
-#: core/models.py sas/models.py
+#: core/models.py
 msgid "parent"
 msgstr "parent"
 
@@ -2384,14 +1623,10 @@ msgstr "parent"
 msgid "compressed file"
 msgstr "version allégée"
 
-#: core/models.py sas/models.py
+#: core/models.py
 msgid "thumbnail"
 msgstr "miniature"
 
-#: core/models.py sas/models.py
-msgid "owner"
-msgstr "propriétaire"
-
 #: core/models.py
 msgid "edit group"
 msgstr "groupe d'édition"
@@ -2420,6 +1655,10 @@ msgstr "date"
 msgid "asked for removal"
 msgstr "retrait demandé"
 
+#: core/models.py
+msgid "is in the SAS"
+msgstr "est dans le SAS"
+
 #: core/models.py
 msgid "Character '/' not authorized in name"
 msgstr "Le caractère '/' n'est pas autorisé dans les noms de fichier"
@@ -3995,7 +3234,7 @@ msgstr "élément de relevé de caisse"
 msgid "banner"
 msgstr "bannière"
 
-#: counter/models.py sas/models.py
+#: counter/models.py
 msgid "event date"
 msgstr "date de l'événement"
 
@@ -4705,16 +3944,6 @@ msgstr "Solde restant : "
 msgid "Pay with credit card"
 msgstr "Payer avec une carte bancaire"
 
-#: eboutic/templates/eboutic/eboutic_checkout.jinja
-msgid ""
-"Credit card payments are currently disabled on the eboutic. You may still "
-"refill your account in one of the AE counters. Please excuse us for the "
-"inconvenience."
-msgstr ""
-"Les paiements par carte bancaire sont actuellement désactivés sur l'eboutic. "
-"Vous pouvez cependant toujours recharger votre compte dans un des lieux de vie de l'AE. "
-"Veuillez nous excuser pour le désagrément."
-
 #: eboutic/templates/eboutic/eboutic_checkout.jinja
 msgid ""
 "AE account payment disabled because your basket contains refilling items."
@@ -4834,11 +4063,11 @@ msgstr "début des candidatures"
 msgid "end candidature"
 msgstr "fin des candidatures"
 
-#: election/models.py sas/models.py
+#: election/models.py
 msgid "edit groups"
 msgstr "groupe d'édition"
 
-#: election/models.py sas/models.py
+#: election/models.py
 msgid "view groups"
 msgstr "groupe de vue"
 
@@ -4880,10 +4109,9 @@ msgid "Candidature are closed for this election"
 msgstr "Les candidatures sont fermées pour cette élection"
 
 #: election/templates/election/election_detail.jinja
-msgid "Candidate pictures won't display for privacy reasons."
-msgstr ""
-"La photo du candidat ne s'affiche pas pour "
-"des raisons de respect de la vie privée."
+msgid ""
+"You are not logged in, candidate pictures won't display for privacy reasons."
+msgstr "Vous n'êtes pas connecté, les photos des candidats ne s'afficheront pas pour des raisons de respect de la vie privée."
 
 #: election/templates/election/election_detail.jinja
 msgid "Polls close "
@@ -5528,22 +4756,6 @@ msgstr "Envoyer les images"
 msgid "You already requested moderation for this picture."
 msgstr "Vous avez déjà déposé une demande de retrait pour cette photo."
 
-#: sas/models.py
-msgid "The date on which the photos in this album were taken"
-msgstr "La date à laquelle les photos de cet album ont été prises"
-
-#: sas/models.py
-msgid "album"
-msgstr "album"
-
-#: sas/models.py
-msgid "original image"
-msgstr "image originale"
-
-#: sas/models.py
-msgid "compressed image"
-msgstr "version compressée"
-
 #: sas/models.py
 msgid "picture"
 msgstr "photo"

openapi-ts.config.ts

@@ -12,7 +12,7 @@ export default defineConfig({
     {
       name: "@hey-api/client-fetch",
       baseUrl: false,
-      runtimeConfigPath: resolve(__dirname, "./openapi-csrf.ts"),
+      runtimeConfigPath: "./openapi-csrf.ts",
       exportFromIndex: true,
     },
   ],

package.json

@@ -15,9 +15,7 @@
   "keywords": [],
   "author": "",
   "license": "GPL-3.0-only",
-  "sideEffects": [
-    ".css"
-  ],
+  "sideEffects": [".css"],
   "imports": {
     "#openapi": "./staticfiles/generated/openapi/client/index.ts",
     "#core:*": "./core/static/bundled/*",
@@ -26,33 +24,33 @@
     "#com:*": "./com/static/bundled/*"
   },
   "devDependencies": {
-    "@babel/core": "^7.29.0",
-    "@babel/preset-env": "^7.29.0",
-    "@biomejs/biome": "^2.3.14",
-    "@hey-api/openapi-ts": "^0.92.4",
+    "@babel/core": "^7.28.5",
+    "@babel/preset-env": "^7.28.5",
+    "@biomejs/biome": "^1.9.4",
+    "@hey-api/openapi-ts": "^0.73.0",
     "@rollup/plugin-inject": "^5.0.5",
     "@types/alpinejs": "^3.13.11",
     "@types/cytoscape-cxtmenu": "^3.4.5",
     "@types/cytoscape-klay": "^3.1.5",
     "@types/js-cookie": "^3.0.6",
     "typescript": "^5.9.3",
-    "vite": "^7.3.1",
+    "vite": "^6.4.1",
     "vite-bundle-visualizer": "^1.2.1",
-    "vite-plugin-static-copy": "^3.2.0"
+    "vite-plugin-static-copy": "^3.1.4"
   },
   "dependencies": {
-    "@alpinejs/sort": "^3.15.8",
+    "@alpinejs/sort": "^3.15.1",
     "@arendjr/text-clipper": "npm:@jsr/arendjr__text-clipper@^3.0.0",
-    "@floating-ui/dom": "^1.7.5",
-    "@fortawesome/fontawesome-free": "^7.2.0",
-    "@fullcalendar/core": "^6.1.20",
-    "@fullcalendar/daygrid": "^6.1.20",
-    "@fullcalendar/icalendar": "^6.1.20",
-    "@fullcalendar/list": "^6.1.20",
-    "@sentry/browser": "^10.38.0",
-    "@zip.js/zip.js": "^2.8.20",
-    "3d-force-graph": "^1.79.1",
-    "alpinejs": "^3.15.8",
+    "@floating-ui/dom": "^1.7.4",
+    "@fortawesome/fontawesome-free": "^6.7.2",
+    "@fullcalendar/core": "^6.1.19",
+    "@fullcalendar/daygrid": "^6.1.19",
+    "@fullcalendar/icalendar": "^6.1.19",
+    "@fullcalendar/list": "^6.1.19",
+    "@sentry/browser": "^9.46.0",
+    "@zip.js/zip.js": "^2.8.9",
+    "3d-force-graph": "^1.79.0",
+    "alpinejs": "^3.15.1",
     "chart.js": "^4.5.1",
     "country-flag-emoji-polyfill": "^0.1.8",
     "cytoscape": "^3.33.1",
@@ -60,14 +58,14 @@
     "cytoscape-klay": "^3.1.4",
     "d3-force-3d": "^3.0.6",
     "easymde": "^2.20.0",
-    "glob": "^13.0.2",
+    "glob": "^11.0.3",
     "html2canvas": "^1.4.1",
     "htmx.org": "^2.0.8",
     "js-cookie": "^3.0.5",
-    "lit-html": "^3.3.2",
+    "lit-html": "^3.3.1",
     "native-file-system-adapter": "^3.0.1",
-    "three": "^0.182.0",
+    "three": "^0.177.0",
     "three-spritetext": "^1.10.0",
-    "tom-select": "^2.5.1"
+    "tom-select": "^2.4.3"
   }
 }

pedagogy/static/bundled/pedagogy/guide-index.js

@@ -1,8 +1,4 @@
-import {
-  getCurrentUrlParams,
-  History,
-  updateQueryString,
-} from "#core:utils/history.ts";
+import { History, getCurrentUrlParams, updateQueryString } from "#core:utils/history";
 import { ueFetchUeList } from "#openapi";
 
 const pageDefault = 1;
@@ -35,8 +31,8 @@ document.addEventListener("alpine:init", () => {
       const url = getCurrentUrlParams();
       this.pushstate = History.Replace;
 
-      this.page = Number.parseInt(url.get("page"), 10) || pageDefault;
-      this.page_size = Number.parseInt(url.get("page_size"), 10) || pageSizeDefault;
+      this.page = Number.parseInt(url.get("page")) || pageDefault;
+      this.page_size = Number.parseInt(url.get("page_size")) || pageSizeDefault;
       this.search = url.get("search") || "";
       this.department = url.getAll("department");
       this.credit_type = url.getAll("credit_type");

pyproject.toml

@@ -19,37 +19,37 @@ authors = [
 license = { text = "GPL-3.0-only" }
 requires-python = "<4.0,>=3.12"
 dependencies = [
-    "django>=5.2.11,<6.0.0",
-    "django-ninja>=1.5.3,<6.0.0",
-    "django-ninja-extra>=0.31.0",
-    "Pillow>=12.1.1,<13.0.0",
-    "mistune>=3.2.0,<4.0.0",
+    "django>=5.2.8,<6.0.0",
+    "django-ninja>=1.5.0,<6.0.0",
+    "django-ninja-extra>=0.30.6",
+    "Pillow>=12.0.0,<13.0.0",
+    "mistune>=3.1.4,<4.0.0",
     "django-jinja<3.0.0,>=2.11.0",
-    "cryptography>=46.0.5,<47.0.0",
-    "django-phonenumber-field>=8.4.0,<9.0.0",
-    "phonenumbers>=9.0.23,<10.0.0",
-    "reportlab>=4.4.9,<5.0.0",
+    "cryptography>=46.0.3,<47.0.0",
+    "django-phonenumber-field>=8.3.0,<9.0.0",
+    "phonenumbers>=9.0.18,<10.0.0",
+    "reportlab>=4.4.4,<5.0.0",
     "django-haystack<4.0.0,>=3.3.0",
     "xapian-haystack<4.0.0,>=3.1.0",
     "libsass<1.0.0,>=0.23.0",
     "django-ordered-model<4.0.0,>=3.7.4",
-    "django-simple-captcha<1.0.0,>=0.6.3",
+    "django-simple-captcha<1.0.0,>=0.6.2",
     "python-dateutil<3.0.0.0,>=2.9.0.post0",
-    "sentry-sdk>=2.52.0,<3.0.0",
+    "sentry-sdk>=2.43.0,<3.0.0",
     "jinja2<4.0.0,>=3.1.6",
-    "django-countries>=8.2.0,<9.0.0",
-    "dict2xml>=1.7.8,<2.0.0",
+    "django-countries>=8.0.0,<9.0.0",
+    "dict2xml>=1.7.7,<2.0.0",
     "Sphinx<6,>=5",
-    "tomli>=2.4.0,<3.0.0",
+    "tomli>=2.3.0,<3.0.0",
     "django-honeypot>=1.3.0,<2",
-    "pydantic-extra-types>=2.11.0,<3.0.0",
+    "pydantic-extra-types>=2.10.6,<3.0.0",
     "ical>=11.1.0,<12",
-    "redis[hiredis]>=5.3.0,<8.0.0",
+    "redis[hiredis]<7,>=5.3.0",
     "environs[django]>=14.5.0,<15.0.0",
     "requests>=2.32.5,<3.0.0",
     "honcho>=2.0.0",
-    "psutil>=7.2.2,<8.0.0",
-    "celery[redis]>=5.6.2,<7",
+    "psutil>=7.1.3,<8.0.0",
+    "celery[redis]>=5.5.2",
     "django-celery-results>=2.5.1",
     "django-celery-beat>=2.7.0",
 ]
@@ -60,32 +60,32 @@ documentation = "https://sith-ae.readthedocs.io/"
 
 [dependency-groups]
 prod = [
-    "psycopg[c]>=3.3.2,<4.0.0",
+    "psycopg[c]>=3.2.12,<4.0.0",
 ]
 dev = [
-    "django-debug-toolbar>=6.2.0,<7",
-    "ipython>=9.10.0,<10.0.0",
-    "pre-commit>=4.5.1,<5.0.0",
-    "ruff>=0.15.0,<1.0.0",
+    "django-debug-toolbar>=6.1.0,<7",
+    "ipython>=9.7.0,<10.0.0",
+    "pre-commit>=4.3.0,<5.0.0",
+    "ruff>=0.14.4,<1.0.0",
     "djhtml>=3.0.10,<4.0.0",
-    "faker>=40.4.0,<41.0.0",
+    "faker>=37.12.0,<38.0.0",
     "rjsmin>=1.2.5,<2.0.0",
 ]
 tests = [
     "freezegun>=1.5.5,<2.0.0",
-    "pytest>=9.0.2,<10.0.0",
+    "pytest>=8.4.2,<9.0.0",
     "pytest-cov>=7.0.0,<8.0.0",
     "pytest-django<5.0.0,>=4.10.0",
-    "model-bakery<2.0.0,>=1.23.2",
-    "beautifulsoup4>=4.14.3,<5",
+    "model-bakery<2.0.0,>=1.20.4",
+    "beautifulsoup4>=4.14.2,<5",
     "lxml>=6.0.2,<7",
 ]
 docs = [
     "mkdocs<2.0.0,>=1.6.1",
-    "mkdocs-material>=9.7.1,<10.0.0",
-    "mkdocstrings>=1.0.3,<2.0.0",
-    "mkdocstrings-python>=2.0.2,<3.0.0",
-    "mkdocs-include-markdown-plugin>=7.2.1,<8.0.0",
+    "mkdocs-material>=9.6.23,<10.0.0",
+    "mkdocstrings>=0.30.1,<1.0.0",
+    "mkdocstrings-python>=1.18.2,<2.0.0",
+    "mkdocs-include-markdown-plugin>=7.2.0,<8.0.0",
 ]
 
 [tool.uv]
@@ -141,4 +141,4 @@ sith = "sith.pytest"
 [tool.pytest.ini_options]
 DJANGO_SETTINGS_MODULE = "sith.settings"
 python_files = ["tests.py", "test_*.py", "*_tests.py"]
-markers = ["slow"]
+markers = ["slow"]

sas/admin.py

@@ -20,9 +20,9 @@ from sas.models import Album, PeoplePictureRelation, Picture, PictureModerationR
 
 @admin.register(Picture)
 class PictureAdmin(admin.ModelAdmin):
-    list_display = ("name", "parent", "is_moderated")
+    list_display = ("name", "parent", "date", "size", "is_moderated")
     search_fields = ("name",)
-    autocomplete_fields = ("owner", "parent", "moderator")
+    autocomplete_fields = ("owner", "parent", "edit_groups", "view_groups", "moderator")
 
 
 @admin.register(PeoplePictureRelation)
@@ -33,9 +33,9 @@ class PeoplePictureRelationAdmin(admin.ModelAdmin):
 
 @admin.register(Album)
 class AlbumAdmin(admin.ModelAdmin):
-    list_display = ("name", "parent")
+    list_display = ("name", "parent", "date", "owner", "is_moderated")
     search_fields = ("name",)
-    autocomplete_fields = ("parent", "edit_groups", "view_groups")
+    autocomplete_fields = ("owner", "parent", "edit_groups", "view_groups")
 
 
 @admin.register(PictureModerationRequest)

sas/api.py

@@ -2,10 +2,8 @@ from typing import Any, Literal
 
 from django.conf import settings
 from django.core.exceptions import ValidationError
-from django.shortcuts import get_list_or_404
 from django.urls import reverse
-from ninja import Body, Query, UploadedFile
-from ninja.errors import HttpError
+from ninja import Body, File, Query
 from ninja.security import SessionAuth
 from ninja_extra import ControllerBase, api_controller, paginate, route
 from ninja_extra.exceptions import NotFound, PermissionDenied
@@ -18,12 +16,11 @@ from api.permissions import (
     CanAccessLookup,
     CanEdit,
     CanView,
-    HasPerm,
     IsInGroup,
     IsRoot,
 )
 from core.models import Notification, User
-from core.utils import get_list_exact_or_404
+from core.schemas import UploadedImage
 from sas.models import Album, PeoplePictureRelation, Picture
 from sas.schemas import (
     AlbumAutocompleteSchema,
@@ -31,7 +28,6 @@ from sas.schemas import (
     AlbumSchema,
     IdentifiedUserSchema,
     ModerationRequestSchema,
-    MoveAlbumSchema,
     PictureFilterSchema,
     PictureSchema,
 )
@@ -73,48 +69,6 @@ class AlbumController(ControllerBase):
             Album.objects.viewable_by(self.context.request.user).order_by("-date")
         )
 
-    @route.patch("/parent", permissions=[IsAuthenticated])
-    def change_album_parent(self, payload: list[MoveAlbumSchema]):
-        """Change parents of albums
-
-        Note:
-            For this operation to work, the user must be authorized
-            to edit both the moved albums and their new parent.
-        """
-        user: User = self.context.request.user
-        albums: list[Album] = get_list_exact_or_404(
-            Album, pk__in={a.id for a in payload}
-        )
-        if not user.has_perm("sas.change_album"):
-            unauthorized = [a.id for a in albums if not user.can_edit(a)]
-            raise PermissionDenied(
-                f"You can't move the following albums : {unauthorized}"
-            )
-        parents: list[Album] = get_list_exact_or_404(
-            Album, pk__in={a.new_parent_id for a in payload}
-        )
-        if not user.has_perm("sas.change_album"):
-            unauthorized = [a.id for a in parents if not user.can_edit(a)]
-            raise PermissionDenied(
-                f"You can't move to the following albums : {unauthorized}"
-            )
-        id_to_new_parent = {i.id: i.new_parent_id for i in payload}
-        for album in albums:
-            album.parent_id = id_to_new_parent[album.id]
-        # known caveat : moving an album won't move it's thumbnail.
-        # E.g. if the album foo/bar is moved to foo/baz,
-        # the thumbnail will still be foo/bar/thumb.webp
-        # This has no impact for the end user
-        # and doing otherwise would be hard for us to implement,
-        # because we would then have to manage rollbacks on fail.
-        Album.objects.bulk_update(albums, fields=["parent_id"])
-
-    @route.delete("", permissions=[HasPerm("sas.delete_album")])
-    def delete_album(self, album_ids: list[int]):
-        # known caveat : deleting an album doesn't delete the pictures on the disk.
-        # It's a db only operation.
-        albums: list[Album] = get_list_or_404(Album, pk__in=album_ids)
-
 
 @api_controller("/sas/picture")
 class PicturesController(ControllerBase):
@@ -142,7 +96,7 @@ class PicturesController(ControllerBase):
         return (
             filters.filter(Picture.objects.viewable_by(user))
             .distinct()
-            .order_by("-parent__event_date", "created_at")
+            .order_by("-parent__date", "date")
             .select_related("owner", "parent")
         )
 
@@ -156,25 +110,27 @@ class PicturesController(ControllerBase):
         },
         url_name="upload_picture",
     )
-    def upload_picture(self, album_id: Body[int], picture: UploadedFile):
+    def upload_picture(self, album_id: Body[int], picture: File[UploadedImage]):
         album = self.get_object_or_exception(Album, pk=album_id)
         user = self.context.request.user
         self_moderate = user.has_perm("sas.moderate_sasfile")
         new = Picture(
             parent=album,
             name=picture.name,
-            original=picture,
+            file=picture,
             owner=user,
             is_moderated=self_moderate,
+            is_folder=False,
+            mime_type=picture.content_type,
         )
         if self_moderate:
             new.moderator = user
-        new.generate_thumbnails()
         try:
+            new.generate_thumbnails()
             new.full_clean()
+            new.save()
         except ValidationError as e:
-            raise HttpError(status_code=409, message=str(e)) from e
-        new.save()
+            return self.create_response({"detail": dict(e)}, status_code=409)
 
     @route.get(
         "/{picture_id}/identified",

sas/baker_recipes.py

@@ -1,35 +1,18 @@
-from django.core.files.uploadedfile import SimpleUploadedFile
 from model_bakery import seq
 from model_bakery.recipe import Recipe
 
-from core.utils import RED_PIXEL_PNG
-from sas.models import Album, Picture
-
-album_recipe = Recipe(
-    Album,
-    name=seq("Album "),
-    thumbnail=SimpleUploadedFile(
-        name="thumb.webp", content=b"", content_type="image/webp"
-    ),
-)
-
+from sas.models import Picture
 
 picture_recipe = Recipe(
     Picture,
+    is_in_sas=True,
+    is_folder=False,
     is_moderated=True,
     name=seq("Picture "),
-    original=SimpleUploadedFile(
-        # compressed and thumbnail are generated on save (except if bulk creating).
-        # For this step no to fail, original must be a valid image.
-        name="img.png",
-        content=RED_PIXEL_PNG,
-        content_type="image/png",
-    ),
-    compressed=SimpleUploadedFile(
-        name="img.webp", content=b"", content_type="image/webp"
-    ),
-    thumbnail=SimpleUploadedFile(
-        name="img.webp", content=b"", content_type="image/webp"
-    ),
 )
-"""A SAS Picture fixture."""
+"""A SAS Picture fixture.
+
+Warnings:
+    If you don't `bulk_create` this, you need
+    to explicitly set the parent album, or it won't work
+"""

sas/forms.py

@@ -48,12 +48,13 @@ class PictureEditForm(forms.ModelForm):
 class AlbumEditForm(forms.ModelForm):
     class Meta:
         model = Album
-        fields = ["name", "date", "thumbnail", "parent", "edit_groups"]
+        fields = ["name", "date", "file", "parent", "edit_groups"]
         widgets = {
             "parent": AutoCompleteSelectAlbum,
             "edit_groups": AutoCompleteSelectMultipleGroup,
         }
 
+    name = forms.CharField(max_length=Album.NAME_MAX_LENGTH, label=_("file name"))
     date = forms.DateField(label=_("Date"), widget=SelectDate, required=True)
     recursive = forms.BooleanField(label=_("Apply rights recursively"), required=False)
 

sas/migrations/0006_move_the_whole_sas.py

@@ -1,357 +0,0 @@
-# Generated by Django 4.2.17 on 2025-01-22 21:53
-import collections
-import itertools
-import logging
-from typing import TYPE_CHECKING
-
-import django.db.models.deletion
-from django.conf import settings
-from django.db import migrations, models
-from django.db.migrations.state import StateApps
-
-import sas.models
-
-if TYPE_CHECKING:
-    import core.models
-
-# NB : tous les commentaires sont écrits en français,
-#      parce qu'on est sur des opérations qui sont complexes,
-#      et qui sont surtout DANGEREUSES.
-#      Ici, la clarté des explications prime sur toute autre considération.
-
-
-def copy_albums_and_pictures(apps: StateApps, schema_editor):
-    SithFile: type[core.models.SithFile] = apps.get_model("core", "SithFile")
-    Album: type[sas.models.Album] = apps.get_model("sas", "Album")
-    Picture: type[sas.models.Picture] = apps.get_model("sas", "Picture")
-    logger = logging.getLogger("django")
-
-    # Il y a environ 1800 albums, 257k photos et 488k identifications
-    # d'utilisateurs dans la db de prod.
-    # En supposant qu'une insertion prenne 10ms (ce qui est très optimiste),
-    # migrer tous les enregistrements de la db prendrait plus de 2h.
-    # C'est trop long.
-    # Mais d'un autre côté, j'ai pas assez confiance dans les capacités de nos
-    # machines pour charger presque un million d'objets en mémoire.
-    # Pour faire un compromis, les albums sont migrés individuellement un à un,
-    # mais tous les objets liés à ces albums
-    # (photos, groupes de vue, groupe d'édition, identification d'utilisateurs)
-    # sont migrés en tas.
-    #
-    # Ordre des opérations :
-    # 1. On migre les albums 1 à 1 (il y en a 1800, donc c'est relativement court)
-    # 2. On migre les photos par paquet de 2500 (soit ~une centaine d'opérations)
-    # 3. On migre tous les groupes de vue et tous les groupes d'édition des albums
-    #
-    # Au total, la migration devrait demander aux alentours de 2000 insertions,
-    # ce qui est un compromis acceptable entre une migration
-    # pas trop longue et une RAM pas trop surchargée.
-    #
-    # Pour ce qui est de la répartition des tables, quatre nouvelles tables
-    # sont créées : sas_album, sas_picture,
-    # sas_pictureviewgroups et sas_picture_editgroups.
-    # Tous les albums et toutes les photos qui sont dans core_sithfile
-    # vont être copiés dans ces tables.
-    # Comme les albums sont migrés un à un, ils recevront une nouvelle
-    # clef primaire.
-    # Pour les photos, en revanche, c'est beaucoup plus sûr de leur donner
-    # le même id que celui qu'il y avait dans core_sithfile.
-    #
-    # Les identifications des photos ne sont pas migrées pour l'instant.
-    # Ce qu'on va faire, c'est qu'on va changer la contrainte de clef étrangère
-    # sur la colonne des photos pour pointer vers sas_picture
-    # au lieu de core_sithfile.
-    # Cependant, pour que ça marche,
-    # il faut qu'au moment où ce changement est effectué,
-    # toutes les clefs primaires référencées existent à la fois dans
-    # les deux tables, sinon les contraintes d'intégrité ne sont pas respectées.
-    # La migration de ce fichier va donc s'occuper de créer les nouvelles tables
-    # et d'y copier les données nécessaires.
-    # Puis une deuxième migration s'occupera de changer les contraintes.
-    # Et enfin une troisième migration supprimera les anciennes données.
-    #
-    # Pavé César
-
-    albums = SithFile.objects.filter(is_in_sas=True, is_folder=True).prefetch_related(
-        "view_groups", "edit_groups"
-    )
-    old_albums = collections.deque(
-        albums.filter(parent_id=settings.SITH_SAS_ROOT_DIR_ID)
-    )
-
-    # Changement de représentation en DB.
-    # Dans l'ancien système, un fichier était dans le SAS si
-    # un fichier spécial (le SAS_ROOT) était parmi ses ancêtres.
-    # Comme maintenant les fichiers du SAS sont dans des tables à part,
-    # il ne peut plus y avoir de confusion.
-    # Les photos ont donc obligatoirement un parent (qui est un album)
-    # et les albums peuvent avoir un parent null.
-    # Un album sans parent est considéré comme se trouvant à la racine
-    # de l'arborescence.
-    # En quelque sorte, None est le nouveau SITH_SAS_ROOT_DIR_ID
-    album_id_old_to_new = {settings.SITH_SAS_ROOT_DIR_ID: None}
-
-    logger.info(f"migrating {albums.count()} albums")
-    while len(old_albums) > 0:
-        # Comme les albums référencent leur parent, les albums doivent être migrés
-        # par ordre croissant de profondeur dans l'arborescence.
-        # Chaque album est donc pris par la gauche de la file
-        # et ses enfants ajoutés sur la droite.
-        old_album = old_albums.popleft()
-        old_albums.extend(list(albums.filter(parent=old_album)))
-        new_album = Album.objects.create(
-            parent_id=album_id_old_to_new[old_album.parent_id],
-            event_date=old_album.date.date(),
-            name=old_album.name,
-            thumbnail=(old_album.file or None),
-            is_moderated=old_album.is_moderated,
-        )
-        # on garde un dictionnaire qui associe les id des albums dans l'ancienne table
-        # à leur id dans la nouvelle table, pour pouvoir recréer
-        # les liens de parenté entre albums
-        album_id_old_to_new[old_album.id] = new_album.id
-
-    pictures = SithFile.objects.filter(is_in_sas=True, is_folder=False)
-    nb_pictures = pictures.count()
-    logger.info(f"migrating {nb_pictures} pictures")
-    for i, pictures_batch in enumerate(itertools.batched(pictures, 2500), start=1):
-        Picture.objects.bulk_create(
-            [
-                Picture(
-                    id=p.id,
-                    name=p.name,
-                    parent_id=album_id_old_to_new[p.parent_id],
-                    thumbnail=p.thumbnail,
-                    compressed=p.compressed,
-                    original=p.file,
-                    owner_id=p.owner_id,
-                    created_at=p.date,
-                    is_moderated=p.is_moderated,
-                    asked_for_removal=p.asked_for_removal,
-                    moderator_id=p.moderator_id,
-                )
-                for p in pictures_batch
-            ]
-        )
-        logger.info(f"Migrated {min(i * 2500, nb_pictures)} / {nb_pictures} pictures")
-
-    logger.info("Migrating album groups")
-    albums = SithFile.objects.filter(is_in_sas=True, is_folder=True).exclude(
-        id=settings.SITH_SAS_ROOT_DIR_ID
-    )
-    Album.edit_groups.through.objects.bulk_create(
-        [
-            Album.view_groups.through(
-                album=album_id_old_to_new[g.sithfile_id], group_id=g.group_id
-            )
-            for g in SithFile.view_groups.through.objects.filter(sithfile__in=albums)
-        ]
-    )
-    Album.edit_groups.through.objects.bulk_create(
-        [
-            Album.view_groups.through(
-                album=album_id_old_to_new[g.sithfile_id], group_id=g.group_id
-            )
-            for g in SithFile.view_groups.through.objects.filter(sithfile__in=albums)
-        ]
-    )
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ("core", "0044_alter_userban_options"),
-        ("sas", "0005_alter_sasfile_options"),
-    ]
-
-    operations = [
-        # les relations et les demandes de modération étaient liées à SithFile,
-        # via le model proxy Picture.
-        # Pour que la migration marche malgré la disparition du modèle Proxy,
-        # on change la relation pour qu'elle pointe directement vers SithFile
-        migrations.AlterField(
-            model_name="peoplepicturerelation",
-            name="picture",
-            field=models.ForeignKey(
-                on_delete=django.db.models.deletion.CASCADE,
-                related_name="people",
-                to="core.sithfile",
-                verbose_name="picture",
-            ),
-        ),
-        migrations.AlterField(
-            model_name="picturemoderationrequest",
-            name="picture",
-            field=models.ForeignKey(
-                on_delete=django.db.models.deletion.CASCADE,
-                related_name="moderation_requests",
-                to="core.sithfile",
-                verbose_name="Picture",
-            ),
-        ),
-        migrations.DeleteModel(name="Album"),
-        migrations.DeleteModel(name="Picture"),
-        migrations.DeleteModel(name="SasFile"),
-        migrations.CreateModel(
-            name="Album",
-            fields=[
-                (
-                    "id",
-                    models.AutoField(
-                        auto_created=True,
-                        primary_key=True,
-                        serialize=False,
-                        verbose_name="ID",
-                    ),
-                ),
-                (
-                    "thumbnail",
-                    models.FileField(
-                        max_length=256,
-                        upload_to=sas.models.get_thumbnail_directory,
-                        verbose_name="thumbnail",
-                    ),
-                ),
-                ("name", models.CharField(max_length=100, verbose_name="name")),
-                (
-                    "event_date",
-                    models.DateField(
-                        default=django.utils.timezone.localdate,
-                        help_text="The date on which the photos in this album were taken",
-                        verbose_name="event date",
-                    ),
-                ),
-                (
-                    "is_moderated",
-                    models.BooleanField(default=False, verbose_name="is moderated"),
-                ),
-                (
-                    "edit_groups",
-                    models.ManyToManyField(
-                        related_name="editable_albums",
-                        to="core.group",
-                        verbose_name="edit groups",
-                    ),
-                ),
-                (
-                    "parent",
-                    models.ForeignKey(
-                        blank=True,
-                        null=True,
-                        on_delete=django.db.models.deletion.CASCADE,
-                        related_name="children",
-                        to="sas.album",
-                        verbose_name="parent",
-                    ),
-                ),
-                (
-                    "view_groups",
-                    models.ManyToManyField(
-                        related_name="viewable_albums",
-                        to="core.group",
-                        verbose_name="view groups",
-                    ),
-                ),
-            ],
-            options={"verbose_name": "album"},
-        ),
-        migrations.CreateModel(
-            name="Picture",
-            fields=[
-                (
-                    "id",
-                    models.AutoField(
-                        auto_created=True,
-                        primary_key=True,
-                        serialize=False,
-                        verbose_name="ID",
-                    ),
-                ),
-                (
-                    "thumbnail",
-                    models.FileField(
-                        unique=True,
-                        upload_to=sas.models.get_thumbnail_directory,
-                        verbose_name="thumbnail",
-                        max_length=256,
-                    ),
-                ),
-                ("name", models.CharField(max_length=256, verbose_name="file name")),
-                (
-                    "original",
-                    models.FileField(
-                        unique=True,
-                        upload_to=sas.models.get_directory,
-                        verbose_name="original image",
-                        max_length=256,
-                    ),
-                ),
-                (
-                    "compressed",
-                    models.FileField(
-                        unique=True,
-                        upload_to=sas.models.get_compressed_directory,
-                        verbose_name="compressed image",
-                        max_length=256,
-                    ),
-                ),
-                ("created_at", models.DateTimeField(default=django.utils.timezone.now)),
-                (
-                    "is_moderated",
-                    models.BooleanField(default=False, verbose_name="is moderated"),
-                ),
-                (
-                    "asked_for_removal",
-                    models.BooleanField(
-                        default=False, verbose_name="asked for removal"
-                    ),
-                ),
-                (
-                    "moderator",
-                    models.ForeignKey(
-                        blank=True,
-                        null=True,
-                        on_delete=django.db.models.deletion.SET_NULL,
-                        related_name="moderated_pictures",
-                        to=settings.AUTH_USER_MODEL,
-                    ),
-                ),
-                (
-                    "owner",
-                    models.ForeignKey(
-                        on_delete=django.db.models.deletion.PROTECT,
-                        related_name="owned_pictures",
-                        to=settings.AUTH_USER_MODEL,
-                        verbose_name="owner",
-                    ),
-                ),
-                (
-                    "parent",
-                    models.ForeignKey(
-                        on_delete=django.db.models.deletion.CASCADE,
-                        related_name="pictures",
-                        to="sas.album",
-                        verbose_name="album",
-                    ),
-                ),
-            ],
-            options={"abstract": False, "verbose_name": "picture"},
-        ),
-        migrations.AddConstraint(
-            model_name="picture",
-            constraint=models.UniqueConstraint(
-                fields=("name", "parent"), name="sas_picture_unique_per_album"
-            ),
-        ),
-        migrations.AddConstraint(
-            model_name="album",
-            constraint=models.UniqueConstraint(
-                fields=("name", "parent"), name="unique_album_name_if_same_parent"
-            ),
-        ),
-        migrations.RunPython(
-            copy_albums_and_pictures,
-            reverse_code=migrations.RunPython.noop,
-            elidable=True,
-        ),
-    ]

sas/migrations/0007_alter_peoplepicturerelation_picture_and_more.py

@@ -1,31 +0,0 @@
-# Generated by Django 4.2.17 on 2025-01-25 23:50
-
-import django.db.models.deletion
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-    dependencies = [("sas", "0006_move_the_whole_sas")]
-
-    operations = [
-        migrations.AlterField(
-            model_name="peoplepicturerelation",
-            name="picture",
-            field=models.ForeignKey(
-                on_delete=django.db.models.deletion.CASCADE,
-                related_name="people",
-                to="sas.picture",
-                verbose_name="picture",
-            ),
-        ),
-        migrations.AlterField(
-            model_name="picturemoderationrequest",
-            name="picture",
-            field=models.ForeignKey(
-                on_delete=django.db.models.deletion.CASCADE,
-                related_name="moderation_requests",
-                to="sas.picture",
-                verbose_name="Picture",
-            ),
-        ),
-    ]

sas/models.py

@@ -18,52 +18,29 @@ from __future__ import annotations
 import contextlib
 from io import BytesIO
 from pathlib import Path
-from typing import TYPE_CHECKING, ClassVar, Self
+from typing import ClassVar, Self
 
 from django.conf import settings
 from django.core.cache import cache
-from django.core.exceptions import ValidationError
-from django.core.files.base import ContentFile
 from django.db import models
 from django.db.models import Exists, OuterRef, Q
-from django.db.models.deletion import Collector
 from django.urls import reverse
-from django.utils import timezone
-from django.utils.functional import cached_property
 from django.utils.translation import gettext_lazy as _
 from PIL import Image
 
-from core.models import Group, Notification, User
+from core.models import Notification, SithFile, User
 from core.utils import exif_auto_rotate, resize_image
 
-if TYPE_CHECKING:
-    from django.db.models.fields.files import FieldFile
 
-
-def get_directory(instance: SasFile, filename: str):
-    return f"./{instance.parent_path}/{filename}"
-
-
-def get_compressed_directory(instance: SasFile, filename: str):
-    return f"./.compressed/{instance.parent_path}/{filename}"
-
-
-def get_thumbnail_directory(instance: SasFile, filename: str):
-    if isinstance(instance, Album):
-        _, extension = filename.rsplit(".", 1)
-        filename = f"{instance.name}/thumb.{extension}"
-    return f"./.thumbnails/{instance.parent_path}/{filename}"
-
-
-class SasFile(models.Model):
-    """Abstract model for SAS files
+class SasFile(SithFile):
+    """Proxy model for any file in the SAS.
 
     May be used to have logic that should be shared by both
     [Picture][sas.models.Picture] and [Album][sas.models.Album].
     """
 
     class Meta:
-        abstract = True
+        proxy = True
         permissions = [
             ("moderate_sasfile", "Can moderate SAS files"),
             ("view_unmoderated_sasfile", "Can view not moderated SAS files"),
@@ -88,169 +65,6 @@ class SasFile(models.Model):
     def can_be_edited_by(self, user):
         return user.has_perm("sas.change_sasfile")
 
-    @cached_property
-    def parent_path(self) -> str:
-        """The parent location in the SAS album tree (e.g. `SAS/foo/bar`)."""
-        return "/".join(["SAS", *[p.name for p in self.parent_list]])
-
-    @cached_property
-    def parent_list(self) -> list[Album]:
-        """The ancestors of this SAS object.
-
-        The result is ordered from the direct parent to the farthest one.
-        """
-        parents = []
-        current = self.parent
-        while current is not None:
-            parents.append(current)
-            current = current.parent
-        return parents
-
-
-class AlbumQuerySet(models.QuerySet):
-    def viewable_by(self, user: User) -> Self:
-        """Filter the albums that this user can view.
-
-        Warning:
-            Calling this queryset method may add several additional requests.
-        """
-        if user.is_root or user.is_in_group(pk=settings.SITH_GROUP_SAS_ADMIN_ID):
-            return self.all()
-        if user.was_subscribed:
-            return self.filter(is_moderated=True)
-        # known bug : if all children of an album are also albums
-        # then this album is excluded, even if one of the sub-albums should be visible.
-        # The fs-like navigation is likely to be half-broken for non-subscribers,
-        # but that's ok, since non-subscribers are expected to see only the albums
-        # containing pictures on which they have been identified (hence, very few).
-        # Most, if not all, of their albums will be displayed on the
-        # `latest albums` section of the SAS.
-        # Moreover, they will still see all of their picture in their profile.
-        return self.filter(
-            Exists(Picture.objects.filter(parent_id=OuterRef("pk")).viewable_by(user))
-        )
-
-
-class Album(SasFile):
-    NAME_MAX_LENGTH: ClassVar[int] = 50
-
-    name = models.CharField(_("name"), max_length=100)
-    parent = models.ForeignKey(
-        "self",
-        related_name="children",
-        verbose_name=_("parent"),
-        null=True,
-        blank=True,
-        on_delete=models.CASCADE,
-    )
-    thumbnail = models.FileField(
-        upload_to=get_thumbnail_directory,
-        verbose_name=_("thumbnail"),
-        max_length=256,
-        blank=True,
-    )
-    view_groups = models.ManyToManyField(
-        Group, related_name="viewable_albums", verbose_name=_("view groups"), blank=True
-    )
-    edit_groups = models.ManyToManyField(
-        Group, related_name="editable_albums", verbose_name=_("edit groups"), blank=True
-    )
-    event_date = models.DateField(
-        _("event date"),
-        help_text=_("The date on which the photos in this album were taken"),
-        default=timezone.localdate,
-        blank=True,
-    )
-    is_moderated = models.BooleanField(_("is moderated"), default=False)
-
-    objects = AlbumQuerySet.as_manager()
-
-    class Meta:
-        verbose_name = _("album")
-        constraints = [
-            models.UniqueConstraint(
-                fields=["name", "parent"],
-                name="unique_album_name_if_same_parent",
-                # TODO : add `nulls_distinct=True` after upgrading to django>=5.0
-            )
-        ]
-
-    def __str__(self):
-        return f"Album {self.name}"
-
-    def save(self, *args, **kwargs):
-        super().save(*args, **kwargs)
-        for user in User.objects.filter(
-            groups__id__in=[settings.SITH_GROUP_SAS_ADMIN_ID]
-        ):
-            Notification(
-                user=user,
-                url=reverse("sas:moderation"),
-                type="SAS_MODERATION",
-                param="1",
-            ).save()
-
-    def get_absolute_url(self):
-        return reverse("sas:album", kwargs={"album_id": self.id})
-
-    def clean(self):
-        super().clean()
-        if "/" in self.name:
-            raise ValidationError(_("Character '/' not authorized in name"))
-        if self.parent_id is not None and (
-            self.id == self.parent_id or self in self.parent_list
-        ):
-            raise ValidationError(_("Loop in album tree"), code="loop")
-        if self.thumbnail:
-            try:
-                Image.open(BytesIO(self.thumbnail.read()))
-            except Image.UnidentifiedImageError as e:
-                raise ValidationError(_("This is not a valid album thumbnail")) from e
-
-    def delete(self, *args, **kwargs):
-        """Delete the album, all of its children and all linked disk files"""
-        collector = Collector(using="default")
-        collector.collect([self])
-        albums: set[Album] = collector.data[Album]
-        pictures: set[Picture] = collector.data[Picture]
-        files: list[FieldFile] = [
-            *[a.thumbnail for a in albums],
-            *[p.thumbnail for p in pictures],
-            *[p.compressed for p in pictures],
-            *[p.original for p in pictures],
-        ]
-        # `bool(f)` checks that the file actually exists on the disk
-        files = [f for f in files if bool(f)]
-        folders = {Path(f.path).parent for f in files}
-        res = super().delete(*args, **kwargs)
-        # once the model instances have been deleted,
-        # delete the actual files.
-        for file in files:
-            # save=False ensures that django doesn't recreate the db record,
-            # which would make the whole deletion pointless
-            # cf. https://docs.djangoproject.com/en/stable/ref/models/fields/#django.db.models.fields.files.FieldFile.delete
-            file.delete(save=False)
-        for folder in folders:
-            # now that the files are deleted, remove the empty folders
-            if folder.is_dir() and next(folder.iterdir(), None) is None:
-                folder.rmdir()
-        return res
-
-    def get_download_url(self):
-        return reverse("sas:album_preview", kwargs={"album_id": self.id})
-
-    def generate_thumbnail(self):
-        p = (
-            self.pictures.exclude(thumbnail="").order_by("?").first()
-            or self.children.exclude(thumbnail="").order_by("?").first()
-        )
-        if p:
-            # The file is loaded into memory to duplicate it.
-            # It may not be the most efficient way, but thumbnails are
-            # usually quite small, so it's still ok
-            self.thumbnail = ContentFile(p.thumbnail.read(), name="thumb.webp")
-            self.save()
-
 
 class PictureQuerySet(models.QuerySet):
     def viewable_by(self, user: User) -> Self:
@@ -266,65 +80,23 @@ class PictureQuerySet(models.QuerySet):
         return self.filter(people__user_id=user.id, is_moderated=True)
 
 
+class SASPictureManager(models.Manager):
+    def get_queryset(self):
+        return super().get_queryset().filter(is_in_sas=True, is_folder=False)
+
+
 class Picture(SasFile):
-    name = models.CharField(_("file name"), max_length=256)
-    parent = models.ForeignKey(
-        Album,
-        related_name="pictures",
-        verbose_name=_("album"),
-        on_delete=models.CASCADE,
-    )
-    thumbnail = models.FileField(
-        upload_to=get_thumbnail_directory,
-        verbose_name=_("thumbnail"),
-        max_length=256,
-        unique=True,
-    )
-    original = models.FileField(
-        upload_to=get_directory,
-        verbose_name=_("original image"),
-        max_length=256,
-        unique=True,
-    )
-    compressed = models.FileField(
-        upload_to=get_compressed_directory,
-        verbose_name=_("compressed image"),
-        max_length=256,
-        unique=True,
-    )
-    created_at = models.DateTimeField(default=timezone.now)
-    owner = models.ForeignKey(
-        User,
-        related_name="owned_pictures",
-        verbose_name=_("owner"),
-        on_delete=models.PROTECT,
-    )
-
-    is_moderated = models.BooleanField(_("is moderated"), default=False)
-    asked_for_removal = models.BooleanField(_("asked for removal"), default=False)
-    moderator = models.ForeignKey(
-        User,
-        related_name="moderated_pictures",
-        null=True,
-        blank=True,
-        on_delete=models.SET_NULL,
-    )
-
-    objects = PictureQuerySet.as_manager()
-
     class Meta:
-        verbose_name = _("picture")
-        constraints = [
-            models.UniqueConstraint(
-                fields=["name", "parent"], name="sas_picture_unique_per_album"
-            )
-        ]
+        proxy = True
 
-    def __str__(self):
-        return self.name
+    objects = SASPictureManager.from_queryset(PictureQuerySet)()
 
-    def get_absolute_url(self):
-        return reverse("sas:picture", kwargs={"picture_id": self.id})
+    @property
+    def is_vertical(self):
+        with open(settings.MEDIA_ROOT / self.file.name, "rb") as f:
+            im = Image.open(BytesIO(f.read()))
+            (w, h) = im.size
+            return (w / h) < 1
 
     def get_download_url(self):
         return reverse("sas:download", kwargs={"picture_id": self.id})
@@ -335,34 +107,41 @@ class Picture(SasFile):
     def get_download_thumb_url(self):
         return reverse("sas:download_thumb", kwargs={"picture_id": self.id})
 
-    @property
-    def is_vertical(self):
-        # original, compressed and thumbnail image have all three the same ratio,
-        # so the smallest one is used to tell if the image is vertical
-        im = Image.open(BytesIO(self.thumbnail.read()))
-        (w, h) = im.size
-        return w < h
+    def get_absolute_url(self):
+        return reverse("sas:picture", kwargs={"picture_id": self.id})
 
-    def generate_thumbnails(self):
-        im = Image.open(self.original)
+    def generate_thumbnails(self, *, overwrite=False):
+        im = Image.open(BytesIO(self.file.read()))
         with contextlib.suppress(Exception):
             im = exif_auto_rotate(im)
         # convert the compressed image and the thumbnail into webp
+        # The original image keeps its original type, because it's not
+        # meant to be shown on the website, but rather to keep the real image
+        # for less frequent cases (like downloading the pictures of an user)
+        extension = self.mime_type.split("/")[-1]
         # the HD version of the image doesn't need to be optimized, because :
         # - it isn't frequently queried
-        # - optimizing large images takes a lot of time, which greatly hinders the UX
+        # - optimizing large images takes a lot time, which greatly hinders the UX
         # - photographers usually already optimize their images
+        file = resize_image(im, max(im.size), extension, optimize=False)
         thumb = resize_image(im, 200, "webp")
         compressed = resize_image(im, 1200, "webp")
-        new_extension_name = str(Path(self.original.name).with_suffix(".webp"))
+        if overwrite:
+            self.file.delete()
+            self.thumbnail.delete()
+            self.compressed.delete()
+        new_extension_name = str(Path(self.name).with_suffix(".webp"))
+        self.file = file
+        self.file.name = self.name
         self.thumbnail = thumb
         self.thumbnail.name = new_extension_name
         self.compressed = compressed
         self.compressed.name = new_extension_name
 
     def rotate(self, degree):
-        for field in self.original, self.compressed, self.thumbnail:
-            with open(field.file, "r+b") as file:
+        for attr in ["file", "compressed", "thumbnail"]:
+            name = self.__getattribute__(attr).name
+            with open(settings.MEDIA_ROOT / name, "r+b") as file:
                 if file:
                     im = Image.open(BytesIO(file.read()))
                     file.seek(0)
@@ -375,6 +154,110 @@ class Picture(SasFile):
                         progressive=True,
                     )
 
+    def get_next(self):
+        if self.is_moderated:
+            pictures_qs = self.parent.children.filter(
+                is_moderated=True,
+                asked_for_removal=False,
+                is_folder=False,
+                id__gt=self.id,
+            )
+        else:
+            pictures_qs = Picture.objects.filter(id__gt=self.id, is_moderated=False)
+        return pictures_qs.order_by("id").first()
+
+    def get_previous(self):
+        if self.is_moderated:
+            pictures_qs = self.parent.children.filter(
+                is_moderated=True,
+                asked_for_removal=False,
+                is_folder=False,
+                id__lt=self.id,
+            )
+        else:
+            pictures_qs = Picture.objects.filter(id__lt=self.id, is_moderated=False)
+        return pictures_qs.order_by("-id").first()
+
+
+class AlbumQuerySet(models.QuerySet):
+    def viewable_by(self, user: User) -> Self:
+        """Filter the albums that this user can view.
+
+        Warning:
+            Calling this queryset method may add several additional requests.
+        """
+        if user.has_perm("sas.moderate_sasfile"):
+            return self.all()
+        if user.was_subscribed:
+            return self.filter(Q(is_moderated=True) | Q(owner=user))
+        # known bug : if all children of an album are also albums
+        # then this album is excluded, even if one of the sub-albums should be visible.
+        # The fs-like navigation is likely to be half-broken for non-subscribers,
+        # but that's ok, since non-subscribers are expected to see only the albums
+        # containing pictures on which they have been identified (hence, very few).
+        # Most, if not all, of their albums will be displayed on the
+        # `latest albums` section of the SAS.
+        # Moreover, they will still see all of their picture in their profile.
+        return self.filter(
+            Exists(Picture.objects.filter(parent_id=OuterRef("pk")).viewable_by(user))
+        )
+
+
+class SASAlbumManager(models.Manager):
+    def get_queryset(self):
+        return super().get_queryset().filter(is_in_sas=True, is_folder=True)
+
+
+class Album(SasFile):
+    NAME_MAX_LENGTH: ClassVar[int] = 50
+    """Maximum length of an album's name.
+    
+    [SithFile][core.models.SithFile] have a maximum length
+    of 256 characters.
+    However, this limit is too high for albums.
+    Names longer than 50 characters are harder to read
+    and harder to display on the SAS page.
+    
+    It is to be noted, though, that this does not
+    add or modify any db behaviour.
+    It's just a constant to be used in views and forms.
+    """
+
+    class Meta:
+        proxy = True
+
+    objects = SASAlbumManager.from_queryset(AlbumQuerySet)()
+
+    @property
+    def children_pictures(self):
+        return Picture.objects.filter(parent=self)
+
+    @property
+    def children_albums(self):
+        return Album.objects.filter(parent=self)
+
+    def get_absolute_url(self):
+        if self.id == settings.SITH_SAS_ROOT_DIR_ID:
+            return reverse("sas:main")
+        return reverse("sas:album", kwargs={"album_id": self.id})
+
+    def get_download_url(self):
+        return reverse("sas:album_preview", kwargs={"album_id": self.id})
+
+    def generate_thumbnail(self):
+        p = (
+            self.children_pictures.order_by("?").first()
+            or self.children_albums.exclude(file=None)
+            .exclude(file="")
+            .order_by("?")
+            .first()
+        )
+        if p and p.file:
+            image = resize_image(Image.open(BytesIO(p.file.read())), 200, "webp")
+            self.file = image
+            self.file.name = f"{self.name}/thumb.webp"
+            self.save()
+
 
 def sas_notification_callback(notif: Notification):
     count = Picture.objects.filter(is_moderated=False).count()

sas/schemas.py

@@ -55,12 +55,7 @@ class AlbumAutocompleteSchema(ModelSchema):
 
     @staticmethod
     def resolve_path(obj: Album) -> str:
-        return str(Path(obj.parent_path) / obj.name)
-
-
-class MoveAlbumSchema(Schema):
-    id: int
-    new_parent_id: int
+        return str(Path(obj.get_parent_path()) / obj.name)
 
 
 class PictureFilterSchema(FilterSchema):
@@ -75,7 +70,7 @@ class PictureFilterSchema(FilterSchema):
 class PictureSchema(ModelSchema):
     class Meta:
         model = Picture
-        fields = ["id", "name", "created_at", "is_moderated", "asked_for_removal"]
+        fields = ["id", "name", "date", "size", "is_moderated", "asked_for_removal"]
 
     owner: UserProfileSchema
     sas_url: str

sas/static/bundled/sas/album-index.ts

@@ -1,12 +1,12 @@
-import { paginated } from "#core:utils/api.ts";
-import { History, initialUrlParams, updateQueryString } from "#core:utils/history.ts";
+import { paginated } from "#core:utils/api";
+import { History, initialUrlParams, updateQueryString } from "#core:utils/history";
 import {
   type AlbumFetchAlbumData,
   type AlbumSchema,
-  albumFetchAlbum,
   type PictureSchema,
   type PicturesFetchPicturesData,
   type PicturesUploadPictureErrors,
+  albumFetchAlbum,
   picturesFetchPictures,
   picturesUploadPicture,
 } from "#openapi";
@@ -23,7 +23,7 @@ interface SubAlbumsConfig {
 document.addEventListener("alpine:init", () => {
   Alpine.data("pictures", (config: AlbumPicturesConfig) => ({
     pictures: [] as PictureSchema[],
-    page: Number.parseInt(initialUrlParams.get("page"), 10) || 1,
+    page: Number.parseInt(initialUrlParams.get("page")) || 1,
     pushstate: History.Push /* Used to avoid pushing a state on a back action */,
     loading: false,
 
@@ -38,10 +38,7 @@ document.addEventListener("alpine:init", () => {
       window.addEventListener("popstate", () => {
         this.pushstate = History.Replace;
         this.page =
-          Number.parseInt(
-            new URLSearchParams(window.location.search).get("page"),
-            10,
-          ) || 1;
+          Number.parseInt(new URLSearchParams(window.location.search).get("page")) || 1;
       });
     },
 
@@ -128,108 +125,3 @@ document.addEventListener("alpine:init", () => {
     },
   }));
 });
-
-// Todo: migrate to alpine.js if we have some time
-// $("form#upload_form").submit(function (event) {
-//   const formData = new FormData($(this)[0]);
-//
-//   if (!formData.get("album_name") && !formData.get("images").name) return false;
-//
-//   if (!formData.get("images").name) {
-//     return true;
-//   }
-//
-//   event.preventDefault();
-//
-//   let errorList = this.querySelector("#upload_form ul.errorlist.nonfield");
-//   if (errorList === null) {
-//     errorList = document.createElement("ul");
-//     errorList.classList.add("errorlist", "nonfield");
-//     this.insertBefore(errorList, this.firstElementChild);
-//   }
-//
-//   while (errorList.childElementCount > 0)
-//     errorList.removeChild(errorList.firstElementChild);
-//
-//   let progress = this.querySelector("progress");
-//   if (progress === null) {
-//     progress = document.createElement("progress");
-//     progress.value = 0;
-//     const p = document.createElement("p");
-//     p.appendChild(progress);
-//     this.insertBefore(p, this.lastElementChild);
-//   }
-//
-//   let dataHolder;
-//
-//   if (formData.get("album_name")) {
-//     dataHolder = new FormData();
-//     dataHolder.set("csrfmiddlewaretoken", "{{ csrf_token }}");
-//     dataHolder.set("album_name", formData.get("album_name"));
-//     $.ajax({
-//       method: "POST",
-//       url: "{{ url('sas:album_upload', album_id=object.id) }}",
-//       data: dataHolder,
-//       processData: false,
-//       contentType: false,
-//       success: onSuccess,
-//     });
-//   }
-//
-//   const images = formData.getAll("images");
-//   const imagesCount = images.length;
-//   let completeCount = 0;
-//
-//   const poolSize = 1;
-//   const imagePool = [];
-//
-//   while (images.length > 0 && imagePool.length < poolSize) {
-//     const image = images.shift();
-//     imagePool.push(image);
-//     sendImage(image);
-//   }
-//
-//   function sendImage(image) {
-//     dataHolder = new FormData();
-//     dataHolder.set("csrfmiddlewaretoken", "{{ csrf_token }}");
-//     dataHolder.set("images", image);
-//
-//     $.ajax({
-//       method: "POST",
-//       url: "{{ url('sas:album_upload', album_id=object.id) }}",
-//       data: dataHolder,
-//       processData: false,
-//       contentType: false,
-//     })
-//       .fail(onSuccess.bind(undefined, image))
-//       .done(onSuccess.bind(undefined, image))
-//       .always(next.bind(undefined, image));
-//   }
-//
-//   function next(image, _, __) {
-//     const index = imagePool.indexOf(image);
-//     const nextImage = images.shift();
-//
-//     if (index !== -1) {
-//       imagePool.splice(index, 1);
-//     }
-//
-//     if (nextImage) {
-//       imagePool.push(nextImage);
-//       sendImage(nextImage);
-//     }
-//   }
-//
-//   function onSuccess(image, data, _, __) {
-//     let errors = [];
-//
-//     if ($(data.responseText).find(".errorlist.nonfield")[0])
-//       errors = Array.from($(data.responseText).find(".errorlist.nonfield")[0].children);
-//
-//     while (errors.length > 0) errorList.appendChild(errors.shift());
-//
-//     progress.value = ++completeCount / imagesCount;
-//     if (progress.value === 1 && errorList.children.length === 0)
-//       document.location.reload();
-//   }
-// });

sas/static/bundled/sas/components/ajax-select-index.ts

@@ -1,7 +1,7 @@
+import { AjaxSelect } from "#core:core/components/ajax-select-base";
+import { registerComponent } from "#core:utils/web-components";
 import type { TomOption } from "tom-select/dist/types/types";
 import type { escape_html } from "tom-select/dist/types/utils";
-import { AjaxSelect } from "#core:core/components/ajax-select-base.ts";
-import { registerComponent } from "#core:utils/web-components.ts";
 import { type AlbumAutocompleteSchema, albumAutocompleteAlbum } from "#openapi";
 
 @registerComponent("album-ajax-select")

sas/static/bundled/sas/pictures-download-index.ts

@@ -30,11 +30,11 @@ document.addEventListener("alpine:init", () => {
       const zipWriter = new ZipWriter(await fileHandle.createWritable());
 
       await Promise.all(
-        this.downloadPictures.map((p: PictureSchema) => {
-          const imgName = `${p.album.name}/IMG_${p.id}_${p.created_at.replace(/[:-]/g, "_")}${p.name.slice(p.name.lastIndexOf("."))}`;
+        this.downloadPictures.map(async (p: PictureSchema) => {
+          const imgName = `${p.album}/IMG_${p.date.replace(/[:\-]/g, "_")}${p.name.slice(p.name.lastIndexOf("."))}`;
           return zipWriter.add(imgName, new HttpReader(p.full_size_url), {
             level: 9,
-            lastModDate: new Date(p.created_at),
+            lastModDate: new Date(p.date),
             onstart: incrementProgressBar,
           });
         }),

sas/static/bundled/sas/user/pictures-index.ts

@@ -1,4 +1,4 @@
-import { paginated } from "#core:utils/api.ts";
+import { paginated } from "#core:utils/api";
 import {
   type PictureSchema,
   type PicturesFetchPicturesData,
@@ -27,7 +27,7 @@ document.addEventListener("alpine:init", () => {
       const lastCachedNumber = localStorage.getItem(localStorageInvalidationKey);
       if (
         lastCachedNumber !== null &&
-        Number.parseInt(lastCachedNumber, 10) === config.nbPictures
+        Number.parseInt(lastCachedNumber) === config.nbPictures
       ) {
         return JSON.parse(localStorage.getItem(localStorageKey));
       }

sas/static/bundled/sas/viewer-index.ts

@@ -1,21 +1,21 @@
+import type { UserAjaxSelect } from "#core:core/components/ajax-select-index";
+import { paginated } from "#core:utils/api";
+import { exportToHtml } from "#core:utils/globals";
+import { History } from "#core:utils/history";
 import type TomSelect from "tom-select";
-import type { UserAjaxSelect } from "#core:core/components/ajax-select-index.ts";
-import { paginated } from "#core:utils/api.ts";
-import { exportToHtml } from "#core:utils/globals.ts";
-import { History } from "#core:utils/history.ts";
 import {
   type IdentifiedUserSchema,
   type ModerationRequestSchema,
   type PictureSchema,
   type PicturesFetchIdentificationsResponse,
   type PicturesFetchPicturesData,
+  type UserProfileSchema,
   picturesDeletePicture,
   picturesFetchIdentifications,
   picturesFetchModerationRequests,
   picturesFetchPictures,
   picturesIdentifyUsers,
   picturesModeratePicture,
-  type UserProfileSchema,
   usersidentifiedDeleteRelation,
 } from "#openapi";
 
@@ -142,8 +142,7 @@ exportToHtml("loadViewer", (config: ViewerConfig) => {
         // biome-ignore lint/style/useNamingConvention: api is in snake_case
         full_size_url: "",
         owner: "",
-        // biome-ignore lint/style/useNamingConvention: api is in snake_case
-        created_at: new Date(),
+        date: new Date(),
         identifications: [] as IdentifiedUserSchema[],
       },
       /**
@@ -209,8 +208,7 @@ exportToHtml("loadViewer", (config: ViewerConfig) => {
           }
           this.pushstate = History.Replace;
           this.currentPicture = this.pictures.find(
-            (i: PictureSchema) =>
-              i.id === Number.parseInt(event.state.sasPictureId, 10),
+            (i: PictureSchema) => i.id === Number.parseInt(event.state.sasPictureId),
           );
         });
         this.pushstate = History.Replace; /* Avoid first url push */
@@ -303,7 +301,7 @@ exportToHtml("loadViewer", (config: ViewerConfig) => {
             // biome-ignore lint/style/useNamingConvention: api is in snake_case
             picture_id: this.currentPicture.id,
           },
-          body: widget.items.map((i: string) => Number.parseInt(i, 10)),
+          body: widget.items.map((i: string) => Number.parseInt(i)),
         });
         // refresh the identified users list
         await this.currentPicture.loadIdentifications({ forceReload: true });

sas/templates/sas/album.jinja

@@ -20,7 +20,7 @@
 
 {% block content %}
   <code>
-    <a href="{{ url('sas:main') }}">SAS</a> / {{ print_path(album.parent) }} {{ album.name }}
+    <a href="{{ url('sas:main') }}">SAS</a> / {{ print_path(album.parent) }} {{ album.get_display_name() }}
   </code>
 
   {% set is_sas_admin = user.can_edit(album) %}
@@ -30,7 +30,7 @@
     <form action="" method="post" enctype="multipart/form-data">
       {% csrf_token %}
       <div class="album-navbar">
-        <h3>{{ album.name }}</h3>
+        <h3>{{ album.get_display_name() }}</h3>
 
         <div class="toolbar">
           <a href="{{ url('sas:album_edit', album_id=album.id) }}">{% trans %}Edit{% endtrans %}</a>
@@ -40,17 +40,17 @@
         </div>
       </div>
 
-{#      {% if clipboard %}#}
-{#        <div class="clipboard">#}
-{#          {% trans %}Clipboard: {% endtrans %}#}
-{#          <ul>#}
-{#            {% for f in clipboard["albums"] %}#}
-{#              <li>{{ f.get_full_path() }}</li>#}
-{#            {% endfor %}#}
-{#          </ul>#}
-{#          <input name="clear" type="submit" value="{% trans %}Clear clipboard{% endtrans %}">#}
-{#        </div>#}
-{#      {% endif %}#}
+      {% if clipboard %}
+        <div class="clipboard">
+          {% trans %}Clipboard: {% endtrans %}
+          <ul>
+            {% for f in clipboard %}
+              <li>{{ f.get_full_path() }}</li>
+            {% endfor %}
+          </ul>
+          <input name="clear" type="submit" value="{% trans %}Clear clipboard{% endtrans %}">
+        </div>
+      {% endif %}
   {% endif %}
 
   {% if show_albums %}
@@ -73,8 +73,8 @@
                 <div class="text">{% trans %}To be moderated{% endtrans %}</div>
               </template>
             </div>
-            {% if edit_mode %}
-              <input type="checkbox" name="album_list" :value="album.id">
+            {% if is_sas_admin %}
+              <input type="checkbox" name="file_list" :value="album.id">
             {% endif %}
           </a>
         </template>
@@ -100,7 +100,7 @@
             </template>
           </div>
           {% if is_sas_admin %}
-            <input type="checkbox" name="picture_list" :value="picture.id">
+            <input type="checkbox" name="file_list" :value="picture.id">
           {% endif %}
         </a>
       </template>
@@ -120,9 +120,9 @@
       {% csrf_token %}
       <div class="inputs">
         <p>
-          <label for="{{ form.images.id_for_label }}">{{ form.images.label }} :</label>
-          {{ form.images|add_attr("x-ref=pictures") }}
-          <span class="helptext">{{ form.images.help_text }}</span>
+          <label for="{{ upload_form.images.id_for_label }}">{{ upload_form.images.label }} :</label>
+          {{ upload_form.images|add_attr("x-ref=pictures") }}
+          <span class="helptext">{{ upload_form.images.help_text }}</span>
         </p>
         <input type="submit" value="{% trans %}Upload{% endtrans %}" />
         <progress x-ref="progress" x-show="sending"></progress>

sas/templates/sas/macros.jinja

@@ -1,13 +1,19 @@
 {% macro display_album(a, edit_mode) %}
   <a href="{{ url('sas:album', album_id=a.id) }}">
-    {% if a.thumbnail %}
+    {% if a.file %}
       {% set img = a.get_download_url() %}
       {% set src = a.name %}
+    {% elif a.children.filter(is_folder=False, is_moderated=True).exists() %}
+      {% set picture = a.children.filter(is_folder=False).first().as_picture %}
+      {% set img = picture.get_download_thumb_url()  %}
+      {% set src = picture.name %}
     {% else %}
       {% set img = static('core/img/sas.jpg') %}
       {% set src = "sas.jpg" %}
     {% endif %}
-    <div class="album{% if not a.is_moderated %} not_moderated{% endif %}">
+    <div
+      class="album{% if not a.is_moderated %} not_moderated{% endif %}"
+    >
       <img src="{{ img }}" alt="{{ src }}" loading="lazy" />
       {% if not a.is_moderated %}
         <div class="overlay">&nbsp;</div>
@@ -25,7 +31,7 @@
 {% macro print_path(file) %}
   {% if file and file.parent %}
     {{ print_path(file.parent) }}
-    <a href="{{ url("sas:album", album_id=file.id) }}">{{ file.name }}</a> /
+    <a href="{{ url('sas:album', album_id=file.id) }}">{{ file.get_display_name() }}</a> /
   {% endif %}
 {% endmacro %}
 

sas/templates/sas/picture.jinja

@@ -1,9 +1,9 @@
 {% extends "core/base.jinja" %}
 
 {%- block additional_css -%}
-  <link rel="stylesheet" href="{{ static('bundled/core/components/ajax-select-index.css') }}">
-  <link rel="stylesheet" href="{{ static('core/components/ajax-select.scss') }}">
-  <link rel="stylesheet" href="{{ static('sas/css/picture.scss') }}">
+  <link defer rel="stylesheet" href="{{ static('bundled/core/components/ajax-select-index.css') }}">
+  <link defer rel="stylesheet" href="{{ static('core/components/ajax-select.scss') }}">
+  <link defer rel="stylesheet" href="{{ static('sas/css/picture.scss') }}">
 {%- endblock -%}
 
 {%- block additional_js -%}
@@ -104,7 +104,7 @@
                 <span
                   x-text="Intl.DateTimeFormat(
                           '{{ LANGUAGE_CODE }}', {dateStyle: 'long'}
-                          ).format(new Date(currentPicture.created_at))"
+                          ).format(new Date(currentPicture.date))"
                 >
                 </span>
               </div>

sas/tests/test_api.py

@@ -27,8 +27,8 @@ class TestSas(TestCase):
         cls.user_b, cls.user_c = subscriber_user.make(_quantity=2)
 
         picture = picture_recipe.extend(owner=owner)
-        cls.album_a = baker.make(Album)
-        cls.album_b = baker.make(Album)
+        cls.album_a = baker.make(Album, is_in_sas=True, parent=sas)
+        cls.album_b = baker.make(Album, is_in_sas=True, parent=sas)
         relation_recipe = Recipe(PeoplePictureRelation)
         relations = []
         for album in cls.album_a, cls.album_b:
@@ -61,7 +61,7 @@ class TestPictureSearch(TestSas):
         self.client.force_login(self.user_b)
         res = self.client.get(self.url + f"?album_id={self.album_a.id}")
         assert res.status_code == 200
-        expected = list(self.album_a.pictures.values_list("id", flat=True))
+        expected = list(self.album_a.children_pictures.values_list("id", flat=True))
         assert [i["id"] for i in res.json()["results"]] == expected
 
     def test_filter_by_user(self):
@@ -70,7 +70,7 @@ class TestPictureSearch(TestSas):
         assert res.status_code == 200
         expected = list(
             self.user_a.pictures.order_by(
-                "-picture__parent__event_date", "picture__created_at"
+                "-picture__parent__date", "picture__date"
             ).values_list("picture_id", flat=True)
         )
         assert [i["id"] for i in res.json()["results"]] == expected
@@ -84,7 +84,7 @@ class TestPictureSearch(TestSas):
         assert res.status_code == 200
         expected = list(
             self.user_a.pictures.union(self.user_b.pictures.all())
-            .order_by("-picture__parent__event_date", "picture__created_at")
+            .order_by("-picture__parent__date", "picture__date")
             .values_list("picture_id", flat=True)
         )
         assert [i["id"] for i in res.json()["results"]] == expected
@@ -97,7 +97,7 @@ class TestPictureSearch(TestSas):
         assert res.status_code == 200
         expected = list(
             self.user_a.pictures.order_by(
-                "-picture__parent__event_date", "picture__created_at"
+                "-picture__parent__date", "picture__date"
             ).values_list("picture_id", flat=True)
         )
         assert [i["id"] for i in res.json()["results"]] == expected
@@ -123,7 +123,7 @@ class TestPictureSearch(TestSas):
         assert res.status_code == 200
         expected = list(
             self.user_b.pictures.intersection(self.user_a.pictures.all())
-            .order_by("-picture__parent__event_date", "picture__created_at")
+            .order_by("-picture__parent__date", "picture__date")
             .values_list("picture_id", flat=True)
         )
         assert [i["id"] for i in res.json()["results"]] == expected

sas/tests/test_model.py

@@ -4,8 +4,8 @@ from model_bakery import baker
 
 from core.baker_recipes import old_subscriber_user, subscriber_user
 from core.models import User
-from sas.baker_recipes import album_recipe, picture_recipe
-from sas.models import Album, PeoplePictureRelation, Picture
+from sas.baker_recipes import picture_recipe
+from sas.models import PeoplePictureRelation, Picture
 
 
 class TestPictureQuerySet(TestCase):
@@ -67,22 +67,3 @@ def test_identifications_viewable_by_user():
     assert list(picture.people.viewable_by(identifications[1].user)) == [
         identifications[1]
     ]
-
-
-class TestDeleteAlbum(TestCase):
-    def setUp(cls):
-        cls.album: Album = album_recipe.make()
-        cls.album_pictures = picture_recipe.make(parent=cls.album, _quantity=5)
-        cls.sub_album = album_recipe.make(parent=cls.album)
-        cls.sub_album_pictures = picture_recipe.make(parent=cls.sub_album, _quantity=5)
-
-    def test_delete(self):
-        album_ids = [self.album.id, self.sub_album.id]
-        picture_ids = [
-            *[p.id for p in self.album_pictures],
-            *[p.id for p in self.sub_album_pictures],
-        ]
-        self.album.delete()
-        # assert not p.exists()
-        assert not Album.objects.filter(id__in=album_ids).exists()
-        assert not Picture.objects.filter(id__in=picture_ids).exists()

sas/tests/test_views.py

@@ -136,7 +136,9 @@ class TestAlbumUpload:
 class TestSasModeration(TestCase):
     @classmethod
     def setUpTestData(cls):
-        album = baker.make(Album)
+        album = baker.make(
+            Album, parent_id=settings.SITH_SAS_ROOT_DIR_ID, is_moderated=True
+        )
         cls.pictures = picture_recipe.make(
             parent=album, _quantity=10, _bulk_create=True
         )

sas/views.py

@@ -12,7 +12,6 @@
 # OR WITHIN THE LOCAL FILE "LICENSE"
 #
 #
-from pathlib import Path
 from typing import Any
 
 from django.conf import settings
@@ -23,12 +22,12 @@ from django.shortcuts import get_object_or_404
 from django.urls import reverse
 from django.utils.safestring import SafeString
 from django.views.generic import CreateView, DetailView, TemplateView
-from django.views.generic.edit import FormMixin, FormView, UpdateView
+from django.views.generic.edit import FormView, UpdateView
 
 from core.auth.mixins import CanEditMixin, CanViewMixin
 from core.models import SithFile, User
-from core.views import FileView, UseFragmentsMixin
-from core.views.files import send_raw_file
+from core.views import UseFragmentsMixin
+from core.views.files import FileView, send_file
 from core.views.mixins import FragmentMixin, FragmentRenderer
 from core.views.user import UserTabsMixin
 from sas.forms import (
@@ -64,7 +63,6 @@ class AlbumCreateFragment(FragmentMixin, CreateView):
 
 
 class SASMainView(UseFragmentsMixin, TemplateView):
-    form_class = AlbumCreateForm
     template_name = "sas/main.jinja"
 
     def get_fragments(self) -> dict[str, FragmentRenderer]:
@@ -81,26 +79,12 @@ class SASMainView(UseFragmentsMixin, TemplateView):
         root_user = User.objects.get(pk=settings.SITH_ROOT_USER_ID)
         return {"album_create_fragment": {"owner": root_user}}
 
-    def dispatch(self, request, *args, **kwargs):
-        if request.method == "POST" and not self.request.user.has_perm("sas.add_album"):
-            raise PermissionDenied
-        return super().dispatch(request, *args, **kwargs)
-
-    def get_form(self, form_class=None):
-        if not self.request.user.has_perm("sas.add_album"):
-            return None
-        return super().get_form(form_class)
-
-    def get_form_kwargs(self):
-        return super().get_form_kwargs() | {
-            "owner": User.objects.get(pk=settings.SITH_ROOT_USER_ID),
-            "parent": None,
-        }
-
     def get_context_data(self, **kwargs):
         kwargs = super().get_context_data(**kwargs)
         albums_qs = Album.objects.viewable_by(self.request.user)
-        kwargs["categories"] = list(albums_qs.filter(parent=None).order_by("id"))
+        kwargs["categories"] = list(
+            albums_qs.filter(parent_id=settings.SITH_SAS_ROOT_DIR_ID).order_by("id")
+        )
         kwargs["latest"] = list(albums_qs.order_by("-id")[:5])
         return kwargs
 
@@ -110,9 +94,6 @@ class PictureView(CanViewMixin, DetailView):
     pk_url_kwarg = "picture_id"
     template_name = "sas/picture.jinja"
 
-    def get_queryset(self):
-        return super().get_queryset().select_related("parent")
-
     def get(self, request, *args, **kwargs):
         self.object = self.get_object()
         if "rotate_right" in request.GET:
@@ -122,42 +103,31 @@ class PictureView(CanViewMixin, DetailView):
         return super().get(request, *args, **kwargs)
 
     def get_context_data(self, **kwargs):
-        return super().get_context_data(**kwargs) | {"album": self.object.parent}
+        return super().get_context_data(**kwargs) | {
+            "album": Album.objects.get(children=self.object)
+        }
 
 
 def send_album(request, album_id):
-    album = get_object_or_404(Album, id=album_id)
-    if not album.can_be_viewed_by(request.user):
-        raise PermissionDenied
-    return send_raw_file(Path(album.thumbnail.path))
+    return send_file(request, album_id, Album)
 
 
 def send_pict(request, picture_id):
-    picture = get_object_or_404(Picture, id=picture_id)
-    if not picture.can_be_viewed_by(request.user):
-        raise PermissionDenied
-    return send_raw_file(Path(picture.original.path))
+    return send_file(request, picture_id, Picture)
 
 
 def send_compressed(request, picture_id):
-    picture = get_object_or_404(Picture, id=picture_id)
-    if not picture.can_be_viewed_by(request.user):
-        raise PermissionDenied
-    return send_raw_file(Path(picture.compressed.path))
+    return send_file(request, picture_id, Picture, "compressed")
 
 
 def send_thumb(request, picture_id):
-    picture = get_object_or_404(Picture, id=picture_id)
-    if not picture.can_be_viewed_by(request.user):
-        raise PermissionDenied
-    return send_raw_file(Path(picture.thumbnail.path))
+    return send_file(request, picture_id, Picture, "thumbnail")
 
 
-class AlbumView(CanViewMixin, UseFragmentsMixin, FormMixin, DetailView):
+class AlbumView(CanViewMixin, UseFragmentsMixin, DetailView):
     model = Album
     pk_url_kwarg = "album_id"
     template_name = "sas/album.jinja"
-    form_class = PictureUploadForm
 
     def get_fragments(self) -> dict[str, FragmentRenderer]:
         return {
@@ -172,32 +142,27 @@ class AlbumView(CanViewMixin, UseFragmentsMixin, FormMixin, DetailView):
         except ValueError as e:
             raise Http404 from e
         if "clipboard" not in request.session:
-            request.session["clipboard"] = {"albums": [], "pictures": []}
+            request.session["clipboard"] = []
         return super().dispatch(request, *args, **kwargs)
 
-    def get_form(self, *args, **kwargs):
-        if not self.request.user.can_edit(self.object):
-            return None
-        return super().get_form(*args, **kwargs)
-
     def post(self, request, *args, **kwargs):
         self.object = self.get_object()
-        form = self.get_form()
-        if not form:
-            # the form is reserved for users that can edit this album.
-            # If there is no form, it means the user has no right to do a POST
-            raise PermissionDenied
-        FileView.handle_clipboard(self.request, self.object)
-        if not form.is_valid():
-            return self.form_invalid(form)
-        return self.form_valid(form)
+        if not self.object.file:
+            self.object.generate_thumbnail()
+        if request.user.can_edit(self.object):  # Handle the copy-paste functions
+            FileView.handle_clipboard(request, self.object)
+        return HttpResponseRedirect(self.request.path)
 
     def get_fragment_data(self) -> dict[str, dict[str, Any]]:
         return {"album_create_fragment": {"owner": self.request.user}}
 
     def get_context_data(self, **kwargs):
         kwargs = super().get_context_data(**kwargs)
-        kwargs["clipboard"] = {}
+        if ids := self.request.session.get("clipboard", None):
+            kwargs["clipboard"] = SithFile.objects.filter(id__in=ids)
+        kwargs["upload_form"] = PictureUploadForm()
+        # if True, the albums will be fetched with a request to the API
+        # if False, the section won't be displayed at all
         kwargs["show_albums"] = (
             Album.objects.viewable_by(self.request.user)
             .filter(parent_id=self.object.id)
@@ -250,7 +215,7 @@ class ModerationView(TemplateView):
     def get_context_data(self, **kwargs):
         kwargs = super().get_context_data(**kwargs)
         kwargs["albums_to_moderate"] = Album.objects.filter(
-            is_moderated=False
+            is_moderated=False, is_in_sas=True, is_folder=True
         ).order_by("id")
         pictures = Picture.objects.filter(is_moderated=False).select_related("parent")
         kwargs["pictures"] = pictures

staticfiles/processors.py

@@ -182,12 +182,13 @@ class OpenApi:
                 path[action]["operationId"] = "_".join(
                     desc["operationId"].split("_")[:-1]
                 )
-
         schema = str(schema)
 
         if old_hash == sha1(schema.encode("utf-8")).hexdigest():
             logging.getLogger("django").info("✨ Api did not change, nothing to do ✨")
             return
 
-        out.write_text(schema)
+        with open(out, "w") as f:
+            _ = f.write(schema)
+
         return subprocess.Popen(["npm", "run", "openapi"])

subscription/static/bundled/subscription/creation-form-existing-user-index.ts

@@ -8,9 +8,9 @@ document.addEventListener("alpine:init", () => {
     async init() {
       const userSelect = document.getElementById("id_member") as HTMLSelectElement;
       userSelect.addEventListener("change", async () => {
-        await this.loadProfile(Number.parseInt(userSelect.value, 10));
+        await this.loadProfile(Number.parseInt(userSelect.value));
       });
-      await this.loadProfile(Number.parseInt(userSelect.value, 10));
+      await this.loadProfile(Number.parseInt(userSelect.value));
     },
 
     async loadProfile(userId: number) {

subscription/static/bundled/subscription/stats-index.ts

@@ -1,5 +1,4 @@
 import { BarController, BarElement, CategoryScale, Chart, LinearScale } from "chart.js";
-
 Chart.register(BarController, BarElement, CategoryScale, LinearScale);
 
 function getRandomColor() {
@@ -19,11 +18,13 @@ function getRandomColorUniq(list: string[]) {
 }
 function hexToRgb(hex: string) {
   // Expand shorthand form (e.g. "03F") to full form (e.g. "0033FF")
+  // biome-ignore lint/performance/useTopLevelRegex: Performance impact is minimal
   const shorthandRegex = /^#?([a-f\d])([a-f\d])([a-f\d])$/i;
   const hexrgb = hex.replace(shorthandRegex, (_m, r, g, b) => {
     return r + r + g + g + b + b;
   });
 
+  // biome-ignore lint/performance/useTopLevelRegex: Performance impact is minimal
   const result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hexrgb);
   return result
     ? {

timetable/static/bundled/timetable/generator-index.ts

@@ -63,10 +63,10 @@ function parseSlots(s: string): TimetableSlot[] {
       }
       const [startHour, startMin] = parsed.groups.startHour
         .split(":")
-        .map((i) => Number.parseInt(i, 10));
+        .map((i) => Number.parseInt(i));
       const [endHour, endMin] = parsed.groups.endHour
         .split(":")
-        .map((i) => Number.parseInt(i, 10));
+        .map((i) => Number.parseInt(i));
       return {
         ...parsed.groups,
         startSlot: Math.floor((startHour * 60 + startMin) / MINUTES_PER_SLOT),
@@ -157,7 +157,6 @@ document.addEventListener("alpine:init", () => {
           .map((c: TimetableSlot) => c.startHour)
           .reduce((res: string, hour: string) => (hour < res ? hour : res), "24:00")
           .split(":")[0],
-        10,
       );
       const res: [string, object][] = [];
       for (let i = 0; i <= this.endSlot - this.startSlot; i += 60 / MINUTES_PER_SLOT) {

vite.config.mts

@@ -2,8 +2,8 @@
 import { parse, resolve } from "node:path";
 import inject from "@rollup/plugin-inject";
 import { glob } from "glob";
+import { type AliasOptions, type UserConfig, defineConfig } from "vite";
 import type { Rollup } from "vite";
-import { type AliasOptions, defineConfig, type UserConfig } from "vite";
 import tsconfig from "./tsconfig.json";
 
 const outDir = resolve(__dirname, "./staticfiles/generated/bundled");