This commit is contained in:
pypy
2021-01-21 12:08:18 +09:00
parent 890daaab55
commit f72066ae51
2 changed files with 28 additions and 28 deletions
+13 -13
View File
@@ -2573,10 +2573,10 @@ speechSynthesis.getVoices();
this.bulk({ this.bulk({
fn, fn,
N, N,
params: { params: {
n: 100, n: 100,
offset: 0 offset: 0
} }
}); });
} }
} }
@@ -3755,12 +3755,12 @@ speechSynthesis.getVoices();
var user = $app.loginForm.savedCredentials[$app.loginForm.lastUserLoggedIn] var user = $app.loginForm.savedCredentials[$app.loginForm.lastUserLoggedIn]
if (user !== undefined) { if (user !== undefined) {
$app.relogin({ $app.relogin({
username: user.loginParmas.username, username: user.loginParmas.username,
password: user.loginParmas.password password: user.loginParmas.password
}).then((args) => { }).then((args) => {
new Noty({ new Noty({
type: 'success', type: 'success',
text: 'Automatically logged in.' text: 'Automatically logged in.'
}).show(); }).show();
}); });
} }
@@ -4211,7 +4211,7 @@ speechSynthesis.getVoices();
if ((ctx.ref.$offline_for == '') && if ((ctx.ref.$offline_for == '') &&
((ctx.state == 'offline') && ctx.ref.state == '') || ((ctx.state == 'offline') && ctx.ref.state == '') ||
(((ctx.state == 'offline') || (ctx.state == 'active')) && (((ctx.state == 'offline') || (ctx.state == 'active')) &&
((ctx.ref.state == 'online')))) { ((ctx.ref.state == 'online')))) {
ctx.ref.$online_for = ''; ctx.ref.$online_for = '';
ctx.ref.$offline_for = Date.now(); ctx.ref.$offline_for = Date.now();
} }
@@ -5802,7 +5802,7 @@ speechSynthesis.getVoices();
$app.data.isStartAtWindowsStartup = configRepository.getBool('VRCX_StartAtWindowsStartup'); $app.data.isStartAtWindowsStartup = configRepository.getBool('VRCX_StartAtWindowsStartup');
$app.data.isStartAsMinimizedState = (VRCXStorage.Get('VRCX_StartAsMinimizedState') === 'true'); $app.data.isStartAsMinimizedState = (VRCXStorage.Get('VRCX_StartAsMinimizedState') === 'true');
$app.data.isCloseToTray = configRepository.getBool('VRCX_CloseToTray'); $app.data.isCloseToTray = configRepository.getBool('VRCX_CloseToTray');
$app.data.isAutoLogin= configRepository.getBool('VRCX_AutoLogin'); $app.data.isAutoLogin = configRepository.getBool('VRCX_AutoLogin');
var saveVRCXWindowOption = function () { var saveVRCXWindowOption = function () {
configRepository.setBool('VRCX_StartAtWindowsStartup', this.isStartAtWindowsStartup); configRepository.setBool('VRCX_StartAtWindowsStartup', this.isStartAtWindowsStartup);
VRCXStorage.Set('VRCX_StartAsMinimizedState', this.isStartAsMinimizedState.toString()); VRCXStorage.Set('VRCX_StartAsMinimizedState', this.isStartAsMinimizedState.toString());
@@ -7963,7 +7963,7 @@ speechSynthesis.getVoices();
return; return;
} }
var r = new FileReader(); var r = new FileReader();
r.onload = function() { r.onload = function () {
var bodyStart = '---------------------------26696829785232761561272838397\nContent-Disposition: form-data; name="file"; filename="blob"\nContent-Type: image/png\n\n'; var bodyStart = '---------------------------26696829785232761561272838397\nContent-Disposition: form-data; name="file"; filename="blob"\nContent-Type: image/png\n\n';
var bodyEnd = '\n---------------------------26696829785232761561272838397--\n'; var bodyEnd = '\n---------------------------26696829785232761561272838397--\n';
var body = bodyStart + r.result + bodyEnd var body = bodyStart + r.result + bodyEnd
+15 -15
View File
@@ -744,8 +744,8 @@ speechSynthesis.getVoices();
if (filter[feed.type]) { if (filter[feed.type]) {
if ((filter[feed.type] !== 'Off') && if ((filter[feed.type] !== 'Off') &&
((filter[feed.type] === 'Everyone') || (filter[feed.type] === 'On') || ((filter[feed.type] === 'Everyone') || (filter[feed.type] === 'On') ||
((filter[feed.type] === 'Friends') && (feed.isFriend)) || ((filter[feed.type] === 'Friends') && (feed.isFriend)) ||
((filter[feed.type] === 'VIP') && (feed.isFavorite)))) { ((filter[feed.type] === 'VIP') && (feed.isFavorite)))) {
var displayName = ''; var displayName = '';
if (feed.displayName) { if (feed.displayName) {
displayName = feed.displayName; displayName = feed.displayName;
@@ -834,7 +834,7 @@ speechSynthesis.getVoices();
} }
if ((feedItem.created_at < bias) || (feedItem.type === 'Location') || if ((feedItem.created_at < bias) || (feedItem.type === 'Location') ||
((feedItem.type === 'GPS') && (feedItem.created_at !== ctx.created_at) && ((feedItem.type === 'GPS') && (feedItem.created_at !== ctx.created_at) &&
(feedItem.displayName === ctx.displayName))) { (feedItem.displayName === ctx.displayName))) {
break; break;
} }
} }
@@ -897,8 +897,8 @@ speechSynthesis.getVoices();
if (filter[feed.type]) { if (filter[feed.type]) {
if ((filter[feed.type] !== 'Off') && if ((filter[feed.type] !== 'Off') &&
((filter[feed.type] === 'Everyone') || (filter[feed.type] === 'On') || ((filter[feed.type] === 'Everyone') || (filter[feed.type] === 'On') ||
((filter[feed.type] === 'Friends') && (feed.isFriend)) || ((filter[feed.type] === 'Friends') && (feed.isFriend)) ||
((filter[feed.type] === 'VIP') && (feed.isFavorite)))) { ((filter[feed.type] === 'VIP') && (feed.isFavorite)))) {
filtered.push(feed); filtered.push(feed);
} }
} else { } else {
@@ -916,8 +916,8 @@ speechSynthesis.getVoices();
if (filter[feed.type]) { if (filter[feed.type]) {
if ((filter[feed.type] !== 'Off') && if ((filter[feed.type] !== 'Off') &&
((filter[feed.type] === 'Everyone') || (filter[feed.type] === 'On') || ((filter[feed.type] === 'Everyone') || (filter[feed.type] === 'On') ||
((filter[feed.type] === 'Friends') && (feed.isFriend)) || ((filter[feed.type] === 'Friends') && (feed.isFriend)) ||
((filter[feed.type] === 'VIP') && (feed.isFavorite)))) { ((filter[feed.type] === 'VIP') && (feed.isFavorite)))) {
filtered.push(feed); filtered.push(feed);
} }
} }
@@ -1090,14 +1090,14 @@ speechSynthesis.getVoices();
var imageURL = ''; var imageURL = '';
if (noty.userId) { if (noty.userId) {
await API.getCachedUser({ await API.getCachedUser({
userId: noty.userId userId: noty.userId
}).catch((err) => { }).catch((err) => {
throw err; throw err;
}).then((args) => { }).then((args) => {
imageURL = args.json.currentAvatarThumbnailImageUrl; imageURL = args.json.currentAvatarThumbnailImageUrl;
if ((this.config.displayVRCPlusIconsAsAvatar) && (args.json.userIcon)) { if ((this.config.displayVRCPlusIconsAsAvatar) && (args.json.userIcon)) {
imageURL = args.json.userIcon; imageURL = args.json.userIcon;
} }
}); });
} }
switch (noty.type) { switch (noty.type) {