phlux/mattermostest
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Escape server name when used inside regex (#2449)

Browse Source 
* Escape server name when used inside regex

* Move util under common and add test
This commit is contained in:
Tasos Boulis
2022-12-06 17:29:02 +02:00
committed by GitHub
parent 865fd2522f
commit de65cfca4e
3 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/renderer/components/MainPage.tsx
View File

@@ -14,6 +14,7 @@ import {TeamWithTabs} from 'types/config';
import {DownloadedItems} from 'types/downloads';
import {getTabViewName} from 'common/tabs/TabView';
import {escapeRegex} from 'common/utils/util';
import restoreButton from '../../assets/titlebar/chrome-restore.svg';
import maximizeButton from '../../assets/titlebar/chrome-maximize.svg';
@@ -462,7 +463,7 @@ class MainPage extends React.PureComponent<Props, State> {
);
}
const serverMatch = `${this.state.activeServerName}___TAB_[A-Z]+`;
const serverMatch = `${escapeRegex(this.state.activeServerName)}___TAB_[A-Z]+`;
const totalMentionCount = Object.keys(this.state.mentionCounts).reduce((sum, key) => {
// Strip out current server from unread and mention counts
if (this.state.activeServerName && key.match(serverMatch)) {