mirror of
https://github.com/MrUnknownDE/VRCX.git
synced 2026-05-07 14:56:06 +02:00
Fixes
This commit is contained in:
+3
-1
@@ -24,7 +24,9 @@ namespace VRCX
|
|||||||
|
|
||||||
foreach (string arg in args)
|
foreach (string arg in args)
|
||||||
{
|
{
|
||||||
if (arg.Contains("--gpufix")) Program.GPUFix = true;
|
if (arg.Contains("--gpufix"))
|
||||||
|
Program.GPUFix = true;
|
||||||
|
|
||||||
if (arg.Length > 12 && arg.Substring(0, 12) == "/uri=vrcx://")
|
if (arg.Length > 12 && arg.Substring(0, 12) == "/uri=vrcx://")
|
||||||
LaunchCommand = arg.Substring(12);
|
LaunchCommand = arg.Substring(12);
|
||||||
|
|
||||||
|
|||||||
+40
-2
@@ -9568,7 +9568,11 @@ speechSynthesis.getVoices();
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
this.photonLastChatBoxMsg.set(photonId, text);
|
this.photonLastChatBoxMsg.set(photonId, text);
|
||||||
if (this.checkChatboxBlacklist(text)) {
|
var userId = this.getUserIdFromPhotonId(photonId);
|
||||||
|
if (
|
||||||
|
this.chatboxUserBlacklist.has(userId) ||
|
||||||
|
this.checkChatboxBlacklist(text)
|
||||||
|
) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
this.addEntryPhotonEvent({
|
this.addEntryPhotonEvent({
|
||||||
@@ -9578,7 +9582,7 @@ speechSynthesis.getVoices();
|
|||||||
created_at: gameLogDate
|
created_at: gameLogDate
|
||||||
});
|
});
|
||||||
var entry = {
|
var entry = {
|
||||||
userId: this.getUserIdFromPhotonId(photonId),
|
userId,
|
||||||
displayName: this.getDisplayNameFromPhotonId(photonId),
|
displayName: this.getDisplayNameFromPhotonId(photonId),
|
||||||
created_at: gameLogDate,
|
created_at: gameLogDate,
|
||||||
type: 'ChatBoxMessage',
|
type: 'ChatBoxMessage',
|
||||||
@@ -22061,6 +22065,40 @@ speechSynthesis.getVoices();
|
|||||||
return false;
|
return false;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// App: ChatBox User Blacklist
|
||||||
|
$app.data.chatboxUserBlacklist = new Map();
|
||||||
|
if (configRepository.getString('VRCX_chatboxUserBlacklist')) {
|
||||||
|
$app.data.chatboxUserBlacklist = new Map(
|
||||||
|
Object.entries(
|
||||||
|
JSON.parse(
|
||||||
|
configRepository.getString('VRCX_chatboxUserBlacklist')
|
||||||
|
)
|
||||||
|
)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
$app.methods.saveChatboxUserBlacklist = function () {
|
||||||
|
configRepository.setString(
|
||||||
|
'VRCX_chatboxUserBlacklist',
|
||||||
|
JSON.stringify(Object.fromEntries(this.chatboxUserBlacklist))
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
$app.methods.addChatboxUserBlacklist = function (user) {
|
||||||
|
this.chatboxUserBlacklist.set(user.id, user.displayName);
|
||||||
|
this.saveChatboxUserBlacklist();
|
||||||
|
this.getCurrentInstanceUserList();
|
||||||
|
};
|
||||||
|
|
||||||
|
$app.methods.deleteChatboxUserBlacklist = function (userId) {
|
||||||
|
this.chatboxUserBlacklist.delete(userId);
|
||||||
|
this.saveChatboxUserBlacklist();
|
||||||
|
this.getCurrentInstanceUserList();
|
||||||
|
this.$nextTick(() =>
|
||||||
|
adjustDialogZ(this.$refs.chatboxBlacklistDialog.$el)
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
$app = new Vue($app);
|
$app = new Vue($app);
|
||||||
window.$app = $app;
|
window.$app = $app;
|
||||||
})();
|
})();
|
||||||
|
|||||||
+12
-1
@@ -263,6 +263,12 @@ html
|
|||||||
timer(:epoch="scope.row.timer")
|
timer(:epoch="scope.row.timer")
|
||||||
el-table-column(v-if="photonLoggingEnabled" label="Photon Id" width="110" prop="photonId" sortable)
|
el-table-column(v-if="photonLoggingEnabled" label="Photon Id" width="110" prop="photonId" sortable)
|
||||||
template(v-once #default="scope")
|
template(v-once #default="scope")
|
||||||
|
template(v-if="chatboxUserBlacklist.has(scope.row.ref.id)")
|
||||||
|
el-tooltip(placement="left" content="Unblock chatbox messages")
|
||||||
|
el-button(type="text" icon="el-icon-turn-off-microphone" size="mini" style="color:red;margin-right:5px" @click.stop="deleteChatboxUserBlacklist(scope.row.ref.id)")
|
||||||
|
template(v-else)
|
||||||
|
el-tooltip(placement="left" content="Block chatbox messages")
|
||||||
|
el-button(type="text" icon="el-icon-microphone" size="mini" style="margin-right:5px" @click.stop="addChatboxUserBlacklist(scope.row.ref)")
|
||||||
span(v-text="scope.row.photonId")
|
span(v-text="scope.row.photonId")
|
||||||
el-table-column(label="Icons" prop="isMaster" width="100")
|
el-table-column(label="Icons" prop="isMaster" width="100")
|
||||||
template(v-once #default="scope")
|
template(v-once #default="scope")
|
||||||
@@ -3305,10 +3311,15 @@ html
|
|||||||
|
|
||||||
//- dialog: chatbox blacklist
|
//- 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")
|
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")
|
div(v-loading="chatboxBlacklistDialog.loading" v-if="chatboxBlacklistDialog.visible")
|
||||||
|
h2 Keyword Blacklist
|
||||||
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-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(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
|
el-button(@click="chatboxBlacklist.push('')" size="mini" style="margin-top:5px") Add Item
|
||||||
|
br
|
||||||
|
h2 User Blacklist
|
||||||
|
el-tag(v-for="user in chatboxUserBlacklist" type="info" disable-transitions="true" :key="user[0]" style="margin-right:5px" closable @close="deleteChatboxUserBlacklist(user[0])")
|
||||||
|
span {{user[1]}}
|
||||||
|
|
||||||
//- dialog: open source software notice
|
//- 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")
|
el-dialog.x-dialog(:before-close="beforeDialogClose" @mousedown.native="dialogMouseDown" @mouseup.native="dialogMouseUp" :visible.sync="ossDialog" title="Open Source Software Notice" width="650px")
|
||||||
|
|||||||
Reference in New Issue
Block a user