Merge branch 'release/1.3.1' into main

CHANGELOG.md

@@ -5,6 +5,18 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.3.1]
+
+### Fixed
+
+- A bug where VRChat accounts without 2FA enabled could not log in properly.
+- A bug where the status bar would still a VRChat user name after logging out.
+
+### Changed
+
+- Update check to run every week after application start, in case Oyasumi is left running for a long time.
+- Update check to rerun every 10 minutes until at least one check has succeeded, in case Oyasumi is started while offline.
+
 ## [1.3.0]
 
 ### Added

package.json

@@ -1,6 +1,6 @@
 {
   "name": "oyasumi",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "author": "Raphiiko",
   "license": "MIT",
   "type": "module",

src-elevated-sidecar/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "oyasumi-elevated-sidecar"
-version = "1.3.0"
+version = "1.3.1"
 authors = ["Raphiiko"]
 license = "MIT"
 edition = "2021"

src-shared/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "oyasumi-shared"
-version = "1.3.0"
+version = "1.3.1"
 authors = ["Raphiiko"]
 edition = "2021"
 license = "MIT"

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "oyasumi"
-version = "1.3.0"
+version = "1.3.1"
 description = ""
 authors = ["Raphiiko"]
 license = "MIT"

src-tauri/tauri.conf.json

@@ -9,7 +9,7 @@
   },
   "package": {
     "productName": "Oyasumi",
-    "version": "1.3.0"
+    "version": "1.3.1"
   },
   "tauri": {
     "allowlist": {
@@ -108,7 +108,7 @@
         "center": true,
         "theme": "Dark",
         "transparent": true,
-        "userAgent": "Oyasumi/1.3.0 (https://github.com/Raphiiko/Oyasumi)"
+        "userAgent": "Oyasumi/1.3.1 (https://github.com/Raphiiko/Oyasumi)"
       },
       {
         "width": 500,
@@ -120,7 +120,7 @@
         "center": true,
         "theme": "Dark",
         "transparent": true,
-        "userAgent": "Oyasumi/1.3.0 (https://github.com/Raphiiko/Oyasumi)"
+        "userAgent": "Oyasumi/1.3.1 (https://github.com/Raphiiko/Oyasumi)"
       }
     ]
   }

src/app/app-routing.module.ts

@@ -10,9 +10,7 @@ import { SleepDetectionViewComponent } from './views/dashboard-view/views/sleep-
 import { GpuAutomationsViewComponent } from './views/dashboard-view/views/gpu-automations-view/gpu-automations-view.component';
 import { OscAutomationsViewComponent } from './views/dashboard-view/views/osc-automations-view/osc-automations-view.component';
 import { StatusAutomationsViewComponent } from './views/dashboard-view/views/status-automations-view/status-automations-view.component';
-import {
-  AutoInviteRequestAcceptViewComponent
-} from './views/dashboard-view/views/auto-invite-request-accept-view/auto-invite-request-accept-view.component';
+import { AutoInviteRequestAcceptViewComponent } from './views/dashboard-view/views/auto-invite-request-accept-view/auto-invite-request-accept-view.component';
 
 const routes: Routes = [
   {

src/app/components/friend-selection-modal/friend-selection-modal.component.scss

@@ -48,7 +48,7 @@
     padding: 0.25em 0.5em 0.25em 1em;
     margin-top: 0.5em;
     border: 1px solid transparent;
-    transition: all .15s ease;
+    transition: all 0.15s ease;
     &:not(:last-child) {
       margin-right: 0.5em;
     }
@@ -61,7 +61,7 @@
       color: var(--color-text-3);
       font-size: 1.25em;
       margin-left: 0.25em;
-      transition: all .15s ease;
+      transition: all 0.15s ease;
     }
     &:hover {
       cursor: pointer;

src/app/components/friend-selection-modal/friend-selection-modal.component.spec.ts

@@ -8,9 +8,8 @@ describe('FriendSelectionModalComponent', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [ FriendSelectionModalComponent ]
-    })
-    .compileComponents();
+      declarations: [FriendSelectionModalComponent],
+    }).compileComponents();
 
     fixture = TestBed.createComponent(FriendSelectionModalComponent);
     component = fixture.componentInstance;

src/app/components/friend-selection-modal/friend-selection-modal.component.ts

@@ -1,6 +1,5 @@
 import { Component, OnDestroy, OnInit } from '@angular/core';
 import { SimpleModalComponent } from 'ngx-simple-modal';
-import { initial } from 'lodash';
 import { fade, fadeUp, hshrink, noop, vshrink } from '../../utils/animations';
 import { LimitedUser } from 'vrchat/dist';
 import { VRChatService } from '../../services/vrchat.service';

src/app/components/main-status-bar/main-status-bar.component.html

@@ -35,7 +35,8 @@
           >
         </div>
         <span translate @hshrink *ngIf="state.hover">VRChat:&nbsp;</span>
-        <span [translate]="user ? user.displayName : 'comp.main-status-bar.loggedOut'"></span>
+        <span *ngIf="user">{{ user?.displayName }}</span>
+        <span translate *ngIf="!user">comp.main-status-bar.loggedOut</span>
       </ng-container>
     </div>
   </div>

src/app/components/main-status-bar/main-status-bar.component.ts

@@ -8,7 +8,7 @@ import { hshrink, noop } from '../../utils/animations';
   selector: 'app-main-status-bar',
   templateUrl: './main-status-bar.component.html',
   styleUrls: ['./main-status-bar.component.scss'],
-  animations: [hshrink(), noop()]
+  animations: [hshrink(), noop()],
 })
 export class MainStatusBarComponent implements OnInit {
   sleepMode = this.sleepService.mode;

src/app/components/select-box/select-box.component.html

@@ -11,7 +11,11 @@
     [class.has-subtitle]="selected.subLabel"
     [class.small]="type === 'SMALL'"
   >
-    <div class="select-item-html-prefix" *ngIf="selected.htmlPrefix" [innerHtml]="selected.htmlPrefix">
+    <div
+      class="select-item-html-prefix"
+      *ngIf="selected.htmlPrefix"
+      [innerHtml]="selected.htmlPrefix"
+    >
     </div>
     <div class="select-item-content">
       <div class="select-item-title">{{ selected.label | tsTranslate }}</div>

src/app/components/sleeping-animation-preset-modal/sleeping-animation-preset-modal.component.html

@@ -3,9 +3,11 @@
     {{ preset?.name }}
   </div>
   <div class="pane-content">
-    <div *ngFor='let link of preset?.infoLinks || []' class='link'>
-      <span>{{link.label}}</span>
-      <button class='btn btn-secondary' translate (click)='openUrl(link.url)'>shared.modals.open</button>
+    <div *ngFor="let link of preset?.infoLinks || []" class="link">
+      <span>{{ link.label }}</span>
+      <button class="btn btn-secondary" translate (click)="openUrl(link.url)"
+        >shared.modals.open</button
+      >
     </div>
   </div>
   <div class="pane-actions spread">

src/app/components/sleeping-animation-preset-modal/sleeping-animation-preset-modal.component.scss

@@ -1,5 +1,3 @@
-
-
 .link {
   display: flex;
   flex-direction: row;

src/app/components/vrchat-login-modal/vrchat-login-modal.component.ts

@@ -53,6 +53,8 @@ export class VRChatLoginModalComponent
     this.error = '';
     try {
       await this.vrchat.login(this.username, this.password);
+      this.loggingIn = false;
+      await this.close();
     } catch (e) {
       switch (e) {
         case '2FA_REQUIRED':

src/app/migrations/app-settings.migrations.ts

@@ -1,6 +1,5 @@
 import { cloneDeep } from 'lodash';
 import { APP_SETTINGS_DEFAULT, AppSettings } from '../models/settings';
-import { AppSettingsService } from '../services/app-settings.service';
 import { info } from 'tauri-plugin-log-api';
 
 const migrations: { [v: number]: (data: any) => any } = {

src/app/migrations/telemetry-settings.migrations.ts

@@ -1,6 +1,5 @@
 import { cloneDeep } from 'lodash';
 import { TELEMETRY_SETTINGS_DEFAULT, TelemetrySettings } from '../models/telemetry-settings';
-import { AUTOMATION_CONFIGS_DEFAULT } from '../models/automations';
 import { info } from 'tauri-plugin-log-api';
 import { v4 as uuidv4 } from 'uuid';
 

src/app/models/osc-message.ts

@@ -52,7 +52,7 @@ export function parseOSCMessage(message: OSCMessageRaw): OSCMessage {
 
 export function parseOSCValue(value: OSCValueRaw): OSCValue {
   let parsedValue: unknown;
-  switch(value.kind) {
+  switch (value.kind) {
     case 'int':
       parsedValue = parseInt(value.value);
       break;

src/app/models/telemetry-settings.ts

@@ -13,5 +13,5 @@ export const TELEMETRY_SETTINGS_DEFAULT: TelemetrySettings = {
   version: 1,
   enabled: true,
   telemetryId: uuidv4(),
-  lastHeartbeat: 0
+  lastHeartbeat: 0,
 };

src/app/pipes/image-cache.pipe.ts

@@ -1,6 +1,4 @@
-import { Input, Pipe, PipeTransform } from '@angular/core';
-import { TranslateService } from '@ngx-translate/core';
-import { TString } from '../models/translatable-string';
+import { Pipe, PipeTransform } from '@angular/core';
 import { ImageCacheService } from '../services/image-cache.service';
 
 @Pipe({

src/app/services/battery-automations/turn-off-devices-when-charging-automation.service.ts

@@ -31,7 +31,11 @@ export class TurnOffDevicesWhenChargingAutomationService {
 
     this.openvr.devices.subscribe((devices) => {
       devices.forEach((device) => {
-        if (device.isCharging && device.canPowerOff && !this.chargingDevices.includes(device.index)) {
+        if (
+          device.isCharging &&
+          device.canPowerOff &&
+          !this.chargingDevices.includes(device.index)
+        ) {
           this.chargingDevices.push(device.index);
           if (this.config.enabled && this.config.deviceClasses.includes(device.class)) {
             info(

src/app/services/gpu-automations.service.ts

@@ -195,7 +195,7 @@ export class GpuAutomationsService {
               (getAutomationConfig().resetToDefault
                 ? selectedDevice!.defaultPowerLimit!
                 : getAutomationConfig().powerLimit || selectedDevice!.defaultPowerLimit!) * 1000
-            )
+            );
           })
         )
         .subscribe();

src/app/services/image-cache.service.ts

@@ -1,7 +1,6 @@
 import { Injectable } from '@angular/core';
 import { invoke } from '@tauri-apps/api';
-import { error, warn } from 'tauri-plugin-log-api';
-
+import { warn } from 'tauri-plugin-log-api';
 
 @Injectable({
   providedIn: 'root',

src/app/services/invite-automations.service.ts

@@ -4,7 +4,6 @@ import { AutomationConfigService } from './automation-config.service';
 import { SleepService } from './sleep.service';
 import { Notification, NotificationType, UserStatus } from 'vrchat';
 import { info, warn } from 'tauri-plugin-log-api';
-import { notification } from '@tauri-apps/api';
 import { firstValueFrom } from 'rxjs';
 
 @Injectable({

src/app/services/openvr.service.ts

@@ -6,7 +6,6 @@ import { invoke } from '@tauri-apps/api/tauri';
 import { OVRDevice, OVRDevicePose } from '../models/ovr-device';
 import { BehaviorSubject, interval, Observable, startWith, Subject, takeUntil } from 'rxjs';
 import { cloneDeep, orderBy } from 'lodash';
-import { message } from '@tauri-apps/api/dialog';
 import { AppSettingsService } from './app-settings.service';
 import { error, info } from 'tauri-plugin-log-api';