diff --git a/.github/workflows/daedalus-docker.yml b/.github/workflows/daedalus-docker.yml index c401860968..ed20f15ca9 100644 --- a/.github/workflows/daedalus-docker.yml +++ b/.github/workflows/daedalus-docker.yml @@ -76,13 +76,6 @@ jobs: env: SCCACHE_DIR: ${{ needs.skip-if-clean.outputs.internal == 'true' && '/mnt/sccache' || '' }} SCCACHE_CACHE_SIZE: ${{ needs.skip-if-clean.outputs.internal == 'true' && '10G' || '' }} - SCCACHE_MULTILEVEL_CHAIN: ${{ needs.skip-if-clean.outputs.internal == 'true' && 'disk,s3' || '' }} - SCCACHE_S3_KEY_PREFIX: ${{ needs.skip-if-clean.outputs.internal == 'true' && format('{0}/', github.repository) || '' }} - SCCACHE_BUCKET: ${{ secrets.SCCACHE_BUCKET }} - SCCACHE_REGION: ${{ secrets.SCCACHE_REGION }} - SCCACHE_ENDPOINT: ${{ secrets.SCCACHE_ENDPOINT }} - AWS_ACCESS_KEY_ID: ${{ secrets.SCCACHE_S3_ACCESS_KEY_ID }} - AWS_SECRET_ACCESS_KEY: ${{ secrets.SCCACHE_S3_SECRET_ACCESS_KEY }} RUSTC_WRAPPER: ${{ needs.skip-if-clean.outputs.internal == 'true' && 'sccache' || '' }} needs: [skip-if-clean] if: ${{ needs.skip-if-clean.outputs.skip != 'true' }} diff --git a/.github/workflows/labrinth-docker.yml b/.github/workflows/labrinth-docker.yml index ca249994b9..b02534a3a7 100644 --- a/.github/workflows/labrinth-docker.yml +++ b/.github/workflows/labrinth-docker.yml @@ -78,13 +78,6 @@ jobs: GIT_HASH: ${{ github.sha }} SCCACHE_DIR: ${{ needs.skip-if-clean.outputs.internal == 'true' && '/mnt/sccache' || '' }} SCCACHE_CACHE_SIZE: ${{ needs.skip-if-clean.outputs.internal == 'true' && '10G' || '' }} - SCCACHE_MULTILEVEL_CHAIN: ${{ needs.skip-if-clean.outputs.internal == 'true' && 'disk,s3' || '' }} - SCCACHE_S3_KEY_PREFIX: ${{ needs.skip-if-clean.outputs.internal == 'true' && format('{0}/', github.repository) || '' }} - SCCACHE_BUCKET: ${{ secrets.SCCACHE_BUCKET }} - SCCACHE_REGION: ${{ secrets.SCCACHE_REGION }} - SCCACHE_ENDPOINT: ${{ secrets.SCCACHE_ENDPOINT }} - AWS_ACCESS_KEY_ID: ${{ secrets.SCCACHE_S3_ACCESS_KEY_ID }} - AWS_SECRET_ACCESS_KEY: ${{ secrets.SCCACHE_S3_SECRET_ACCESS_KEY }} RUSTC_WRAPPER: ${{ needs.skip-if-clean.outputs.internal == 'true' && 'sccache' || '' }} steps: - name: Check out code diff --git a/.github/workflows/turbo-ci.yml b/.github/workflows/turbo-ci.yml index c0cd950d99..ad4147a313 100644 --- a/.github/workflows/turbo-ci.yml +++ b/.github/workflows/turbo-ci.yml @@ -81,13 +81,6 @@ jobs: # blacksmith runner) SCCACHE_DIR: ${{ needs.skip-if-clean.outputs.internal == 'true' && '/mnt/sccache' || '' }} SCCACHE_CACHE_SIZE: ${{ needs.skip-if-clean.outputs.internal == 'true' && '10G' || '' }} - SCCACHE_MULTILEVEL_CHAIN: ${{ needs.skip-if-clean.outputs.internal == 'true' && 'disk,s3' || '' }} - SCCACHE_S3_KEY_PREFIX: ${{ needs.skip-if-clean.outputs.internal == 'true' && format('{0}/', github.repository) || '' }} - SCCACHE_BUCKET: ${{ secrets.SCCACHE_BUCKET }} - SCCACHE_REGION: ${{ secrets.SCCACHE_REGION }} - SCCACHE_ENDPOINT: ${{ secrets.SCCACHE_ENDPOINT }} - AWS_ACCESS_KEY_ID: ${{ secrets.SCCACHE_S3_ACCESS_KEY_ID }} - AWS_SECRET_ACCESS_KEY: ${{ secrets.SCCACHE_S3_SECRET_ACCESS_KEY }} RUSTC_WRAPPER: ${{ needs.skip-if-clean.outputs.internal == 'true' && 'sccache' || '' }} steps: diff --git a/apps/app-frontend/src/App.vue b/apps/app-frontend/src/App.vue index 83e2312c44..1f39661978 100644 --- a/apps/app-frontend/src/App.vue +++ b/apps/app-frontend/src/App.vue @@ -1341,12 +1341,11 @@ async function processPendingSurveys() { const creds = await getCreds().catch(handleError) const userId = creds?.user_id - const instances = await list().catch(handleError) - const isActivePlayer = - instances.findIndex( - (instance) => - isWithinLastTwoWeeks(instance.last_played) && !isWithinLastTwoWeeks(instance.created), - ) >= 0 + const instances = (await list().catch(handleError)) ?? [] + const isActivePlayer = instances.some( + (instance) => + isWithinLastTwoWeeks(instance.last_played) && !isWithinLastTwoWeeks(instance.created), + ) let surveys = [] try { diff --git a/apps/app-frontend/src/components/ui/ExportModal.vue b/apps/app-frontend/src/components/ui/ExportModal.vue index a71898949f..e97f833f5c 100644 --- a/apps/app-frontend/src/components/ui/ExportModal.vue +++ b/apps/app-frontend/src/components/ui/ExportModal.vue @@ -1,28 +1,32 @@ diff --git a/apps/app-frontend/src/components/ui/friends/FriendsList.vue b/apps/app-frontend/src/components/ui/friends/FriendsList.vue index cff91a960c..c622c078e4 100644 --- a/apps/app-frontend/src/components/ui/friends/FriendsList.vue +++ b/apps/app-frontend/src/components/ui/friends/FriendsList.vue @@ -1,5 +1,5 @@ diff --git a/apps/app-frontend/src/pages/instance/Index.vue b/apps/app-frontend/src/pages/instance/Index.vue index b061e04fed..122edf3a84 100644 --- a/apps/app-frontend/src/pages/instance/Index.vue +++ b/apps/app-frontend/src/pages/instance/Index.vue @@ -676,7 +676,7 @@ const handleOptionsClick = async (args: { option: string; item: unknown }) => { break case 'copy_path': { if (instance.value) { - const fullPath = await get_full_path(instance.value?.path) + const fullPath = await get_full_path(instance.value.id) await navigator.clipboard.writeText(fullPath) } break diff --git a/apps/app-frontend/src/pages/instance/Mods.vue b/apps/app-frontend/src/pages/instance/Mods.vue index ca1d6fbe25..6bcff92a0e 100644 --- a/apps/app-frontend/src/pages/instance/Mods.vue +++ b/apps/app-frontend/src/pages/instance/Mods.vue @@ -1443,7 +1443,7 @@ onMounted(() => { props.instance && event.instance_id === props.instance.id && event.event === 'synced' && - props.instance.install_stage !== 'pack_installing' && + props.instance.install_stage === 'installed' && !isBulkOperating.value ) { await initProjects() diff --git a/apps/app-frontend/src/pages/instance/Worlds.vue b/apps/app-frontend/src/pages/instance/Worlds.vue index 400179fd74..6d6be96fc4 100644 --- a/apps/app-frontend/src/pages/instance/Worlds.vue +++ b/apps/app-frontend/src/pages/instance/Worlds.vue @@ -618,10 +618,7 @@ const filterOptions = computed(() => { const hasSingleplayer = dedupedWorlds.value.some((x) => x.type === 'singleplayer') const hasServer = dedupedWorlds.value.some((x) => x.type === 'server') - const hasStatusFilter = - selectedFilters.value.includes('online') || selectedFilters.value.includes('offline') - - if (hasSingleplayer && hasServer && !hasStatusFilter) { + if (hasSingleplayer && hasServer) { options.push({ id: 'singleplayer', label: formatMessage(commonMessages.singleplayerLabel) }) } @@ -633,13 +630,11 @@ const filterOptions = computed(() => { options.push({ id: 'vanilla', label: formatMessage(messages.vanillaFilter) }) options.push({ id: 'modded', label: formatMessage(messages.moddedFilter) }) } - if (!selectedFilters.value.includes('singleplayer')) { - const hasOnline = servers.some((x) => !!serverData.value[x.address]?.status) - const hasOffline = servers.some((x) => !serverData.value[x.address]?.status) - if (hasOnline && hasOffline) { - options.push({ id: 'online', label: formatMessage(messages.onlineFilter) }) - options.push({ id: 'offline', label: formatMessage(messages.offlineFilter) }) - } + const hasOnline = servers.some((x) => !!serverData.value[x.address]?.status) + const hasOffline = servers.some((x) => !serverData.value[x.address]?.status) + if (hasOnline && hasOffline) { + options.push({ id: 'online', label: formatMessage(messages.onlineFilter) }) + options.push({ id: 'offline', label: formatMessage(messages.offlineFilter) }) } } diff --git a/apps/app-frontend/src/pages/project/Versions.vue b/apps/app-frontend/src/pages/project/Versions.vue index f7aa3d0e1a..584801fff5 100644 --- a/apps/app-frontend/src/pages/project/Versions.vue +++ b/apps/app-frontend/src/pages/project/Versions.vue @@ -5,16 +5,15 @@ :game-versions="gameVersions" :versions="versions" :project="project" + :show-environment-column="themeStore.featureFlags.show_version_environment_column" :version-link="(version) => buildProjectHref(`/project/${project.id}/version/${version.id}`)" >