eightequal/AstralRinth
1
0
Fork 0
forked from didirus/AstralRinth
Code Pull Requests Activity

Merge tag 'v0.10.21' into beta

Browse Source
This commit is contained in:
didirus
2025-11-28 22:23:28 +03:00
parent 82119a9fc9 fe684ab903
commit cac3b46652
21 changed files with 503 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
apps/app-frontend/src/pages/instance/Mods.vue
View File

@@ -301,11 +301,13 @@ import {
get_organization_many,
get_project_many,
get_team_many,
get_version,
get_version_many,
} from '@/helpers/cache.js'
import { profile_listener } from '@/helpers/events.js'
import {
add_project_from_path,
get,
get_projects,
remove_project,
toggle_disable_project,
@@ -314,6 +316,7 @@ import {
} from '@/helpers/profile.js'
import type { CacheBehaviour, ContentFile, GameInstance } from '@/helpers/types'
import { highlightModInProfile } from '@/helpers/utils.js'
import { installVersionDependencies } from '@/store/install'
const { handleError } = injectNotificationManager()
@@ -627,10 +630,15 @@ const sortProjects = (filter: string) => {
const updateAll = async () => {
const setProjects = []
const outdatedProjects = []
for (const [i, project] of projects.value.entries()) {
if (project.outdated) {
project.updating = true
setProjects.push(i)
if (project.updateVersion) {
outdatedProjects.push(project.updateVersion)
}
}
}
@@ -646,6 +654,21 @@ const updateAll = async () => {
projects.value[index].updateVersion = undefined
}
}
if (outdatedProjects.length > 0) {
const profile = await get(props.instance.path).catch(handleError)
if (profile) {
for (const versionId of outdatedProjects) {
const versionData = await get_version(versionId, 'must_revalidate').catch(handleError)
if (versionData) {
await installVersionDependencies(profile, versionData).catch(handleError)
}
}
}
}
for (const project of setProjects) {
projects.value[project].updating = false
}
@@ -662,6 +685,19 @@ const updateProject = async (mod: ProjectListEntry) => {
mod.updating = true
await new Promise((resolve) => setTimeout(resolve, 0))
mod.path = await update_project(props.instance.path, mod.path).catch(handleError)
if (mod.updateVersion) {
const versionData = await get_version(mod.updateVersion, 'must_revalidate').catch(handleError)
if (versionData) {
const profile = await get(props.instance.path).catch(handleError)
if (profile) {
await installVersionDependencies(profile, versionData).catch(handleError)
}
}
}
mod.updating = false
mod.outdated = false

1
apps/app/src/main.rs
View File

@@ -2,6 +2,7 @@
all(not(debug_assertions), target_os = "windows"),
windows_subsystem = "windows"
)]
#![recursion_limit = "256"]
use native_dialog::{DialogBuilder, MessageLevel};
use std::env;

11
apps/frontend/src/components/ui/moderation/checklist/ModerationChecklist.vue
View File

@@ -85,6 +85,7 @@
<ModpackPermissionsFlow
v-model="modpackJudgements"
:project-id="project.id"
:project-updated="project.updated"
@complete="handleModpackPermissionsComplete"
/>
</div>
@@ -446,6 +447,11 @@ function resetProgress() {
localStorage.removeItem(`modpack-permissions-${props.project.id}`)
localStorage.removeItem(`modpack-permissions-index-${props.project.id}`)
sessionStorage.removeItem(`modpack-permissions-data-${props.project.id}`)
sessionStorage.removeItem(`modpack-permissions-permanent-no-${props.project.id}`)
sessionStorage.removeItem(`modpack-permissions-updated-${props.project.id}`)
modpackPermissionsComplete.value = false
modpackJudgements.value = {}
@@ -1331,6 +1337,11 @@ function clearProjectLocalStorage() {
localStorage.removeItem(`moderation-actions-${props.project.slug}`)
localStorage.removeItem(`moderation-inputs-${props.project.slug}`)
localStorage.removeItem(`moderation-stage-${props.project.slug}`)
sessionStorage.removeItem(`modpack-permissions-data-${props.project.id}`)
sessionStorage.removeItem(`modpack-permissions-permanent-no-${props.project.id}`)
sessionStorage.removeItem(`modpack-permissions-updated-${props.project.id}`)
actionStates.value = {}
}

13
apps/frontend/src/components/ui/moderation/checklist/ModpackPermissionsFlow.vue
View File

@@ -161,6 +161,7 @@ import { computed, onMounted, ref, watch } from 'vue'
const props = defineProps<{
projectId: string
projectUpdated: string
modelValue?: ModerationJudgements
}>()
@@ -202,6 +203,10 @@ const permanentNoFiles = useSessionStorage<ModerationModpackItem[]>(
},
},
)
const cachedProjectUpdated = useSessionStorage<string | null>(
`modpack-permissions-updated-${props.projectId}`,
null,
)
const currentIndex = ref(0)
const fileApprovalTypes: ModerationModpackPermissionApprovalType[] = [
@@ -363,11 +368,13 @@ async function fetchModPackData(): Promise<void> {
}
modPackData.value = sortedData
cachedProjectUpdated.value = props.projectUpdated
persistAll()
} catch (error) {
console.error('Failed to fetch modpack data:', error)
modPackData.value = []
permanentNoFiles.value = []
cachedProjectUpdated.value = props.projectUpdated
persistAll()
}
}
@@ -457,7 +464,10 @@ function getJudgements(): ModerationJudgements {
onMounted(() => {
loadPersistedData()
if (!modPackData.value) {
const isStale = cachedProjectUpdated.value !== props.projectUpdated
if (!modPackData.value || isStale) {
fetchModPackData()
}
})
@@ -477,6 +487,7 @@ watch(
() => props.projectId,
() => {
clearPersistedData()
cachedProjectUpdated.value = null
loadPersistedData()
if (!modPackData.value) {
fetchModPackData()

17
apps/frontend/src/pages/servers/manage/[id]/options/index.vue
View File

@@ -84,16 +84,19 @@
@change="uploadFile"
/>
<div
class="absolute top-0 hidden size-[6rem] flex-col items-center justify-center rounded-xl bg-button-bg p-2 opacity-80 group-hover:flex"
class="absolute top-0 hidden size-24 flex-col items-center justify-center rounded-xl bg-button-bg p-2 opacity-80 group-hover:flex"
>
<EditIcon class="h-8 w-8 text-contrast" />
</div>
<ServerIcon :image="icon" />
<ServerIcon class="size-24" :image="icon" />
</div>
<ButtonStyled>
<button v-tooltip="'Synchronize icon with installed modpack'" @click="resetIcon">
<TransferIcon class="h-6 w-6" />
<span>Sync icon</span>
<button
v-tooltip="'Synchronize icon with installed modpack'"
class="my-auto"
@click="resetIcon"
>
<TransferIcon /> Sync icon
</button>
</ButtonStyled>
</div>
@@ -112,8 +115,8 @@
</template>
<script setup lang="ts">
import { EditIcon, ServerIcon, TransferIcon } from '@modrinth/assets'
import { injectNotificationManager } from '@modrinth/ui'
import { EditIcon, TransferIcon } from '@modrinth/assets'
import { injectNotificationManager, ServerIcon } from '@modrinth/ui'
import ButtonStyled from '@modrinth/ui/src/components/base/ButtonStyled.vue'
import SaveBanner from '~/components/ui/servers/SaveBanner.vue'

8
apps/frontend/src/pages/user/[id].vue
View File

@@ -304,7 +304,13 @@
/>
</div>
</div>
<div v-else-if="route.params.projectType !== 'collections'" class="error">
<div
v-else-if="
(route.params.projectType && route.params.projectType !== 'collections') ||
(!route.params.projectType && collections.length === 0)
"
class="error"
>
<UpToDate class="icon" />
<br />
<span v-if="auth.user && auth.user.id === user.id" class="preserve-lines text">

4
apps/labrinth/Cargo.toml
View File

@@ -71,8 +71,8 @@ json-patch = { workspace = true }
lettre = { workspace = true }
meilisearch-sdk = { workspace = true, features = ["reqwest"] }
modrinth-maxmind = { workspace = true }
modrinth-util = { workspace = true }
muralpay = { workspace = true, features = ["utoipa", "mock"] }
modrinth-util = { workspace = true, features = ["decimal", "utoipa"] }
muralpay = { workspace = true, features = ["mock", "utoipa"] }
murmur2 = { workspace = true }
paste = { workspace = true }
path-util = { workspace = true }

3
apps/labrinth/src/background_task.rs
View File

@@ -197,7 +197,8 @@ pub async fn payouts(
}
pub async fn sync_payout_statuses(pool: sqlx::Pool<Postgres>, mural: MuralPay) {
const LIMIT: u32 = 1000;
// Mural sets a max limit of 100 for search payouts endpoint
const LIMIT: u32 = 100;
info!("Started syncing payout statuses");

6
apps/labrinth/src/lib.rs
View File

@@ -9,7 +9,7 @@ use queue::{
session::AuthQueue, socket::ActiveSockets,
};
use sqlx::Postgres;
use tracing::{info, warn};
use tracing::{debug, info, warn};
extern crate clickhouse as clickhouse_crate;
use clickhouse_crate::Client;
@@ -240,14 +240,14 @@ pub fn app_setup(
let redis_ref = redis_ref.clone();
async move {
info!("Indexing analytics queue");
debug!("Indexing analytics queue");
let result = analytics_queue_ref
.index(client_ref, &redis_ref, &pool_ref)
.await;
if let Err(e) = result {
warn!("Indexing analytics queue failed: {:?}", e);
}
info!("Done indexing analytics queue");
debug!("Done indexing analytics queue");
}
});
}

4
apps/labrinth/src/models/v3/payouts.rs
View File

@@ -252,9 +252,9 @@ pub struct PayoutMethodFee {
}
impl PayoutMethodFee {
pub fn compute_fee(&self, value: Decimal) -> Decimal {
pub fn compute_fee(&self, value: impl Into<Decimal>) -> Decimal {
cmp::min(
cmp::max(self.min, self.percentage * value),
cmp::max(self.min, self.percentage * value.into()),
self.max.unwrap_or(Decimal::MAX),
)
}

40
apps/labrinth/src/queue/payouts/mod.rs
View File

@@ -20,10 +20,11 @@ use chrono::{DateTime, Datelike, Duration, NaiveTime, TimeZone, Utc};
use dashmap::DashMap;
use eyre::{Result, eyre};
use futures::TryStreamExt;
use modrinth_util::decimal::Decimal2dp;
use muralpay::MuralPay;
use reqwest::Method;
use rust_decimal::prelude::ToPrimitive;
use rust_decimal::{Decimal, dec};
use rust_decimal::{Decimal, RoundingStrategy, dec};
use serde::de::DeserializeOwned;
use serde::{Deserialize, Serialize};
use serde_json::Value;
@@ -618,7 +619,7 @@ impl PayoutsQueue {
&self,
request: &PayoutMethodRequest,
method_id: &str,
amount: Decimal,
amount: Decimal2dp,
) -> Result<PayoutFees, ApiError> {
const MURAL_FEE: Decimal = dec!(0.01);
@@ -641,8 +642,9 @@ impl PayoutsQueue {
..
},
} => PayoutFees {
method_fee: dec!(0),
platform_fee: amount * MURAL_FEE,
method_fee: Decimal2dp::ZERO,
platform_fee: amount
.mul_round(MURAL_FEE, RoundingStrategy::AwayFromZero),
exchange_rate: None,
},
PayoutMethodRequest::MuralPay {
@@ -667,8 +669,14 @@ impl PayoutsQueue {
fee_total,
..
} => PayoutFees {
method_fee: fee_total.token_amount,
platform_fee: amount * MURAL_FEE,
method_fee: Decimal2dp::rounded(
fee_total.token_amount,
RoundingStrategy::AwayFromZero,
),
platform_fee: amount.mul_round(
MURAL_FEE,
RoundingStrategy::AwayFromZero,
),
exchange_rate: Some(exchange_rate),
},
muralpay::TokenPayoutFee::Error { message, .. } => {
@@ -680,16 +688,22 @@ impl PayoutsQueue {
}
PayoutMethodRequest::PayPal | PayoutMethodRequest::Venmo => {
let method = get_method.await?;
let fee = method.fee.compute_fee(amount);
let fee = Decimal2dp::rounded(
method.fee.compute_fee(amount),
RoundingStrategy::AwayFromZero,
);
PayoutFees {
method_fee: fee,
platform_fee: dec!(0),
platform_fee: Decimal2dp::ZERO,
exchange_rate: None,
}
}
PayoutMethodRequest::Tremendous { method_details } => {
let method = get_method.await?;
let fee = method.fee.compute_fee(amount);
let fee = Decimal2dp::rounded(
method.fee.compute_fee(amount),
RoundingStrategy::AwayFromZero,
);
let forex: TremendousForexResponse = self
.make_tremendous_request(Method::GET, "forex", None::<()>)
@@ -718,7 +732,7 @@ impl PayoutsQueue {
// we send the request to Tremendous. Afterwards, the method
// (Tremendous) will take 0% off the top of our $10.
PayoutFees {
method_fee: dec!(0),
method_fee: Decimal2dp::ZERO,
platform_fee: fee,
exchange_rate,
}
@@ -736,19 +750,19 @@ pub struct PayoutFees {
/// For example, if a user withdraws $10.00 and the method takes a
/// 10% cut, then we submit a payout request of $10.00 to the method,
/// and only $9.00 will be sent to the recipient.
pub method_fee: Decimal,
pub method_fee: Decimal2dp,
/// Fee which we keep and don't pass to the underlying method.
///
/// For example, if a user withdraws $10.00 and the method takes a
/// 10% cut, then we submit a payout request of $9.00, and the $1.00 stays
/// in our account.
pub platform_fee: Decimal,
pub platform_fee: Decimal2dp,
/// How much is 1 USD worth in the target currency?
pub exchange_rate: Option<Decimal>,
}
impl PayoutFees {
pub fn total_fee(&self) -> Decimal {
pub fn total_fee(&self) -> Decimal2dp {
self.method_fee + self.platform_fee
}
}

62
apps/labrinth/src/queue/payouts/mural.rs
View File

@@ -2,11 +2,12 @@ use ariadne::ids::UserId;
use chrono::Utc;
use eyre::{Result, eyre};
use futures::{StreamExt, TryFutureExt, stream::FuturesUnordered};
use modrinth_util::decimal::Decimal2dp;
use muralpay::{MuralError, MuralPay, TokenFeeRequest};
use rust_decimal::{Decimal, prelude::ToPrimitive};
use serde::{Deserialize, Serialize};
use sqlx::PgPool;
use tracing::warn;
use tracing::{info, trace, warn};
use crate::{
database::models::DBPayoutId,
@@ -35,7 +36,7 @@ pub enum MuralPayoutRequest {
impl PayoutsQueue {
pub async fn compute_muralpay_fees(
&self,
amount: Decimal,
amount: Decimal2dp,
fiat_and_rail_code: muralpay::FiatAndRailCode,
) -> Result<muralpay::TokenPayoutFee, ApiError> {
let muralpay = self.muralpay.load();
@@ -48,7 +49,7 @@ impl PayoutsQueue {
.get_fees_for_token_amount(&[TokenFeeRequest {
amount: muralpay::TokenAmount {
token_symbol: muralpay::USDC.into(),
token_amount: amount,
token_amount: amount.get(),
},
fiat_and_rail_code,
}])
@@ -65,7 +66,7 @@ impl PayoutsQueue {
&self,
payout_id: DBPayoutId,
user_id: UserId,
gross_amount: Decimal,
gross_amount: Decimal2dp,
fees: PayoutFees,
payout_details: MuralPayoutRequest,
recipient_info: muralpay::PayoutRecipientInfo,
@@ -107,9 +108,9 @@ impl PayoutsQueue {
let recipient_address = recipient_info.physical_address();
let recipient_email = recipient_info.email().to_string();
let gross_amount_cents = gross_amount * Decimal::from(100);
let net_amount_cents = net_amount * Decimal::from(100);
let fees_cents = fees.total_fee() * Decimal::from(100);
let gross_amount_cents = gross_amount.get() * Decimal::from(100);
let net_amount_cents = net_amount.get() * Decimal::from(100);
let fees_cents = fees.total_fee().get() * Decimal::from(100);
let address_line_3 = format!(
"{}, {}, {}",
recipient_address.city,
@@ -153,7 +154,7 @@ impl PayoutsQueue {
let payout = muralpay::CreatePayout {
amount: muralpay::TokenAmount {
token_amount: sent_to_method,
token_amount: sent_to_method.get(),
token_symbol: muralpay::USDC.into(),
},
payout_details,
@@ -271,6 +272,8 @@ pub async fn sync_pending_payouts_from_mural(
status: PayoutStatus,
}
info!("Syncing pending payouts from Mural");
let mut txn = db
.begin()
.await
@@ -299,6 +302,8 @@ pub async fn sync_pending_payouts_from_mural(
.await
.wrap_internal_err("failed to fetch incomplete Mural payouts")?;
info!("Found {} incomplete Mural payouts", rows.len());
let futs = rows.into_iter().map(|row| async move {
let platform_id = row.platform_id.wrap_err("no platform ID")?;
let payout_request_id = platform_id.parse::<muralpay::PayoutRequestId>()
@@ -369,6 +374,8 @@ pub async fn sync_failed_mural_payouts_to_labrinth(
mural: &MuralPay,
limit: u32,
) -> eyre::Result<()> {
info!("Syncing failed Mural payouts to Labrinth");
let mut next_id = None;
loop {
let search_resp = mural
@@ -393,8 +400,22 @@ pub async fn sync_failed_mural_payouts_to_labrinth(
break;
}
let mut payout_platform_id = Vec::<String>::new();
let mut payout_new_status = Vec::<String>::new();
let num_canceled = search_resp
.results
.iter()
.filter(|p| p.status == muralpay::PayoutStatus::Canceled)
.count();
let num_failed = search_resp
.results
.iter()
.filter(|p| p.status == muralpay::PayoutStatus::Failed)
.count();
info!(
"Found {num_canceled} canceled and {num_failed} failed Mural payouts"
);
let mut payout_platform_ids = Vec::<String>::new();
let mut payout_new_statuses = Vec::<String>::new();
for payout_req in search_resp.results {
let new_payout_status = match payout_req.status {
@@ -408,12 +429,17 @@ pub async fn sync_failed_mural_payouts_to_labrinth(
continue;
}
};
let payout_platform_id = payout_req.id;
payout_platform_id.push(payout_req.id.to_string());
payout_new_status.push(new_payout_status.to_string());
trace!(
"- Payout {payout_platform_id} set to {new_payout_status:?}",
);
payout_platform_ids.push(payout_platform_id.to_string());
payout_new_statuses.push(new_payout_status.to_string());
}
sqlx::query!(
let result = sqlx::query!(
"
UPDATE payouts
SET status = u.status
@@ -422,14 +448,20 @@ pub async fn sync_failed_mural_payouts_to_labrinth(
payouts.method = $3
AND payouts.platform_id = u.platform_id
",
&payout_platform_id,
&payout_new_status,
&payout_platform_ids,
&payout_new_statuses,
PayoutMethodType::MuralPay.as_str(),
)
.execute(db)
.await
.wrap_internal_err("failed to update payout statuses")?;
info!(
"Attempted to update {} payouts in database from Mural info, {} rows affected",
payout_platform_ids.len(),
result.rows_affected()
);
if next_id.is_none() {
break;
}

46
apps/labrinth/src/routes/v3/payouts.rs
View File

@@ -22,8 +22,9 @@ use chrono::{DateTime, Duration, Utc};
use eyre::eyre;
use hex::ToHex;
use hmac::{Hmac, Mac};
use modrinth_util::decimal::Decimal2dp;
use reqwest::Method;
use rust_decimal::Decimal;
use rust_decimal::{Decimal, RoundingStrategy};
use serde::{Deserialize, Serialize};
use serde_json::json;
use sha2::Sha256;
@@ -423,8 +424,7 @@ pub async fn tremendous_webhook(
#[derive(Debug, Serialize, Deserialize, utoipa::ToSchema)]
pub struct Withdrawal {
#[serde(with = "rust_decimal::serde::float")]
amount: Decimal,
amount: Decimal2dp,
#[serde(flatten)]
method: PayoutMethodRequest,
method_id: String,
@@ -432,7 +432,7 @@ pub struct Withdrawal {
#[derive(Debug, Serialize, Deserialize)]
pub struct WithdrawalFees {
pub fee: Decimal,
pub fee: Decimal2dp,
pub exchange_rate: Option<Decimal>,
}
@@ -583,7 +583,8 @@ pub async fn create_payout(
let fees = payouts_queue
.calculate_fees(&body.method, &body.method_id, body.amount)
.await?;
.await
.wrap_internal_err("failed to compute fees")?;
// fees are a bit complicated here, since we have 2 types:
// - method fees - this is what Tremendous, Mural, etc. will take from us
@@ -595,14 +596,18 @@ pub async fn create_payout(
// then we issue a payout request with `amount - platform fees`
let amount_minus_fee = body.amount - fees.total_fee();
if amount_minus_fee.round_dp(2) <= Decimal::ZERO {
if amount_minus_fee <= Decimal::ZERO {
return Err(ApiError::InvalidInput(
"You need to withdraw more to cover the fee!".to_string(),
));
}
let sent_to_method = (body.amount - fees.platform_fee).round_dp(2);
assert!(sent_to_method > Decimal::ZERO);
let sent_to_method = body.amount - fees.platform_fee;
if sent_to_method <= Decimal::ZERO {
return Err(ApiError::InvalidInput(
"You need to withdraw more to cover the fee!".to_string(),
));
}
let payout_id = generate_payout_id(&mut transaction)
.await
@@ -653,13 +658,13 @@ struct PayoutContext<'a> {
body: &'a Withdrawal,
user: &'a DBUser,
payout_id: DBPayoutId,
gross_amount: Decimal,
gross_amount: Decimal2dp,
fees: PayoutFees,
/// Set as the [`DBPayout::amount`] field.
amount_minus_fee: Decimal,
amount_minus_fee: Decimal2dp,
/// Set as the [`DBPayout::fee`] field.
total_fee: Decimal,
sent_to_method: Decimal,
total_fee: Decimal2dp,
sent_to_method: Decimal2dp,
payouts_queue: &'a PayoutsQueue,
}
@@ -721,7 +726,10 @@ async fn tremendous_payout(
forex.forex.get(&currency_code).wrap_internal_err_with(|| {
eyre!("no Tremendous forex data for {currency}")
})?;
(sent_to_method * *exchange_rate, Some(currency_code))
(
sent_to_method.mul_round(*exchange_rate, RoundingStrategy::ToZero),
Some(currency_code),
)
} else {
(sent_to_method, None)
};
@@ -770,8 +778,8 @@ async fn tremendous_payout(
user_id: user.id,
created: Utc::now(),
status: PayoutStatus::InTransit,
amount: amount_minus_fee,
fee: Some(total_fee),
amount: amount_minus_fee.get(),
fee: Some(total_fee.get()),
method: Some(PayoutMethodType::Tremendous),
method_id: Some(body.method_id.clone()),
method_address: Some(user_email.to_string()),
@@ -825,8 +833,8 @@ async fn mural_pay_payout(
// after the payout has been successfully executed,
// we wait for Mural's confirmation that the funds have been delivered
status: PayoutStatus::InTransit,
amount: amount_minus_fee,
fee: Some(total_fee),
amount: amount_minus_fee.get(),
fee: Some(total_fee.get()),
method: Some(PayoutMethodType::MuralPay),
method_id: Some(method_id),
method_address: Some(user_email.to_string()),
@@ -962,8 +970,8 @@ async fn paypal_payout(
user_id: user.id,
created: Utc::now(),
status: PayoutStatus::InTransit,
amount: amount_minus_fee,
fee: Some(total_fee),
amount: amount_minus_fee.get(),
fee: Some(total_fee.get()),
method: Some(body.method.method_type()),
method_id: Some(body.method_id.clone()),
method_address: Some(display_address.clone()),