From ed936728ad02274688d0f3a03d8656cbc24316d5 Mon Sep 17 00:00:00 2001
From: "Calum H. (IMB11)" <contact@cal.engineer>
Date: Tue, 4 Aug 2026 19:30:36 +0100
Subject: [PATCH] fix: merge issues

---
 .../src/pages/discover/[type]/index.vue       |  3 +-
 .../server-header/PanelServerActionButton.vue | 57 ++++++++++++++++++-
 .../src/layouts/shared/browse-tab/header.vue  |  2 +-
 .../wrapped/hosting/manage/[id]/index.vue     | 30 ++++++++--
 4 files changed, 81 insertions(+), 11 deletions(-)

diff --git a/apps/frontend/src/pages/discover/[type]/index.vue b/apps/frontend/src/pages/discover/[type]/index.vue
index ae62c97475..95c70c3149 100644
--- a/apps/frontend/src/pages/discover/[type]/index.vue
+++ b/apps/frontend/src/pages/discover/[type]/index.vue
@@ -114,6 +114,7 @@ debug('initial route.params.type:', route.params.type, '→ currentType:', curre
 const isServerType = computed(() => currentType.value === 'server')
 
 const projectType = computed(() => tags.value.projectTypes.find((x) => x.id === currentType.value))
+const projectTypeId = computed(() => projectType.value?.id ?? 'mod')
 
 watch(
 	() => projectType.value?.id,
@@ -423,8 +424,6 @@ const advancedFiltersCollapsed = computed({
 	},
 })
 
-const projectTypeId = computed(() => projectType.value?.id ?? 'mod')
-
 debug('projectTypeId:', projectTypeId.value)
 watch(projectTypeId, (val) => debug('projectTypeId changed:', val))
 
diff --git a/packages/ui/src/components/servers/server-header/PanelServerActionButton.vue b/packages/ui/src/components/servers/server-header/PanelServerActionButton.vue
index b895aa1432..521b3b9ee4 100644
--- a/packages/ui/src/components/servers/server-header/PanelServerActionButton.vue
+++ b/packages/ui/src/components/servers/server-header/PanelServerActionButton.vue
@@ -8,7 +8,17 @@
 			</ButtonStyled>
 
 			<template v-else-if="showRestartButton">
-				<ButtonStyled type="standard" color="orange" :size="size">
+				<JoinedButtons
+					v-if="powerActionWorlds.length"
+					color="orange"
+					:size="size"
+					:actions="restartSplitActions"
+					:primary-disabled="!canTakeAction"
+					:dropdown-disabled="!canTakeAction"
+					:primary-tooltip="busyTooltip"
+					:dropdown-tooltip="busyTooltip"
+				/>
+				<ButtonStyled v-else type="standard" color="orange" :size="size">
 					<button v-tooltip="busyTooltip" :disabled="!canTakeAction" @click="handlePrimaryAction">
 						<UpdatedIcon />
 						<span>{{ primaryActionText }}</span>
@@ -49,7 +59,17 @@
 			</template>
 
 			<template v-else>
-				<ButtonStyled type="standard" color="brand" :size="size">
+				<JoinedButtons
+					v-if="powerActionWorlds.length"
+					color="brand"
+					:size="size"
+					:actions="startSplitActions"
+					:primary-disabled="!canTakeAction"
+					:dropdown-disabled="!canTakeAction"
+					:primary-tooltip="busyTooltip"
+					:dropdown-tooltip="busyTooltip"
+				/>
+				<ButtonStyled v-else type="standard" color="brand" :size="size">
 					<button v-tooltip="busyTooltip" :disabled="!canTakeAction" @click="handlePrimaryAction">
 						<PlayIcon />
 						<span>{{ startActionText }}</span>
@@ -79,11 +99,13 @@ const props = withDefaults(
 		disabled?: boolean
 		size?: 'standard' | 'large' | 'small'
 		startLabel?: string
+		worlds?: { id: string; name: string }[]
 	}>(),
 	{
 		disabled: false,
 		size: 'large',
 		startLabel: 'Start',
+		worlds: () => [],
 	},
 )
 
@@ -105,6 +127,37 @@ const size = computed(() => props.size)
 const startActionText = computed(() =>
 	primaryActionText.value === 'Start' ? props.startLabel : primaryActionText.value,
 )
+const powerActionWorlds = computed(() => (props.worlds.length > 1 ? props.worlds : []))
+
+const startSplitActions = computed<JoinedButtonAction[]>(() => [
+	{
+		id: 'start',
+		label: startActionText.value,
+		icon: PlayIcon,
+		action: handlePrimaryAction,
+	},
+	...powerActionWorlds.value.map((world) => ({
+		id: `start-${world.id}`,
+		label: `Start with ${world.name}`,
+		icon: PlayIcon,
+		action: () => initiateAction('Start', world.id),
+	})),
+])
+
+const restartSplitActions = computed<JoinedButtonAction[]>(() => [
+	{
+		id: 'restart',
+		label: primaryActionText.value,
+		icon: UpdatedIcon,
+		action: handlePrimaryAction,
+	},
+	...powerActionWorlds.value.map((world) => ({
+		id: `restart-${world.id}`,
+		label: `Restart with ${world.name}`,
+		icon: UpdatedIcon,
+		action: () => initiateAction('Restart', world.id),
+	})),
+])
 
 const stopSplitActions = computed<JoinedButtonAction[]>(() => [
 	{
diff --git a/packages/ui/src/layouts/shared/browse-tab/header.vue b/packages/ui/src/layouts/shared/browse-tab/header.vue
index cda1745fb1..397588db3b 100644
--- a/packages/ui/src/layouts/shared/browse-tab/header.vue
+++ b/packages/ui/src/layouts/shared/browse-tab/header.vue
@@ -11,7 +11,7 @@ import PageHeader from '#ui/components/base/page-header/index.vue'
 import PageHeaderMetadata from '#ui/components/base/page-header/metadata/index.vue'
 import PageHeaderMetadataItem from '#ui/components/base/page-header/metadata/page-header-metadata-item.vue'
 import LoaderIcon from '#ui/components/servers/icons/LoaderIcon.vue'
-import { useServerImage } from '#ui/composables/use-server-image'
+import { useServerImage } from '#ui/composables/servers/use-server-image'
 import { formatLoaderLabel } from '#ui/utils/loaders'
 
 import SelectedProjectsLeaveModal from './components/SelectedProjectsLeaveModal.vue'
diff --git a/packages/ui/src/layouts/wrapped/hosting/manage/[id]/index.vue b/packages/ui/src/layouts/wrapped/hosting/manage/[id]/index.vue
index c905bb8725..46c4f5db93 100644
--- a/packages/ui/src/layouts/wrapped/hosting/manage/[id]/index.vue
+++ b/packages/ui/src/layouts/wrapped/hosting/manage/[id]/index.vue
@@ -158,12 +158,12 @@
 									{{ formatLoaderLabel(serverData.loader) }} {{ serverData.mc_version }}
 								</PageHeaderMetadataItem>
 								<PageHeaderMetadataItem
-									v-if="serverData.net?.domain && !serverPreferences.hideSubdomainLabel"
+									v-if="showServerAddress"
 									:icon="LinkIcon"
 									tooltip="Copy server address"
 									:action="copyServerAddress"
 								>
-									{{ serverData.net.domain }}.modrinth.gg
+									{{ serverAddress }}
 								</PageHeaderMetadataItem>
 								<PageHeaderMetadataItem v-if="showServerUptime" :icon="TimerIcon">
 									{{ formattedUptime }}
@@ -183,7 +183,10 @@
 
 					<template #actions>
 						<PageHeaderActions>
-							<PanelServerActionButton :disabled="!!installError" />
+							<PanelServerActionButton
+								:disabled="!!installError"
+								:worlds="serverFull?.worlds ?? []"
+							/>
 							<Tooltip
 								theme="dismissable-prompt"
 								:triggers="[]"
@@ -1070,6 +1073,22 @@ const showServerUptime = computed(() => props.showUptime && serverPowerState.val
 
 const formattedUptime = computed(() => formatUptime(uptimeSeconds.value))
 
+const serverAddress = computed(() => {
+	const domain = serverData.value?.net?.domain
+	if (domain) return `${domain}.modrinth.gg`
+
+	const ip = serverData.value?.net?.ip
+	if (!ip) return null
+	const port = serverData.value?.net?.port
+	return port ? `${ip}:${port}` : ip
+})
+
+const showServerAddress = computed(
+	() =>
+		!!serverAddress.value &&
+		(!serverData.value?.net?.domain || !serverPreferences.value.hideSubdomainLabel),
+)
+
 const serverProjectLink = computed(() => {
 	if (!serverProject.value) return ''
 	return `/project/${serverProject.value.slug ?? serverProject.value.id}`
@@ -1105,10 +1124,9 @@ function formatUptime(uptime: number) {
 }
 
 function copyServerAddress() {
-	const domain = serverData.value?.net?.domain
-	if (!domain) return
+	if (!serverAddress.value) return
 
-	void navigator.clipboard.writeText(`${domain}.modrinth.gg`)
+	void navigator.clipboard.writeText(serverAddress.value)
 	addNotification({
 		title: 'Server address copied',
 		text: "Your server's address has been copied to your clipboard.",