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

[MM-40573] Stop asterisk detection on versions newer than 5.28, force space for the others (#1931)

Browse source 
* [MM-40573] Stop asking detection on versions newer than 5.29, force space for the others

* PR feedback and test fixes
This commit is contained in:
Devin Binnie 2021-12-23 16:49:53 -05:00 committed by GitHub
parent c28b219362
commit bd470459c2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/views/MattermostView.test.js
View file

@ -310,7 +310,7 @@ describe('main/views/MattermostView', () => {
});
describe('updateMentionsFromTitle', () => {
const mattermostView = new MattermostView(tabView, {}, {}, {});
const mattermostView = new MattermostView(tabView, {remoteInfo: {serverVersion: '5.28.0'}}, {}, {});
it('should parse mentions from title', () => {
mattermostView.updateMentionsFromTitle('(7) Mattermost');
@ -321,5 +321,10 @@ describe('main/views/MattermostView', () => {
mattermostView.updateMentionsFromTitle('* Mattermost');
expect(appState.updateMentions).toHaveBeenCalledWith(mattermostView.tab.name, 0, true);
});
it('should not parse unreads when title is on a channel with an asterisk before it', () => {
mattermostView.updateMentionsFromTitle('*testChannel - Mattermost');
expect(appState.updateMentions).toHaveBeenCalledWith(mattermostView.tab.name, 0, false);
});
});
});

6
src/main/views/MattermostView.ts
View file

@ -326,13 +326,17 @@ export class MattermostView extends EventEmitter {
}
}
titleParser = /(\((\d+)\) )?(\*)?/g
titleParser = /(\((\d+)\) )?(\* )?/g
handleTitleUpdate = (e: Event, title: string) => {
this.updateMentionsFromTitle(title);
}
updateMentionsFromTitle = (title: string) => {
if (this.serverInfo.remoteInfo.serverVersion && Util.isVersionGreaterThanOrEqualTo(this.serverInfo.remoteInfo.serverVersion, '5.29.0')) {
return;
}
//const title = this.view.webContents.getTitle();
const resultsIterator = title.matchAll(this.titleParser);
const results = resultsIterator.next(); // we are only interested in the first set