1berry/modrinth-code
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove url field from shared instance routes

Browse Source
This commit is contained in:
Josiah Glosson 2025-06-12 12:59:08 -05:00
parent b76d0fdcc3
commit 26364f65d6
2 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apps/labrinth/src/routes/v3/shared_instance_version_creation.rs
View File

@ -3,21 +3,23 @@ use crate::database::models::shared_instance_item::{
DBSharedInstance, DBSharedInstanceUser, DBSharedInstanceVersion, DBSharedInstance, DBSharedInstanceUser, DBSharedInstanceVersion,
}; };
use crate::database::models::{ use crate::database::models::{
generate_shared_instance_version_id, DBSharedInstanceId, DBSharedInstanceId, DBSharedInstanceVersionId,
DBSharedInstanceVersionId, generate_shared_instance_version_id,
}; };
use crate::database::redis::RedisPool; use crate::database::redis::RedisPool;
use crate::file_hosting::{FileHost, FileHostPublicity}; use crate::file_hosting::{FileHost, FileHostPublicity};
use crate::models::ids::{SharedInstanceId, SharedInstanceVersionId}; use crate::models::ids::{SharedInstanceId, SharedInstanceVersionId};
use crate::models::pats::Scopes; use crate::models::pats::Scopes;
use crate::models::shared_instances::{SharedInstanceUserPermissions, SharedInstanceVersion}; use crate::models::shared_instances::{
SharedInstanceUserPermissions, SharedInstanceVersion,
};
use crate::queue::session::AuthQueue; use crate::queue::session::AuthQueue;
use crate::routes::v3::project_creation::UploadedFile;
use crate::routes::ApiError; use crate::routes::ApiError;
use crate::routes::v3::project_creation::UploadedFile;
use crate::util::ext::MRPACK_MIME_TYPE; use crate::util::ext::MRPACK_MIME_TYPE;
use actix_web::http::header::ContentLength; use actix_web::http::header::ContentLength;
use actix_web::web::Data; use actix_web::web::Data;
use actix_web::{web, HttpRequest, HttpResponse}; use actix_web::{HttpRequest, HttpResponse, web};
use bytes::BytesMut; use bytes::BytesMut;
use chrono::Utc; use chrono::Utc;
use futures_util::StreamExt; use futures_util::StreamExt;

15
apps/labrinth/src/routes/v3/shared_instances.rs
View File

@ -415,21 +415,14 @@ pub async fn shared_instance_version_get(
.await? .await?
.map(|(_, user)| user); .map(|(_, user)| user);
let version = let version = DBSharedInstanceVersion::get(version_id, &**pool).await?;
DBSharedInstanceVersion::get(version_id, &**pool).await?;
if let Some(version) = version { if let Some(version) = version {
let instance = DBSharedInstance::get( let instance =
version.shared_instance_id, DBSharedInstance::get(version.shared_instance_id, &**pool).await?;
&**pool,
)
.await?;
if let Some(instance) = instance { if let Some(instance) = instance {
if !can_access_instance_as_maybe_user( if !can_access_instance_as_maybe_user(
&pool, &pool, &redis, &instance, user,
&redis,
&instance,
user,
) )
.await? .await?
{ {