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

Small fixes

Browse Source
This commit is contained in:
Natsumi
2024-04-28 08:41:17 +12:00
parent ce3aa1d531
commit 326937853a
3 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Dotnet/Program.cs
View File

@@ -123,6 +123,7 @@ namespace VRCX
{ {
Version = $"{buildName} Build"; Version = $"{buildName} Build";
} }
Version = Version.Replace("\r", "").Replace("\n", "");
} }
private static void Run() private static void Run()

23
html/src/app.js
View File

@@ -2622,9 +2622,9 @@ speechSynthesis.getVoices();
return args; return args;
}) })
.catch((err) => { .catch((err) => {
if (err && err.includes('Instance is closed.')) { if (err?.error?.message) {
$app.$message({ $app.$message({
message: 'Instance is closed.', message: err.error.message,
type: 'error' type: 'error'
}); });
throw err; throw err;
@@ -9970,6 +9970,9 @@ speechSynthesis.getVoices();
// eslint-disable-next-line require-atomic-updates // eslint-disable-next-line require-atomic-updates
$app.feedSessionTable = await database.getFeedDatabase(); $app.feedSessionTable = await database.getFeedDatabase();
$app.feedTableLookup(); $app.feedTableLookup();
// eslint-disable-next-line require-atomic-updates
$app.notificationTable.data = await database.getNotifications();
await this.refreshNotifications();
if (typeof args.json.presence?.groups !== 'undefined') { if (typeof args.json.presence?.groups !== 'undefined') {
await $app.loadCurrentUserGroups( await $app.loadCurrentUserGroups(
args.json.id, args.json.id,
@@ -9993,9 +9996,6 @@ speechSynthesis.getVoices();
this.logout(); this.logout();
throw err; throw err;
} }
// eslint-disable-next-line require-atomic-updates
$app.notificationTable.data = await database.getNotifications();
await this.refreshNotifications();
$app.getAvatarHistory(); $app.getAvatarHistory();
$app.getAllMemos(); $app.getAllMemos();
if ($app.randomUserColours) { if ($app.randomUserColours) {
@@ -19715,10 +19715,9 @@ speechSynthesis.getVoices();
) { ) {
this.$message({ this.$message({
message: message:
"You can't invite yourself in 'Do Not Disturb' mode", "You may not receive this invite in 'Do Not Disturb' mode",
type: 'error' type: 'error'
}); });
return;
} }
D.loading = true; D.loading = true;
var inviteLoop = () => { var inviteLoop = () => {
@@ -29887,10 +29886,12 @@ speechSynthesis.getVoices();
if (this.groupDialog.visible && this.groupDialog.id === groupId) { if (this.groupDialog.visible && this.groupDialog.id === groupId) {
this.showGroupDialog(groupId); this.showGroupDialog(groupId);
} }
API.currentUserGroups.delete(groupId); if (API.currentUserGroups.has(groupId)) {
API.getCachedGroup({ groupId }).then((args) => { API.currentUserGroups.delete(groupId);
this.groupChange(args.ref, 'Left group'); API.getCachedGroup({ groupId }).then((args) => {
}); this.groupChange(args.ref, 'Left group');
});
}
}; };
// group search // group search

1
html/src/theme.material3.scss
View File

@@ -1318,7 +1318,6 @@ img.x-link.el-popover__reference {
font-size: var(--md-sys-typescale-label-medium-size); font-size: var(--md-sys-typescale-label-medium-size);
font-weight: var(--md-sys-typescale-label-medium-weight); font-weight: var(--md-sys-typescale-label-medium-weight);
letter-spacing: var(--md-sys-typescale-label-medium-tracking); letter-spacing: var(--md-sys-typescale-label-medium-tracking);
pointer-events: none;
} }
/* Dialog / Message box */ /* Dialog / Message box */