Merge upstream develop

Author: github-actions[bot]

.gitlab/ci/deploy_docs.yml

@@ -71,8 +71,6 @@ docs-review-stop:
   variables:
     CF_PAGES_PROJECT: polycentric-docs
     CF_PAGES_BRANCH: mr-$CI_MERGE_REQUEST_IID
-    # Needs a git checkout for the cleanup script below
-    GIT_STRATEGY: none
   environment:
     name: review/docs/$CI_MERGE_REQUEST_IID
     action: stop

services/server/migration/src/lib.rs

@@ -16,6 +16,7 @@ mod m20260617_000002_drop_push_token_table;
 mod m20260618_000001_timestamps_to_timestamptz;
 mod m20260625_000001_add_event_key_indices;
 mod m20260630_000001_add_verification_tables;
+mod m20260707_164130_add_indices_for_sorting;
 
 pub struct Migrator;
 
@@ -32,13 +33,14 @@ impl MigratorTrait for Migrator {
             Box::new(m20260526_000002_add_content_repost_table::Migration),
             Box::new(m20260528_000001_reaction_opinion_to_positive::Migration),
             Box::new(m20260601_000001_add_content_report_table::Migration),
-            Box::new(m20260604_000001_add_content_label_table::Migration),
             Box::new(m20260601_000001_add_follower_lookup_indexes::Migration),
+            Box::new(m20260604_000001_add_content_label_table::Migration),
             Box::new(m20260617_000001_add_notification_table::Migration),
             Box::new(m20260617_000002_drop_push_token_table::Migration),
             Box::new(m20260618_000001_timestamps_to_timestamptz::Migration),
             Box::new(m20260625_000001_add_event_key_indices::Migration),
             Box::new(m20260630_000001_add_verification_tables::Migration),
+            Box::new(m20260707_164130_add_indices_for_sorting::Migration),
         ]
     }
 }

services/server/migration/src/m20260707_164130_add_indices_for_sorting.rs

@@ -0,0 +1,91 @@
+use ::entity::{event_model, notification};
+use sea_orm_migration::prelude::*;
+
+/// `notification_to_identity_id_idx`: `list_notifications` grabs the notifications
+/// for an identity reverse sorted by the primary key.
+///
+/// `events_collection_created_at_id_idx`: feeds are sorted in reverse-chronological
+/// order, with the primary key as a fallback to keep the sort order stable.
+///
+/// `events_identity_heads_idx`: `list_heads` gets only the head for each "event stream"
+/// for efficient syncing.
+#[derive(DeriveMigrationName)]
+pub struct Migration;
+
+#[async_trait::async_trait]
+impl MigrationTrait for Migration {
+    async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> {
+        manager
+            .create_index(
+                Index::create()
+                    .if_not_exists()
+                    .name("notification_to_identity_id_idx")
+                    .table(notification::Entity)
+                    .col(notification::Column::ToIdentity)
+                    .col(notification::Column::Id)
+                    .to_owned(),
+            )
+            .await?;
+
+        manager
+            .create_index(
+                Index::create()
+                    .if_not_exists()
+                    .name("events_collection_created_at_id_idx")
+                    .table(event_model::Entity)
+                    .col(event_model::Column::Collection)
+                    .col(event_model::Column::CreatedAt)
+                    .col(event_model::Column::Id)
+                    .to_owned(),
+            )
+            .await?;
+
+        manager
+            .create_index(
+                Index::create()
+                    .if_not_exists()
+                    .name("events_identity_heads_idx")
+                    .table(event_model::Entity)
+                    .col(event_model::Column::Identity)
+                    .col(event_model::Column::PublicKeyType)
+                    .col(event_model::Column::PublicKey)
+                    .col(event_model::Column::Collection)
+                    .col(event_model::Column::Sequence)
+                    .to_owned(),
+            )
+            .await?;
+
+        Ok(())
+    }
+
+    async fn down(&self, manager: &SchemaManager) -> Result<(), DbErr> {
+        manager
+            .drop_index(
+                Index::drop()
+                    .name("events_identity_heads_idx")
+                    .table(event_model::Entity)
+                    .to_owned(),
+            )
+            .await?;
+
+        manager
+            .drop_index(
+                Index::drop()
+                    .name("events_collection_created_at_id_idx")
+                    .table(event_model::Entity)
+                    .to_owned(),
+            )
+            .await?;
+
+        manager
+            .drop_index(
+                Index::drop()
+                    .name("notification_to_identity_id_idx")
+                    .table(notification::Entity)
+                    .to_owned(),
+            )
+            .await?;
+
+        Ok(())
+    }
+}