push-notifications-from-upstream-update #2

Open
majorkamo wants to merge 184 commits from push-notifications-from-upstream-update into main
Owner

merging upstream changes

merging upstream changes
Merge remote-tracking branch 'fluxer-upstream/main' into update-fork
Some checks failed
Code Correctness & Tests / Lint & Style Checks (pull_request) Has been cancelled
Code Correctness & Tests / Typecheck (pull_request) Has been cancelled
Code Correctness & Tests / Unit & Integration Tests (pull_request) Has been cancelled
Code Correctness & Tests / Rust Checks & Tests (pull_request) Has been cancelled
Code Correctness & Tests / Gateway (Erlang/OTP) Checks (pull_request) Has been cancelled
Code Correctness & Tests / Unused Code & Dependency Check (Knip) (pull_request) Has been cancelled
Code Correctness & Tests / Internationalization (i18n) Sync (pull_request) Has been cancelled
Code Correctness & Tests / Documentation Verification (pull_request) Has been cancelled
Code Correctness & Tests / Detect OpenAPI Schema Drift (pull_request) Has been cancelled
Code Correctness & Tests / Font Verification (pull_request) Has been cancelled
00c405a766
Co-authored-by: Hampus <hampus@fluxer.com>
Merge remote-tracking branch 'fluxer-upstream/main' into update-fork
Some checks failed
Code Correctness & Tests / Lint & Style Checks (pull_request) Failing after 9m32s
Code Correctness & Tests / Typecheck (pull_request) Failing after 12m30s
Code Correctness & Tests / Unit & Integration Tests (pull_request) Failing after 12m47s
Code Correctness & Tests / Rust Checks & Tests (pull_request) Failing after 23m32s
Code Correctness & Tests / Gateway (Erlang/OTP) Checks (pull_request) Failing after 2m15s
Code Correctness & Tests / Unused Code & Dependency Check (Knip) (pull_request) Successful in 25m22s
Code Correctness & Tests / Internationalization (i18n) Sync (pull_request) Successful in 15m36s
Code Correctness & Tests / Documentation Verification (pull_request) Successful in 15m6s
Code Correctness & Tests / Detect OpenAPI Schema Drift (pull_request) Successful in 15m24s
Code Correctness & Tests / Font Verification (pull_request) Successful in 1m31s
3d916a206c
Some checks failed
Code Correctness & Tests / Lint & Style Checks (pull_request) Failing after 9m32s
Code Correctness & Tests / Typecheck (pull_request) Failing after 12m30s
Code Correctness & Tests / Unit & Integration Tests (pull_request) Failing after 12m47s
Code Correctness & Tests / Rust Checks & Tests (pull_request) Failing after 23m32s
Code Correctness & Tests / Gateway (Erlang/OTP) Checks (pull_request) Failing after 2m15s
Code Correctness & Tests / Unused Code & Dependency Check (Knip) (pull_request) Successful in 25m22s
Code Correctness & Tests / Internationalization (i18n) Sync (pull_request) Successful in 15m36s
Code Correctness & Tests / Documentation Verification (pull_request) Successful in 15m6s
Code Correctness & Tests / Detect OpenAPI Schema Drift (pull_request) Successful in 15m24s
Code Correctness & Tests / Font Verification (pull_request) Successful in 1m31s
This pull request has changes conflicting with the target branch.
  • fluxer_admin/openapi-admin.json
  • fluxer_admin/src/api/instance_config.rs
  • fluxer_admin/src/api/types/instance_config.rs
  • fluxer_admin/src/routes/system_actions.rs
  • fluxer_admin/src/routes/users.rs
  • fluxer_admin/src/state.rs
  • fluxer_admin/src/templates/pages/instance_config.rs
  • fluxer_admin/src/templates/pages/users_list.rs
  • fluxer_admin/src/utils/forms.rs
  • fluxer_admin/tests/api_deserialization.rs
  • fluxer_api/pkgs/captcha/src/ICaptchaProvider.ts
  • fluxer_api/pkgs/captcha/src/providers/AltchaProvider.ts
  • fluxer_api/src/api/Config.ts
  • fluxer_api/src/api/admin/controllers/InstanceConfigAdminController.ts
  • fluxer_api/src/api/app/ControllerRegistry.ts
  • fluxer_api/src/api/experiment/ExperimentController.ts
  • fluxer_api/src/api/experiment/ExperimentTargeting.ts
  • fluxer_api/src/api/experiment/tests/ExperimentController.test.ts
  • fluxer_api/src/api/instance/InstanceConfigRepository.ts
  • fluxer_api/src/api/middleware/CaptchaMiddleware.ts
  • fluxer_api/src/api/middleware/tests/CaptchaProviderHeader.test.ts
  • fluxer_api/src/api/openapi/openapi.json
  • fluxer_api/src/api/read_state/ReadStateService.ts
  • fluxer_api/src/api/risk/IpBanExemptions.ts
  • fluxer_api/src/api/stripe/StripeController.ts
  • fluxer_api/src/api/stripe/StripeService.ts
  • fluxer_api/src/api/stripe/services/PremiumStateService.ts
  • fluxer_api/src/api/stripe/services/StripeCheckoutService.ts
  • fluxer_api/src/api/stripe/services/StripeCheckoutWebhookHandler.ts
  • fluxer_api/src/api/stripe/services/StripeGiftService.ts
  • fluxer_api/src/api/stripe/services/StripeWebhookService.ts
  • fluxer_api/src/api/stripe/tests/OperatorBillingCatalog.test.ts
  • fluxer_api/src/api/stripe/tests/SelfHostedPremiumRoutes.test.ts
  • fluxer_api/src/api/user/UserHelpers.ts
  • fluxer_api/src/api/user/UserMappers.ts
  • fluxer_api/src/api/user/services/UserAccountProfileService.ts
  • fluxer_api/src/api/user/services/UserAccountRequestService.ts
  • fluxer_api/src/api/user/tests/UserProfileTimezoneVisibility.test.ts
  • fluxer_api/src/api/worker/WorkerDependencies.ts
  • fluxer_api/src/api/worker/WorkerMain.ts
  • fluxer_api/src/api/worker/tasks/ProcessExpiredPremiumSweep.ts
  • fluxer_api/src/api/worker/tasks/ProcessStripeWebhook.ts
  • fluxer_api/src/api/worker/tasks/ReconcileUserPayments.ts
  • fluxer_api/src/api/worker/tests/ProcessExpiredPremiumSweep.test.ts
  • fluxer_app/index.html
  • fluxer_app/src/app/AppBootstrap.tsx
  • fluxer_app/src/features/app/components/dialogs/components/PlutoniumContent.tsx
  • fluxer_app/src/features/app/components/dialogs/components/plutonium/SubscriptionCard.tsx
  • fluxer_app/src/features/app/components/layout/app_layout/AppLayoutHooks.ts
  • fluxer_app/src/features/app/components/setup/SetupWizardSteps.tsx
  • fluxer_app/src/features/app/state/RuntimeConfig.ts
  • fluxer_app/src/features/auth/altcha/AltchaSolver.ts
  • fluxer_app/src/features/auth/components/CaptchaInterceptor.tsx
  • fluxer_app/src/features/auth/components/modals/CaptchaModal.tsx
  • fluxer_app/src/features/auth/flow/AuthLoginLayout.tsx
  • fluxer_app/src/features/channel/components/ChannelMessages.module.css
  • fluxer_app/src/features/channel/components/ChannelMessages.tsx
  • fluxer_app/src/features/i18n/locales/ar/messages.po
  • fluxer_app/src/features/i18n/locales/auto-i18n-reviewed-unchanged.json
  • fluxer_app/src/features/i18n/locales/bg/messages.po
  • fluxer_app/src/features/i18n/locales/cs/messages.po
  • fluxer_app/src/features/i18n/locales/da/messages.po
  • fluxer_app/src/features/i18n/locales/de/messages.po
  • fluxer_app/src/features/i18n/locales/el/messages.po
  • fluxer_app/src/features/i18n/locales/en-GB/messages.po
  • fluxer_app/src/features/i18n/locales/en-US/messages.po
  • fluxer_app/src/features/i18n/locales/es-419/messages.po
  • fluxer_app/src/features/i18n/locales/es-ES/messages.po
  • fluxer_app/src/features/i18n/locales/fi/messages.po
  • fluxer_app/src/features/i18n/locales/fr/messages.po
  • fluxer_app/src/features/i18n/locales/he/messages.po
  • fluxer_app/src/features/i18n/locales/hi/messages.po
  • fluxer_app/src/features/i18n/locales/hr/messages.po
  • fluxer_app/src/features/i18n/locales/hu/messages.po
  • fluxer_app/src/features/i18n/locales/id/messages.po
  • fluxer_app/src/features/i18n/locales/it/messages.po
  • fluxer_app/src/features/i18n/locales/ja/messages.po
  • fluxer_app/src/features/i18n/locales/ko/messages.po
  • fluxer_app/src/features/i18n/locales/lt/messages.po
  • fluxer_app/src/features/i18n/locales/nl/messages.po
  • fluxer_app/src/features/i18n/locales/no/messages.po
  • fluxer_app/src/features/i18n/locales/pl/messages.po
  • fluxer_app/src/features/i18n/locales/pt-BR/messages.po
  • fluxer_app/src/features/i18n/locales/ro/messages.po
  • fluxer_app/src/features/i18n/locales/ru/messages.po
  • fluxer_app/src/features/i18n/locales/sv-SE/messages.po
  • fluxer_app/src/features/i18n/locales/th/messages.po
  • fluxer_app/src/features/i18n/locales/tr/messages.po
  • fluxer_app/src/features/i18n/locales/uk/messages.po
  • fluxer_app/src/features/i18n/locales/vi/messages.po
  • fluxer_app/src/features/i18n/locales/zh-CN/messages.po
  • fluxer_app/src/features/i18n/locales/zh-TW/messages.po
  • fluxer_app/src/features/navigation/utils/DeepLinkUtils.ts
  • fluxer_app/src/features/premium/commands/PremiumModalCommands.tsx
  • fluxer_app/src/features/premium/components/pages/PremiumCallbackPage.tsx
  • fluxer_app/src/features/premium/utils/PremiumUtils.ts
  • fluxer_app/src/features/user/components/modals/tabs/MyProfileTab.tsx
  • fluxer_app/src/features/user/components/popouts/UserProfileBadges.tsx
  • fluxer_app/src/features/user/utils/ProfileUtils.ts
  • fluxer_docs/scripts/VerifyDocsStyle.ts
  • fluxer_docs/src/content/docs/admin-api/instance.mdx
  • fluxer_docs/src/content/docs/http-api/billing.mdx
  • fluxer_docs/src/content/docs/http-api/deployment-availability.md
  • fluxer_docs/src/content/docs/http-api/experiments.mdx
  • fluxer_docs/src/content/docs/http-api/users.mdx
  • fluxer_docs/src/content/docs/http-api/users/current-user.mdx
  • fluxer_docs/src/content/docs/operator/configuration.mdx
  • fluxer_docs/src/content/docs/topics/captcha.md
  • fluxer_gateway/src/gateway/fluxer_gateway_config.erl
  • fluxer_gateway/src/gateway/gateway_rpc_push.erl
  • fluxer_gateway/src/guild/guild_dispatch_push.erl
  • fluxer_gateway/src/guild/guild_init.erl
  • fluxer_gateway/src/guild/guild_maintenance.erl
  • fluxer_gateway/src/guild/guild_member_list_channel_engine.erl
  • fluxer_gateway/src/guild/guild_member_list_engine_inputs.erl
  • fluxer_gateway/src/guild/guild_permissions.erl
  • fluxer_gateway/src/guild/guild_virtual_channel_access.erl
  • fluxer_gateway/src/push/push.erl
  • fluxer_gateway/src/push/push_job_publisher.erl
  • fluxer_gateway/src/push/push_message_params.erl
  • fluxer_gateway/src/push/push_notification_format.erl
  • fluxer_gateway/src/push/push_outbox.erl
  • fluxer_gateway/test/guild_channel_move_equivalence_tests.erl
  • fluxer_messages/src/shard_impl.rs
  • fluxer_push/src/config.rs
  • fluxer_push/src/providers/mod.rs
  • fluxer_push/src/providers/web_push.rs
  • knip.json
  • packages/errors/src/i18n/locales/cs.ts
  • packages/errors/src/i18n/locales/es-ES.ts
  • packages/errors/src/i18n/locales/fr.ts
  • packages/errors/src/i18n/locales/hr.ts
  • packages/errors/src/i18n/locales/ja.ts
  • packages/errors/src/i18n/locales/ko.ts
  • packages/errors/src/i18n/locales/ro.ts
  • packages/errors/src/i18n/locales/ru.ts
  • packages/errors/src/i18n/locales/zh-CN.ts
  • packages/errors/src/i18n/weblate/locales/cs.json
  • packages/errors/src/i18n/weblate/locales/es-ES.json
  • packages/errors/src/i18n/weblate/locales/fr.json
  • packages/errors/src/i18n/weblate/locales/hr.json
  • packages/errors/src/i18n/weblate/locales/ja.json
  • packages/errors/src/i18n/weblate/locales/ko.json
  • packages/errors/src/i18n/weblate/locales/ro.json
  • packages/errors/src/i18n/weblate/locales/ru.json
  • packages/errors/src/i18n/weblate/locales/zh-CN.json
  • packages/schema/src/domains/admin/AdminSchemas.ts
  • packages/schema/src/domains/admin/VoiceNoiseSuppressionSchemas.test.ts
  • packages/schema/src/domains/admin/VoiceNoiseSuppressionSchemas.ts
  • packages/schema/src/domains/experiment/ExperimentSchemas.ts
  • packages/schema/src/domains/user/UserRequestSchemas.ts
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin push-notifications-from-upstream-update:push-notifications-from-upstream-update
git switch push-notifications-from-upstream-update

Merge

Merge the changes and update on Forgejo.
git switch main
git merge --no-ff push-notifications-from-upstream-update
git switch push-notifications-from-upstream-update
git rebase main
git switch main
git merge --ff-only push-notifications-from-upstream-update
git switch push-notifications-from-upstream-update
git rebase main
git switch main
git merge --no-ff push-notifications-from-upstream-update
git switch main
git merge --squash push-notifications-from-upstream-update
git switch main
git merge --ff-only push-notifications-from-upstream-update
git switch main
git merge push-notifications-from-upstream-update
git push origin main
Sign in to join this conversation.
No reviewers
No labels
No milestone
No project
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
majorkamo/CamFlux!2
No description provided.