Merge branch 'develop' of github.com:thecodingmachine/workadventure
This commit is contained in:
commit
d5f61199c7
@ -1,5 +1,10 @@
|
|||||||
## Version develop
|
## Version develop
|
||||||
|
|
||||||
|
### Bugfix
|
||||||
|
- Moving a discussion over a user will now add this user to the discussion
|
||||||
|
- Being in a silent zone new forces mediaConstraints to false (#1508)
|
||||||
|
- Fixes for the emote menu (#1501)
|
||||||
|
|
||||||
## Version 1.5.0
|
## Version 1.5.0
|
||||||
### Updates
|
### Updates
|
||||||
- Added support for login with OpenID Connect
|
- Added support for login with OpenID Connect
|
||||||
|
@ -137,25 +137,6 @@ export class Room {
|
|||||||
*/
|
*/
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @deprecated
|
|
||||||
*/
|
|
||||||
private parsePrivateUrl(url: string): { organizationSlug: string; worldSlug: string; roomSlug?: string } {
|
|
||||||
const regex = /@\/([^/]+)\/([^/]+)(?:\/([^/]*))?/gm;
|
|
||||||
const match = regex.exec(url);
|
|
||||||
if (!match) {
|
|
||||||
throw new Error("Invalid URL " + url);
|
|
||||||
}
|
|
||||||
const results: { organizationSlug: string; worldSlug: string; roomSlug?: string } = {
|
|
||||||
organizationSlug: match[1],
|
|
||||||
worldSlug: match[2],
|
|
||||||
};
|
|
||||||
if (match[3] !== undefined) {
|
|
||||||
results.roomSlug = match[3];
|
|
||||||
}
|
|
||||||
return results;
|
|
||||||
}
|
|
||||||
|
|
||||||
public isDisconnected(): boolean {
|
public isDisconnected(): boolean {
|
||||||
const alone = this._search.get("alone");
|
const alone = this._search.get("alone");
|
||||||
if (alone && alone !== "0" && alone.toLowerCase() !== "false") {
|
if (alone && alone !== "0" && alone.toLowerCase() !== "false") {
|
||||||
|
Loading…
Reference in New Issue
Block a user