Merge branch 'develop' into na/backend/add-exclude-attending

Author: nabramow

.github/autoreviewers.yml

@@ -13,6 +13,8 @@ web Couchers-org/web:
 mobile Couchers-org/mobile:
   - 'app/mobile/**'
   - '!app/mobile/**/locales/*.json'
+fingerprints aapeliv:
+  - 'app/mobile/fingerprint*'
 locales tristanlabelle:
   - 'app/**/locales/*.json'
 i18n tristanlabelle:

app/.gitlab-ci.yml

@@ -1,3 +1,11 @@
+# suppress external PR pipelines: they duplicate the branch pipeline per PR
+# push (job rules key on CI_COMMIT_BRANCH, which is unset there yet matches)
+workflow:
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "external_pull_request_event"
+      when: never
+    - when: always
+
 stages:
   - protos
   - build
@@ -340,7 +348,7 @@ test:backend:
     - cp /app/.coverage.$CI_NODE_INDEX $CI_PROJECT_DIR/
     - cp /app/.test_durations.$CI_NODE_INDEX $CI_PROJECT_DIR/
     - mkdir -p $CI_PROJECT_DIR/artifacts/test_artifacts
-    - cp /app/test_artifacts/* $CI_PROJECT_DIR/artifacts/test_artifacts/ 2>/dev/null || true
+    - cp -r /app/test_artifacts/* $CI_PROJECT_DIR/artifacts/test_artifacts/ 2>/dev/null || true
   artifacts:
     reports:
       junit: junit-$CI_NODE_INDEX.xml
@@ -762,6 +770,7 @@ preview:backend:
     - aws s3 rm s3://$AWS_PREVIEW_BUCKET/test-artifacts/$CI_COMMIT_REF_SLUG/ --recursive
     - aws s3 cp artifacts/test_artifacts s3://$AWS_PREVIEW_BUCKET/test-artifacts/$CI_COMMIT_REF_SLUG/ --recursive 2>/dev/null || true
     - echo "Done, test artifacts available at https://$CI_COMMIT_SHORT_SHA--test-artifacts.$PREVIEW_DOMAIN/ and https://$CI_COMMIT_REF_SLUG--test-artifacts.$PREVIEW_DOMAIN/"
+    - echo "Sample emails index at https://$CI_COMMIT_SHORT_SHA--test-artifacts.$PREVIEW_DOMAIN/emails/index.html and https://$CI_COMMIT_REF_SLUG--test-artifacts.$PREVIEW_DOMAIN/emails/index.html"
   artifacts:
     paths:
       - artifacts/schema_dumps
@@ -888,12 +897,19 @@ build:mobile-ota-devtool:
     - npm ci
     - npx expo config --type public --json > ota-expo-config.json
     - |
+      # develop's preview keeps the build default (staging web)
+      WEB_BASE_URL=""
+      if [ "$CI_COMMIT_BRANCH" != "$RELEASE_BRANCH" ]; then
+        WEB_BASE_URL=$(node scripts/vercel-preview-url.mjs --branch "$CI_COMMIT_BRANCH" --sha "$CI_COMMIT_SHA")
+      fi
+      echo "web base url: ${WEB_BASE_URL:-(build default)}"
       for P in $OTA_PLATFORMS; do
         rm -rf dist
         npx expo export --platform "$P"
         RV=$(npx expo-updates fingerprint:generate --platform "$P" 2>/dev/null | node -e 'let s="";process.stdin.on("data",d=>s+=d).on("end",()=>process.stdout.write(JSON.parse(s).hash))')
         echo "fingerprint($P) = $RV"
-        node scripts/ota-stage.mjs --platform "$P" --runtime-version "$RV" --base-url "https://$CI_COMMIT_SHORT_SHA--ota.$PREVIEW_DOMAIN" --dist dist --out ota-out --expo-config ota-expo-config.json
+        node scripts/ota-bundle.mjs --platform "$P" --runtime-version "$RV" --base-url "https://$CI_COMMIT_SHORT_SHA--ota.$PREVIEW_DOMAIN" --dist dist --out ota-out --expo-config ota-expo-config.json ${WEB_BASE_URL:+--web-base-url "$WEB_BASE_URL"}
+        node scripts/ota-open-page.mjs --manifest-url "https://$CI_COMMIT_SHORT_SHA--ota.$PREVIEW_DOMAIN/$P/manifest" --out "ota-out/$P/open.html"
         npx --yes qrcode -o "ota-out/$P/qr.png" "couchers-devtool://expo-development-client/?url=https%3A%2F%2F$CI_COMMIT_SHORT_SHA--ota.$PREVIEW_DOMAIN%2F$P%2Fmanifest" < /dev/null
       done
   artifacts:
@@ -938,26 +954,40 @@ preview:mobile-ota-devtool:
         - app/mobile/**/*
         - app/scripts/**/*
 
+# posts the comment placeholder within seconds of the push
+preview:pr-comment-stub:
+  needs: []
+  stage: preview
+  image: python:3.14-slim
+  inherit:
+    default: false
+  # serialize comment writes across concurrent pipelines
+  resource_group: pr-preview-comment
+  script:
+    - pip install --quiet --no-cache-dir requests
+    - python app/scripts/pr_preview_comment.py --stub
+  rules:
+    - if: $CI_COMMIT_BRANCH != $RELEASE_BRANCH
+
 preview:pr-comment:
   needs:
+    - job: preview:pr-comment-stub
+      artifacts: false
     - job: preview:mobile-ota-devtool
       artifacts: false
+      optional: true
   stage: preview
   image: python:3.14-slim
   inherit:
     default: false
+  resource_group: pr-preview-comment
   variables:
     OTA_PLATFORMS: "ios android"
   script:
     - pip install --quiet --no-cache-dir requests
     - python app/scripts/pr_preview_comment.py
   rules:
-    - if: ($BUILD_MOBILE == "true") && ($CI_COMMIT_BRANCH == $RELEASE_BRANCH)
-    - if: ($BUILD_MOBILE == "true") && ($CI_COMMIT_BRANCH != $RELEASE_BRANCH)
-      changes:
-        - app/proto/**/*
-        - app/mobile/**/*
-        - app/scripts/**/*
+    - if: $CI_COMMIT_BRANCH != $RELEASE_BRANCH
 
 build:mobile-native-devtool:
   needs: ["protos"]
@@ -1009,7 +1039,7 @@ build:mobile-ota-staging:
         npx sentry-expo-upload-sourcemaps dist
         RV=$(npx expo-updates fingerprint:generate --platform "$P" 2>/dev/null | node -e 'let s="";process.stdin.on("data",d=>s+=d).on("end",()=>process.stdout.write(JSON.parse(s).hash))')
         echo "fingerprint($P) = $RV"
-        node scripts/ota-stage.mjs --platform "$P" --runtime-version "$RV" --base-url "$OTA_CDN_BASE" --dist dist --out ota-staging-out --expo-config ota-expo-config.json
+        node scripts/ota-bundle.mjs --platform "$P" --runtime-version "$RV" --base-url "$OTA_CDN_BASE" --dist dist --out ota-staging-out --expo-config ota-expo-config.json
         node scripts/ota-sign.mjs --dir "ota-staging-out/$P" --key-file ota-staging-private-key.pem --key-id staging
       done
     - rm -f ota-staging-private-key.pem
@@ -1216,7 +1246,7 @@ build:mobile-ota-prod:
         npx sentry-expo-upload-sourcemaps dist
         RV=$(npx expo-updates fingerprint:generate --platform "$P" 2>/dev/null | node -e 'let s="";process.stdin.on("data",d=>s+=d).on("end",()=>process.stdout.write(JSON.parse(s).hash))')
         echo "fingerprint($P) = $RV"
-        node scripts/ota-stage.mjs --platform "$P" --runtime-version "$RV" --base-url '__OTA_BUNDLE_BASE__' --dist dist --out ota-prod-out --expo-config ota-expo-config.json
+        node scripts/ota-bundle.mjs --platform "$P" --runtime-version "$RV" --base-url '__OTA_BUNDLE_BASE__' --dist dist --out ota-prod-out --expo-config ota-expo-config.json
         tar -C ota-prod-out/"$P" -czf "native-ota-dist/native-ota-$P-$CI_PIPELINE_ID-$CI_COMMIT_SHA.tar.gz" .
       done
   artifacts:

app/backend/src/couchers/constants.py

@@ -12,7 +12,9 @@
 
 EMAIL_REGEX = r"^[0-9a-z]([0-9a-z\-\_\+]|(\.[0-9a-z\-\_\+]))*@([0-9a-z\-]+\.)*[0-9a-z\-]+\.[a-z]{2,}$"
 
-# Must match the frontend pattern in app/web/utils/validation.ts
+# Must match the frontend values in app/web/utils/validation.ts
+VALID_NAME_MIN_LENGTH = 2
+VALID_NAME_MAX_LENGTH = 100
 VALID_NAME_REGEX = r"^[\p{L}'-]+(\s+[\p{L}'-]+)*$"
 
 BANNED_USERNAME_PHRASES = [

app/backend/src/couchers/context.py

@@ -72,6 +72,7 @@ def __init__(
         token: str | None,
         localization: LocalizationContext,
         sofa: str | None = None,
+        serialize_shadowed: bool,
     ):
         """Don't ever construct directly, always use the `make_*_context_` functions!"""
         self._grpc_context = grpc_context
@@ -80,6 +81,7 @@ def __init__(
         self.__token = token
         self.__localization = localization
         self._sofa = sofa
+        self.__serialize_shadowed = serialize_shadowed
         self.__is_interactive = is_interactive
         self.__logged_in = self._user_id is not None
         self.__cookies: list[str] = []
@@ -192,6 +194,10 @@ def token(self) -> str:
     def localization(self) -> LocalizationContext:
         return self.__localization
 
+    @property
+    def serialize_shadowed(self) -> bool:
+        return self.__serialize_shadowed
+
     # Feature-flag evaluation methods mirror the OpenFeature evaluation API, evaluating for this
     # context's user. The gating lives in experimentation; we just pass our cached per-request
     # evaluator. The in-code default is honored even for flags not yet set up in GrowthBook.
@@ -233,6 +239,7 @@ def make_interactive_context(
         token=token,
         localization=localization,
         sofa=sofa,
+        serialize_shadowed=False,
     )
 
 
@@ -244,6 +251,7 @@ def make_one_off_interactive_user_context(couchers_context: CouchersContext, use
         is_api_key=None,
         token=None,
         localization=couchers_context.localization,
+        serialize_shadowed=False,
     )
 
 
@@ -255,6 +263,7 @@ def make_media_context(grpc_context: grpc.ServicerContext) -> CouchersContext:
         grpc_context=grpc_context,
         token=None,
         localization=LocalizationContext.en_utc(),
+        serialize_shadowed=False,
     )
 
 
@@ -266,6 +275,19 @@ def make_background_user_context(user_id: int, localization: LocalizationContext
         grpc_context=None,
         token=None,
         localization=localization or LocalizationContext.en_utc(),
+        serialize_shadowed=False,
+    )
+
+
+def make_notification_user_context(user_id: int, localization: LocalizationContext | None = None) -> CouchersContext:
+    return CouchersContext(
+        is_interactive=False,
+        user_id=user_id,
+        is_api_key=None,
+        grpc_context=None,
+        token=None,
+        localization=localization or LocalizationContext.en_utc(),
+        serialize_shadowed=True,
     )
 
 
@@ -277,4 +299,5 @@ def make_logged_out_context(localization: LocalizationContext) -> CouchersContex
         grpc_context=None,
         token=None,
         localization=localization,
+        serialize_shadowed=False,
     )