From d468940d4c0eef0cd969e69f6be072f5ff78a6ba Mon Sep 17 00:00:00 2001 From: "Calum H. (IMB11)" Date: Wed, 18 Nov 2026 15:31:31 +0000 Subject: [PATCH 1/7] feat: implement pastes.modrinth.com into app --- .../src/components/ui/ErrorModal.vue | 12 +++++-- .../download-manager/use-download-manager.ts | 4 ++- .../MinecraftAuthErrorModal.vue | 12 +++++-- .../src/composables/use-copy-as-paste.ts | 16 +++++++++ .../system/troubleshooting-settings.vue | 6 ++-- .../api-client/src/core/abstract-client.ts | 3 +- packages/api-client/src/modules/index.ts | 2 ++ .../api-client/src/modules/paste/pastes/v0.ts | 36 +++++++++++++++++++ .../api-client/src/modules/paste/types.ts | 9 +++++ packages/api-client/src/modules/types.ts | 1 + 10 files changed, 93 insertions(+), 8 deletions(-) create mode 100644 apps/app-frontend/src/composables/use-copy-as-paste.ts create mode 100644 packages/api-client/src/modules/paste/pastes/v0.ts create mode 100644 packages/api-client/src/modules/paste/types.ts diff --git a/apps/app-frontend/src/components/ui/ErrorModal.vue b/apps/app-frontend/src/components/ui/ErrorModal.vue index 263c4391888..d71dde6b501 100644 --- a/apps/app-frontend/src/components/ui/ErrorModal.vue +++ b/apps/app-frontend/src/components/ui/ErrorModal.vue @@ -23,6 +23,7 @@ import { computed, ref } from 'vue' import { ChatIcon } from '@/assets/icons' import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue' +import { useCopyAsPaste } from '@/composables/use-copy-as-paste' import { handleSevereError } from '@/composables/use-error.js' import { trackEvent } from '@/helpers/analytics' import { login as login_flow, set_default_user } from '@/helpers/auth.js' @@ -31,6 +32,7 @@ import { cancel_directory_change } from '@/helpers/settings.ts' import { showAppDbBackupsFolder } from '@/helpers/utils.js' const { handleError } = injectNotificationManager() +const copyAsPaste = useCopyAsPaste() const { formatMessage } = useVIntl() const messages = defineMessages({ @@ -159,9 +161,15 @@ const hasDebugInfo = computed( const debugInfo = computed(() => error.value.message ?? error.value ?? 'No error message.') const copied = ref(false) +const copying = ref(false) async function copyToClipboard(text) { - await navigator.clipboard.writeText(text) + copying.value = true + try { + await copyAsPaste(text) + } finally { + copying.value = false + } copied.value = true setTimeout(() => { copied.value = false @@ -331,7 +339,7 @@ async function copyToClipboard(text) { diff --git a/apps/app-frontend/src/components/ui/download-manager/use-download-manager.ts b/apps/app-frontend/src/components/ui/download-manager/use-download-manager.ts index b2c83360f87..b07d2b48ce4 100644 --- a/apps/app-frontend/src/components/ui/download-manager/use-download-manager.ts +++ b/apps/app-frontend/src/components/ui/download-manager/use-download-manager.ts @@ -9,6 +9,7 @@ import { convertFileSrc } from '@tauri-apps/api/core' import { computed, onMounted, onScopeDispose, ref, watch } from 'vue' import { useAppSettings } from '@/composables/use-app-settings' +import { useCopyAsPaste } from '@/composables/use-copy-as-paste' import { toError } from '@/helpers/errors' import { install_job_cancel, @@ -109,6 +110,7 @@ export function useDownloadManager() { const events = injectAppEvents() const { handleError } = injectNotificationManager() const appSettings = useAppSettings() + const copyAsPaste = useCopyAsPaste() const display = useInstallJobDisplay() const { formatMessage } = useVIntl() const formatBytes = useFormatBytes() @@ -540,7 +542,7 @@ export function useDownloadManager() { ? (file.error ?? '') : await install_job_support_details(id) if (disposed) return - await navigator.clipboard.writeText(details) + await copyAsPaste(details) if (disposed) return copiedJobs.value.add(id) clearTimeout(copiedTimeouts.get(id)) diff --git a/apps/app-frontend/src/components/ui/minecraft-auth-error-modal/MinecraftAuthErrorModal.vue b/apps/app-frontend/src/components/ui/minecraft-auth-error-modal/MinecraftAuthErrorModal.vue index 0cd1efb7788..e9319099350 100644 --- a/apps/app-frontend/src/components/ui/minecraft-auth-error-modal/MinecraftAuthErrorModal.vue +++ b/apps/app-frontend/src/components/ui/minecraft-auth-error-modal/MinecraftAuthErrorModal.vue @@ -10,6 +10,7 @@ import { import { Admonition, Button, ButtonLink, Collapsible, IconButton, NewModal } from '@modrinth/ui' import { computed, ref } from 'vue' +import { useCopyAsPaste } from '@/composables/use-copy-as-paste' import { handleSevereError } from '@/composables/use-error.js' import { login as login_flow, set_default_user } from '@/helpers/auth.js' @@ -20,6 +21,8 @@ const rawError = ref('') const matchedError = ref(null) const debugCollapsed = ref(true) const copied = ref(false) +const copying = ref(false) +const copyAsPaste = useCopyAsPaste() const loadingSignIn = ref(false) function show(errorVal: { message?: string; code?: string }) { @@ -58,7 +61,12 @@ async function signInAgain() { const debugInfo = computed(() => rawError.value || 'No error message.') async function copyToClipboard(text: string) { - await navigator.clipboard.writeText(text) + copying.value = true + try { + await copyAsPaste(text) + } finally { + copying.value = false + } copied.value = true setTimeout(() => { copied.value = false @@ -174,7 +182,7 @@ async function copyToClipboard(text: string) { diff --git a/apps/app-frontend/src/composables/use-copy-as-paste.ts b/apps/app-frontend/src/composables/use-copy-as-paste.ts new file mode 100644 index 00000000000..afcfc39d2d9 --- /dev/null +++ b/apps/app-frontend/src/composables/use-copy-as-paste.ts @@ -0,0 +1,16 @@ +import { injectModrinthClient } from '@modrinth/ui' + +export function useCopyAsPaste() { + const client = injectModrinthClient() + + return async function copyAsPaste(content: string) { + let text = content + try { + const { key } = await client.paste.pastes_v0.create(content) + text = client.paste.pastes_v0.getUrl(key) + } catch (error) { + console.error('Failed to upload to paste.modrinth.com, copying raw text instead', error) + } + await navigator.clipboard.writeText(text) + } +} diff --git a/apps/app-frontend/src/features/settings/system/troubleshooting-settings.vue b/apps/app-frontend/src/features/settings/system/troubleshooting-settings.vue index c9bdf68c2dd..a00384b73c4 100644 --- a/apps/app-frontend/src/features/settings/system/troubleshooting-settings.vue +++ b/apps/app-frontend/src/features/settings/system/troubleshooting-settings.vue @@ -26,15 +26,17 @@ import { } from '@/components/ui/download-manager/debug-info-export' import ConfirmModalWrapper from '@/components/ui/modal/ConfirmModalWrapper.vue' import { useAppSettings } from '@/composables/use-app-settings.ts' +import { useCopyAsPaste } from '@/composables/use-copy-as-paste' import { get_ads_debug_state } from '@/helpers/ads.js' import { purge_cache_types } from '@/helpers/cache.js' import { appSettingsKeys, get, set } from '@/helpers/settings.ts' -import { copyToClipboard, showAppDbBackupsFolder } from '@/helpers/utils.js' +import { showAppDbBackupsFolder } from '@/helpers/utils.js' const { addNotification, handleError } = injectNotificationManager() const { formatMessage } = useVIntl() const { adConsentAvailable } = injectPageContext() const appSettings = useAppSettings() +const copyAsPaste = useCopyAsPaste() const queryClient = useQueryClient() const clearCacheConfirmModal = ref | null>(null) const copyingAdDetails = ref(false) @@ -207,7 +209,7 @@ async function handleCopyAdDetails() { } const { current_ad: currentAd, ...info } = adReport - await copyToClipboard( + await copyAsPaste( `CURRENT_AD: ${currentAd ?? 'unknown'}\n\nINFO:\n${JSON.stringify(info, null, 2)}`, ) diff --git a/packages/api-client/src/core/abstract-client.ts b/packages/api-client/src/core/abstract-client.ts index df5160ac335..9393667b5e8 100644 --- a/packages/api-client/src/core/abstract-client.ts +++ b/packages/api-client/src/core/abstract-client.ts @@ -44,6 +44,7 @@ export abstract class AbstractModrinthClient extends AbstractUploadClient { public readonly mclogs!: InferredClientModules['mclogs'] public readonly launchermeta!: InferredClientModules['launchermeta'] public readonly paper!: InferredClientModules['paper'] + public readonly paste!: InferredClientModules['paste'] public readonly purpur!: InferredClientModules['purpur'] public readonly sharedinstances!: InferredClientModules['sharedinstances'] @@ -330,7 +331,7 @@ export abstract class AbstractModrinthClient extends AbstractUploadClient { versionPath = '/_internal' } else if (typeof version === 'number') { versionPath = `/v${version}` - } else if (typeof version === 'string') { + } else if (typeof version === 'string' && version) { // Custom version string (e.g., 'v0', 'modrinth/v0') versionPath = `/${version}` } diff --git a/packages/api-client/src/modules/index.ts b/packages/api-client/src/modules/index.ts index 863c2f93ede..711ae3afda2 100644 --- a/packages/api-client/src/modules/index.ts +++ b/packages/api-client/src/modules/index.ts @@ -67,6 +67,7 @@ import { LauncherMetaManifestV0Module } from './launcher-meta/v0' import { MclogsInsightsV1Module } from './mclogs/insights/v1' import { MclogsLogsV1Module } from './mclogs/logs/v1' import { PaperVersionsV3Module } from './paper/v3' +import { PastePastesV0Module } from './paste/pastes/v0' import { PurpurVersionsV2Module } from './purpur/v2' import { SharedInstancesInstancesV1Module } from './shared-instances/instances/v1' import { SharedInstancesInvitesV1Module } from './shared-instances/invites/v1' @@ -153,6 +154,7 @@ export const MODULE_REGISTRY = { labrinth_versions_v2: LabrinthVersionsV2Module, labrinth_versions_v3: LabrinthVersionsV3Module, paper_versions_v3: PaperVersionsV3Module, + paste_pastes_v0: PastePastesV0Module, purpur_versions_v2: PurpurVersionsV2Module, sharedinstances_invites_v1: SharedInstancesInvitesV1Module, sharedinstances_instances_v1: SharedInstancesInstancesV1Module, diff --git a/packages/api-client/src/modules/paste/pastes/v0.ts b/packages/api-client/src/modules/paste/pastes/v0.ts new file mode 100644 index 00000000000..5826a737542 --- /dev/null +++ b/packages/api-client/src/modules/paste/pastes/v0.ts @@ -0,0 +1,36 @@ +import { AbstractModule } from '../../../core/abstract-module' +import type { Paste } from '../types' + +const PASTE_BASE_URL = 'https://paste.modrinth.com' + +export class PastePastesV0Module extends AbstractModule { + public getModuleID(): string { + return 'paste_pastes_v0' + } + + /** + * Upload plain text to paste.modrinth.com. + * + * @param content - Text to upload + * @returns The key of the new paste + */ + public async create(content: string): Promise { + return this.client.request('/post', { + api: PASTE_BASE_URL, + version: '', + method: 'POST', + body: content, + headers: { 'Content-Type': 'text/plain' }, + skipAuth: true, + }) + } + + /** + * Get the shareable URL for a paste. + * + * @param key - Key returned by `create` + */ + public getUrl(key: string): string { + return `${PASTE_BASE_URL}/${key}` + } +} diff --git a/packages/api-client/src/modules/paste/types.ts b/packages/api-client/src/modules/paste/types.ts new file mode 100644 index 00000000000..6ca16b815f0 --- /dev/null +++ b/packages/api-client/src/modules/paste/types.ts @@ -0,0 +1,9 @@ +export namespace Paste { + export namespace Pastes { + export namespace v0 { + export type CreateResponse = { + key: string + } + } + } +} diff --git a/packages/api-client/src/modules/types.ts b/packages/api-client/src/modules/types.ts index 5a9aeba0b57..ff6a8c9327c 100644 --- a/packages/api-client/src/modules/types.ts +++ b/packages/api-client/src/modules/types.ts @@ -6,5 +6,6 @@ export * from './labrinth/types' export * from './launcher-meta/types' export * from './mclogs/types' export * from './paper/types' +export * from './paste/types' export * from './purpur/types' export * from './shared-instances/types' From 8b947458576bf6e56dba9286899621c3702e1b9c Mon Sep 17 00:00:00 2001 From: "Calum H. (IMB11)" Date: Wed, 18 Nov 2026 16:01:31 +0000 Subject: [PATCH 2/7] feat: integrate paste.modrinth.com into app --- .../download-manager/download-manager-job.vue | 11 ++-- .../download-manager/use-download-manager.ts | 25 +++++-- .../src/composables/use-copy-as-paste.ts | 11 ++-- .../system/troubleshooting-settings.vue | 4 +- apps/app-frontend/src/helpers/install.ts | 8 +++ .../app-frontend/src/locales/en-US/index.json | 10 +-- apps/app/build.rs | 2 + apps/app/src/api/install.rs | 17 +++++ .../api-client/src/modules/paste/pastes/v0.ts | 8 ++- ...5dcebba094dfcdfdc036b59f66c9cb1e62f6f.json | 12 ++++ ...2c7044f95c91f4d6620f53356b3ad849cc110.json | 12 ++++ ...8dd0897d60eee5f2ff6135b264d5dc01acec9.json | 12 ---- ...fe7060917c55e4d36cff4ef7e2cc9da0f067d.json | 26 ++++++++ ...18120000_install-job-support-paste-url.sql | 1 + packages/app-lib/src/install/mod.rs | 5 +- packages/app-lib/src/install/runner.rs | 15 +++++ packages/app-lib/src/install/store.rs | 65 +++++++++++++++++-- packages/assets/generated-icons.ts | 2 + packages/assets/icons/text-search.svg | 19 ++++++ 19 files changed, 222 insertions(+), 43 deletions(-) create mode 100644 packages/app-lib/.sqlx/query-07677fcb343d4c44851481304355dcebba094dfcdfdc036b59f66c9cb1e62f6f.json create mode 100644 packages/app-lib/.sqlx/query-3088ec1e5937bd4261d19ee66462c7044f95c91f4d6620f53356b3ad849cc110.json delete mode 100644 packages/app-lib/.sqlx/query-91cc73d90f102ee5492f564a1318dd0897d60eee5f2ff6135b264d5dc01acec9.json create mode 100644 packages/app-lib/.sqlx/query-ecaa2289de752ca47fe4048b984fe7060917c55e4d36cff4ef7e2cc9da0f067d.json create mode 100644 packages/app-lib/migrations/20261118120000_install-job-support-paste-url.sql create mode 100644 packages/assets/icons/text-search.svg diff --git a/apps/app-frontend/src/components/ui/download-manager/download-manager-job.vue b/apps/app-frontend/src/components/ui/download-manager/download-manager-job.vue index fee1469b657..cae2e0a7a27 100644 --- a/apps/app-frontend/src/components/ui/download-manager/download-manager-job.vue +++ b/apps/app-frontend/src/components/ui/download-manager/download-manager-job.vue @@ -2,11 +2,11 @@ import { BoxIcon, CheckIcon, - CopyIcon, DownloadIcon, MinecraftServerIcon, PauseIcon, PlayIcon, + TextSearchIcon, TrashIcon, UpdatedIcon, UploadIcon, @@ -57,7 +57,10 @@ const messages = defineMessages({ pause: { id: 'app.download-manager.pause', defaultMessage: 'Pause installation' }, resume: { id: 'app.download-manager.resume', defaultMessage: 'Resume installation' }, retry: { id: 'app.action-bar.install.retry', defaultMessage: 'Retry' }, - copyDetails: { id: 'app.action-bar.install.copy-details', defaultMessage: 'Copy details' }, + inspectDetails: { + id: 'app.action-bar.install.inspect-details', + defaultMessage: 'Inspect details', + }, copied: { id: 'app.action-bar.install.copied-details', defaultMessage: 'Copied' }, dismiss: { id: 'app.action-bar.install.dismiss', defaultMessage: 'Dismiss' }, cancel: { id: 'app.download-manager.cancel', defaultMessage: 'Cancel installation' }, @@ -236,8 +239,8 @@ const instanceLink = computed(() => @click="$emit('copyDetails', job.id)" > - - {{ formatMessage(job.copied ? messages.copied : messages.copyDetails) }} + + {{ formatMessage(job.copied ? messages.copied : messages.inspectDetails) }}