Handle merge conflicts

Author: nabramow

.github/autoreviewers.yml

@@ -0,0 +1,21 @@
+# Defines PR reviewers based on modified file paths.
+# This is an input to the dorny/paths-filter GitHub action,
+# configured to match rules if EVERY glob applies (to support exclusions).
+# Filter names are a label plus a comma-delimited people/teams to assign.
+backend Couchers-org/backend:
+  - 'app/backend/**'
+  - '!app/backend/**/locales/*.json'
+media Couchers-org/backend:
+  - 'app/media/**'
+web Couchers-org/web:
+  - 'app/web/**'
+  - '!app/web/**/locales/*.json'
+mobile Couchers-org/mobile:
+  - 'app/mobile/**'
+  - '!app/mobile/**/locales/*.json'
+locales tristanlabelle:
+  - 'app/**/locales/*.json'
+i18n tristanlabelle:
+  - 'app/**/i18n/**'
+docs aapeliv,nabramow:
+  - 'docs/**'

.github/pull_request_template.md

@@ -29,6 +29,7 @@ Fill applicable checklists below, or remove those that don't apply.
 - [x] Maintainers can merge this PR for me
 
 <!--
-Remember to request review from couchers-org/web, couchers-org/backend or an individual.
+Create the code review as a draft if still iterating or validating via CI.
+Once published, reviewers will be added based on changes, but feel free to add more.
 Once your code is approved, you can merge it if you have write access.
 --->

.github/workflows/add-reviewers.yml

@@ -0,0 +1,88 @@
+# [WIP] Currently fails to add team reviewers
+# Adds reviewers upon publishing a PR based on changed files.
+# Works around limitations of GitHub's CODEOWNERS, which can only match one rule,
+# whereas our changes can straddle frontend and backend, for example.
+name: Add reviewers
+
+# on:
+#   pull_request:
+#     types: [opened, ready_for_review, reopened]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+  pull-requests: write
+
+jobs:
+  add-reviewers:
+    name: Add reviewers
+    runs-on: ubuntu-latest
+    if: "!github.event.pull_request.draft"
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          sparse-checkout: .github/autoreviewers.yml
+
+      - name: Match rules from autoreviewers.yml
+        uses: dorny/paths-filter@v4
+        id: filter
+        with:
+          filters: .github/autoreviewers.yml
+          # Require every glob to match for a rule to match,
+          # otherwise we cannot express exclusions.
+          # e.g. 'app/web/**' + '!**/en.json' needs to be AND, not OR
+          predicate-quantifier: every
+
+      - name: Collect reviewers from matched rules
+        id: collect-reviewers
+        env:
+          PR_AUTHOR: ${{ github.event.pull_request.user.login }}
+          # The "changes" output is a JSON array of filter names.
+          FILTER_CHANGES: ${{ steps.filter.outputs.changes }}
+        run: |
+          # Filter keys are "<name> <reviewer1,reviewer2,...>"; process matched filters.
+          REVIEWERS=()
+          while IFS= read -r entry; do
+            [[ -n "$entry" ]] || continue
+            RULE_NAME="${entry%% *}"
+            REVIEWERS_STR="${entry#* }"
+
+            echo "Matched rule \"$RULE_NAME\" with reviewers: $REVIEWERS_STR"
+            IFS=',' read -ra reviewers <<< "$REVIEWERS_STR"
+            for reviewer in "${reviewers[@]}"; do
+              [[ -n "$reviewer" ]] || continue
+              # The PR author cannot be a reviewer on their own PR
+              [[ "$reviewer" == "$PR_AUTHOR" ]] && continue
+              # Avoid adding the same reviewer twice
+              [[ " ${REVIEWERS[*]} " == *" $reviewer "* ]] && continue
+              REVIEWERS+=("$reviewer")
+            done
+          done < <(echo "$FILTER_CHANGES" | jq -r '.[]')
+
+          if [[ ${#REVIEWERS[@]} -gt 0 ]]; then
+            echo "Collected reviewers: $(IFS=','; echo "${REVIEWERS[*]}")"
+          else
+            echo "No reviewers collected"
+          fi
+
+          echo "reviewers=$(IFS=','; echo "${REVIEWERS[*]}")" >> "$GITHUB_OUTPUT"
+
+      - name: Add reviewers
+        if: steps.collect-reviewers.outputs.reviewers != ''
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_REPO: ${{ github.repository }}
+          PR_NUMBER: ${{ github.event.pull_request.number }}
+          REVIEWERS: ${{ steps.collect-reviewers.outputs.reviewers }}
+        run: |
+          GH_PR_EDIT_ARGS=()
+          IFS=',' read -ra reviewers <<< "$REVIEWERS"
+          for reviewer in "${reviewers[@]}"; do
+            GH_PR_EDIT_ARGS+=(--add-reviewer "$reviewer")
+          done
+
+          echo "Adding reviewers: $REVIEWERS"
+          gh pr edit "$PR_NUMBER" "${GH_PR_EDIT_ARGS[@]}"

app/backend/src/couchers/email/calendar_events.py

@@ -25,17 +25,23 @@ def create_host_request_ics(
     host_request: HostRequest, other_name: str, hosting: bool, loc_context: LocalizationContext
 ) -> str:
     event = create_host_request_event(host_request, other_name, hosting, loc_context)
-    return event_to_ics(event, loc_context)
+
+    # METHOD:PUBLISH means this is part of a stream of calendar event information.
+    # It allows for later cancellation, and doesn't expose accept/decline functionality.
+    return event_to_ics(event, "PUBLISH", loc_context)
 
 
 def create_host_request_event(
-    host_request: HostRequest, other_name: str, hosting: bool, loc_context: LocalizationContext
+    host_request: HostRequest, other_name: str, hosting: bool, loc_context: LocalizationContext, sequence: int = 0
 ) -> Event:
     """Creates an ics event for a host request."""
 
     event = Event()
     event.uid = get_host_request_event_uid(host_request.host_request_id)
 
+    # Explicitly allow later sequencing of a cancellation with SEQUENCE:1
+    event.extra.append(ContentLine(name="SEQUENCE", value=str(sequence)))
+
     if hosting:
         event.name = get_emails_i18next().localize(
             "calendar_events.host_requests.title_host", loc_context.locale, {"name": other_name}
@@ -70,23 +76,23 @@ def create_host_request_cancellation_attachment(
 def create_host_request_cancellation_ics(
     host_request: HostRequest, other_name: str, hosting: bool, loc_context: LocalizationContext
 ) -> str:
-    event = create_host_request_event(host_request, other_name, hosting, loc_context)
+    event = create_host_request_event(host_request, other_name, hosting, loc_context, sequence=1)
     event.name = get_emails_i18next().localize(
         "calendar_events.title_cancelled", loc_context.locale, {"title": event.name}
     )
     event.status = "CANCELLED"
 
-    # Cancellation is sequenced after creation (which defaults to sequence number 0)
-    event.extra.append(ContentLine(name="SEQUENCE", value="1"))
-
-    return event_to_ics(event, loc_context)
+    # METHOD:PUBLISH means this is part of a stream of calendar event information.
+    # Gmail™ will immediately remove the event from the user's calendar.
+    # METHOD:CANCEL might leave the event in cancelled state or not work.
+    return event_to_ics(event, "PUBLISH", loc_context)
 
 
-def event_to_ics(event: Event, loc_context: LocalizationContext) -> str:
+def event_to_ics(event: Event, method: str | None, loc_context: LocalizationContext) -> str:
     # PRODID is mandatory and generally follows "-//[Organization]//[Product Name]//[Language]"
     calendar = Calendar(creator=f"-//Couchers.org//Couchers//{loc_context.locale.upper()}")
-    if event.status == "CANCELLED":
-        calendar.method = "CANCEL"
+    if method:
+        calendar.method = method
     calendar.events.add(event)
     return cast(str, calendar.serialize())
 

app/backend/src/couchers/i18n/locales/de.json

@@ -246,7 +246,11 @@
     "public_trip_user_mismatch": "Der Empfänger der Host-Anfrage stimmt nicht mit dem Reisenden des öffentlichen Trips überein.",
     "public_trips_not_enabled": "Öffentliche Trips sind in dieser Community nicht aktiviert.",
     "duplicate_host_request_for_trip": "Du hast bereits angeboten, diesen Trip zu hosten.",
-    "public_trip_same_gender_only": "Dieser Trip akzeptiert nur Angebote von Personen des gleichen Geschlechts."
+    "public_trip_same_gender_only": "Dieser Trip akzeptiert nur Angebote von Personen des gleichen Geschlechts.",
+    "incomplete_profile_send_friend_request": "Du musst dein Profil vervollständigen, bevor du eine Freundschafts-Anfrage senden kannst.",
+    "admin_note_data_must_be_valid_json": "Die Admin-Notiz-Daten müssen gültiges JSON sein.",
+    "admin_note_requires_exactly_one_of_note_or_data": "Gib genau eines an, admin_note oder data.",
+    "invalid_password_login": "Benutzername/E-Mail oder Passwort ist falsch."
   },
   "quick_links": {
     "do_not_email": "Du wirst keine E-Mails mehr erhalten, die nicht sicherheitsrelevant sind, und dein Hosting-Status wurde zurückgesetzt. Der Newsletter muss separat abbestellt werden.",

app/backend/src/couchers/i18n/locales/en.json

@@ -7,6 +7,8 @@
     "admin_blog_title_too_long": "The blog post title is too long.",
     "admin_cannot_edit_badge": "Admins cannot edit that badge.",
     "admin_note_cant_be_empty": "The admin note cannot be empty.",
+    "admin_note_data_must_be_valid_json": "The admin note data must be valid JSON.",
+    "admin_note_requires_exactly_one_of_note_or_data": "Provide exactly one of admin_note or data.",
     "already_admin": "That user is already an admin.",
     "already_have_dm": "You already have a direct message chat with this user.",
     "already_in_chat": "That user is already in the chat.",
@@ -127,6 +129,7 @@
     "invalid_name": "Name not supported.",
     "invalid_notification_preference": "Invalid notification preference.",
     "invalid_password": "Wrong password.",
+    "invalid_password_login": "Wrong username/email or password.",
     "invalid_phone": "Phone number must be in international format without punctuation.",
     "invalid_recipients": "Invalid recipients list.",
     "invalid_region": "Invalid region.",

app/backend/src/couchers/i18n/locales/en_CORP.json

@@ -132,7 +132,11 @@
     "chat_initiation_rate_limit2_many": "Has enviado mensajes a muchos usuarios en el último {{count}} de horas. Para evitar el spam, no puedes contactar con más usuarios por el momento.",
     "chat_initiation_rate_limit2_other": "Has enviado mensajes a muchos usuarios en las últimas {{count}} horas. Para evitar el spam, no puedes contactar con más usuarios por el momento.",
     "dev_apis_disabled": "Las API de desarrollo no están habilitadas en este servidor.",
-    "event_community_invite_not_found": "No se pudo encontrar esa invitación de la comunidad al evento."
+    "event_community_invite_not_found": "No se pudo encontrar esa invitación de la comunidad al evento.",
+    "friend_request_rate_limit2_one": "Has enviado muchas solicitudes de amistad en la última {{count}} hora. Para evitar el spam, no puedes enviar más por ahora.",
+    "friend_request_rate_limit2_many": "Has enviado muchas solicitudes de amistad en los últimos {{count}} de horas. Para evitar el spam, no puedes enviar más por ahora.",
+    "friend_request_rate_limit2_other": "Has enviado muchas solicitudes de amistad en las últimas {{count}} horas. Para evitar el spam, no puedes enviar más por ahora.",
+    "after_item_not_found": "No se encontró el elemento después del cual colocar."
   },
   "badges": {
     "volunteer_name": "Voluntario en activo",

app/backend/src/couchers/i18n/locales/es.json

@@ -0,0 +1,33 @@
+"""Add machine-readable data payload to admin notes
+
+Revision ID: 0151
+Revises: 0150
+Create Date: 2026-05-15 05:41:24.160635
+
+"""
+
+import sqlalchemy as sa
+from alembic import op
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision = "0151"
+down_revision = "0150"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    op.add_column(
+        "admin_actions", sa.Column("data", postgresql.JSONB(none_as_null=True, astext_type=sa.Text()), nullable=True)
+    )
+    op.create_check_constraint(
+        constraint_name="note_xor_data",
+        table_name="admin_actions",
+        condition="note IS NULL OR data IS NULL",
+    )
+
+
+def downgrade() -> None:
+    op.drop_constraint("ck_admin_actions_note_xor_data", "admin_actions", type_="check")
+    op.drop_column("admin_actions", "data")