mirror of
https://github.com/modrinth/code.git
synced 2026-09-02 13:05:50 +00:00
feat: instance sharing thru shared-instances service (#6569)
* feat: implement instance share page + search_users backend call * feat: invite players modal * feat: use tanstack queries for friends sync across app pages * feat: base shared instances implementation * fix: admon style * feat: impl instance admonitions like server panel * fix: impl get + del usage * feat: support modpack links * feat: invite notif accepting * fix: lint + fmt * feat: impl install to play * feat: impl usage of UpdateToPlayModal * feat: warnings on deleting/disabling shared-instance version content * fix: send instance name * feat: align with backend * feat: shared instances qa * feat: wrong account protection * feat: qa * fix: smartly apply updates * fix: install bug * fix: 401/404 differentiation * fix: fmt+prepr * feat: qa * feat: qa * fix: signing out messes up revoke/deleted checks * feat: qa * fix: fmt + lint * feat: lock content if part of shared instance * fix: lint * [do not merge] feat: rough invite links impl temp (#6666) * fix: wrong cmd * feat: invite page * fix: server-manager DTO mismatch * fix: drop anonymous invite link acceptance * refactor: structured shared-instance unavailable errors * refactor: centralise error presentations * refactor: dedupe shared instance diff detection * fix: logging in reqwests * refactor: move app.vue shared instances into handler * refactor: break up Share.vue * refactor: split up shared instances state outside of instance index * refactor: dedicated shared instances install/update modals + split up page * refactor: centralized managed content * refactor: split up install shared to own runner + shared.rs split up * refactor: dedupe sql for instance metadata enrichmnt * refactor: friends composable + dedupe friends logic across usages * chore: reduced unused code * fix: align with backend * fix: lint * fix: file sha changes * fix: invite links not working due to icon signed * feat: qa * feat: reporting frontend dummy * fix: try use header * remove: file hash field * fix: pin box * feat: malware warning for shared instances * fix: cache rule * feat: config files syncing * feat: disable config sharing * fix: header * fix: use mark ready * fix: dont cause push update for configs * fix: lint * feat: sharing page in settings * feat: move config + change flow * fix: qa * fix: lint prepr * feat: proxy file upload thru shared instances backend * fix: use collapisible * fix: push config * fix: config * feat: swap out sign in modal for new one * fix: report flow * fix: exclude configs.zip from external warnings * fix: nuxi init * fix: config bundle downloading * fix: error notif * fix: polling * fix: qa * fix: lint + prepr * feat: shared instances moderation frontend + hook up report flow * fix: report copy * fix: lint * fix: lint * fix: modrinth ids being undefined * feat: instance quarantining * fix: prepr + fmt * fix: quarantined -> locked terminology * fix: missing endpoint impls + fmt * fix: missing api in build.rs * fix: share tab jittery * fix: fmt *PT bug * fix: invites count as users even if pending * fix: prepr * fix: invite page owner in users list * fix: lint * fix: qa * fix: lint * fix: members stale not clearing * fix: invite use joined_at field * fix: lint * fix: qa --------- Co-authored-by: sychic <47618543+Sychic@users.noreply.github.com>
This commit is contained in:
@@ -502,6 +502,13 @@ pub(crate) async fn add_project_bytes(
|
||||
version_id: Option<&str>,
|
||||
state: &State,
|
||||
) -> crate::Result<String> {
|
||||
if !path_util::is_safe_file_name(file_name) {
|
||||
return Err(crate::ErrorKind::InputError(format!(
|
||||
"Project file {file_name} has an invalid file name"
|
||||
))
|
||||
.into());
|
||||
}
|
||||
|
||||
let _content_lock = state.lock_instance_content(instance_id).await;
|
||||
let scope = resolve_content_scope(instance_id, None, state).await?;
|
||||
let project_type = match project_type {
|
||||
@@ -561,6 +568,7 @@ pub(crate) async fn add_project_bytes(
|
||||
)
|
||||
.await?;
|
||||
tx.commit().await?;
|
||||
super::mark_shared_instance_stale(instance_id, &state.pool).await?;
|
||||
|
||||
Ok(relative_path)
|
||||
}
|
||||
@@ -608,6 +616,7 @@ pub(crate) async fn record_project_file(
|
||||
)
|
||||
.await?;
|
||||
tx.commit().await?;
|
||||
super::mark_shared_instance_stale(instance_id, &state.pool).await?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
@@ -711,6 +720,8 @@ pub(crate) async fn toggle_disable_project(
|
||||
}
|
||||
tx.commit().await?;
|
||||
|
||||
super::mark_shared_instance_stale(instance_id, &state.pool).await?;
|
||||
|
||||
Ok(new_path)
|
||||
}
|
||||
|
||||
@@ -752,9 +763,36 @@ pub(crate) async fn remove_project(
|
||||
tx.commit().await?;
|
||||
}
|
||||
|
||||
super::mark_shared_instance_stale(instance_id, &state.pool).await?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub(crate) async fn content_source_kind_for_project_path(
|
||||
instance_id: &str,
|
||||
project_path: &str,
|
||||
state: &State,
|
||||
) -> crate::Result<Option<ContentSourceKind>> {
|
||||
let scope = resolve_content_scope(instance_id, None, state).await?;
|
||||
let Some(file) = content_rows::get_instance_file_by_relative_path(
|
||||
&scope.instance.id,
|
||||
project_path,
|
||||
&state.pool,
|
||||
)
|
||||
.await?
|
||||
else {
|
||||
return Ok(None);
|
||||
};
|
||||
let entries =
|
||||
content_rows::get_content_entries(&scope.content_set_id, &state.pool)
|
||||
.await?;
|
||||
|
||||
Ok(entries.into_iter().find_map(|entry| {
|
||||
(entry.file_id.as_deref() == Some(file.id.as_str()))
|
||||
.then_some(entry.source_kind)
|
||||
}))
|
||||
}
|
||||
|
||||
pub(crate) async fn rename_project_companion_file(
|
||||
instance_id: &str,
|
||||
old_project_path: &str,
|
||||
|
||||
Reference in New Issue
Block a user