diff --git a/ImageCache.cs b/ImageCache.cs index ea7af164..58cde24b 100644 --- a/ImageCache.cs +++ b/ImageCache.cs @@ -13,6 +13,7 @@ namespace VRCX { var imageHost = "api.vrchat.cloud"; var imageHost1 = "files.vrchat.cloud"; + var imageHost2 = "d348imysud55la.cloudfront.net"; var directoryLocation = Path.Combine(cacheLocation, fileId); var fileLocation = Path.Combine(directoryLocation, $"{version}.png"); @@ -27,7 +28,7 @@ namespace VRCX Directory.CreateDirectory(directoryLocation); Uri uri = new Uri(url); - if (uri.Host != imageHost && uri.Host != imageHost1) + if (uri.Host != imageHost && uri.Host != imageHost1 && uri.Host != imageHost2) throw new ArgumentException("Invalid image host", url); using (var client = new WebClient()) diff --git a/html/src/app.js b/html/src/app.js index 9121b048..0982e4d4 100644 --- a/html/src/app.js +++ b/html/src/app.js @@ -11180,7 +11180,8 @@ speechSynthesis.getVoices(); stripe: true, size: 'mini' }, - layout: 'table' + layout: 'table', + visible: false }; $app.data.inviteResponseMessageTable = { data: [], @@ -11188,7 +11189,8 @@ speechSynthesis.getVoices(); stripe: true, size: 'mini' }, - layout: 'table' + layout: 'table', + visible: false }; $app.data.inviteRequestMessageTable = { data: [], @@ -11196,7 +11198,8 @@ speechSynthesis.getVoices(); stripe: true, size: 'mini' }, - layout: 'table' + layout: 'table', + visible: false }; $app.data.inviteRequestResponseMessageTable = { data: [], @@ -11204,7 +11207,8 @@ speechSynthesis.getVoices(); stripe: true, size: 'mini' }, - layout: 'table' + layout: 'table', + visible: false }; $app.data.friendsListTable = { data: [], @@ -11442,10 +11446,6 @@ speechSynthesis.getVoices(); } else { AppApi.ChangeTheme(0); } - var dateObj = new Date(); - if (dateObj.getMonth() === 3 && dateObj.getDate() === 1) { - AppApi.DoFunny(); - } window .matchMedia('(prefers-color-scheme: dark)') .addEventListener('change', (e) => { diff --git a/html/src/app.scss b/html/src/app.scss index a8023808..e2119cd8 100644 --- a/html/src/app.scss +++ b/html/src/app.scss @@ -664,3 +664,12 @@ i.x-user-status.busy { width: 16px; height: 11px; } + +.el-pagination .el-select .el-input .el-input__inner, +.el-input--mini .el-input__icon { + height: 22px; +} + +.el-pagination .btn-next { + margin-right: 10px; +} diff --git a/html/src/index.pug b/html/src/index.pug index f4b815c7..6b3bbf5f 100644 --- a/html/src/index.pug +++ b/html/src/index.pug @@ -745,7 +745,7 @@ html el-tooltip(placement="top" content="Refresh" :disabled="hideTooltips") el-button(type="default" @click="inviteMessageTable.visible = true; refreshInviteMessageTable('message')" size="mini" icon="el-icon-refresh" circle style="margin-left:5px") el-tooltip(placement="top" content="Clear results" :disabled="hideTooltips") - el-button(type="default" @click="inviteMessageTable.visible = false" size="mini" icon="el-icon-delete" circle style="margin-left:0") + el-button(type="default" @click="inviteMessageTable.visible = false" size="mini" icon="el-icon-delete" circle style="margin-left:5px") data-tables(v-if="inviteMessageTable.visible" v-bind="inviteMessageTable" style="margin-top:10px") el-table-column(label="Slot" prop="slot" sortable="custom" width="70") el-table-column(label="Message" prop="message") @@ -760,7 +760,7 @@ html el-tooltip(placement="top" content="Refresh" :disabled="hideTooltips") el-button(type="default" @click="inviteResponseMessageTable.visible = true; refreshInviteMessageTable('response')" size="mini" icon="el-icon-refresh" circle style="margin-left:5px") el-tooltip(placement="top" content="Clear results" :disabled="hideTooltips") - el-button(type="default" @click="inviteResponseMessageTable.visible = false" size="mini" icon="el-icon-delete" circle style="margin-left:0") + el-button(type="default" @click="inviteResponseMessageTable.visible = false" size="mini" icon="el-icon-delete" circle style="margin-left:5px") data-tables(v-if="inviteResponseMessageTable.visible" v-bind="inviteResponseMessageTable" style="margin-top:10px") el-table-column(label="Slot" prop="slot" sortable="custom" width="70") el-table-column(label="Message" prop="message") @@ -775,7 +775,7 @@ html el-tooltip(placement="top" content="Refresh" :disabled="hideTooltips") el-button(type="default" @click="inviteRequestMessageTable.visible = true; refreshInviteMessageTable('request')" size="mini" icon="el-icon-refresh" circle style="margin-left:5px") el-tooltip(placement="top" content="Clear results" :disabled="hideTooltips") - el-button(type="default" @click="inviteRequestMessageTable.visible = false" size="mini" icon="el-icon-delete" circle style="margin-left:0") + el-button(type="default" @click="inviteRequestMessageTable.visible = false" size="mini" icon="el-icon-delete" circle style="margin-left:5px") data-tables(v-if="inviteRequestMessageTable.visible" v-bind="inviteRequestMessageTable" style="margin-top:10px") el-table-column(label="Slot" prop="slot" sortable="custom" width="70") el-table-column(label="Message" prop="message") @@ -790,7 +790,7 @@ html el-tooltip(placement="top" content="Refresh" :disabled="hideTooltips") el-button(type="default" @click="inviteRequestResponseMessageTable.visible = true; refreshInviteMessageTable('requestResponse')" size="mini" icon="el-icon-refresh" circle style="margin-left:5px") el-tooltip(placement="top" content="Clear results" :disabled="hideTooltips") - el-button(type="default" @click="inviteRequestResponseMessageTable.visible = false" size="mini" icon="el-icon-delete" circle style="margin-left:0") + el-button(type="default" @click="inviteRequestResponseMessageTable.visible = false" size="mini" icon="el-icon-delete" circle style="margin-left:5px") data-tables(v-if="inviteRequestResponseMessageTable.visible" v-bind="inviteRequestResponseMessageTable" style="margin-top:10px") el-table-column(label="Slot" prop="slot" sortable="custom" width="70") el-table-column(label="Message" prop="message") @@ -812,7 +812,7 @@ html el-tooltip(placement="top" content="Refresh" :disabled="hideTooltips") el-button(type="default" @click="refreshConfigTreeData()" size="mini" icon="el-icon-refresh" circle style="margin-left:5px") el-tooltip(placement="top" content="Clear results" :disabled="hideTooltips") - el-button(type="default" @click="configTreeData = []" size="mini" icon="el-icon-delete" circle style="margin-left:0") + el-button(type="default" @click="configTreeData = []" size="mini" icon="el-icon-delete" circle style="margin-left:5px") el-tree(v-if="configTreeData.length > 0" :data="configTreeData" style="margin-top:10px;font-size:12px") template(#default="scope") span @@ -823,7 +823,7 @@ html el-tooltip(placement="top" content="Refresh" :disabled="hideTooltips") el-button(type="default" @click="refreshCurrentUserTreeData()" size="mini" icon="el-icon-refresh" circle style="margin-left:5px") el-tooltip(placement="top" content="Clear results" :disabled="hideTooltips") - el-button(type="default" @click="currentUserTreeData = []" size="mini" icon="el-icon-delete" circle style="margin-left:0") + el-button(type="default" @click="currentUserTreeData = []" size="mini" icon="el-icon-delete" circle style="margin-left:5px") el-tree(v-if="currentUserTreeData.length > 0" :data="currentUserTreeData" style="margin-top:10px;font-size:12px") template(#default="scope") span @@ -1519,7 +1519,7 @@ html .detail span.name Date Joined span.extra(v-text="userDialog.ref.date_joined") - .x-friend-item(style="cursor:default") + .x-friend-item(v-if="API.currentUser.id !== userDialog.id" style="cursor:default") .detail span.name(v-if="userDialog.unFriended") Unfriended span.name(v-else) Friended @@ -1847,7 +1847,7 @@ html //- dialog: favorite el-dialog.x-dialog(:before-close="beforeDialogClose" @mousedown.native="dialogMouseDown" @mouseup.native="dialogMouseUp" ref="favoriteDialog" :visible.sync="favoriteDialog.visible" title="Choose Group" width="300px") div(v-loading="favoriteDialog.loading") - el-button(v-for="group in favoriteDialog.groups" :key="group.name" style="display:block;width:100%;margin:10px 0" @click="addFavorite(group)" :disabled="group.count >= group.capacity") {{ group.displayName }} ({{ group.count }} / {{ group.capacity }}) + el-button(v-for="group in favoriteDialog.groups" :key="group.name" style="display:block;width:100%;margin:10px 0" @click="addFavorite(group)") {{ group.displayName }} ({{ group.count }} / {{ group.capacity }}) //- dialog: invite el-dialog.x-dialog(:before-close="beforeDialogClose" @mousedown.native="dialogMouseDown" @mouseup.native="dialogMouseUp" ref="inviteDialog" :visible.sync="inviteDialog.visible" title="Invite" width="450px")