aaron/mattermost-desktop
1
0
Fork 0
Code Issues Pull requests Actions 1 Packages Projects Releases Wiki Activity

[MM-54616] Remove regex matching for URL lookups (#2851) (#2854)

Browse source 
(cherry picked from commit d2266ac109)

Co-authored-by: Devin Binnie <52460000+devinbinnie@users.noreply.github.com>
This commit is contained in:
Mattermost Build 2023-09-20 13:02:25 +03:00 committed by GitHub
parent 4077405c5a
commit e81b62c6f7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/common/servers/serverManager.ts
View file

@ -124,7 +124,8 @@ export class ServerManager extends EventEmitter {
return undefined;
}
const server = this.getAllServers().find((server) => {
return isInternalURL(parsedURL, server.url, ignoreScheme) && getFormattedPathName(parsedURL.pathname).match(new RegExp(`^${server.url.pathname}(.+)?(/(.+))?$`));
return isInternalURL(parsedURL, server.url, ignoreScheme) &&
getFormattedPathName(parsedURL.pathname).startsWith(server.url.pathname);
});
if (!server) {
return undefined;
@ -135,7 +136,7 @@ export class ServerManager extends EventEmitter {
views.
filter((view) => view && view.type !== TAB_MESSAGING).
forEach((view) => {
if (getFormattedPathName(parsedURL.pathname).match(new RegExp(`^${view.url.pathname}(/(.+))?`))) {
if (getFormattedPathName(parsedURL.pathname).startsWith(view.url.pathname)) {
selectedView = view;
}
});