Communities: order by NodeType enum, drop home-first, keyset pagination

Address @aapeliv review on #9270: order ListUserCommunities directly by the
NodeType ordinal (node_type.desc()) instead of a CASE rank; remove the
is_home/ST_Contains home-first sort; replace offset with a keyset page token
(node_type, name, id) so filtering happens in SQL. Revert hand-edits to the
Weblate-managed non-English locale files — only en.json changes by hand.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

Author: kevinortiz43

app/backend/src/couchers/servicers/communities.py

@@ -1,12 +1,13 @@
+import json
 import logging
 from collections.abc import Sequence
 from datetime import timedelta
 
 import grpc
 from google.protobuf import empty_pb2
-from sqlalchemy import case, select
+from sqlalchemy import select
 from sqlalchemy.orm import Session, selectinload
-from sqlalchemy.sql import delete, func, or_
+from sqlalchemy.sql import and_, delete, func, or_
 
 from couchers.constants import COMMUNITIES_SEARCH_FUZZY_SIMILARITY_THRESHOLD
 from couchers.context import CouchersContext
@@ -570,40 +571,47 @@ def ListUserCommunities(
         self, request: communities_pb2.ListUserCommunitiesReq, context: CouchersContext, session: Session
     ) -> communities_pb2.ListUserCommunitiesRes:
         page_size = min(MAX_PAGINATION_LENGTH, request.page_size or MAX_PAGINATION_LENGTH)
-        offset = int(decrypt_page_token(request.page_token)) if request.page_token else 0
         user_id = request.user_id or context.user_id
 
-        user_geom = select(User.geom).where(User.id == user_id).scalar_subquery()
-        type_rank = case(
-            (Node.node_type == NodeType.locality, 0),
-            (Node.node_type == NodeType.sublocality, 1),
-            (Node.node_type == NodeType.subregion, 2),
-            (Node.node_type == NodeType.region, 3),
-            (Node.node_type == NodeType.macroregion, 4),
-            (Node.node_type == NodeType.world, 5),
-            else_=6,
+        query = (
+            select(Node)
+            .join(Cluster, Cluster.parent_node_id == Node.id)
+            .join(ClusterSubscription, ClusterSubscription.cluster_id == Cluster.id)
+            .where(ClusterSubscription.user_id == user_id)
+            .where(Cluster.is_official_cluster)
         )
-        is_home = func.ST_Contains(Node.geom, user_geom)
+
+        if request.page_token:
+            cursor_node_type_name, cursor_name, cursor_id = json.loads(decrypt_page_token(request.page_token))
+            cursor_node_type = NodeType[cursor_node_type_name]
+            query = query.where(
+                or_(
+                    Node.node_type < cursor_node_type,
+                    and_(Node.node_type == cursor_node_type, Cluster.name > cursor_name),
+                    and_(Node.node_type == cursor_node_type, Cluster.name == cursor_name, Node.id > cursor_id),
+                )
+            )
 
         nodes = (
             session.execute(
-                select(Node)
-                .join(Cluster, Cluster.parent_node_id == Node.id)
-                .join(ClusterSubscription, ClusterSubscription.cluster_id == Cluster.id)
-                .where(ClusterSubscription.user_id == user_id)
-                .where(Cluster.is_official_cluster)
-                .order_by(type_rank, is_home.desc(), Cluster.name.asc(), Node.id.asc())
+                query.order_by(Node.node_type.desc(), Cluster.name.asc(), Node.id.asc())
                 .limit(page_size + 1)
-                .offset(offset)
                 .options(selectinload(Node.official_cluster))
             )
             .scalars()
             .all()
         )
 
+        next_page_token = None
+        if len(nodes) > page_size:
+            last_node = nodes[page_size - 1]
+            next_page_token = encrypt_page_token(
+                json.dumps([last_node.node_type.name, last_node.official_cluster.name, last_node.id])
+            )
+
         return communities_pb2.ListUserCommunitiesRes(
             communities=communities_to_pb(session, nodes[:page_size], context),
-            next_page_token=encrypt_page_token(str(offset + page_size)) if len(nodes) > page_size else None,
+            next_page_token=next_page_token,
         )
 
     def ListAllCommunities(

app/backend/src/tests/test_communities.py

@@ -1248,46 +1248,52 @@ def test_LeaveCommunity_regression(db):
         assert not api.GetCommunity(communities_pb2.GetCommunityReq(community_id=c2_id)).member
 
 
-def test_ListUserCommunities_orders_locality_first_then_home_then_name(db):
-    user, token = generate_user(username="orderuser", geom=create_1d_point(20), geom_radius=0.1)
-    other_admin, _ = generate_user(username="orderuser_stateadmin")
+def test_ListUserCommunities_orders_locality_first_then_name(db):
+    user, token = generate_user(username="orderuser")
 
     with session_scope() as session:
         world = create_community(session, 0, 100, "World", [user], [], None)
         continent = create_community(session, 0, 90, "Continent", [user], [], world)
-        home_country = create_community(session, 10, 50, "Zzz Home Country", [user], [], continent)
-        other_country = create_community(session, 60, 80, "Aaa Country", [user], [], continent)
-        state = create_community(session, 15, 30, "State", [other_admin], [], home_country)
-        home_city = create_community(session, 18, 22, "Zzz Home City", [user], [], state)
-        other_city = create_community(session, 23, 26, "Aaa City", [user], [], state)
+        country_a = create_community(session, 0, 30, "Aaa Country", [user], [], continent)
+        country_z = create_community(session, 30, 60, "Zzz Country", [user], [], continent)
+        city_a = create_community(session, 0, 10, "Aaa City", [user], [], country_a)
+        city_m = create_community(session, 10, 20, "Mmm City", [user], [], country_a)
+        city_z = create_community(session, 20, 30, "Zzz City", [user], [], country_a)
 
         world_id = world.id
         continent_id = continent.id
-        home_country_id = home_country.id
-        other_country_id = other_country.id
-        home_city_id = home_city.id
-        other_city_id = other_city.id
+        country_a_id = country_a.id
+        country_z_id = country_z.id
+        city_a_id = city_a.id
+        city_m_id = city_m.id
+        city_z_id = city_z.id
+
+    expected_order = [
+        city_a_id,
+        city_m_id,
+        city_z_id,
+        country_a_id,
+        country_z_id,
+        continent_id,
+        world_id,
+    ]
 
     with communities_session(token) as api:
         res = api.ListUserCommunities(communities_pb2.ListUserCommunitiesReq())
-        assert [c.community_id for c in res.communities] == [
-            home_city_id,
-            other_city_id,
-            home_country_id,
-            other_country_id,
-            continent_id,
-            world_id,
-        ]
-
-        res = api.ListUserCommunities(communities_pb2.ListUserCommunitiesReq(page_size=3))
-        assert [c.community_id for c in res.communities] == [home_city_id, other_city_id, home_country_id]
-        assert res.next_page_token
-
-        res = api.ListUserCommunities(
-            communities_pb2.ListUserCommunitiesReq(page_size=3, page_token=res.next_page_token)
-        )
-        assert [c.community_id for c in res.communities] == [other_country_id, continent_id, world_id]
-        assert not res.next_page_token
+        assert [c.community_id for c in res.communities] == expected_order
+
+        seen: list[int] = []
+        page_token = ""
+        for _ in range(len(expected_order) + 1):
+            res = api.ListUserCommunities(communities_pb2.ListUserCommunitiesReq(page_size=2, page_token=page_token))
+            seen.extend(c.community_id for c in res.communities)
+            if not res.next_page_token:
+                break
+            page_token = res.next_page_token
+        else:
+            pytest.fail("pagination did not terminate within the expected number of pages")
+
+        assert seen == expected_order
 
 
 def test_enforce_community_memberships_for_user(testing_communities):

app/web/features/dashboard/locales/ca.json

@@ -15,6 +15,7 @@
   "welcome": "Benvingut a Couchers.org!",
   "new_pill": "Nou",
   "your_communities_helper_text": "T'han afegit a totes les comunitats basant-se en la teva ubicació. Pots <1>explorar comunitats</1> en altres ubicacions.",
+  "your_communities_helper_text2": "No trobes la teva comunitat? <1>Posa-la en marxa!</1>",
   "community_builder_form_text": "Crea la teva pròpia comunitat local",
   "communities_welcome_title": "Benvingut a les Comunitats",
   "community_builder": "Vols ser un ambaixador de la teva comunitat i ajudar-la a créixer? Sigues un <1>Impulsor de Comunitat!</1>",

app/web/features/dashboard/locales/cs.json

@@ -12,6 +12,7 @@
   "all_communities_heading": "Všechny komunity",
   "no_community": "Momentálně nejsi v žádné komunitě.",
   "your_communities_helper_text": "Přidali jsme tě do všech komunit na základě tvé polohy. Neváhej však <1>procházet komunity</1> i v jiných lokalitách.",
+  "your_communities_helper_text2": "Nevidíš svou komunitu? <1>Založ ji!</1>",
   "community_builder_form_text": "Založ si vlastní místní komunitu",
   "communities_welcome_title": "Vítej v Komunitách",
   "community_builder": "Chceš být ambasadorem své komunity a pomoci jí růst? Staň se <1>budovatelem komunity!</1>",
@@ -44,10 +45,14 @@
   "hero_image_attribution": "Foto: <1>Mesut Kaya</1> na <3>Unsplash</3>",
   "reminder": {
     "complete_profile": {
-      "button": "Upravit svůj profil"
+      "button": "Upravit svůj profil",
+      "title": "Dokonči svůj profil",
+      "description": "Vyplň svojí sekci \"Kdo jsem\" a nahraj profilovou fotku"
     },
     "strong_verification": {
-      "description": "Ověř svoji identitu pro bezpečnější komunitu"
+      "description": "Ověř svoji identitu pro bezpečnější komunitu",
+      "title": "Silné ověření",
+      "button": "Ověř svůj účet"
     },
     "respond_to_host_request": {
       "description": "Nezapomeň odpovědět na žádost o ubytování od {{name}}.",
@@ -56,14 +61,36 @@
     },
     "write_reference": {
       "title": "Napsat referenci",
-      "description_surfed": "Zanech referenci na svůj pobyt u {{name}}"
+      "description_surfed": "Zanech referenci na svůj pobyt u {{name}}",
+      "button": "Napiš referenci",
+      "description_hosted": "Zanech referenci na pobyt {{name}} u tebe"
+    },
+    "complete_my_home": {
+      "title": "Dokonči sekci \"Můj domov\" ve svém profilu",
+      "description": "Vyplň informace o uspořádání spaní, domácí řád a popis vašeho ubytování",
+      "button": "Uprav svůj domov"
+    },
+    "carousel_dismiss_button_a11y": "Zavřít upozornění",
+    "carousel_scroller": {
+      "left_arrow_a11y": "Posunout doleva",
+      "right_arrow_a11y": "Posunout doprava"
+    },
+    "confirm_host_request": {
+      "title": "Potvrď svůj pobyt u {{name}}",
+      "button": "Potvrď pobyt"
     }
   },
   "public_trips": {
     "when_tomorrow": "Zítra",
     "when_today": "Dnes",
     "manage_link": "Spravovat",
-    "when_now": "Nyní"
+    "when_now": "Nyní",
+    "empty_description": "Chystáš se někam? Zveřejni veřejnou cestu v komunitě a získej tak nabídky od hostitelů v okolí.",
+    "same_gender_only_indicator": "Stejné pohlaví",
+    "offers_count_one": "{{count}} nabídka",
+    "offers_count_few": "{{count}} nabídky",
+    "offers_count_other": "{{count}} nabídek",
+    "no_offers": "Zatím žádné nabídky"
   },
   "prev_page_button_a11y": "Předchozí stránka",
   "next_page_button_a11y": "Následující stránka",
@@ -88,6 +115,7 @@
     "night_count_one": "{{count}} noc",
     "night_count_few": "{{count}} noci",
     "night_count_other": "{{count}} nocí",
-    "no_upcoming_guests": "Zatím žádní nadcházející hosté."
+    "no_upcoming_guests": "Zatím žádní nadcházející hosté.",
+    "no_upcoming_trips": "Žádné nadcházející cesty. Připraveni objevovat?"
   }
 }

app/web/features/dashboard/locales/de.json

@@ -19,6 +19,7 @@
   "landing_text": "Wir entwickeln neue <1>Funktionen</1> wie Events, Local Guides, Moderation und Hangouts. Wir danken euch für eure Geduld und <3>Unterstützung</3> bei der Entwicklung.",
   "your_communities_helper_text": "Du wurdest zu allen Communitys hinzugefügt, die sich auf deinen Standort beziehen. Du kannst auch an anderen Orten <1>Communitys durchsuchen</1>.",
   "community_builder_form_text": "Gründen deine eigene lokale Community",
+  "your_communities_helper_text2": "Siehst du deine Community nicht? <1>Gründe sie!</1>",
   "member_count_one": "{{count}} Mitglied",
   "member_count_other": "{{count}} Mitglieder",
   "profile_summary_edit": "Profil bearbeiten",

app/web/features/dashboard/locales/es.json

@@ -16,6 +16,7 @@
   "profile_mobile_summary_view": "Ir al perfil",
   "find_a_host": "Buscar anfitrión",
   "your_communities_helper_text": "Se te ha añadido a todas las comunidades basándonos en tu ubicación. También eres libre de <1>explorar comunidades</1> en otras ubicaciones.",
+  "your_communities_helper_text2": "¿No ves tu comunidad? <1>¡Créala!</1>",
   "community_builder_form_text": "Crear tu propia comunidad local",
   "no_sub_communities": "Sin sub-comunidades.",
   "browse_communities": "Explorar las comunidades",

app/web/features/dashboard/locales/fr.json

@@ -16,6 +16,7 @@
   "member_count_other": "{{count}} membres",
   "profile_summary_edit": "Rédiger mon profil",
   "profile_summary_view": "Voir mon profil",
+  "your_communities_helper_text2": "Ne voyez-vous pas votre communauté ? <1>Créez la vôtre !</1>",
   "community_builder_form_text": "Créez votre propre communauté locale",
   "landing_text": "Nous développons actuellement de nouvelles <1>fonctionnalités</1>, telles que les événements, les guides locaux, la modération et la fonction de traîner. Nous vous remercions de votre patience et de votre soutien pendant leur développement.",
   "show_map": "Montrer la carte",

app/web/features/dashboard/locales/it.json

@@ -3,11 +3,29 @@
   "please_complete_profile": "Completa il tuo profilo in modo da comparire nei risultati di ricerca:",
   "fill_in_who_i_am": "1. Completa la sezione \"Chi sono\" con alcune frasi su di te",
   "upload_photo": "2. Carica una foto (cliccando sull'avatar nella pagina di modifica)",
-  "your_communities_heading": "Le tue comunità",
-  "all_communities_heading": "Tutte le comunità",
+  "your_communities_heading": "Le tue community",
+  "all_communities_heading": "Tutte le community",
   "load_more": "Carica altro",
   "welcome": "Benvenuto in Couchers.org!",
   "new_pill": "Nuovo",
   "landing_text": "Stiamo sviluppando nuove <1>funzionalità</1> come eventi, guide locali, moderazione e ritrovi. Apprezziamo la tua pazienza ed il tuo <3>supporto</3> durante lo sviluppo.",
-  "your_communities_helper_text": "Sei stato aggiunto a tutte le comunità in base alla tua posizione. Sentiti libero di <1>esplorare le comunità</1> anche in altre località."
+  "your_communities_helper_text": "Fai parte di tutte le community relative alla tua posizione. Se ti va, puoi sempre <1>esplorare le community</1> anche in altre località.",
+  "complete_profile_explanation": "Non odi il fatto che su altre piattaforme ci siano profili \"fantasma\" vuoti e senza informazioni? Per favore non ghostarci! 👻👻👻",
+  "no_community": "Attualmente non sei in alcuna community.",
+  "no_sub_communities": "Nessuna sotto-community.",
+  "your_communities_helper_text2": "Non vedi la tua community? <1>Creala!</1>",
+  "community_builder_form_text": "Crea la tua community locale",
+  "communities_welcome_title": "Benvenuto nel portale community",
+  "communities_intro": "Per aiutare la gente in tutto il mondo a organizzare eventi, discussioni e incontri, abbiamo creato il portale delle community, che sono riportate qui sotto. <strong>Fai automaticamente parte di alcune di queste in base alla tua posizione geografica, ma puoi unirti a qualsiasi community tu voglia!</strong> Le tue community sono riportate nella bacheca.",
+  "community_builder": "Vuoi essere un ambasciatore per la tua community e aiutare a farla crescere? Diventa un <1>Community Builder!</1>",
+  "my_communities_heading": "Le mie community",
+  "find_your_community": "Trova una community",
+  "find_your_community_intro": "Qui sotto puoi cercare o navigare tutte le community che esistono finora. Manca il tuo paese o la tua città? <1>Usa questo form</1> per richiederlo!",
+  "find_your_community_intro_simplified": "Cerca la tua community o naviga qui sotto. <1>Non trovi la tua? Richiedila!</1>",
+  "browse_communities": "Esplora le community",
+  "browse_all_communities": "Esplora tutte le community",
+  "browse_communities_text": "Clicca sul nome di una regione per vedere le altre community contenute all'interno. Clicca sul link per vedere la pagina della community di quella specifica città o regione.",
+  "show_all_communities": "Mostra tutte le community",
+  "hide_all_communities": "Nascondi tutte le community",
+  "all_communities_section": "Tutte le community"
 }

app/web/features/dashboard/locales/nl.json

@@ -12,6 +12,7 @@
   "load_more": "Meer laden",
   "new_pill": "Nieuw",
   "your_communities_helper_text": "Je bent op basis van je locatie automatisch toegevoegd aan een aantal communities. Natuurlijk kan je ook door <1>communities bladeren</1> van andere locaties.",
+  "your_communities_helper_text2": "Zie je jouw community niet? <1>Begin hem zelf!</1>",
   "community_builder_form_text": "Begin jouw eigen lokale community",
   "communities_welcome_title": "Welkom bij Communities",
   "landing_text": "We bouwen nieuwe <1>functionaliteiten</1> zoals events, lokale gidsen, moderatie en hangouts. We waarderen je geduld en <3>support</3> tijdens het wachten hierop.",

app/web/features/dashboard/locales/pt.json

@@ -6,6 +6,7 @@
   "hero_image_alt": "Balões de ar quente na Capadócia",
   "hero_image_attribution": "Fotografia por <1>Mesut Kaya</1> em <3>Unsplash</3>",
   "become_a_host": "Torna-te um anfitrião",
+  "your_communities_helper_text2": "Não vês a tua comunidade? <1>Começa-a aqui!</1>",
   "search_input_label": "Para onde vais?",
   "complete_profile_explanation": "Não detestas quando as outras plataformas têm perfis \"fantasma\", vazios, sem nenhuma informação. Por favor, não sejas um fantasma aqui! 👻👻👻",
   "no_sub_communities": "Sem subcomunidades.",