_Bastler/partey_workadventure
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

get rid of awayStore as it is now the same as privacyShutdownStore

Browse Source
This commit is contained in:
Piotr 'pwh' Hanusiak 2022-04-20 16:49:16 +02:00
parent dfd9a66bd4
commit c6d445bd97
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
front/src/Phaser/Game/GameScene.ts
View File

@ -91,7 +91,7 @@ import { MapStore } from "../../Stores/Utils/MapStore";
import { followUsersColorStore } from "../../Stores/FollowStore"; import { followUsersColorStore } from "../../Stores/FollowStore";
import { GameSceneUserInputHandler } from "../UserInput/GameSceneUserInputHandler"; import { GameSceneUserInputHandler } from "../UserInput/GameSceneUserInputHandler";
import { locale } from "../../i18n/i18n-svelte"; import { locale } from "../../i18n/i18n-svelte";
import { availabilityStatusStore, awayStore, localVolumeStore } from "../../Stores/MediaStore"; import { availabilityStatusStore, localVolumeStore } from "../../Stores/MediaStore";
import { StringUtils } from "../../Utils/StringUtils"; import { StringUtils } from "../../Utils/StringUtils";
import { startLayerNamesStore } from "../../Stores/StartLayerNamesStore"; import { startLayerNamesStore } from "../../Stores/StartLayerNamesStore";
import { JitsiCoWebsite } from "../../WebRtc/CoWebsite/JitsiCoWebsite"; import { JitsiCoWebsite } from "../../WebRtc/CoWebsite/JitsiCoWebsite";
@ -101,7 +101,6 @@ import CancelablePromise from "cancelable-promise";
import { Deferred } from "ts-deferred"; import { Deferred } from "ts-deferred";
import { SuperLoaderPlugin } from "../Services/SuperLoaderPlugin"; import { SuperLoaderPlugin } from "../Services/SuperLoaderPlugin";
import { PlayerDetailsUpdatedMessage } from "../../Messages/ts-proto-generated/protos/messages"; import { PlayerDetailsUpdatedMessage } from "../../Messages/ts-proto-generated/protos/messages";
import { privacyShutdownStore } from "../../Stores/PrivacyShutdownStore";
export interface GameSceneInitInterface { export interface GameSceneInitInterface {
initPosition: PointInterface | null; initPosition: PointInterface | null;
reconnecting: boolean; reconnecting: boolean;
@ -712,10 +711,6 @@ export class GameScene extends DirtyScene {
} }
}); });
this.privacyShutdownStoreUnsubscribe = privacyShutdownStore.subscribe((away) => {
awayStore.set(away);
});
Promise.all([ Promise.all([
this.connectionAnswerPromiseDeferred.promise as Promise<unknown>, this.connectionAnswerPromiseDeferred.promise as Promise<unknown>,
...scriptPromises, ...scriptPromises,

7
front/src/Stores/MediaStore.ts
View File

@ -182,14 +182,13 @@ function createVideoConstraintStore() {
export const inJitsiStore = writable(false); export const inJitsiStore = writable(false);
export const silentStore = writable(false); export const silentStore = writable(false);
export const awayStore = writable(false);
export const availabilityStatusStore = derived( export const availabilityStatusStore = derived(
[inJitsiStore, silentStore, awayStore], [inJitsiStore, silentStore, privacyShutdownStore],
([$inJitsiStore, $silentStore, $awayStore]) => { ([$inJitsiStore, $silentStore, $privacyShutdownStore]) => {
if ($inJitsiStore) return AvailabilityStatus.JITSI; if ($inJitsiStore) return AvailabilityStatus.JITSI;
if ($silentStore) return AvailabilityStatus.SILENT; if ($silentStore) return AvailabilityStatus.SILENT;
if ($awayStore) return AvailabilityStatus.AWAY; if ($privacyShutdownStore) return AvailabilityStatus.AWAY;
return AvailabilityStatus.ONLINE; return AvailabilityStatus.ONLINE;
}, },
AvailabilityStatus.ONLINE AvailabilityStatus.ONLINE