sugoidogo/modrinth
1
0
Fork 0
mirror of https://github.com/modrinth/code.git synced 2026-08-25 00:55:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,179 Commits 627 Branches 152 Tags
c74460fffa80eb30c14716044cc917f5c579046e
Commit Graph
50 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
François-Xavier Talbot f375913c62 Adjust some values in tax-related tasks (#4598) 
* Adjust some values for tax processing

* chore: query cache, clippy, fmt
 2025-10-21 15:55:54 +00:00
François-Xavier Talbot a4015d9df3 Fix v1 servers handling (#4596) 2025-10-21 06:40:10 +00:00
François-Xavier Talbot 977de0e18a Fix MaxMind (#4595) 
* add maxmind to app data

* add back maxmind account id check
 2025-10-21 00:24:47 +02:00
François-Xavier Talbot c379e4b173 admin/credit: don't credit unprovisioned subscriptions (#4594) 
* Remove pointless sorting

* Filter subscriptions by labrinth's provisioned state
 2025-10-20 20:31:20 +00:00
François-Xavier Talbot eeed4e572d Credit subscriptions (#4575) 
* Implement subscription crediting

* chore: query cache, clippy, fmt

* Improve code, improve query for next open charge

* chore: query cache, clippy, fmt

* Move server ID copy button up

* Node + region crediting

* Make it less ugly

* chore: query cache, clippy, fmt

* Bugfixes

* Fix lint

* Adjust migration

* Adjust migration

* Remove billing change

* Move DEFAULT_CREDIT_EMAIL_MESSAGE to utils.ts

* Lint

* Merge

* bump clickhouse, disable validation

* tombi fmt

* Update cargo lock
 2025-10-20 17:35:44 +00:00
François-Xavier Talbot 79502a19d6 bump clickhouse, disable validation (#4593) 
* bump clickhouse, disable validation

* tombi fmt
 2025-10-20 17:30:28 +00:00
François-Xavier Talbot 3dbfd69bdd Fix clickhouse (#4592) 2025-10-20 19:07:23 +02:00
François-Xavier Talbot 859d7f57cf Downgrade CH dep (#4591) 2025-10-20 18:50:16 +02:00
François-Xavier Talbot 8a30b7978d Support ctoken_ in PATCH subscription (#4578) 2025-10-20 10:03:20 +00:00
François-Xavier Talbot 4b17eb5d35 Gotenberg/PDF gen implementation (#4574) 
* Gotenberg/PDF gen implementation

* Security, PDF type enum, propagate client

* chore: query cache, clippy, fmt

* clippy fixes + tombi

* Update env example, add GOTENBERG_CALLBACK_URL

* Remove test code

* Fix .env, docker-compose

* Update purpose of payment

* Add internal networking guards to gotenberg webhooks

* Fix error

* Fix lint
 2025-10-19 23:56:26 +00:00
François-Xavier TalbotandCalum H. 7796273529 Clearer error on TIN mismatch (#4579) 
* Clearer error on TIN mismatch

* Remove ctoken code (how did that end up there)

* polish: frontend for TIN/SSN mismatch

* fix: lint

* polish: only banner + change text

* fix: logic

* fix: lint

---------

Co-authored-by: Calum H. (IMB11) <contact@cal.engineer>
 2025-10-19 21:03:21 +00:00
François-Xavier Talbot 5db5bf4c4c Changes to handling of refunds in Anrok (#4556) 
* Use negations, track transaction version/accounting time, use original charge accounting time in refunds

* query cache

* chore: query cache, clippy, fmt

* Fix tax drift calculation

* Fix migration

* Increase update_tax_transactions rate
 2025-10-17 15:57:36 +00:00
François-Xavier Talbot 2a61916d1e Mark charges from stripe customers with no address as unresolvable (#4521) 2025-10-11 18:24:21 +00:00
François-Xavier Talbotandaecsocket 0c66fa3f12 Custom Emails (#4526) 
* Dynamic email template

* Set lower cache expiry for templates

* Custom email route

* Fix subject line on custom emails

* chore: query cache, clippy, fmt

* Bugfixes

* Key-based caching on custom emails

* Sequentially process emails prone to causing cache stampede

* Fill variables in dynamic body + subject line

* Update apps/labrinth/src/queue/email/templates.rs

Co-authored-by: aecsocket <aecsocket@tutanota.com>
Signed-off-by: François-Xavier Talbot <108630700+fetchfern@users.noreply.github.com>

* Update apps/labrinth/src/queue/email/templates.rs

Co-authored-by: aecsocket <aecsocket@tutanota.com>
Signed-off-by: François-Xavier Talbot <108630700+fetchfern@users.noreply.github.com>

---------

Signed-off-by: François-Xavier Talbot <108630700+fetchfern@users.noreply.github.com>
Co-authored-by: aecsocket <aecsocket@tutanota.com>
 2025-10-10 16:30:38 +00:00
François-Xavier Talbot c88bdda3e6 More flexible datetime parsing (#4533) 2025-10-09 20:01:07 +00:00
François-Xavier Talbot 9589e23118 Link customer ID to Anrok transaction (#4509) 
* Mark transactions with unresolvable addresses as unresolved

* Add customer_name + customer_id to anrok transactions

* Increase rate of Anrok syn

* Remove timer from update_tax_transactions

* chore: query cache, clippy, fmt
 2025-10-06 16:06:57 +00:00
François-Xavier Talbot a13647b9e2 Negate refund amount (#4481) 2025-10-03 23:29:22 +00:00
François-Xavier Talbot bea0ba017c Fix interactive payments in non-USD currencies (#4476) 
* Use price's currency rather than inferred stripe currency in PaymentIntent

* Correctly convert to stripe::Currency

* Include original currency code in error message
 2025-10-03 13:26:06 +00:00
François-Xavier Talbot 7e84659249 Cleanup + fixes to index_billing/index_subscriptions (#4457) 
* Parse refunds

* Cleanup index subscriptions/index billing

* chore: query cache, clippy, fmt
 2025-10-03 13:01:52 +00:00
François-Xavier Talbot 24504cb94d Fix CI (#4477) 2025-10-03 12:35:43 +00:00
François-Xavier Talbot 9315af9b20 Only skip attaching payment method when using ctoken (#4460) 2025-09-30 18:41:17 -07:00
François-Xavier Talbot beb1bdb31f Skip synchronizing transactions to Anrok if missing payment intent ID (#4446) 
* Skip succeeded txns with no payment platform ID

* chore: query cache, clippy, fmt
 2025-09-30 14:36:41 +00:00
François-Xavier Talbot 54747aa628 Tweaks and fixes to background tasks (#4447) 
* adjustments

* chore: query cache, clippy, fmt
 2025-09-30 11:43:59 +00:00
François-Xavier Talbot b4eba5a0d5 Tax fixes (#4435) 
* Only update the PaymentMethod ID if not using placeholder ID

* comment

* Create Anrok transactions for all charges

* Fix comment

* Prefer using payment method's address rather than customer address

* chore: query cache, clippy, fmt

* Retrieve stripe address from PM

* chore: query cache, clippy, fmt

* fmt

* bring back the query cache

* Better address retrieval for updating tax amounts, always update tax_last_updated

* chore: query cache, clippy, fmt

* Don't set PM in ctoken interactive session for new PIs
 2025-09-28 21:13:48 +00:00
François-Xavier Talbot 3f55711f9e More billing fixes (#4431) 
* Only update the PaymentMethod ID if not using placeholder ID

* comment

* Create Anrok transactions for all charges

* Fix comment

* Prefer using payment method's address rather than customer address

* chore: query cache, clippy, fmt

* Retrieve stripe address from PM

* chore: query cache, clippy, fmt

* fmt

* bring back the query cache
 2025-09-27 22:37:30 +00:00
François-Xavier Talbot 14af3d0763 Billing fixes (#4422) 
* Only update the PaymentMethod ID if not using placeholder ID

* comment

* Create Anrok transactions for all charges

* Fix comment

* Prefer using payment method's address rather than customer address

* chore: query cache, clippy, fmt
 2025-09-26 15:39:47 +00:00
François-Xavier Talbot 4228a193e9 Charge tax on products (#4361) 
* Initial Anrok integration

* Query cache, fmt, clippy

* Fmt

* Use payment intent function in edit_subscription

* Attach Anrok client, use payments in index_billing

* Integrate Anrok with refunds

* Bug fixes

* More bugfixes

* Fix resubscriptions

* Medal promotion bugfixes

* Use stripe metadata constants everywhere

* Pre-fill values in products_tax_identifiers

* Cleanup billing route module

* Cleanup

* Email notification for tax charge

* Don't charge tax on users which haven't been notified of tax change

* Fix taxnotification.amount templates

* Update .env.docker-compose

* Update .env.local

* Clippy

* Fmt

* Query cache

* Periodically update tax amount on upcoming charges

* Fix queries

* Skip indexing tax amount on charges if no charges to process

* chore: query cache, clippy, fmt

* Fix a lot of things

* Remove test code

* chore: query cache, clippy, fmt

* Fix money formatting

* Fix conflicts

* Extra documentation, handle tax association properly

* Track loss in tax drift

* chore: query cache, clippy, fmt

* Add subscription.id variable

* chore: query cache, clippy, fmt

* chore: query cache, clippy, fmt
 2025-09-25 11:29:29 +00:00
François-Xavier Talbot 47020f34b6 Tax compliance adjustments (#4414) 
* tax compliance adjustments

* chore: query cache, clippy, fmt
 2025-09-25 11:02:33 +00:00
François-Xavier Talbot e6edf07eae Fill variables for subject line (#4415) 2025-09-24 10:52:43 +00:00
François-Xavier Talbot 71d63fbe17 Fix version upload for popular projects (#4410) 
* Only notify users that exist

* chore: query cache, clippy, fmt
 2025-09-22 15:12:17 -07:00
François-Xavier Talbot f33efed91b Less emails per transactinos (#4406) 2025-09-22 19:40:59 +00:00
François-Xavier Talbot d41b31c775 Fix track1099 (#4405) 
* don't parse datetime

* fix import

* update comments
 2025-09-22 18:08:22 +00:00
François-Xavier Talbot afcdb1d0a1 more loggging (#4404) 2025-09-22 16:53:27 +00:00
François-Xavier Talbot 6da190ed01 New Creator Notifications (#4383) 
* Some new notification types

* Fix error

* Use existing DB models rather than inline queries

* Fix template fillout

* Fix ModerationThreadMessageReceived

* Insert more notifications, fix some formatting

* chore: query cache, clippy, fmt

* chore: query cache, clippy, fmt

* Use outer transactions to insert notifications instead of creating a new one

* Join futures
 2025-09-17 19:37:21 +00:00
François-Xavier TalbotCopilotJosiah Glosson
 		902d749293 [DO NOT MERGE] Email notification system (#4338) 
* Migration

* Fixup db models

* Redis

* Stuff

* Switch PKs to BIGSERIALs, insert to notifications_deliveries when inserting notifications

* Queue, templates

* Query cache

* Fixes, fixtures

* Perf, cache template data & HTML bodies

* Notification type configuration, ResetPassword notification type

* Reset password

* Query cache

* Clippy + fmt

* Traces, fix typo, fix user email in ResetPassword

* send_email

* Models, db

* Remove dead code, adjust notification settings in migration

* Clippy fmt

* Delete dead code, fixes

* Fmt

* Update apps/labrinth/src/queue/email.rs

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Signed-off-by: François-Xavier Talbot <108630700+fetchfern@users.noreply.github.com>

* Remove old fixtures

* Unify email retry delay

* Fix type

* External notifications

* Remove `notifications_types_preference_restrictions`, as user notification preferences is out of scope for this PR

* Query cache, fmt, clippy

* Fix join in get_many_user_exposed_on_site

* Remove migration comment

* Query cache

* Update html body urls

* Remove comment

* Add paymentfailed.service variable to PaymentFailed notification variant

* Fix compile error

* Fix deleting notifications

* Update apps/labrinth/src/database/models/user_item.rs

Co-authored-by: Josiah Glosson <soujournme@gmail.com>
Signed-off-by: François-Xavier Talbot <108630700+fetchfern@users.noreply.github.com>

* Update apps/labrinth/src/database/models/user_item.rs

Co-authored-by: Josiah Glosson <soujournme@gmail.com>
Signed-off-by: François-Xavier Talbot <108630700+fetchfern@users.noreply.github.com>

* Update Cargo.toml

Co-authored-by: Josiah Glosson <soujournme@gmail.com>
Signed-off-by: François-Xavier Talbot <108630700+fetchfern@users.noreply.github.com>

* Update apps/labrinth/migrations/20250902133943_notification-extension.sql

Co-authored-by: Josiah Glosson <soujournme@gmail.com>
Signed-off-by: François-Xavier Talbot <108630700+fetchfern@users.noreply.github.com>

* Address review comments

* Fix compliation

* Update apps/labrinth/src/database/models/users_notifications_preferences_item.rs

Co-authored-by: Josiah Glosson <soujournme@gmail.com>
Signed-off-by: François-Xavier Talbot <108630700+fetchfern@users.noreply.github.com>

* Use strfmt to format emails

* Configurable Reply-To

* Configurable Reply-To

* Refactor for email background task

* Send some emails inline

* Fix account creation email check

* Revert "Use strfmt to format emails"

This reverts commit e0d6614afe.

* Reintroduce fill_template

* Set password reset email inline

* Process more emails per index

* clippy fmt

* Query cache

---------

Signed-off-by: François-Xavier Talbot <108630700+fetchfern@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Josiah Glosson <soujournme@gmail.com>
 2025-09-15 19:02:29 +00:00
François-Xavier Talbot 3fc55184a7 Support alternative read-replica PgPool (#4374) 
* Add ReadOnlyPgPool

* Clippy, fmt
 2025-09-14 15:44:52 +00:00
François-Xavier Talbot d8d9720495 Only Fire Slack Webhook Once a Day (#4368) 
* Only send webhook once per day

* pat clippy's back

* damn query cache
 2025-09-11 23:38:22 +00:00
François-Xavier Talbot 58aac642a9 Slack webhook for payout source threshold alerts (#4353) 
* Slack webhook for payout alerts

* add PAYOUT_ALERT_SLACK_WEBHOOK to check_env_vars

* Fix commit

* Fix webhook format

* Add new env vars in .env.local

* Rename env vars, fire webhook on error

* Fix compilation

* Clippy

* Fix CI

* Add env vars to .env.docker-compose
 2025-09-10 21:16:21 +00:00
François-Xavier Talbot ea607c1a04 Include Tremendous image_logo_url (#4349) 2025-09-08 12:34:51 +00:00
François-Xavier Talbot 0511a14bd9 Fix tremendous balance check (#4337) 2025-09-04 12:28:22 +00:00
François-Xavier Talbot bd918c7616 Move update_bank_balances to billing task, don't fail every provider if one fails (#4332) 2025-09-03 13:12:34 +00:00
François-Xavier Talbot 8aede4e082 Revert decimal rounding order, fix profile settings (#4314) 
* Revert rounding post subtraction in GET balance

* Switch to panic = "unwind" in release mode

* Use profile 'release-labrinth'

* Fix target path
 2025-09-01 14:59:09 +00:00
François-Xavier Talbot ab539a313f Add tax compliance form related fields to GET /payout (#4274) 
* Add form fields to GET payout

* Fix TIN match status never being updated

* Fmt + clippy

* Remove unnecessary borrow
 2025-08-28 09:36:31 +00:00
François-Xavier Talbot 006b19e3c9 Creator tax compliance (#4254) 
* Initial implementation

* Remove test code

* Query cache

* Appease clippy

* Precise TIN/SSN

* Make tax threshold customizable via env variable

* Address review comments
 2025-08-25 16:34:58 +00:00
François-Xavier TalbotandCal H. b03d754a57 Dry query param, cleanup (#4176) 
Co-authored-by: Cal H. <hendersoncal117@gmail.com>
 2025-08-17 11:50:51 +00:00
François-Xavier TalbotandCopilot 9b5f172170 Billing issues fixes (#4173) 
* Multiple billing fixes

- Fix the open charge not having its amount + interval updated after
promoting the expiring subscription
- Fix proration rate being miscalculated (assumed the current
subscription interval was always monthly)
- Fix the open charge's interval and amount being updated on PATCH
/subscription/:id even if the payment intent was never confirmed

* Appease clippy

* Update apps/labrinth/src/routes/internal/billing.rs

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Signed-off-by: François-Xavier Talbot <108630700+fetchfern@users.noreply.github.com>

---------

Signed-off-by: François-Xavier Talbot <108630700+fetchfern@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
 2025-08-14 23:59:37 +00:00
François-Xavier Talbot 9497ba70a4 Offers, redemption, preview subscriptions (#4121) 
* Initial db migration/impl, guarded partner routes

* Add guard to /redeem

* Add `public` column to products prices, only expose public prices

* Query cache

* Add partner subscription type

* 5 days subscription interval, metadata

* Create server on redeem

* Query cache

* Fix race condition

* Unprovision Medal subscriptions

* Consider due expiring charge as unprovisionable

* Query cache

* Use a queue

* Promote to full subscription, fmt + clippy

* Patch expiring charge on promotion, comments

* Additional comments

* Add `tags` field to Archon /create request

* Address review comments

* Query cache

* Final fixes to edit_subscription

* Appease clippy

* fmt
 2025-08-11 21:40:58 +00:00
François-Xavier Talbot 544f63512a Use correct .git path in build.rs (#4145) 2025-08-09 18:59:22 +00:00
François-Xavier Talbot 7223c2b197 Include region in user subscription metadata (#3733) 2025-06-02 05:13:06 +00:00
François-Xavier Talbot f52d020a3c Support specifying a region when creating servers (#3709) 
* Support specifying a region when creating servers

* Remove hardcoded default server region
 2025-05-26 21:21:52 +00:00