Skip to content

Legacy: fix custom prayer time timezone and response - #88

Merged
escalopa merged 1 commit into
mainfrom
codex/fix-legacy-override-timezone
Sep 8, 2026
Merged

escalopa merged 1 commit into
mainfrom
codex/fix-legacy-override-timezone

Conversation

@escalopa

@escalopa escalopa commented Sep 8, 2026

Copy link
Copy Markdown
Owner

Summary

  • interpret fixed daily prayer times in each Legacy bot city timezone rather than UTC
  • apply that timezone consistently to displayed schedules, next prayer, and reminder triggers
  • send the setting confirmation as plain text so Telegram no longer rejects its Markdown

Validation

  • production logs showed normal request latency and the Markdown parse error
  • added a regression test for UTC database timestamps rendered in the bot timezone
  • git diff --check
  • local Go tests remain blocked by the installed compiler/standard-library patch mismatch; CI uses a clean Go 1.26 environment

@github-actions

github-actions Bot commented Sep 8, 2026

Copy link
Copy Markdown

Terraform Plan — dev

Acquiring state lock. This may take a few moments...
data.archive_file.loader_zip: Reading...
data.archive_file.reminder_zip: Reading...
data.archive_file.dispatcher_zip: Reading...
data.archive_file.reminder_zip: Read complete after 1s [id=f547b25f5f5b0d1ab7299c857d104de376984f5f]
google_project_service.required["cloudscheduler.googleapis.com"]: Refreshing state... [id=prayer-bot-infra/cloudscheduler.googleapis.com]
google_project_iam_member.deploy_eventarc_admin[0]: Refreshing state... [id=prayer-bot-infra/roles/eventarc.admin/serviceAccount:prayer-bot-deploy@prayer-bot-infra.iam.gserviceaccount.com]
google_project_service.required["eventarc.googleapis.com"]: Refreshing state... [id=prayer-bot-infra/eventarc.googleapis.com]
google_project_service.required["pubsub.googleapis.com"]: Refreshing state... [id=prayer-bot-infra/pubsub.googleapis.com]
google_project_iam_member.deploy_pubsub_admin[0]: Refreshing state... [id=prayer-bot-infra/roles/pubsub.admin/serviceAccount:prayer-bot-deploy@prayer-bot-infra.iam.gserviceaccount.com]
google_project_service.required["cloudbuild.googleapis.com"]: Refreshing state... [id=prayer-bot-infra/cloudbuild.googleapis.com]
google_project_service.required["iam.googleapis.com"]: Refreshing state... [id=prayer-bot-infra/iam.googleapis.com]
google_project_service.required["run.googleapis.com"]: Refreshing state... [id=prayer-bot-infra/run.googleapis.com]
data.archive_file.dispatcher_zip: Read complete after 1s [id=a9663f1d9169a383b344eed29f93eda28a547c5f]
google_project_service.required["storage.googleapis.com"]: Refreshing state... [id=prayer-bot-infra/storage.googleapis.com]
google_project_service.required["serviceusage.googleapis.com"]: Refreshing state... [id=prayer-bot-infra/serviceusage.googleapis.com]
data.archive_file.loader_zip: Read complete after 1s [id=508eec5eb350ced673dc2f4815bdd232f1d1d84b]
google_project_service.required["artifactregistry.googleapis.com"]: Refreshing state... [id=prayer-bot-infra/artifactregistry.googleapis.com]
google_project_service.required["cloudfunctions.googleapis.com"]: Refreshing state... [id=prayer-bot-infra/cloudfunctions.googleapis.com]
google_project_service.required["cloudresourcemanager.googleapis.com"]: Refreshing state... [id=prayer-bot-infra/cloudresourcemanager.googleapis.com]
google_project_iam_member.deploy_cloudscheduler_admin[0]: Refreshing state... [id=prayer-bot-infra/roles/cloudscheduler.admin/serviceAccount:prayer-bot-deploy@prayer-bot-infra.iam.gserviceaccount.com]
google_service_account.runtime: Refreshing state... [id=projects/prayer-bot-infra/serviceAccounts/prayer-bot-dev@prayer-bot-infra.iam.gserviceaccount.com]
data.google_storage_project_service_account.gcs_account: Reading...
google_service_account.scheduler: Refreshing state... [id=projects/prayer-bot-infra/serviceAccounts/prayer-bot-scheduler-dev@prayer-bot-infra.iam.gserviceaccount.com]
google_storage_bucket.data: Refreshing state... [id=prayer-bot-data-dev]
google_storage_bucket.source: Refreshing state... [id=prayer-bot-infra-prayer-bot-src-dev]
data.google_storage_project_service_account.gcs_account: Read complete after 0s [id=service-832489372636@gs-project-accounts.iam.gserviceaccount.com]
google_project_iam_member.gcs_pubsub_publisher: Refreshing state... [id=prayer-bot-infra/roles/pubsub.publisher/serviceAccount:service-832489372636@gs-project-accounts.iam.gserviceaccount.com]
google_project_iam_member.runtime_logging: Refreshing state... [id=prayer-bot-infra/roles/logging.logWriter/serviceAccount:prayer-bot-dev@prayer-bot-infra.iam.gserviceaccount.com]
google_project_iam_member.runtime_eventarc_receiver[0]: Refreshing state... [id=prayer-bot-infra/roles/eventarc.eventReceiver/serviceAccount:prayer-bot-dev@prayer-bot-infra.iam.gserviceaccount.com]
google_project_iam_member.runtime_storage: Refreshing state... [id=prayer-bot-infra/roles/storage.objectViewer/serviceAccount:prayer-bot-dev@prayer-bot-infra.iam.gserviceaccount.com]
google_storage_bucket_iam_member.runtime_data_admin: Refreshing state... [id=b/prayer-bot-data-dev/roles/storage.objectAdmin/serviceAccount:prayer-bot-dev@prayer-bot-infra.iam.gserviceaccount.com]
google_storage_bucket_object.reminder_zip: Refreshing state... [id=prayer-bot-infra-prayer-bot-src-dev-reminder-2dba39163f8cba2ce110c8c9abfd1bbf.zip]
google_storage_bucket_object.loader_zip: Refreshing state... [id=prayer-bot-infra-prayer-bot-src-dev-loader-12ff633bc1acd12398982a52dc8bc6e9.zip]
google_storage_bucket_object.dispatcher_zip: Refreshing state... [id=prayer-bot-infra-prayer-bot-src-dev-dispatcher-c19817f1e7e5a58d50d53366e989513e.zip]
google_cloudfunctions2_function.reminder: Refreshing state... [id=projects/prayer-bot-infra/locations/europe-west1/functions/prayer-bot-reminder-dev]
google_cloudfunctions2_function.dispatcher: Refreshing state... [id=projects/prayer-bot-infra/locations/europe-west1/functions/prayer-bot-dispatcher-dev]
google_cloudfunctions2_function.loader: Refreshing state... [id=projects/prayer-bot-infra/locations/europe-west1/functions/prayer-bot-loader-dev]
google_cloud_run_v2_service_iam_member.dispatcher_public: Refreshing state... [id=projects/prayer-bot-infra/locations/europe-west1/services/prayer-bot-dispatcher-dev/roles/run.invoker/allUsers]
google_cloud_run_v2_service_iam_member.reminder_scheduler[0]: Refreshing state... [id=projects/prayer-bot-infra/locations/europe-west1/services/prayer-bot-reminder-dev/roles/run.invoker/serviceAccount:prayer-bot-scheduler-dev@prayer-bot-infra.iam.gserviceaccount.com]
google_cloud_run_v2_service_iam_member.loader_eventarc[0]: Refreshing state... [id=projects/prayer-bot-infra/locations/europe-west1/services/prayer-bot-loader-dev/roles/run.invoker/serviceAccount:prayer-bot-dev@prayer-bot-infra.iam.gserviceaccount.com]
google_cloud_scheduler_job.reminder[0]: Refreshing state... [id=projects/prayer-bot-infra/locations/europe-west1/jobs/prayer-bot-reminder-dev]
google_eventarc_trigger.loader[0]: Refreshing state... [id=projects/prayer-bot-infra/locations/europe-west1/triggers/prayer-bot-loader-dev]

Terraform used the selected providers to generate the following execution
plan. Resource actions are indicated with the following symbols:
  ~ update in-place
  - destroy
-/+ destroy and then create replacement

Terraform will perform the following actions:

  # google_cloud_scheduler_job.reminder[0] will be updated in-place
  ~ resource "google_cloud_scheduler_job" "reminder" {
        id               = "projects/prayer-bot-infra/locations/europe-west1/jobs/prayer-bot-reminder-dev"
        name             = "prayer-bot-reminder-dev"
        # (8 unchanged attributes hidden)

      ~ http_target {
            # (3 unchanged attributes hidden)

          ~ oidc_token {
              - audience              = "https://prayer-bot-reminder-dev-wsgaovlfla-ew.a.run.app/" -> null
                # (1 unchanged attribute hidden)
            }
        }
    }

  # google_cloudfunctions2_function.dispatcher will be updated in-place
  ~ resource "google_cloudfunctions2_function" "dispatcher" {
        id               = "projects/prayer-bot-infra/locations/europe-west1/functions/prayer-bot-dispatcher-dev"
        name             = "prayer-bot-dispatcher-dev"
        # (10 unchanged attributes hidden)

      ~ build_config {
            # (6 unchanged attributes hidden)

          ~ source {
              ~ storage_source {
                  ~ object     = "dispatcher-c19817f1e7e5a58d50d53366e989513e.zip" -> "dispatcher-ac9fcbdfe9191c33147618a5f4daca28.zip"
                    # (2 unchanged attributes hidden)
                }
            }

            # (1 unchanged block hidden)
        }

        # (1 unchanged block hidden)
    }

  # google_cloudfunctions2_function.loader will be updated in-place
  ~ resource "google_cloudfunctions2_function" "loader" {
        id               = "projects/prayer-bot-infra/locations/europe-west1/functions/prayer-bot-loader-dev"
        name             = "prayer-bot-loader-dev"
        # (10 unchanged attributes hidden)

      ~ build_config {
            # (6 unchanged attributes hidden)

          ~ source {
              ~ storage_source {
                  ~ object     = "loader-12ff633bc1acd12398982a52dc8bc6e9.zip" -> "loader-b881a105ed5ceaea6583ffa29ed38b70.zip"
                    # (2 unchanged attributes hidden)
                }
            }

            # (1 unchanged block hidden)
        }

        # (1 unchanged block hidden)
    }

  # google_cloudfunctions2_function.reminder will be updated in-place
  ~ resource "google_cloudfunctions2_function" "reminder" {
        id               = "projects/prayer-bot-infra/locations/europe-west1/functions/prayer-bot-reminder-dev"
        name             = "prayer-bot-reminder-dev"
        # (10 unchanged attributes hidden)

      ~ build_config {
            # (6 unchanged attributes hidden)

          ~ source {
              ~ storage_source {
                  ~ object     = "reminder-2dba39163f8cba2ce110c8c9abfd1bbf.zip" -> "reminder-85c8663edb40902243bb93578320570f.zip"
                    # (2 unchanged attributes hidden)
                }
            }

            # (1 unchanged block hidden)
        }

        # (1 unchanged block hidden)
    }

  # google_project_iam_member.deploy_cloudscheduler_admin[0] will be destroyed
  # (because index [0] is out of range for count)
  - resource "google_project_iam_member" "deploy_cloudscheduler_admin" {
      - etag    = "BwZaBc9ln0E=" -> null
      - id      = "prayer-bot-infra/roles/cloudscheduler.admin/serviceAccount:prayer-bot-deploy@prayer-bot-infra.iam.gserviceaccount.com" -> null
      - member  = "serviceAccount:prayer-bot-deploy@prayer-bot-infra.iam.gserviceaccount.com" -> null
      - project = "prayer-bot-infra" -> null
      - role    = "roles/cloudscheduler.admin" -> null
    }

  # google_project_iam_member.deploy_eventarc_admin[0] will be destroyed
  # (because index [0] is out of range for count)
  - resource "google_project_iam_member" "deploy_eventarc_admin" {
      - etag    = "BwZaBc9ln0E=" -> null
      - id      = "prayer-bot-infra/roles/eventarc.admin/serviceAccount:prayer-bot-deploy@prayer-bot-infra.iam.gserviceaccount.com" -> null
      - member  = "serviceAccount:prayer-bot-deploy@prayer-bot-infra.iam.gserviceaccount.com" -> null
      - project = "prayer-bot-infra" -> null
      - role    = "roles/eventarc.admin" -> null
    }

  # google_project_iam_member.deploy_pubsub_admin[0] will be destroyed
  # (because index [0] is out of range for count)
  - resource "google_project_iam_member" "deploy_pubsub_admin" {
      - etag    = "BwZaBc9ln0E=" -> null
      - id      = "prayer-bot-infra/roles/pubsub.admin/serviceAccount:prayer-bot-deploy@prayer-bot-infra.iam.gserviceaccount.com" -> null
      - member  = "serviceAccount:prayer-bot-deploy@prayer-bot-infra.iam.gserviceaccount.com" -> null
      - project = "prayer-bot-infra" -> null
      - role    = "roles/pubsub.admin" -> null
    }

  # google_storage_bucket_object.dispatcher_zip must be replaced
-/+ resource "google_storage_bucket_object" "dispatcher_zip" {
      + content          = (sensitive value)
      ~ content_type     = "application/zip" -> (known after apply)
      ~ crc32c           = "I0V0zA==" -> (known after apply)
      ~ detect_md5hash   = "wZgX8eflpY1Q1TNm6YlRPg==" -> "different hash"
      - event_based_hold = false -> null
      ~ generation       = 1788858941618226 -> (known after apply)
      ~ id               = "prayer-bot-infra-prayer-bot-src-dev-dispatcher-c19817f1e7e5a58d50d53366e989513e.zip" -> (known after apply)
      + kms_key_name     = (known after apply)
      ~ md5hash          = "wZgX8eflpY1Q1TNm6YlRPg==" -> (known after apply)
      ~ md5hexhash       = "c19817f1e7e5a58d50d53366e989513e" -> (known after apply)
      ~ media_link       = "https://storage.googleapis.com/download/storage/v1/b/prayer-bot-infra-prayer-bot-src-dev/o/dispatcher-c19817f1e7e5a58d50d53366e989513e.zip?generation=1788858941618226&alt=media" -> (known after apply)
      - metadata         = {} -> null
      ~ name             = "dispatcher-c19817f1e7e5a58d50d53366e989513e.zip" -> "dispatcher-ac9fcbdfe9191c33147618a5f4daca28.zip" # forces replacement
      ~ output_name      = "dispatcher-c19817f1e7e5a58d50d53366e989513e.zip" -> (known after apply)
      ~ self_link        = "https://www.googleapis.com/storage/v1/b/prayer-bot-infra-prayer-bot-src-dev/o/dispatcher-c19817f1e7e5a58d50d53366e989513e.zip" -> (known after apply)
      ~ storage_class    = "STANDARD" -> (known after apply)
      - temporary_hold   = false -> null
        # (3 unchanged attributes hidden)
    }

  # google_storage_bucket_object.loader_zip must be replaced
-/+ resource "google_storage_bucket_object" "loader_zip" {
      + content          = (sensitive value)
      ~ content_type     = "application/zip" -> (known after apply)
      ~ crc32c           = "Yx6j2g==" -> (known after apply)
      ~ detect_md5hash   = "Ev9jO8Gs0SOYmCpS3IvG6Q==" -> "different hash"
      - event_based_hold = false -> null
      ~ generation       = 1788858557095007 -> (known after apply)
      ~ id               = "prayer-bot-infra-prayer-bot-src-dev-loader-12ff633bc1acd12398982a52dc8bc6e9.zip" -> (known after apply)
      + kms_key_name     = (known after apply)
      ~ md5hash          = "Ev9jO8Gs0SOYmCpS3IvG6Q==" -> (known after apply)
      ~ md5hexhash       = "12ff633bc1acd12398982a52dc8bc6e9" -> (known after apply)
      ~ media_link       = "https://storage.googleapis.com/download/storage/v1/b/prayer-bot-infra-prayer-bot-src-dev/o/loader-12ff633bc1acd12398982a52dc8bc6e9.zip?generation=1788858557095007&alt=media" -> (known after apply)
      - metadata         = {} -> null
      ~ name             = "loader-12ff633bc1acd12398982a52dc8bc6e9.zip" -> "loader-b881a105ed5ceaea6583ffa29ed38b70.zip" # forces replacement
      ~ output_name      = "loader-12ff633bc1acd12398982a52dc8bc6e9.zip" -> (known after apply)
      ~ self_link        = "https://www.googleapis.com/storage/v1/b/prayer-bot-infra-prayer-bot-src-dev/o/loader-12ff633bc1acd12398982a52dc8bc6e9.zip" -> (known after apply)
      ~ storage_class    = "STANDARD" -> (known after apply)
      - temporary_hold   = false -> null
        # (3 unchanged attributes hidden)
    }

  # google_storage_bucket_object.reminder_zip must be replaced
-/+ resource "google_storage_bucket_object" "reminder_zip" {
      + content          = (sensitive value)
      ~ content_type     = "application/zip" -> (known after apply)
      ~ crc32c           = "RFJYCg==" -> (known after apply)
      ~ detect_md5hash   = "Lbo5Fj+MuizhEMjJq/0bvw==" -> "different hash"
      - event_based_hold = false -> null
      ~ generation       = 1788858556923224 -> (known after apply)
      ~ id               = "prayer-bot-infra-prayer-bot-src-dev-reminder-2dba39163f8cba2ce110c8c9abfd1bbf.zip" -> (known after apply)
      + kms_key_name     = (known after apply)
      ~ md5hash          = "Lbo5Fj+MuizhEMjJq/0bvw==" -> (known after apply)
      ~ md5hexhash       = "2dba39163f8cba2ce110c8c9abfd1bbf" -> (known after apply)
      ~ media_link       = "https://storage.googleapis.com/download/storage/v1/b/prayer-bot-infra-prayer-bot-src-dev/o/reminder-2dba39163f8cba2ce110c8c9abfd1bbf.zip?generation=1788858556923224&alt=media" -> (known after apply)
      - metadata         = {} -> null
      ~ name             = "reminder-2dba39163f8cba2ce110c8c9abfd1bbf.zip" -> "reminder-85c8663edb40902243bb93578320570f.zip" # forces replacement
      ~ output_name      = "reminder-2dba39163f8cba2ce110c8c9abfd1bbf.zip" -> (known after apply)
      ~ self_link        = "https://www.googleapis.com/storage/v1/b/prayer-bot-infra-prayer-bot-src-dev/o/reminder-2dba39163f8cba2ce110c8c9abfd1bbf.zip" -> (known after apply)
      ~ storage_class    = "STANDARD" -> (known after apply)
      - temporary_hold   = false -> null
        # (3 unchanged attributes hidden)
    }

Plan: 3 to add, 4 to change, 6 to destroy.

─────────────────────────────────────────────────────────────────────────────

Note: You didn't use the -out option to save this plan, so Terraform can't
guarantee to take exactly these actions if you run "terraform apply" now.

@escalopa
escalopa merged commit eae277a into main Sep 8, 2026
9 checks passed

This branch was successfully deployed

1 active deployment
dev — 721e9419 Deployed Sep 8, 2026 by escalopa via Setup Telegram Webhooks #247
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant