michael/discord-vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: clean up session and party presence

Browse source
This commit is contained in:
iCrawl 2019-04-28 10:46:22 +02:00
parent 255c57e2ac
commit 039cb4bfbe
No known key found for this signature in database
GPG key ID: E41A6DB922EC2CFE
3 changed files with 24 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.vscode/launch.json vendored
View file

@ -9,8 +9,7 @@
"args": ["--extensionDevelopmentPath=${workspaceRoot}" ], "args": ["--extensionDevelopmentPath=${workspaceRoot}" ],
"stopOnEntry": false, "stopOnEntry": false,
"sourceMaps": true, "sourceMaps": true,
"outFiles": [ "${workspaceRoot}/dist/**/*.js" ], "outFiles": [ "${workspaceRoot}/dist/**/*.js" ]
"preLaunchTask": "build"
} }
] ]
} }

15
.vscode/tasks.json vendored
View file

@ -1,15 +0,0 @@
{
// See https://go.microsoft.com/fwlink/?LinkId=733558
// for the documentation about the tasks.json format
"version": "2.0.0",
"tasks": [
{
"label": "build",
"type": "gulp",
"task": "build",
"problemMatcher": [
"$gulp-tsc"
]
}
]
}

37
src/structures/Activity.ts
View file

@ -96,6 +96,7 @@ export default class Activity implements Disposable {
} }
public async allowSpectate(): Promise<State | void> { public async allowSpectate(): Promise<State | void> {
if (!this._state) return;
const liveshare = await vsls.getApi(); const liveshare = await vsls.getApi();
if (!liveshare) return; if (!liveshare) return;
const join = await liveshare.share({ suppressNotification: true, access: vsls.Access.ReadOnly }); const join = await liveshare.share({ suppressNotification: true, access: vsls.Access.ReadOnly });
@ -109,19 +110,19 @@ export default class Activity implements Disposable {
} }
public async disableSpectate(): Promise<State | void> { public async disableSpectate(): Promise<State | void> {
if (!this._state) return;
const liveshare = await vsls.getApi(); const liveshare = await vsls.getApi();
if (!liveshare) return; if (!liveshare) return;
await liveshare.end(); await liveshare.end();
this._state = {
...this._state, delete this._state.spectateSecret;
spectateSecret: undefined, this._state.instance = false;
instance: false
};
return this._state; return this._state;
} }
public async allowJoinRequests(): Promise<State | void> { public async allowJoinRequests(): Promise<State | void> {
if (!this._state) return;
const liveshare = await vsls.getApi(); const liveshare = await vsls.getApi();
if (!liveshare) return; if (!liveshare) return;
const join = await liveshare.share({ suppressNotification: true }); const join = await liveshare.share({ suppressNotification: true });
@ -138,28 +139,36 @@ export default class Activity implements Disposable {
} }
public async disableJoinRequests(): Promise<State | void> { public async disableJoinRequests(): Promise<State | void> {
if (!this._state) return;
const liveshare = await vsls.getApi(); const liveshare = await vsls.getApi();
if (!liveshare) return; if (!liveshare) return;
await liveshare.end(); await liveshare.end();
this._state = {
...this._state, delete this._state.partyId;
partyId: undefined, delete this._state.partySize;
partySize: undefined, delete this._state.partyMax;
partyMax: undefined, delete this._state.joinSecret;
joinSecret: undefined, this._state.instance = false;
instance: false
};
return this._state; return this._state;
} }
public changePartyId(id?: string): State | void { public changePartyId(id?: string): State | void {
if (!this._state) return; if (!this._state) return;
if (!id) {
delete this._state.partyId;
delete this._state.partySize;
delete this._state.partyMax;
this._state.instance = false;
return this._state;
}
this._state = { this._state = {
...this._state, ...this._state,
partyId: id, partyId: id,
partySize: this._state.partySize ? this._state.partySize + 1 : 1, partySize: this._state.partySize ? this._state.partySize + 1 : 1,
partyMax: id ? 5 : undefined partyMax: 5,
instance: true
}; };
return this._state; return this._state;