mirror of
https://github.com/MrUnknownDE/VRCX.git
synced 2026-05-07 14:56:06 +02:00
fix: Error When Creating Group Members/Plus Instance (#1234)
* utils * fix: Error When Creating Group Members/Plus Instance (#1233)
This commit is contained in:
+3
-4
@@ -130,7 +130,8 @@ import {
|
|||||||
deleteVRChatCache,
|
deleteVRChatCache,
|
||||||
extractFileId,
|
extractFileId,
|
||||||
extractFileVersion,
|
extractFileVersion,
|
||||||
getAvailablePlatforms
|
getAvailablePlatforms,
|
||||||
|
_utils
|
||||||
} from './composables/shared/utils';
|
} from './composables/shared/utils';
|
||||||
|
|
||||||
// main app classes
|
// main app classes
|
||||||
@@ -449,6 +450,7 @@ console.log(`isLinux: ${LINUX}`);
|
|||||||
app.methods = { ...app.methods, ...value._methods };
|
app.methods = { ...app.methods, ...value._methods };
|
||||||
app.data = { ...app.data, ...value._data };
|
app.data = { ...app.data, ...value._data };
|
||||||
}
|
}
|
||||||
|
app.methods = { ...app.methods, ..._utils };
|
||||||
Object.assign($app, app);
|
Object.assign($app, app);
|
||||||
|
|
||||||
// #endregion
|
// #endregion
|
||||||
@@ -9882,9 +9884,6 @@ console.log(`isLinux: ${LINUX}`);
|
|||||||
params.queueEnabled = D.queueEnabled;
|
params.queueEnabled = D.queueEnabled;
|
||||||
if (D.groupAccessType === 'members') {
|
if (D.groupAccessType === 'members') {
|
||||||
params.roleIds = D.roleIds;
|
params.roleIds = D.roleIds;
|
||||||
params.canRequestInvite = true;
|
|
||||||
} else if (D.groupAccessType === 'plus') {
|
|
||||||
params.canRequestInvite = true;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (
|
if (
|
||||||
|
|||||||
@@ -1,6 +1,16 @@
|
|||||||
import Noty from 'noty';
|
import Noty from 'noty';
|
||||||
import utils from '../../classes/utils';
|
import utils from '../../classes/utils';
|
||||||
import { compareUnityVersion } from '../avatar/utils';
|
import { compareUnityVersion } from '../avatar/utils';
|
||||||
|
import {
|
||||||
|
displayLocation,
|
||||||
|
isRealInstance,
|
||||||
|
parseLocation
|
||||||
|
} from '../instance/utils';
|
||||||
|
import {
|
||||||
|
getPrintFileName,
|
||||||
|
getPrintLocalDate,
|
||||||
|
isFriendOnline
|
||||||
|
} from '../user/utils';
|
||||||
|
|
||||||
function getAvailablePlatforms(unityPackages) {
|
function getAvailablePlatforms(unityPackages) {
|
||||||
var isPC = false;
|
var isPC = false;
|
||||||
@@ -223,25 +233,9 @@ function extractVariantVersion(url) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export {
|
// ---------------------- devtool method --------------------------
|
||||||
getAvailablePlatforms,
|
|
||||||
downloadAndSaveJson,
|
|
||||||
deleteVRChatCache,
|
|
||||||
checkVRChatCache,
|
|
||||||
copyToClipboard,
|
|
||||||
getFaviconUrl,
|
|
||||||
convertFileUrlToImageUrl,
|
|
||||||
replaceVrcPackageUrl,
|
|
||||||
getLaunchURL,
|
|
||||||
extractFileId,
|
|
||||||
extractFileVersion,
|
|
||||||
extractVariantVersion
|
|
||||||
};
|
|
||||||
|
|
||||||
// ---------------------- devtools method --------------------------
|
async function getBundleLocation(input) {
|
||||||
|
|
||||||
// not window.$app
|
|
||||||
window.getBundleLocation = async function (input) {
|
|
||||||
const $app = window.$app;
|
const $app = window.$app;
|
||||||
var assetUrl = input;
|
var assetUrl = input;
|
||||||
var variant = '';
|
var variant = '';
|
||||||
@@ -318,4 +312,37 @@ window.getBundleLocation = async function (input) {
|
|||||||
var fullAssetLocation = `${assetLocation}\\__data`;
|
var fullAssetLocation = `${assetLocation}\\__data`;
|
||||||
console.log(fullAssetLocation);
|
console.log(fullAssetLocation);
|
||||||
return fullAssetLocation;
|
return fullAssetLocation;
|
||||||
|
}
|
||||||
|
|
||||||
|
const _utils = {
|
||||||
|
getAvailablePlatforms,
|
||||||
|
deleteVRChatCache,
|
||||||
|
checkVRChatCache,
|
||||||
|
getLaunchURL,
|
||||||
|
extractFileId,
|
||||||
|
extractFileVersion,
|
||||||
|
extractVariantVersion,
|
||||||
|
isRealInstance,
|
||||||
|
displayLocation,
|
||||||
|
parseLocation,
|
||||||
|
getPrintFileName,
|
||||||
|
getPrintLocalDate,
|
||||||
|
isFriendOnline
|
||||||
|
};
|
||||||
|
|
||||||
|
export {
|
||||||
|
getAvailablePlatforms,
|
||||||
|
downloadAndSaveJson,
|
||||||
|
deleteVRChatCache,
|
||||||
|
checkVRChatCache,
|
||||||
|
copyToClipboard,
|
||||||
|
getFaviconUrl,
|
||||||
|
convertFileUrlToImageUrl,
|
||||||
|
replaceVrcPackageUrl,
|
||||||
|
getLaunchURL,
|
||||||
|
extractFileId,
|
||||||
|
extractFileVersion,
|
||||||
|
extractVariantVersion,
|
||||||
|
getBundleLocation,
|
||||||
|
_utils
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user