Merge commit '36367e475e1849445718a2ecec8ee5b74110ff08' into feature-clean

apps/frontend/src/pages/servers/index.vue

@@ -771,7 +771,7 @@
         </ul>
 
         <div
-          class="flex w-full flex-col items-start justify-between gap-4 rounded-2xl bg-bg p-8 text-left lg:flex-row lg:gap-0"
+          class="mb-4 flex w-full flex-col items-start justify-between gap-4 rounded-2xl bg-bg p-8 text-left lg:flex-row lg:gap-0"
         >
           <div class="flex flex-col gap-4">
             <h1 class="m-0">Build your own</h1>

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

@@ -2300,8 +2300,6 @@ pub async fn index_billing(
         )
         .await?;
 
-        let mut transaction = pool.begin().await?;
-
         for mut charge in charges_to_do {
             let product_price = if let Some(price) =
                 prices.iter().find(|x| x.id == charge.price_id)
@@ -2396,19 +2394,28 @@ pub async fn index_billing(
 
                     charge.status = ChargeStatus::Processing;
 
-                    stripe::PaymentIntent::create(&stripe_client, intent)
-                        .await?;
+                    if let Err(e) =
+                        stripe::PaymentIntent::create(&stripe_client, intent)
+                            .await
+                    {
+                        tracing::error!(
+                            "Failed to create payment intent: {:?}",
+                            e
+                        );
+                        charge.status = ChargeStatus::Failed;
+                        charge.last_attempt = Some(Utc::now());
+                    }
                 } else {
                     charge.status = ChargeStatus::Failed;
                     charge.last_attempt = Some(Utc::now());
                 }
 
+                let mut transaction = pool.begin().await?;
                 charge.upsert(&mut transaction).await?;
+                transaction.commit().await?;
             }
         }
 
-        transaction.commit().await?;
-
         Ok::<(), ApiError>(())
     }
     .await;

packages/utils/changelog.ts

@@ -10,6 +10,25 @@ export type VersionEntry = {
 }
 
 const VERSIONS: VersionEntry[] = [
+  {
+    date: `2025-04-01T21:15:00-07:00`,
+    product: 'web',
+    body: `### Added
+- Reverted Modrinth Pizza due to issues in pizza processing leading to users being redirected to [this page](https://modrinth.com/pizza/error).
+- Fixed bug causing theme color to turn orange and corners turn sharp.`,
+  },
+  {
+    date: `2025-04-01T12:00:00`,
+    product: 'web',
+    body: `### Added
+- Added Modrinth Pizza.`,
+  },
+  {
+    date: `2025-04-01T00:00:00`,
+    product: 'web',
+    body: `### Improvements
+- Fixed project version field accepting more than 32 characters.`,
+  },
   {
     date: `2025-03-25T18:25:00-07:00`,
     product: 'web',