MrUnknownDE/VRCX
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/VRCX.git synced 2026-04-19 06:43:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update VC++, Register & forgot password buttons

Browse Source
This commit is contained in:
Natsumi
2022-11-07 15:47:17 +13:00
parent 09dad4e36d
commit d385279742
3 changed files with 55 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Installer/installer.nsi
View File

@@ -132,7 +132,7 @@ Section "Install" SecInstall
afterupgrade:
ReadRegStr $R0 HKCR "Installer\Dependencies\VC,redist.x64,amd64,14.32,bundle" "Version"
ReadRegStr $R0 HKCR "Installer\Dependencies\VC,redist.x64,amd64,14.34,bundle" "Version"
IfErrors 0 VSRedistInstalled
inetc::get "https://aka.ms/vs/17/release/vc_redist.x64.exe" $TEMP\vcredist_x64.exe

43
html/src/app.js
View File

@@ -9568,6 +9568,9 @@ speechSynthesis.getVoices();
return;
}
this.photonLastChatBoxMsg.set(photonId, text);
if (this.checkChatboxBlacklist(text)) {
return;
}
this.addEntryPhotonEvent({
photonId,
text,
@@ -22018,6 +22021,46 @@ speechSynthesis.getVoices();
);
};
// App: ChatBox Blacklist
$app.data.chatboxBlacklist = ['NP: ', 'Now Playing', '( ▶️ '];
if (configRepository.getString('VRCX_chatboxBlacklist')) {
$app.data.chatboxBlacklist = JSON.parse(
configRepository.getString('VRCX_chatboxBlacklist')
);
}
$app.data.chatboxBlacklistDialog = {
visible: false,
loading: false
};
API.$on('LOGOUT', function () {
$app.chatboxBlacklistDialog.visible = false;
});
$app.methods.saveChatboxBlacklist = function () {
configRepository.setString(
'VRCX_chatboxBlacklist',
JSON.stringify(this.chatboxBlacklist)
);
};
$app.methods.showChatboxBlacklistDialog = function () {
this.$nextTick(() =>
adjustDialogZ(this.$refs.chatboxBlacklistDialog.$el)
);
var D = this.chatboxBlacklistDialog;
D.visible = true;
};
$app.methods.checkChatboxBlacklist = function (msg) {
for (var i = 0; i < this.chatboxBlacklist.length; ++i) {
if (msg.includes(this.chatboxBlacklist[i])) {
return true;
}
}
return false;
};
$app = new Vue($app);
window.$app = $app;
})();

12
html/src/index.pug
View File

@@ -42,7 +42,9 @@ html
el-input(v-model="loginForm.websocket" name="websocket" :placeholder="API.websocketDomainVrchat" clearable)
el-form-item(style="margin-top:15px")
el-button(native-type="submit" type="primary" :loading="loginForm.loading" style="width:100%") Login
el-button(type="primary" @click="openExternalLink('https://vrchat.com/register')" :loading="loginForm.loading" style="width:100%") Register
div(style="text-align:center;font-size:12px")
p #[a(@click="openExternalLink('https://vrchat.com/home/password')") Forgot password?]
p &copy; 2019-2022 #[a(@click="openExternalLink('https://github.com/pypy-vrc')") pypy] (mina#5656) & #[a(@click="openExternalLink('https://github.com/Natsumi-sama')") Natsumi]
p VRCX is an assistant application for provide information about manage friendship. this application uses unofficial VRChat API (VRCSDK).
p VRCX isn't endorsed by VRChat and doesn't reflect the views or opinions of VRChat or anyone officially involved in producing or managing VRChat. VRChat is trademark of VRChat Inc. VRChat © VRChat Inc.
@@ -130,9 +132,10 @@ html
span.extra {{ currentInstanceWorld.ref.created_at | formatDate('long') }}
div.photon-event-table(v-if="photonLoggingEnabled")
div(style="position:absolute;margin-left:195px;z-index:1")
el-select(v-model="photonEventTableTypeFilter" @change="photonEventTableFilterChange" multiple clearable collapse-tags style="flex:1" placeholder="Filter")
el-select(v-model="photonEventTableTypeFilter" @change="photonEventTableFilterChange" multiple clearable collapse-tags style="flex:1;width:150px" placeholder="Filter")
el-option(v-once v-for="type in photonEventTableTypeFilterList" :key="type" :label="type" :value="type")
el-input(v-model="photonEventTableFilter" @input="photonEventTableFilterChange" placeholder="Search" clearable style="width:150px;margin-left:10px")
el-button(@click="showChatboxBlacklistDialog" style="margin-left:10px") Chatbox Blacklist
el-tooltip(placement="bottom" content="VRCX Companion Status" :disabled="hideTooltips")
div(style="display:inline-block;margin-left:15px;font-size:14px;vertical-align:text-top;margin-top:1px")
span(v-if="ipcEnabled && !photonEventIcon") 🟢
@@ -3300,6 +3303,13 @@ html
el-button(slot="append" icon="el-icon-delete" @click="removeAvatarProvider(provider)")
el-button(@click="avatarRemoteDatabaseProviderList.push('')" size="mini" style="margin-top:5px") Add Provider
//- dialog: chatbox blacklist
el-dialog.x-dialog(:before-close="beforeDialogClose" @mousedown.native="dialogMouseDown" @mouseup.native="dialogMouseUp" ref="chatboxBlacklistDialog" :visible.sync="chatboxBlacklistDialog.visible" title="Chatbox Blacklist" width="600px")
div(v-loading="chatboxBlacklistDialog.loading")
el-input(v-for="(item, index) in chatboxBlacklist" :key="index" :value="item" v-model="chatboxBlacklist[index]" size="small" style="margin-top:5px" @change="saveChatboxBlacklist")
el-button(slot="append" icon="el-icon-delete" @click="chatboxBlacklist.splice(index, 1); saveChatboxBlacklist()")
el-button(@click="chatboxBlacklist.push('')" size="mini" style="margin-top:5px") Add Item
//- dialog: open source software notice
el-dialog.x-dialog(:before-close="beforeDialogClose" @mousedown.native="dialogMouseDown" @mouseup.native="dialogMouseUp" :visible.sync="ossDialog" title="Open Source Software Notice" width="650px")
div(v-if="ossDialog" style="height:350px;overflow:hidden scroll;word-break:break-all")