@@ -837,20 +849,26 @@ provideAppUpdateDownloadProgress(appUpdateDownload) // [AR Note] If delete this
>
-
-
Playing as
+
+
- Playing as
+
-
-
-
News
-
+
+
-
-
-
News
+Add friends to share what you're playing!
-
-
-
-
-
-
-
- {{ friend.username }}
-
-
-
-
-
- You have no pending friend requests :C
-
-
+
You have no pending friend requests :C
+
+
{count} project} other {{count} projects}}',
+ profileProjectsLabel: {
+ id: 'profile.label.projects',
+ defaultMessage: '{count} {count, plural, one {project} other {projects}}',
},
- profileDownloadsStats: {
- id: 'profile.stats.downloads',
- defaultMessage:
- '{count, plural, one {{count} project download} other {{count} project downloads}}',
+ profileDownloadsLabel: {
+ id: 'profile.label.downloads',
+ defaultMessage: '{count} {count, plural, one {download} other {downloads}}',
+ },
+ profileJoinedLabel: {
+ id: 'profile.label.joined',
+ defaultMessage: 'Joined',
+ },
+ savingLabel: {
+ id: 'profile.label.saving',
+ defaultMessage: 'Saving...',
+ },
+ emailLabel: {
+ id: 'profile.details.label.email',
+ defaultMessage: 'Email',
+ },
+ emailVerifiedTooltip: {
+ id: 'profile.details.tooltip.email-verified',
+ defaultMessage: 'Email verified',
+ },
+ emailNotVerifiedTooltip: {
+ id: 'profile.details.tooltip.email-not-verified',
+ defaultMessage: 'Email not verified',
+ },
+ authProvidersLabel: {
+ id: 'profile.details.label.auth-providers',
+ defaultMessage: 'Auth providers',
+ },
+ paymentMethodsLabel: {
+ id: 'profile.details.label.payment-methods',
+ defaultMessage: 'Payment methods',
+ },
+ hasPasswordLabel: {
+ id: 'profile.details.label.has-password',
+ defaultMessage: 'Has password',
+ },
+ hasTotpLabel: {
+ id: 'profile.details.label.has-totp',
+ defaultMessage: 'Has TOTP',
+ },
+ yesLabel: {
+ id: 'profile.label.yes',
+ defaultMessage: 'Yes',
+ },
+ noLabel: {
+ id: 'profile.label.no',
+ defaultMessage: 'No',
+ },
+ bioFallbackUser: {
+ id: 'profile.bio.fallback.user',
+ defaultMessage: 'A Modrinth user.',
+ },
+ bioFallbackCreator: {
+ id: 'profile.bio.fallback.creator',
+ defaultMessage: 'A Modrinth creator.',
+ },
+ collectionLabel: {
+ id: 'profile.label.collection',
+ defaultMessage: 'Collection',
},
profileProjectsFollowersStats: {
id: 'profile.stats.projects-followers',
defaultMessage:
'{count, plural, one {{count} project follower} other {{count} project followers}}',
},
- profileJoinedAt: {
- id: 'profile.joined-at',
- defaultMessage: 'Joined {ago} ',
- },
profileUserId: {
id: 'profile.user-id',
defaultMessage: 'User ID: {id}',
diff --git a/apps/frontend/src/public/news/article/creator-withdrawals-overhaul/balance-progress-bar.mp4 b/apps/frontend/src/public/news/article/creator-withdrawals-overhaul/balance-progress-bar.mp4
new file mode 100644
index 00000000..05131a28
Binary files /dev/null and b/apps/frontend/src/public/news/article/creator-withdrawals-overhaul/balance-progress-bar.mp4 differ
diff --git a/apps/frontend/src/public/news/article/creator-withdrawals-overhaul/revenue-page-from-home.mp4 b/apps/frontend/src/public/news/article/creator-withdrawals-overhaul/revenue-page-from-home.mp4
new file mode 100644
index 00000000..4af4e18a
Binary files /dev/null and b/apps/frontend/src/public/news/article/creator-withdrawals-overhaul/revenue-page-from-home.mp4 differ
diff --git a/apps/frontend/src/public/news/article/creator-withdrawals-overhaul/tax-compliance.png b/apps/frontend/src/public/news/article/creator-withdrawals-overhaul/tax-compliance.png
new file mode 100644
index 00000000..d41170ba
Binary files /dev/null and b/apps/frontend/src/public/news/article/creator-withdrawals-overhaul/tax-compliance.png differ
diff --git a/apps/frontend/src/public/news/article/creator-withdrawals-overhaul/thumbnail.webp b/apps/frontend/src/public/news/article/creator-withdrawals-overhaul/thumbnail.webp
new file mode 100644
index 00000000..97265aa6
Binary files /dev/null and b/apps/frontend/src/public/news/article/creator-withdrawals-overhaul/thumbnail.webp differ
diff --git a/apps/frontend/src/public/news/article/creator-withdrawals-overhaul/withdraw-example.mp4 b/apps/frontend/src/public/news/article/creator-withdrawals-overhaul/withdraw-example.mp4
new file mode 100644
index 00000000..ef5edd61
Binary files /dev/null and b/apps/frontend/src/public/news/article/creator-withdrawals-overhaul/withdraw-example.mp4 differ
diff --git a/apps/frontend/src/public/news/feed/articles.json b/apps/frontend/src/public/news/feed/articles.json
index 1c3cd626..b296c93b 100644
--- a/apps/frontend/src/public/news/feed/articles.json
+++ b/apps/frontend/src/public/news/feed/articles.json
@@ -1,5 +1,12 @@
{
"articles": [
+ {
+ "title": "More Ways to Withdraw",
+ "summary": "Coming soon: new withdraw options and a redesigned revenue dashboard",
+ "thumbnail": "https://modrinth.com/news/article/creator-withdrawals-overhaul/thumbnail.webp",
+ "date": "2025-10-27T23:30:00.000Z",
+ "link": "https://modrinth.com/news/article/creator-withdrawals-overhaul"
+ },
{
"title": "Standing By Our Values",
"summary": "Keeping LGBTQIA+ content visible despite demands from Russia.",
diff --git a/apps/frontend/src/public/news/feed/rss.xml b/apps/frontend/src/public/news/feed/rss.xml
index 1da2d231..0d66e3c2 100644
--- a/apps/frontend/src/public/news/feed/rss.xml
+++ b/apps/frontend/src/public/news/feed/rss.xml
@@ -4,9 +4,17 @@
@modrinth/blog
- Thu, 02 Oct 2025 01:36:13 GMT
+ Mon, 27 Oct 2025 23:06:26 GMT
-
+
<![CDATA[More Ways to Withdraw]]>
+ https://modrinth.com/news/article/creator-withdrawals-overhaul/
+ Mon, 27 Oct 2025 21:38:54 GMT
+ <![CDATA[<p>Hey everyone! We've heard your feedback on creator withdrawal options, and we're excited to share that more are finally coming to Modrinth! Over the past month, we've been working on overhauling the withdrawal experience and supporting more withdraw methods.</p><p><strong>This update will roll out later this week</strong>, but we wanted to give everyone an early heads-up so you can hold off on withdrawing when payouts go out in a couple days in case one of the new options interests you. There's a lot packed into this release, so let's dive in!</p><div class="video-wrapper mb-8"><video autoplay loop muted playsinline><source src="./revenue-page-from-home.mp4" type="video/mp4"></video></div><h2><strong>TL;DR</strong></h2><ul><li>New revenue page and withdrawal flow</li><li>New bank transfer option for 29 countries</li><li>New crypto (USDC) option for hard to reach countries</li><li>PayPal and Venmo moved to Tremendous for international users (lower to no FX fees)</li><li>Email notifications for payout updates (available, successful, failed, etc.)</li><li>New withdrawal compliance</li></ul><hr><h2>Streamlined Withdrawal Experience</h2><p>A big goal for this release was to make payouts as clear as possible for creators. The revenue screen and withdrawal process has been completely overhauled.</p><p><strong>Your revenue is now displayed as a balance, with a detailed breakdown below.</strong></p><div class="video-wrapper mb-8"><video autoplay loop muted playsinline><source src="./balance-progress-bar.mp4" type="video/mp4"></video></div><blockquote><p>Green shows available revenue, blue and purple show estimated revenue from the last two completed months, and grey shows the current month revenue that's still being processed.</p></blockquote><p>We've also cleaned up the transaction history. You'll now see your most recent transactions directly on the revenue page, along with any deposits from Modrinth into your account.</p><h2>New Withdraw Methods</h2><p>The second big goal of this release was to bring more options, better fees, and new ways to withdraw from countries that were previously hard to reach.</p><div class="video-wrapper mb-8"><video autoplay loop muted playsinline><source src="./withdraw-example.mp4" type="video/mp4"></video></div><p>Withdrawing with ease from your balance using our new modal flow. Click the green Withdraw button to get started, and you'll immediately see all available methods and fees for your country, including a few new ones:</p><h3>Bank Transfers (29 Countries)</h3><p>You can now withdraw directly to your bank account via wire or ACH, depending on your country. Supported countries and their fees are listed below.</p><p>We're working to expand this list, most notably to Canada, the UK, and countries across Asia, but there's no timeline <em>yet</em>.</p><table><thead><tr><th>Country</th><th>Currency</th><th>Transaction Fee</th><th>FX Fee</th><th><strong>Total Fee</strong></th></tr></thead><tbody><tr><td>πΊπΈ USA</td><td>USD</td><td>$0.50 + 1%</td><td>0.50%</td><td><strong>~1.5% + $0.50</strong></td></tr><tr><td>πͺπΊ EU</td><td>EUR</td><td>β¬1.00 + 1%</td><td>0.60%</td><td><strong>~1.6% + β¬1.00</strong></td></tr><tr><td>π¦π· Argentina</td><td>ARS</td><td>$0.00 + 1%</td><td>0.50%</td><td><strong>~1.5%</strong></td></tr><tr><td>π²π½ Mexico</td><td>MXN</td><td>$0.50 + 1%</td><td>0.90%</td><td><strong>~1.9% + $0.50</strong></td></tr><tr><td>π§π· Brazil</td><td>BRL</td><td>$0.25 + 1%</td><td>1.30% (incl. IOF)</td><td><strong>~2.3% + $0.25</strong></td></tr><tr><td>π¨π± Chile</td><td>CLP</td><td>$1.20 + 1%</td><td>0.95%</td><td><strong>~2.0% + $1.20</strong></td></tr><tr><td>π¨π· Costa Rica</td><td>CRC</td><td>$0.80 + 1%</td><td>1.05%</td><td><strong>~2.1% + $0.80</strong></td></tr><tr><td>π΅πͺ Peru (PEN)</td><td>PEN</td><td>$1.00 + 1%</td><td>1.15%</td><td><strong>~2.1% + $1.00</strong></td></tr><tr><td>πΏπ¦ South Africa</td><td>ZAR</td><td>$1.50 + 1%</td><td>1.40%</td><td><strong>~2.4% + $1.50</strong></td></tr><tr><td>π΅πͺ Peru (USD)</td><td>USD</td><td>$5.00 + 1%</td><td>0.50%</td><td><strong>~1.5% + $5.00</strong></td></tr><tr><td>π¨π΄ Colombia</td><td>COP</td><td>$0.35 + 1%</td><td>0.95% (incl. GMF)</td><td><strong>~2.0% + $0.35</strong></td></tr></tbody></table><p><em>Total Fee includes both transaction and FX fees.</em></p><blockquote><p><strong>Supported EU countries:</strong> Austria, Belgium, Cyprus, Estonia, Finland, France, Germany, Greece, Ireland, Italy, Latvia, Lithuania, Luxembourg, Malta, Netherlands, Portugal, Slovakia, Spain</p></blockquote><h3>Crypto Withdrawals (USDC)</h3><p>We've also added USDC withdrawals on the Polygon network. This option is available worldwide, so everyone can now withdraw funds. Fees are a flat 1% + network fees, making it a great low-cost option.</p><h3>PayPal & Venmo</h3><p>We've moved PayPal and Venmo to two different methods depending on your country:</p><ul><li><strong>United States:</strong> PayPal and Venmo will remain on the existing system with the same low fees: $0.25 + 2%, capped at $1.00.</li><li><strong>Outside of the United States:</strong> PayPal and Venmo have been moved to Tremendous, which has zero FX fees and charges a flat 6%, capped at $25.00. This should be an improvement over the old method for larger creators, where PayPal charged high uncapped fees for currency conversion.</li></ul><h2>New Email Notifications</h2><p>Earlier this month, we quietly rolled out a new email system that lets us give both creators and users better feedback about what's going on.</p><p>This includes emails for things like project status changes, payouts available, and successful withdrawals. We plan to keep building on this and will be adding email preference settings soon!</p><h2>Tax Compliance</h2><p>Last but not least, we're also rolling out our new tax compliance system. We partially rolled this out earlier this month, but the full version is now live.</p><p>Creator withdrawals will now be limited to $600.00 USD per calendar year as of 2025, per U.S. regulations. As a creator approaches that threshold, they'll be prompted to fill out a W-8 or W-9 tax form, depending on their country.</p><p><img src="/news/article/creator-withdrawals-overhaul/tax-compliance.png" alt="A snippet of the tax form stage of the new withdraw modal."></p><p>Completing this form helps Modrinth stay compliant and will automatically unlock withdrawals again once submitted. For non-US users, these details are not automatically sent to the US government! They are for our own records in the case of an audit and we need to prove where we're sending money to.</p><hr><p>Thank you to all the creators and players supporting Modrinth, we hope you enjoy this long deserved update! π</p>]]>
+
-
<![CDATA[Standing By Our Values]]>
- This payout reflects revenue earned by the creator through their activity on the Modrinth
- platform. Earnings are based on advertising revenue, subscriptions, and/or affiliate
- commissions tied to the creator's published projects, in accordance with the Rewards Program
- Terms.
+ This payout reflects the creator's earnings from their activity on the Modrinth platform.
+ Such earnings are based on advertising revenue derived from user engagement with the
+ creator's published projects and/or affiliate commissions in accordance with the Rewards
+ Program Terms.
diff --git a/apps/frontend/src/templates/emails/account/AuthenticationMethodAdded.vue b/apps/frontend/src/templates/emails/account/AuthenticationMethodAdded.vue
index 278ea0a3..dcb0b026 100644
--- a/apps/frontend/src/templates/emails/account/AuthenticationMethodAdded.vue
+++ b/apps/frontend/src/templates/emails/account/AuthenticationMethodAdded.vue
@@ -17,9 +17,8 @@ import StyledEmail from '../shared/StyledEmail.vue'
Modrinth account.
- If you did not make this change, please contact us immediately by replying to this email or
- through our Support Portal Support Portal.
diff --git a/apps/frontend/src/templates/emails/account/AuthenticationMethodRemoved.vue b/apps/frontend/src/templates/emails/account/AuthenticationMethodRemoved.vue
index 715565cd..066add93 100644
--- a/apps/frontend/src/templates/emails/account/AuthenticationMethodRemoved.vue
+++ b/apps/frontend/src/templates/emails/account/AuthenticationMethodRemoved.vue
@@ -17,9 +17,8 @@ import StyledEmail from '../shared/StyledEmail.vue'
sign in to your Modrinth account.
- If you did not make this change, please contact us immediately by replying to this email or
- through our Support Portal Support Portal.
diff --git a/apps/frontend/src/templates/emails/account/EmailChanged.vue b/apps/frontend/src/templates/emails/account/EmailChanged.vue
index a2595393..95a1aa9d 100644
--- a/apps/frontend/src/templates/emails/account/EmailChanged.vue
+++ b/apps/frontend/src/templates/emails/account/EmailChanged.vue
@@ -17,9 +17,8 @@ import StyledEmail from '../shared/StyledEmail.vue'
{emailchanged.new_email}.
- If you did not make this change, please contact us immediately by replying to this email or
- through our Support Portal Support Portal.
diff --git a/apps/frontend/src/templates/emails/account/LoginNewDevice.vue b/apps/frontend/src/templates/emails/account/LoginNewDevice.vue
index 138b90f6..e3bfa8bb 100644
--- a/apps/frontend/src/templates/emails/account/LoginNewDevice.vue
+++ b/apps/frontend/src/templates/emails/account/LoginNewDevice.vue
@@ -70,9 +70,8 @@ import StyledEmail from '../shared/StyledEmail.vue'
If this wasn't you, please update your password and review your account security settings. If
- you cannot do this, contact us immediately by replying to this email or
- through our Support Portal Support Portal.
diff --git a/apps/frontend/src/templates/emails/account/PATCreated.vue b/apps/frontend/src/templates/emails/account/PATCreated.vue
index 840c43af..acbfc8ad 100644
--- a/apps/frontend/src/templates/emails/account/PATCreated.vue
+++ b/apps/frontend/src/templates/emails/account/PATCreated.vue
@@ -18,9 +18,8 @@ import StyledEmail from '../shared/StyledEmail.vue'
A new personal access token, {newpat.token_name}, has been added to your account.
- If you did not create this token, please contact us immediately by replying to this email or
- through our Support Portal Support Portal.
diff --git a/apps/frontend/src/templates/emails/account/PasswordChanged.vue b/apps/frontend/src/templates/emails/account/PasswordChanged.vue
index 3c949220..c2a461ef 100644
--- a/apps/frontend/src/templates/emails/account/PasswordChanged.vue
+++ b/apps/frontend/src/templates/emails/account/PasswordChanged.vue
@@ -14,9 +14,8 @@ import StyledEmail from '../shared/StyledEmail.vue'
Hi {user.name},
Your password has been changed on your account.
- If you did not make this change, please contact us immediately by replying to this email or
- through our Support Portal Support Portal.
diff --git a/apps/frontend/src/templates/emails/account/PasswordRemoved.vue b/apps/frontend/src/templates/emails/account/PasswordRemoved.vue
index 56fdeb85..ff21223d 100644
--- a/apps/frontend/src/templates/emails/account/PasswordRemoved.vue
+++ b/apps/frontend/src/templates/emails/account/PasswordRemoved.vue
@@ -18,9 +18,8 @@ import StyledEmail from '../shared/StyledEmail.vue'
Modrinth account.
- If you did not make this change, please contact us immediately by replying to this email or
- through our Support Portal Support Portal.
diff --git a/apps/frontend/src/templates/emails/account/PayoutAvailable.vue b/apps/frontend/src/templates/emails/account/PayoutAvailable.vue
index 5ae88853..4401e795 100644
--- a/apps/frontend/src/templates/emails/account/PayoutAvailable.vue
+++ b/apps/frontend/src/templates/emails/account/PayoutAvailable.vue
@@ -34,8 +34,8 @@ import StyledEmail from '../shared/StyledEmail.vue'
If you have any questions about the creator rewards program, please contact support through
the
- Support Portal
- or by replying to this email.
+ Support Portal .
Thank you for being a creator on Modrinth!
diff --git a/apps/frontend/src/templates/emails/account/SubscriptionCredited.vue b/apps/frontend/src/templates/emails/account/SubscriptionCredited.vue
new file mode 100644
index 00000000..aeb5be9d
--- /dev/null
+++ b/apps/frontend/src/templates/emails/account/SubscriptionCredited.vue
@@ -0,0 +1,25 @@
+
+
+
+
+ Weβve added time to your server
+
+ Hi {user.name},
+ {credit.header_message}
+
+
+ To make up for it, we've added {credit.days_formatted} to your {credit.subscription.type}
+ subscription.
+
+
+ Your next charge was scheduled for {credit.previous_due} and will now be on {credit.next_due}.
+
+
+ Thank you for supporting us,
+ The Modrinth Team
+
+
diff --git a/apps/frontend/src/templates/emails/account/SubscriptionTaxChange.vue b/apps/frontend/src/templates/emails/account/SubscriptionTaxChange.vue
index ee87fbd0..6fca93d8 100644
--- a/apps/frontend/src/templates/emails/account/SubscriptionTaxChange.vue
+++ b/apps/frontend/src/templates/emails/account/SubscriptionTaxChange.vue
@@ -32,7 +32,7 @@ import StyledEmail from '../shared/StyledEmail.vue'
Thank you for choosing Modrinth! If you have any questions or need help with your
- subscription, reply to this email or visit our
+ subscription, visit our
Support Portal .
diff --git a/apps/frontend/src/templates/emails/account/TwoFactorAdded.vue b/apps/frontend/src/templates/emails/account/TwoFactorAdded.vue
index 6b5db217..6222c8b9 100644
--- a/apps/frontend/src/templates/emails/account/TwoFactorAdded.vue
+++ b/apps/frontend/src/templates/emails/account/TwoFactorAdded.vue
@@ -17,9 +17,8 @@ import StyledEmail from '../shared/StyledEmail.vue'
need to submit the code generated by your authenticator app.
- If you did not make this change, please contact us immediately by replying to this email or
- through our Support Portal Support Portal.
diff --git a/apps/frontend/src/templates/emails/account/TwoFactorRemoved.vue b/apps/frontend/src/templates/emails/account/TwoFactorRemoved.vue
index 82a5a6e9..740bb089 100644
--- a/apps/frontend/src/templates/emails/account/TwoFactorRemoved.vue
+++ b/apps/frontend/src/templates/emails/account/TwoFactorRemoved.vue
@@ -18,9 +18,8 @@ import StyledEmail from '../shared/StyledEmail.vue'
At your request, we've removed two-factor authentication from your Modrinth account.
- If you did not make this change, please contact us immediately by replying to this email or
- through our Support Portal Support Portal.
diff --git a/apps/frontend/src/templates/emails/index.ts b/apps/frontend/src/templates/emails/index.ts
index 8ec330e9..719611b6 100644
--- a/apps/frontend/src/templates/emails/index.ts
+++ b/apps/frontend/src/templates/emails/index.ts
@@ -18,6 +18,7 @@ export default {
// Subscriptions
'subscription-tax-change': () => import('./account/SubscriptionTaxChange.vue'),
+ 'subscription-credited': () => import('./account/SubscriptionCredited.vue'),
// Moderation
'report-submitted': () => import('./moderation/ReportSubmitted.vue'),
diff --git a/apps/frontend/src/templates/emails/organization/OrganizationInvited.vue b/apps/frontend/src/templates/emails/organization/OrganizationInvited.vue
index e6d1a565..ffdaf260 100644
--- a/apps/frontend/src/templates/emails/organization/OrganizationInvited.vue
+++ b/apps/frontend/src/templates/emails/organization/OrganizationInvited.vue
@@ -68,8 +68,7 @@ import StyledEmail from '../shared/StyledEmail.vue'
in error or is abusive, please contact support
through the Support Portal
- or by replying to this email.
+ >.
diff --git a/apps/frontend/src/templates/emails/project/ProjectInvited.vue b/apps/frontend/src/templates/emails/project/ProjectInvited.vue
index 711047bf..1e3ab88e 100644
--- a/apps/frontend/src/templates/emails/project/ProjectInvited.vue
+++ b/apps/frontend/src/templates/emails/project/ProjectInvited.vue
@@ -63,8 +63,7 @@ import StyledEmail from '../shared/StyledEmail.vue'
this was sent in error or is abusive, please contact support
through the Support Portal
- or by replying to this email.
+ >.
diff --git a/apps/frontend/src/templates/emails/project/ProjectStatusApproved.vue b/apps/frontend/src/templates/emails/project/ProjectStatusApproved.vue
index e2e52163..a1310c18 100644
--- a/apps/frontend/src/templates/emails/project/ProjectStatusApproved.vue
+++ b/apps/frontend/src/templates/emails/project/ProjectStatusApproved.vue
@@ -45,8 +45,7 @@ import StyledEmail from '../shared/StyledEmail.vue'
- If you have questions or believe something isn't correct, you can reply to this email or reach
- out via the
+ If you have questions or believe something isn't correct, you can reach out via the
Support Portal .
diff --git a/apps/frontend/src/templates/emails/project/ProjectStatusUpdatedNeutral.vue b/apps/frontend/src/templates/emails/project/ProjectStatusUpdatedNeutral.vue
index feae7549..eb9361d6 100644
--- a/apps/frontend/src/templates/emails/project/ProjectStatusUpdatedNeutral.vue
+++ b/apps/frontend/src/templates/emails/project/ProjectStatusUpdatedNeutral.vue
@@ -53,8 +53,8 @@ import StyledEmail from '../shared/StyledEmail.vue'
If you believe this status was applied in error, you can reply in the moderation thread or
contact support through our
- Support Portal
- or by replying to this email.
+ Support Portal .
Thank you for publishing on Modrinth!
diff --git a/apps/frontend/src/templates/emails/project/ProjectTransferred.vue b/apps/frontend/src/templates/emails/project/ProjectTransferred.vue
index 7da66d5d..bb221f37 100644
--- a/apps/frontend/src/templates/emails/project/ProjectTransferred.vue
+++ b/apps/frontend/src/templates/emails/project/ProjectTransferred.vue
@@ -53,8 +53,8 @@ import StyledEmail from '../shared/StyledEmail.vue'
If you did not initiate this transfer, please contact support immediately through the
- Support Portal
- or by replying to this email.
+ Support Portal .
diff --git a/apps/frontend/src/utils/analytics.js b/apps/frontend/src/utils/analytics.js
index 9aa63572..a8833424 100644
--- a/apps/frontend/src/utils/analytics.js
+++ b/apps/frontend/src/utils/analytics.js
@@ -307,6 +307,7 @@ export const useFetchAllAnalytics = (
startDate = ref(dayjs().subtract(30, 'days')),
endDate = ref(dayjs()),
timeResolution = ref(1440),
+ isInitialized = ref(false),
) => {
const downloadData = ref(null)
const viewData = ref(null)
@@ -388,8 +389,18 @@ export const useFetchAllAnalytics = (
}
watch(
- [() => startDate.value, () => endDate.value, () => timeResolution.value, () => projects.value],
+ [
+ () => startDate.value,
+ () => endDate.value,
+ () => timeResolution.value,
+ () => projects.value,
+ () => isInitialized.value,
+ ],
async () => {
+ if (!isInitialized.value) {
+ return
+ }
+
const q = {
start_date: startDate.value.toISOString(),
end_date: endDate.value.toISOString(),
@@ -456,5 +467,6 @@ export const useFetchAllAnalytics = (
totalData,
loading,
error,
+ isInitialized,
}
}
diff --git a/apps/labrinth/.env.docker-compose b/apps/labrinth/.env.docker-compose
index 45be8c82..d272a7e4 100644
--- a/apps/labrinth/.env.docker-compose
+++ b/apps/labrinth/.env.docker-compose
@@ -114,6 +114,7 @@ CLICKHOUSE_USER=default
CLICKHOUSE_PASSWORD=default
CLICKHOUSE_DATABASE=staging_ariadne
+MAXMIND_ACCOUNT_ID=none
MAXMIND_LICENSE_KEY=none
FLAME_ANVIL_URL=none
@@ -141,4 +142,7 @@ COMPLIANCE_PAYOUT_THRESHOLD=disabled
ANROK_API_KEY=none
ANROK_API_URL=none
+GOTENBERG_URL=http://labrinth-gotenberg:13000
+GOTENBERG_CALLBACK_BASE=http://host.docker.internal:8000/_internal/gotenberg
+
ARCHON_URL=none
diff --git a/apps/labrinth/.env.local b/apps/labrinth/.env.local
index a644cd54..45372c45 100644
--- a/apps/labrinth/.env.local
+++ b/apps/labrinth/.env.local
@@ -115,6 +115,7 @@ CLICKHOUSE_USER=default
CLICKHOUSE_PASSWORD=default
CLICKHOUSE_DATABASE=staging_ariadne
+MAXMIND_ACCOUNT_ID=none
MAXMIND_LICENSE_KEY=none
FLAME_ANVIL_URL=none
@@ -142,4 +143,7 @@ COMPLIANCE_PAYOUT_THRESHOLD=disabled
ANROK_API_KEY=none
ANROK_API_URL=none
+GOTENBERG_URL=http://localhost:13000
+GOTENBERG_CALLBACK_BASE=http://host.docker.internal:8000/_internal/gotenberg
+
ARCHON_URL=none
diff --git a/apps/labrinth/.prettierignore b/apps/labrinth/.prettierignore
index ffe984b7..ae989a74 100644
--- a/apps/labrinth/.prettierignore
+++ b/apps/labrinth/.prettierignore
@@ -113,6 +113,10 @@ migrations/20250725230041_reports-closed-status-index.sql
migrations/20250727184120_user-newsletter-subscription-column.sql
migrations/20250804221014_users-redeemals.sql
migrations/20250805001654_product-prices-public.sql
+migrations/20250823233518_user-compliance.sql
+migrations/20250902133943_notification-extension.sql
+migrations/20250914190749_affiliate_codes.sql
+migrations/20250927120742_user_limits.sql
# Prettier reformats some of the PostgreSQL-specific COPY syntax here,
# which is very likely to break things
diff --git a/apps/labrinth/.sqlx/query-e36e0ac1e2edb73533961a18e913f0b8e4f420a76e511571bb2eed9355771e54.json b/apps/labrinth/.sqlx/query-372c03a6daf0045f615faa9a6205558cd0ea1d9dba5948e8fa2496ed99de8fea.json
similarity index 73%
rename from apps/labrinth/.sqlx/query-e36e0ac1e2edb73533961a18e913f0b8e4f420a76e511571bb2eed9355771e54.json
rename to apps/labrinth/.sqlx/query-372c03a6daf0045f615faa9a6205558cd0ea1d9dba5948e8fa2496ed99de8fea.json
index 84342011..8cbb2c28 100644
--- a/apps/labrinth/.sqlx/query-e36e0ac1e2edb73533961a18e913f0b8e4f420a76e511571bb2eed9355771e54.json
+++ b/apps/labrinth/.sqlx/query-372c03a6daf0045f615faa9a6205558cd0ea1d9dba5948e8fa2496ed99de8fea.json
@@ -1,6 +1,6 @@
{
"db_name": "PostgreSQL",
- "query": "\n SELECT\n charges.id, charges.user_id, charges.price_id, charges.amount, charges.currency_code, charges.status, charges.due, charges.last_attempt,\n charges.charge_type, charges.subscription_id, charges.tax_amount, charges.tax_platform_id,\n -- Workaround for https://github.com/launchbadge/sqlx/issues/3336\n charges.subscription_interval AS \"subscription_interval?\",\n charges.payment_platform,\n charges.payment_platform_id AS \"payment_platform_id?\",\n charges.parent_charge_id AS \"parent_charge_id?\",\n charges.net AS \"net?\",\n\t\t\t\tcharges.tax_last_updated AS \"tax_last_updated?\",\n\t\t\t\tcharges.tax_drift_loss AS \"tax_drift_loss?\"\n FROM charges\n \n WHERE\n charge_type = $1 AND\n status = 'failed' AND due < NOW() - INTERVAL '30 days'\n ",
+ "query": "\n SELECT\n charges.id, charges.user_id, charges.price_id, charges.amount, charges.currency_code, charges.status, charges.due, charges.last_attempt,\n charges.charge_type, charges.subscription_id, charges.tax_amount, charges.tax_platform_id,\n -- Workaround for https://github.com/launchbadge/sqlx/issues/3336\n charges.subscription_interval AS \"subscription_interval?\",\n charges.payment_platform,\n charges.payment_platform_id AS \"payment_platform_id?\",\n charges.parent_charge_id AS \"parent_charge_id?\",\n charges.net AS \"net?\",\n\t\t\t\tcharges.tax_last_updated AS \"tax_last_updated?\",\n\t\t\t\tcharges.tax_drift_loss AS \"tax_drift_loss?\",\n charges.tax_transaction_version AS \"tax_transaction_version?\",\n charges.tax_platform_accounting_time AS \"tax_platform_accounting_time?\"\n FROM charges\n \n INNER JOIN users_subscriptions us ON us.id = charges.subscription_id\n WHERE\n charges.charge_type = $1 AND\n (\n (charges.status = 'cancelled' AND charges.due < NOW()) OR\n (charges.status = 'expiring' AND charges.due < NOW()) OR\n (charges.status = 'failed' AND charges.last_attempt < NOW() - INTERVAL '2 days')\n )\n AND us.status = 'provisioned'\n ",
"describe": {
"columns": [
{
@@ -97,6 +97,16 @@
"ordinal": 18,
"name": "tax_drift_loss?",
"type_info": "Int8"
+ },
+ {
+ "ordinal": 19,
+ "name": "tax_transaction_version?",
+ "type_info": "Int4"
+ },
+ {
+ "ordinal": 20,
+ "name": "tax_platform_accounting_time?",
+ "type_info": "Timestamptz"
}
],
"parameters": {
@@ -123,8 +133,10 @@
true,
true,
true,
+ true,
+ true,
true
]
},
- "hash": "e36e0ac1e2edb73533961a18e913f0b8e4f420a76e511571bb2eed9355771e54"
+ "hash": "372c03a6daf0045f615faa9a6205558cd0ea1d9dba5948e8fa2496ed99de8fea"
}
diff --git a/apps/labrinth/.sqlx/query-3d05de766a0987028d465a3305938164e4d79734c17c07111f8923f2faa517bf.json b/apps/labrinth/.sqlx/query-3d05de766a0987028d465a3305938164e4d79734c17c07111f8923f2faa517bf.json
new file mode 100644
index 00000000..f1960f40
--- /dev/null
+++ b/apps/labrinth/.sqlx/query-3d05de766a0987028d465a3305938164e4d79734c17c07111f8923f2faa517bf.json
@@ -0,0 +1,19 @@
+{
+ "db_name": "PostgreSQL",
+ "query": "\n INSERT INTO users_subscriptions_credits\n (subscription_id, user_id, creditor_id, days, previous_due, next_due)\n SELECT * FROM UNNEST($1::bigint[], $2::bigint[], $3::bigint[], $4::int[], $5::timestamptz[], $6::timestamptz[])\n ",
+ "describe": {
+ "columns": [],
+ "parameters": {
+ "Left": [
+ "Int8Array",
+ "Int8Array",
+ "Int8Array",
+ "Int4Array",
+ "TimestamptzArray",
+ "TimestamptzArray"
+ ]
+ },
+ "nullable": []
+ },
+ "hash": "3d05de766a0987028d465a3305938164e4d79734c17c07111f8923f2faa517bf"
+}
diff --git a/apps/labrinth/.sqlx/query-050e755134f6d1f09de805ae2cd0f7ca8f6efb96be9f070c43db7fd2049af2d2.json b/apps/labrinth/.sqlx/query-4a0e5c7ebd4565b95fb99983484cec76952f1505a75eb1a006b3ad9b8aa91a51.json
similarity index 83%
rename from apps/labrinth/.sqlx/query-050e755134f6d1f09de805ae2cd0f7ca8f6efb96be9f070c43db7fd2049af2d2.json
rename to apps/labrinth/.sqlx/query-4a0e5c7ebd4565b95fb99983484cec76952f1505a75eb1a006b3ad9b8aa91a51.json
index 5779cc0f..00c9c93d 100644
--- a/apps/labrinth/.sqlx/query-050e755134f6d1f09de805ae2cd0f7ca8f6efb96be9f070c43db7fd2049af2d2.json
+++ b/apps/labrinth/.sqlx/query-4a0e5c7ebd4565b95fb99983484cec76952f1505a75eb1a006b3ad9b8aa91a51.json
@@ -1,6 +1,6 @@
{
"db_name": "PostgreSQL",
- "query": "\n SELECT\n charges.id, charges.user_id, charges.price_id, charges.amount, charges.currency_code, charges.status, charges.due, charges.last_attempt,\n charges.charge_type, charges.subscription_id, charges.tax_amount, charges.tax_platform_id,\n -- Workaround for https://github.com/launchbadge/sqlx/issues/3336\n charges.subscription_interval AS \"subscription_interval?\",\n charges.payment_platform,\n charges.payment_platform_id AS \"payment_platform_id?\",\n charges.parent_charge_id AS \"parent_charge_id?\",\n charges.net AS \"net?\",\n\t\t\t\tcharges.tax_last_updated AS \"tax_last_updated?\",\n\t\t\t\tcharges.tax_drift_loss AS \"tax_drift_loss?\"\n FROM charges\n \n\t\t\tWHERE\n\t\t\t status = 'succeeded'\n\t\t\t AND tax_platform_id IS NULL\n AND payment_platform_id IS NOT NULL\n\t\t\tORDER BY due ASC\n\t\t\tFOR NO KEY UPDATE SKIP LOCKED\n OFFSET $1\n\t\t\tLIMIT $2\n\t\t\t",
+ "query": "\n SELECT\n charges.id, charges.user_id, charges.price_id, charges.amount, charges.currency_code, charges.status, charges.due, charges.last_attempt,\n charges.charge_type, charges.subscription_id, charges.tax_amount, charges.tax_platform_id,\n -- Workaround for https://github.com/launchbadge/sqlx/issues/3336\n charges.subscription_interval AS \"subscription_interval?\",\n charges.payment_platform,\n charges.payment_platform_id AS \"payment_platform_id?\",\n charges.parent_charge_id AS \"parent_charge_id?\",\n charges.net AS \"net?\",\n\t\t\t\tcharges.tax_last_updated AS \"tax_last_updated?\",\n\t\t\t\tcharges.tax_drift_loss AS \"tax_drift_loss?\",\n charges.tax_transaction_version AS \"tax_transaction_version?\",\n charges.tax_platform_accounting_time AS \"tax_platform_accounting_time?\"\n FROM charges\n WHERE user_id = $1 ORDER BY due DESC",
"describe": {
"columns": [
{
@@ -97,11 +97,20 @@
"ordinal": 18,
"name": "tax_drift_loss?",
"type_info": "Int8"
+ },
+ {
+ "ordinal": 19,
+ "name": "tax_transaction_version?",
+ "type_info": "Int4"
+ },
+ {
+ "ordinal": 20,
+ "name": "tax_platform_accounting_time?",
+ "type_info": "Timestamptz"
}
],
"parameters": {
"Left": [
- "Int8",
"Int8"
]
},
@@ -124,8 +133,10 @@
true,
true,
true,
+ true,
+ true,
true
]
},
- "hash": "050e755134f6d1f09de805ae2cd0f7ca8f6efb96be9f070c43db7fd2049af2d2"
+ "hash": "4a0e5c7ebd4565b95fb99983484cec76952f1505a75eb1a006b3ad9b8aa91a51"
}
diff --git a/apps/labrinth/.sqlx/query-9f0c73fabe99d9891faaebdd3518b362437dcdcef9cd9a68b950fba61218bb4d.json b/apps/labrinth/.sqlx/query-4ed57832b7c02e1f4c683e256455c76e645cde49f95b0e5bfecd3d3d2330ed5c.json
similarity index 78%
rename from apps/labrinth/.sqlx/query-9f0c73fabe99d9891faaebdd3518b362437dcdcef9cd9a68b950fba61218bb4d.json
rename to apps/labrinth/.sqlx/query-4ed57832b7c02e1f4c683e256455c76e645cde49f95b0e5bfecd3d3d2330ed5c.json
index f5dc4759..41437210 100644
--- a/apps/labrinth/.sqlx/query-9f0c73fabe99d9891faaebdd3518b362437dcdcef9cd9a68b950fba61218bb4d.json
+++ b/apps/labrinth/.sqlx/query-4ed57832b7c02e1f4c683e256455c76e645cde49f95b0e5bfecd3d3d2330ed5c.json
@@ -1,6 +1,6 @@
{
"db_name": "PostgreSQL",
- "query": "\n SELECT\n charges.id, charges.user_id, charges.price_id, charges.amount, charges.currency_code, charges.status, charges.due, charges.last_attempt,\n charges.charge_type, charges.subscription_id, charges.tax_amount, charges.tax_platform_id,\n -- Workaround for https://github.com/launchbadge/sqlx/issues/3336\n charges.subscription_interval AS \"subscription_interval?\",\n charges.payment_platform,\n charges.payment_platform_id AS \"payment_platform_id?\",\n charges.parent_charge_id AS \"parent_charge_id?\",\n charges.net AS \"net?\",\n\t\t\t\tcharges.tax_last_updated AS \"tax_last_updated?\",\n\t\t\t\tcharges.tax_drift_loss AS \"tax_drift_loss?\"\n FROM charges\n \n INNER JOIN users_subscriptions us ON us.id = charges.subscription_id\n WHERE\n charges.charge_type = $1 AND\n (\n (charges.status = 'cancelled' AND charges.due < NOW()) OR\n (charges.status = 'expiring' AND charges.due < NOW()) OR\n (charges.status = 'failed' AND charges.last_attempt < NOW() - INTERVAL '2 days')\n )\n AND us.status = 'provisioned'\n ",
+ "query": "\n SELECT\n charges.id, charges.user_id, charges.price_id, charges.amount, charges.currency_code, charges.status, charges.due, charges.last_attempt,\n charges.charge_type, charges.subscription_id, charges.tax_amount, charges.tax_platform_id,\n -- Workaround for https://github.com/launchbadge/sqlx/issues/3336\n charges.subscription_interval AS \"subscription_interval?\",\n charges.payment_platform,\n charges.payment_platform_id AS \"payment_platform_id?\",\n charges.parent_charge_id AS \"parent_charge_id?\",\n charges.net AS \"net?\",\n\t\t\t\tcharges.tax_last_updated AS \"tax_last_updated?\",\n\t\t\t\tcharges.tax_drift_loss AS \"tax_drift_loss?\",\n charges.tax_transaction_version AS \"tax_transaction_version?\",\n charges.tax_platform_accounting_time AS \"tax_platform_accounting_time?\"\n FROM charges\n \n WHERE\n charge_type = $1 AND\n (\n (status = 'open' AND due < NOW()) OR\n (status = 'failed' AND last_attempt < NOW() - INTERVAL '2 days')\n )\n ",
"describe": {
"columns": [
{
@@ -97,6 +97,16 @@
"ordinal": 18,
"name": "tax_drift_loss?",
"type_info": "Int8"
+ },
+ {
+ "ordinal": 19,
+ "name": "tax_transaction_version?",
+ "type_info": "Int4"
+ },
+ {
+ "ordinal": 20,
+ "name": "tax_platform_accounting_time?",
+ "type_info": "Timestamptz"
}
],
"parameters": {
@@ -123,8 +133,10 @@
true,
true,
true,
+ true,
+ true,
true
]
},
- "hash": "9f0c73fabe99d9891faaebdd3518b362437dcdcef9cd9a68b950fba61218bb4d"
+ "hash": "4ed57832b7c02e1f4c683e256455c76e645cde49f95b0e5bfecd3d3d2330ed5c"
}
diff --git a/apps/labrinth/.sqlx/query-5a972c49ccacf8735ec36d691f1c34b86c33703f984c869346b0c0be1c4a4883.json b/apps/labrinth/.sqlx/query-5a972c49ccacf8735ec36d691f1c34b86c33703f984c869346b0c0be1c4a4883.json
new file mode 100644
index 00000000..1616cd7c
--- /dev/null
+++ b/apps/labrinth/.sqlx/query-5a972c49ccacf8735ec36d691f1c34b86c33703f984c869346b0c0be1c4a4883.json
@@ -0,0 +1,34 @@
+{
+ "db_name": "PostgreSQL",
+ "query": "\n INSERT INTO charges (id, user_id, price_id, amount, currency_code, charge_type, status, due, last_attempt, subscription_id, subscription_interval, payment_platform, payment_platform_id, parent_charge_id, net, tax_amount, tax_platform_id, tax_last_updated, tax_drift_loss, tax_transaction_version, tax_platform_accounting_time)\n VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20, $21)\n ON CONFLICT (id)\n DO UPDATE\n SET status = EXCLUDED.status,\n last_attempt = EXCLUDED.last_attempt,\n due = EXCLUDED.due,\n subscription_id = EXCLUDED.subscription_id,\n subscription_interval = EXCLUDED.subscription_interval,\n payment_platform = EXCLUDED.payment_platform,\n payment_platform_id = EXCLUDED.payment_platform_id,\n parent_charge_id = EXCLUDED.parent_charge_id,\n net = EXCLUDED.net,\n tax_amount = EXCLUDED.tax_amount,\n tax_platform_id = EXCLUDED.tax_platform_id,\n tax_last_updated = EXCLUDED.tax_last_updated,\n price_id = EXCLUDED.price_id,\n amount = EXCLUDED.amount,\n currency_code = EXCLUDED.currency_code,\n charge_type = EXCLUDED.charge_type,\n\t\t\t\t\ttax_drift_loss = EXCLUDED.tax_drift_loss,\n\t\t\t\t\ttax_transaction_version = EXCLUDED.tax_transaction_version,\n\t\t\t\t\ttax_platform_accounting_time = EXCLUDED.tax_platform_accounting_time\n ",
+ "describe": {
+ "columns": [],
+ "parameters": {
+ "Left": [
+ "Int8",
+ "Int8",
+ "Int8",
+ "Int8",
+ "Text",
+ "Text",
+ "Varchar",
+ "Timestamptz",
+ "Timestamptz",
+ "Int8",
+ "Text",
+ "Text",
+ "Text",
+ "Int8",
+ "Int8",
+ "Int8",
+ "Text",
+ "Timestamptz",
+ "Int8",
+ "Int4",
+ "Timestamptz"
+ ]
+ },
+ "nullable": []
+ },
+ "hash": "5a972c49ccacf8735ec36d691f1c34b86c33703f984c869346b0c0be1c4a4883"
+}
diff --git a/apps/labrinth/.sqlx/query-7973e569e784f416c1b4f1e6f3b099dca9c0d9c84e55951a730d8c214580e0d6.json b/apps/labrinth/.sqlx/query-64233913683d187ee6c449eb106bd1a27929e05b497aaea93e9e8f318770c64c.json
similarity index 83%
rename from apps/labrinth/.sqlx/query-7973e569e784f416c1b4f1e6f3b099dca9c0d9c84e55951a730d8c214580e0d6.json
rename to apps/labrinth/.sqlx/query-64233913683d187ee6c449eb106bd1a27929e05b497aaea93e9e8f318770c64c.json
index d8265d33..68e8fac7 100644
--- a/apps/labrinth/.sqlx/query-7973e569e784f416c1b4f1e6f3b099dca9c0d9c84e55951a730d8c214580e0d6.json
+++ b/apps/labrinth/.sqlx/query-64233913683d187ee6c449eb106bd1a27929e05b497aaea93e9e8f318770c64c.json
@@ -1,6 +1,6 @@
{
"db_name": "PostgreSQL",
- "query": "\n SELECT\n charges.id, charges.user_id, charges.price_id, charges.amount, charges.currency_code, charges.status, charges.due, charges.last_attempt,\n charges.charge_type, charges.subscription_id, charges.tax_amount, charges.tax_platform_id,\n -- Workaround for https://github.com/launchbadge/sqlx/issues/3336\n charges.subscription_interval AS \"subscription_interval?\",\n charges.payment_platform,\n charges.payment_platform_id AS \"payment_platform_id?\",\n charges.parent_charge_id AS \"parent_charge_id?\",\n charges.net AS \"net?\",\n\t\t\t\tcharges.tax_last_updated AS \"tax_last_updated?\",\n\t\t\t\tcharges.tax_drift_loss AS \"tax_drift_loss?\"\n FROM charges\n WHERE user_id = $1 ORDER BY due DESC",
+ "query": "\n SELECT\n charges.id, charges.user_id, charges.price_id, charges.amount, charges.currency_code, charges.status, charges.due, charges.last_attempt,\n charges.charge_type, charges.subscription_id, charges.tax_amount, charges.tax_platform_id,\n -- Workaround for https://github.com/launchbadge/sqlx/issues/3336\n charges.subscription_interval AS \"subscription_interval?\",\n charges.payment_platform,\n charges.payment_platform_id AS \"payment_platform_id?\",\n charges.parent_charge_id AS \"parent_charge_id?\",\n charges.net AS \"net?\",\n\t\t\t\tcharges.tax_last_updated AS \"tax_last_updated?\",\n\t\t\t\tcharges.tax_drift_loss AS \"tax_drift_loss?\",\n charges.tax_transaction_version AS \"tax_transaction_version?\",\n charges.tax_platform_accounting_time AS \"tax_platform_accounting_time?\"\n FROM charges\n WHERE parent_charge_id = $1",
"describe": {
"columns": [
{
@@ -97,6 +97,16 @@
"ordinal": 18,
"name": "tax_drift_loss?",
"type_info": "Int8"
+ },
+ {
+ "ordinal": 19,
+ "name": "tax_transaction_version?",
+ "type_info": "Int4"
+ },
+ {
+ "ordinal": 20,
+ "name": "tax_platform_accounting_time?",
+ "type_info": "Timestamptz"
}
],
"parameters": {
@@ -123,8 +133,10 @@
true,
true,
true,
+ true,
+ true,
true
]
},
- "hash": "7973e569e784f416c1b4f1e6f3b099dca9c0d9c84e55951a730d8c214580e0d6"
+ "hash": "64233913683d187ee6c449eb106bd1a27929e05b497aaea93e9e8f318770c64c"
}
diff --git a/apps/labrinth/.sqlx/query-6443da83032ef5d6cb907f97fb37ae62351eeeb2ae3b8148cf8a8fd0deb2795a.json b/apps/labrinth/.sqlx/query-6443da83032ef5d6cb907f97fb37ae62351eeeb2ae3b8148cf8a8fd0deb2795a.json
new file mode 100644
index 00000000..1f1eb4f3
--- /dev/null
+++ b/apps/labrinth/.sqlx/query-6443da83032ef5d6cb907f97fb37ae62351eeeb2ae3b8148cf8a8fd0deb2795a.json
@@ -0,0 +1,15 @@
+{
+ "db_name": "PostgreSQL",
+ "query": "\n UPDATE affiliate_codes\n SET created_by = $1\n WHERE created_by = $2",
+ "describe": {
+ "columns": [],
+ "parameters": {
+ "Left": [
+ "Int8",
+ "Int8"
+ ]
+ },
+ "nullable": []
+ },
+ "hash": "6443da83032ef5d6cb907f97fb37ae62351eeeb2ae3b8148cf8a8fd0deb2795a"
+}
diff --git a/apps/labrinth/.sqlx/query-68968755bd5eacce9009d1d873d08ef679e6638e57e4711c2c215f32e691d856.json b/apps/labrinth/.sqlx/query-68968755bd5eacce9009d1d873d08ef679e6638e57e4711c2c215f32e691d856.json
new file mode 100644
index 00000000..a7d64639
--- /dev/null
+++ b/apps/labrinth/.sqlx/query-68968755bd5eacce9009d1d873d08ef679e6638e57e4711c2c215f32e691d856.json
@@ -0,0 +1,27 @@
+{
+ "db_name": "PostgreSQL",
+ "query": "\n INSERT INTO users_subscriptions_credits\n (subscription_id, user_id, creditor_id, days, previous_due, next_due)\n VALUES ($1, $2, $3, $4, $5, $6)\n RETURNING id\n ",
+ "describe": {
+ "columns": [
+ {
+ "ordinal": 0,
+ "name": "id",
+ "type_info": "Int4"
+ }
+ ],
+ "parameters": {
+ "Left": [
+ "Int8",
+ "Int8",
+ "Int8",
+ "Int4",
+ "Timestamptz",
+ "Timestamptz"
+ ]
+ },
+ "nullable": [
+ false
+ ]
+ },
+ "hash": "68968755bd5eacce9009d1d873d08ef679e6638e57e4711c2c215f32e691d856"
+}
diff --git a/apps/labrinth/.sqlx/query-70236e8be98967070160f703ed0242239eb5a4c6bef3748dac57fa339260c9c1.json b/apps/labrinth/.sqlx/query-70236e8be98967070160f703ed0242239eb5a4c6bef3748dac57fa339260c9c1.json
new file mode 100644
index 00000000..23c73e91
--- /dev/null
+++ b/apps/labrinth/.sqlx/query-70236e8be98967070160f703ed0242239eb5a4c6bef3748dac57fa339260c9c1.json
@@ -0,0 +1,143 @@
+{
+ "db_name": "PostgreSQL",
+ "query": "\n SELECT\n charges.id, charges.user_id, charges.price_id, charges.amount, charges.currency_code, charges.status, charges.due, charges.last_attempt,\n charges.charge_type, charges.subscription_id, charges.tax_amount, charges.tax_platform_id,\n -- Workaround for https://github.com/launchbadge/sqlx/issues/3336\n charges.subscription_interval AS \"subscription_interval?\",\n charges.payment_platform,\n charges.payment_platform_id AS \"payment_platform_id?\",\n charges.parent_charge_id AS \"parent_charge_id?\",\n charges.net AS \"net?\",\n\t\t\t\tcharges.tax_last_updated AS \"tax_last_updated?\",\n\t\t\t\tcharges.tax_drift_loss AS \"tax_drift_loss?\",\n charges.tax_transaction_version AS \"tax_transaction_version?\",\n charges.tax_platform_accounting_time AS \"tax_platform_accounting_time?\"\n FROM charges\n \n\t\t\tWHERE\n\t\t\t status = 'succeeded'\n\t\t\t AND tax_platform_id IS NULL\n AND payment_platform_id IS NOT NULL\n\t\t\tORDER BY due ASC\n\t\t\tFOR NO KEY UPDATE SKIP LOCKED\n OFFSET $1\n\t\t\tLIMIT $2\n\t\t\t",
+ "describe": {
+ "columns": [
+ {
+ "ordinal": 0,
+ "name": "id",
+ "type_info": "Int8"
+ },
+ {
+ "ordinal": 1,
+ "name": "user_id",
+ "type_info": "Int8"
+ },
+ {
+ "ordinal": 2,
+ "name": "price_id",
+ "type_info": "Int8"
+ },
+ {
+ "ordinal": 3,
+ "name": "amount",
+ "type_info": "Int8"
+ },
+ {
+ "ordinal": 4,
+ "name": "currency_code",
+ "type_info": "Text"
+ },
+ {
+ "ordinal": 5,
+ "name": "status",
+ "type_info": "Varchar"
+ },
+ {
+ "ordinal": 6,
+ "name": "due",
+ "type_info": "Timestamptz"
+ },
+ {
+ "ordinal": 7,
+ "name": "last_attempt",
+ "type_info": "Timestamptz"
+ },
+ {
+ "ordinal": 8,
+ "name": "charge_type",
+ "type_info": "Text"
+ },
+ {
+ "ordinal": 9,
+ "name": "subscription_id",
+ "type_info": "Int8"
+ },
+ {
+ "ordinal": 10,
+ "name": "tax_amount",
+ "type_info": "Int8"
+ },
+ {
+ "ordinal": 11,
+ "name": "tax_platform_id",
+ "type_info": "Text"
+ },
+ {
+ "ordinal": 12,
+ "name": "subscription_interval?",
+ "type_info": "Text"
+ },
+ {
+ "ordinal": 13,
+ "name": "payment_platform",
+ "type_info": "Text"
+ },
+ {
+ "ordinal": 14,
+ "name": "payment_platform_id?",
+ "type_info": "Text"
+ },
+ {
+ "ordinal": 15,
+ "name": "parent_charge_id?",
+ "type_info": "Int8"
+ },
+ {
+ "ordinal": 16,
+ "name": "net?",
+ "type_info": "Int8"
+ },
+ {
+ "ordinal": 17,
+ "name": "tax_last_updated?",
+ "type_info": "Timestamptz"
+ },
+ {
+ "ordinal": 18,
+ "name": "tax_drift_loss?",
+ "type_info": "Int8"
+ },
+ {
+ "ordinal": 19,
+ "name": "tax_transaction_version?",
+ "type_info": "Int4"
+ },
+ {
+ "ordinal": 20,
+ "name": "tax_platform_accounting_time?",
+ "type_info": "Timestamptz"
+ }
+ ],
+ "parameters": {
+ "Left": [
+ "Int8",
+ "Int8"
+ ]
+ },
+ "nullable": [
+ false,
+ false,
+ false,
+ false,
+ false,
+ false,
+ false,
+ true,
+ false,
+ true,
+ false,
+ true,
+ true,
+ false,
+ true,
+ true,
+ true,
+ true,
+ true,
+ true,
+ true
+ ]
+ },
+ "hash": "70236e8be98967070160f703ed0242239eb5a4c6bef3748dac57fa339260c9c1"
+}
diff --git a/apps/labrinth/.sqlx/query-713034d4968b290a0096e41b9da044f6760683cb89ff39255a177bb025e7638e.json b/apps/labrinth/.sqlx/query-713034d4968b290a0096e41b9da044f6760683cb89ff39255a177bb025e7638e.json
new file mode 100644
index 00000000..2465ba1b
--- /dev/null
+++ b/apps/labrinth/.sqlx/query-713034d4968b290a0096e41b9da044f6760683cb89ff39255a177bb025e7638e.json
@@ -0,0 +1,14 @@
+{
+ "db_name": "PostgreSQL",
+ "query": "\n DELETE FROM payouts_values_notifications\n WHERE user_id = $1",
+ "describe": {
+ "columns": [],
+ "parameters": {
+ "Left": [
+ "Int8"
+ ]
+ },
+ "nullable": []
+ },
+ "hash": "713034d4968b290a0096e41b9da044f6760683cb89ff39255a177bb025e7638e"
+}
diff --git a/apps/labrinth/.sqlx/query-7d8de27065490edc560b0c81061295ca82f44546527e1a31c03e5bb7a07c1e63.json b/apps/labrinth/.sqlx/query-7d8de27065490edc560b0c81061295ca82f44546527e1a31c03e5bb7a07c1e63.json
new file mode 100644
index 00000000..ba3e1bd7
--- /dev/null
+++ b/apps/labrinth/.sqlx/query-7d8de27065490edc560b0c81061295ca82f44546527e1a31c03e5bb7a07c1e63.json
@@ -0,0 +1,142 @@
+{
+ "db_name": "PostgreSQL",
+ "query": "\n SELECT\n charges.id, charges.user_id, charges.price_id, charges.amount, charges.currency_code, charges.status, charges.due, charges.last_attempt,\n charges.charge_type, charges.subscription_id, charges.tax_amount, charges.tax_platform_id,\n -- Workaround for https://github.com/launchbadge/sqlx/issues/3336\n charges.subscription_interval AS \"subscription_interval?\",\n charges.payment_platform,\n charges.payment_platform_id AS \"payment_platform_id?\",\n charges.parent_charge_id AS \"parent_charge_id?\",\n charges.net AS \"net?\",\n\t\t\t\tcharges.tax_last_updated AS \"tax_last_updated?\",\n\t\t\t\tcharges.tax_drift_loss AS \"tax_drift_loss?\",\n charges.tax_transaction_version AS \"tax_transaction_version?\",\n charges.tax_platform_accounting_time AS \"tax_platform_accounting_time?\"\n FROM charges\n \n\t\t\tINNER JOIN users u ON u.id = charges.user_id\n\t\t\tWHERE\n\t\t\t status = 'open'\n\t\t\t AND COALESCE(tax_last_updated, '-infinity' :: TIMESTAMPTZ) < NOW() - INTERVAL '1 day'\n\t\t\t AND u.email IS NOT NULL\n\t\t\t AND due - INTERVAL '7 days' > NOW()\n AND due - INTERVAL '30 days' < NOW() -- Due between 7 and 30 days from now\n\t\t\tORDER BY COALESCE(tax_last_updated, '-infinity' :: TIMESTAMPTZ) ASC\n\t\t\tFOR NO KEY UPDATE SKIP LOCKED\n\t\t\tLIMIT $1\n\t\t\t",
+ "describe": {
+ "columns": [
+ {
+ "ordinal": 0,
+ "name": "id",
+ "type_info": "Int8"
+ },
+ {
+ "ordinal": 1,
+ "name": "user_id",
+ "type_info": "Int8"
+ },
+ {
+ "ordinal": 2,
+ "name": "price_id",
+ "type_info": "Int8"
+ },
+ {
+ "ordinal": 3,
+ "name": "amount",
+ "type_info": "Int8"
+ },
+ {
+ "ordinal": 4,
+ "name": "currency_code",
+ "type_info": "Text"
+ },
+ {
+ "ordinal": 5,
+ "name": "status",
+ "type_info": "Varchar"
+ },
+ {
+ "ordinal": 6,
+ "name": "due",
+ "type_info": "Timestamptz"
+ },
+ {
+ "ordinal": 7,
+ "name": "last_attempt",
+ "type_info": "Timestamptz"
+ },
+ {
+ "ordinal": 8,
+ "name": "charge_type",
+ "type_info": "Text"
+ },
+ {
+ "ordinal": 9,
+ "name": "subscription_id",
+ "type_info": "Int8"
+ },
+ {
+ "ordinal": 10,
+ "name": "tax_amount",
+ "type_info": "Int8"
+ },
+ {
+ "ordinal": 11,
+ "name": "tax_platform_id",
+ "type_info": "Text"
+ },
+ {
+ "ordinal": 12,
+ "name": "subscription_interval?",
+ "type_info": "Text"
+ },
+ {
+ "ordinal": 13,
+ "name": "payment_platform",
+ "type_info": "Text"
+ },
+ {
+ "ordinal": 14,
+ "name": "payment_platform_id?",
+ "type_info": "Text"
+ },
+ {
+ "ordinal": 15,
+ "name": "parent_charge_id?",
+ "type_info": "Int8"
+ },
+ {
+ "ordinal": 16,
+ "name": "net?",
+ "type_info": "Int8"
+ },
+ {
+ "ordinal": 17,
+ "name": "tax_last_updated?",
+ "type_info": "Timestamptz"
+ },
+ {
+ "ordinal": 18,
+ "name": "tax_drift_loss?",
+ "type_info": "Int8"
+ },
+ {
+ "ordinal": 19,
+ "name": "tax_transaction_version?",
+ "type_info": "Int4"
+ },
+ {
+ "ordinal": 20,
+ "name": "tax_platform_accounting_time?",
+ "type_info": "Timestamptz"
+ }
+ ],
+ "parameters": {
+ "Left": [
+ "Int8"
+ ]
+ },
+ "nullable": [
+ false,
+ false,
+ false,
+ false,
+ false,
+ false,
+ false,
+ true,
+ false,
+ true,
+ false,
+ true,
+ true,
+ false,
+ true,
+ true,
+ true,
+ true,
+ true,
+ true,
+ true
+ ]
+ },
+ "hash": "7d8de27065490edc560b0c81061295ca82f44546527e1a31c03e5bb7a07c1e63"
+}
diff --git a/apps/labrinth/.sqlx/query-4e8e9f9cb42f90cc17702386fdb78385608f19dae9439cb6a860503600127b04.json b/apps/labrinth/.sqlx/query-91866517bf34fb8bf31a7a49832b18fca60c293ad349eaec07b573d22a28301c.json
similarity index 80%
rename from apps/labrinth/.sqlx/query-4e8e9f9cb42f90cc17702386fdb78385608f19dae9439cb6a860503600127b04.json
rename to apps/labrinth/.sqlx/query-91866517bf34fb8bf31a7a49832b18fca60c293ad349eaec07b573d22a28301c.json
index 77bc16da..cc851a50 100644
--- a/apps/labrinth/.sqlx/query-4e8e9f9cb42f90cc17702386fdb78385608f19dae9439cb6a860503600127b04.json
+++ b/apps/labrinth/.sqlx/query-91866517bf34fb8bf31a7a49832b18fca60c293ad349eaec07b573d22a28301c.json
@@ -1,6 +1,6 @@
{
"db_name": "PostgreSQL",
- "query": "\n SELECT\n charges.id, charges.user_id, charges.price_id, charges.amount, charges.currency_code, charges.status, charges.due, charges.last_attempt,\n charges.charge_type, charges.subscription_id, charges.tax_amount, charges.tax_platform_id,\n -- Workaround for https://github.com/launchbadge/sqlx/issues/3336\n charges.subscription_interval AS \"subscription_interval?\",\n charges.payment_platform,\n charges.payment_platform_id AS \"payment_platform_id?\",\n charges.parent_charge_id AS \"parent_charge_id?\",\n charges.net AS \"net?\",\n\t\t\t\tcharges.tax_last_updated AS \"tax_last_updated?\",\n\t\t\t\tcharges.tax_drift_loss AS \"tax_drift_loss?\"\n FROM charges\n WHERE id = $1",
+ "query": "\n SELECT\n charges.id, charges.user_id, charges.price_id, charges.amount, charges.currency_code, charges.status, charges.due, charges.last_attempt,\n charges.charge_type, charges.subscription_id, charges.tax_amount, charges.tax_platform_id,\n -- Workaround for https://github.com/launchbadge/sqlx/issues/3336\n charges.subscription_interval AS \"subscription_interval?\",\n charges.payment_platform,\n charges.payment_platform_id AS \"payment_platform_id?\",\n charges.parent_charge_id AS \"parent_charge_id?\",\n charges.net AS \"net?\",\n\t\t\t\tcharges.tax_last_updated AS \"tax_last_updated?\",\n\t\t\t\tcharges.tax_drift_loss AS \"tax_drift_loss?\",\n charges.tax_transaction_version AS \"tax_transaction_version?\",\n charges.tax_platform_accounting_time AS \"tax_platform_accounting_time?\"\n FROM charges\n WHERE\n\t\t\t subscription_id = $1\n\t\t\t AND (status = 'open' OR status = 'expiring' OR status = 'cancelled' OR status = 'failed')\n\t\t\tORDER BY due ASC LIMIT 1",
"describe": {
"columns": [
{
@@ -97,6 +97,16 @@
"ordinal": 18,
"name": "tax_drift_loss?",
"type_info": "Int8"
+ },
+ {
+ "ordinal": 19,
+ "name": "tax_transaction_version?",
+ "type_info": "Int4"
+ },
+ {
+ "ordinal": 20,
+ "name": "tax_platform_accounting_time?",
+ "type_info": "Timestamptz"
}
],
"parameters": {
@@ -123,8 +133,10 @@
true,
true,
true,
+ true,
+ true,
true
]
},
- "hash": "4e8e9f9cb42f90cc17702386fdb78385608f19dae9439cb6a860503600127b04"
+ "hash": "91866517bf34fb8bf31a7a49832b18fca60c293ad349eaec07b573d22a28301c"
}
diff --git a/apps/labrinth/.sqlx/query-9a35729acbba06eafaa205922e4987e082a000ec1b397957650e1332191613ca.json b/apps/labrinth/.sqlx/query-9a35729acbba06eafaa205922e4987e082a000ec1b397957650e1332191613ca.json
deleted file mode 100644
index 4659b4c7..00000000
--- a/apps/labrinth/.sqlx/query-9a35729acbba06eafaa205922e4987e082a000ec1b397957650e1332191613ca.json
+++ /dev/null
@@ -1,130 +0,0 @@
-{
- "db_name": "PostgreSQL",
- "query": "\n SELECT\n charges.id, charges.user_id, charges.price_id, charges.amount, charges.currency_code, charges.status, charges.due, charges.last_attempt,\n charges.charge_type, charges.subscription_id, charges.tax_amount, charges.tax_platform_id,\n -- Workaround for https://github.com/launchbadge/sqlx/issues/3336\n charges.subscription_interval AS \"subscription_interval?\",\n charges.payment_platform,\n charges.payment_platform_id AS \"payment_platform_id?\",\n charges.parent_charge_id AS \"parent_charge_id?\",\n charges.net AS \"net?\",\n\t\t\t\tcharges.tax_last_updated AS \"tax_last_updated?\",\n\t\t\t\tcharges.tax_drift_loss AS \"tax_drift_loss?\"\n FROM charges\n WHERE subscription_id = $1 AND (status = 'open' OR status = 'expiring' OR status = 'cancelled' OR status = 'failed')",
- "describe": {
- "columns": [
- {
- "ordinal": 0,
- "name": "id",
- "type_info": "Int8"
- },
- {
- "ordinal": 1,
- "name": "user_id",
- "type_info": "Int8"
- },
- {
- "ordinal": 2,
- "name": "price_id",
- "type_info": "Int8"
- },
- {
- "ordinal": 3,
- "name": "amount",
- "type_info": "Int8"
- },
- {
- "ordinal": 4,
- "name": "currency_code",
- "type_info": "Text"
- },
- {
- "ordinal": 5,
- "name": "status",
- "type_info": "Varchar"
- },
- {
- "ordinal": 6,
- "name": "due",
- "type_info": "Timestamptz"
- },
- {
- "ordinal": 7,
- "name": "last_attempt",
- "type_info": "Timestamptz"
- },
- {
- "ordinal": 8,
- "name": "charge_type",
- "type_info": "Text"
- },
- {
- "ordinal": 9,
- "name": "subscription_id",
- "type_info": "Int8"
- },
- {
- "ordinal": 10,
- "name": "tax_amount",
- "type_info": "Int8"
- },
- {
- "ordinal": 11,
- "name": "tax_platform_id",
- "type_info": "Text"
- },
- {
- "ordinal": 12,
- "name": "subscription_interval?",
- "type_info": "Text"
- },
- {
- "ordinal": 13,
- "name": "payment_platform",
- "type_info": "Text"
- },
- {
- "ordinal": 14,
- "name": "payment_platform_id?",
- "type_info": "Text"
- },
- {
- "ordinal": 15,
- "name": "parent_charge_id?",
- "type_info": "Int8"
- },
- {
- "ordinal": 16,
- "name": "net?",
- "type_info": "Int8"
- },
- {
- "ordinal": 17,
- "name": "tax_last_updated?",
- "type_info": "Timestamptz"
- },
- {
- "ordinal": 18,
- "name": "tax_drift_loss?",
- "type_info": "Int8"
- }
- ],
- "parameters": {
- "Left": [
- "Int8"
- ]
- },
- "nullable": [
- false,
- false,
- false,
- false,
- false,
- false,
- false,
- true,
- false,
- true,
- false,
- true,
- true,
- false,
- true,
- true,
- true,
- true,
- true
- ]
- },
- "hash": "9a35729acbba06eafaa205922e4987e082a000ec1b397957650e1332191613ca"
-}
diff --git a/apps/labrinth/.sqlx/query-aafa63e08f9d556dcd55c4687f0323aa502ce9feb3f439a614bb7759dcb03b23.json b/apps/labrinth/.sqlx/query-aafa63e08f9d556dcd55c4687f0323aa502ce9feb3f439a614bb7759dcb03b23.json
new file mode 100644
index 00000000..fca33354
--- /dev/null
+++ b/apps/labrinth/.sqlx/query-aafa63e08f9d556dcd55c4687f0323aa502ce9feb3f439a614bb7759dcb03b23.json
@@ -0,0 +1,58 @@
+{
+ "db_name": "PostgreSQL",
+ "query": "\n SELECT us.id, us.user_id, us.price_id, us.interval, us.created, us.status, us.metadata\n FROM users_subscriptions us\n WHERE us.metadata->>'type' = 'pyro' AND us.metadata->>'id' = ANY($1::text[])\n ",
+ "describe": {
+ "columns": [
+ {
+ "ordinal": 0,
+ "name": "id",
+ "type_info": "Int8"
+ },
+ {
+ "ordinal": 1,
+ "name": "user_id",
+ "type_info": "Int8"
+ },
+ {
+ "ordinal": 2,
+ "name": "price_id",
+ "type_info": "Int8"
+ },
+ {
+ "ordinal": 3,
+ "name": "interval",
+ "type_info": "Text"
+ },
+ {
+ "ordinal": 4,
+ "name": "created",
+ "type_info": "Timestamptz"
+ },
+ {
+ "ordinal": 5,
+ "name": "status",
+ "type_info": "Varchar"
+ },
+ {
+ "ordinal": 6,
+ "name": "metadata",
+ "type_info": "Jsonb"
+ }
+ ],
+ "parameters": {
+ "Left": [
+ "TextArray"
+ ]
+ },
+ "nullable": [
+ false,
+ false,
+ false,
+ false,
+ false,
+ false,
+ true
+ ]
+ },
+ "hash": "aafa63e08f9d556dcd55c4687f0323aa502ce9feb3f439a614bb7759dcb03b23"
+}
diff --git a/apps/labrinth/.sqlx/query-b97afaa6cab8e042ab0117e64b43a8ba3a2c2be461ff9a6309d7e36c3148aeea.json b/apps/labrinth/.sqlx/query-b97afaa6cab8e042ab0117e64b43a8ba3a2c2be461ff9a6309d7e36c3148aeea.json
new file mode 100644
index 00000000..30cda8db
--- /dev/null
+++ b/apps/labrinth/.sqlx/query-b97afaa6cab8e042ab0117e64b43a8ba3a2c2be461ff9a6309d7e36c3148aeea.json
@@ -0,0 +1,15 @@
+{
+ "db_name": "PostgreSQL",
+ "query": "\n UPDATE payouts_values\n SET user_id = $1\n WHERE user_id = $2",
+ "describe": {
+ "columns": [],
+ "parameters": {
+ "Left": [
+ "Int8",
+ "Int8"
+ ]
+ },
+ "nullable": []
+ },
+ "hash": "b97afaa6cab8e042ab0117e64b43a8ba3a2c2be461ff9a6309d7e36c3148aeea"
+}
diff --git a/apps/labrinth/.sqlx/query-c0c70ebc3d59a5ab6a4c81e987df178a7828a45ed3134d3336cb59572f40beab.json b/apps/labrinth/.sqlx/query-c0c70ebc3d59a5ab6a4c81e987df178a7828a45ed3134d3336cb59572f40beab.json
deleted file mode 100644
index 75a3edf5..00000000
--- a/apps/labrinth/.sqlx/query-c0c70ebc3d59a5ab6a4c81e987df178a7828a45ed3134d3336cb59572f40beab.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
- "db_name": "PostgreSQL",
- "query": "\n INSERT INTO charges (id, user_id, price_id, amount, currency_code, charge_type, status, due, last_attempt, subscription_id, subscription_interval, payment_platform, payment_platform_id, parent_charge_id, net, tax_amount, tax_platform_id, tax_last_updated, tax_drift_loss)\n VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19)\n ON CONFLICT (id)\n DO UPDATE\n SET status = EXCLUDED.status,\n last_attempt = EXCLUDED.last_attempt,\n due = EXCLUDED.due,\n subscription_id = EXCLUDED.subscription_id,\n subscription_interval = EXCLUDED.subscription_interval,\n payment_platform = EXCLUDED.payment_platform,\n payment_platform_id = EXCLUDED.payment_platform_id,\n parent_charge_id = EXCLUDED.parent_charge_id,\n net = EXCLUDED.net,\n tax_amount = EXCLUDED.tax_amount,\n tax_platform_id = EXCLUDED.tax_platform_id,\n tax_last_updated = EXCLUDED.tax_last_updated,\n price_id = EXCLUDED.price_id,\n amount = EXCLUDED.amount,\n currency_code = EXCLUDED.currency_code,\n charge_type = EXCLUDED.charge_type,\n\t\t\t\t\ttax_drift_loss = EXCLUDED.tax_drift_loss\n ",
- "describe": {
- "columns": [],
- "parameters": {
- "Left": [
- "Int8",
- "Int8",
- "Int8",
- "Int8",
- "Text",
- "Text",
- "Varchar",
- "Timestamptz",
- "Timestamptz",
- "Int8",
- "Text",
- "Text",
- "Text",
- "Int8",
- "Int8",
- "Int8",
- "Text",
- "Timestamptz",
- "Int8"
- ]
- },
- "nullable": []
- },
- "hash": "c0c70ebc3d59a5ab6a4c81e987df178a7828a45ed3134d3336cb59572f40beab"
-}
diff --git a/apps/labrinth/.sqlx/query-ca9b41de4618bcf8ff4f6086f658add5d93855f599a48eeb5f1811f14e7fe610.json b/apps/labrinth/.sqlx/query-ca9b41de4618bcf8ff4f6086f658add5d93855f599a48eeb5f1811f14e7fe610.json
new file mode 100644
index 00000000..7d1b773b
--- /dev/null
+++ b/apps/labrinth/.sqlx/query-ca9b41de4618bcf8ff4f6086f658add5d93855f599a48eeb5f1811f14e7fe610.json
@@ -0,0 +1,14 @@
+{
+ "db_name": "PostgreSQL",
+ "query": "\n DELETE FROM affiliate_codes\n WHERE affiliate = $1",
+ "describe": {
+ "columns": [],
+ "parameters": {
+ "Left": [
+ "Int8"
+ ]
+ },
+ "nullable": []
+ },
+ "hash": "ca9b41de4618bcf8ff4f6086f658add5d93855f599a48eeb5f1811f14e7fe610"
+}
diff --git a/apps/labrinth/.sqlx/query-e2e58113bc3a3db6ffc75b5c5e10acd16403aa0679ef53330f2ce3e8a45f7b9f.json b/apps/labrinth/.sqlx/query-caf16ed13389398c1ee3456c0e2534310be545293b2693f1c747425295b367a8.json
similarity index 81%
rename from apps/labrinth/.sqlx/query-e2e58113bc3a3db6ffc75b5c5e10acd16403aa0679ef53330f2ce3e8a45f7b9f.json
rename to apps/labrinth/.sqlx/query-caf16ed13389398c1ee3456c0e2534310be545293b2693f1c747425295b367a8.json
index d17a3276..f44b89a8 100644
--- a/apps/labrinth/.sqlx/query-e2e58113bc3a3db6ffc75b5c5e10acd16403aa0679ef53330f2ce3e8a45f7b9f.json
+++ b/apps/labrinth/.sqlx/query-caf16ed13389398c1ee3456c0e2534310be545293b2693f1c747425295b367a8.json
@@ -1,6 +1,6 @@
{
"db_name": "PostgreSQL",
- "query": "\n SELECT\n charges.id, charges.user_id, charges.price_id, charges.amount, charges.currency_code, charges.status, charges.due, charges.last_attempt,\n charges.charge_type, charges.subscription_id, charges.tax_amount, charges.tax_platform_id,\n -- Workaround for https://github.com/launchbadge/sqlx/issues/3336\n charges.subscription_interval AS \"subscription_interval?\",\n charges.payment_platform,\n charges.payment_platform_id AS \"payment_platform_id?\",\n charges.parent_charge_id AS \"parent_charge_id?\",\n charges.net AS \"net?\",\n\t\t\t\tcharges.tax_last_updated AS \"tax_last_updated?\",\n\t\t\t\tcharges.tax_drift_loss AS \"tax_drift_loss?\"\n FROM charges\n \n WHERE\n charge_type = $1 AND\n (\n (status = 'open' AND due < NOW()) OR\n (status = 'failed' AND last_attempt < NOW() - INTERVAL '2 days')\n )\n ",
+ "query": "\n SELECT\n charges.id, charges.user_id, charges.price_id, charges.amount, charges.currency_code, charges.status, charges.due, charges.last_attempt,\n charges.charge_type, charges.subscription_id, charges.tax_amount, charges.tax_platform_id,\n -- Workaround for https://github.com/launchbadge/sqlx/issues/3336\n charges.subscription_interval AS \"subscription_interval?\",\n charges.payment_platform,\n charges.payment_platform_id AS \"payment_platform_id?\",\n charges.parent_charge_id AS \"parent_charge_id?\",\n charges.net AS \"net?\",\n\t\t\t\tcharges.tax_last_updated AS \"tax_last_updated?\",\n\t\t\t\tcharges.tax_drift_loss AS \"tax_drift_loss?\",\n charges.tax_transaction_version AS \"tax_transaction_version?\",\n charges.tax_platform_accounting_time AS \"tax_platform_accounting_time?\"\n FROM charges\n \n WHERE\n charge_type = $1 AND\n status = 'failed' AND due < NOW() - INTERVAL '30 days'\n ",
"describe": {
"columns": [
{
@@ -97,6 +97,16 @@
"ordinal": 18,
"name": "tax_drift_loss?",
"type_info": "Int8"
+ },
+ {
+ "ordinal": 19,
+ "name": "tax_transaction_version?",
+ "type_info": "Int4"
+ },
+ {
+ "ordinal": 20,
+ "name": "tax_platform_accounting_time?",
+ "type_info": "Timestamptz"
}
],
"parameters": {
@@ -123,8 +133,10 @@
true,
true,
true,
+ true,
+ true,
true
]
},
- "hash": "e2e58113bc3a3db6ffc75b5c5e10acd16403aa0679ef53330f2ce3e8a45f7b9f"
+ "hash": "caf16ed13389398c1ee3456c0e2534310be545293b2693f1c747425295b367a8"
}
diff --git a/apps/labrinth/.sqlx/query-cd18ae8abe81a159a134923957f4cd6d0ba3b1bcbc89df349cf7b5b1897603b8.json b/apps/labrinth/.sqlx/query-cd18ae8abe81a159a134923957f4cd6d0ba3b1bcbc89df349cf7b5b1897603b8.json
deleted file mode 100644
index 458f19f9..00000000
--- a/apps/labrinth/.sqlx/query-cd18ae8abe81a159a134923957f4cd6d0ba3b1bcbc89df349cf7b5b1897603b8.json
+++ /dev/null
@@ -1,130 +0,0 @@
-{
- "db_name": "PostgreSQL",
- "query": "\n SELECT\n charges.id, charges.user_id, charges.price_id, charges.amount, charges.currency_code, charges.status, charges.due, charges.last_attempt,\n charges.charge_type, charges.subscription_id, charges.tax_amount, charges.tax_platform_id,\n -- Workaround for https://github.com/launchbadge/sqlx/issues/3336\n charges.subscription_interval AS \"subscription_interval?\",\n charges.payment_platform,\n charges.payment_platform_id AS \"payment_platform_id?\",\n charges.parent_charge_id AS \"parent_charge_id?\",\n charges.net AS \"net?\",\n\t\t\t\tcharges.tax_last_updated AS \"tax_last_updated?\",\n\t\t\t\tcharges.tax_drift_loss AS \"tax_drift_loss?\"\n FROM charges\n \n\t\t\tINNER JOIN users u ON u.id = charges.user_id\n\t\t\tWHERE\n\t\t\t status = 'open'\n\t\t\t AND COALESCE(tax_last_updated, '-infinity' :: TIMESTAMPTZ) < NOW() - INTERVAL '1 day'\n\t\t\t AND u.email IS NOT NULL\n\t\t\t AND due - INTERVAL '7 days' > NOW()\n AND due - INTERVAL '14 days' < NOW() -- Due between 7 and 14 days from now\n\t\t\tORDER BY COALESCE(tax_last_updated, '-infinity' :: TIMESTAMPTZ) ASC\n\t\t\tFOR NO KEY UPDATE SKIP LOCKED\n\t\t\tLIMIT $1\n\t\t\t",
- "describe": {
- "columns": [
- {
- "ordinal": 0,
- "name": "id",
- "type_info": "Int8"
- },
- {
- "ordinal": 1,
- "name": "user_id",
- "type_info": "Int8"
- },
- {
- "ordinal": 2,
- "name": "price_id",
- "type_info": "Int8"
- },
- {
- "ordinal": 3,
- "name": "amount",
- "type_info": "Int8"
- },
- {
- "ordinal": 4,
- "name": "currency_code",
- "type_info": "Text"
- },
- {
- "ordinal": 5,
- "name": "status",
- "type_info": "Varchar"
- },
- {
- "ordinal": 6,
- "name": "due",
- "type_info": "Timestamptz"
- },
- {
- "ordinal": 7,
- "name": "last_attempt",
- "type_info": "Timestamptz"
- },
- {
- "ordinal": 8,
- "name": "charge_type",
- "type_info": "Text"
- },
- {
- "ordinal": 9,
- "name": "subscription_id",
- "type_info": "Int8"
- },
- {
- "ordinal": 10,
- "name": "tax_amount",
- "type_info": "Int8"
- },
- {
- "ordinal": 11,
- "name": "tax_platform_id",
- "type_info": "Text"
- },
- {
- "ordinal": 12,
- "name": "subscription_interval?",
- "type_info": "Text"
- },
- {
- "ordinal": 13,
- "name": "payment_platform",
- "type_info": "Text"
- },
- {
- "ordinal": 14,
- "name": "payment_platform_id?",
- "type_info": "Text"
- },
- {
- "ordinal": 15,
- "name": "parent_charge_id?",
- "type_info": "Int8"
- },
- {
- "ordinal": 16,
- "name": "net?",
- "type_info": "Int8"
- },
- {
- "ordinal": 17,
- "name": "tax_last_updated?",
- "type_info": "Timestamptz"
- },
- {
- "ordinal": 18,
- "name": "tax_drift_loss?",
- "type_info": "Int8"
- }
- ],
- "parameters": {
- "Left": [
- "Int8"
- ]
- },
- "nullable": [
- false,
- false,
- false,
- false,
- false,
- false,
- false,
- true,
- false,
- true,
- false,
- true,
- true,
- false,
- true,
- true,
- true,
- true,
- true
- ]
- },
- "hash": "cd18ae8abe81a159a134923957f4cd6d0ba3b1bcbc89df349cf7b5b1897603b8"
-}
diff --git a/apps/labrinth/.sqlx/query-51c542076b4b3811eb12f051294f55827a27f51e65e668525b8b545f570c0bda.json b/apps/labrinth/.sqlx/query-f0618e69765ba605b1db7f25a233cbf6f13bddc80a9719cbd401395db718b2f2.json
similarity index 83%
rename from apps/labrinth/.sqlx/query-51c542076b4b3811eb12f051294f55827a27f51e65e668525b8b545f570c0bda.json
rename to apps/labrinth/.sqlx/query-f0618e69765ba605b1db7f25a233cbf6f13bddc80a9719cbd401395db718b2f2.json
index b3efa342..823d2cdb 100644
--- a/apps/labrinth/.sqlx/query-51c542076b4b3811eb12f051294f55827a27f51e65e668525b8b545f570c0bda.json
+++ b/apps/labrinth/.sqlx/query-f0618e69765ba605b1db7f25a233cbf6f13bddc80a9719cbd401395db718b2f2.json
@@ -1,6 +1,6 @@
{
"db_name": "PostgreSQL",
- "query": "\n SELECT\n charges.id, charges.user_id, charges.price_id, charges.amount, charges.currency_code, charges.status, charges.due, charges.last_attempt,\n charges.charge_type, charges.subscription_id, charges.tax_amount, charges.tax_platform_id,\n -- Workaround for https://github.com/launchbadge/sqlx/issues/3336\n charges.subscription_interval AS \"subscription_interval?\",\n charges.payment_platform,\n charges.payment_platform_id AS \"payment_platform_id?\",\n charges.parent_charge_id AS \"parent_charge_id?\",\n charges.net AS \"net?\",\n\t\t\t\tcharges.tax_last_updated AS \"tax_last_updated?\",\n\t\t\t\tcharges.tax_drift_loss AS \"tax_drift_loss?\"\n FROM charges\n WHERE parent_charge_id = $1",
+ "query": "\n SELECT\n charges.id, charges.user_id, charges.price_id, charges.amount, charges.currency_code, charges.status, charges.due, charges.last_attempt,\n charges.charge_type, charges.subscription_id, charges.tax_amount, charges.tax_platform_id,\n -- Workaround for https://github.com/launchbadge/sqlx/issues/3336\n charges.subscription_interval AS \"subscription_interval?\",\n charges.payment_platform,\n charges.payment_platform_id AS \"payment_platform_id?\",\n charges.parent_charge_id AS \"parent_charge_id?\",\n charges.net AS \"net?\",\n\t\t\t\tcharges.tax_last_updated AS \"tax_last_updated?\",\n\t\t\t\tcharges.tax_drift_loss AS \"tax_drift_loss?\",\n charges.tax_transaction_version AS \"tax_transaction_version?\",\n charges.tax_platform_accounting_time AS \"tax_platform_accounting_time?\"\n FROM charges\n WHERE id = $1",
"describe": {
"columns": [
{
@@ -97,6 +97,16 @@
"ordinal": 18,
"name": "tax_drift_loss?",
"type_info": "Int8"
+ },
+ {
+ "ordinal": 19,
+ "name": "tax_transaction_version?",
+ "type_info": "Int4"
+ },
+ {
+ "ordinal": 20,
+ "name": "tax_platform_accounting_time?",
+ "type_info": "Timestamptz"
}
],
"parameters": {
@@ -123,8 +133,10 @@
true,
true,
true,
+ true,
+ true,
true
]
},
- "hash": "51c542076b4b3811eb12f051294f55827a27f51e65e668525b8b545f570c0bda"
+ "hash": "f0618e69765ba605b1db7f25a233cbf6f13bddc80a9719cbd401395db718b2f2"
}
diff --git a/apps/labrinth/Cargo.toml b/apps/labrinth/Cargo.toml
index 3e57bec3..055e2e58 100644
--- a/apps/labrinth/Cargo.toml
+++ b/apps/labrinth/Cargo.toml
@@ -42,7 +42,6 @@ deadpool-redis.workspace = true
dotenvy = { workspace = true }
either = { workspace = true }
eyre = { workspace = true }
-flate2 = { workspace = true }
futures = { workspace = true }
futures-util = { workspace = true }
hex = { workspace = true }
@@ -69,8 +68,8 @@ image = { workspace = true, features = [
itertools = { workspace = true }
json-patch = { workspace = true }
lettre = { workspace = true }
-maxminddb = { workspace = true }
meilisearch-sdk = { workspace = true, features = ["reqwest"] }
+modrinth-maxmind = { workspace = true }
murmur2 = { workspace = true }
paste = { workspace = true }
path-util = { workspace = true }
@@ -91,6 +90,7 @@ rust_decimal = { workspace = true, features = [
] }
rust_iso3166 = { workspace = true }
rust-s3 = { workspace = true }
+rustls.workspace = true
rusty-money = { workspace = true }
sentry = { workspace = true }
sentry-actix = { workspace = true }
@@ -108,9 +108,8 @@ sqlx = { workspace = true, features = [
"postgres",
"runtime-tokio",
"rust_decimal",
- "tls-rustls-ring",
+ "tls-rustls-aws-lc-rs",
] }
-tar = { workspace = true }
thiserror = { workspace = true }
tokio = { workspace = true, features = ["rt-multi-thread", "sync"] }
tokio-stream = { workspace = true }
@@ -121,6 +120,9 @@ tracing-ecs = { workspace = true }
tracing-subscriber = { workspace = true }
url = { workspace = true }
urlencoding = { workspace = true }
+utoipa = { workspace = true }
+utoipa-actix-web = { workspace = true }
+utoipa-swagger-ui = { workspace = true }
uuid = { workspace = true, features = ["fast-rng", "serde", "v4"] }
validator = { workspace = true, features = ["derive"] }
webp = { workspace = true }
diff --git a/apps/labrinth/Dockerfile b/apps/labrinth/Dockerfile
index d35198c2..42e485df 100644
--- a/apps/labrinth/Dockerfile
+++ b/apps/labrinth/Dockerfile
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
-FROM rust:1.89.0 AS build
+FROM rust:1.90.0 AS build
WORKDIR /usr/src/labrinth
COPY . .
@@ -17,7 +17,7 @@ RUN --mount=type=cache,target=/usr/src/labrinth/target \
&& cp -r /usr/src/labrinth/apps/labrinth/migrations /labrinth \
&& cp -r /usr/src/labrinth/apps/labrinth/assets /labrinth
-FROM debian:bookworm-slim
+FROM debian:trixie-slim
LABEL org.opencontainers.image.source=https://github.com/modrinth/code
LABEL org.opencontainers.image.title=labrinth
diff --git a/apps/labrinth/tests/fixtures/dummy_data.sql b/apps/labrinth/fixtures/dummy_data.sql
similarity index 80%
rename from apps/labrinth/tests/fixtures/dummy_data.sql
rename to apps/labrinth/fixtures/dummy_data.sql
index a60edfd5..5ab97bb3 100644
--- a/apps/labrinth/tests/fixtures/dummy_data.sql
+++ b/apps/labrinth/fixtures/dummy_data.sql
@@ -3,24 +3,22 @@
-- Inserts 5 dummy users for testing, with slight differences
-- 'Friend' and 'enemy' function like 'user', but we can use them to simulate 'other' users that may or may not be able to access certain things
--- IDs 1-5, 1-5
-INSERT INTO users (id, username, email, role) VALUES (1, 'Admin', 'admin@modrinth.com', 'admin');
INSERT INTO users (id, username, email, role)
-VALUES (2, 'Moderator', 'moderator@modrinth.com', 'moderator');
-INSERT INTO users (id, username, email, role) VALUES (3, 'User', 'user@modrinth.com', 'developer');
-INSERT INTO users (id, username, email, role)
-VALUES (4, 'Friend', 'friend@modrinth.com', 'developer');
-INSERT INTO users (id, username, email, role)
-VALUES (5, 'Enemy', 'enemy@modrinth.com', 'developer');
+VALUES ({{user_id::ADMIN}}, 'Admin', 'admin@modrinth.com', 'admin'),
+ ({{user_id::MODERATOR}}, 'Moderator', 'moderator@modrinth.com', 'moderator'),
+ ({{user_id::USER}}, 'User', 'user@modrinth.com', 'developer'),
+ ({{user_id::FRIEND}}, 'Friend', 'friend@modrinth.com', 'developer'),
+ ({{user_id::ENEMY}}, 'Enemy', 'enemy@modrinth.com', 'developer');
-- Full PATs for each user, with different scopes
-- These are not legal PATs, as they contain all scopes- they mimic permissions of a logged in user
-- IDs: 50-54, o p q r s
-INSERT INTO pats (id, user_id, name, access_token, scopes, expires) VALUES (50, 1, 'admin-pat', 'mrp_patadmin', $1, '2030-08-18 15:48:58.435729+00');
-INSERT INTO pats (id, user_id, name, access_token, scopes, expires) VALUES (51, 2, 'moderator-pat', 'mrp_patmoderator', $1, '2030-08-18 15:48:58.435729+00');
-INSERT INTO pats (id, user_id, name, access_token, scopes, expires) VALUES (52, 3, 'user-pat', 'mrp_patuser', $1, '2030-08-18 15:48:58.435729+00');
-INSERT INTO pats (id, user_id, name, access_token, scopes, expires) VALUES (53, 4, 'friend-pat', 'mrp_patfriend', $1, '2030-08-18 15:48:58.435729+00');
-INSERT INTO pats (id, user_id, name, access_token, scopes, expires) VALUES (54, 5, 'enemy-pat', 'mrp_patenemy', $1, '2030-08-18 15:48:58.435729+00');
+INSERT INTO pats (id, user_id, name, access_token, scopes, expires)
+VALUES (50, {{user_id::ADMIN}}, 'admin-pat', '{{pat::ADMIN}}', {{all_scopes}}, '2030-08-18 15:48:58.435729+00'),
+ (51, {{user_id::MODERATOR}}, 'moderator-pat', '{{pat::MODERATOR}}', {{all_scopes}}, '2030-08-18 15:48:58.435729+00'),
+ (52, {{user_id::USER}}, 'user-pat', '{{pat::USER}}', {{all_scopes}}, '2030-08-18 15:48:58.435729+00'),
+ (53, {{user_id::FRIEND}}, 'friend-pat', '{{pat::FRIEND}}', {{all_scopes}}, '2030-08-18 15:48:58.435729+00'),
+ (54, {{user_id::ENEMY}}, 'enemy-pat', '{{pat::ENEMY}}', {{all_scopes}}, '2030-08-18 15:48:58.435729+00');
INSERT INTO loaders (id, loader) VALUES (5, 'fabric');
INSERT INTO loaders_project_types (joining_loader_id, joining_project_type_id) VALUES (5, 1);
@@ -119,7 +117,7 @@ VALUES (
1,
'oauth_client_alpha',
NULL,
- $1,
+ {{all_scopes}},
'4dbff86cc2ca1bae1e16468a05cb9881c97f1753bce3619034898faa1aabe429955a1bf8ec483d7421fe3c1646613a59ed5441fb0f321389f77f48a879c7b1f1',
3
);
diff --git a/apps/labrinth/fixtures/labrinth-seed-data-202508052143.sql b/apps/labrinth/fixtures/labrinth-seed-data-202508052143.sql
index 1ad6d4ec..5f4b0d20 100644
--- a/apps/labrinth/fixtures/labrinth-seed-data-202508052143.sql
+++ b/apps/labrinth/fixtures/labrinth-seed-data-202508052143.sql
@@ -1104,5 +1104,7 @@ COPY public.users (id, github_id, username, email, avatar_url, bio, created, rol
103587649610509 \N Default admin user admin@modrinth.invalid https://avatars.githubusercontent.com/u/106493074 $ chmod 777 labrinth 2020-07-18 16:03:00.000000+00 admin 0 0.00000000000000000000 \N \N \N \N \N $argon2i$v=19$m=4096,t=3,p=1$c2FsdEl0V2l0aFNhbHQ$xTGvQNICqetaNA0Wu1GwFmYhQjAreRcjBz6ornhaFXA t \N \N \N \N \N \N https://avatars.githubusercontent.com/u/106493074 t
\.
+INSERT INTO sessions (id, session, user_id, created, last_login, expires, refresh_expires, city, country, ip, os, platform, user_agent)
+VALUES (93083445641246, 'mra_admin', 103587649610509, '2025-10-20 14:58:53.128901+00', '2025-10-20 14:58:53.128901+00', '2025-11-03 14:58:53.128901+00', '2025-12-19 14:58:53.128901+00', '', '', '127.0.0.1', 'Linux', 'Chrome', 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/141.0.0.0 Safari/537.36');
COMMIT;
diff --git a/apps/labrinth/migrations/20251015085756_tax-platform-transaction-version.sql b/apps/labrinth/migrations/20251015085756_tax-platform-transaction-version.sql
new file mode 100644
index 00000000..1efca15c
--- /dev/null
+++ b/apps/labrinth/migrations/20251015085756_tax-platform-transaction-version.sql
@@ -0,0 +1,2 @@
+ALTER TABLE charges ADD COLUMN tax_transaction_version INTEGER;
+ALTER TABLE charges ADD COLUMN tax_platform_accounting_time TIMESTAMP WITH TIME ZONE;
diff --git a/apps/labrinth/migrations/20251017120000_subscription-credited-notification.sql b/apps/labrinth/migrations/20251017120000_subscription-credited-notification.sql
new file mode 100644
index 00000000..42396e1a
--- /dev/null
+++ b/apps/labrinth/migrations/20251017120000_subscription-credited-notification.sql
@@ -0,0 +1,44 @@
+CREATE TABLE users_subscriptions_credits (
+ id SERIAL PRIMARY KEY,
+ subscription_id BIGINT NOT NULL REFERENCES users_subscriptions (id),
+ user_id BIGINT NOT NULL REFERENCES users (id),
+ creditor_id BIGINT NOT NULL REFERENCES users (id),
+ days INTEGER NOT NULL,
+ previous_due TIMESTAMPTZ NOT NULL,
+ next_due TIMESTAMPTZ NOT NULL,
+ created TIMESTAMPTZ NOT NULL DEFAULT NOW()
+);
+
+INSERT INTO notifications_types
+ (name, delivery_priority, expose_in_user_preferences, expose_in_site_notifications)
+VALUES ('subscription_credited', 1, FALSE, FALSE);
+
+INSERT INTO users_notifications_preferences (user_id, channel, notification_type, enabled)
+VALUES (NULL, 'email', 'subscription_credited', TRUE);
+
+INSERT INTO notifications_templates
+ (channel, notification_type, subject_line, body_fetch_url, plaintext_fallback)
+VALUES
+ (
+ 'email',
+ 'subscription_credited',
+ 'Weβve added time to your server',
+ 'https://modrinth.com/_internal/templates/email/subscription-credited',
+ CONCAT(
+ 'Hi {user.name},',
+ CHR(10),
+ CHR(10),
+ '{credit.header_message}',
+ CHR(10),
+ CHR(10),
+ 'To make up for it, we''ve added {credit.days_formatted} to your {credit.subscription.type} subscription.',
+ CHR(10),
+ CHR(10),
+ 'Your next charge was scheduled for {credit.previous_due} and will now be on {credit.next_due}.',
+ CHR(10),
+ CHR(10),
+ 'Thank you for supporting us,',
+ CHR(10),
+ 'The Modrinth Team'
+ )
+ );
diff --git a/apps/labrinth/src/clickhouse/mod.rs b/apps/labrinth/src/clickhouse/mod.rs
index 8bc00921..6efe1eaa 100644
--- a/apps/labrinth/src/clickhouse/mod.rs
+++ b/apps/labrinth/src/clickhouse/mod.rs
@@ -27,6 +27,7 @@ pub async fn init_client_with_database(
.with_url(dotenvy::var("CLICKHOUSE_URL").unwrap())
.with_user(dotenvy::var("CLICKHOUSE_USER").unwrap())
.with_password(dotenvy::var("CLICKHOUSE_PASSWORD").unwrap())
+ .with_validation(false)
};
client
diff --git a/apps/labrinth/src/database/mod.rs b/apps/labrinth/src/database/mod.rs
index b5995485..dce09ad5 100644
--- a/apps/labrinth/src/database/mod.rs
+++ b/apps/labrinth/src/database/mod.rs
@@ -5,5 +5,6 @@ pub use models::DBImage;
pub use models::DBProject;
pub use models::DBVersion;
pub use postgres_database::{
- ReadOnlyPgPool, check_for_migrations, connect_all, register_and_set_metrics,
+ MIGRATOR, ReadOnlyPgPool, check_for_migrations, connect_all,
+ register_and_set_metrics,
};
diff --git a/apps/labrinth/src/database/models/charge_item.rs b/apps/labrinth/src/database/models/charge_item.rs
index 1e7bdc40..4b9e704f 100644
--- a/apps/labrinth/src/database/models/charge_item.rs
+++ b/apps/labrinth/src/database/models/charge_item.rs
@@ -30,6 +30,8 @@ pub struct DBCharge {
pub tax_amount: i64,
pub tax_platform_id: Option,
pub tax_last_updated: Option>,
+ pub tax_transaction_version: Option,
+ pub tax_platform_accounting_time: Option>,
// Net is always in USD
pub net: Option,
@@ -56,6 +58,8 @@ struct ChargeQueryResult {
tax_last_updated: Option>,
net: Option,
tax_drift_loss: Option,
+ tax_transaction_version: Option,
+ tax_platform_accounting_time: Option>,
}
impl TryFrom for DBCharge {
@@ -84,6 +88,8 @@ impl TryFrom for DBCharge {
net: r.net,
tax_last_updated: r.tax_last_updated,
tax_drift_loss: r.tax_drift_loss,
+ tax_transaction_version: r.tax_transaction_version,
+ tax_platform_accounting_time: r.tax_platform_accounting_time,
})
}
}
@@ -103,7 +109,9 @@ macro_rules! select_charges_with_predicate {
charges.parent_charge_id AS "parent_charge_id?",
charges.net AS "net?",
charges.tax_last_updated AS "tax_last_updated?",
- charges.tax_drift_loss AS "tax_drift_loss?"
+ charges.tax_drift_loss AS "tax_drift_loss?",
+ charges.tax_transaction_version AS "tax_transaction_version?",
+ charges.tax_platform_accounting_time AS "tax_platform_accounting_time?"
FROM charges
"#
+ $predicate,
@@ -119,8 +127,8 @@ impl DBCharge {
) -> Result {
sqlx::query!(
r#"
- INSERT INTO charges (id, user_id, price_id, amount, currency_code, charge_type, status, due, last_attempt, subscription_id, subscription_interval, payment_platform, payment_platform_id, parent_charge_id, net, tax_amount, tax_platform_id, tax_last_updated, tax_drift_loss)
- VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19)
+ INSERT INTO charges (id, user_id, price_id, amount, currency_code, charge_type, status, due, last_attempt, subscription_id, subscription_interval, payment_platform, payment_platform_id, parent_charge_id, net, tax_amount, tax_platform_id, tax_last_updated, tax_drift_loss, tax_transaction_version, tax_platform_accounting_time)
+ VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20, $21)
ON CONFLICT (id)
DO UPDATE
SET status = EXCLUDED.status,
@@ -139,7 +147,9 @@ impl DBCharge {
amount = EXCLUDED.amount,
currency_code = EXCLUDED.currency_code,
charge_type = EXCLUDED.charge_type,
- tax_drift_loss = EXCLUDED.tax_drift_loss
+ tax_drift_loss = EXCLUDED.tax_drift_loss,
+ tax_transaction_version = EXCLUDED.tax_transaction_version,
+ tax_platform_accounting_time = EXCLUDED.tax_platform_accounting_time
"#,
self.id.0,
self.user_id.0,
@@ -160,6 +170,8 @@ impl DBCharge {
self.tax_platform_id.as_deref(),
self.tax_last_updated,
self.tax_drift_loss,
+ self.tax_transaction_version,
+ self.tax_platform_accounting_time,
)
.execute(&mut **transaction)
.await?;
@@ -221,7 +233,10 @@ impl DBCharge {
) -> Result, DatabaseError> {
let user_subscription_id = user_subscription_id.0;
let res = select_charges_with_predicate!(
- "WHERE subscription_id = $1 AND (status = 'open' OR status = 'expiring' OR status = 'cancelled' OR status = 'failed')",
+ "WHERE
+ subscription_id = $1
+ AND (status = 'open' OR status = 'expiring' OR status = 'cancelled' OR status = 'failed')
+ ORDER BY due ASC LIMIT 1",
user_subscription_id
)
.fetch_optional(exec)
@@ -323,7 +338,7 @@ impl DBCharge {
AND COALESCE(tax_last_updated, '-infinity' :: TIMESTAMPTZ) < NOW() - INTERVAL '1 day'
AND u.email IS NOT NULL
AND due - INTERVAL '7 days' > NOW()
- AND due - INTERVAL '14 days' < NOW() -- Due between 7 and 14 days from now
+ AND due - INTERVAL '30 days' < NOW() -- Due between 7 and 30 days from now
ORDER BY COALESCE(tax_last_updated, '-infinity' :: TIMESTAMPTZ) ASC
FOR NO KEY UPDATE SKIP LOCKED
LIMIT $1
diff --git a/apps/labrinth/src/database/models/mod.rs b/apps/labrinth/src/database/models/mod.rs
index fa43cff7..0e5f31cd 100644
--- a/apps/labrinth/src/database/models/mod.rs
+++ b/apps/labrinth/src/database/models/mod.rs
@@ -35,6 +35,7 @@ pub mod user_subscription_item;
pub mod users_compliance;
pub mod users_notifications_preferences_item;
pub mod users_redeemals;
+pub mod users_subscriptions_credits;
pub mod version_item;
pub use affiliate_code_item::DBAffiliateCode;
diff --git a/apps/labrinth/src/database/models/user_item.rs b/apps/labrinth/src/database/models/user_item.rs
index 090d99e4..18e4e7f7 100644
--- a/apps/labrinth/src/database/models/user_item.rs
+++ b/apps/labrinth/src/database/models/user_item.rs
@@ -753,6 +753,46 @@ impl DBUser {
.execute(&mut **transaction)
.await?;
+ sqlx::query!(
+ "
+ UPDATE affiliate_codes
+ SET created_by = $1
+ WHERE created_by = $2",
+ deleted_user as DBUserId,
+ id as DBUserId,
+ )
+ .execute(&mut **transaction)
+ .await?;
+
+ sqlx::query!(
+ "
+ DELETE FROM affiliate_codes
+ WHERE affiliate = $1",
+ id as DBUserId,
+ )
+ .execute(&mut **transaction)
+ .await?;
+
+ sqlx::query!(
+ "
+ UPDATE payouts_values
+ SET user_id = $1
+ WHERE user_id = $2",
+ deleted_user as DBUserId,
+ id as DBUserId,
+ )
+ .execute(&mut **transaction)
+ .await?;
+
+ sqlx::query!(
+ "
+ DELETE FROM payouts_values_notifications
+ WHERE user_id = $1",
+ id as DBUserId,
+ )
+ .execute(&mut **transaction)
+ .await?;
+
let open_subscriptions =
DBUserSubscription::get_all_user(id, &mut **transaction)
.await?;
diff --git a/apps/labrinth/src/database/models/user_subscription_item.rs b/apps/labrinth/src/database/models/user_subscription_item.rs
index 87189077..63eb6665 100644
--- a/apps/labrinth/src/database/models/user_subscription_item.rs
+++ b/apps/labrinth/src/database/models/user_subscription_item.rs
@@ -160,6 +160,32 @@ impl DBUserSubscription {
Ok(())
}
+
+ pub async fn get_many_by_server_ids(
+ server_ids: &[String],
+ exec: impl sqlx::Executor<'_, Database = sqlx::Postgres>,
+ ) -> Result, DatabaseError> {
+ if server_ids.is_empty() {
+ return Ok(vec![]);
+ }
+
+ let results = sqlx::query_as!(
+ UserSubscriptionQueryResult,
+ r#"
+ SELECT us.id, us.user_id, us.price_id, us.interval, us.created, us.status, us.metadata
+ FROM users_subscriptions us
+ WHERE us.metadata->>'type' = 'pyro' AND us.metadata->>'id' = ANY($1::text[])
+ "#,
+ server_ids
+ )
+ .fetch_all(exec)
+ .await?;
+
+ Ok(results
+ .into_iter()
+ .map(|r| r.try_into())
+ .collect::, serde_json::Error>>()?)
+ }
}
pub struct SubscriptionWithCharge {
diff --git a/apps/labrinth/src/database/models/users_subscriptions_credits.rs b/apps/labrinth/src/database/models/users_subscriptions_credits.rs
new file mode 100644
index 00000000..1c96410c
--- /dev/null
+++ b/apps/labrinth/src/database/models/users_subscriptions_credits.rs
@@ -0,0 +1,82 @@
+use crate::database::models::{DBUserId, DBUserSubscriptionId};
+use chrono::{DateTime, Utc};
+use serde::{Deserialize, Serialize};
+use sqlx::query_scalar;
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct DBUserSubscriptionCredit {
+ pub id: i32,
+ pub subscription_id: DBUserSubscriptionId,
+ pub user_id: DBUserId,
+ pub creditor_id: DBUserId,
+ pub days: i32,
+ pub previous_due: DateTime,
+ pub next_due: DateTime,
+ pub created: DateTime,
+}
+
+impl DBUserSubscriptionCredit {
+ /// Inserts this audit entry and sets its id.
+ pub async fn insert<'a, E>(&mut self, exec: E) -> sqlx::Result<()>
+ where
+ E: sqlx::PgExecutor<'a>,
+ {
+ let id = query_scalar!(
+ r#"
+ INSERT INTO users_subscriptions_credits
+ (subscription_id, user_id, creditor_id, days, previous_due, next_due)
+ VALUES ($1, $2, $3, $4, $5, $6)
+ RETURNING id
+ "#,
+ self.subscription_id.0,
+ self.user_id.0,
+ self.creditor_id.0,
+ self.days,
+ self.previous_due,
+ self.next_due,
+ )
+ .fetch_one(exec)
+ .await?;
+
+ self.id = id;
+ Ok(())
+ }
+
+ pub async fn insert_many(
+ exec: &mut sqlx::Transaction<'_, sqlx::Postgres>,
+ subscription_ids: &[DBUserSubscriptionId],
+ user_ids: &[DBUserId],
+ creditor_ids: &[DBUserId],
+ days: &[i32],
+ previous_dues: &[DateTime],
+ next_dues: &[DateTime],
+ ) -> sqlx::Result<()> {
+ debug_assert_eq!(subscription_ids.len(), user_ids.len());
+ debug_assert_eq!(user_ids.len(), creditor_ids.len());
+ debug_assert_eq!(creditor_ids.len(), days.len());
+ debug_assert_eq!(days.len(), previous_dues.len());
+ debug_assert_eq!(previous_dues.len(), next_dues.len());
+
+ let subs: Vec = subscription_ids.iter().map(|x| x.0).collect();
+ let users: Vec = user_ids.iter().map(|x| x.0).collect();
+ let creditors: Vec = creditor_ids.iter().map(|x| x.0).collect();
+
+ sqlx::query!(
+ r#"
+ INSERT INTO users_subscriptions_credits
+ (subscription_id, user_id, creditor_id, days, previous_due, next_due)
+ SELECT * FROM UNNEST($1::bigint[], $2::bigint[], $3::bigint[], $4::int[], $5::timestamptz[], $6::timestamptz[])
+ "#,
+ &subs[..],
+ &users[..],
+ &creditors[..],
+ &days[..],
+ &previous_dues[..],
+ &next_dues[..],
+ )
+ .execute(&mut **exec)
+ .await?;
+
+ Ok(())
+ }
+}
diff --git a/apps/labrinth/src/database/postgres_database.rs b/apps/labrinth/src/database/postgres_database.rs
index f0cf7b5f..5be98131 100644
--- a/apps/labrinth/src/database/postgres_database.rs
+++ b/apps/labrinth/src/database/postgres_database.rs
@@ -1,5 +1,6 @@
+use eyre::Context;
use prometheus::{IntGauge, Registry};
-use sqlx::migrate::MigrateDatabase;
+use sqlx::migrate::{MigrateDatabase, Migrator};
use sqlx::postgres::{PgPool, PgPoolOptions};
use sqlx::{Connection, PgConnection, Postgres};
use std::ops::{Deref, DerefMut};
@@ -75,25 +76,36 @@ pub async fn connect_all() -> Result<(PgPool, ReadOnlyPgPool), sqlx::Error> {
Ok((pool, ro))
}
}
-pub async fn check_for_migrations() -> Result<(), sqlx::Error> {
- let uri = dotenvy::var("DATABASE_URL").expect("`DATABASE_URL` not in .env");
+
+pub async fn check_for_migrations() -> eyre::Result<()> {
+ let uri =
+ dotenvy::var("DATABASE_URL").wrap_err("`DATABASE_URL` not in .env")?;
let uri = uri.as_str();
- if !Postgres::database_exists(uri).await? {
+ if !Postgres::database_exists(uri)
+ .await
+ .wrap_err("failed to check if database exists")?
+ {
info!("Creating database...");
- Postgres::create_database(uri).await?;
+ Postgres::create_database(uri)
+ .await
+ .wrap_err("failed to create database")?;
}
info!("Applying migrations...");
- let mut conn: PgConnection = PgConnection::connect(uri).await?;
- sqlx::migrate!()
+ let mut conn: PgConnection = PgConnection::connect(uri)
+ .await
+ .wrap_err("failed to connect to database")?;
+ MIGRATOR
.run(&mut conn)
.await
- .expect("Error while running database migrations!");
+ .wrap_err("failed to run database migrations")?;
Ok(())
}
+pub static MIGRATOR: Migrator = sqlx::migrate!();
+
pub async fn register_and_set_metrics(
pool: &PgPool,
registry: &Registry,
diff --git a/apps/labrinth/src/lib.rs b/apps/labrinth/src/lib.rs
index f119f71c..b35e4adf 100644
--- a/apps/labrinth/src/lib.rs
+++ b/apps/labrinth/src/lib.rs
@@ -3,6 +3,7 @@ use std::time::Duration;
use actix_web::web;
use database::redis::RedisPool;
+use modrinth_maxmind::MaxMind;
use queue::{
analytics::AnalyticsQueue, email::EmailQueue, payouts::PayoutsQueue,
session::AuthQueue, socket::ActiveSockets,
@@ -13,12 +14,14 @@ use tracing::{info, warn};
extern crate clickhouse as clickhouse_crate;
use clickhouse_crate::Client;
use util::cors::default_cors;
+use util::gotenberg::GotenbergClient;
use crate::background_task::update_versions;
use crate::database::ReadOnlyPgPool;
use crate::queue::billing::{index_billing, index_subscriptions};
use crate::queue::moderation::AutomatedModerationQueue;
use crate::util::anrok;
+use crate::util::archon::ArchonClient;
use crate::util::env::{parse_strings_from_var, parse_var};
use crate::util::ratelimit::{AsyncRateLimiter, GCRAParameters};
use sync::friends::handle_pubsub;
@@ -34,6 +37,7 @@ pub mod routes;
pub mod scheduler;
pub mod search;
pub mod sync;
+pub mod test;
pub mod util;
pub mod validate;
@@ -49,7 +53,7 @@ pub struct LabrinthConfig {
pub redis_pool: RedisPool,
pub clickhouse: Client,
pub file_host: Arc,
- pub maxmind: Arc,
+ pub maxmind: web::Data,
pub scheduler: Arc,
pub ip_salt: Pepper,
pub search_config: search::SearchConfig,
@@ -62,6 +66,8 @@ pub struct LabrinthConfig {
pub stripe_client: stripe::Client,
pub anrok_client: anrok::Client,
pub email_queue: web::Data,
+ pub archon_client: web::Data,
+ pub gotenberg_client: GotenbergClient,
}
#[allow(clippy::too_many_arguments)]
@@ -72,10 +78,11 @@ pub fn app_setup(
search_config: search::SearchConfig,
clickhouse: &mut Client,
file_host: Arc,
- maxmind: Arc,
+ maxmind: MaxMind,
stripe_client: stripe::Client,
anrok_client: anrok::Client,
email_queue: EmailQueue,
+ gotenberg_client: GotenbergClient,
enable_background_tasks: bool,
) -> LabrinthConfig {
info!(
@@ -218,27 +225,6 @@ pub fn app_setup(
}
});
- let reader = maxmind.clone();
- {
- let reader_ref = reader;
- scheduler.run(Duration::from_secs(60 * 60 * 24), move || {
- let reader_ref = reader_ref.clone();
-
- async move {
- info!("Downloading MaxMind GeoLite2 country database");
- let result = reader_ref.index().await;
- if let Err(e) = result {
- warn!(
- "Downloading MaxMind GeoLite2 country database failed: {:?}",
- e
- );
- }
- info!("Done downloading MaxMind GeoLite2 country database");
- }
- });
- }
- info!("Downloading MaxMind GeoLite2 country database");
-
let analytics_queue = Arc::new(AnalyticsQueue::new());
{
let client_ref = clickhouse.clone();
@@ -287,7 +273,7 @@ pub fn app_setup(
redis_pool,
clickhouse: clickhouse.clone(),
file_host,
- maxmind,
+ maxmind: web::Data::new(maxmind),
scheduler: Arc::new(scheduler),
ip_salt,
search_config,
@@ -299,6 +285,11 @@ pub fn app_setup(
rate_limiter: limiter,
stripe_client,
anrok_client,
+ gotenberg_client,
+ archon_client: web::Data::new(
+ ArchonClient::from_env()
+ .expect("ARCHON_URL and PYRO_API_KEY must be set"),
+ ),
email_queue: web::Data::new(email_queue),
}
}
@@ -324,15 +315,17 @@ pub fn app_config(
.app_data(web::Data::new(labrinth_config.ro_pool.clone()))
.app_data(web::Data::new(labrinth_config.file_host.clone()))
.app_data(web::Data::new(labrinth_config.search_config.clone()))
+ .app_data(web::Data::new(labrinth_config.gotenberg_client.clone()))
.app_data(labrinth_config.session_queue.clone())
.app_data(labrinth_config.payouts_queue.clone())
.app_data(labrinth_config.email_queue.clone())
+ .app_data(labrinth_config.maxmind.clone())
.app_data(web::Data::new(labrinth_config.ip_salt.clone()))
.app_data(web::Data::new(labrinth_config.analytics_queue.clone()))
.app_data(web::Data::new(labrinth_config.clickhouse.clone()))
- .app_data(web::Data::new(labrinth_config.maxmind.clone()))
.app_data(labrinth_config.active_sockets.clone())
.app_data(labrinth_config.automated_moderation_queue.clone())
+ .app_data(labrinth_config.archon_client.clone())
.app_data(web::Data::new(labrinth_config.stripe_client.clone()))
.app_data(web::Data::new(labrinth_config.anrok_client.clone()))
.app_data(labrinth_config.rate_limiter.clone())
@@ -353,6 +346,13 @@ pub fn app_config(
.default_service(web::get().wrap(default_cors()).to(routes::not_found));
}
+pub fn utoipa_app_config(
+ cfg: &mut utoipa_actix_web::service_config::ServiceConfig,
+ _labrinth_config: LabrinthConfig,
+) {
+ cfg.configure(routes::v3::utoipa_config);
+}
+
// This is so that env vars not used immediately don't panic at runtime
pub fn check_env_vars() -> bool {
let mut failed = false;
@@ -493,10 +493,14 @@ pub fn check_env_vars() -> bool {
failed |= check_var::("CLICKHOUSE_PASSWORD");
failed |= check_var::("CLICKHOUSE_DATABASE");
+ failed |= check_var::("MAXMIND_ACCOUNT_ID");
failed |= check_var::("MAXMIND_LICENSE_KEY");
failed |= check_var::("FLAME_ANVIL_URL");
+ failed |= check_var::("GOTENBERG_URL");
+ failed |= check_var::("GOTENBERG_CALLBACK_BASE");
+
failed |= check_var::("STRIPE_API_KEY");
failed |= check_var::("STRIPE_WEBHOOK_SECRET");
diff --git a/apps/labrinth/src/main.rs b/apps/labrinth/src/main.rs
index 7284a36d..643d6062 100644
--- a/apps/labrinth/src/main.rs
+++ b/apps/labrinth/src/main.rs
@@ -12,8 +12,10 @@ use labrinth::queue::email::EmailQueue;
use labrinth::search;
use labrinth::util::anrok;
use labrinth::util::env::parse_var;
+use labrinth::util::gotenberg::GotenbergClient;
use labrinth::util::ratelimit::rate_limit_middleware;
-use labrinth::{check_env_vars, clickhouse, database, file_hosting, queue};
+use labrinth::utoipa_app_config;
+use labrinth::{check_env_vars, clickhouse, database, file_hosting};
use std::ffi::CStr;
use std::str::FromStr;
use std::sync::Arc;
@@ -24,6 +26,9 @@ use tracing_ecs::ECSLayerBuilder;
use tracing_subscriber::EnvFilter;
use tracing_subscriber::layer::SubscriberExt;
use tracing_subscriber::util::SubscriberInitExt;
+use utoipa::OpenApi;
+use utoipa_actix_web::AppExt;
+use utoipa_swagger_ui::SwaggerUi;
#[cfg(target_os = "linux")]
#[global_allocator]
@@ -113,6 +118,10 @@ async fn main() -> std::io::Result<()> {
std::process::exit(1);
}
+ rustls::crypto::aws_lc_rs::default_provider()
+ .install_default()
+ .unwrap();
+
// DSN is from SENTRY_DSN env variable.
// Has no effect if not set.
let sentry = sentry::init(sentry::ClientOptions {
@@ -196,6 +205,9 @@ async fn main() -> std::io::Result<()> {
let email_queue =
EmailQueue::init(pool.clone(), redis_pool.clone()).unwrap();
+ let gotenberg_client =
+ GotenbergClient::from_env().expect("Failed to create Gotenberg client");
+
if let Some(task) = args.run_background_task {
info!("Running task {task:?} and exiting");
task.run(
@@ -211,8 +223,7 @@ async fn main() -> std::io::Result<()> {
return Ok(());
}
- let maxmind_reader =
- Arc::new(queue::maxmind::MaxMindIndexer::new().await.unwrap());
+ let maxmind_reader = modrinth_maxmind::MaxMind::new().await;
let prometheus = PrometheusMetricsBuilder::new("labrinth")
.endpoint("/metrics")
@@ -246,6 +257,7 @@ async fn main() -> std::io::Result<()> {
stripe_client,
anrok_client.clone(),
email_queue,
+ gotenberg_client,
!args.no_background_tasks,
);
@@ -285,6 +297,12 @@ async fn main() -> std::io::Result<()> {
.wrap(from_fn(rate_limit_middleware))
.wrap(actix_web::middleware::Compress::default())
.wrap(sentry_actix::Sentry::new())
+ .into_utoipa_app()
+ .configure(|cfg| utoipa_app_config(cfg, labrinth_config.clone()))
+ .openapi_service(|api| SwaggerUi::new("/docs/swagger-ui/{_:.*}")
+ .config(utoipa_swagger_ui::Config::default().try_it_out_enabled(true))
+ .url("/docs/openapi.json", ApiDoc::openapi().merge_from(api)))
+ .into_app()
.configure(|cfg| app_config(cfg, labrinth_config.clone()))
})
.bind(dotenvy::var("BIND_ADDR").unwrap())?
@@ -292,6 +310,10 @@ async fn main() -> std::io::Result<()> {
.await
}
+#[derive(utoipa::OpenApi)]
+#[openapi(info(title = "Labrinth"))]
+struct ApiDoc;
+
fn log_error(err: &actix_web::Error) {
if err.as_response_error().status_code().is_client_error() {
tracing::debug!(
diff --git a/apps/labrinth/src/models/v2/notifications.rs b/apps/labrinth/src/models/v2/notifications.rs
index 8619af06..66252e5d 100644
--- a/apps/labrinth/src/models/v2/notifications.rs
+++ b/apps/labrinth/src/models/v2/notifications.rs
@@ -109,6 +109,13 @@ pub enum LegacyNotificationBody {
amount: String,
service: String,
},
+ SubscriptionCredited {
+ subscription_id: UserSubscriptionId,
+ days: i32,
+ previous_due: DateTime,
+ next_due: DateTime,
+ header_message: Option,
+ },
PatCreated {
token_name: String,
},
@@ -219,6 +226,9 @@ impl LegacyNotification {
NotificationBody::TaxNotification { .. } => {
Some("tax_notification".to_string())
}
+ NotificationBody::SubscriptionCredited { .. } => {
+ Some("subscription_credited".to_string())
+ }
NotificationBody::PayoutAvailable { .. } => {
Some("payout_available".to_string())
}
@@ -396,6 +406,19 @@ impl LegacyNotification {
NotificationBody::PaymentFailed { amount, service } => {
LegacyNotificationBody::PaymentFailed { amount, service }
}
+ NotificationBody::SubscriptionCredited {
+ subscription_id,
+ days,
+ previous_due,
+ next_due,
+ header_message,
+ } => LegacyNotificationBody::SubscriptionCredited {
+ subscription_id,
+ days,
+ previous_due,
+ next_due,
+ header_message,
+ },
NotificationBody::Unknown => LegacyNotificationBody::Unknown,
};
diff --git a/apps/labrinth/src/models/v3/analytics.rs b/apps/labrinth/src/models/v3/analytics.rs
index b59254a7..6296d7e0 100644
--- a/apps/labrinth/src/models/v3/analytics.rs
+++ b/apps/labrinth/src/models/v3/analytics.rs
@@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize};
use std::hash::Hash;
use std::net::Ipv6Addr;
-#[derive(Row, Serialize, Deserialize, Clone, Eq, PartialEq, Hash)]
+#[derive(Debug, Row, Serialize, Deserialize, Clone, Eq, PartialEq, Hash)]
pub struct Download {
pub recorded: i64,
pub domain: String,
@@ -24,7 +24,7 @@ pub struct Download {
pub headers: Vec<(String, String)>,
}
-#[derive(Row, Serialize, Deserialize, Clone, Eq, PartialEq, Hash)]
+#[derive(Debug, Row, Serialize, Deserialize, Clone, Eq, PartialEq, Hash)]
pub struct PageView {
pub recorded: i64,
pub domain: String,
diff --git a/apps/labrinth/src/models/v3/notifications.rs b/apps/labrinth/src/models/v3/notifications.rs
index edd0ecd3..dc9ea448 100644
--- a/apps/labrinth/src/models/v3/notifications.rs
+++ b/apps/labrinth/src/models/v3/notifications.rs
@@ -46,6 +46,7 @@ pub enum NotificationType {
PasswordChanged,
PasswordRemoved,
EmailChanged,
+ SubscriptionCredited,
PaymentFailed,
TaxNotification,
PatCreated,
@@ -78,6 +79,7 @@ impl NotificationType {
NotificationType::PasswordChanged => "password_changed",
NotificationType::PasswordRemoved => "password_removed",
NotificationType::EmailChanged => "email_changed",
+ NotificationType::SubscriptionCredited => "subscription_credited",
NotificationType::PaymentFailed => "payment_failed",
NotificationType::TaxNotification => "tax_notification",
NotificationType::PatCreated => "pat_created",
@@ -114,6 +116,7 @@ impl NotificationType {
"password_changed" => NotificationType::PasswordChanged,
"password_removed" => NotificationType::PasswordRemoved,
"email_changed" => NotificationType::EmailChanged,
+ "subscription_credited" => NotificationType::SubscriptionCredited,
"payment_failed" => NotificationType::PaymentFailed,
"tax_notification" => NotificationType::TaxNotification,
"payout_available" => NotificationType::PayoutAvailable,
@@ -220,6 +223,13 @@ pub enum NotificationBody {
new_email: String,
to_email: String,
},
+ SubscriptionCredited {
+ subscription_id: UserSubscriptionId,
+ days: i32,
+ previous_due: DateTime,
+ next_due: DateTime,
+ header_message: Option,
+ },
PaymentFailed {
amount: String,
service: String,
@@ -312,6 +322,9 @@ impl NotificationBody {
NotificationBody::EmailChanged { .. } => {
NotificationType::EmailChanged
}
+ NotificationBody::SubscriptionCredited { .. } => {
+ NotificationType::SubscriptionCredited
+ }
NotificationBody::PaymentFailed { .. } => {
NotificationType::PaymentFailed
}
@@ -554,6 +567,12 @@ impl From for Notification {
"#".to_string(),
vec![],
),
+ NotificationBody::SubscriptionCredited { .. } => (
+ "Subscription credited".to_string(),
+ "Your subscription has been credited with additional service time.".to_string(),
+ "#".to_string(),
+ vec![],
+ ),
NotificationBody::PayoutAvailable { .. } => (
"Payout available".to_string(),
"A payout is available!".to_string(),
diff --git a/apps/labrinth/src/models/v3/oauth_clients.rs b/apps/labrinth/src/models/v3/oauth_clients.rs
index 875752bc..6790bb1f 100644
--- a/apps/labrinth/src/models/v3/oauth_clients.rs
+++ b/apps/labrinth/src/models/v3/oauth_clients.rs
@@ -57,8 +57,8 @@ pub struct OAuthClientAuthorization {
pub created: DateTime,
}
-#[serde_as]
#[derive(Deserialize, Serialize)]
+#[serde_as]
pub struct GetOAuthClientsRequest {
#[serde_as(
as = "serde_with::StringWithSeparator::"
diff --git a/apps/labrinth/src/queue/analytics.rs b/apps/labrinth/src/queue/analytics.rs
index 4269edae..d44f8a2b 100644
--- a/apps/labrinth/src/queue/analytics.rs
+++ b/apps/labrinth/src/queue/analytics.rs
@@ -66,7 +66,7 @@ impl AnalyticsQueue {
self.playtime_queue.clear();
if !playtime_queue.is_empty() {
- let mut playtimes = client.insert("playtime")?;
+ let mut playtimes = client.insert::("playtime").await?;
for playtime in playtime_queue {
playtimes.write(&playtime).await?;
@@ -132,7 +132,7 @@ impl AnalyticsQueue {
.await
.map_err(DatabaseError::CacheError)?;
- let mut views = client.insert("views")?;
+ let mut views = client.insert::("views").await?;
for (all_views, monetized) in raw_views {
for (idx, mut view) in all_views.into_iter().enumerate() {
@@ -200,7 +200,7 @@ impl AnalyticsQueue {
.map_err(DatabaseError::CacheError)?;
let mut transaction = pool.begin().await?;
- let mut downloads = client.insert("downloads")?;
+ let mut downloads = client.insert::("downloads").await?;
let mut version_downloads: HashMap = HashMap::new();
let mut project_downloads: HashMap = HashMap::new();
diff --git a/apps/labrinth/src/queue/billing.rs b/apps/labrinth/src/queue/billing.rs
index e259662c..bfb3d749 100644
--- a/apps/labrinth/src/queue/billing.rs
+++ b/apps/labrinth/src/queue/billing.rs
@@ -35,9 +35,6 @@ use tracing::{debug, error, info, warn};
/// Updates charges which need to have their tax amount updated. This is done within a timer to avoid reaching
/// Anrok API limits.
-///
-/// The global rate limit for Anrok API operations is 10 RPS, so we run ~8 requests every second up
-/// to the specified limit of processed charges.
async fn update_tax_amounts(
pg: &PgPool,
redis: &RedisPool,
@@ -45,17 +42,12 @@ async fn update_tax_amounts(
stripe_client: &stripe::Client,
limit: i64,
) -> Result<(), ApiError> {
- let mut interval = tokio::time::interval(std::time::Duration::from_secs(1));
- interval.set_missed_tick_behavior(tokio::time::MissedTickBehavior::Skip);
-
let mut processed_charges = 0;
loop {
- interval.tick().await;
-
let mut txn = pg.begin().await?;
- let charges = DBCharge::get_updateable_lock(&mut *txn, 8).await?;
+ let charges = DBCharge::get_updateable_lock(&mut *txn, 5).await?;
if charges.is_empty() {
info!("No more charges to process");
@@ -432,12 +424,17 @@ async fn update_anrok_transactions(
match result {
Ok(response) => {
- let should_have_collected = response.tax_amount_to_collect;
+ let version = response.version.ok_or_else(|| {
+ ApiError::InvalidInput(
+ "Anrok response is missing tax transaction version"
+ .to_owned(),
+ )
+ })?;
- let drift = should_have_collected - c.tax_amount;
-
- c.tax_drift_loss = Some(drift);
+ c.tax_drift_loss = Some(response.tax_amount_to_collect);
c.tax_platform_id = Some(tax_platform_id);
+ c.tax_transaction_version = Some(version);
+ c.tax_platform_accounting_time = Some(c.due);
c.upsert(txn).await?;
Ok(())
@@ -647,6 +644,8 @@ pub async fn try_process_user_redeemal(
net: None,
tax_last_updated: Some(Utc::now()),
tax_drift_loss: Some(0),
+ tax_transaction_version: None,
+ tax_platform_accounting_time: None,
}
.upsert(&mut txn)
.await?;
@@ -1016,14 +1015,14 @@ pub async fn index_subscriptions(
&redis,
&anrok_client,
&stripe_client,
- 750,
+ 500,
),
)
.await;
run_and_time(
"update_tax_amounts",
- update_tax_amounts(&pool, &redis, &anrok_client, &stripe_client, 50),
+ update_tax_amounts(&pool, &redis, &anrok_client, &stripe_client, 500),
)
.await;
diff --git a/apps/labrinth/src/queue/email/templates.rs b/apps/labrinth/src/queue/email/templates.rs
index 2a13baac..c2234fef 100644
--- a/apps/labrinth/src/queue/email/templates.rs
+++ b/apps/labrinth/src/queue/email/templates.rs
@@ -42,6 +42,12 @@ const TAXNOTIFICATION_BILLING_INTERVAL: &str =
const TAXNOTIFICATION_DUE: &str = "taxnotification.due";
const TAXNOTIFICATION_SERVICE: &str = "taxnotification.service";
+const CREDIT_DAYS: &str = "credit.days_formatted";
+const CREDIT_PREVIOUS_DUE: &str = "credit.previous_due";
+const CREDIT_NEXT_DUE: &str = "credit.next_due";
+const CREDIT_HEADER_MESSAGE: &str = "credit.header_message";
+const CREDIT_SUBSCRIPTION_TYPE: &str = "credit.subscription.type";
+
const PAYMENTFAILED_AMOUNT: &str = "paymentfailed.amount";
const PAYMENTFAILED_SERVICE: &str = "paymentfailed.service";
@@ -676,6 +682,47 @@ async fn collect_template_variables(
Ok(EmailTemplate::Static(map))
}
+ NotificationBody::SubscriptionCredited {
+ subscription_id,
+ days,
+ previous_due,
+ next_due,
+ header_message,
+ } => {
+ map.insert(
+ CREDIT_DAYS,
+ format!("{days} day{}", if *days == 1 { "" } else { "s" }),
+ );
+ map.insert(CREDIT_PREVIOUS_DUE, date_human_readable(*previous_due));
+ map.insert(CREDIT_NEXT_DUE, date_human_readable(*next_due));
+ map.insert(SUBSCRIPTION_ID, to_base62(subscription_id.0));
+
+ // Only insert header message if provided; frontend sets default fallback
+ if let Some(h) = header_message.clone() {
+ map.insert(CREDIT_HEADER_MESSAGE, h);
+ }
+
+ // Derive subscription type label for templates
+ // Resolve product metadata via price_id join
+ if let Some(info) = crate::database::models::user_subscription_item::DBUserSubscription::get(
+ (*subscription_id).into(),
+ &mut **exec,
+ )
+ .await
+ .ok()
+ .flatten()
+ && let Ok(Some(pinfo)) = crate::database::models::products_tax_identifier_item::product_info_by_product_price_id(info.price_id, &mut **exec).await {
+ let label = match pinfo.product_metadata {
+ crate::models::billing::ProductMetadata::Pyro { .. } => "server".to_string(),
+ crate::models::billing::ProductMetadata::Medal { .. } => "server".to_string(),
+ crate::models::billing::ProductMetadata::Midas => "Modrinth+".to_string(),
+ };
+ map.insert(CREDIT_SUBSCRIPTION_TYPE, label);
+ }
+
+ Ok(EmailTemplate::Static(map))
+ }
+
NotificationBody::Custom {
title,
body_md,
@@ -704,7 +751,7 @@ async fn dynamic_email_body(
.wrap_internal_err("SITE_URL is not set")?;
let site_url = site_url.trim_end_matches('/');
- let url = format!("{}/_internal/templates/email/dynamic", site_url);
+ let url = format!("{site_url}/_internal/templates/email/dynamic");
std::str::from_utf8(
reqwest::Client::new()
diff --git a/apps/labrinth/src/queue/maxmind.rs b/apps/labrinth/src/queue/maxmind.rs
deleted file mode 100644
index bb80fb69..00000000
--- a/apps/labrinth/src/queue/maxmind.rs
+++ /dev/null
@@ -1,87 +0,0 @@
-use flate2::read::GzDecoder;
-use maxminddb::geoip2::Country;
-use std::io::{Cursor, Read};
-use std::net::Ipv6Addr;
-use tar::Archive;
-use tokio::sync::RwLock;
-use tracing::warn;
-
-pub struct MaxMindIndexer {
- pub reader: RwLock>>>,
-}
-
-impl MaxMindIndexer {
- pub async fn new() -> Result {
- let reader = MaxMindIndexer::inner_index(false).await.ok().flatten();
-
- Ok(MaxMindIndexer {
- reader: RwLock::new(reader),
- })
- }
-
- pub async fn index(&self) -> Result<(), reqwest::Error> {
- let reader = MaxMindIndexer::inner_index(false).await?;
-
- if let Some(reader) = reader {
- let mut reader_new = self.reader.write().await;
- *reader_new = Some(reader);
- }
-
- Ok(())
- }
-
- async fn inner_index(
- should_panic: bool,
- ) -> Result>>, reqwest::Error> {
- let response = reqwest::get(
- format!(
- "https://download.maxmind.com/app/geoip_download?edition_id=GeoLite2-Country&license_key={}&suffix=tar.gz",
- dotenvy::var("MAXMIND_LICENSE_KEY").unwrap()
- )
- ).await?.bytes().await.unwrap().to_vec();
-
- let tarfile = GzDecoder::new(Cursor::new(response));
- let mut archive = Archive::new(tarfile);
-
- if let Ok(entries) = archive.entries() {
- for mut file in entries.flatten() {
- if let Ok(path) = file.header().path()
- && path.extension().and_then(|x| x.to_str()) == Some("mmdb")
- {
- let mut buf = Vec::new();
- file.read_to_end(&mut buf).unwrap();
-
- let reader = maxminddb::Reader::from_source(buf).unwrap();
-
- return Ok(Some(reader));
- }
- }
- }
-
- if should_panic {
- panic!(
- "Unable to download maxmind database- did you get a license key?"
- )
- } else {
- warn!("Unable to download maxmind database.");
-
- Ok(None)
- }
- }
-
- pub async fn query(&self, ip: Ipv6Addr) -> Option {
- let maxmind = self.reader.read().await;
-
- if let Some(ref maxmind) = *maxmind {
- maxmind
- .lookup::(ip.into())
- .ok()
- .flatten()
- .and_then(|x| {
- x.country.and_then(|x| x.iso_code.map(|x| x.to_string()))
- })
- } else {
- None
- }
- }
-}
diff --git a/apps/labrinth/src/queue/mod.rs b/apps/labrinth/src/queue/mod.rs
index a0fd5827..5ad33d01 100644
--- a/apps/labrinth/src/queue/mod.rs
+++ b/apps/labrinth/src/queue/mod.rs
@@ -1,7 +1,6 @@
pub mod analytics;
pub mod billing;
pub mod email;
-pub mod maxmind;
pub mod moderation;
pub mod payouts;
pub mod session;
diff --git a/apps/labrinth/src/routes/analytics.rs b/apps/labrinth/src/routes/analytics.rs
index 2bdd5ffa..b15b9117 100644
--- a/apps/labrinth/src/routes/analytics.rs
+++ b/apps/labrinth/src/routes/analytics.rs
@@ -3,18 +3,19 @@ use crate::database::redis::RedisPool;
use crate::models::analytics::{PageView, Playtime};
use crate::models::pats::Scopes;
use crate::queue::analytics::AnalyticsQueue;
-use crate::queue::maxmind::MaxMindIndexer;
use crate::queue::session::AuthQueue;
use crate::routes::ApiError;
use crate::util::date::get_current_tenths_of_ms;
use crate::util::env::parse_strings_from_var;
use actix_web::{HttpRequest, HttpResponse};
use actix_web::{post, web};
+use modrinth_maxmind::MaxMind;
use serde::Deserialize;
use sqlx::PgPool;
use std::collections::HashMap;
use std::net::Ipv4Addr;
use std::sync::Arc;
+use tracing::trace;
use url::Url;
pub const FILTERED_HEADERS: &[&str] = &[
@@ -48,7 +49,7 @@ pub struct UrlInput {
#[post("view")]
pub async fn page_view_ingest(
req: HttpRequest,
- maxmind: web::Data>,
+ maxmind: web::Data,
analytics_queue: web::Data>,
session_queue: web::Data,
url_input: web::Json,
@@ -113,7 +114,7 @@ pub async fn page_view_ingest(
user_id: 0,
project_id: 0,
ip,
- country: maxmind.query(ip).await.unwrap_or_default(),
+ country: maxmind.query_country(ip).await.unwrap_or_default(),
user_agent: headers.get("user-agent").cloned().unwrap_or_default(),
headers: headers
.into_iter()
@@ -154,6 +155,7 @@ pub async fn page_view_ingest(
view.user_id = user.id.0;
}
+ trace!("Ingested page view {view:?}");
analytics_queue.add_view(view);
Ok(HttpResponse::NoContent().body(""))
diff --git a/apps/labrinth/src/routes/internal/admin.rs b/apps/labrinth/src/routes/internal/admin.rs
index 9d9de667..518a315a 100644
--- a/apps/labrinth/src/routes/internal/admin.rs
+++ b/apps/labrinth/src/routes/internal/admin.rs
@@ -6,7 +6,6 @@ use crate::models::ids::ProjectId;
use crate::models::pats::Scopes;
use crate::models::threads::MessageBody;
use crate::queue::analytics::AnalyticsQueue;
-use crate::queue::maxmind::MaxMindIndexer;
use crate::queue::moderation::AUTOMOD_ID;
use crate::queue::session::AuthQueue;
use crate::routes::ApiError;
@@ -14,6 +13,7 @@ use crate::search::SearchConfig;
use crate::util::date::get_current_tenths_of_ms;
use crate::util::guards::admin_key_guard;
use actix_web::{HttpRequest, HttpResponse, patch, post, web};
+use modrinth_maxmind::MaxMind;
use serde::Deserialize;
use sqlx::PgPool;
use std::collections::HashMap;
@@ -48,7 +48,7 @@ pub async fn count_download(
req: HttpRequest,
pool: web::Data,
redis: web::Data,
- maxmind: web::Data>,
+ maxmind: web::Data,
analytics_queue: web::Data>,
session_queue: web::Data,
download_body: web::Json,
@@ -132,7 +132,7 @@ pub async fn count_download(
project_id: project_id as u64,
version_id: version_id as u64,
ip,
- country: maxmind.query(ip).await.unwrap_or_default(),
+ country: maxmind.query_country(ip).await.unwrap_or_default(),
user_agent: download_body
.headers
.get("user-agent")
diff --git a/apps/labrinth/src/routes/internal/billing.rs b/apps/labrinth/src/routes/internal/billing.rs
index a2e230ca..6e6c180e 100644
--- a/apps/labrinth/src/routes/internal/billing.rs
+++ b/apps/labrinth/src/routes/internal/billing.rs
@@ -1,8 +1,10 @@
use self::payments::*;
use crate::auth::get_user_from_headers;
use crate::database::models::charge_item::DBCharge;
+use crate::database::models::ids::DBUserSubscriptionId;
use crate::database::models::notification_item::NotificationBuilder;
use crate::database::models::products_tax_identifier_item::product_info_by_product_price_id;
+use crate::database::models::users_subscriptions_credits::DBUserSubscriptionCredit;
use crate::database::models::{
charge_item, generate_charge_id, product_item, user_subscription_item,
};
@@ -48,6 +50,7 @@ pub fn config(cfg: &mut web::ServiceConfig) {
.service(edit_payment_method)
.service(remove_payment_method)
.service(charges)
+ .service(credit)
.service(active_servers)
.service(initiate_payment)
.service(stripe_webhook)
@@ -267,6 +270,24 @@ pub async fn refund_charge(
.tax_identifier
.tax_processor_id;
+ let Some((
+ (
+ original_tax_platform_id,
+ original_tax_transaction_version,
+ ),
+ original_tax_platform_accounting_time,
+ )) = charge
+ .tax_platform_id
+ .clone()
+ .zip(charge.tax_transaction_version)
+ .zip(charge.tax_platform_accounting_time)
+ else {
+ return Err(ApiError::InvalidInput(
+ "Charge is missing full tax information. Please wait for the original charge to be synchronized with the tax processor."
+ .to_owned(),
+ ));
+ };
+
let refund = stripe::Refund::create(
&stripe_client,
CreateRefund {
@@ -281,13 +302,16 @@ pub async fn refund_charge(
)
.await?;
- let anrok_txn_result = anrok_client.create_or_update_txn(
+ let anrok_txn_result = anrok_client.negate_or_create_partial_negation(
+ original_tax_platform_id,
+ original_tax_transaction_version,
+ charge.amount + charge.tax_amount,
&anrok::Transaction {
id: anrok::transaction_id_stripe_pyr(&refund.id),
fields: anrok::TransactionFields {
customer_address: anrok::Address::from_stripe_address(&billing_address),
currency_code: charge.currency_code.clone(),
- accounting_time: Utc::now(),
+ accounting_time: original_tax_platform_accounting_time,
accounting_time_zone: anrok::AccountingTimeZone::Utc,
line_items: vec![anrok::LineItem::new_including_tax_amount(tax_id, -refund_amount)],
customer_id: Some(format!("stripe:cust:{}", user.stripe_customer_id.unwrap_or_else(|| "unknown".to_owned()))),
@@ -347,6 +371,8 @@ pub async fn refund_charge(
currency_code: charge.currency_code,
tax_last_updated: Some(Utc::now()),
tax_drift_loss: Some(0),
+ tax_transaction_version: None,
+ tax_platform_accounting_time: None,
}
.upsert(&mut transaction)
.await?;
@@ -688,6 +714,14 @@ pub async fn edit_subscription(
}));
}
+ let payment_request_type =
+ PaymentRequestType::from_stripe_id(payment_method)
+ .ok_or_else(|| {
+ ApiError::InvalidInput(
+ "Invalid payment method ID".to_owned(),
+ )
+ })?;
+
if req == PaymentRequirement::RequiresPayment {
let results = create_or_update_payment_intent(
&pool,
@@ -698,10 +732,7 @@ pub async fn edit_subscription(
user: &user,
payment_intent: None,
payment_session: PaymentSession::Interactive {
- payment_request_type:
- PaymentRequestType::PaymentMethod {
- id: payment_method,
- },
+ payment_request_type,
},
attached_charge: AttachedCharge::Promotion {
product_id: new_product_price.product_id.into(),
@@ -1270,6 +1301,19 @@ pub enum PaymentRequestType {
ConfirmationToken { token: String },
}
+impl PaymentRequestType {
+ pub fn from_stripe_id(id: String) -> Option {
+ let prefix = id.split_at(id.split_once('_')?.0.len() + 1).0;
+ if stripe::PaymentMethodId::is_valid_prefix(prefix) {
+ Some(Self::PaymentMethod { id })
+ } else if prefix == "ctoken_" {
+ Some(Self::ConfirmationToken { token: id })
+ } else {
+ None
+ }
+ }
+}
+
#[derive(Deserialize)]
#[serde(tag = "type", rename_all = "snake_case")]
pub enum ChargeRequestType {
@@ -1641,6 +1685,8 @@ pub async fn stripe_webhook(
net: None,
tax_last_updated: Some(Utc::now()),
tax_drift_loss: Some(0),
+ tax_transaction_version: None,
+ tax_platform_accounting_time: None,
};
if charge_status != ChargeStatus::Failed {
@@ -2004,6 +2050,8 @@ pub async fn stripe_webhook(
tax_platform_id: None,
tax_last_updated: Some(Utc::now()),
tax_drift_loss: Some(0),
+ tax_transaction_version: None,
+ tax_platform_accounting_time: None,
}
.upsert(&mut transaction)
.await?;
@@ -2142,4 +2190,245 @@ pub async fn stripe_webhook(
Ok(HttpResponse::Ok().finish())
}
+#[allow(clippy::too_many_arguments)]
+async fn apply_credit_many(
+ transaction: &mut Transaction<'_, Postgres>,
+ redis: &RedisPool,
+ current_user_id: crate::database::models::ids::DBUserId,
+ subscription_ids: Vec,
+ days: i32,
+ send_email: bool,
+ message: String,
+) -> Result<(), ApiError> {
+ let subs_ids: Vec = subscription_ids
+ .iter()
+ .map(|id| DBUserSubscriptionId(id.0 as i64))
+ .collect();
+ let subs = user_subscription_item::DBUserSubscription::get_many(
+ &subs_ids,
+ &mut **transaction,
+ )
+ .await?;
+
+ let provisioned_count = subs
+ .iter()
+ .filter(|s| s.status == SubscriptionStatus::Provisioned)
+ .count();
+
+ let mut credit_sub_ids: Vec =
+ Vec::with_capacity(provisioned_count);
+ let mut credit_user_ids: Vec =
+ Vec::with_capacity(provisioned_count);
+ let mut credit_creditor_ids: Vec =
+ Vec::with_capacity(provisioned_count);
+ let mut credit_days: Vec = Vec::with_capacity(provisioned_count);
+ let mut credit_prev_dues: Vec> =
+ Vec::with_capacity(provisioned_count);
+ let mut credit_next_dues: Vec> =
+ Vec::with_capacity(provisioned_count);
+
+ for subscription in subs {
+ if subscription.status != SubscriptionStatus::Provisioned {
+ continue;
+ }
+
+ let mut open_charge = charge_item::DBCharge::get_open_subscription(
+ subscription.id,
+ &mut **transaction,
+ )
+ .await?
+ .ok_or_else(|| {
+ ApiError::InvalidInput(format!(
+ "Could not find open charge for subscription {}",
+ to_base62(subscription.id.0 as u64)
+ ))
+ })?;
+
+ let previous_due = open_charge.due;
+ open_charge.due = previous_due + Duration::days(days as i64);
+ let next_due = open_charge.due;
+ open_charge.upsert(&mut *transaction).await?;
+
+ credit_sub_ids.push(subscription.id);
+ credit_user_ids.push(subscription.user_id);
+ credit_creditor_ids.push(current_user_id);
+ credit_days.push(days);
+ credit_prev_dues.push(previous_due);
+ credit_next_dues.push(next_due);
+
+ if send_email {
+ NotificationBuilder {
+ body: NotificationBody::SubscriptionCredited {
+ subscription_id: subscription.id.into(),
+ days,
+ previous_due,
+ next_due,
+ header_message: Some(message.clone()),
+ },
+ }
+ .insert(subscription.user_id, &mut *transaction, redis)
+ .await?;
+ }
+ }
+
+ DBUserSubscriptionCredit::insert_many(
+ &mut *transaction,
+ &credit_sub_ids,
+ &credit_user_ids,
+ &credit_creditor_ids,
+ &credit_days,
+ &credit_prev_dues,
+ &credit_next_dues,
+ )
+ .await
+ .map_err(|e| ApiError::Internal(eyre::eyre!(e)))?;
+
+ Ok(())
+}
+
+#[derive(Deserialize)]
+pub struct CreditRequest {
+ #[serde(flatten)]
+ pub target: CreditTarget,
+ pub days: i32,
+ pub send_email: bool,
+ pub message: String,
+}
+
+#[derive(Deserialize)]
+#[serde(untagged)]
+pub enum CreditTarget {
+ Subscriptions {
+ subscription_ids: Vec,
+ },
+ Nodes {
+ nodes: Vec,
+ },
+ Region {
+ region: String,
+ },
+}
+
+#[post("credit")]
+pub async fn credit(
+ req: HttpRequest,
+ pool: web::Data,
+ redis: web::Data,
+ session_queue: web::Data,
+ archon_client: web::Data,
+ body: web::Json,
+) -> Result {
+ let user = get_user_from_headers(
+ &req,
+ &**pool,
+ &redis,
+ &session_queue,
+ Scopes::SESSION_ACCESS,
+ )
+ .await?
+ .1;
+
+ if !user.role.is_admin() {
+ return Err(ApiError::CustomAuthentication(
+ "You do not have permission to credit subscriptions!".to_string(),
+ ));
+ }
+
+ let CreditRequest {
+ target,
+ days,
+ send_email,
+ message,
+ } = body.into_inner();
+
+ if days <= 0 {
+ return Err(ApiError::InvalidInput(
+ "Days must be greater than zero".to_string(),
+ ));
+ }
+ let mut transaction = pool.begin().await?;
+
+ match target {
+ CreditTarget::Subscriptions { subscription_ids } => {
+ if subscription_ids.is_empty() {
+ return Err(ApiError::InvalidInput(
+ "You must specify at least one subscription id".to_string(),
+ ));
+ }
+ apply_credit_many(
+ &mut transaction,
+ &redis,
+ crate::database::models::ids::DBUserId(user.id.0 as i64),
+ subscription_ids,
+ days,
+ send_email,
+ message,
+ )
+ .await?;
+ }
+ CreditTarget::Nodes { nodes } => {
+ if nodes.is_empty() {
+ return Err(ApiError::InvalidInput(
+ "You must specify at least one node hostname".to_string(),
+ ));
+ }
+ let mut server_ids: Vec = Vec::new();
+ for hostname in nodes {
+ let ids =
+ archon_client.get_servers_by_hostname(&hostname).await?;
+ server_ids.extend(ids.into_iter().map(|id| id.to_string()));
+ }
+ server_ids.dedup();
+ let subs = user_subscription_item::DBUserSubscription::get_many_by_server_ids(
+ &server_ids,
+ &mut *transaction,
+ )
+ .await?;
+ if subs.is_empty() {
+ return Err(ApiError::InvalidInput(
+ "No subscriptions found for provided nodes".to_string(),
+ ));
+ }
+ apply_credit_many(
+ &mut transaction,
+ &redis,
+ crate::database::models::ids::DBUserId(user.id.0 as i64),
+ subs.into_iter().map(|s| s.id.into()).collect(),
+ days,
+ send_email,
+ message,
+ )
+ .await?;
+ }
+ CreditTarget::Region { region } => {
+ let servers =
+ archon_client.get_active_servers_by_region(®ion).await?;
+ let subs = user_subscription_item::DBUserSubscription::get_many_by_server_ids(
+ &servers.into_iter().map(|id| id.to_string()).collect::>(),
+ &mut *transaction,
+ )
+ .await?;
+ if subs.is_empty() {
+ return Err(ApiError::InvalidInput(
+ "No subscriptions found for provided region".to_string(),
+ ));
+ }
+ apply_credit_many(
+ &mut transaction,
+ &redis,
+ crate::database::models::ids::DBUserId(user.id.0 as i64),
+ subs.into_iter().map(|s| s.id.into()).collect(),
+ days,
+ send_email,
+ message,
+ )
+ .await?;
+ }
+ }
+
+ transaction.commit().await?;
+
+ Ok(HttpResponse::NoContent().finish())
+}
+
pub mod payments;
diff --git a/apps/labrinth/src/routes/internal/gotenberg.rs b/apps/labrinth/src/routes/internal/gotenberg.rs
new file mode 100644
index 00000000..744a1256
--- /dev/null
+++ b/apps/labrinth/src/routes/internal/gotenberg.rs
@@ -0,0 +1,150 @@
+use actix_web::{
+ HttpMessage, HttpResponse, error::ParseError, http::header, post, web,
+};
+use serde::Deserialize;
+use tracing::trace;
+
+use crate::routes::ApiError;
+use crate::util::gotenberg::{
+ GeneratedPdfType, MODRINTH_GENERATED_PDF_TYPE, MODRINTH_PAYMENT_ID,
+};
+use crate::util::guards::internal_network_guard;
+
+pub fn config(cfg: &mut actix_web::web::ServiceConfig) {
+ cfg.service(success).service(error);
+}
+
+#[post("/gotenberg/success", guard = "internal_network_guard")]
+pub async fn success(
+ web::Header(header::ContentDisposition {
+ disposition,
+ parameters: disposition_parameters,
+ }): web::Header,
+ web::Header(GotenbergTrace(trace)): web::Header,
+ web::Header(ModrinthGeneratedPdfType(r#type)): web::Header<
+ ModrinthGeneratedPdfType,
+ >,
+ maybe_payment_id: Option>,
+ body: web::Bytes,
+) -> Result {
+ trace!(
+ %trace,
+ %disposition,
+ ?disposition_parameters,
+ r#type = r#type.as_str(),
+ ?maybe_payment_id,
+ body.len = body.len(),
+ "Received Gotenberg generated PDF"
+ );
+
+ Ok(HttpResponse::Ok().finish())
+}
+
+#[allow(dead_code)]
+#[derive(Debug, Deserialize)]
+pub struct ErrorBody {
+ status: Option,
+ message: Option,
+}
+
+#[post("/gotenberg/error", guard = "internal_network_guard")]
+pub async fn error(
+ web::Header(GotenbergTrace(trace)): web::Header,
+ web::Header(ModrinthGeneratedPdfType(r#type)): web::Header<
+ ModrinthGeneratedPdfType,
+ >,
+ maybe_payment_id: Option>,
+ web::Json(error_body): web::Json,
+) -> Result {
+ trace!(
+ %trace,
+ r#type = r#type.as_str(),
+ ?maybe_payment_id,
+ ?error_body,
+ "Received Gotenberg error webhook"
+ );
+
+ Ok(HttpResponse::Ok().finish())
+}
+
+#[derive(Debug)]
+struct GotenbergTrace(String);
+
+impl header::TryIntoHeaderValue for GotenbergTrace {
+ type Error = header::InvalidHeaderValue;
+
+ fn try_into_value(self) -> Result {
+ header::HeaderValue::from_str(&self.0)
+ }
+}
+
+impl header::Header for GotenbergTrace {
+ fn name() -> header::HeaderName {
+ header::HeaderName::from_static("gotenberg-trace")
+ }
+
+ fn parse(m: &M) -> Result {
+ m.headers()
+ .get(Self::name())
+ .ok_or(ParseError::Header)?
+ .to_str()
+ .map_err(|_| ParseError::Header)
+ .map(ToOwned::to_owned)
+ .map(GotenbergTrace)
+ }
+}
+
+#[derive(Debug)]
+struct ModrinthGeneratedPdfType(GeneratedPdfType);
+
+impl header::TryIntoHeaderValue for ModrinthGeneratedPdfType {
+ type Error = header::InvalidHeaderValue;
+
+ fn try_into_value(self) -> Result {
+ header::HeaderValue::from_str(self.0.as_str())
+ }
+}
+
+impl header::Header for ModrinthGeneratedPdfType {
+ fn name() -> header::HeaderName {
+ MODRINTH_GENERATED_PDF_TYPE
+ }
+
+ fn parse(m: &M) -> Result {
+ m.headers()
+ .get(Self::name())
+ .ok_or(ParseError::Header)?
+ .to_str()
+ .map_err(|_| ParseError::Header)?
+ .parse()
+ .map_err(|_| ParseError::Header)
+ .map(ModrinthGeneratedPdfType)
+ }
+}
+
+#[derive(Debug)]
+struct ModrinthPaymentId(String);
+
+impl header::TryIntoHeaderValue for ModrinthPaymentId {
+ type Error = header::InvalidHeaderValue;
+
+ fn try_into_value(self) -> Result {
+ header::HeaderValue::from_str(&self.0)
+ }
+}
+
+impl header::Header for ModrinthPaymentId {
+ fn name() -> header::HeaderName {
+ MODRINTH_PAYMENT_ID
+ }
+
+ fn parse(m: &M) -> Result {
+ m.headers()
+ .get(Self::name())
+ .ok_or(ParseError::Header)?
+ .to_str()
+ .map_err(|_| ParseError::Header)
+ .map(ToOwned::to_owned)
+ .map(ModrinthPaymentId)
+ }
+}
diff --git a/apps/labrinth/src/routes/internal/mod.rs b/apps/labrinth/src/routes/internal/mod.rs
index 00730373..32f5a0bf 100644
--- a/apps/labrinth/src/routes/internal/mod.rs
+++ b/apps/labrinth/src/routes/internal/mod.rs
@@ -4,6 +4,7 @@ pub mod billing;
pub mod external_notifications;
pub mod flows;
pub mod gdpr;
+pub mod gotenberg;
pub mod medal;
pub mod moderation;
pub mod pats;
@@ -26,6 +27,7 @@ pub fn config(cfg: &mut actix_web::web::ServiceConfig) {
.configure(moderation::config)
.configure(billing::config)
.configure(gdpr::config)
+ .configure(gotenberg::config)
.configure(statuses::config)
.configure(medal::config)
.configure(external_notifications::config)
diff --git a/apps/labrinth/src/routes/v3/analytics_get.rs b/apps/labrinth/src/routes/v3/analytics_get.rs
index ad21c1e5..924bcae5 100644
--- a/apps/labrinth/src/routes/v3/analytics_get.rs
+++ b/apps/labrinth/src/routes/v3/analytics_get.rs
@@ -7,9 +7,11 @@
//! requests, you have to zip together M arrays of N elements
//! - this makes it inconvenient to have separate endpoints
+mod old;
+
use std::num::NonZeroU64;
-use actix_web::{HttpRequest, web};
+use actix_web::{HttpRequest, post, web};
use chrono::{DateTime, TimeDelta, Utc};
use futures::StreamExt;
use rust_decimal::Decimal;
@@ -32,10 +34,9 @@ use crate::{
routes::ApiError,
};
-// TODO: this service `analytics` is shadowed by `analytics_get_old`'s
-// see the TODO in `analytics_get_old.rs`
-pub fn config(cfg: &mut web::ServiceConfig) {
- cfg.service(web::scope("analytics").route("", web::post().to(get)));
+pub fn config(cfg: &mut utoipa_actix_web::service_config::ServiceConfig) {
+ cfg.service(fetch_analytics);
+ cfg.configure(old::config);
}
// request
@@ -43,7 +44,7 @@ pub fn config(cfg: &mut web::ServiceConfig) {
/// Requests analytics data, aggregating over all possible analytics sources
/// like projects and affiliate codes, returning the data in a list of time
/// slices.
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Serialize, Deserialize, utoipa::ToSchema)]
pub struct GetRequest {
/// What time range to return statistics for.
pub time_range: TimeRange,
@@ -52,7 +53,7 @@ pub struct GetRequest {
}
/// Time range for fetching analytics.
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Serialize, Deserialize, utoipa::ToSchema)]
pub struct TimeRange {
/// When to start including data.
pub start: DateTime,
@@ -68,20 +69,22 @@ pub struct TimeRange {
/// Determines how many time slices between the start and end will be
/// included, and how fine-grained those time slices will be.
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Serialize, Deserialize, utoipa::ToSchema)]
#[serde(rename_all = "snake_case")]
pub enum TimeRangeResolution {
/// Use a set number of time slices, with the resolution being determined
/// automatically.
+ #[schema(value_type = u64)]
Slices(NonZeroU64),
/// Each time slice will be a set number of minutes long, and the number of
/// slices is determined automatically.
+ #[schema(value_type = u64)]
Minutes(NonZeroU64),
}
/// What metrics the caller would like to receive from this analytics get
/// request.
-#[derive(Debug, Default, Serialize, Deserialize)]
+#[derive(Debug, Default, Serialize, Deserialize, utoipa::ToSchema)]
pub struct ReturnMetrics {
/// How many times a project page has been viewed.
pub project_views: Option>,
@@ -90,11 +93,15 @@ pub struct ReturnMetrics {
/// How long users have been playing a project.
pub project_playtime: Option>,
/// How much payout revenue a project has generated.
- pub project_revenue: Option>,
+ pub project_revenue: Option>,
}
+/// Replacement for `()` because of a `utoipa` limitation.
+#[derive(Debug, Default, Serialize, Deserialize, utoipa::ToSchema)]
+pub struct Unit {}
+
/// See [`ReturnMetrics`].
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Serialize, Deserialize, utoipa::ToSchema)]
pub struct Metrics {
/// When collecting metrics, what fields do we want to group the results by?
///
@@ -114,7 +121,9 @@ pub struct Metrics {
}
/// Fields for [`ReturnMetrics::project_views`].
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
+#[derive(
+ Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize, utoipa::ToSchema,
+)]
#[serde(rename_all = "snake_case")]
pub enum ProjectViewsField {
/// Project ID.
@@ -132,7 +141,9 @@ pub enum ProjectViewsField {
}
/// Fields for [`ReturnMetrics::project_downloads`].
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
+#[derive(
+ Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize, utoipa::ToSchema,
+)]
#[serde(rename_all = "snake_case")]
pub enum ProjectDownloadsField {
/// Project ID.
@@ -150,7 +161,9 @@ pub enum ProjectDownloadsField {
}
/// Fields for [`ReturnMetrics::project_playtime`].
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
+#[derive(
+ Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize, utoipa::ToSchema,
+)]
#[serde(rename_all = "snake_case")]
pub enum ProjectPlaytimeField {
/// Project ID.
@@ -177,15 +190,15 @@ pub const MAX_TIME_SLICES: usize = 1024;
/// This is a list of N [`TimeSlice`]s, where each slice represents an equal
/// time interval of metrics collection. The number of slices is determined
/// by [`GetRequest::time_range`].
-#[derive(Debug, Default, Serialize, Deserialize)]
-pub struct GetResponse(pub Vec);
+#[derive(Debug, Default, Serialize, Deserialize, utoipa::ToSchema)]
+pub struct FetchResponse(pub Vec);
/// Single time interval of metrics collection.
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[derive(Debug, Clone, Default, Serialize, Deserialize, utoipa::ToSchema)]
pub struct TimeSlice(pub Vec);
/// Metrics collected in a single [`TimeSlice`].
-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize, utoipa::ToSchema)]
#[serde(untagged)] // the presence of `source_project`, `source_affiliate_code` determines the kind
pub enum AnalyticsData {
/// Project metrics.
@@ -194,7 +207,7 @@ pub enum AnalyticsData {
}
/// Project metrics.
-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize, utoipa::ToSchema)]
pub struct ProjectAnalytics {
/// What project these metrics are for.
source_project: ProjectId,
@@ -213,7 +226,7 @@ impl ProjectAnalytics {
/// Project metrics of a specific kind.
///
/// If a field is not included in [`Metrics::bucket_by`], it will be [`None`].
-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize, utoipa::ToSchema)]
#[serde(rename_all = "snake_case", tag = "metric_kind")]
pub enum ProjectMetrics {
/// [`ReturnMetrics::project_views`].
@@ -227,7 +240,7 @@ pub enum ProjectMetrics {
}
/// [`ReturnMetrics::project_views`].
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[derive(Debug, Clone, Default, Serialize, Deserialize, utoipa::ToSchema)]
pub struct ProjectViews {
/// [`ProjectViewsField::Domain`].
#[serde(skip_serializing_if = "Option::is_none")]
@@ -246,7 +259,7 @@ pub struct ProjectViews {
}
/// [`ReturnMetrics::project_downloads`].
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[derive(Debug, Clone, Default, Serialize, Deserialize, utoipa::ToSchema)]
pub struct ProjectDownloads {
/// [`ProjectDownloadsField::Domain`].
#[serde(skip_serializing_if = "Option::is_none")]
@@ -265,7 +278,7 @@ pub struct ProjectDownloads {
}
/// [`ReturnMetrics::project_playtime`].
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[derive(Debug, Clone, Default, Serialize, Deserialize, utoipa::ToSchema)]
pub struct ProjectPlaytime {
/// [`ProjectPlaytimeField::VersionId`].
#[serde(skip_serializing_if = "Option::is_none")]
@@ -281,7 +294,7 @@ pub struct ProjectPlaytime {
}
/// [`ReturnMetrics::project_revenue`].
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[derive(Debug, Clone, Default, Serialize, Deserialize, utoipa::ToSchema)]
pub struct ProjectRevenue {
/// Total revenue for this bucket.
revenue: Decimal,
@@ -414,14 +427,19 @@ mod query {
};
}
-pub async fn get(
+/// Fetches analytics data for the authorized user's projects.
+#[utoipa::path(
+ responses((status = OK, body = inline(FetchResponse))),
+)]
+#[post("")]
+pub async fn fetch_analytics(
http_req: HttpRequest,
req: web::Json,
pool: web::Data,
redis: web::Data,
session_queue: web::Data,
clickhouse: web::Data,
-) -> Result, ApiError> {
+) -> Result, ApiError> {
let (scopes, user) = get_user_from_headers(
&http_req,
&**pool,
@@ -655,7 +673,7 @@ pub async fn get(
}
}
- Ok(web::Json(GetResponse(time_slices)))
+ Ok(web::Json(FetchResponse(time_slices)))
}
fn none_if_empty(s: String) -> Option {
@@ -686,11 +704,12 @@ async fn query_clickhouse(
cx: &mut QueryClickhouseContext<'_>,
query: &str,
use_columns: &[(&str, bool)],
- row_get_bucket: impl Fn(&Row) -> u64,
- row_to_analytics: impl Fn(Row) -> AnalyticsData,
+ // I hate using the hidden type Row::Value here, but it's what next() returns, so I see no other option
+ row_get_bucket: impl Fn(&Row::Value<'_>) -> u64,
+ row_to_analytics: impl Fn(Row::Value<'_>) -> AnalyticsData,
) -> Result<(), ApiError>
where
- Row: clickhouse::Row + serde::de::DeserializeOwned + std::fmt::Debug,
+ Row: clickhouse::RowRead + serde::de::DeserializeOwned + std::fmt::Debug,
{
let mut query = cx
.clickhouse
@@ -823,7 +842,7 @@ mod tests {
let test_project_2 = ProjectId(456);
let test_project_3 = ProjectId(789);
- let src = GetResponse(vec![
+ let src = FetchResponse(vec![
TimeSlice(vec![
AnalyticsData::Project(ProjectAnalytics {
source_project: test_project_1,
diff --git a/apps/labrinth/src/routes/v3/analytics_get_old.rs b/apps/labrinth/src/routes/v3/analytics_get/old.rs
similarity index 91%
rename from apps/labrinth/src/routes/v3/analytics_get_old.rs
rename to apps/labrinth/src/routes/v3/analytics_get/old.rs
index 0d50014b..79c5330c 100644
--- a/apps/labrinth/src/routes/v3/analytics_get_old.rs
+++ b/apps/labrinth/src/routes/v3/analytics_get/old.rs
@@ -7,13 +7,10 @@ use crate::models::teams::ProjectPermissions;
use crate::{
auth::get_user_from_headers,
database::models::user_item,
- models::{
- ids::{ProjectId, VersionId},
- pats::Scopes,
- },
+ models::{ids::ProjectId, pats::Scopes},
queue::session::AuthQueue,
};
-use actix_web::{HttpRequest, HttpResponse, web};
+use actix_web::{HttpRequest, HttpResponse, get, web};
use ariadne::ids::base62_impl::to_base62;
use chrono::{DateTime, Duration, Utc};
use eyre::eyre;
@@ -24,28 +21,21 @@ use std::collections::HashMap;
use std::convert::TryInto;
use std::num::NonZeroU32;
-pub fn config(cfg: &mut web::ServiceConfig) {
- cfg.service(
- web::scope("analytics")
- // TODO: since our service shadows analytics v2, we have to redirect here
- .route("", web::post().to(super::analytics_get::get))
- .route("playtime", web::get().to(playtimes_get))
- .route("views", web::get().to(views_get))
- .route("downloads", web::get().to(downloads_get))
- .route("revenue", web::get().to(revenue_get))
- .route(
- "countries/downloads",
- web::get().to(countries_downloads_get),
- )
- .route("countries/views", web::get().to(countries_views_get)),
- );
+pub fn config(cfg: &mut utoipa_actix_web::service_config::ServiceConfig) {
+ cfg.service(playtimes_get)
+ .service(views_get)
+ .service(downloads_get)
+ .service(revenue_get)
+ .service(countries_downloads_get)
+ .service(countries_views_get);
}
-/// The json data to be passed to fetch analytic data
+/// The json data to be passed to fetch analytic data.
+///
/// Either a list of project_ids or version_ids can be used, but not both. Unauthorized projects/versions will be filtered out.
/// start_date and end_date are optional, and default to two weeks ago, and the maximum date respectively.
/// resolution_minutes is optional. This refers to the window by which we are looking (every day, every minute, etc) and defaults to 1440 (1 day)
-#[derive(Serialize, Deserialize, Clone, Debug)]
+#[derive(Serialize, Deserialize, Clone, Debug, utoipa::ToSchema)]
pub struct GetData {
// only one of project_ids or version_ids should be used
// if neither are provided, all projects the user has access to will be used
@@ -54,26 +44,12 @@ pub struct GetData {
pub start_date: Option>, // defaults to 2 weeks ago
pub end_date: Option>, // defaults to now
+ #[schema(value_type = Option, minimum = 1)]
pub resolution_minutes: Option, // defaults to 1 day. Ignored in routes that do not aggregate over a resolution (eg: /countries)
}
-/// Get playtime data for a set of projects or versions
-/// Data is returned as a hashmap of project/version ids to a hashmap of days to playtime data
-/// eg:
-/// {
-/// "4N1tEhnO": {
-/// "20230824": 23
-/// }
-///}
-/// Either a list of project_ids or version_ids can be used, but not both. Unauthorized projects/versions will be filtered out.
-#[derive(Serialize, Deserialize, Clone)]
-pub struct FetchedPlaytime {
- pub time: u64,
- pub total_seconds: u64,
- pub loader_seconds: HashMap,
- pub game_version_seconds: HashMap,
- pub parent_seconds: HashMap,
-}
+#[utoipa::path]
+#[get("/playtime")]
pub async fn playtimes_get(
req: HttpRequest,
clickhouse: web::Data,
@@ -134,7 +110,8 @@ pub async fn playtimes_get(
Ok(HttpResponse::Ok().json(hm))
}
-/// Get view data for a set of projects or versions
+/// Get view data for a set of projects or versions.
+///
/// Data is returned as a hashmap of project/version ids to a hashmap of days to views
/// eg:
/// {
@@ -143,6 +120,8 @@ pub async fn playtimes_get(
/// }
///}
/// Either a list of project_ids or version_ids can be used, but not both. Unauthorized projects/versions will be filtered out.
+#[utoipa::path]
+#[get("/views")]
pub async fn views_get(
req: HttpRequest,
clickhouse: web::Data,
@@ -203,7 +182,8 @@ pub async fn views_get(
Ok(HttpResponse::Ok().json(hm))
}
-/// Get download data for a set of projects or versions
+/// Get download data for a set of projects or versions.
+///
/// Data is returned as a hashmap of project/version ids to a hashmap of days to downloads
/// eg:
/// {
@@ -212,6 +192,8 @@ pub async fn views_get(
/// }
///}
/// Either a list of project_ids or version_ids can be used, but not both. Unauthorized projects/versions will be filtered out.
+#[utoipa::path]
+#[get("/downloads")]
pub async fn downloads_get(
req: HttpRequest,
clickhouse: web::Data,
@@ -273,7 +255,8 @@ pub async fn downloads_get(
Ok(HttpResponse::Ok().json(hm))
}
-/// Get payout data for a set of projects
+/// Get payout data for a set of projects.
+///
/// Data is returned as a hashmap of project ids to a hashmap of days to amount earned per day
/// eg:
/// {
@@ -282,6 +265,8 @@ pub async fn downloads_get(
/// }
///}
/// ONLY project IDs can be used. Unauthorized projects will be filtered out.
+#[utoipa::path]
+#[get("/revenue")]
pub async fn revenue_get(
req: HttpRequest,
data: web::Query,
@@ -409,7 +394,8 @@ pub async fn revenue_get(
Ok(HttpResponse::Ok().json(hm))
}
-/// Get country data for a set of projects or versions
+/// Get country data for a set of projects or versions.
+///
/// Data is returned as a hashmap of project/version ids to a hashmap of coutnry to downloads.
/// Unknown countries are labeled "".
/// This is usable to see significant performing countries per project
@@ -421,6 +407,8 @@ pub async fn revenue_get(
///}
/// Either a list of project_ids or version_ids can be used, but not both. Unauthorized projects/versions will be filtered out.
/// For this endpoint, provided dates are a range to aggregate over, not specific days to fetch
+#[utoipa::path]
+#[get("/countries/downloads")]
pub async fn countries_downloads_get(
req: HttpRequest,
clickhouse: web::Data,
@@ -482,7 +470,8 @@ pub async fn countries_downloads_get(
Ok(HttpResponse::Ok().json(hm))
}
-/// Get country data for a set of projects or versions
+/// Get country data for a set of projects or versions.
+///
/// Data is returned as a hashmap of project/version ids to a hashmap of coutnry to views.
/// Unknown countries are labeled "".
/// This is usable to see significant performing countries per project
@@ -494,6 +483,8 @@ pub async fn countries_downloads_get(
///}
/// Either a list of project_ids or version_ids can be used, but not both. Unauthorized projects/versions will be filtered out.
/// For this endpoint, provided dates are a range to aggregate over, not specific days to fetch
+#[utoipa::path]
+#[get("/countries/views")]
pub async fn countries_views_get(
req: HttpRequest,
clickhouse: web::Data,
diff --git a/apps/labrinth/src/routes/v3/mod.rs b/apps/labrinth/src/routes/v3/mod.rs
index 7a989d81..96c54ce4 100644
--- a/apps/labrinth/src/routes/v3/mod.rs
+++ b/apps/labrinth/src/routes/v3/mod.rs
@@ -4,7 +4,6 @@ use actix_web::{HttpResponse, web};
use serde_json::json;
pub mod analytics_get;
-pub mod analytics_get_old;
pub mod collections;
pub mod friends;
pub mod images;
@@ -33,8 +32,6 @@ pub fn config(cfg: &mut web::ServiceConfig) {
web::scope("v3")
.wrap(default_cors())
.configure(limits::config)
- // .configure(analytics_get::config) // TODO: see `analytics_get`
- .configure(analytics_get_old::config)
.configure(collections::config)
.configure(images::config)
.configure(notifications::config)
@@ -56,6 +53,16 @@ pub fn config(cfg: &mut web::ServiceConfig) {
);
}
+pub fn utoipa_config(
+ cfg: &mut utoipa_actix_web::service_config::ServiceConfig,
+) {
+ cfg.service(
+ utoipa_actix_web::scope("/v3/analytics")
+ .wrap(default_cors())
+ .configure(analytics_get::config),
+ );
+}
+
pub async fn hello_world() -> Result {
Ok(HttpResponse::Ok().json(json!({
"hello": "world",
diff --git a/apps/labrinth/src/routes/v3/payouts.rs b/apps/labrinth/src/routes/v3/payouts.rs
index f77fb262..8779a887 100644
--- a/apps/labrinth/src/routes/v3/payouts.rs
+++ b/apps/labrinth/src/routes/v3/payouts.rs
@@ -86,7 +86,18 @@ pub async fn post_compliance_form(
.await?;
let mut compliance = match maybe_compliance {
- Some(c) => c,
+ Some(c) => {
+ if c.signed.is_some()
+ && c.form_type.is_some_and(|f| f.requires_domestic_tin_match())
+ && !c.tin_matched
+ {
+ return Err(ApiError::InvalidInput(
+ "Your TIN/SSN did not match the IRS records. Please contact support https://support.modrinth.com".to_owned(),
+ ));
+ }
+
+ c
+ }
None => users_compliance::UserCompliance {
id: 0,
user_id,
@@ -1110,7 +1121,11 @@ pub async fn get_balance(
if compliance.compliance_api_check_failed {
FormCompletionStatus::Unknown
} else if compliance.model.signed.is_some() {
- if compliance.model.tin_matched {
+ if compliance.model.tin_matched
+ || compliance.model.form_type.is_some_and(|x| {
+ !x.requires_domestic_tin_match()
+ })
+ {
FormCompletionStatus::Complete
} else {
FormCompletionStatus::TinMismatch
diff --git a/apps/labrinth/src/search/indexing/mod.rs b/apps/labrinth/src/search/indexing/mod.rs
index 1ecb70ad..89f98d2f 100644
--- a/apps/labrinth/src/search/indexing/mod.rs
+++ b/apps/labrinth/src/search/indexing/mod.rs
@@ -127,6 +127,7 @@ pub async fn swap_index(
let index_name = config.get_index_name(index_name, false);
let swap_indices = SwapIndexes {
indexes: (index_name_next, index_name),
+ rename: None,
};
client
.swap_indexes([&swap_indices])
diff --git a/apps/labrinth/src/test/db.rs b/apps/labrinth/src/test/db.rs
new file mode 100644
index 00000000..cbfa2412
--- /dev/null
+++ b/apps/labrinth/src/test/db.rs
@@ -0,0 +1,81 @@
+use eyre::{Context, Result};
+use sqlx::{Executor, PgPool};
+
+/// Static personal access token for use in [`AppendPat`].
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub struct Pat(pub &'static str);
+
+/// Dummy [`Pat`]s.
+#[allow(missing_docs, reason = "self-explanatory")]
+pub mod pat {
+ use super::Pat;
+
+ pub const ADMIN: Pat = Pat("mrp_patadmin");
+ pub const MODERATOR: Pat = Pat("mrp_patmoderator");
+ pub const USER: Pat = Pat("mrp_patuser");
+ pub const FRIEND: Pat = Pat("mrp_patfriend");
+ pub const ENEMY: Pat = Pat("mrp_patenemy");
+}
+
+/// See [`AppendPat::append_pat`].
+pub trait AppendPat {
+ /// Appends a [`Pat`] authorization token to an
+ /// [`actix_web::test::TestRequest`].
+ #[must_use]
+ fn append_pat(self, pat: Pat) -> Self;
+}
+
+impl AppendPat for actix_web::test::TestRequest {
+ fn append_pat(self, pat: Pat) -> Self {
+ self.append_header(("Authorization", pat.0))
+ }
+}
+
+/// Dummy [`DBUserId`]s.
+///
+/// [`DBUserId`]: crate::database::models::DBUserId
+pub mod user_id {
+ use crate::database::models::DBUserId;
+
+ pub const ADMIN: DBUserId = DBUserId(1);
+ pub const MODERATOR: DBUserId = DBUserId(2);
+ pub const USER: DBUserId = DBUserId(3);
+ pub const FRIEND: DBUserId = DBUserId(4);
+ pub const ENEMY: DBUserId = DBUserId(5);
+}
+
+/// Initialize a database with dummy fixture data.
+///
+/// # Errors
+///
+/// Errors if the fixture could not be applied.
+pub async fn add_dummy_data(db: &PgPool) -> Result<()> {
+ db.execute(
+ include_str!("../../fixtures/dummy_data.sql")
+ //
+ .replace("{{user_id::ADMIN}}", &user_id::ADMIN.0.to_string())
+ .replace(
+ "{{user_id::MODERATOR}}",
+ &user_id::MODERATOR.0.to_string(),
+ )
+ .replace("{{user_id::USER}}", &user_id::USER.0.to_string())
+ .replace("{{user_id::FRIEND}}", &user_id::FRIEND.0.to_string())
+ .replace("{{user_id::ENEMY}}", &user_id::ENEMY.0.to_string())
+ //
+ .replace("{{pat::ADMIN}}", pat::ADMIN.0)
+ .replace("{{pat::MODERATOR}}", pat::MODERATOR.0)
+ .replace("{{pat::USER}}", pat::USER.0)
+ .replace("{{pat::FRIEND}}", pat::FRIEND.0)
+ .replace("{{pat::ENEMY}}", pat::ENEMY.0)
+ //
+ .replace(
+ "{{all_scopes}}",
+ &crate::models::pats::Scopes::all().bits().to_string(),
+ )
+ .as_str(),
+ )
+ .await
+ .wrap_err("failed to add dummy data")?;
+
+ Ok(())
+}
diff --git a/apps/labrinth/src/test/mod.rs b/apps/labrinth/src/test/mod.rs
new file mode 100644
index 00000000..dec10232
--- /dev/null
+++ b/apps/labrinth/src/test/mod.rs
@@ -0,0 +1 @@
+pub mod db;
diff --git a/apps/labrinth/src/util/anrok.rs b/apps/labrinth/src/util/anrok.rs
index e7d896dd..b9ed7998 100644
--- a/apps/labrinth/src/util/anrok.rs
+++ b/apps/labrinth/src/util/anrok.rs
@@ -182,6 +182,60 @@ impl Client {
.await
}
+ pub async fn negate_or_create_partial_negation(
+ &self,
+ original_txn_anrok_id: String,
+ original_txn_version: i32,
+ original_txn_tax_amount_with_tax: i64,
+ body: &Transaction,
+ ) -> Result<(), AnrokError> {
+ let refund_amount = body
+ .fields
+ .line_items
+ .iter()
+ .map(|l| l.amount_in_smallest_denominations)
+ .sum::();
+
+ if -refund_amount == original_txn_tax_amount_with_tax {
+ self.create_full_negation(
+ original_txn_anrok_id,
+ original_txn_version,
+ body.id.clone(),
+ )
+ .await?;
+ } else {
+ self.create_or_update_txn(body).await?;
+ }
+
+ Ok(())
+ }
+
+ pub async fn create_full_negation(
+ &self,
+ original_txn_anrok_id: String,
+ original_txn_version: i32,
+ new_txn_id: String,
+ ) -> Result {
+ #[derive(Serialize)]
+ #[serde(rename_all = "camelCase")]
+ struct NegationBody {
+ original_transaction_id: String,
+ new_transaction_id: String,
+ original_transaction_expected_version: i32,
+ }
+
+ self.make_request(
+ Method::POST,
+ "/v1/seller/transactions/createNegation",
+ Some(&NegationBody {
+ original_transaction_id: original_txn_anrok_id,
+ new_transaction_id: new_txn_id,
+ original_transaction_expected_version: original_txn_version,
+ }),
+ )
+ .await
+ }
+
pub async fn create_or_update_txn(
&self,
body: &Transaction,
diff --git a/apps/labrinth/src/util/archon.rs b/apps/labrinth/src/util/archon.rs
index 471faa7b..621e923f 100644
--- a/apps/labrinth/src/util/archon.rs
+++ b/apps/labrinth/src/util/archon.rs
@@ -72,4 +72,58 @@ impl ArchonClient {
Ok(response.json::().await?.uuid)
}
+
+ pub async fn get_servers_by_hostname(
+ &self,
+ hostname: &str,
+ ) -> Result, reqwest::Error> {
+ #[derive(Deserialize)]
+ struct NodeByHostnameResponse {
+ servers: Vec,
+ }
+ #[derive(Deserialize)]
+ struct NodeServerEntry {
+ id: Uuid,
+ #[allow(dead_code)]
+ available: Option,
+ }
+
+ let res = self
+ .client
+ .get(format!(
+ "{}/_internal/nodes/by-hostname/{}",
+ self.base_url, hostname
+ ))
+ .header(X_MASTER_KEY, &self.pyro_api_key)
+ .send()
+ .await?
+ .error_for_status()?;
+
+ let parsed: NodeByHostnameResponse = res.json().await?;
+ Ok(parsed.servers.into_iter().map(|s| s.id).collect())
+ }
+
+ pub async fn get_active_servers_by_region(
+ &self,
+ region: &str,
+ ) -> Result, reqwest::Error> {
+ #[derive(Deserialize)]
+ struct RegionResponse {
+ active_servers: Vec,
+ }
+
+ let res = self
+ .client
+ .get(format!(
+ "{}/_internal/nodes/regions/{}",
+ self.base_url, region
+ ))
+ .header(X_MASTER_KEY, &self.pyro_api_key)
+ .send()
+ .await?
+ .error_for_status()?;
+
+ let parsed: RegionResponse = res.json().await?;
+ Ok(parsed.active_servers)
+ }
}
diff --git a/apps/labrinth/src/util/gotenberg.rs b/apps/labrinth/src/util/gotenberg.rs
new file mode 100644
index 00000000..ec8c6b3d
--- /dev/null
+++ b/apps/labrinth/src/util/gotenberg.rs
@@ -0,0 +1,219 @@
+use crate::routes::ApiError;
+use crate::util::error::Context;
+use actix_web::http::header::HeaderName;
+use serde::{Deserialize, Serialize};
+use std::str::FromStr;
+
+pub const MODRINTH_GENERATED_PDF_TYPE: HeaderName =
+ HeaderName::from_static("modrinth-generated-pdf-type");
+pub const MODRINTH_PAYMENT_ID: HeaderName =
+ HeaderName::from_static("modrinth-payment-id");
+
+#[derive(Serialize, Deserialize, Debug, Clone)]
+pub struct PaymentStatement {
+ pub payment_id: String,
+ pub recipient_address_line_1: Option,
+ pub recipient_address_line_2: Option,
+ pub recipient_address_line_3: Option,
+ pub recipient_email: String,
+ pub payment_date: String,
+ pub gross_amount_cents: i64,
+ pub net_amount_cents: i64,
+ pub fees_cents: i64,
+ pub currency_code: String,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub enum GeneratedPdfType {
+ PaymentStatement,
+}
+
+impl GeneratedPdfType {
+ pub fn as_str(self) -> &'static str {
+ match self {
+ GeneratedPdfType::PaymentStatement => "payment-statement",
+ }
+ }
+}
+
+impl FromStr for GeneratedPdfType {
+ type Err = String;
+
+ fn from_str(s: &str) -> Result {
+ match s {
+ "payment-statement" => Ok(GeneratedPdfType::PaymentStatement),
+ _ => Err(s.to_owned()),
+ }
+ }
+}
+
+#[derive(Clone)]
+pub struct GotenbergClient {
+ client: reqwest::Client,
+ gotenberg_url: String,
+ site_url: String,
+ callback_base: String,
+}
+
+impl GotenbergClient {
+ /// Initialize the client from environment variables.
+ pub fn from_env() -> Result {
+ let client = reqwest::Client::builder()
+ .user_agent("Modrinth")
+ .build()
+ .wrap_internal_err("failed to build reqwest client")?;
+
+ let gotenberg_url = dotenvy::var("GOTENBERG_URL")
+ .wrap_internal_err("GOTENBERG_URL is not set")?;
+ let site_url = dotenvy::var("SITE_URL")
+ .wrap_internal_err("SITE_URL is not set")?;
+ let callback_base = dotenvy::var("GOTENBERG_CALLBACK_BASE")
+ .wrap_internal_err("GOTENBERG_CALLBACK_BASE is not set")?;
+
+ Ok(Self {
+ client,
+ gotenberg_url: gotenberg_url.trim_end_matches('/').to_owned(),
+ site_url: site_url.trim_end_matches('/').to_owned(),
+ callback_base: callback_base.trim_end_matches('/').to_owned(),
+ })
+ }
+
+ /// Generate a PDF payment statement via Gotenberg.
+ ///
+ /// This will:
+ /// - Fetch the HTML template from `{SITE_URL}/_internal/templates/doc/payment-statement`.
+ /// - Perform simple template substitution with fields from `PaymentStatement`.
+ /// - Submit the HTML to Gotenberg HTML route with webhook headers.
+ pub async fn generate_payment_statement(
+ &self,
+ statement: &PaymentStatement,
+ ) -> Result<(), ApiError> {
+ let template_url = format!(
+ "{}/_internal/templates/doc/payment-statement",
+ self.site_url
+ );
+
+ let template_html = {
+ let resp = self
+ .client
+ .get(template_url)
+ .send()
+ .await
+ .wrap_internal_err(
+ "failed to request payment statement template",
+ )?;
+ let resp = resp.error_for_status().wrap_internal_err(
+ "failed to fetch payment statement template (bad status)",
+ )?;
+ resp.text().await.wrap_internal_err(
+ "failed to read payment statement template body",
+ )?
+ };
+
+ let filled_html = fill_statement_template(&template_html, statement);
+
+ let form = reqwest::multipart::Form::new().part(
+ "files",
+ reqwest::multipart::Part::text(filled_html)
+ .file_name("index.html")
+ .mime_str("text/html")
+ .wrap_internal_err("invalid mime type for html part")?,
+ );
+
+ let success_webhook = format!("{}/success", self.callback_base);
+ let error_webhook = format!("{}/error", self.callback_base);
+
+ self
+ .client
+ .post(format!(
+ "{}/forms/chromium/convert/html",
+ self.gotenberg_url
+ ))
+ .header("Gotenberg-Webhook-Url", success_webhook)
+ .header("Gotenberg-Webhook-Error-Url", error_webhook)
+ .header(
+ "Gotenberg-Webhook-Extra-Http-Headers",
+ serde_json::json!({
+ "Modrinth-Payment-Id": statement.payment_id,
+ "Modrinth-Generated-Pdf-Type": GeneratedPdfType::PaymentStatement.as_str(),
+ }).to_string(),
+ )
+ .header(
+ "Modrinth-Payment-Id",
+ &statement.payment_id,
+ )
+ .header(
+ "Gotenberg-Output-Filename",
+ format!("payment-statement-{}", statement.payment_id),
+ )
+ .multipart(form)
+ .send()
+ .await
+ .wrap_internal_err("failed to submit HTML to Gotenberg")?
+ .error_for_status()
+ .wrap_internal_err("Gotenberg returned an error status")?;
+
+ Ok(())
+ }
+}
+
+fn fill_statement_template(html: &str, s: &PaymentStatement) -> String {
+ let variables: Vec<(&str, String)> = vec![
+ ("statement.payment_id", s.payment_id.clone()),
+ (
+ "statement.recipient_address_line_1",
+ s.recipient_address_line_1.clone().unwrap_or_default(),
+ ),
+ (
+ "statement.recipient_address_line_2",
+ s.recipient_address_line_2.clone().unwrap_or_default(),
+ ),
+ (
+ "statement.recipient_address_line_3",
+ s.recipient_address_line_3.clone().unwrap_or_default(),
+ ),
+ ("statement.recipient_email", s.recipient_email.clone()),
+ ("statement.payment_date", s.payment_date.clone()),
+ (
+ "statement.gross_amount",
+ format_money(s.gross_amount_cents, &s.currency_code),
+ ),
+ (
+ "statement.net_amount",
+ format_money(s.net_amount_cents, &s.currency_code),
+ ),
+ (
+ "statement.fees",
+ format_money(s.fees_cents, &s.currency_code),
+ ),
+ ];
+
+ let mut out = String::with_capacity(html.len());
+ let mut remaining = html;
+ while let Some((before, rest)) = remaining.split_once('{') {
+ out.push_str(before);
+ if let Some((key, after)) = rest.split_once('}') {
+ let key = key.trim();
+ if let Some((_, val)) = variables.iter().find(|(k, _)| *k == key) {
+ out.push_str(val);
+ }
+ // if key not found, insert empty string
+ remaining = after;
+ } else {
+ // unmatched '{', push the rest and break
+ out.push_str(rest);
+ remaining = "";
+ break;
+ }
+ }
+ out.push_str(remaining);
+ out
+}
+
+fn format_money(amount_cents: i64, currency: &str) -> String {
+ rusty_money::Money::from_minor(
+ amount_cents,
+ rusty_money::iso::find(currency).unwrap_or(rusty_money::iso::USD),
+ )
+ .to_string()
+}
diff --git a/apps/labrinth/src/util/guards.rs b/apps/labrinth/src/util/guards.rs
index ec46a4f8..08b3df46 100644
--- a/apps/labrinth/src/util/guards.rs
+++ b/apps/labrinth/src/util/guards.rs
@@ -1,4 +1,5 @@
use actix_web::guard::GuardContext;
+use actix_web::http::header::X_FORWARDED_FOR;
pub const ADMIN_KEY_HEADER: &str = "Modrinth-Admin";
pub const MEDAL_KEY_HEADER: &str = "X-Medal-Access-Key";
@@ -42,3 +43,10 @@ pub fn external_notification_key_guard(ctx: &GuardContext) -> bool {
}),
}
}
+
+pub fn internal_network_guard(ctx: &GuardContext) -> bool {
+ ctx.head()
+ .peer_addr
+ .is_some_and(|sock| matches!(sock.ip().to_canonical(), std::net::IpAddr::V4(v4) if v4.is_private()))
+ && ctx.head().headers().get(X_FORWARDED_FOR).is_none()
+}
diff --git a/apps/labrinth/src/util/mod.rs b/apps/labrinth/src/util/mod.rs
index f2c1c68a..fa907500 100644
--- a/apps/labrinth/src/util/mod.rs
+++ b/apps/labrinth/src/util/mod.rs
@@ -9,6 +9,7 @@ pub mod date;
pub mod env;
pub mod error;
pub mod ext;
+pub mod gotenberg;
pub mod guards;
pub mod img;
pub mod ip;
diff --git a/apps/labrinth/src/validate/datapack.rs b/apps/labrinth/src/validate/datapack.rs
index f152486d..b1639874 100644
--- a/apps/labrinth/src/validate/datapack.rs
+++ b/apps/labrinth/src/validate/datapack.rs
@@ -18,7 +18,7 @@ impl super::Validator for DataPackValidator {
fn get_supported_game_versions(&self) -> SupportedGameVersions {
// Time since release of 17w43a, 2017-10-25, which introduced datapacks
SupportedGameVersions::PastDate(
- DateTime::from_timestamp(1508889600, 0).unwrap(),
+ DateTime::from_timestamp_secs(1508889600).unwrap(),
)
}
diff --git a/apps/labrinth/src/validate/forge.rs b/apps/labrinth/src/validate/forge.rs
index da8b49a8..375b31e6 100644
--- a/apps/labrinth/src/validate/forge.rs
+++ b/apps/labrinth/src/validate/forge.rs
@@ -19,7 +19,7 @@ impl super::Validator for ForgeValidator {
fn get_supported_game_versions(&self) -> SupportedGameVersions {
// Time since release of 1.13, the first forge version which uses the new TOML system
SupportedGameVersions::PastDate(
- DateTime::from_timestamp(1540122067, 0).unwrap(),
+ DateTime::from_timestamp_secs(1540122067).unwrap(),
)
}
@@ -56,8 +56,8 @@ impl super::Validator for LegacyForgeValidator {
fn get_supported_game_versions(&self) -> SupportedGameVersions {
// Times between versions 1.5.2 to 1.12.2, which all use the legacy way of defining mods
SupportedGameVersions::Range(
- DateTime::from_timestamp(0, 0).unwrap(),
- DateTime::from_timestamp(1540122066, 0).unwrap(),
+ DateTime::from_timestamp_secs(0).unwrap(),
+ DateTime::from_timestamp_secs(1540122066).unwrap(),
)
}
diff --git a/apps/labrinth/src/validate/quilt.rs b/apps/labrinth/src/validate/quilt.rs
index 08312f56..29ed0d54 100644
--- a/apps/labrinth/src/validate/quilt.rs
+++ b/apps/labrinth/src/validate/quilt.rs
@@ -18,7 +18,7 @@ impl super::Validator for QuiltValidator {
fn get_supported_game_versions(&self) -> SupportedGameVersions {
SupportedGameVersions::PastDate(
- DateTime::from_timestamp(1646070100, 0).unwrap(),
+ DateTime::from_timestamp_secs(1646070100).unwrap(),
)
}
diff --git a/apps/labrinth/src/validate/resourcepack.rs b/apps/labrinth/src/validate/resourcepack.rs
index 1d9d52c3..7f204f6d 100644
--- a/apps/labrinth/src/validate/resourcepack.rs
+++ b/apps/labrinth/src/validate/resourcepack.rs
@@ -20,7 +20,7 @@ impl super::Validator for PackValidator {
fn get_supported_game_versions(&self) -> SupportedGameVersions {
// Time since release of 13w24a which replaced texture packs with resource packs
SupportedGameVersions::PastDate(
- DateTime::from_timestamp(1371137542, 0).unwrap(),
+ DateTime::from_timestamp_secs(1371137542).unwrap(),
)
}
@@ -59,8 +59,8 @@ impl super::Validator for TexturePackValidator {
fn get_supported_game_versions(&self) -> SupportedGameVersions {
// a1.2.2a to 13w23b
SupportedGameVersions::Range(
- DateTime::from_timestamp(1289339999, 0).unwrap(),
- DateTime::from_timestamp(1370651522, 0).unwrap(),
+ DateTime::from_timestamp_secs(1289339999).unwrap(),
+ DateTime::from_timestamp_secs(1370651522).unwrap(),
)
}
diff --git a/apps/labrinth/tests/common/api_v2/mod.rs b/apps/labrinth/tests/common/api_v2/mod.rs
index 20d0e6e3..e197c4b7 100644
--- a/apps/labrinth/tests/common/api_v2/mod.rs
+++ b/apps/labrinth/tests/common/api_v2/mod.rs
@@ -6,6 +6,7 @@ use actix_web::{App, dev::ServiceResponse, test};
use async_trait::async_trait;
use labrinth::LabrinthConfig;
use std::rc::Rc;
+use utoipa_actix_web::AppExt;
pub mod project;
pub mod request_data;
@@ -22,9 +23,15 @@ pub struct ApiV2 {
#[async_trait(?Send)]
impl ApiBuildable for ApiV2 {
async fn build(labrinth_config: LabrinthConfig) -> Self {
- let app = App::new().configure(|cfg| {
- labrinth::app_config(cfg, labrinth_config.clone())
- });
+ let app = App::new()
+ .into_utoipa_app()
+ .configure(|cfg| {
+ labrinth::utoipa_app_config(cfg, labrinth_config.clone())
+ })
+ .into_app()
+ .configure(|cfg| {
+ labrinth::app_config(cfg, labrinth_config.clone())
+ });
let test_app: Rc =
Rc::new(test::init_service(app).await);
diff --git a/apps/labrinth/tests/common/api_v3/mod.rs b/apps/labrinth/tests/common/api_v3/mod.rs
index e556d040..1f28896d 100644
--- a/apps/labrinth/tests/common/api_v3/mod.rs
+++ b/apps/labrinth/tests/common/api_v3/mod.rs
@@ -6,6 +6,7 @@ use actix_web::{App, dev::ServiceResponse, test};
use async_trait::async_trait;
use labrinth::LabrinthConfig;
use std::rc::Rc;
+use utoipa_actix_web::AppExt;
pub mod collections;
pub mod limits;
@@ -27,9 +28,15 @@ pub struct ApiV3 {
#[async_trait(?Send)]
impl ApiBuildable for ApiV3 {
async fn build(labrinth_config: LabrinthConfig) -> Self {
- let app = App::new().configure(|cfg| {
- labrinth::app_config(cfg, labrinth_config.clone())
- });
+ let app = App::new()
+ .into_utoipa_app()
+ .configure(|cfg| {
+ labrinth::utoipa_app_config(cfg, labrinth_config.clone())
+ })
+ .into_app()
+ .configure(|cfg| {
+ labrinth::app_config(cfg, labrinth_config.clone())
+ });
let test_app: Rc =
Rc::new(test::init_service(app).await);
diff --git a/apps/labrinth/tests/common/dummy_data.rs b/apps/labrinth/tests/common/dummy_data.rs
index 7e9ffa84..d44bd839 100644
--- a/apps/labrinth/tests/common/dummy_data.rs
+++ b/apps/labrinth/tests/common/dummy_data.rs
@@ -10,11 +10,9 @@ use labrinth::models::ids::ProjectId;
use labrinth::models::{
oauth_clients::OAuthClient,
organizations::Organization,
- pats::Scopes,
projects::{Project, Version},
};
use serde_json::json;
-use sqlx::Executor;
use zip::{CompressionMethod, ZipWriter, write::FileOptions};
use super::{
@@ -291,13 +289,7 @@ pub async fn add_dummy_data(api: &ApiV3, db: TemporaryDatabase) -> DummyData {
// Adds basic dummy data to the database directly with sql (user, pats)
let pool = &db.pool.clone();
- pool.execute(
- include_str!("../fixtures/dummy_data.sql")
- .replace("$1", &Scopes::all().bits().to_string())
- .as_str(),
- )
- .await
- .unwrap();
+ labrinth::test::db::add_dummy_data(pool).await.unwrap();
let (alpha_project, alpha_version) = add_project_alpha(api).await;
let (beta_project, beta_version) = add_project_beta(api).await;
diff --git a/apps/labrinth/tests/common/mod.rs b/apps/labrinth/tests/common/mod.rs
index 1056ab0d..79958f7a 100644
--- a/apps/labrinth/tests/common/mod.rs
+++ b/apps/labrinth/tests/common/mod.rs
@@ -1,7 +1,9 @@
use labrinth::queue::email::EmailQueue;
use labrinth::util::anrok;
-use labrinth::{LabrinthConfig, file_hosting, queue};
+use labrinth::util::gotenberg::GotenbergClient;
+use labrinth::{LabrinthConfig, file_hosting};
use labrinth::{check_env_vars, clickhouse};
+use modrinth_maxmind::MaxMind;
use std::sync::Arc;
pub mod api_common;
@@ -27,6 +29,8 @@ pub async fn setup(db: &database::TemporaryDatabase) -> LabrinthConfig {
println!("Some environment variables are missing!");
}
+ let _ = rustls::crypto::aws_lc_rs::default_provider().install_default();
+
let pool = db.pool.clone();
let ro_pool = db.ro_pool.clone();
let redis_pool = db.redis_pool.clone();
@@ -35,8 +39,7 @@ pub async fn setup(db: &database::TemporaryDatabase) -> LabrinthConfig {
Arc::new(file_hosting::MockHost::new());
let mut clickhouse = clickhouse::init_client().await.unwrap();
- let maxmind_reader =
- Arc::new(queue::maxmind::MaxMindIndexer::new().await.unwrap());
+ let maxmind_reader = MaxMind::new().await;
let stripe_client =
stripe::Client::new(dotenvy::var("STRIPE_API_KEY").unwrap());
@@ -44,6 +47,8 @@ pub async fn setup(db: &database::TemporaryDatabase) -> LabrinthConfig {
let anrok_client = anrok::Client::from_env().unwrap();
let email_queue =
EmailQueue::init(pool.clone(), redis_pool.clone()).unwrap();
+ let gotenberg_client =
+ GotenbergClient::from_env().expect("Failed to create Gotenberg client");
labrinth::app_setup(
pool.clone(),
@@ -56,6 +61,7 @@ pub async fn setup(db: &database::TemporaryDatabase) -> LabrinthConfig {
stripe_client,
anrok_client,
email_queue,
+ gotenberg_client,
false,
)
}
diff --git a/clippy.toml b/clippy.toml
index b77c9241..ddc612e9 100644
--- a/clippy.toml
+++ b/clippy.toml
@@ -1,2 +1,2 @@
allow-dbg-in-tests = true
-msrv = "1.89.0"
+msrv = "1.90.0"
diff --git a/docker-compose.yml b/docker-compose.yml
index 955e6586..ebca3de9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,7 +12,7 @@ services:
POSTGRES_PASSWORD: labrinth
POSTGRES_HOST_AUTH_METHOD: trust
healthcheck:
- test: ['CMD', 'pg_isready']
+ test: [ 'CMD', 'pg_isready' ]
interval: 3s
timeout: 5s
retries: 3
@@ -28,7 +28,7 @@ services:
MEILI_MASTER_KEY: modrinth
MEILI_HTTP_PAYLOAD_SIZE_LIMIT: 107374182400
healthcheck:
- test: ['CMD', 'curl', '--fail', 'http://localhost:7700/health']
+ test: [ 'CMD', 'curl', '--fail', 'http://localhost:7700/health' ]
interval: 3s
timeout: 5s
retries: 3
@@ -41,7 +41,7 @@ services:
volumes:
- redis-data:/data
healthcheck:
- test: ['CMD', 'redis-cli', 'PING']
+ test: [ 'CMD', 'redis-cli', 'PING' ]
interval: 3s
timeout: 5s
retries: 3
@@ -54,7 +54,7 @@ services:
CLICKHOUSE_USER: default
CLICKHOUSE_PASSWORD: default
healthcheck:
- test: ['CMD-SHELL', 'clickhouse-client --query "SELECT 1"']
+ test: [ 'CMD-SHELL', 'clickhouse-client --query "SELECT 1"' ]
interval: 3s
timeout: 5s
retries: 3
@@ -67,10 +67,15 @@ services:
environment:
MP_ENABLE_SPAMASSASSIN: postmark
healthcheck:
- test: ['CMD', 'wget', '-q', '-O/dev/null', 'http://localhost:8025/api/v1/info']
+ test: [ 'CMD', 'wget', '-q', '-O/dev/null', 'http://localhost:8025/api/v1/info' ]
interval: 3s
timeout: 5s
retries: 3
+ gotenberg:
+ image: gotenberg/gotenberg:8
+ container_name: labrinth-gotenberg
+ ports:
+ - "3000:13000"
labrinth:
profiles:
- with-labrinth
diff --git a/packages/app-lib/.prettierignore b/packages/app-lib/.prettierignore
index 9237fdf3..42a37415 100644
--- a/packages/app-lib/.prettierignore
+++ b/packages/app-lib/.prettierignore
@@ -1,6 +1,8 @@
**/*.rs
.sqlx
+java/build
+
# Migrations existing before Prettier formatted them shall always be ignored,
# as any changes to them will break existing deployments
migrations/20240711194701_init.sql
diff --git a/packages/app-lib/.sqlx/query-7dc83d7ffa3d583fc5ffaf13811a8dab4d0b9ded6200f827b9de7ac32e5318d5.json b/packages/app-lib/.sqlx/query-07ea3a644644de61c4ed7c30ee711d29fd49f10534230b1b03097275a30cb50f.json
similarity index 93%
rename from packages/app-lib/.sqlx/query-7dc83d7ffa3d583fc5ffaf13811a8dab4d0b9ded6200f827b9de7ac32e5318d5.json
rename to packages/app-lib/.sqlx/query-07ea3a644644de61c4ed7c30ee711d29fd49f10534230b1b03097275a30cb50f.json
index 43518eb5..4ebdb79b 100644
--- a/packages/app-lib/.sqlx/query-7dc83d7ffa3d583fc5ffaf13811a8dab4d0b9ded6200f827b9de7ac32e5318d5.json
+++ b/packages/app-lib/.sqlx/query-07ea3a644644de61c4ed7c30ee711d29fd49f10534230b1b03097275a30cb50f.json
@@ -1,6 +1,6 @@
{
"db_name": "SQLite",
- "query": "\n SELECT\n max_concurrent_writes, max_concurrent_downloads,\n theme, default_page, collapsed_navigation, hide_nametag_skins_page, advanced_rendering, native_decorations,\n discord_rpc, developer_mode, telemetry, personalized_ads,\n onboarded,\n json(extra_launch_args) extra_launch_args, json(custom_env_vars) custom_env_vars,\n mc_memory_max, mc_force_fullscreen, mc_game_resolution_x, mc_game_resolution_y, hide_on_process_start,\n hook_pre_launch, hook_wrapper, hook_post_exit,\n custom_dir, prev_custom_dir, migrated, json(feature_flags) feature_flags, toggle_sidebar,\n skipped_update, pending_update_toast_for_version, auto_download_updates\n FROM settings\n ",
+ "query": "\n SELECT\n max_concurrent_writes, max_concurrent_downloads,\n theme, default_page, collapsed_navigation, hide_nametag_skins_page, advanced_rendering, native_decorations,\n discord_rpc, developer_mode, telemetry, personalized_ads,\n onboarded,\n json(extra_launch_args) extra_launch_args, json(custom_env_vars) custom_env_vars,\n mc_memory_max, mc_force_fullscreen, mc_game_resolution_x, mc_game_resolution_y, hide_on_process_start,\n hook_pre_launch, hook_wrapper, hook_post_exit,\n custom_dir, prev_custom_dir, migrated, json(feature_flags) feature_flags, toggle_sidebar,\n skipped_update, pending_update_toast_for_version, auto_download_updates,\n version\n FROM settings\n ",
"describe": {
"columns": [
{
@@ -157,6 +157,11 @@
"name": "auto_download_updates",
"ordinal": 30,
"type_info": "Integer"
+ },
+ {
+ "name": "version",
+ "ordinal": 31,
+ "type_info": "Integer"
}
],
"parameters": {
@@ -193,8 +198,9 @@
false,
true,
true,
- true
+ true,
+ false
]
},
- "hash": "7dc83d7ffa3d583fc5ffaf13811a8dab4d0b9ded6200f827b9de7ac32e5318d5"
+ "hash": "07ea3a644644de61c4ed7c30ee711d29fd49f10534230b1b03097275a30cb50f"
}
diff --git a/packages/app-lib/.sqlx/query-6e3fa492c085ebb8e7280dd4d55cdcf73da199ea6ac05ee3ee798ece80d877cf.json b/packages/app-lib/.sqlx/query-6e3fa492c085ebb8e7280dd4d55cdcf73da199ea6ac05ee3ee798ece80d877cf.json
index 22e39e75..9742cb7b 100644
--- a/packages/app-lib/.sqlx/query-6e3fa492c085ebb8e7280dd4d55cdcf73da199ea6ac05ee3ee798ece80d877cf.json
+++ b/packages/app-lib/.sqlx/query-6e3fa492c085ebb8e7280dd4d55cdcf73da199ea6ac05ee3ee798ece80d877cf.json
@@ -41,7 +41,7 @@
{
"name": "display_claims!: serde_json::Value",
"ordinal": 7,
- "type_info": "Text"
+ "type_info": "Null"
}
],
"parameters": {
diff --git a/packages/app-lib/.sqlx/query-eb95fac3043d0ffd10caef69cc469474cc5c0d36cc0698c4cc0852da81fed158.json b/packages/app-lib/.sqlx/query-a40e60da6dd1312d4a1ed52fa8fd2394e7ad21de1cb44cf8b93c4b1459cdc716.json
similarity index 90%
rename from packages/app-lib/.sqlx/query-eb95fac3043d0ffd10caef69cc469474cc5c0d36cc0698c4cc0852da81fed158.json
rename to packages/app-lib/.sqlx/query-a40e60da6dd1312d4a1ed52fa8fd2394e7ad21de1cb44cf8b93c4b1459cdc716.json
index 90d12211..e80d1cb6 100644
--- a/packages/app-lib/.sqlx/query-eb95fac3043d0ffd10caef69cc469474cc5c0d36cc0698c4cc0852da81fed158.json
+++ b/packages/app-lib/.sqlx/query-a40e60da6dd1312d4a1ed52fa8fd2394e7ad21de1cb44cf8b93c4b1459cdc716.json
@@ -1,12 +1,12 @@
{
"db_name": "SQLite",
- "query": "\n UPDATE settings\n SET\n max_concurrent_writes = $1,\n max_concurrent_downloads = $2,\n\n theme = $3,\n default_page = $4,\n collapsed_navigation = $5,\n advanced_rendering = $6,\n native_decorations = $7,\n\n discord_rpc = $8,\n developer_mode = $9,\n telemetry = $10,\n personalized_ads = $11,\n\n onboarded = $12,\n\n extra_launch_args = jsonb($13),\n custom_env_vars = jsonb($14),\n mc_memory_max = $15,\n mc_force_fullscreen = $16,\n mc_game_resolution_x = $17,\n mc_game_resolution_y = $18,\n hide_on_process_start = $19,\n\n hook_pre_launch = $20,\n hook_wrapper = $21,\n hook_post_exit = $22,\n\n custom_dir = $23,\n prev_custom_dir = $24,\n migrated = $25,\n\n toggle_sidebar = $26,\n feature_flags = $27,\n hide_nametag_skins_page = $28,\n\n skipped_update = $29,\n pending_update_toast_for_version = $30,\n auto_download_updates = $31\n ",
+ "query": "\n UPDATE settings\n SET\n max_concurrent_writes = $1,\n max_concurrent_downloads = $2,\n\n theme = $3,\n default_page = $4,\n collapsed_navigation = $5,\n advanced_rendering = $6,\n native_decorations = $7,\n\n discord_rpc = $8,\n developer_mode = $9,\n telemetry = $10,\n personalized_ads = $11,\n\n onboarded = $12,\n\n extra_launch_args = jsonb($13),\n custom_env_vars = jsonb($14),\n mc_memory_max = $15,\n mc_force_fullscreen = $16,\n mc_game_resolution_x = $17,\n mc_game_resolution_y = $18,\n hide_on_process_start = $19,\n\n hook_pre_launch = $20,\n hook_wrapper = $21,\n hook_post_exit = $22,\n\n custom_dir = $23,\n prev_custom_dir = $24,\n migrated = $25,\n\n toggle_sidebar = $26,\n feature_flags = $27,\n hide_nametag_skins_page = $28,\n\n skipped_update = $29,\n pending_update_toast_for_version = $30,\n auto_download_updates = $31,\n\n version = $32\n ",
"describe": {
"columns": [],
"parameters": {
- "Right": 31
+ "Right": 32
},
"nullable": []
},
- "hash": "eb95fac3043d0ffd10caef69cc469474cc5c0d36cc0698c4cc0852da81fed158"
+ "hash": "a40e60da6dd1312d4a1ed52fa8fd2394e7ad21de1cb44cf8b93c4b1459cdc716"
}
diff --git a/packages/app-lib/Cargo.toml b/packages/app-lib/Cargo.toml
index 709ec415..d4343b91 100644
--- a/packages/app-lib/Cargo.toml
+++ b/packages/app-lib/Cargo.toml
@@ -73,6 +73,7 @@ serde_json = { workspace = true }
serde_with = { workspace = true }
sha1_smol = { workspace = true }
sha2 = { workspace = true }
+shlex = { workspace = true }
sqlx = { workspace = true, features = [
"json",
"macros",
diff --git a/packages/app-lib/java/build.gradle.kts b/packages/app-lib/java/build.gradle.kts
index f0d88f86..10435b98 100644
--- a/packages/app-lib/java/build.gradle.kts
+++ b/packages/app-lib/java/build.gradle.kts
@@ -1,18 +1,7 @@
-import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowCopyAction
-import com.github.jengelman.gradle.plugins.shadow.transformers.CacheableTransformer
-import com.github.jengelman.gradle.plugins.shadow.transformers.ResourceTransformer
-import com.github.jengelman.gradle.plugins.shadow.transformers.TransformerContext
-import org.apache.tools.zip.ZipEntry
-import org.apache.tools.zip.ZipOutputStream
-import java.io.IOException
-import java.util.jar.JarFile
-import java.util.jar.Attributes as JarAttributes
-import java.util.jar.Manifest as JarManifest
-
plugins {
java
- id("com.diffplug.spotless") version "7.0.4"
- id("com.gradleup.shadow") version "9.0.0-rc2"
+ id("com.diffplug.spotless") version "8.0.0"
+ id("com.gradleup.shadow") version "9.2.2"
}
repositories {
@@ -20,9 +9,9 @@ repositories {
}
dependencies {
- implementation("org.ow2.asm:asm:9.8")
- implementation("org.ow2.asm:asm-tree:9.8")
- implementation("com.google.code.gson:gson:2.13.1")
+ implementation("org.ow2.asm:asm:9.9")
+ implementation("org.ow2.asm:asm-tree:9.9")
+ implementation("com.google.code.gson:gson:2.13.2")
testImplementation(libs.junit.jupiter)
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
@@ -30,7 +19,7 @@ dependencies {
java {
toolchain {
- languageVersion = JavaLanguageVersion.of(11)
+ languageVersion = JavaLanguageVersion.of(17)
}
}
@@ -56,52 +45,9 @@ tasks.shadowJar {
attributes["Premain-Class"] = "com.modrinth.theseus.agent.TheseusAgent"
}
- enableRelocation = true
+ addMultiReleaseAttribute = false
+ enableAutoRelocation = true
relocationPrefix = "com.modrinth.theseus.shadow"
-
- // Adapted from ManifestResourceTransformer to do one thing: remove Multi-Release.
- // Multi-Release gets added by shadow because gson has Multi-Release set to true, however
- // shadow strips the actual versions directory, as gson only has a module-info.class in there.
- // However, older versions of SecureJarHandler crash if Multi-Release is set to true but the
- // versions directory is missing.
- transform(@CacheableTransformer object : ResourceTransformer {
- private var manifestDiscovered = false
- private var manifest: JarManifest? = null
-
- override fun canTransformResource(element: FileTreeElement): Boolean {
- return JarFile.MANIFEST_NAME.equals(element.path, ignoreCase = true)
- }
-
- override fun transform(context: TransformerContext) {
- if (!manifestDiscovered) {
- try {
- manifest = JarManifest(context.inputStream)
- manifestDiscovered = true
- } catch (e: IOException) {
- logger.warn("Failed to read MANIFEST.MF", e)
- }
- }
- }
-
- override fun hasTransformedResource(): Boolean = true
-
- override fun modifyOutputStream(
- os: ZipOutputStream,
- preserveFileTimestamps: Boolean
- ) {
- // If we didn't find a manifest, then let's create one.
- if (manifest == null) {
- manifest = JarManifest()
- }
-
- manifest!!.mainAttributes.remove(JarAttributes.Name.MULTI_RELEASE)
-
- os.putNextEntry(ZipEntry(JarFile.MANIFEST_NAME).apply {
- time = ShadowCopyAction.CONSTANT_TIME_FOR_ZIP_ENTRIES
- })
- manifest!!.write(os)
- }
- })
}
tasks.named("test") {
diff --git a/packages/app-lib/java/gradle/libs.versions.toml b/packages/app-lib/java/gradle/libs.versions.toml
index cd649555..dacbebcd 100644
--- a/packages/app-lib/java/gradle/libs.versions.toml
+++ b/packages/app-lib/java/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
[versions]
-junit-jupiter = "5.12.1"
+junit-jupiter = "5.14.0"
[libraries]
junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit-jupiter" }
diff --git a/packages/app-lib/java/gradle/wrapper/gradle-wrapper.properties b/packages/app-lib/java/gradle/wrapper/gradle-wrapper.properties
index ff23a68d..2e111328 100644
--- a/packages/app-lib/java/gradle/wrapper/gradle-wrapper.properties
+++ b/packages/app-lib/java/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
diff --git a/packages/app-lib/java/settings.gradle.kts b/packages/app-lib/java/settings.gradle.kts
index 01d2944d..2a0aaa65 100644
--- a/packages/app-lib/java/settings.gradle.kts
+++ b/packages/app-lib/java/settings.gradle.kts
@@ -1,6 +1,6 @@
plugins {
// Apply the foojay-resolver plugin to allow automatic download of JDKs
- id("org.gradle.toolchains.foojay-resolver-convention") version "0.10.0"
+ id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
}
rootProject.name = "theseus"
diff --git a/packages/app-lib/migrations/20251002173041_settings-version.sql b/packages/app-lib/migrations/20251002173041_settings-version.sql
new file mode 100644
index 00000000..285b2af6
--- /dev/null
+++ b/packages/app-lib/migrations/20251002173041_settings-version.sql
@@ -0,0 +1 @@
+ALTER TABLE settings ADD COLUMN version INTEGER NOT NULL DEFAULT 1;
\ No newline at end of file
diff --git a/packages/app-lib/src/api/minecraft_skins/png_util.rs b/packages/app-lib/src/api/minecraft_skins/png_util.rs
index 36c74cee..e4ae3dcb 100644
--- a/packages/app-lib/src/api/minecraft_skins/png_util.rs
+++ b/packages/app-lib/src/api/minecraft_skins/png_util.rs
@@ -1,6 +1,6 @@
//! Miscellaneous PNG utilities for Minecraft skins.
-use std::io::Read;
+use std::io::{BufRead, Cursor, Seek};
use std::sync::Arc;
use base64::Engine;
@@ -9,7 +9,8 @@ use data_url::DataUrl;
use futures::{Stream, TryStreamExt, future::Either, stream};
use itertools::Itertools;
use rgb::Rgba;
-use tokio_util::{compat::FuturesAsyncReadCompatExt, io::SyncIoBridge};
+use tokio::io::AsyncReadExt;
+use tokio_util::compat::FuturesAsyncReadCompatExt;
use url::Url;
use crate::{
@@ -95,7 +96,8 @@ pub fn dimensions(png_data: &[u8]) -> crate::Result<(u32, u32)> {
pub async fn normalize_skin_texture(
texture: &UrlOrBlob,
) -> crate::Result {
- let texture_stream = SyncIoBridge::new(Box::pin(
+ let mut texture_data = Vec::with_capacity(8192);
+ Box::pin(
match texture {
UrlOrBlob::Url(url) => Either::Left(
url_to_data_stream(url)
@@ -112,84 +114,84 @@ pub async fn normalize_skin_texture(
),
}
.compat(),
- ));
+ )
+ .read_to_end(&mut texture_data)
+ .await?;
- tokio::task::spawn_blocking(|| {
- let mut png_reader = {
- let mut decoder = png::Decoder::new(texture_stream);
- decoder.set_transformations(
- png::Transformations::normalize_to_color8(),
- );
- decoder.read_info()
- }?;
+ let mut png_reader = {
+ let mut decoder = png::Decoder::new(Cursor::new(texture_data));
+ decoder
+ .set_transformations(png::Transformations::normalize_to_color8());
+ decoder.read_info()
+ }?;
- // The code below assumes that the skin texture has valid dimensions.
- // This also serves as a way to bail out early for obviously invalid or
- // adversarial textures
- if png_reader.info().width != 64
- || ![64, 32].contains(&png_reader.info().height)
- {
- Err(ErrorKind::InvalidSkinTexture)?;
- }
+ // The code below assumes that the skin texture has valid dimensions.
+ // This also serves as a way to bail out early for obviously invalid or
+ // adversarial textures
+ if png_reader.info().width != 64
+ || ![64, 32].contains(&png_reader.info().height)
+ {
+ Err(ErrorKind::InvalidSkinTexture)?;
+ }
- let is_legacy_skin = png_reader.info().height == 32;
- let mut texture_buf =
- get_skin_texture_buffer(&mut png_reader, is_legacy_skin)?;
- if is_legacy_skin {
- convert_legacy_skin_texture(&mut texture_buf, png_reader.info());
- do_notch_transparency_hack(&mut texture_buf, png_reader.info());
- }
- make_inner_parts_opaque(&mut texture_buf, png_reader.info());
+ let is_legacy_skin = png_reader.info().height == 32;
+ let mut texture_buf =
+ get_skin_texture_buffer(&mut png_reader, is_legacy_skin)?;
+ if is_legacy_skin {
+ convert_legacy_skin_texture(&mut texture_buf, png_reader.info());
+ do_notch_transparency_hack(&mut texture_buf, png_reader.info());
+ }
+ make_inner_parts_opaque(&mut texture_buf, png_reader.info());
- let mut encoded_png = vec![];
+ let mut encoded_png = vec![];
- let mut png_encoder = png::Encoder::new(&mut encoded_png, 64, 64);
- png_encoder.set_color(png::ColorType::Rgba);
- png_encoder.set_depth(png::BitDepth::Eight);
- png_encoder.set_filter(png::FilterType::NoFilter);
- png_encoder.set_compression(png::Compression::Fast);
+ let mut png_encoder = png::Encoder::new(&mut encoded_png, 64, 64);
+ png_encoder.set_color(png::ColorType::Rgba);
+ png_encoder.set_depth(png::BitDepth::Eight);
+ png_encoder.set_filter(png::Filter::NoFilter);
+ png_encoder.set_compression(png::Compression::Fast);
- // Keeping color space information properly set, to handle the occasional
- // strange PNG with non-sRGB chromaticities and/or different grayscale spaces
- // that keeps most people wondering, is what sets a carefully crafted image
- // manipulation routine apart :)
- if let Some(source_chromaticities) =
- png_reader.info().source_chromaticities.as_ref().copied()
- {
- png_encoder.set_source_chromaticities(source_chromaticities);
- }
- if let Some(source_gamma) =
- png_reader.info().source_gamma.as_ref().copied()
- {
- png_encoder.set_source_gamma(source_gamma);
- }
- if let Some(source_srgb) = png_reader.info().srgb.as_ref().copied() {
- png_encoder.set_source_srgb(source_srgb);
- }
+ // Keeping color space information properly set, to handle the occasional
+ // strange PNG with non-sRGB chromaticities and/or different grayscale spaces
+ // that keeps most people wondering, is what sets a carefully crafted image
+ // manipulation routine apart :)
+ if let Some(source_chromaticities) =
+ png_reader.info().source_chromaticities.as_ref().copied()
+ {
+ png_encoder.set_source_chromaticities(source_chromaticities);
+ }
+ if let Some(source_gamma) = png_reader.info().source_gamma.as_ref().copied()
+ {
+ png_encoder.set_source_gamma(source_gamma);
+ }
+ if let Some(source_srgb) = png_reader.info().srgb.as_ref().copied() {
+ png_encoder.set_source_srgb(source_srgb);
+ }
- let png_buf = bytemuck::try_cast_slice(&texture_buf)
- .map_err(|_| ErrorKind::InvalidPng)?;
- let mut png_writer = png_encoder.write_header()?;
- png_writer.write_image_data(png_buf)?;
- png_writer.finish()?;
+ let png_buf = bytemuck::try_cast_slice(&texture_buf)
+ .map_err(|_| ErrorKind::InvalidPng)?;
+ let mut png_writer = png_encoder.write_header()?;
+ png_writer.write_image_data(png_buf)?;
+ png_writer.finish()?;
- Ok(encoded_png.into())
- })
- .await?
+ Ok(encoded_png.into())
}
/// Reads a skin texture and returns a 64x64 buffer in RGBA format.
-fn get_skin_texture_buffer(
+fn get_skin_texture_buffer(
png_reader: &mut png::Reader,
is_legacy_skin: bool,
) -> crate::Result>> {
+ let output_buffer_size = png_reader
+ .output_buffer_size()
+ .expect("Reasonable skin texture size verified already");
let mut png_buf = if is_legacy_skin {
// Legacy skins have half the height, so duplicate the rows to
// turn them into a 64x64 texture
- vec![0; png_reader.output_buffer_size() * 2]
+ vec![0; output_buffer_size * 2]
} else {
// Modern skins are left as-is
- vec![0; png_reader.output_buffer_size()]
+ vec![0; output_buffer_size]
};
png_reader.next_frame(&mut png_buf)?;
@@ -373,9 +375,10 @@ fn set_alpha(
#[tokio::test]
async fn normalize_skin_texture_works() {
let decode_to_pixels = |png_data: &[u8]| {
- let decoder = png::Decoder::new(png_data);
+ let decoder = png::Decoder::new(Cursor::new(png_data));
let mut reader = decoder.read_info().expect("Failed to read PNG info");
- let mut buffer = vec![0; reader.output_buffer_size()];
+ let mut buffer =
+ vec![0; reader.output_buffer_size().expect("Skin size too large")];
reader
.next_frame(&mut buffer)
.expect("Failed to decode PNG");
diff --git a/packages/app-lib/src/api/pack/install_mrpack.rs b/packages/app-lib/src/api/pack/install_mrpack.rs
index 91cc65e0..0fdead31 100644
--- a/packages/app-lib/src/api/pack/install_mrpack.rs
+++ b/packages/app-lib/src/api/pack/install_mrpack.rs
@@ -12,6 +12,8 @@ use crate::util::fetch::{fetch_mirrors, write};
use crate::util::io;
use crate::{State, profile};
use async_zip::base::read::seek::ZipFileReader;
+use futures::StreamExt;
+use path_util::SafeRelativeUtf8UnixPathBuf;
use super::install_from::{
CreatePack, CreatePackLocation, PackFormat, generate_pack_from_file,
@@ -19,7 +21,6 @@ use super::install_from::{
};
use crate::data::ProjectType;
use std::io::{Cursor, ErrorKind};
-use std::path::PathBuf;
/// Install a pack
/// Wrapper around install_pack_files that generates a pack creation description, and
@@ -93,197 +94,194 @@ pub async fn install_zipped_mrpack_files(
})?;
// Extract index of modrinth.index.json
- let zip_index_option = zip_reader.file().entries().iter().position(|f| {
- f.filename().as_str().unwrap_or_default() == "modrinth.index.json"
- });
- if let Some(zip_index) = zip_index_option {
- let mut manifest = String::new();
- let mut reader = zip_reader.reader_with_entry(zip_index).await?;
- reader.read_to_string_checked(&mut manifest).await?;
-
- let pack: PackFormat = serde_json::from_str(&manifest)?;
-
- if &*pack.game != "minecraft" {
- return Err(crate::ErrorKind::InputError(
- "Pack does not support Minecraft".to_string(),
- )
- .into());
- }
-
- // Sets generated profile attributes to the pack ones (using profile::edit)
- set_profile_information(
- profile_path.clone(),
- &description,
- &pack.name,
- &pack.dependencies,
- ignore_lock,
- )
- .await?;
-
- let profile_path = profile_path.clone();
- let loading_bar = init_or_edit_loading(
- existing_loading_bar,
- LoadingBarType::PackDownload {
- profile_path: profile_path.clone(),
- pack_name: pack.name.clone(),
- icon,
- pack_id: project_id,
- pack_version: version_id,
- },
- 100.0,
- "Downloading modpack",
- )
- .await?;
-
- let num_files = pack.files.len();
- use futures::StreamExt;
- loading_try_for_each_concurrent(
- futures::stream::iter(pack.files.into_iter())
- .map(Ok::),
- None,
- Some(&loading_bar),
- 70.0,
- num_files,
- None,
- |project| {
- let profile_path = profile_path.clone();
- async move {
- //TODO: Future update: prompt user for optional files in a modpack
- if let Some(env) = project.env
- && env
- .get(&EnvType::Client)
- .is_some_and(|x| x == &SideType::Unsupported)
- {
- return Ok(());
- }
-
- let file = fetch_mirrors(
- &project
- .downloads
- .iter()
- .map(|x| &**x)
- .collect::>(),
- project.hashes.get(&PackFileHash::Sha1).map(|x| &**x),
- &state.fetch_semaphore,
- &state.pool,
- )
- .await?;
-
- let path = profile::get_full_path(&profile_path)
- .await?
- .join(project.path.as_str());
-
- cache_file_hash(
- file.clone(),
- &profile_path,
- project.path.as_str(),
- project.hashes.get(&PackFileHash::Sha1).map(|x| &**x),
- ProjectType::get_from_parent_folder(&path),
- &state.pool,
- )
- .await?;
-
- write(&path, &file, &state.io_semaphore).await?;
-
- Ok(())
- }
- },
- )
- .await?;
-
- emit_loading(&loading_bar, 0.0, Some("Extracting overrides"))?;
-
- let mut total_len = 0;
-
- for index in 0..zip_reader.file().entries().len() {
- let file = zip_reader.file().entries().get(index).unwrap();
- let filename = file.filename().as_str().unwrap_or_default();
-
- if (filename.starts_with("overrides")
- || filename.starts_with("client-overrides"))
- && !filename.ends_with('/')
- {
- total_len += 1;
- }
- }
-
- for index in 0..zip_reader.file().entries().len() {
- let file = zip_reader.file().entries().get(index).unwrap();
-
- let filename = file.filename().as_str().unwrap_or_default();
-
- let file_path = PathBuf::from(filename);
- if (filename.starts_with("overrides")
- || filename.starts_with("client-overrides"))
- && !filename.ends_with('/')
- {
- // Reads the file into the 'content' variable
- let mut content = Vec::new();
- let mut reader = zip_reader.reader_with_entry(index).await?;
- reader.read_to_end_checked(&mut content).await?;
-
- let mut new_path = PathBuf::new();
- let components = file_path.components().skip(1);
-
- for component in components {
- new_path.push(component);
- }
-
- if new_path.file_name().is_some() {
- let bytes = bytes::Bytes::from(content);
-
- cache_file_hash(
- bytes.clone(),
- &profile_path,
- &new_path.to_string_lossy(),
- None,
- ProjectType::get_from_parent_folder(&new_path),
- &state.pool,
- )
- .await?;
-
- write(
- &profile::get_full_path(&profile_path)
- .await?
- .join(new_path),
- &bytes,
- &state.io_semaphore,
- )
- .await?;
- }
-
- emit_loading(
- &loading_bar,
- 30.0 / total_len as f64,
- Some(&format!("Extracting override {index}/{total_len}")),
- )?;
- }
- }
-
- // If the icon doesn't exist, we expect icon.png to be a potential icon.
- // If it doesn't exist, and an override to icon.png exists, cache and use that
- let potential_icon = profile::get_full_path(&profile_path)
- .await?
- .join("icon.png");
- if !icon_exists && potential_icon.exists() {
- profile::edit_icon(&profile_path, Some(&potential_icon)).await?;
- }
-
- if let Some(profile_val) = profile::get(&profile_path).await? {
- crate::launcher::install_minecraft(
- &profile_val,
- Some(loading_bar),
- false,
- )
- .await?;
- }
-
- Ok::(profile_path.clone())
- } else {
- Err(crate::Error::from(crate::ErrorKind::InputError(
+ let Some(manifest_idx) = zip_reader.file().entries().iter().position(|f| {
+ matches!(f.filename().as_str(), Ok("modrinth.index.json"))
+ }) else {
+ return Err(crate::Error::from(crate::ErrorKind::InputError(
"No pack manifest found in mrpack".to_string(),
- )))
+ )));
+ };
+
+ let mut manifest = String::new();
+ let mut reader = zip_reader.reader_with_entry(manifest_idx).await?;
+ reader.read_to_string_checked(&mut manifest).await?;
+
+ let pack: PackFormat = serde_json::from_str(&manifest)?;
+
+ if &*pack.game != "minecraft" {
+ return Err(crate::ErrorKind::InputError(
+ "Pack does not support Minecraft".to_string(),
+ )
+ .into());
}
+
+ // Sets generated profile attributes to the pack ones (using profile::edit)
+ set_profile_information(
+ profile_path.clone(),
+ &description,
+ &pack.name,
+ &pack.dependencies,
+ ignore_lock,
+ )
+ .await?;
+
+ let profile_path = profile_path.clone();
+ let loading_bar = init_or_edit_loading(
+ existing_loading_bar,
+ LoadingBarType::PackDownload {
+ profile_path: profile_path.clone(),
+ pack_name: pack.name.clone(),
+ icon,
+ pack_id: project_id,
+ pack_version: version_id,
+ },
+ 100.0,
+ "Downloading modpack",
+ )
+ .await?;
+
+ let num_files = pack.files.len();
+ loading_try_for_each_concurrent(
+ futures::stream::iter(pack.files.into_iter())
+ .map(Ok::),
+ None,
+ Some(&loading_bar),
+ 70.0,
+ num_files,
+ None,
+ |project| {
+ let profile_path = profile_path.clone();
+ async move {
+ //TODO: Future update: prompt user for optional files in a modpack
+ if let Some(env) = project.env
+ && env
+ .get(&EnvType::Client)
+ .is_some_and(|x| x == &SideType::Unsupported)
+ {
+ return Ok(());
+ }
+
+ let file = fetch_mirrors(
+ &project
+ .downloads
+ .iter()
+ .map(|x| &**x)
+ .collect::>(),
+ project.hashes.get(&PackFileHash::Sha1).map(|x| &**x),
+ &state.fetch_semaphore,
+ &state.pool,
+ )
+ .await?;
+
+ let path = profile::get_full_path(&profile_path)
+ .await?
+ .join(project.path.as_str());
+
+ cache_file_hash(
+ file.clone(),
+ &profile_path,
+ project.path.as_str(),
+ project.hashes.get(&PackFileHash::Sha1).map(|x| &**x),
+ ProjectType::get_from_parent_folder(&path),
+ &state.pool,
+ )
+ .await?;
+
+ write(&path, &file, &state.io_semaphore).await?;
+
+ Ok(())
+ }
+ },
+ )
+ .await?;
+
+ emit_loading(&loading_bar, 0.0, Some("Extracting overrides"))?;
+
+ let override_file_entries = zip_reader
+ .file()
+ .entries()
+ .iter()
+ .enumerate()
+ .filter_map(|(index, file)| {
+ let filename = file.filename().as_str().unwrap_or_default();
+ ((filename.starts_with("overrides/")
+ || filename.starts_with("client-overrides/"))
+ && !filename.ends_with('/'))
+ .then(|| (index, file.clone()))
+ })
+ .collect::>();
+ let override_file_entries_count = override_file_entries.len();
+
+ for (i, (index, file)) in override_file_entries.into_iter().enumerate() {
+ let relative_override_file_path =
+ SafeRelativeUtf8UnixPathBuf::try_from(
+ file.filename().as_str().unwrap().to_string(),
+ )?;
+ let relative_override_file_path = relative_override_file_path
+ .strip_prefix("overrides")
+ .or_else(|_| relative_override_file_path.strip_prefix("client-overrides"))
+ .map_err(|_| {
+ crate::Error::from(crate::ErrorKind::OtherError(
+ format!("Failed to strip override prefix from override file path: {relative_override_file_path}")
+ ))
+ })?;
+
+ let mut file_bytes = vec![];
+ let mut reader = zip_reader.reader_with_entry(index).await?;
+ reader.read_to_end_checked(&mut file_bytes).await?;
+
+ let file_bytes = bytes::Bytes::from(file_bytes);
+
+ cache_file_hash(
+ file_bytes.clone(),
+ &profile_path,
+ relative_override_file_path.as_str(),
+ None,
+ ProjectType::get_from_parent_folder(
+ relative_override_file_path.as_str(),
+ ),
+ &state.pool,
+ )
+ .await?;
+
+ write(
+ &profile::get_full_path(&profile_path)
+ .await?
+ .join(relative_override_file_path.as_str()),
+ &file_bytes,
+ &state.io_semaphore,
+ )
+ .await?;
+
+ emit_loading(
+ &loading_bar,
+ 30.0 / override_file_entries_count as f64,
+ Some(&format!(
+ "Extracting override {}/{override_file_entries_count}",
+ i + 1
+ )),
+ )?;
+ }
+
+ // If the icon doesn't exist, we expect icon.png to be a potential icon.
+ // If it doesn't exist, and an override to icon.png exists, cache and use that
+ let potential_icon = profile::get_full_path(&profile_path)
+ .await?
+ .join("icon.png");
+ if !icon_exists && potential_icon.exists() {
+ profile::edit_icon(&profile_path, Some(&potential_icon)).await?;
+ }
+
+ if let Some(profile_val) = profile::get(&profile_path).await? {
+ crate::launcher::install_minecraft(
+ &profile_val,
+ Some(loading_bar),
+ false,
+ )
+ .await?;
+ }
+
+ Ok::(profile_path.clone())
}
#[tracing::instrument(skip(mrpack_file))]
@@ -303,127 +301,130 @@ pub async fn remove_all_related_files(
})?;
// Extract index of modrinth.index.json
- let zip_index_option = zip_reader.file().entries().iter().position(|f| {
- f.filename().as_str().unwrap_or_default() == "modrinth.index.json"
- });
- if let Some(zip_index) = zip_index_option {
- let mut manifest = String::new();
+ let Some(manifest_idx) = zip_reader.file().entries().iter().position(|f| {
+ matches!(f.filename().as_str(), Ok("modrinth.index.json"))
+ }) else {
+ return Err(crate::Error::from(crate::ErrorKind::InputError(
+ "No pack manifest found in mrpack".to_string(),
+ )));
+ };
- let mut reader = zip_reader.reader_with_entry(zip_index).await?;
- reader.read_to_string_checked(&mut manifest).await?;
+ let mut manifest = String::new();
- let pack: PackFormat = serde_json::from_str(&manifest)?;
+ let mut reader = zip_reader.reader_with_entry(manifest_idx).await?;
+ reader.read_to_string_checked(&mut manifest).await?;
- if &*pack.game != "minecraft" {
- return Err(crate::ErrorKind::InputError(
- "Pack does not support Minecraft".to_string(),
- )
- .into());
- }
+ let pack: PackFormat = serde_json::from_str(&manifest)?;
- // Set install stage to installing, and do not change it back (as files are being removed and are not being reinstalled here)
- crate::api::profile::edit(&profile_path, |prof| {
- prof.install_stage = ProfileInstallStage::PackInstalling;
- async { Ok(()) }
- })
- .await?;
+ if &*pack.game != "minecraft" {
+ return Err(crate::ErrorKind::InputError(
+ "Pack does not support Minecraft".to_string(),
+ )
+ .into());
+ }
- // First, remove all modrinth projects by their version hashes
- // Remove all modrinth projects by their version hashes
- // We need to do a fetch to get the project ids from Modrinth
- let state = State::get().await?;
- let all_hashes = pack
- .files
- .iter()
- .filter_map(|f| Some(f.hashes.get(&PackFileHash::Sha1)?.clone()))
- .collect::>();
+ // Set install stage to installing, and do not change it back (as files are being removed and are not being reinstalled here)
+ crate::api::profile::edit(&profile_path, |prof| {
+ prof.install_stage = ProfileInstallStage::PackInstalling;
+ async { Ok(()) }
+ })
+ .await?;
- // First, get project info by hash
- let file_infos = CachedEntry::get_file_many(
- &all_hashes.iter().map(|x| &**x).collect::>(),
- None,
+ // First, remove all modrinth projects by their version hashes
+ // Remove all modrinth projects by their version hashes
+ // We need to do a fetch to get the project ids from Modrinth
+ let state = State::get().await?;
+ let all_hashes = pack
+ .files
+ .iter()
+ .filter_map(|f| Some(f.hashes.get(&PackFileHash::Sha1)?.clone()))
+ .collect::>();
+
+ // First, get project info by hash
+ let file_infos = CachedEntry::get_file_many(
+ &all_hashes.iter().map(|x| &**x).collect::>(),
+ None,
+ &state.pool,
+ &state.api_semaphore,
+ )
+ .await?;
+
+ let to_remove = file_infos
+ .into_iter()
+ .map(|p| p.project_id)
+ .collect::>();
+
+ let profile = profile::get(&profile_path).await?.ok_or_else(|| {
+ crate::ErrorKind::UnmanagedProfileError(profile_path.to_string())
+ })?;
+ let profile_full_path = profile::get_full_path(&profile_path).await?;
+
+ for (file_path, project) in profile
+ .get_projects(
+ Some(CacheBehaviour::MustRevalidate),
&state.pool,
&state.api_semaphore,
)
- .await?;
-
- let to_remove = file_infos
- .into_iter()
- .map(|p| p.project_id)
- .collect::>();
-
- let profile = profile::get(&profile_path).await?.ok_or_else(|| {
- crate::ErrorKind::UnmanagedProfileError(profile_path.to_string())
- })?;
- let profile_full_path = profile::get_full_path(&profile_path).await?;
-
- for (file_path, project) in profile
- .get_projects(
- Some(CacheBehaviour::MustRevalidate),
- &state.pool,
- &state.api_semaphore,
- )
- .await?
+ .await?
+ {
+ if let Some(metadata) = &project.metadata
+ && to_remove.contains(&metadata.project_id)
{
- if let Some(metadata) = &project.metadata
- && to_remove.contains(&metadata.project_id)
- {
- match io::remove_file(profile_full_path.join(file_path)).await {
- Ok(_) => (),
- Err(err) if err.kind() == ErrorKind::NotFound => (),
- Err(err) => return Err(err.into()),
- }
- }
- }
-
- // Iterate over all Modrinth project file paths in the json, and remove them
- // (There should be few, but this removes any files the .mrpack intended as Modrinth projects but were unrecognized)
- for file in pack.files {
- match io::remove_file(profile_full_path.join(file.path.as_str()))
- .await
- {
+ match io::remove_file(profile_full_path.join(file_path)).await {
Ok(_) => (),
Err(err) if err.kind() == ErrorKind::NotFound => (),
Err(err) => return Err(err.into()),
}
}
-
- // Iterate over each 'overrides' file and remove it
- for index in 0..zip_reader.file().entries().len() {
- let file = zip_reader.file().entries().get(index).unwrap();
-
- let filename = file.filename().as_str().unwrap_or_default();
-
- let file_path = PathBuf::from(filename);
- if (filename.starts_with("overrides")
- || filename.starts_with("client-overrides"))
- && !filename.ends_with('/')
- {
- let mut new_path = PathBuf::new();
- let components = file_path.components().skip(1);
-
- for component in components {
- new_path.push(component);
- }
-
- // Remove this file if a corresponding one exists in the filesystem
- match io::remove_file(
- profile::get_full_path(&profile_path)
- .await?
- .join(&new_path),
- )
- .await
- {
- Ok(_) => (),
- Err(err) if err.kind() == ErrorKind::NotFound => (),
- Err(err) => return Err(err.into()),
- }
- }
- }
- Ok(())
- } else {
- Err(crate::Error::from(crate::ErrorKind::InputError(
- "No pack manifest found in mrpack".to_string(),
- )))
}
+
+ // Iterate over all Modrinth project file paths in the json, and remove them
+ // (There should be few, but this removes any files the .mrpack intended as Modrinth projects but were unrecognized)
+ for file in pack.files {
+ match io::remove_file(profile_full_path.join(file.path.as_str())).await
+ {
+ Ok(_) => (),
+ Err(err) if err.kind() == ErrorKind::NotFound => (),
+ Err(err) => return Err(err.into()),
+ }
+ }
+
+ // Iterate over each 'overrides' file and remove it
+ let override_file_entries =
+ zip_reader.file().entries().iter().filter(|file| {
+ let filename = file.filename().as_str().unwrap_or_default();
+ (filename.starts_with("overrides/")
+ || filename.starts_with("client-overrides/"))
+ && !filename.ends_with('/')
+ });
+
+ for file in override_file_entries {
+ let relative_override_file_path =
+ SafeRelativeUtf8UnixPathBuf::try_from(
+ file.filename().as_str().unwrap().to_string(),
+ )?;
+ let relative_override_file_path = relative_override_file_path
+ .strip_prefix("overrides")
+ .or_else(|_| relative_override_file_path.strip_prefix("client-overrides"))
+ .map_err(|_| {
+ crate::Error::from(crate::ErrorKind::OtherError(
+ format!("Failed to strip override prefix from override file path: {relative_override_file_path}")
+ ))
+ })?;
+
+ // Remove this file if a corresponding one exists in the filesystem
+ match io::remove_file(
+ profile::get_full_path(&profile_path)
+ .await?
+ .join(relative_override_file_path.as_str()),
+ )
+ .await
+ {
+ Ok(_) => (),
+ Err(err) if err.kind() == ErrorKind::NotFound => (),
+ Err(err) => return Err(err.into()),
+ }
+ }
+
+ Ok(())
}
diff --git a/packages/app-lib/src/api/profile/mod.rs b/packages/app-lib/src/api/profile/mod.rs
index 865eace3..514ed88b 100644
--- a/packages/app-lib/src/api/profile/mod.rs
+++ b/packages/app-lib/src/api/profile/mod.rs
@@ -666,7 +666,14 @@ async fn run_credentials(
.filter(|hook_command| !hook_command.is_empty());
if let Some(hook) = pre_launch_hooks {
// TODO: hook parameters
- let mut cmd = hook.split(' ');
+ let mut cmd = shlex::split(hook)
+ .ok_or_else(|| {
+ crate::ErrorKind::LauncherError(format!(
+ "Invalid pre-launch command: {hook}",
+ ))
+ })?
+ .into_iter();
+
if let Some(command) = cmd.next() {
let full_path = get_full_path(&profile.path).await?;
let result = Command::new(command)
diff --git a/packages/app-lib/src/error.rs b/packages/app-lib/src/error.rs
index ad4c65ed..6712b85c 100644
--- a/packages/app-lib/src/error.rs
+++ b/packages/app-lib/src/error.rs
@@ -210,6 +210,9 @@ pub enum ErrorKind {
#[error("Deserialization error: {0}")]
DeserializationError(#[from] serde::de::value::Error),
+
+ #[error("Discord IPC error: {0}")]
+ DiscordRichPresenceError(#[from] discord_rich_presence::error::Error),
}
#[derive(Debug)]
diff --git a/packages/app-lib/src/launcher/mod.rs b/packages/app-lib/src/launcher/mod.rs
index 39bd2737..a7930733 100644
--- a/packages/app-lib/src/launcher/mod.rs
+++ b/packages/app-lib/src/launcher/mod.rs
@@ -570,7 +570,19 @@ pub async fn launch_minecraft(
let args = version_info.arguments.clone().unwrap_or_default();
let mut command = match wrapper {
Some(hook) => {
- let mut command = Command::new(hook);
+ let mut cmd = shlex::split(hook)
+ .ok_or_else(|| {
+ crate::ErrorKind::LauncherError(format!(
+ "Invalid wrapper command: {hook}",
+ ))
+ })?
+ .into_iter();
+ let mut command = Command::new(cmd.next().ok_or(
+ crate::ErrorKind::LauncherError(
+ "Empty wrapper command".to_owned(),
+ ),
+ )?);
+ command.args(cmd);
command.arg(&java_version.path);
command
}
diff --git a/packages/app-lib/src/state/discord.rs b/packages/app-lib/src/state/discord.rs
index b6135b66..0c87d1e5 100644
--- a/packages/app-lib/src/state/discord.rs
+++ b/packages/app-lib/src/state/discord.rs
@@ -40,12 +40,7 @@ impl DiscordGuard {
/// Initialize discord IPC client, and attempt to connect to it
/// If it fails, it will still return a DiscordGuard, but the client will be unconnected
pub fn init() -> crate::Result {
- let dipc =
- DiscordIpcClient::new("1190718475832918136").map_err(|e| {
- crate::ErrorKind::OtherError(format!(
- "Could not create Discord client {e}",
- ))
- })?;
+ let dipc = DiscordIpcClient::new("1190718475832918136");
Ok(DiscordGuard {
client: Arc::new(RwLock::new(dipc)),
@@ -130,25 +125,14 @@ impl DiscordGuard {
let mut client: tokio::sync::RwLockWriteGuard<'_, DiscordIpcClient> =
self.client.write().await;
let res = client.set_activity(activity.clone());
- let could_not_set_err = |e: Box| {
- crate::ErrorKind::OtherError(format!(
- "Could not update Discord activity {e}",
- ))
- };
if reconnect_if_fail {
if let Err(_e) = res {
- client.reconnect().map_err(|e| {
- crate::ErrorKind::OtherError(format!(
- "Could not reconnect to Discord IPC {e}",
- ))
- })?;
- return Ok(client
- .set_activity(activity)
- .map_err(could_not_set_err)?); // try again, but don't reconnect if it fails again
+ client.reconnect()?;
+ return Ok(client.set_activity(activity)?); // try again, but don't reconnect if it fails again
}
} else {
- res.map_err(could_not_set_err)?;
+ res?;
}
Ok(())
@@ -169,25 +153,13 @@ impl DiscordGuard {
let mut client = self.client.write().await;
let res = client.clear_activity();
- let could_not_clear_err = |e: Box| {
- crate::ErrorKind::OtherError(format!(
- "Could not clear Discord activity {e}",
- ))
- };
-
if reconnect_if_fail {
if res.is_err() {
- client.reconnect().map_err(|e| {
- crate::ErrorKind::OtherError(format!(
- "Could not reconnect to Discord IPC {e}",
- ))
- })?;
- return Ok(client
- .clear_activity()
- .map_err(could_not_clear_err)?); // try again, but don't reconnect if it fails again
+ client.reconnect()?;
+ return Ok(client.clear_activity()?); // try again, but don't reconnect if it fails again
}
} else {
- res.map_err(could_not_clear_err)?;
+ res?;
}
Ok(())
}
diff --git a/packages/app-lib/src/state/friends.rs b/packages/app-lib/src/state/friends.rs
index b697cd04..ad28ffeb 100644
--- a/packages/app-lib/src/state/friends.rs
+++ b/packages/app-lib/src/state/friends.rs
@@ -272,7 +272,7 @@ impl FriendsSocket {
pub async fn disconnect(&self) -> crate::Result<()> {
let mut write_lock = self.write.write().await;
if let Some(ref mut write_half) = *write_lock {
- write_half.close().await?;
+ SinkExt::close(write_half).await?;
*write_lock = None;
}
Ok(())
diff --git a/packages/app-lib/src/state/mod.rs b/packages/app-lib/src/state/mod.rs
index ab7a5e3e..7666218c 100644
--- a/packages/app-lib/src/state/mod.rs
+++ b/packages/app-lib/src/state/mod.rs
@@ -89,6 +89,7 @@ impl State {
let res = tokio::try_join!(
state.discord_rpc.clear_to_default(true),
Profile::refresh_all(),
+ Settings::migrate(&state.pool),
ModrinthCredentials::refresh_all(),
);
diff --git a/packages/app-lib/src/state/process.rs b/packages/app-lib/src/state/process.rs
index 4cff0a33..bfcb70cf 100644
--- a/packages/app-lib/src/state/process.rs
+++ b/packages/app-lib/src/state/process.rs
@@ -516,7 +516,7 @@ impl Process {
chrono::DateTime::::from_timestamp(secs, nsecs)
.unwrap_or_default()
} else {
- chrono::DateTime::::from_timestamp(timestamp_val, 0)
+ chrono::DateTime::::from_timestamp_secs(timestamp_val)
.unwrap_or_default()
};
@@ -743,7 +743,14 @@ impl Process {
// We do not wait on the post exist command to finish running! We let it spawn + run on its own.
// This behaviour may be changed in the future
if let Some(hook) = post_exit_command {
- let mut cmd = hook.split(' ');
+ let mut cmd = shlex::split(&hook)
+ .ok_or_else(|| {
+ crate::ErrorKind::LauncherError(format!(
+ "Invalid post-exit command: {hook}",
+ ))
+ })?
+ .into_iter();
+
if let Some(command) = cmd.next() {
let mut command = Command::new(command);
command.args(cmd).current_dir(
diff --git a/packages/app-lib/src/state/profiles.rs b/packages/app-lib/src/state/profiles.rs
index f11eeb48..84d4e772 100644
--- a/packages/app-lib/src/state/profiles.rs
+++ b/packages/app-lib/src/state/profiles.rs
@@ -103,10 +103,11 @@ impl ProfileInstallStage {
pub enum LauncherFeatureVersion {
None,
MigratedServerLastPlayTime,
+ MigratedLaunchHooks,
}
impl LauncherFeatureVersion {
- pub const MOST_RECENT: Self = Self::MigratedServerLastPlayTime;
+ pub const MOST_RECENT: Self = Self::MigratedLaunchHooks;
pub fn as_str(&self) -> &'static str {
match *self {
@@ -114,6 +115,7 @@ impl LauncherFeatureVersion {
Self::MigratedServerLastPlayTime => {
"migrated_server_last_play_time"
}
+ Self::MigratedLaunchHooks => "migrated_launch_hooks",
}
}
@@ -123,6 +125,7 @@ impl LauncherFeatureVersion {
"migrated_server_last_play_time" => {
Self::MigratedServerLastPlayTime
}
+ "migrated_launch_hooks" => Self::MigratedLaunchHooks,
_ => Self::None,
}
}
@@ -225,10 +228,14 @@ impl ProjectType {
}
}
- pub fn get_from_parent_folder(path: &Path) -> Option {
- // Get parent folder
- let path = path.parent()?.file_name()?;
- match path.to_str()? {
+ pub fn get_from_parent_folder(path: impl AsRef) -> Option {
+ match path
+ .as_ref()
+ .parent()?
+ .file_name()?
+ .to_str()
+ .unwrap_or_default()
+ {
"mods" => Some(ProjectType::Mod),
"datapacks" => Some(ProjectType::DataPack),
"resourcepacks" => Some(ProjectType::ResourcePack),
@@ -781,6 +788,30 @@ impl Profile {
self.launcher_feature_version =
LauncherFeatureVersion::MigratedServerLastPlayTime;
}
+ LauncherFeatureVersion::MigratedServerLastPlayTime => {
+ let quoter = shlex::Quoter::new().allow_nul(true);
+
+ // Previously split by spaces
+ if let Some(pre_launch) = self.hooks.pre_launch.as_ref() {
+ self.hooks.pre_launch =
+ Some(quoter.join(pre_launch.split(' ')).unwrap())
+ }
+
+ // Previously treated as complete path to command
+ if let Some(wrapper) = self.hooks.wrapper.as_ref() {
+ self.hooks.wrapper =
+ Some(quoter.quote(wrapper).unwrap().to_string())
+ }
+
+ // Previously split by spaces
+ if let Some(post_exit) = self.hooks.post_exit.as_ref() {
+ self.hooks.post_exit =
+ Some(quoter.join(post_exit.split(' ')).unwrap())
+ }
+
+ self.launcher_feature_version =
+ LauncherFeatureVersion::MigratedLaunchHooks;
+ }
LauncherFeatureVersion::MOST_RECENT => unreachable!(
"LauncherFeatureVersion::MOST_RECENT was not updated"
),
diff --git a/packages/app-lib/src/state/settings.rs b/packages/app-lib/src/state/settings.rs
index 785c7b45..9eef6c39 100644
--- a/packages/app-lib/src/state/settings.rs
+++ b/packages/app-lib/src/state/settings.rs
@@ -1,6 +1,7 @@
//! Theseus settings file
use serde::{Deserialize, Serialize};
+use sqlx::{Pool, Sqlite};
use std::collections::HashMap;
// Types
@@ -42,6 +43,8 @@ pub struct Settings {
pub skipped_update: Option,
pub pending_update_toast_for_version: Option,
pub auto_download_updates: Option,
+
+ pub version: usize,
}
#[derive(Serialize, Deserialize, Debug, Clone, Copy, Eq, Hash, PartialEq)]
@@ -54,6 +57,8 @@ pub enum FeatureFlag {
}
impl Settings {
+ const CURRENT_VERSION: usize = 2;
+
pub async fn get(
exec: impl sqlx::Executor<'_, Database = sqlx::Sqlite>,
) -> crate::Result {
@@ -68,7 +73,8 @@ impl Settings {
mc_memory_max, mc_force_fullscreen, mc_game_resolution_x, mc_game_resolution_y, hide_on_process_start,
hook_pre_launch, hook_wrapper, hook_post_exit,
custom_dir, prev_custom_dir, migrated, json(feature_flags) feature_flags, toggle_sidebar,
- skipped_update, pending_update_toast_for_version, auto_download_updates
+ skipped_update, pending_update_toast_for_version, auto_download_updates,
+ version
FROM settings
"
)
@@ -126,6 +132,7 @@ impl Settings {
pending_update_toast_for_version: res
.pending_update_toast_for_version,
auto_download_updates: res.auto_download_updates.map(|x| x == 1),
+ version: res.version as usize,
})
}
@@ -140,6 +147,7 @@ impl Settings {
let extra_launch_args = serde_json::to_string(&self.extra_launch_args)?;
let custom_env_vars = serde_json::to_string(&self.custom_env_vars)?;
let feature_flags = serde_json::to_string(&self.feature_flags)?;
+ let version = self.version as i64;
sqlx::query!(
"
@@ -183,7 +191,9 @@ impl Settings {
skipped_update = $29,
pending_update_toast_for_version = $30,
- auto_download_updates = $31
+ auto_download_updates = $31,
+
+ version = $32
",
max_concurrent_writes,
max_concurrent_downloads,
@@ -216,12 +226,75 @@ impl Settings {
self.skipped_update,
self.pending_update_toast_for_version,
self.auto_download_updates,
+ version,
)
.execute(exec)
.await?;
Ok(())
}
+
+ pub async fn migrate(exec: &Pool) -> crate::Result<()> {
+ let mut settings = Self::get(exec).await?;
+
+ if settings.version < Settings::CURRENT_VERSION {
+ tracing::info!(
+ "Migrating settings version {} to {:?}",
+ settings.version,
+ Settings::CURRENT_VERSION
+ );
+ }
+ while settings.version < Settings::CURRENT_VERSION {
+ if let Err(err) = settings.perform_migration() {
+ tracing::error!(
+ "Failed to migrate settings from version {}: {}",
+ settings.version,
+ err
+ );
+ return Err(err);
+ }
+ }
+
+ settings.update(exec).await?;
+
+ Ok(())
+ }
+
+ pub fn perform_migration(&mut self) -> crate::Result<()> {
+ match self.version {
+ 1 => {
+ let quoter = shlex::Quoter::new().allow_nul(true);
+
+ // Previously split by spaces
+ if let Some(pre_launch) = self.hooks.pre_launch.as_ref() {
+ self.hooks.pre_launch =
+ Some(quoter.join(pre_launch.split(' ')).unwrap())
+ }
+
+ // Previously treated as complete path to command
+ if let Some(wrapper) = self.hooks.wrapper.as_ref() {
+ self.hooks.wrapper =
+ Some(quoter.quote(wrapper).unwrap().to_string())
+ }
+
+ // Previously split by spaces
+ if let Some(post_exit) = self.hooks.post_exit.as_ref() {
+ self.hooks.post_exit =
+ Some(quoter.join(post_exit.split(' ')).unwrap())
+ }
+
+ self.version = 2;
+ }
+ version => {
+ return Err(crate::ErrorKind::OtherError(format!(
+ "Invalid settings version: {version}"
+ ))
+ .into());
+ }
+ }
+
+ Ok(())
+ }
}
/// Theseus theme
diff --git a/packages/ariadne/Cargo.toml b/packages/ariadne/Cargo.toml
index 5b5dcd59..1cab28f9 100644
--- a/packages/ariadne/Cargo.toml
+++ b/packages/ariadne/Cargo.toml
@@ -12,6 +12,7 @@ serde_bytes = { workspace = true }
serde_cbor = { workspace = true }
serde_json = { workspace = true }
thiserror = { workspace = true }
+utoipa = { workspace = true }
uuid = { workspace = true, features = ["fast-rng", "serde", "v4"] }
[lints]
diff --git a/packages/ariadne/src/ids.rs b/packages/ariadne/src/ids.rs
index 5b389c8f..6f91cecd 100644
--- a/packages/ariadne/src/ids.rs
+++ b/packages/ariadne/src/ids.rs
@@ -94,6 +94,7 @@ macro_rules! base62_id {
serde::Deserialize,
Debug,
Hash,
+ utoipa::ToSchema,
)]
#[serde(from = "ariadne::ids::Base62Id")]
#[serde(into = "ariadne::ids::Base62Id")]
diff --git a/packages/assets/generated-icons.ts b/packages/assets/generated-icons.ts
index 79da983d..f92d43dd 100644
--- a/packages/assets/generated-icons.ts
+++ b/packages/assets/generated-icons.ts
@@ -188,6 +188,7 @@ import _UnplugIcon from './icons/unplug.svg?component'
import _UpdatedIcon from './icons/updated.svg?component'
import _UploadIcon from './icons/upload.svg?component'
import _UserIcon from './icons/user.svg?component'
+import _UserCogIcon from './icons/user-cog.svg?component'
import _UserPlusIcon from './icons/user-plus.svg?component'
import _UserXIcon from './icons/user-x.svg?component'
import _UsersIcon from './icons/users.svg?component'
@@ -387,6 +388,7 @@ export const UnlinkIcon = _UnlinkIcon
export const UnplugIcon = _UnplugIcon
export const UpdatedIcon = _UpdatedIcon
export const UploadIcon = _UploadIcon
+export const UserCogIcon = _UserCogIcon
export const UserPlusIcon = _UserPlusIcon
export const UserXIcon = _UserXIcon
export const UserIcon = _UserIcon
diff --git a/packages/assets/icons/user-cog.svg b/packages/assets/icons/user-cog.svg
new file mode 100644
index 00000000..60ca1007
--- /dev/null
+++ b/packages/assets/icons/user-cog.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/packages/assets/styles/variables.scss b/packages/assets/styles/variables.scss
index 10659c53..2d8a82f0 100644
--- a/packages/assets/styles/variables.scss
+++ b/packages/assets/styles/variables.scss
@@ -303,7 +303,7 @@ html {
--color-text-primary: #ffffff;
--color-text-default: #b0bac5;
- --color-text-tertiary: #80878f;
+ --color-text-tertiary: #96a2b0;
// ===
@@ -389,10 +389,10 @@ html {
.oled-mode {
@extend .dark-mode;
--surface-1: #000000;
- --surface-2: #101013;
- --surface-3: #1b1b20;
- --surface-4: #25262b;
- --surface-5: #2e2f34;
+ --surface-2: #09090a;
+ --surface-3: #101013;
+ --surface-4: #1b1b20;
+ --surface-5: #25262b;
--color-ad: #0d1828;
diff --git a/packages/blog/articles/creator-withdrawals-overhaul.md b/packages/blog/articles/creator-withdrawals-overhaul.md
new file mode 100644
index 00000000..58a6a93e
--- /dev/null
+++ b/packages/blog/articles/creator-withdrawals-overhaul.md
@@ -0,0 +1,110 @@
+---
+title: More Ways to Withdraw
+summary: 'Coming soon: new withdraw options and a redesigned revenue dashboard'
+date: 2025-10-27T16:30:00-07:00
+authors: ['AJfd8YH6', 'bOHH0P9Z', 'xSQqYYIN']
+---
+
+Hey everyone! We've heard your feedback on creator withdrawal options, and we're excited to share that more are finally coming to Modrinth! Over the past month, we've been working on overhauling the withdrawal experience and supporting more withdraw methods.
+
+**This update will roll out later this week**, but we wanted to give everyone an early heads-up so you can hold off on withdrawing when payouts go out in a couple days in case one of the new options interests you. There's a lot packed into this release, so let's dive in!
+
+
::parse();
+ tracing_subscriber::fmt().init();
+
+ let maxmind = modrinth_maxmind::init_reader()
+ .await
+ .wrap_err("failed to create reader")?;
+
+ let ip = args.ip;
+ let country = maxmind
+ .lookup::(ip)
+ .wrap_err("failed to lookup country")?;
+
+ info!("Country details for {ip:?}:\n{country:#?}");
+
+ Ok(())
+}
diff --git a/packages/modrinth-maxmind/src/lib.rs b/packages/modrinth-maxmind/src/lib.rs
new file mode 100644
index 00000000..22080967
--- /dev/null
+++ b/packages/modrinth-maxmind/src/lib.rs
@@ -0,0 +1,174 @@
+#![doc = include_str!("../README.md")]
+
+use std::{
+ io::{Cursor, Read},
+ net::IpAddr,
+ path::Path,
+ sync::Arc,
+};
+
+use flate2::read::GzDecoder;
+pub use maxminddb::{self, geoip2};
+
+use bytes::Bytes;
+use eyre::{Result, bail, eyre};
+use modrinth_util::{Context, env_var};
+use tokio::fs;
+use tracing::{debug, info, warn};
+
+/// MaxMind GeoIP database reader for use as a `web::Data` parameter.
+#[derive(Debug, Clone)]
+pub struct MaxMind {
+ /// Database reader.
+ ///
+ /// If the backend was not configured with MaxMind, the reader will not be
+ /// available.
+ pub reader: Option>>,
+}
+
+impl MaxMind {
+ /// Creates a [`MaxMind`] with no reader.
+ #[must_use]
+ pub const fn none() -> Self {
+ Self { reader: None }
+ }
+
+ /// Attempts to create a [`MaxMind`] with a MaxMind GeoIP database reader.
+ ///
+ /// This reads creation and download parameters from environment variables.
+ ///
+ /// If the database could not be created or downloaded, this will make a
+ /// [`MaxMind`] with no reader.
+ pub async fn new() -> Self {
+ Self {
+ reader: init_reader()
+ .await
+ .inspect_err(|err| {
+ warn!("Failed to initialize MaxMind: {err:#}");
+ })
+ .map(Arc::new)
+ .ok(),
+ }
+ }
+
+ /// Queries the MaxMind database for the ISO country code of an IP address.
+ ///
+ /// If MaxMind is not configured or the database could not be read, returns
+ /// [`None`].
+ pub async fn query_country(&self, ip: impl Into) -> Option {
+ let reader = self.reader.as_ref()?;
+ reader
+ .lookup::(ip.into())
+ .ok()?
+ .and_then(|c| c.country)
+ .and_then(|c| c.iso_code.map(|s| s.to_string()))
+ }
+}
+
+/// Creates a [`maxminddb::Reader`] for use in [`MaxMind::reader`].
+///
+/// # Errors
+///
+/// Errors if the database is not present, or could not be downloaded (i.e.
+/// missing license key).
+pub async fn init_reader() -> Result> {
+ let db = if let Ok(db_path) = env_var("MAXMIND_DB") {
+ info!("Using MaxMind database at {db_path:?}");
+
+ fs::read(&db_path)
+ .await
+ .map(Bytes::from)
+ .wrap_err_with(|| {
+ eyre!("failed to read database from {db_path:?}")
+ })?
+ } else {
+ let account_id = env_var("MAXMIND_ACCOUNT_ID")?;
+ let license_key = env_var("MAXMIND_LICENSE_KEY")?;
+
+ let dirs = directories::ProjectDirs::from(
+ "com.modrinth",
+ "Modrinth",
+ "modrinth-backend",
+ )
+ .wrap_err("failed to get cache directory")?;
+ let cache_dir = dirs.cache_dir();
+ let db_path = cache_dir.join("geolite.mmdb");
+
+ match fs::read(&db_path).await {
+ Ok(db) => {
+ info!("Using cached MaxMind database at {db_path:?}");
+ Bytes::from(db)
+ }
+ Err(err) => {
+ debug!(
+ "Failed to read MaxMind database from {db_path:?}, will download: {err}"
+ );
+
+ let db = download(&account_id, &license_key).await?;
+
+ match write_to_cache(cache_dir, &db_path, &db).await {
+ Ok(()) => {
+ info!("Wrote GeoIP database cache to {db_path:?}");
+ }
+ Err(err) => warn!(
+ "Failed to write GeoIP database cache to {db_path:?}: {err:?}",
+ ),
+ }
+
+ info!("Downloaded and cached database");
+ db
+ }
+ }
+ };
+
+ maxminddb::Reader::from_source(db).wrap_err("failed to create reader")
+}
+
+async fn download(account_id: &str, license_key: &str) -> Result {
+ info!("Downloading MaxMind GeoIP database");
+ let db = reqwest::Client::new()
+ .get("https://download.maxmind.com/geoip/databases/GeoLite2-Country/download?suffix=tar.gz")
+ .basic_auth(account_id, Some(license_key))
+ .send()
+ .await
+ .wrap_err("failed to begin downloading GeoIP database")?
+ .error_for_status()
+ .wrap_err("failed to download GeoIP database")?
+ .bytes()
+ .await
+ .wrap_err("failed to finish downloading GeoIP database")?;
+
+ let db = GzDecoder::new(Cursor::new(db));
+ let mut archive = tar::Archive::new(db);
+
+ let entries = archive.entries().wrap_err("failed to read entries")?;
+ for entry in entries {
+ let mut entry = entry.wrap_err("failed to read entry")?;
+ let Ok(path) = entry.header().path() else {
+ continue;
+ };
+ if path.extension().and_then(|x| x.to_str()) == Some("mmdb") {
+ let mut buf = Vec::new();
+ entry
+ .read_to_end(&mut buf)
+ .wrap_err("failed to read entry")?;
+ return Ok(Bytes::from(buf));
+ }
+ }
+
+ bail!("no entries in archive");
+}
+
+async fn write_to_cache(
+ cache_dir: &Path,
+ db_path: &Path,
+ db: &[u8],
+) -> Result<()> {
+ fs::create_dir_all(cache_dir)
+ .await
+ .wrap_err("failed to create parent directories")?;
+ fs::write(db_path, db)
+ .await
+ .wrap_err("failed to write to file")?;
+ Ok(())
+}
diff --git a/packages/modrinth-util/Cargo.toml b/packages/modrinth-util/Cargo.toml
new file mode 100644
index 00000000..1c453c4c
--- /dev/null
+++ b/packages/modrinth-util/Cargo.toml
@@ -0,0 +1,15 @@
+[package]
+name = "modrinth-util"
+edition.workspace = true
+rust-version.workspace = true
+repository.workspace = true
+
+[dependencies]
+actix-web = { workspace = true }
+derive_more = { workspace = true, features = ["display", "error", "from"] }
+dotenvy = { workspace = true }
+eyre = { workspace = true }
+serde = { workspace = true, features = ["derive"] }
+
+[lints]
+workspace = true
diff --git a/packages/modrinth-util/README.md b/packages/modrinth-util/README.md
new file mode 100644
index 00000000..3b3d3194
--- /dev/null
+++ b/packages/modrinth-util/README.md
@@ -0,0 +1 @@
+Modrinth services utilities.
diff --git a/packages/modrinth-util/src/error.rs b/packages/modrinth-util/src/error.rs
new file mode 100644
index 00000000..023104a6
--- /dev/null
+++ b/packages/modrinth-util/src/error.rs
@@ -0,0 +1,326 @@
+use std::{
+ convert::Infallible,
+ fmt::{Debug, Display},
+};
+
+use actix_web::{HttpResponse, ResponseError, http::StatusCode};
+use derive_more::{Display, Error};
+use serde::{Deserialize, Serialize};
+
+/// Error when calling an HTTP endpoint.
+#[derive(Debug, Display, Error)]
+pub enum ApiError {
+ /// Error occurred on the server side, which the caller has no fault in.
+ Internal(eyre::Report),
+ /// Caller made an invalid or malformed request.
+ Request(eyre::Report),
+ /// Caller attempted a request which they are not allowed to make.
+ Auth(eyre::Report),
+}
+
+impl ResponseError for ApiError {
+ fn status_code(&self) -> StatusCode {
+ match self {
+ Self::Internal(_) => StatusCode::INTERNAL_SERVER_ERROR,
+ Self::Request(_) => StatusCode::BAD_REQUEST,
+ Self::Auth(_) => StatusCode::UNAUTHORIZED,
+ }
+ }
+
+ fn error_response(&self) -> HttpResponse {
+ HttpResponse::build(self.status_code()).json(ErrorResponse {
+ // internal error details are not leaked to the caller
+ description: match self {
+ Self::Internal(_) => None,
+ _ => Some(self.to_string()),
+ },
+ })
+ }
+}
+
+/// How an [`ApiError`] is represented when sending over an HTTP request.
+#[derive(Debug, Serialize, Deserialize)]
+pub struct ErrorResponse {
+ /// Text description of the error that occurred.
+ ///
+ /// [`ApiError::Internal`] errors have their description filtered out, and
+ /// will hold [`None`].
+ pub description: Option,
+}
+
+/// Allows wrapping [`Result`]s and [`Option`]s into [`Result`]s.
+#[allow(
+ clippy::missing_errors_doc,
+ reason = "this trait's purpose is improving error handling"
+)]
+pub trait Context: Sized {
+ /// Maps the error variant into an [`eyre::Report`], creating the message
+ /// using `f`.
+ fn wrap_err_with(self, f: impl FnOnce() -> D) -> Result
+ where
+ D: Send + Sync + Debug + Display + 'static;
+
+ /// Maps the error variant into an [`eyre::Report`] with the given message.
+ /// Maps the error variant into an [`eyre::Report`] with the given message.
+ #[inline]
+ fn wrap_err(self, msg: D) -> Result
+ where
+ D: Send + Sync + Debug + Display + 'static,
+ {
+ self.wrap_err_with(|| msg)
+ }
+
+ /// Maps the error variant into an [`ApiError::Internal`] using the closure to create the message.
+ #[inline]
+ fn wrap_internal_err_with(
+ self,
+ f: impl FnOnce() -> D,
+ ) -> Result
+ where
+ D: Send + Sync + Debug + Display + 'static,
+ {
+ self.wrap_err_with(f).map_err(ApiError::Internal)
+ }
+
+ /// Maps the error variant into an [`ApiError::Internal`] with the given message.
+ #[inline]
+ fn wrap_internal_err(self, msg: D) -> Result
+ where
+ D: Send + Sync + Debug + Display + 'static,
+ {
+ self.wrap_internal_err_with(|| msg)
+ }
+
+ /// Maps the error variant into an [`ApiError::Request`] using the closure to create the message.
+ #[inline]
+ fn wrap_request_err_with(
+ self,
+ f: impl FnOnce() -> D,
+ ) -> Result
+ where
+ D: Send + Sync + Debug + Display + 'static,
+ {
+ self.wrap_err_with(f).map_err(ApiError::Request)
+ }
+
+ /// Maps the error variant into an [`ApiError::Request`] with the given message.
+ #[inline]
+ fn wrap_request_err(self, msg: D) -> Result
+ where
+ D: Send + Sync + Debug + Display + 'static,
+ {
+ self.wrap_request_err_with(|| msg)
+ }
+
+ /// Maps the error variant into an [`ApiError::Auth`] using the closure to create the message.
+ #[inline]
+ fn wrap_auth_err_with(self, f: impl FnOnce() -> D) -> Result
+ where
+ D: Send + Sync + Debug + Display + 'static,
+ {
+ self.wrap_err_with(f).map_err(ApiError::Auth)
+ }
+
+ /// Maps the error variant into an [`ApiError::Auth`] with the given message.
+ #[inline]
+ fn wrap_auth_err(self, msg: D) -> Result
+ where
+ D: Send + Sync + Debug + Display + 'static,
+ {
+ self.wrap_auth_err_with(|| msg)
+ }
+}
+
+impl Context for Result
+where
+ Self: eyre::WrapErr,
+{
+ fn wrap_err_with(self, f: impl FnOnce() -> D) -> Result
+ where
+ D: Send + Sync + Debug + Display + 'static,
+ {
+ eyre::WrapErr::wrap_err_with(self, f)
+ }
+}
+
+impl Context for Option {
+ fn wrap_err_with(self, f: impl FnOnce() -> D) -> Result
+ where
+ D: Send + Sync + Debug + Display + 'static,
+ {
+ self.ok_or_else(|| eyre::Report::msg(f()))
+ }
+}
+
+// impl Context for Ty where Ty: eyre::WrapErr {}
+
+// impl Context for Ty where Ty: eyre::OptionExt {}
+
+// impl Context for Result
+// where
+// Self: eyre::WrapErr
+
-
-
@@ -298,25 +322,27 @@
- - {{ friend.username }} sent you a friend request + + {{ friend.username }} sent you a friend request You sent {{ friend.username }} a friend request @@ -219,7 +234,7 @@ onUnmounted(() => {
-
+
-
+
-
+
Username
-You can add friends with their Modrinth username.
- +
+
- + {{ formatMessage(messages.usernameTitle) }} +
++ {{ formatMessage(messages.usernameDescription) }} +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
@@ -25,9 +25,11 @@
@click="saveRoleEdit"
>
-
@@ -36,10 +38,16 @@
+
+
+
+
+ + {{ formatMessage(messages.friends) }} +
+
-
-
-
-
-
- Add friend
-
-
-
- Manage friends
-
-
-
-
- View friend requests
-
-
-
-
- Friends
-
+
@@ -759,9 +760,14 @@ const handleWebSocketMessage = (data: WSEvent) => {
curBackup.task = {}
}
- curBackup.task[data.task] = {
- progress: data.progress,
- state: data.state,
+ const currentState = curBackup.task[data.task]?.state
+ const shouldUpdate = !(currentState === 'ongoing' && data.state === 'unchanged')
+
+ if (shouldUpdate) {
+ curBackup.task[data.task] = {
+ progress: data.progress,
+ state: data.state,
+ }
}
curBackup.ongoing = data.task === 'create' && data.state === 'ongoing'
@@ -1037,7 +1043,10 @@ const nodeUnavailableDetails = computed(() => [
},
{
label: 'Node',
- value: server.general?.datacenter ?? 'Unknown',
+ value:
+ server.moduleErrors?.general?.error.responseData?.hostname ??
+ server.general?.datacenter ??
+ 'Unknown',
type: 'inline' as const,
},
{
@@ -1277,6 +1286,7 @@ useHead({
opacity: 0;
transform: translateX(1rem);
}
+
100% {
opacity: 1;
transform: none;
diff --git a/apps/frontend/src/pages/servers/manage/[id]/backups.vue b/apps/frontend/src/pages/servers/manage/[id]/backups.vue
index 091f036b..56d85946 100644
--- a/apps/frontend/src/pages/servers/manage/[id]/backups.vue
+++ b/apps/frontend/src/pages/servers/manage/[id]/backups.vue
@@ -105,6 +105,7 @@
v-for="backup in backups"
:key="`backup-${backup.id}`"
:backup="backup"
+ :server="props.server"
:kyros-url="props.server.general?.node.instance"
:jwt="props.server.general?.node.token"
@download="() => triggerDownloadAnimation()"
diff --git a/apps/frontend/src/pages/user/[id].vue b/apps/frontend/src/pages/user/[id].vue
index c05ee149..32fb8696 100644
--- a/apps/frontend/src/pages/user/[id].vue
+++ b/apps/frontend/src/pages/user/[id].vue
@@ -16,7 +16,7 @@
+
@@ -354,7 +355,7 @@
>
+ {{ formatMessage(messages.friends) }} +
-
+
-
-
+
+
+
+
+
+
diff --git a/apps/app-frontend/src/components/ui/skin/EditSkinModal.vue b/apps/app-frontend/src/components/ui/skin/EditSkinModal.vue
index 1ac359d7..56d418ce 100644
--- a/apps/app-frontend/src/components/ui/skin/EditSkinModal.vue
+++ b/apps/app-frontend/src/components/ui/skin/EditSkinModal.vue
@@ -130,6 +130,7 @@ import {
remove_custom_skin,
type Skin,
type SkinModel,
+ type SkinTextureUrl,
unequip_skin,
} from '@/helpers/skins.ts'
@@ -142,7 +143,7 @@ const currentSkin = ref(null)
const shouldRestoreModal = ref(false)
const isSaving = ref(false)
-const uploadedTextureUrl = ref(null)
+const uploadedTextureUrl = ref(null)
const previewSkin = ref('')
const variant = ref('CLASSIC')
@@ -188,7 +189,7 @@ function getSortedCapeExcluding(excludeId: string): Cape | undefined {
async function loadPreviewSkin() {
if (uploadedTextureUrl.value) {
- previewSkin.value = uploadedTextureUrl.value
+ previewSkin.value = uploadedTextureUrl.value.normalized
} else if (currentSkin.value) {
try {
previewSkin.value = await get_normalized_skin_texture(currentSkin.value)
@@ -253,11 +254,11 @@ async function show(e: MouseEvent, skin?: Skin) {
modal.value?.show(e)
}
-async function showNew(e: MouseEvent, skinTextureUrl: string) {
+async function showNew(e: MouseEvent, skinTextureUrl: SkinTextureUrl) {
mode.value = 'new'
currentSkin.value = null
uploadedTextureUrl.value = skinTextureUrl
- variant.value = await determineModelType(skinTextureUrl)
+ variant.value = await determineModelType(skinTextureUrl.original)
selectedCape.value = undefined
visibleCapeList.value = []
initVisibleCapeList()
@@ -267,7 +268,7 @@ async function showNew(e: MouseEvent, skinTextureUrl: string) {
modal.value?.show(e)
}
-async function restoreWithNewTexture(skinTextureUrl: string) {
+async function restoreWithNewTexture(skinTextureUrl: SkinTextureUrl) {
uploadedTextureUrl.value = skinTextureUrl
await loadPreviewSkin()
@@ -361,7 +362,7 @@ async function save() {
let textureUrl: string
if (uploadedTextureUrl.value) {
- textureUrl = uploadedTextureUrl.value
+ textureUrl = uploadedTextureUrl.value.original
} else {
textureUrl = currentSkin.value!.texture
}
diff --git a/apps/app-frontend/src/helpers/friends.js b/apps/app-frontend/src/helpers/friends.js
deleted file mode 100644
index 16d64f11..00000000
--- a/apps/app-frontend/src/helpers/friends.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import { invoke } from '@tauri-apps/api/core'
-
-export async function friends() {
- return await invoke('plugin:friends|friends')
-}
-
-export async function friend_statuses() {
- return await invoke('plugin:friends|friend_statuses')
-}
-
-export async function add_friend(userId) {
- return await invoke('plugin:friends|add_friend', { userId })
-}
-
-export async function remove_friend(userId) {
- return await invoke('plugin:friends|remove_friend', { userId })
-}
diff --git a/apps/app-frontend/src/helpers/friends.ts b/apps/app-frontend/src/helpers/friends.ts
new file mode 100644
index 00000000..96effddd
--- /dev/null
+++ b/apps/app-frontend/src/helpers/friends.ts
@@ -0,0 +1,79 @@
+import type { User } from '@modrinth/utils'
+import { invoke } from '@tauri-apps/api/core'
+import type { Dayjs } from 'dayjs'
+import dayjs from 'dayjs'
+
+import { get_user_many } from '@/helpers/cache'
+import type { ModrinthCredentials } from '@/helpers/mr_auth'
+
+export type UserStatus = {
+ user_id: string
+ profile_name: string | null
+ last_update: string
+}
+
+export type UserFriend = {
+ id: string
+ friend_id: string
+ accepted: boolean
+ created: string
+}
+
+export async function friends(): Promise {
+ return await invoke('plugin:friends|friends')
+}
+
+export async function friend_statuses(): Promise {
+ return await invoke('plugin:friends|friend_statuses')
+}
+
+export async function add_friend(userId: string): Promise {
+ return await invoke('plugin:friends|add_friend', { userId })
+}
+
+export async function remove_friend(userId: string): Promise {
+ return await invoke('plugin:friends|remove_friend', { userId })
+}
+
+export type FriendWithUserData = {
+ id: string
+ friend_id: string | null
+ status: string | null
+ last_updated: Dayjs | null
+ created: Dayjs
+ username: string
+ accepted: boolean
+ online: boolean
+ avatar: string
+}
+export async function transformFriends(
+ friends: UserFriend[],
+ credentials: ModrinthCredentials | null,
+): Promise {
+ if (friends.length === 0 || !credentials) {
+ return []
+ }
+
+ const friendStatuses = await friend_statuses()
+ const users = await get_user_many(
+ friends.map((x) => (x.id === credentials.user_id ? x.friend_id : x.id)),
+ )
+
+ return friends.map((friend) => {
+ const user = users.find((x: User) => x.id === friend.id || x.id === friend.friend_id)
+ const status = friendStatuses.find(
+ (x) => x.user_id === friend.id || x.user_id === friend.friend_id,
+ )
+ return {
+ id: friend.id,
+ friend_id: friend.friend_id,
+ status: status?.profile_name ?? null,
+ last_updated: status && status.last_update ? dayjs(status.last_update) : null,
+ created: dayjs(friend.created),
+ avatar: user?.avatar_url ?? '',
+ username: user?.username ?? '',
+ online: !!status,
+ accepted: friend.accepted,
+ }
+ })
+}
diff --git a/apps/app-frontend/src/helpers/mr_auth.js b/apps/app-frontend/src/helpers/mr_auth.ts
similarity index 60%
rename from apps/app-frontend/src/helpers/mr_auth.js
rename to apps/app-frontend/src/helpers/mr_auth.ts
index 2690957e..dfb476d2 100644
--- a/apps/app-frontend/src/helpers/mr_auth.js
+++ b/apps/app-frontend/src/helpers/mr_auth.ts
@@ -5,18 +5,25 @@
*/
import { invoke } from '@tauri-apps/api/core'
-export async function login() {
+export type ModrinthCredentials = {
+ session: string
+ expires: string
+ user_id: string
+ active: boolean
+}
+
+export async function login(): Promise {
return await invoke('plugin:mr-auth|modrinth_login')
}
-export async function logout() {
+export async function logout(): Promise {
return await invoke('plugin:mr-auth|logout')
}
-export async function get() {
+export async function get(): Promise {
return await invoke('plugin:mr-auth|get')
}
-export async function cancelLogin() {
+export async function cancelLogin(): Promise {
return await invoke('plugin:mr-auth|cancel_modrinth_login')
}
diff --git a/apps/app-frontend/src/helpers/settings.ts b/apps/app-frontend/src/helpers/settings.ts
index b7bbcd92..ae935224 100644
--- a/apps/app-frontend/src/helpers/settings.ts
+++ b/apps/app-frontend/src/helpers/settings.ts
@@ -67,6 +67,8 @@ export type AppSettings = {
skipped_update: string | null
pending_update_toast_for_version: string | null
auto_download_updates: boolean | null
+
+ version: number
}
// Get full settings object
diff --git a/apps/app-frontend/src/helpers/skins.ts b/apps/app-frontend/src/helpers/skins.ts
index 75dea749..87f7286c 100644
--- a/apps/app-frontend/src/helpers/skins.ts
+++ b/apps/app-frontend/src/helpers/skins.ts
@@ -22,6 +22,11 @@ export interface Skin {
is_equipped: boolean
}
+export interface SkinTextureUrl {
+ original: string
+ normalized: string
+}
+
export const DEFAULT_MODEL_SORTING = ['Steve', 'Alex'] as string[]
export const DEFAULT_MODELS: Record = {
diff --git a/apps/app-frontend/src/locales/en-US/index.json b/apps/app-frontend/src/locales/en-US/index.json
index 9ec019ff..854998fe 100644
--- a/apps/app-frontend/src/locales/en-US/index.json
+++ b/apps/app-frontend/src/locales/en-US/index.json
@@ -65,6 +65,69 @@
"app.update.reload-to-update": {
"message": "Reload to install update"
},
+ "friends.action.add-friend": {
+ "message": "Add a friend"
+ },
+ "friends.action.view-friend-requests": {
+ "message": "{count} friend {count, plural, one {request} other {requests}}"
+ },
+ "friends.add-friend.submit": {
+ "message": "Send friend request"
+ },
+ "friends.add-friend.title": {
+ "message": "Adding a friend"
+ },
+ "friends.add-friend.username.description": {
+ "message": "It may be different from their Minecraft username!"
+ },
+ "friends.add-friend.username.placeholder": {
+ "message": "Enter Modrinth username..."
+ },
+ "friends.add-friend.username.title": {
+ "message": "What's your friend's Modrinth username?"
+ },
+ "friends.add-friends-to-share": {
+ "message": "Add friends to see what they're playing!"
+ },
+ "friends.friend.cancel-request": {
+ "message": "Cancel request"
+ },
+ "friends.friend.remove-friend": {
+ "message": "Remove friend"
+ },
+ "friends.friend.request-sent": {
+ "message": "Friend request sent"
+ },
+ "friends.friend.view-profile": {
+ "message": "View profile"
+ },
+ "friends.heading": {
+ "message": "Friends"
+ },
+ "friends.heading.active": {
+ "message": "Active"
+ },
+ "friends.heading.offline": {
+ "message": "Offline"
+ },
+ "friends.heading.online": {
+ "message": "Online"
+ },
+ "friends.heading.pending": {
+ "message": "Pending"
+ },
+ "friends.no-friends-match": {
+ "message": "No friends matching ''{query}''"
+ },
+ "friends.search-friends-placeholder": {
+ "message": "Search friends..."
+ },
+ "friends.section.heading": {
+ "message": "{title} - {count}"
+ },
+ "friends.sign-in-to-add-friends": {
+ "message": "Sign in to a Modrinth account to add friends and see what they're playing!"
+ },
"instance.add-server.add-and-play": {
"message": "Add and play"
},
diff --git a/apps/app-frontend/src/pages/Skins.vue b/apps/app-frontend/src/pages/Skins.vue
index cab38f2f..d2bca13f 100644
--- a/apps/app-frontend/src/pages/Skins.vue
+++ b/apps/app-frontend/src/pages/Skins.vue
@@ -31,7 +31,7 @@ import { get_default_user, login as login_flow, users } from '@/helpers/auth'
import type { RenderResult } from '@/helpers/rendering/batch-skin-renderer.ts'
import { generateSkinPreviews, skinBlobUrlMap } from '@/helpers/rendering/batch-skin-renderer.ts'
import { get as getSettings } from '@/helpers/settings.ts'
-import type { Cape, Skin } from '@/helpers/skins.ts'
+import type { Cape, Skin, SkinTextureUrl } from '@/helpers/skins.ts'
import {
equip_skin,
filterDefaultSkins,
@@ -245,16 +245,18 @@ function openUploadSkinModal(e: MouseEvent) {
function onSkinFileUploaded(buffer: ArrayBuffer) {
const fakeEvent = new MouseEvent('click')
- normalize_skin_texture(`data:image/png;base64,` + arrayBufferToBase64(buffer)).then(
- (skinTextureNormalized: Uint8Array) => {
- const skinTexUrl = `data:image/png;base64,` + arrayBufferToBase64(skinTextureNormalized)
- if (editSkinModal.value && editSkinModal.value.shouldRestoreModal) {
- editSkinModal.value.restoreWithNewTexture(skinTexUrl)
- } else {
- editSkinModal.value?.showNew(fakeEvent, skinTexUrl)
- }
- },
- )
+ const originalSkinTexUrl = `data:image/png;base64,` + arrayBufferToBase64(buffer)
+ normalize_skin_texture(originalSkinTexUrl).then((skinTextureNormalized: Uint8Array) => {
+ const skinTexUrl: SkinTextureUrl = {
+ original: originalSkinTexUrl,
+ normalized: `data:image/png;base64,` + arrayBufferToBase64(skinTextureNormalized),
+ }
+ if (editSkinModal.value && editSkinModal.value.shouldRestoreModal) {
+ editSkinModal.value.restoreWithNewTexture(skinTexUrl)
+ } else {
+ editSkinModal.value?.showNew(fakeEvent, skinTexUrl)
+ }
+ })
}
function onUploadCanceled() {
diff --git a/apps/app-frontend/src/pages/instance/Index.vue b/apps/app-frontend/src/pages/instance/Index.vue
index 35d4676a..b1d6f66b 100644
--- a/apps/app-frontend/src/pages/instance/Index.vue
+++ b/apps/app-frontend/src/pages/instance/Index.vue
@@ -139,9 +139,9 @@
-
-
- {{ formatMessage(messages.signIn) }}
+
+
+
+
+
+
+ {{ formatMessage(messages.signIn) }}
+
+
@@ -40,24 +45,26 @@
-
+
+
+
-
- {{ formatMessage(messages.signIn) }}
+
+
+ {{ formatMessage(messages.signIn) }}
+
+
@@ -181,14 +211,19 @@ useSeoMeta({
padding: 0;
}
- ul,
+ ul > li:not(:last-child),
ol > li:not(:last-child) {
margin-bottom: 0.5rem;
}
ul,
ol {
- p {
+ > li > p {
+ margin-top: 0;
+ margin-bottom: 0;
+ }
+
+ > li > p:not(:last-child) {
margin-bottom: 0.5rem;
}
}
@@ -220,20 +255,22 @@ useSeoMeta({
h2 {
font-size: 1.25rem;
+ margin-top: 1.5rem;
@media (min-width: 640px) {
font-size: 1.5rem;
}
}
h3 {
- font-size: 1.125rem;
+ font-size: 1rem;
+ margin-top: 1.25rem;
@media (min-width: 640px) {
- font-size: 1.25rem;
+ font-size: 1.125rem;
}
}
p {
- margin-bottom: 1.25rem;
+ margin-bottom: 0.75rem;
font-size: 0.875rem;
@media (min-width: 640px) {
font-size: 1rem;
@@ -275,8 +312,34 @@ useSeoMeta({
}
}
+ hr {
+ border: none;
+ height: 1px;
+ background-color: var(--color-divider);
+ }
+
+ .video-wrapper {
+ display: inline-block;
+ max-width: 100%;
+ border-radius: var(--radius-md);
+ overflow: hidden;
+ border: 1px solid var(--color-button-border);
+ @media (min-width: 640px) {
+ border-radius: var(--radius-lg);
+ }
+
+ video {
+ display: block;
+ max-width: 100%;
+ object-fit: cover;
+ height: auto;
+ }
+ }
+
> img,
- > :has(img:first-child:last-child) {
+ > .video-wrapper,
+ > :has(img:first-child:last-child),
+ > :has(video:first-child:last-child) {
display: flex;
justify-content: center;
}
diff --git a/apps/frontend/src/pages/servers/manage/[id].vue b/apps/frontend/src/pages/servers/manage/[id].vue
index 4e2c046f..5e750616 100644
--- a/apps/frontend/src/pages/servers/manage/[id].vue
+++ b/apps/frontend/src/pages/servers/manage/[id].vue
@@ -151,6 +151,7 @@
:server-name="serverData.name"
:server-data="serverData"
:uptime-seconds="uptimeSeconds"
+ :backup-in-progress="backupInProgress"
@action="sendPowerAction"
/>
@@ -325,50 +351,77 @@ onUnmounted(() => {
+
+
-
-
-
+
diff --git a/apps/app-frontend/src/components/ui/friends/FriendsSection.vue b/apps/app-frontend/src/components/ui/friends/FriendsSection.vue
new file mode 100644
index 00000000..83e673f7
--- /dev/null
+++ b/apps/app-frontend/src/components/ui/friends/FriendsSection.vue
@@ -0,0 +1,185 @@
+
+
+
+
- Sign in to add friends!
+
+
+
+
- Add friends
- to share what you're playing!
+
+
+
+
-
+
-
-
-
- {{ friend.username }}
-
- {{ friend.status }}
-
- + {{ formatMessage(messages.noFriendsMatch, { query: search }) }} +
+ {{ formatMessage(messages.heading, { title: heading, count: friends.length }) }} +
+ + +
+
+
+
+ {{ formatMessage(postVerificationMessages.description) }}
-Server data
{{
- JSON.stringify(server, null, ' ')
+ JSON.stringify(server, null, ' ')
}}
- Email
+ {{
+ formatMessage(messages.emailLabel)
+ }}
@@ -98,8 +116,8 @@
user.bio
? user.bio
: projects.length === 0
- ? 'A Modrinth user.'
- : 'A Modrinth creator.'
+ ? formatMessage(messages.bioFallbackUser)
+ : formatMessage(messages.bioFallbackCreator)
}}
@@ -107,16 +125,22 @@
class="flex items-center gap-2 border-0 border-r border-solid border-divider pr-4 font-semibold"
>
{{ user.email }}
@@ -50,12 +58,16 @@
- Auth providers
+ {{
+ formatMessage(messages.authProvidersLabel)
+ }}
{{ user.auth_providers.join(', ') }}
- Payment methods
+ {{
+ formatMessage(messages.paymentMethodsLabel)
+ }}
Paypal ({{ user.payout_data.paypal_address }} - {{ user.payout_data.paypal_country }})
@@ -70,16 +82,22 @@
- Has password
+ {{
+ formatMessage(messages.hasPasswordLabel)
+ }}
- {{ user.has_password ? 'Yes' : 'No' }}
+ {{
+ user.has_password ? formatMessage(messages.yesLabel) : formatMessage(messages.noLabel)
+ }}
- Has TOTP
+ {{
+ formatMessage(messages.hasTotpLabel)
+ }}
- {{ user.has_totp ? 'Yes' : 'No' }}
+ {{ user.has_totp ? formatMessage(messages.yesLabel) : formatMessage(messages.noLabel) }}
{{ collection.name }}
- Collection
+ {{ formatMessage(messages.collectionLabel) }}
+
+
+
+## **TL;DR**
+
+- New revenue page and withdrawal flow
+- New bank transfer option for 29 countries
+- New crypto (USDC) option for hard to reach countries
+- PayPal and Venmo moved to Tremendous for international users (lower to no FX fees)
+- Email notifications for payout updates (available, successful, failed, etc.)
+- New withdrawal compliance
+
+---
+
+## Streamlined Withdrawal Experience
+
+A big goal for this release was to make payouts as clear as possible for creators. The revenue screen and withdrawal process has been completely overhauled.
+
+**Your revenue is now displayed as a balance, with a detailed breakdown below.**
+
+
+
+
+
+> Green shows available revenue, blue and purple show estimated revenue from the last two completed months, and grey shows the current month revenue that's still being processed.
+
+We've also cleaned up the transaction history. You'll now see your most recent transactions directly on the revenue page, along with any deposits from Modrinth into your account.
+
+## New Withdraw Methods
+
+The second big goal of this release was to bring more options, better fees, and new ways to withdraw from countries that were previously hard to reach.
+
+
+
+
+
+Withdrawing with ease from your balance using our new modal flow. Click the green Withdraw button to get started, and you'll immediately see all available methods and fees for your country, including a few new ones:
+
+### Bank Transfers (29 Countries)
+
+You can now withdraw directly to your bank account via wire or ACH, depending on your country. Supported countries and their fees are listed below.
+
+We're working to expand this list, most notably to Canada, the UK, and countries across Asia, but there's no timeline _yet_.
+
+| Country | Currency | Transaction Fee | FX Fee | **Total Fee** |
+| --------------- | -------- | --------------- | ----------------- | ----------------- |
+| πΊπΈ USA | USD | $0.50 + 1% | 0.50% | **~1.5% + $0.50** |
+| πͺπΊ EU | EUR | β¬1.00 + 1% | 0.60% | **~1.6% + β¬1.00** |
+| π¦π· Argentina | ARS | $0.00 + 1% | 0.50% | **~1.5%** |
+| π²π½ Mexico | MXN | $0.50 + 1% | 0.90% | **~1.9% + $0.50** |
+| π§π· Brazil | BRL | $0.25 + 1% | 1.30% (incl. IOF) | **~2.3% + $0.25** |
+| π¨π± Chile | CLP | $1.20 + 1% | 0.95% | **~2.0% + $1.20** |
+| π¨π· Costa Rica | CRC | $0.80 + 1% | 1.05% | **~2.1% + $0.80** |
+| π΅πͺ Peru (PEN) | PEN | $1.00 + 1% | 1.15% | **~2.1% + $1.00** |
+| πΏπ¦ South Africa | ZAR | $1.50 + 1% | 1.40% | **~2.4% + $1.50** |
+| π΅πͺ Peru (USD) | USD | $5.00 + 1% | 0.50% | **~1.5% + $5.00** |
+| π¨π΄ Colombia | COP | $0.35 + 1% | 0.95% (incl. GMF) | **~2.0% + $0.35** |
+
+_Total Fee includes both transaction and FX fees._
+
+> **Supported EU countries:** Austria, Belgium, Cyprus, Estonia, Finland, France, Germany, Greece, Ireland, Italy, Latvia, Lithuania, Luxembourg, Malta, Netherlands, Portugal, Slovakia, Spain
+
+### Crypto Withdrawals (USDC)
+
+We've also added USDC withdrawals on the Polygon network. This option is available worldwide, so everyone can now withdraw funds. Fees are a flat 1% + network fees, making it a great low-cost option.
+
+### PayPal & Venmo
+
+We've moved PayPal and Venmo to two different methods depending on your country:
+
+- **United States:** PayPal and Venmo will remain on the existing system with the same low fees: $0.25 + 2%, capped at $1.00.
+- **Outside of the United States:** PayPal and Venmo have been moved to Tremendous, which has zero FX fees and charges a flat 6%, capped at $25.00. This should be an improvement over the old method for larger creators, where PayPal charged high uncapped fees for currency conversion.
+
+## New Email Notifications
+
+Earlier this month, we quietly rolled out a new email system that lets us give both creators and users better feedback about what's going on.
+
+This includes emails for things like project status changes, payouts available, and successful withdrawals. We plan to keep building on this and will be adding email preference settings soon!
+
+## Tax Compliance
+
+Last but not least, we're also rolling out our new tax compliance system. We partially rolled this out earlier this month, but the full version is now live.
+
+Creator withdrawals will now be limited to $600.00 USD per calendar year as of 2025, per U.S. regulations. As a creator approaches that threshold, they'll be prompted to fill out a W-8 or W-9 tax form, depending on their country.
+
+
+
+Completing this form helps Modrinth stay compliant and will automatically unlock withdrawals again once submitted. For non-US users, these details are not automatically sent to the US government! They are for our own records in the case of an audit and we need to prove where we're sending money to.
+
+---
+
+Thank you to all the creators and players supporting Modrinth, we hope you enjoy this long deserved update! π
diff --git a/packages/blog/compiled/creator_withdrawals_overhaul.content.ts b/packages/blog/compiled/creator_withdrawals_overhaul.content.ts
new file mode 100644
index 00000000..3dc98ec8
--- /dev/null
+++ b/packages/blog/compiled/creator_withdrawals_overhaul.content.ts
@@ -0,0 +1,2 @@
+// AUTO-GENERATED FILE - DO NOT EDIT
+export const html = `Hey everyone! We've heard your feedback on creator withdrawal options, and we're excited to share that more are finally coming to Modrinth! Over the past month, we've been working on overhauling the withdrawal experience and supporting more withdraw methods.
This update will roll out later this week, but we wanted to give everyone an early heads-up so you can hold off on withdrawing when payouts go out in a couple days in case one of the new options interests you. There's a lot packed into this release, so let's dive in!
TL;DR
- New revenue page and withdrawal flow
- New bank transfer option for 29 countries
- New crypto (USDC) option for hard to reach countries
- PayPal and Venmo moved to Tremendous for international users (lower to no FX fees)
- Email notifications for payout updates (available, successful, failed, etc.)
- New withdrawal compliance
Streamlined Withdrawal Experience
A big goal for this release was to make payouts as clear as possible for creators. The revenue screen and withdrawal process has been completely overhauled.
Your revenue is now displayed as a balance, with a detailed breakdown below.
Green shows available revenue, blue and purple show estimated revenue from the last two completed months, and grey shows the current month revenue that's still being processed.
We've also cleaned up the transaction history. You'll now see your most recent transactions directly on the revenue page, along with any deposits from Modrinth into your account.
New Withdraw Methods
The second big goal of this release was to bring more options, better fees, and new ways to withdraw from countries that were previously hard to reach.
Withdrawing with ease from your balance using our new modal flow. Click the green Withdraw button to get started, and you'll immediately see all available methods and fees for your country, including a few new ones:
Bank Transfers (29 Countries)
You can now withdraw directly to your bank account via wire or ACH, depending on your country. Supported countries and their fees are listed below.
We're working to expand this list, most notably to Canada, the UK, and countries across Asia, but there's no timeline yet.
| Country | Currency | Transaction Fee | FX Fee | Total Fee |
|---|---|---|---|---|
| πΊπΈ USA | USD | $0.50 + 1% | 0.50% | ~1.5% + $0.50 |
| πͺπΊ EU | EUR | β¬1.00 + 1% | 0.60% | ~1.6% + β¬1.00 |
| π¦π· Argentina | ARS | $0.00 + 1% | 0.50% | ~1.5% |
| π²π½ Mexico | MXN | $0.50 + 1% | 0.90% | ~1.9% + $0.50 |
| π§π· Brazil | BRL | $0.25 + 1% | 1.30% (incl. IOF) | ~2.3% + $0.25 |
| π¨π± Chile | CLP | $1.20 + 1% | 0.95% | ~2.0% + $1.20 |
| π¨π· Costa Rica | CRC | $0.80 + 1% | 1.05% | ~2.1% + $0.80 |
| π΅πͺ Peru (PEN) | PEN | $1.00 + 1% | 1.15% | ~2.1% + $1.00 |
| πΏπ¦ South Africa | ZAR | $1.50 + 1% | 1.40% | ~2.4% + $1.50 |
| π΅πͺ Peru (USD) | USD | $5.00 + 1% | 0.50% | ~1.5% + $5.00 |
| π¨π΄ Colombia | COP | $0.35 + 1% | 0.95% (incl. GMF) | ~2.0% + $0.35 |
Total Fee includes both transaction and FX fees.
Supported EU countries: Austria, Belgium, Cyprus, Estonia, Finland, France, Germany, Greece, Ireland, Italy, Latvia, Lithuania, Luxembourg, Malta, Netherlands, Portugal, Slovakia, Spain
Crypto Withdrawals (USDC)
We've also added USDC withdrawals on the Polygon network. This option is available worldwide, so everyone can now withdraw funds. Fees are a flat 1% + network fees, making it a great low-cost option.
PayPal & Venmo
We've moved PayPal and Venmo to two different methods depending on your country:
- United States: PayPal and Venmo will remain on the existing system with the same low fees: $0.25 + 2%, capped at $1.00.
- Outside of the United States: PayPal and Venmo have been moved to Tremendous, which has zero FX fees and charges a flat 6%, capped at $25.00. This should be an improvement over the old method for larger creators, where PayPal charged high uncapped fees for currency conversion.
New Email Notifications
Earlier this month, we quietly rolled out a new email system that lets us give both creators and users better feedback about what's going on.
This includes emails for things like project status changes, payouts available, and successful withdrawals. We plan to keep building on this and will be adding email preference settings soon!
Tax Compliance
Last but not least, we're also rolling out our new tax compliance system. We partially rolled this out earlier this month, but the full version is now live.
Creator withdrawals will now be limited to $600.00 USD per calendar year as of 2025, per U.S. regulations. As a creator approaches that threshold, they'll be prompted to fill out a W-8 or W-9 tax form, depending on their country.
Completing this form helps Modrinth stay compliant and will automatically unlock withdrawals again once submitted. For non-US users, these details are not automatically sent to the US government! They are for our own records in the case of an audit and we need to prove where we're sending money to.
Thank you to all the creators and players supporting Modrinth, we hope you enjoy this long deserved update! π
`; diff --git a/packages/blog/compiled/creator_withdrawals_overhaul.ts b/packages/blog/compiled/creator_withdrawals_overhaul.ts new file mode 100644 index 00000000..cd7b41cf --- /dev/null +++ b/packages/blog/compiled/creator_withdrawals_overhaul.ts @@ -0,0 +1,12 @@ +// AUTO-GENERATED FILE - DO NOT EDIT +export const article = { + html: () => import(`./creator_withdrawals_overhaul.content`).then(m => m.html), + title: "More Ways to Withdraw", + summary: "Coming soon: new withdraw options and a redesigned revenue dashboard", + date: "2025-10-27T23:30:00.000Z", + slug: "creator-withdrawals-overhaul", + authors: ["AJfd8YH6","bOHH0P9Z","xSQqYYIN"], + unlisted: false, + thumbnail: true, + +}; diff --git a/packages/blog/compiled/index.ts b/packages/blog/compiled/index.ts index 33ce60b1..fbc9f0e1 100644 --- a/packages/blog/compiled/index.ts +++ b/packages/blog/compiled/index.ts @@ -7,6 +7,7 @@ import { article as carbon_ads } from "./carbon_ads"; import { article as creator_monetization } from "./creator_monetization"; import { article as creator_update } from "./creator_update"; import { article as creator_updates_july_2025 } from "./creator_updates_july_2025"; +import { article as creator_withdrawals_overhaul } from "./creator_withdrawals_overhaul"; import { article as design_refresh } from "./design_refresh"; import { article as download_adjustment } from "./download_adjustment"; import { article as free_server_medal } from "./free_server_medal"; @@ -57,6 +58,7 @@ export const articles = [ free_server_medal, download_adjustment, design_refresh, + creator_withdrawals_overhaul, creator_updates_july_2025, creator_update, creator_monetization, diff --git a/packages/blog/public/creator-withdrawals-overhaul/balance-progress-bar.mp4 b/packages/blog/public/creator-withdrawals-overhaul/balance-progress-bar.mp4 new file mode 100644 index 00000000..05131a28 Binary files /dev/null and b/packages/blog/public/creator-withdrawals-overhaul/balance-progress-bar.mp4 differ diff --git a/packages/blog/public/creator-withdrawals-overhaul/revenue-page-from-home.mp4 b/packages/blog/public/creator-withdrawals-overhaul/revenue-page-from-home.mp4 new file mode 100644 index 00000000..4af4e18a Binary files /dev/null and b/packages/blog/public/creator-withdrawals-overhaul/revenue-page-from-home.mp4 differ diff --git a/packages/blog/public/creator-withdrawals-overhaul/tax-compliance.png b/packages/blog/public/creator-withdrawals-overhaul/tax-compliance.png new file mode 100644 index 00000000..d41170ba Binary files /dev/null and b/packages/blog/public/creator-withdrawals-overhaul/tax-compliance.png differ diff --git a/packages/blog/public/creator-withdrawals-overhaul/thumbnail.webp b/packages/blog/public/creator-withdrawals-overhaul/thumbnail.webp new file mode 100644 index 00000000..97265aa6 Binary files /dev/null and b/packages/blog/public/creator-withdrawals-overhaul/thumbnail.webp differ diff --git a/packages/blog/public/creator-withdrawals-overhaul/withdraw-example.mp4 b/packages/blog/public/creator-withdrawals-overhaul/withdraw-example.mp4 new file mode 100644 index 00000000..ef5edd61 Binary files /dev/null and b/packages/blog/public/creator-withdrawals-overhaul/withdraw-example.mp4 differ diff --git a/packages/modrinth-maxmind/Cargo.toml b/packages/modrinth-maxmind/Cargo.toml new file mode 100644 index 00000000..15f87aae --- /dev/null +++ b/packages/modrinth-maxmind/Cargo.toml @@ -0,0 +1,25 @@ +[package] +name = "modrinth-maxmind" +edition.workspace = true +rust-version.workspace = true +repository.workspace = true + +[dependencies] +bytes = { workspace = true } +directories = { workspace = true } +eyre = { workspace = true } +flate2 = { workspace = true } +maxminddb = { workspace = true } +modrinth-util = { workspace = true } +reqwest = { workspace = true, features = ["json"] } +tar = { workspace = true } +tokio = { workspace = true, features = ["fs"] } +tracing = { workspace = true } + +[dev-dependencies] +clap = { workspace = true, features = ["derive"] } +tokio = { workspace = true, features = ["full"] } +tracing-subscriber = { workspace = true } + +[lints] +workspace = true diff --git a/packages/modrinth-maxmind/README.md b/packages/modrinth-maxmind/README.md new file mode 100644 index 00000000..9884bf55 --- /dev/null +++ b/packages/modrinth-maxmind/README.md @@ -0,0 +1 @@ +Allows opening and reading a MaxMind GeoIP database, for use in an `actix-web` app. diff --git a/packages/modrinth-maxmind/examples/maxmind.rs b/packages/modrinth-maxmind/examples/maxmind.rs new file mode 100644 index 00000000..ab104331 --- /dev/null +++ b/packages/modrinth-maxmind/examples/maxmind.rs @@ -0,0 +1,35 @@ +//! Example/testing binary for checking if a MaxMind database can be loaded from +//! the current environment. + +use std::net::IpAddr; + +use eyre::Result; +use maxminddb::geoip2; +use modrinth_util::Context; +use tracing::info; + +/// Looks up country details for an IP using the MaxMind database +#[derive(Debug, clap::Parser)] +struct Args { + /// IP address to look up + ip: IpAddr, +} + +#[tokio::main] +async fn main() -> Result<()> { + let args =