diff --git a/src/app.js b/src/app.js index a4cccf13..dfedeea5 100644 --- a/src/app.js +++ b/src/app.js @@ -130,7 +130,8 @@ import { deleteVRChatCache, extractFileId, extractFileVersion, - getAvailablePlatforms + getAvailablePlatforms, + _utils } from './composables/shared/utils'; // main app classes @@ -449,6 +450,7 @@ console.log(`isLinux: ${LINUX}`); app.methods = { ...app.methods, ...value._methods }; app.data = { ...app.data, ...value._data }; } + app.methods = { ...app.methods, ..._utils }; Object.assign($app, app); // #endregion @@ -9882,9 +9884,6 @@ console.log(`isLinux: ${LINUX}`); params.queueEnabled = D.queueEnabled; if (D.groupAccessType === 'members') { params.roleIds = D.roleIds; - params.canRequestInvite = true; - } else if (D.groupAccessType === 'plus') { - params.canRequestInvite = true; } } if ( diff --git a/src/composables/shared/utils.js b/src/composables/shared/utils.js index 44c32703..7035a408 100644 --- a/src/composables/shared/utils.js +++ b/src/composables/shared/utils.js @@ -1,6 +1,16 @@ import Noty from 'noty'; import utils from '../../classes/utils'; import { compareUnityVersion } from '../avatar/utils'; +import { + displayLocation, + isRealInstance, + parseLocation +} from '../instance/utils'; +import { + getPrintFileName, + getPrintLocalDate, + isFriendOnline +} from '../user/utils'; function getAvailablePlatforms(unityPackages) { var isPC = false; @@ -223,25 +233,9 @@ function extractVariantVersion(url) { } } -export { - getAvailablePlatforms, - downloadAndSaveJson, - deleteVRChatCache, - checkVRChatCache, - copyToClipboard, - getFaviconUrl, - convertFileUrlToImageUrl, - replaceVrcPackageUrl, - getLaunchURL, - extractFileId, - extractFileVersion, - extractVariantVersion -}; +// ---------------------- devtool method -------------------------- -// ---------------------- devtools method -------------------------- - -// not window.$app -window.getBundleLocation = async function (input) { +async function getBundleLocation(input) { const $app = window.$app; var assetUrl = input; var variant = ''; @@ -318,4 +312,37 @@ window.getBundleLocation = async function (input) { var fullAssetLocation = `${assetLocation}\\__data`; console.log(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 };