From bb6faac54c906ad701552e7646bcc98dfe13569b Mon Sep 17 00:00:00 2001
From: Natsumi <cmcooper123@hotmail.com>
Date: Wed, 27 Aug 2025 20:09:32 +1200
Subject: [PATCH] Open new instance in-game

---
 .../dialogs/WorldDialog/WorldDialog.vue       |  6 +++++-
 src/localization/en/en.json                   |  2 +-
 src/stores/invite.js                          | 10 +++++++++
 .../components/FavoritesWorldItem.vue         | 21 ++++++++++++++-----
 4 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/src/components/dialogs/WorldDialog/WorldDialog.vue b/src/components/dialogs/WorldDialog/WorldDialog.vue
index 14304445..c3af29e2 100644
--- a/src/components/dialogs/WorldDialog/WorldDialog.vue
+++ b/src/components/dialogs/WorldDialog/WorldDialog.vue
@@ -232,7 +232,11 @@
                                     {{ t('dialog.world.actions.new_instance') }}
                                 </el-dropdown-item>
                                 <el-dropdown-item icon="el-icon-message" command="New Instance and Self Invite">
-                                    {{ t('dialog.world.actions.new_instance_and_self_invite') }}
+                                    {{
+                                        isGameRunning
+                                            ? t('dialog.world.actions.new_instance_and_open_in_vrchat')
+                                            : t('dialog.world.actions.new_instance_and_self_invite')
+                                    }}
                                 </el-dropdown-item>
                                 <el-dropdown-item
                                     v-if="
diff --git a/src/localization/en/en.json b/src/localization/en/en.json
index 83dc066a..ba4287f1 100644
--- a/src/localization/en/en.json
+++ b/src/localization/en/en.json
@@ -135,7 +135,6 @@
             "import": "Import",
             "move_tooltip": "Move",
             "copy_tooltip": "Copy",
-            "self_invite_tooltip": "Self Invite",
             "unfavorite_tooltip": "Unfavorite",
             "visibility_tooltip": "Change Visibility",
             "rename_tooltip": "Rename",
@@ -908,6 +907,7 @@
                 "share": "Share",
                 "new_instance": "New Instance",
                 "new_instance_and_self_invite": "New Instance and Self Invite",
+                "new_instance_and_open_in_vrchat": "New Instance and Open in VRChat",
                 "make_home": "Make Home",
                 "reset_home": "Reset Home",
                 "show_previous_instances": "Show Previous Instances",
diff --git a/src/stores/invite.js b/src/stores/invite.js
index 5feda96f..42841ac2 100644
--- a/src/stores/invite.js
+++ b/src/stores/invite.js
@@ -5,9 +5,13 @@ import { $app } from '../app';
 import { watchState } from '../service/watchState';
 import { parseLocation } from '../shared/utils';
 import { useInstanceStore } from './instance';
+import { useGameStore } from './game';
+import { useLaunchStore } from './launch';
 
 export const useInviteStore = defineStore('Invite', () => {
     const instanceStore = useInstanceStore();
+    const gameStore = useGameStore();
+    const launchStore = useLaunchStore();
     const state = reactive({
         editInviteMessageDialog: {
             visible: false,
@@ -160,6 +164,12 @@ export const useInviteStore = defineStore('Invite', () => {
             if (!L.isRealInstance) {
                 return;
             }
+            if (gameStore.isGameRunning && !LINUX) {
+                const secureOrShortName =
+                    args.json.shortName || args.json.secureName;
+                launchStore.tryOpenInstanceInVrc(location, secureOrShortName);
+                return;
+            }
             instanceRequest
                 .selfInvite({
                     instanceId: L.instanceId,
diff --git a/src/views/Favorites/components/FavoritesWorldItem.vue b/src/views/Favorites/components/FavoritesWorldItem.vue
index 1e3f6646..b057641a 100644
--- a/src/views/Favorites/components/FavoritesWorldItem.vue
+++ b/src/views/Favorites/components/FavoritesWorldItem.vue
@@ -51,10 +51,14 @@
                         :content="$t('view.favorite.private')">
                         <i class="el-icon-warning" style="color: #e6a23c; margin-left: 5px"></i>
                     </el-tooltip>
-                    <el-tooltip
-                        placement="left"
-                        :content="$t('view.favorite.self_invite_tooltip')"
-                        :disabled="hideTooltips">
+                    <el-tooltip placement="left" :disabled="hideTooltips">
+                        <template #content>
+                            {{
+                                isGameRunning
+                                    ? $t('dialog.world.actions.new_instance_and_open_in_vrchat')
+                                    : $t('dialog.world.actions.new_instance_and_self_invite')
+                            }}
+                        </template>
                         <el-button
                             size="mini"
                             icon="el-icon-message"
@@ -132,7 +136,13 @@
     import { storeToRefs } from 'pinia';
     import { computed, getCurrentInstance } from 'vue';
     import { favoriteRequest } from '../../../api';
-    import { useAppearanceSettingsStore, useFavoriteStore, useInviteStore, useUiStore } from '../../../stores';
+    import {
+        useAppearanceSettingsStore,
+        useFavoriteStore,
+        useInviteStore,
+        useUiStore,
+        useGameStore
+    } from '../../../stores';
 
     const props = defineProps({
         group: [Object, String],
@@ -149,6 +159,7 @@
     const { showFavoriteDialog } = useFavoriteStore();
     const { newInstanceSelfInvite } = useInviteStore();
     const { shiftHeld } = storeToRefs(useUiStore());
+    const { isGameRunning } = storeToRefs(useGameStore());
 
     const isSelected = computed({
         get: () => props.favorite.$selected,