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

[MM-38679] Fix download notification title on Windows (#1752)

Browse Source 
* [MM-38679] Fix download notification title on Windows

* Lint fix
This commit is contained in:
Devin Binnie
2021-09-22 12:41:28 -04:00
committed by GitHub
parent f8209540e3
commit 45ff8cbd9f
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/main.ts
View File

@@ -759,7 +759,7 @@ function initializeAfterAppReady() {
item.on('done', (doneEvent, state) => { item.on('done', (doneEvent, state) => {
if (state === 'completed') { if (state === 'completed') {
displayDownloadCompleted(filename, item.savePath, urlUtils.getView(webContents.getURL(), config.teams)!); displayDownloadCompleted(filename, item.savePath, WindowManager.getServerNameByWebContentsId(webContents.id) || '');
} }
}); });
}); });

5
src/main/notifications/Download.ts
View File

@@ -3,7 +3,6 @@
import path from 'path'; import path from 'path';
import {app, Notification} from 'electron'; import {app, Notification} from 'electron';
import {ServerFromURL} from 'types/utils';
const assetsDir = path.resolve(app.getAppPath(), 'assets'); const assetsDir = path.resolve(app.getAppPath(), 'assets');
const appIconURL = path.resolve(assetsDir, 'appicon_48.png'); const appIconURL = path.resolve(assetsDir, 'appicon_48.png');
@@ -17,7 +16,7 @@ const defaultOptions = {
}; };
export class DownloadNotification extends Notification { export class DownloadNotification extends Notification {
constructor(fileName: string, serverInfo: ServerFromURL) { constructor(fileName: string, serverName: string) {
const options = {...defaultOptions}; const options = {...defaultOptions};
if (process.platform === 'win32') { if (process.platform === 'win32') {
options.icon = appIconURL; options.icon = appIconURL;
@@ -26,7 +25,7 @@ export class DownloadNotification extends Notification {
Reflect.deleteProperty(options, 'icon'); Reflect.deleteProperty(options, 'icon');
} }
options.title = process.platform === 'win32' ? serverInfo.name : 'Download Complete'; options.title = process.platform === 'win32' ? serverName : 'Download Complete';
options.body = process.platform === 'win32' ? `Download Complete \n ${fileName}` : fileName; options.body = process.platform === 'win32' ? `Download Complete \n ${fileName}` : fileName;
super(options); super(options);

5
src/main/notifications/index.ts
View File

@@ -5,7 +5,6 @@ import {shell, Notification} from 'electron';
import log from 'electron-log'; import log from 'electron-log';
import {MentionData} from 'types/notification'; import {MentionData} from 'types/notification';
import {ServerFromURL} from 'types/utils';
import {PLAY_SOUND} from 'common/communication'; import {PLAY_SOUND} from 'common/communication';
import {TAB_MESSAGING} from 'common/tabs/TabView'; import {TAB_MESSAGING} from 'common/tabs/TabView';
@@ -60,12 +59,12 @@ export function displayMention(title: string, body: string, channel: {id: string
mention.show(); mention.show();
} }
export function displayDownloadCompleted(fileName: string, path: string, serverInfo: ServerFromURL) { export function displayDownloadCompleted(fileName: string, path: string, serverName: string) {
if (!Notification.isSupported()) { if (!Notification.isSupported()) {
log.error('notification not supported'); log.error('notification not supported');
return; return;
} }
const download = new DownloadNotification(fileName, serverInfo); const download = new DownloadNotification(fileName, serverName);
download.on('show', () => { download.on('show', () => {
windowManager.flashFrame(true); windowManager.flashFrame(true);