diff --git a/theseus_gui/src-tauri/src/api/mod.rs b/theseus_gui/src-tauri/src/api/mod.rs index d2a6b0757..9c2f324d0 100644 --- a/theseus_gui/src-tauri/src/api/mod.rs +++ b/theseus_gui/src-tauri/src/api/mod.rs @@ -15,6 +15,7 @@ pub mod profile_create; pub mod settings; pub mod tags; pub mod utils; +pub mod profile_share; pub type Result = std::result::Result; diff --git a/theseus_gui/src-tauri/src/api/profile_share.rs b/theseus_gui/src-tauri/src/api/profile_share.rs new file mode 100644 index 000000000..efa903f69 --- /dev/null +++ b/theseus_gui/src-tauri/src/api/profile_share.rs @@ -0,0 +1,76 @@ +use crate::api::Result; +use theseus::{prelude::*, shared_profile::SharedProfile}; + +pub fn init() -> tauri::plugin::TauriPlugin { + tauri::plugin::Builder::new("profile_share") + .invoke_handler(tauri::generate_handler![ + profile_share_get_all, + profile_share_install, + profile_share_create, + profile_share_inbound_sync, + profile_share_outbound_sync, + profile_share_generate_share_link, + profile_share_accept_share_link + ]) + .build() +} + +// invoke('plugin:profile_share|profile_share_get_all',profile) +#[tauri::command] +pub async fn profile_share_get_all( +) -> Result> { + let res = shared_profile::get_all() + .await?; + Ok(res) +} + +#[tauri::command] +pub async fn profile_share_install( + profile: SharedProfile, +) -> Result { + let res = shared_profile::install(profile) + .await?; + Ok(res) +} + +#[tauri::command] +pub async fn profile_share_create( + path: ProfilePathId +) -> Result<()> { + shared_profile::create(path) + .await?; + Ok(()) +} + +#[tauri::command] +pub async fn profile_share_inbound_sync( + path: ProfilePathId +) -> Result<()> { + shared_profile::inbound_sync(path) + .await?; + Ok(()) +} + +#[tauri::command] +pub async fn profile_share_outbound_sync( + path : ProfilePathId +) -> Result<()> { + shared_profile::outbound_sync(path).await?; + Ok(()) +} + +#[tauri::command] +pub async fn profile_share_generate_share_link( + path : ProfilePathId +) -> Result { + let res = shared_profile::generate_share_link(path).await?; + Ok(res) +} + +#[tauri::command] +pub async fn profile_share_accept_share_link( + link : String +) -> Result<()> { + shared_profile::accept_share_link(link).await?; + Ok(()) +} \ No newline at end of file diff --git a/theseus_gui/src-tauri/src/main.rs b/theseus_gui/src-tauri/src/main.rs index 3a3fa0240..2dd4ae34f 100644 --- a/theseus_gui/src-tauri/src/main.rs +++ b/theseus_gui/src-tauri/src/main.rs @@ -139,6 +139,7 @@ fn main() { .plugin(api::process::init()) .plugin(api::profile::init()) .plugin(api::profile_create::init()) + .plugin(api::profile_share::init()) .plugin(api::settings::init()) .plugin(api::tags::init()) .plugin(api::utils::init()) diff --git a/theseus_gui/src/App.vue b/theseus_gui/src/App.vue index a93e3c66d..1ded159c5 100644 --- a/theseus_gui/src/App.vue +++ b/theseus_gui/src/App.vue @@ -40,12 +40,14 @@ import { TauriEvent } from '@tauri-apps/api/event' import { await_sync, check_safe_loading_bars_complete } from './helpers/state' import { confirm } from '@tauri-apps/api/dialog' import URLConfirmModal from '@/components/ui/URLConfirmModal.vue' +import AcceptSharedProfileModal from '@/components/ui/AcceptSharedProfileModal.vue' import StickyTitleBar from '@/components/ui/tutorial/StickyTitleBar.vue' import OnboardingScreen from '@/components/ui/tutorial/OnboardingScreen.vue' import { install_from_file } from './helpers/pack' const themeStore = useTheming() const urlModal = ref(null) +const sharedProfileConfirmModal = ref(null) const isLoading = ref(true) const videoPlaying = ref(false) @@ -237,6 +239,9 @@ command_listener(async (e) => { source: 'CreationModalFileDrop', }) } + } else if (e.event === 'OpenSharedProfile') { + // Install a shared profile + sharedProfileConfirmModal.value.show(e) } else { // Other commands are URL-based (deep linking) urlModal.value.show(e) @@ -388,6 +393,7 @@ command_listener(async (e) => { + diff --git a/theseus_gui/src/components/GridDisplay.vue b/theseus_gui/src/components/GridDisplay.vue index 615ff5e08..62c854a50 100644 --- a/theseus_gui/src/components/GridDisplay.vue +++ b/theseus_gui/src/components/GridDisplay.vue @@ -169,7 +169,7 @@ const filteredResults = computed(() => { }) } else if (filters.value === 'Downloaded modpacks') { instances = instances.filter((instance) => { - return instance.metadata?.linked_data + return instance.metadata?.linked_data?.modrinth_modpack }) } diff --git a/theseus_gui/src/components/RowDisplay.vue b/theseus_gui/src/components/RowDisplay.vue index 500fa830e..df09a392d 100644 --- a/theseus_gui/src/components/RowDisplay.vue +++ b/theseus_gui/src/components/RowDisplay.vue @@ -170,7 +170,7 @@ const handleOptionsClick = async (args) => { break case 'install': { const versions = await useFetch( - `https://api.modrinth.com/v2/project/${args.item.project_id}/version`, + `https://staging-api.modrinth.com/v2/project/${args.item.project_id}/version`, 'project versions' ) diff --git a/theseus_gui/src/components/ui/AcceptSharedProfileModal.vue b/theseus_gui/src/components/ui/AcceptSharedProfileModal.vue new file mode 100644 index 000000000..3dda939db --- /dev/null +++ b/theseus_gui/src/components/ui/AcceptSharedProfileModal.vue @@ -0,0 +1,89 @@ + + + + + diff --git a/theseus_gui/src/components/ui/Instance.vue b/theseus_gui/src/components/ui/Instance.vue index 2ceadd593..fee2581d5 100644 --- a/theseus_gui/src/components/ui/Instance.vue +++ b/theseus_gui/src/components/ui/Instance.vue @@ -71,7 +71,7 @@ const install = async (e) => { e?.stopPropagation() modLoading.value = true const versions = await useFetch( - `https://api.modrinth.com/v2/project/${props.instance.project_id}/version`, + `https://staging-api.modrinth.com/v2/project/${props.instance.project_id}/version`, 'project versions' ) @@ -82,7 +82,7 @@ const install = async (e) => { packs.length === 0 || !packs .map((value) => value.metadata) - .find((pack) => pack.linked_data?.project_id === props.instance.project_id) + .find((pack) => pack.linked_data?.modrinth_modpack?.project_id === props.instance.project_id) ) { modLoading.value = true await pack_install( diff --git a/theseus_gui/src/components/ui/ModInstallModal.vue b/theseus_gui/src/components/ui/ModInstallModal.vue index a19c53c67..8219a0e38 100644 --- a/theseus_gui/src/components/ui/ModInstallModal.vue +++ b/theseus_gui/src/components/ui/ModInstallModal.vue @@ -247,7 +247,9 @@ const check_valid = computed(() => {
{ ? 'Installing...' : profile.installedMod ? 'Installed' - : profile.metadata.linked_data && profile.metadata.linked_data.locked + : profile.metadata.linked_data?.modrinth_modpack.locked || profile.metadata.linked_data?.shared_profile ? 'Paired' : 'Install' }} diff --git a/theseus_gui/src/components/ui/ModpackVersionModal.vue b/theseus_gui/src/components/ui/ModpackVersionModal.vue index d4e80bf05..0f7797cd6 100644 --- a/theseus_gui/src/components/ui/ModpackVersionModal.vue +++ b/theseus_gui/src/components/ui/ModpackVersionModal.vue @@ -28,7 +28,7 @@ const filteredVersions = computed(() => { }) const modpackVersionModal = ref(null) -const installedVersion = computed(() => props.instance?.metadata?.linked_data?.version_id) +const installedVersion = computed(() => props.instance?.metadata?.linked_data?.modrinth_modpack?.version_id) const installing = computed(() => props.instance.install_stage !== 'installed') const inProgress = ref(false) @@ -49,7 +49,7 @@ const switchVersion = async (versionId) => { :noblur="!themeStore.advancedRendering" >
- +
diff --git a/theseus_gui/src/components/ui/ProjectCard.vue b/theseus_gui/src/components/ui/ProjectCard.vue index 20ee8c034..2467f8718 100644 --- a/theseus_gui/src/components/ui/ProjectCard.vue +++ b/theseus_gui/src/components/ui/ProjectCard.vue @@ -73,7 +73,7 @@ const install = async (e) => { e?.stopPropagation() installing.value = true const versions = await useFetch( - `https://api.modrinth.com/v2/project/${props.project.project_id}/version`, + `https://staging-api.modrinth.com/v2/project/${props.project.project_id}/version`, 'project versions' ) @@ -84,7 +84,7 @@ const install = async (e) => { packs.length === 0 || !packs .map((value) => value.metadata) - .find((pack) => pack.linked_data?.project_id === props.project.project_id) + .find((pack) => pack.linked_data?.modrinth_modpack?.project_id === props.project.project_id) ) { installing.value = true await pack_install( diff --git a/theseus_gui/src/components/ui/SearchCard.vue b/theseus_gui/src/components/ui/SearchCard.vue index 9724e2548..41b6db855 100644 --- a/theseus_gui/src/components/ui/SearchCard.vue +++ b/theseus_gui/src/components/ui/SearchCard.vue @@ -135,7 +135,7 @@ const installed = ref(props.installed) async function install() { installing.value = true const versions = await useFetch( - `https://api.modrinth.com/v2/project/${props.project.project_id}/version`, + `https://staging-api.modrinth.com/v2/project/${props.project.project_id}/version`, 'project versions' ) let queuedVersionData @@ -156,7 +156,7 @@ async function install() { packs.length === 0 || !packs .map((value) => value.metadata) - .find((pack) => pack.linked_data?.project_id === props.project.project_id) + .find((pack) => pack.linked_data?.modrinth_modpack?.project_id === props.project.project_id) ) { await packInstall( props.project.project_id, diff --git a/theseus_gui/src/components/ui/URLConfirmModal.vue b/theseus_gui/src/components/ui/URLConfirmModal.vue index 631a0fd56..d87b66399 100644 --- a/theseus_gui/src/components/ui/URLConfirmModal.vue +++ b/theseus_gui/src/components/ui/URLConfirmModal.vue @@ -20,20 +20,20 @@ defineExpose({ async show(event) { if (event.event === 'InstallVersion') { version.value = await useFetch( - `https://api.modrinth.com/v2/version/${encodeURIComponent(event.id)}`, + `https://staging-api.modrinth.com/v2/version/${encodeURIComponent(event.id)}`, 'version' ) project.value = await useFetch( - `https://api.modrinth.com/v2/project/${encodeURIComponent(version.value.project_id)}`, + `https://staging-api.modrinth.com/v2/project/${encodeURIComponent(version.value.project_id)}`, 'project' ) } else { project.value = await useFetch( - `https://api.modrinth.com/v2/project/${encodeURIComponent(event.id)}`, + `https://staging-api.modrinth.com/v2/project/${encodeURIComponent(event.id)}`, 'project' ) version.value = await useFetch( - `https://api.modrinth.com/v2/version/${encodeURIComponent(project.value.versions[0])}`, + `https://staging-api.modrinth.com/v2/version/${encodeURIComponent(project.value.versions[0])}`, 'version' ) } diff --git a/theseus_gui/src/helpers/shared_profiles.js b/theseus_gui/src/helpers/shared_profiles.js new file mode 100644 index 000000000..9d0878933 --- /dev/null +++ b/theseus_gui/src/helpers/shared_profiles.js @@ -0,0 +1,42 @@ +/** + * All theseus API calls return serialized values (both return values and errors); + * So, for example, addDefaultInstance creates a blank Profile object, where the Rust struct is serialized, + * and deserialized into a usable JS object. + */ +import { invoke } from '@tauri-apps/api/tauri' + +/// Created shared modpack from profile +export async function share_create(path) { + return await invoke('plugin:profile_share|profile_share_create', { path }) +} + +/// Generates a shared profile link +export async function share_generate(path) { + return await invoke('plugin:profile_share|profile_share_generate_share_link', { path }) +} + +/// Accepts a shared profile link +export async function share_accept(link) { + return await invoke('plugin:profile_share|profile_share_accept', { link }) +} + +/// Install a pack from a shared profile id +export async function share_install(id) { + return await invoke('plugin:profile_share|profile_share_install', { id }) +} + +// get all user profiles that are available to the currentt user +export async function get_all(path) { + return await invoke('plugin:profile_share|profile_share_get_all', { path }) +} + +// syncs profile to match that on server +export async function inbound_sync(path) { + return await invoke('plugin:profile_share|profile_share_inbound_sync', { path }) +} + +// syncs profile to update server +// only allowed if profile is owned by user +export async function outbound_sync(path) { + return await invoke('plugin:profile_share|profile_share_outbound_sync', { path }) +} \ No newline at end of file diff --git a/theseus_gui/src/helpers/utils.js b/theseus_gui/src/helpers/utils.js index a95c22a49..fb461a679 100644 --- a/theseus_gui/src/helpers/utils.js +++ b/theseus_gui/src/helpers/utils.js @@ -68,7 +68,7 @@ export const installVersionDependencies = async (profile, version) => { ) continue const depVersions = await useFetch( - `https://api.modrinth.com/v2/project/${dep.project_id}/version`, + `https://staging-api.modrinth.com/v2/project/${dep.project_id}/version`, 'dependency versions' ) const latest = depVersions.find( diff --git a/theseus_gui/src/pages/Browse.vue b/theseus_gui/src/pages/Browse.vue index 5fbdd8c71..95129d9d3 100644 --- a/theseus_gui/src/pages/Browse.vue +++ b/theseus_gui/src/pages/Browse.vue @@ -149,7 +149,7 @@ if (route.query.ai) { } async function refreshSearch() { - const base = 'https://api.modrinth.com/v2/' + const base = 'https://staging-api.modrinth.com/v2/' const params = [`limit=${maxResults.value}`, `index=${sortType.value.name}`] if (query.value.length > 0) { diff --git a/theseus_gui/src/pages/Index.vue b/theseus_gui/src/pages/Index.vue index 0f0c008c1..eb851a437 100644 --- a/theseus_gui/src/pages/Index.vue +++ b/theseus_gui/src/pages/Index.vue @@ -31,8 +31,8 @@ const getInstances = async () => { let filters = [] for (const instance of recentInstances.value) { - if (instance.metadata.linked_data && instance.metadata.linked_data.project_id) { - filters.push(`NOT"project_id"="${instance.metadata.linked_data.project_id}"`) + if (instance.metadata.linked_data?.modrinth_modpack?.project_id) { + filters.push(`NOT"project_id"="${instance.metadata.linked_data?.modrinth_modpack?.project_id}"`) } } filter.value = filters.join(' AND ') @@ -40,7 +40,7 @@ const getInstances = async () => { const getFeaturedModpacks = async () => { const response = await useFetch( - `https://api.modrinth.com/v2/search?facets=[["project_type:modpack"]]&limit=10&index=follows&filters=${filter.value}`, + `https://staging-api.modrinth.com/v2/search?facets=[["project_type:modpack"]]&limit=10&index=follows&filters=${filter.value}`, 'featured modpacks', offline.value ) @@ -52,7 +52,7 @@ const getFeaturedModpacks = async () => { } const getFeaturedMods = async () => { const response = await useFetch( - 'https://api.modrinth.com/v2/search?facets=[["project_type:mod"]]&limit=10&index=follows', + 'https://staging-api.modrinth.com/v2/search?facets=[["project_type:mod"]]&limit=10&index=follows', 'featured mods', offline.value ) diff --git a/theseus_gui/src/pages/instance/Index.vue b/theseus_gui/src/pages/instance/Index.vue index 41d639ba6..864e0bfa1 100644 --- a/theseus_gui/src/pages/instance/Index.vue +++ b/theseus_gui/src/pages/instance/Index.vue @@ -209,9 +209,9 @@ const checkProcess = async () => { // Get information on associated modrinth versions, if any const modrinthVersions = ref([]) -if (!(await isOffline()) && instance.value.metadata.linked_data?.project_id) { +if (!(await isOffline()) && instance.value.metadata.linked_data?.modrinth_modpack?.project_id) { modrinthVersions.value = await useFetch( - `https://api.modrinth.com/v2/project/${instance.value.metadata.linked_data.project_id}/version`, + `https://staging-api.modrinth.com/v2/project/${instance.value.metadata.linked_data?.modrinth_modpack?.project_id}/version`, 'project' ) } diff --git a/theseus_gui/src/pages/instance/Mods.vue b/theseus_gui/src/pages/instance/Mods.vue index 87032e72c..ddb321751 100644 --- a/theseus_gui/src/pages/instance/Mods.vue +++ b/theseus_gui/src/pages/instance/Mods.vue @@ -359,7 +359,7 @@ /> { - return props.instance.metadata.linked_data && props.instance.metadata.linked_data.locked + if (props.instance.metadata.linked_data?.shared_profile) { + return !props.instance.metadata.linked_data.shared_profile.is_owner + } + return props.instance.metadata.linked_data?.modrinth_modpack?.locked }) const canUpdatePack = computed(() => { if (!props.instance.metadata.linked_data) return false - return props.instance.metadata.linked_data.version_id !== props.instance.modrinth_update_version + let linked_data = props.instance.metadata.linked_data + if (linked_data.modrinth_modpack) { + return linked_data.modrinth_modpack.version_id !== props.instance.sync_update_version + } + return false }) const exportModal = ref(null) diff --git a/theseus_gui/src/pages/instance/Options.vue b/theseus_gui/src/pages/instance/Options.vue index d8dead98c..764f1fa17 100644 --- a/theseus_gui/src/pages/instance/Options.vue +++ b/theseus_gui/src/pages/instance/Options.vue @@ -358,7 +358,7 @@ />
- +

Modpack @@ -413,8 +413,7 @@ Unpair

- -
+
+ +
+

+ Shared profile management +

+
+
+ + +
+
+ Generated link: {{ shareLink }} +
+
+
+
+ +
+
+
+
+
+ {{ user }} +
+
+
+
+ +
+
+
+
+
+ your project + {{ props.instance.sync_update_version }} + :) + + + +
+
+ not yours + {{ props.instance.sync_update_version }} + + +
+

@@ -502,7 +585,7 @@

props.instance.install_stage !== 'installed') -const installedVersion = computed(() => props.instance?.metadata?.linked_data?.version_id) +const installedVersion = computed(() => props.instance?.metadata?.linked_data?.modrinth_modpack?.version_id) const installedVersionData = computed(() => { if (!installedVersion.value) return null return props.versions.find((version) => version.id === installedVersion.value) }) +const sharedProfiles = await get_all(); +const installedSharedProfileData = computed(() => { + if (!props.instance.metadata.linked_data?.shared_profile) return null + return sharedProfiles.find((profile) => profile.id === props.instance.metadata.linked_data?.shared_profile?.profile_id) +}) + watch( [ title, @@ -794,13 +890,13 @@ async function unpairProfile() { async function unlockProfile() { const editProfile = props.instance - editProfile.metadata.linked_data.locked = false + editProfile.metadata.linked_data.modrinth_modpack.locked = false await edit(props.instance.path, editProfile) modalConfirmUnlock.value.hide() } const isPackLocked = computed(() => { - return props.instance.metadata.linked_data && props.instance.metadata.linked_data.locked + return props.instance.metadata.linked_data?.modrinth_modpack.locked }) async function repairModpack() { @@ -932,6 +1028,20 @@ async function saveGvLoaderEdits() { editing.value = false changeVersionsModal.value.hide() } + +async function outboundSyncSharedProfile() { + await outbound_sync(props.instance.path).catch(handleError) +} + +async function inboundSyncSharedProfile() { + await inbound_sync(props.instance.path).catch(handleError) +} + +const shareLink = ref(null) +async function generateShareLink() { + shareLink.value = await share_generate(props.instance.path).catch(handleError) +} + diff --git a/theseus_gui/src/pages/project/Index.vue b/theseus_gui/src/pages/project/Index.vue index 3c8c4fa19..8a1e27729 100644 --- a/theseus_gui/src/pages/project/Index.vue +++ b/theseus_gui/src/pages/project/Index.vue @@ -314,10 +314,10 @@ async function fetchProjectData() { categories.value, instance.value, ] = await Promise.all([ - useFetch(`https://api.modrinth.com/v2/project/${route.params.id}`, 'project'), - useFetch(`https://api.modrinth.com/v2/project/${route.params.id}/version`, 'project'), - useFetch(`https://api.modrinth.com/v2/project/${route.params.id}/members`, 'project'), - useFetch(`https://api.modrinth.com/v2/project/${route.params.id}/dependencies`, 'project'), + useFetch(`https://staging-api.modrinth.com/v2/project/${route.params.id}`, 'project'), + useFetch(`https://staging-api.modrinth.com/v2/project/${route.params.id}/version`, 'project'), + useFetch(`https://staging-api.modrinth.com/v2/project/${route.params.id}/members`, 'project'), + useFetch(`https://staging-api.modrinth.com/v2/project/${route.params.id}/dependencies`, 'project'), get_categories().catch(handleError), route.query.i ? getInstance(route.query.i, false).catch(handleError) : Promise.resolve(), ]) @@ -391,7 +391,7 @@ async function install(version) { packs.length === 0 || !packs .map((value) => value.metadata) - .find((pack) => pack.linked_data?.project_id === data.value.id) + .find((pack) => pack.linked_data?.modrinth_modpack?.project_id === data.value.id) ) { await packInstall( data.value.id,