From 68c8b93d4bf163b03a9d1f2fad30bfb6de8d6704 Mon Sep 17 00:00:00 2001
From: shenmo <jifengshenmo@outlook.com>
Date: Fri, 2 Sep 2022 09:52:16 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
main.js | 20 +-
main.js.autosave | 771 +++++++++++++++++++++++++++++++++++++++++++++++
package.json | 1 -
3 files changed, 781 insertions(+), 11 deletions(-)
create mode 100644 main.js.autosave
diff --git a/main.js b/main.js
index 0933cd7..bdef184 100644
--- a/main.js
+++ b/main.js
@@ -30,7 +30,7 @@ let mainMenu = [
selector: 'orderFrontStandardAboutPanel:',
},
{
- label: 'Preferences...',
+ label: '首选项...',
accelerator: !isOsx ? 'Ctrl+,' : 'Cmd+,',
click() {
mainWindow.show();
@@ -203,7 +203,7 @@ let mainMenu = [
}
},
{
- label: 'Toggle 群聊',
+ label: '显示群聊',
accelerator: !isOsx ? 'Ctrl+Shift+M' : 'Shift+Cmd+M',
click() {
mainWindow.show();
@@ -248,7 +248,7 @@ let mainMenu = [
}
},
{
- label: 'Fork me on Github',
+ label: '在Gitee主页查看',
click() {
shell.openExternal('https://gitee.com/spark-community-works-collections/wewechat-plus-plus');
}
@@ -258,14 +258,14 @@ let mainMenu = [
];
let trayMenu = [
{
- label: `You have 0 messages`,
+ label: `您有0条未读消息`,
click() {
mainWindow.show();
mainWindow.webContents.send('show-messages');
}
},
{
- label: 'Toggle main window',
+ label: '打开主窗口',
click() {
let isVisible = mainWindow.isVisible();
isVisible ? mainWindow.hide() : mainWindow.show();
@@ -275,7 +275,7 @@ let trayMenu = [
type: 'separator'
},
{
- label: 'Preferences...',
+ label: '首选项...',
accelerator: !isOsx ? 'Ctrl+,' : 'Cmd+,',
click() {
mainWindow.show();
@@ -283,7 +283,7 @@ let trayMenu = [
}
},
{
- label: 'Fork me on Github',
+ label: '在Gitee主页查看',
click() {
shell.openExternal('https://gitee.com/spark-community-works-collections/wewechat-plus-plus');
}
@@ -292,7 +292,7 @@ let trayMenu = [
type: 'separator'
},
{
- label: 'Toggle DevTools',
+ label: '打开开发者工具',
accelerator: !isOsx ? 'Ctrl+Alt+I' : 'Alt+Command+I',
click() {
mainWindow.show();
@@ -300,7 +300,7 @@ let trayMenu = [
}
},
{
- label: 'Hide menu bar icon',
+ label: '隐藏菜单栏图标',
click() {
mainWindow.webContents.send('hide-tray');
}
@@ -393,7 +393,7 @@ function updateTray(unread = 0) {
}
// Update unread mesage count
- trayMenu[0].label = `You have ${unread} messages`;
+ trayMenu[0].label = `您有 ${unread} 条未读消息`;
if (settings.showOnTray) {
if (tray
diff --git a/main.js.autosave b/main.js.autosave
new file mode 100644
index 0000000..e5a4718
--- /dev/null
+++ b/main.js.autosave
@@ -0,0 +1,771 @@
+
+import fs from 'fs';
+import tmp from 'tmp';
+import { app, powerMonitor, BrowserWindow, Tray, Menu, ipcMain, clipboard, shell, nativeImage, dialog } from 'electron';
+import windowStateKeeper from 'electron-window-state';
+import AutoLaunch from 'auto-launch';
+import { autoUpdater } from 'electron-updater';
+import axios from 'axios';
+
+import pkg from './package.json';
+
+let forceQuit = false;
+let downloading = false;
+let mainWindow;
+let tray;
+let settings = {};
+let isFullScreen = false;
+let isWin = process.platform === 'win32';
+let isOsx = process.platform === 'darwin';
+let isSuspend = false;
+let userData = app.getPath('userData');
+let imagesCacheDir = `${userData}/images`;
+let voicesCacheDir = `${userData}/voices`;
+let mainMenu = [
+ {
+ label: pkg.name,
+ submenu: [
+ {
+ label: `About ${pkg.name}`,
+ selector: 'orderFrontStandardAboutPanel:',
+ },
+ {
+ label: '首选项...',
+ accelerator: !isOsx ? 'Ctrl+,' : 'Cmd+,',
+ click() {
+ mainWindow.show();
+ mainWindow.webContents.send('show-settings');
+ }
+ },
+ {
+ label: 'messageInput',
+ accelerator: 'Esc',
+ click() {
+ mainWindow.show();
+ mainWindow.webContents.send('show-messageInput');
+ }
+ },
+ {
+ type: 'separator'
+ },
+ {
+ role: 'hide'
+ },
+ {
+ role: 'hideothers'
+ },
+ {
+ role: 'unhide'
+ },
+ {
+ label: '检查更新',
+ accelerator: !isOsx ? 'Ctrl+U' : 'Cmd+U',
+ click() {
+ checkForUpdates();
+ }
+ },
+ {
+ type: 'separator'
+ },
+ {
+ label: 'Quit weweChat',
+ accelerator: !isOsx ? 'Alt+Q' : 'Command+Q',
+ selector: 'terminate:',
+ click() {
+ forceQuit = true;
+ mainWindow = null;
+ app.quit();
+ }
+ }
+ ]
+ },
+ {
+ label: 'File',
+ submenu: [
+ {
+ label: 'New Chat',
+ accelerator: !isOsx ? 'Ctrl+N' : 'Cmd+N',
+ click() {
+ mainWindow.show();
+ mainWindow.webContents.send('show-newchat');
+ }
+ },
+ {
+ label: 'Search...',
+ accelerator: !isOsx ? 'Ctrl+F' : 'Cmd+F',
+ click() {
+ mainWindow.show();
+ mainWindow.webContents.send('show-search');
+ }
+ },
+ {
+ label: 'Batch Send Message',
+ accelerator: !isOsx ? 'Ctrl+B' : 'Cmd+B',
+ click() {
+ mainWindow.show();
+ mainWindow.webContents.send('show-batchsend');
+ }
+ },
+ {
+ type: 'separator',
+ },
+ {
+ label: 'Insert emoji',
+ accelerator: !isOsx ? 'Ctrl+I' : 'Cmd+I',
+ click() {
+ mainWindow.show();
+ mainWindow.webContents.send('show-emoji');
+ }
+ },
+ {
+ type: 'separator',
+ },
+ {
+ label: 'Next conversation',
+ accelerator: !isOsx ? 'Ctrl+J' : 'Cmd+J',
+ click() {
+ mainWindow.show();
+ mainWindow.webContents.send('show-next');
+ }
+ },
+ {
+ label: 'Previous conversation',
+ accelerator: !isOsx ? 'Ctrl+K' : 'Cmd+K',
+ click() {
+ mainWindow.show();
+ mainWindow.webContents.send('show-previous');
+ }
+ },
+ ]
+ },
+ {
+ label: '群聊',
+ submenu: [
+ {
+ label: 'Loading...',
+ }
+ ],
+ },
+ {
+ label: '私聊',
+ submenu: [
+ {
+ label: 'Loading...',
+ }
+ ],
+ },
+ {
+
+ },
+ {
+ label: 'Edit',
+ submenu: [
+ {
+ role: 'undo'
+ },
+ {
+ role: 'redo'
+ },
+ {
+ type: 'separator'
+ },
+ {
+ role: 'cut'
+ },
+ {
+ role: 'copy'
+ },
+ {
+ role: 'paste'
+ },
+ {
+ role: 'pasteandmatchstyle'
+ },
+ {
+ role: 'delete'
+ },
+ {
+ role: 'selectall'
+ }
+ ]
+ },
+ {
+ label: 'View',
+ submenu: [
+ {
+ label: isFullScreen ? 'Exit Full Screen' : 'Enter Full Screen',
+ accelerator: !isOsx ? 'Ctrl+Shift+F' : 'Shift+Cmd+F',
+ click() {
+ isFullScreen = !isFullScreen;
+
+ mainWindow.show();
+ mainWindow.setFullScreen(isFullScreen);
+ }
+ },
+ {
+ label: '显示群聊',
+ accelerator: !isOsx ? 'Ctrl+Shift+M' : 'Shift+Cmd+M',
+ click() {
+ mainWindow.show();
+ mainWindow.webContents.send('show-conversations');
+ }
+ },
+ {
+ type: 'separator',
+ },
+ {
+ label: ''
+ },
+ {
+ type: 'separator',
+ },
+ {
+ role: 'toggledevtools'
+ },
+ {
+ role: 'togglefullscreen'
+ }
+ ]
+ },
+ {
+ role: 'window',
+ submenu: [
+ {
+ role: 'minimize'
+ },
+ {
+ role: 'close'
+ }
+ ]
+ },
+ {
+ role: 'help',
+ submenu: [
+ {
+ label: '反馈(不一定解决)',
+ click() {
+ shell.openExternal('https://gitee.com/spark-community-works-collections/wewechat-plus-plus/issues');
+ }
+ },
+ {
+ label: '在Gitee主页查看',
+ click() {
+ shell.openExternal('https://gitee.com/spark-community-works-collections/wewechat-plus-plus');
+ }
+ },
+ ]
+ }
+];
+let trayMenu = [
+ {
+ label: `您有0条未读消息`,
+ click() {
+ mainWindow.show();
+ mainWindow.webContents.send('show-messages');
+ }
+ },
+ {
+ label: '打开主窗口',
+ click() {
+ let isVisible = mainWindow.isVisible();
+ isVisible ? mainWindow.hide() : mainWindow.show();
+ }
+ },
+ {
+ type: 'separator'
+ },
+ {
+ label: '首选项...',
+ accelerator: !isOsx ? 'Ctrl+,' : 'Cmd+,',
+ click() {
+ mainWindow.show();
+ mainWindow.webContents.send('show-settings');
+ }
+ },
+ {
+ label: '在Gitee主页查看',
+ click() {
+ shell.openExternal('https://gitee.com/spark-community-works-collections/wewechat-plus-plus');
+ }
+ },
+ {
+ type: 'separator'
+ },
+ {
+ label: '打开开发者工具',
+ accelerator: !isOsx ? 'Ctrl+Alt+I' : 'Alt+Command+I',
+ click() {
+ mainWindow.show();
+ mainWindow.toggleDevTools();
+ }
+ },
+ {
+ label: '隐藏菜单栏图标',
+ click() {
+ mainWindow.webContents.send('hide-tray');
+ }
+ },
+ {
+ type: 'separator'
+ },
+ {
+ label: '检查更新',
+ accelerator: !isOsx ? 'Ctrl+U' : 'Cmd+U',
+ click() {
+ checkForUpdates();
+ }
+ },
+ {
+ label: 'Quit weweChat',
+ accelerator: !isOsx ? 'Alt+Q' : 'Command+Q',
+ selector: 'terminate:',
+ click() {
+ forceQuit = true;
+ mainWindow = null;
+ app.quit();
+ }
+ }
+];
+let avatarPath = tmp.dirSync();
+let avatarCache = {};
+let avatarPlaceholder = `${__dirname}/src/assets/images/user-fallback.png`;
+const icon = `${__dirname}/src/assets/images/dock.png`;
+
+async function getIcon(cookies, userid, src) {
+ var cached = avatarCache[userid];
+ var icon;
+
+ if (cached) {
+ return cached;
+ }
+
+ if (cookies && src) {
+ try {
+ let response = await axios({
+ url: src,
+ method: 'get',
+ responseType: 'arraybuffer',
+ headers: {
+ Cookie: cookies,
+ 'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_6) AppleWebKit/603.3.8 (KHTML, like Gecko) Version/10.1.2 Safari/603.3.8',
+ },
+ });
+ // eslint-disable-next-line
+ let base64 = new Buffer(response.data, 'binary').toString('base64');
+
+ icon = `${avatarPath.name}/${userid}.jpg`;
+ fs.writeFileSync(icon, base64.replace(/^data:image\/png;base64,/, ''), 'base64');
+ } catch (ex) {
+ console.error(ex);
+ icon = avatarPlaceholder;
+ }
+ }
+
+ var image = nativeImage.createFromPath(icon);
+
+ image = image.resize({ width: 24, height: 24 });
+
+ avatarCache[userid] = image;
+
+ return image;
+}
+
+function checkForUpdates() {
+ if (downloading) {
+ dialog.showMessageBox({
+ type: 'info',
+ buttons: ['OK'],
+ title: pkg.name,
+ message: `Downloading...`,
+ detail: `Please leave the app open, the new version is downloading. You'll receive a new dialog when downloading is finished.`
+ });
+
+ return;
+ }
+
+ autoUpdater.checkForUpdates();
+}
+
+function updateTray(unread = 0) {
+ if (!isOsx) {
+ // Always show the tray icon on windows
+ settings.showOnTray = true;
+ }
+
+ // Update unread mesage count
+ trayMenu[0].label = `您有 ${unread} 条未读消息`;
+
+ if (settings.showOnTray) {
+ if (tray
+ && updateTray.lastUnread === unread) {
+ return;
+ }
+
+ let contextmenu = Menu.buildFromTemplate(trayMenu);
+ let icon = unread
+ ? `${__dirname}/src/assets/images/icon-new-message.png`
+ : `${__dirname}/src/assets/images/icon.png`
+ ;
+
+ // Make sure the last tray has been destroyed
+ setTimeout(() => {
+ if (!tray) {
+ // Init tray icon
+ tray = new Tray(icon);
+
+ tray.on('right-click', () => {
+ tray.popUpContextMenu();
+ });
+
+ let clicked = false;
+ tray.on('click', () => {
+ if (clicked) {
+ mainWindow.show();
+ clicked = false;
+ } else {
+ clicked = true;
+ setTimeout(() => {
+ clicked = false;
+ }, 400);
+ }
+ });
+ }
+
+ tray.setImage(icon);
+ tray.setContextMenu(contextmenu);
+ });
+ } else {
+ if (!tray) return;
+
+ tray.destroy();
+ tray = null;
+ }
+
+ // Avoid tray icon been recreate
+ updateTray.lastUnread = unread;
+}
+
+async function autostart() {
+ var launcher = new AutoLaunch({
+ name: 'weweChat',
+ path: '/Applications/wewechat.app',
+ });
+
+ if (settings.startup) {
+ if (!isOsx) {
+ mainWindow.webContents.send('show-errors', {
+ message: 'Currently only supports the OSX.'
+ });
+ return;
+ }
+
+ launcher.enable()
+ .catch(ex => {
+ console.error(ex);
+ });
+ } else {
+ launcher.disable();
+ }
+}
+
+function createMenu() {
+ var menu = Menu.buildFromTemplate(mainMenu);
+
+ if (isOsx) {
+ Menu.setApplicationMenu(menu);
+ } else {
+ mainWindow.setMenu(menu);
+ }
+}
+
+const createMainWindow = () => {
+ var mainWindowState = windowStateKeeper({
+ defaultWidth: 745,
+ defaultHeight: 450,
+ });
+
+ mainWindow = new BrowserWindow({
+ x: mainWindowState.x,
+ y: mainWindowState.y,
+ minWidth: 745,
+ minHeight: 450,
+ transparent: true,
+ titleBarStyle: 'hiddenInset',
+ backgroundColor: 'none',
+ resizable: true,
+ webPreferences: {
+ scrollBounce: true
+ },
+ frame: !isWin,
+ icon
+ });
+
+ // mainWindow.webContents.openDevTools();
+ mainWindow.setSize(350, 460);
+ mainWindow.loadURL(
+ `file://${__dirname}/src/index.html`
+ );
+ mainWindow.webContents.on('did-finish-load', () => {
+ try {
+ mainWindow.show();
+ mainWindow.focus();
+ } catch (ex) { }
+ });
+
+ mainWindow.webContents.on('new-window', (event, url) => {
+ event.preventDefault();
+ shell.openExternal(url);
+ });
+
+ mainWindow.on('close', e => {
+ if (forceQuit) {
+ mainWindow = null;
+ app.quit();
+ } else {
+ e.preventDefault();
+ mainWindow.hide();
+ }
+ });
+
+ ipcMain.on('settings-apply', (event, args) => {
+ settings = args.settings;
+ mainWindow.setAlwaysOnTop(!!settings.alwaysOnTop);
+
+ try {
+ updateTray();
+ autostart();
+ } catch (ex) {
+ console.error(ex);
+ }
+ });
+
+ ipcMain.on('show-window', event => {
+ if (!mainWindow.isVisible()) {
+ mainWindow.show();
+ mainWindow.focus();
+ }
+ });
+
+ ipcMain.on('menu-update', async(event, args) => {
+ var { cookies, contacts = [], conversations = [] } = args;
+ var conversationsMenu = mainMenu.find(e => e.label === '群聊');
+ var contactsMenu = mainMenu.find(e => e.label === '私聊');
+ var shouldUpdate = false;
+
+ // if (!isOsx) {
+ // return;
+ // }
+
+ if (conversations.length
+ && conversations.map(e => e.name).join() !== conversationsMenu.submenu.map(e => e.label).join()) {
+ shouldUpdate = true;
+
+ conversations = await Promise.all(
+ conversations.map(async(e, index) => {
+ let icon = await getIcon(cookies, e.id, e.avatar);
+
+ return {
+ label: e.name,
+ accelerator: !isOsx ? `Ctrl+${index}` : `Cmd+${index}`,
+ icon,
+ click() {
+ mainWindow.show();
+ mainWindow.webContents.send('message-chatto', {
+ id: e.id,
+ });
+ }
+ };
+ })
+ );
+ conversationsMenu.submenu = conversations;
+ }
+
+ if (contacts.length) {
+ shouldUpdate = true;
+
+ contacts = await Promise.all(
+ contacts.map(async e => {
+ let icon = await getIcon(cookies, e.id, e.avatar);
+
+ return {
+ label: e.name,
+ icon,
+ click() {
+ mainWindow.show();
+ mainWindow.webContents.send('show-userinfo', {
+ id: e.id,
+ });
+ }
+ };
+ })
+ );
+ contactsMenu.submenu = contacts;
+ }
+
+ if (shouldUpdate) {
+ createMenu();
+ }
+ });
+
+ ipcMain.on('message-unread', (event, args) => {
+ var counter = args.counter;
+
+ if (settings.showOnTray) {
+ updateTray(counter);
+ }
+ });
+
+ ipcMain.on('file-paste', (event) => {
+ var image = clipboard.readImage();
+ var args = { hasImage: false };
+
+ if (!image.isEmpty()) {
+ let filename = tmp.tmpNameSync() + '.png';
+
+ args = {
+ hasImage: true,
+ filename,
+ raw: image.toPNG(),
+ };
+
+ fs.writeFileSync(filename, image.toPNG());
+ }
+
+ event.returnValue = args;
+ });
+
+ ipcMain.on('file-download', async(event, args) => {
+ var filename = args.filename;
+
+ fs.writeFileSync(filename, args.raw.replace(/^data:image\/png;base64,/, ''), {
+ encoding: 'base64',
+ // Overwrite file
+ flag: 'wx',
+ });
+ event.returnValue = filename;
+ });
+
+ ipcMain.on('open-file', async(event, filename) => {
+ shell.openItem(filename);
+ });
+
+ ipcMain.on('open-folder', async(event, dir) => {
+ shell.openItem(dir);
+ });
+
+ ipcMain.on('open-map', (event, args) => {
+ event.preventDefault();
+ shell.openExternal(args.map);
+ });
+
+ ipcMain.on('open-image', async(event, args) => {
+ var filename = `${imagesCacheDir}/img_${args.dataset.id}`;
+
+ fs.writeFileSync(filename, args.base64.replace(/^data:image\/png;base64,/, ''), 'base64');
+ shell.openItem(filename);
+ });
+
+ ipcMain.on('is-suspend', (event, args) => {
+ event.returnValue = isSuspend;
+ });
+
+ ipcMain.once('logined', event => {
+ mainWindow.setResizable(true);
+ mainWindow.setSize(mainWindowState.width, mainWindowState.height);
+ mainWindowState.manage(mainWindow);
+ });
+
+ powerMonitor.on('resume', () => {
+ isSuspend = false;
+ mainWindow.webContents.send('os-resume');
+ });
+
+ powerMonitor.on('suspend', () => {
+ isSuspend = true;
+ });
+
+ if (isOsx) {
+ app.setAboutPanelOptions({
+ applicationName: pkg.name,
+ applicationVersion: pkg.version,
+ copyright: 'Made with 💖 by trazyn. \n https://github.com/trazyn/weweChat \nRevise By Riceneeder \n https://gitee.com/spark-community-works-collections/wewechat-plus-plus',
+ credits: `With the invaluable help of: \n web.wechat.com`,
+ version: pkg.version
+ });
+ }
+
+ [imagesCacheDir, voicesCacheDir].map(e => {
+ if (!fs.existsSync(e)) {
+ fs.mkdirSync(e);
+ }
+ });
+
+ mainWindow.webContents.setUserAgent('Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_6) AppleWebKit/603.3.8 (KHTML, like Gecko) Version/10.1.2 Safari/603.3.8');
+ createMenu();
+};
+
+app.setName(pkg.name);
+app.dock && app.dock.setIcon(icon);
+
+app.on('ready', createMainWindow);
+app.on('before-quit', () => {
+ // Fix issues #14
+ forceQuit = true;
+});
+app.on('activate', e => {
+ if (!mainWindow.isVisible()) {
+ mainWindow.show();
+ }
+});
+
+autoUpdater.on('update-not-available', e => {
+ dialog.showMessageBox({
+ type: 'info',
+ buttons: ['OK'],
+ title: pkg.name,
+ message: `${pkg.name} is up to date :)`,
+ detail: `${pkg.name} ${pkg.version} is currently the newest version available, It looks like you're already rocking the latest version!`
+ });
+
+ console.log('Update not available.');
+});
+
+autoUpdater.on('update-available', e => {
+ downloading = true;
+ checkForUpdates();
+});
+
+autoUpdater.on('error', err => {
+ dialog.showMessageBox({
+ type: 'error',
+ buttons: ['Cancel update'],
+ title: pkg.name,
+ message: `Failed to update ${pkg.name} :(`,
+ detail: `An error occurred in retrieving update information, Please try again later.`,
+ });
+
+ downloading = false;
+ console.error(err);
+});
+
+autoUpdater.on('update-downloaded', info => {
+ var { releaseNotes, releaseName } = info;
+ var index = dialog.showMessageBox({
+ type: 'info',
+ buttons: ['Restart', 'Later'],
+ title: pkg.name,
+ message: `The new version has been downloaded. Please restart the application to apply the updates.`,
+ detail: `${releaseName}\n\n${releaseNotes}`
+ });
+ downloading = false;
+
+ if (index === 1) {
+ return;
+ }
+
+ autoUpdater.quitAndInstall();
+ setTimeout(() => {
+ mainWindow = null;
+ app.quit();
+ });
+});
diff --git a/package.json b/package.json
index fd8ffc4..baaa056 100644
--- a/package.json
+++ b/package.json
@@ -57,7 +57,6 @@
"category": "Chat",
"executableName": "wewechat",
"target": [
- "deb",
"AppImage"
]
},
From 3bfde67f69776bf68c6d55328e144dc2faed3a61 Mon Sep 17 00:00:00 2001
From: shenmo <jifengshenmo@outlook.com>
Date: Fri, 2 Sep 2022 10:01:41 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=09=E4=BF=AE=E6=94=B9=EF=BC=9A=20=20=20=20?=
=?UTF-8?q?=20.workflow/pipeline-build-20220901.yml=20=09=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9=EF=BC=9A=20=20=20=20=20main.js=20=09=E5=88=A0?=
=?UTF-8?q?=E9=99=A4=EF=BC=9A=20=20=20=20=20main.js.autosave=20=09?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=20=20=20=20=20package.json?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.workflow/pipeline-build-20220901.yml | 1 +
main.js | 6 +-
main.js.autosave | 771 --------------------------
package.json | 2 +-
4 files changed, 5 insertions(+), 775 deletions(-)
delete mode 100644 main.js.autosave
diff --git a/.workflow/pipeline-build-20220901.yml b/.workflow/pipeline-build-20220901.yml
index 3b2bd0d..55bfd2d 100644
--- a/.workflow/pipeline-build-20220901.yml
+++ b/.workflow/pipeline-build-20220901.yml
@@ -55,6 +55,7 @@ stages:
- yarn
- yarn package-linux
- mv ../release ./release
+ - rm -r ./release/linux-unpacked
artifacts:
- name: BUILD_ARTIFACT
path:
diff --git a/main.js b/main.js
index bdef184..2eec56e 100644
--- a/main.js
+++ b/main.js
@@ -58,10 +58,10 @@ let mainMenu = [
role: 'unhide'
},
{
- label: 'Check for updates',
+ label: '检查更新',
accelerator: !isOsx ? 'Ctrl+U' : 'Cmd+U',
click() {
- checkForUpdates();
+ shell.openExternal('spk://store/chat/wewechat');
}
},
{
@@ -309,7 +309,7 @@ let trayMenu = [
type: 'separator'
},
{
- label: 'Check for updates',
+ label: '检查更新',
accelerator: !isOsx ? 'Ctrl+U' : 'Cmd+U',
click() {
checkForUpdates();
diff --git a/main.js.autosave b/main.js.autosave
deleted file mode 100644
index e5a4718..0000000
--- a/main.js.autosave
+++ /dev/null
@@ -1,771 +0,0 @@
-
-import fs from 'fs';
-import tmp from 'tmp';
-import { app, powerMonitor, BrowserWindow, Tray, Menu, ipcMain, clipboard, shell, nativeImage, dialog } from 'electron';
-import windowStateKeeper from 'electron-window-state';
-import AutoLaunch from 'auto-launch';
-import { autoUpdater } from 'electron-updater';
-import axios from 'axios';
-
-import pkg from './package.json';
-
-let forceQuit = false;
-let downloading = false;
-let mainWindow;
-let tray;
-let settings = {};
-let isFullScreen = false;
-let isWin = process.platform === 'win32';
-let isOsx = process.platform === 'darwin';
-let isSuspend = false;
-let userData = app.getPath('userData');
-let imagesCacheDir = `${userData}/images`;
-let voicesCacheDir = `${userData}/voices`;
-let mainMenu = [
- {
- label: pkg.name,
- submenu: [
- {
- label: `About ${pkg.name}`,
- selector: 'orderFrontStandardAboutPanel:',
- },
- {
- label: '首选项...',
- accelerator: !isOsx ? 'Ctrl+,' : 'Cmd+,',
- click() {
- mainWindow.show();
- mainWindow.webContents.send('show-settings');
- }
- },
- {
- label: 'messageInput',
- accelerator: 'Esc',
- click() {
- mainWindow.show();
- mainWindow.webContents.send('show-messageInput');
- }
- },
- {
- type: 'separator'
- },
- {
- role: 'hide'
- },
- {
- role: 'hideothers'
- },
- {
- role: 'unhide'
- },
- {
- label: '检查更新',
- accelerator: !isOsx ? 'Ctrl+U' : 'Cmd+U',
- click() {
- checkForUpdates();
- }
- },
- {
- type: 'separator'
- },
- {
- label: 'Quit weweChat',
- accelerator: !isOsx ? 'Alt+Q' : 'Command+Q',
- selector: 'terminate:',
- click() {
- forceQuit = true;
- mainWindow = null;
- app.quit();
- }
- }
- ]
- },
- {
- label: 'File',
- submenu: [
- {
- label: 'New Chat',
- accelerator: !isOsx ? 'Ctrl+N' : 'Cmd+N',
- click() {
- mainWindow.show();
- mainWindow.webContents.send('show-newchat');
- }
- },
- {
- label: 'Search...',
- accelerator: !isOsx ? 'Ctrl+F' : 'Cmd+F',
- click() {
- mainWindow.show();
- mainWindow.webContents.send('show-search');
- }
- },
- {
- label: 'Batch Send Message',
- accelerator: !isOsx ? 'Ctrl+B' : 'Cmd+B',
- click() {
- mainWindow.show();
- mainWindow.webContents.send('show-batchsend');
- }
- },
- {
- type: 'separator',
- },
- {
- label: 'Insert emoji',
- accelerator: !isOsx ? 'Ctrl+I' : 'Cmd+I',
- click() {
- mainWindow.show();
- mainWindow.webContents.send('show-emoji');
- }
- },
- {
- type: 'separator',
- },
- {
- label: 'Next conversation',
- accelerator: !isOsx ? 'Ctrl+J' : 'Cmd+J',
- click() {
- mainWindow.show();
- mainWindow.webContents.send('show-next');
- }
- },
- {
- label: 'Previous conversation',
- accelerator: !isOsx ? 'Ctrl+K' : 'Cmd+K',
- click() {
- mainWindow.show();
- mainWindow.webContents.send('show-previous');
- }
- },
- ]
- },
- {
- label: '群聊',
- submenu: [
- {
- label: 'Loading...',
- }
- ],
- },
- {
- label: '私聊',
- submenu: [
- {
- label: 'Loading...',
- }
- ],
- },
- {
-
- },
- {
- label: 'Edit',
- submenu: [
- {
- role: 'undo'
- },
- {
- role: 'redo'
- },
- {
- type: 'separator'
- },
- {
- role: 'cut'
- },
- {
- role: 'copy'
- },
- {
- role: 'paste'
- },
- {
- role: 'pasteandmatchstyle'
- },
- {
- role: 'delete'
- },
- {
- role: 'selectall'
- }
- ]
- },
- {
- label: 'View',
- submenu: [
- {
- label: isFullScreen ? 'Exit Full Screen' : 'Enter Full Screen',
- accelerator: !isOsx ? 'Ctrl+Shift+F' : 'Shift+Cmd+F',
- click() {
- isFullScreen = !isFullScreen;
-
- mainWindow.show();
- mainWindow.setFullScreen(isFullScreen);
- }
- },
- {
- label: '显示群聊',
- accelerator: !isOsx ? 'Ctrl+Shift+M' : 'Shift+Cmd+M',
- click() {
- mainWindow.show();
- mainWindow.webContents.send('show-conversations');
- }
- },
- {
- type: 'separator',
- },
- {
- label: ''
- },
- {
- type: 'separator',
- },
- {
- role: 'toggledevtools'
- },
- {
- role: 'togglefullscreen'
- }
- ]
- },
- {
- role: 'window',
- submenu: [
- {
- role: 'minimize'
- },
- {
- role: 'close'
- }
- ]
- },
- {
- role: 'help',
- submenu: [
- {
- label: '反馈(不一定解决)',
- click() {
- shell.openExternal('https://gitee.com/spark-community-works-collections/wewechat-plus-plus/issues');
- }
- },
- {
- label: '在Gitee主页查看',
- click() {
- shell.openExternal('https://gitee.com/spark-community-works-collections/wewechat-plus-plus');
- }
- },
- ]
- }
-];
-let trayMenu = [
- {
- label: `您有0条未读消息`,
- click() {
- mainWindow.show();
- mainWindow.webContents.send('show-messages');
- }
- },
- {
- label: '打开主窗口',
- click() {
- let isVisible = mainWindow.isVisible();
- isVisible ? mainWindow.hide() : mainWindow.show();
- }
- },
- {
- type: 'separator'
- },
- {
- label: '首选项...',
- accelerator: !isOsx ? 'Ctrl+,' : 'Cmd+,',
- click() {
- mainWindow.show();
- mainWindow.webContents.send('show-settings');
- }
- },
- {
- label: '在Gitee主页查看',
- click() {
- shell.openExternal('https://gitee.com/spark-community-works-collections/wewechat-plus-plus');
- }
- },
- {
- type: 'separator'
- },
- {
- label: '打开开发者工具',
- accelerator: !isOsx ? 'Ctrl+Alt+I' : 'Alt+Command+I',
- click() {
- mainWindow.show();
- mainWindow.toggleDevTools();
- }
- },
- {
- label: '隐藏菜单栏图标',
- click() {
- mainWindow.webContents.send('hide-tray');
- }
- },
- {
- type: 'separator'
- },
- {
- label: '检查更新',
- accelerator: !isOsx ? 'Ctrl+U' : 'Cmd+U',
- click() {
- checkForUpdates();
- }
- },
- {
- label: 'Quit weweChat',
- accelerator: !isOsx ? 'Alt+Q' : 'Command+Q',
- selector: 'terminate:',
- click() {
- forceQuit = true;
- mainWindow = null;
- app.quit();
- }
- }
-];
-let avatarPath = tmp.dirSync();
-let avatarCache = {};
-let avatarPlaceholder = `${__dirname}/src/assets/images/user-fallback.png`;
-const icon = `${__dirname}/src/assets/images/dock.png`;
-
-async function getIcon(cookies, userid, src) {
- var cached = avatarCache[userid];
- var icon;
-
- if (cached) {
- return cached;
- }
-
- if (cookies && src) {
- try {
- let response = await axios({
- url: src,
- method: 'get',
- responseType: 'arraybuffer',
- headers: {
- Cookie: cookies,
- 'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_6) AppleWebKit/603.3.8 (KHTML, like Gecko) Version/10.1.2 Safari/603.3.8',
- },
- });
- // eslint-disable-next-line
- let base64 = new Buffer(response.data, 'binary').toString('base64');
-
- icon = `${avatarPath.name}/${userid}.jpg`;
- fs.writeFileSync(icon, base64.replace(/^data:image\/png;base64,/, ''), 'base64');
- } catch (ex) {
- console.error(ex);
- icon = avatarPlaceholder;
- }
- }
-
- var image = nativeImage.createFromPath(icon);
-
- image = image.resize({ width: 24, height: 24 });
-
- avatarCache[userid] = image;
-
- return image;
-}
-
-function checkForUpdates() {
- if (downloading) {
- dialog.showMessageBox({
- type: 'info',
- buttons: ['OK'],
- title: pkg.name,
- message: `Downloading...`,
- detail: `Please leave the app open, the new version is downloading. You'll receive a new dialog when downloading is finished.`
- });
-
- return;
- }
-
- autoUpdater.checkForUpdates();
-}
-
-function updateTray(unread = 0) {
- if (!isOsx) {
- // Always show the tray icon on windows
- settings.showOnTray = true;
- }
-
- // Update unread mesage count
- trayMenu[0].label = `您有 ${unread} 条未读消息`;
-
- if (settings.showOnTray) {
- if (tray
- && updateTray.lastUnread === unread) {
- return;
- }
-
- let contextmenu = Menu.buildFromTemplate(trayMenu);
- let icon = unread
- ? `${__dirname}/src/assets/images/icon-new-message.png`
- : `${__dirname}/src/assets/images/icon.png`
- ;
-
- // Make sure the last tray has been destroyed
- setTimeout(() => {
- if (!tray) {
- // Init tray icon
- tray = new Tray(icon);
-
- tray.on('right-click', () => {
- tray.popUpContextMenu();
- });
-
- let clicked = false;
- tray.on('click', () => {
- if (clicked) {
- mainWindow.show();
- clicked = false;
- } else {
- clicked = true;
- setTimeout(() => {
- clicked = false;
- }, 400);
- }
- });
- }
-
- tray.setImage(icon);
- tray.setContextMenu(contextmenu);
- });
- } else {
- if (!tray) return;
-
- tray.destroy();
- tray = null;
- }
-
- // Avoid tray icon been recreate
- updateTray.lastUnread = unread;
-}
-
-async function autostart() {
- var launcher = new AutoLaunch({
- name: 'weweChat',
- path: '/Applications/wewechat.app',
- });
-
- if (settings.startup) {
- if (!isOsx) {
- mainWindow.webContents.send('show-errors', {
- message: 'Currently only supports the OSX.'
- });
- return;
- }
-
- launcher.enable()
- .catch(ex => {
- console.error(ex);
- });
- } else {
- launcher.disable();
- }
-}
-
-function createMenu() {
- var menu = Menu.buildFromTemplate(mainMenu);
-
- if (isOsx) {
- Menu.setApplicationMenu(menu);
- } else {
- mainWindow.setMenu(menu);
- }
-}
-
-const createMainWindow = () => {
- var mainWindowState = windowStateKeeper({
- defaultWidth: 745,
- defaultHeight: 450,
- });
-
- mainWindow = new BrowserWindow({
- x: mainWindowState.x,
- y: mainWindowState.y,
- minWidth: 745,
- minHeight: 450,
- transparent: true,
- titleBarStyle: 'hiddenInset',
- backgroundColor: 'none',
- resizable: true,
- webPreferences: {
- scrollBounce: true
- },
- frame: !isWin,
- icon
- });
-
- // mainWindow.webContents.openDevTools();
- mainWindow.setSize(350, 460);
- mainWindow.loadURL(
- `file://${__dirname}/src/index.html`
- );
- mainWindow.webContents.on('did-finish-load', () => {
- try {
- mainWindow.show();
- mainWindow.focus();
- } catch (ex) { }
- });
-
- mainWindow.webContents.on('new-window', (event, url) => {
- event.preventDefault();
- shell.openExternal(url);
- });
-
- mainWindow.on('close', e => {
- if (forceQuit) {
- mainWindow = null;
- app.quit();
- } else {
- e.preventDefault();
- mainWindow.hide();
- }
- });
-
- ipcMain.on('settings-apply', (event, args) => {
- settings = args.settings;
- mainWindow.setAlwaysOnTop(!!settings.alwaysOnTop);
-
- try {
- updateTray();
- autostart();
- } catch (ex) {
- console.error(ex);
- }
- });
-
- ipcMain.on('show-window', event => {
- if (!mainWindow.isVisible()) {
- mainWindow.show();
- mainWindow.focus();
- }
- });
-
- ipcMain.on('menu-update', async(event, args) => {
- var { cookies, contacts = [], conversations = [] } = args;
- var conversationsMenu = mainMenu.find(e => e.label === '群聊');
- var contactsMenu = mainMenu.find(e => e.label === '私聊');
- var shouldUpdate = false;
-
- // if (!isOsx) {
- // return;
- // }
-
- if (conversations.length
- && conversations.map(e => e.name).join() !== conversationsMenu.submenu.map(e => e.label).join()) {
- shouldUpdate = true;
-
- conversations = await Promise.all(
- conversations.map(async(e, index) => {
- let icon = await getIcon(cookies, e.id, e.avatar);
-
- return {
- label: e.name,
- accelerator: !isOsx ? `Ctrl+${index}` : `Cmd+${index}`,
- icon,
- click() {
- mainWindow.show();
- mainWindow.webContents.send('message-chatto', {
- id: e.id,
- });
- }
- };
- })
- );
- conversationsMenu.submenu = conversations;
- }
-
- if (contacts.length) {
- shouldUpdate = true;
-
- contacts = await Promise.all(
- contacts.map(async e => {
- let icon = await getIcon(cookies, e.id, e.avatar);
-
- return {
- label: e.name,
- icon,
- click() {
- mainWindow.show();
- mainWindow.webContents.send('show-userinfo', {
- id: e.id,
- });
- }
- };
- })
- );
- contactsMenu.submenu = contacts;
- }
-
- if (shouldUpdate) {
- createMenu();
- }
- });
-
- ipcMain.on('message-unread', (event, args) => {
- var counter = args.counter;
-
- if (settings.showOnTray) {
- updateTray(counter);
- }
- });
-
- ipcMain.on('file-paste', (event) => {
- var image = clipboard.readImage();
- var args = { hasImage: false };
-
- if (!image.isEmpty()) {
- let filename = tmp.tmpNameSync() + '.png';
-
- args = {
- hasImage: true,
- filename,
- raw: image.toPNG(),
- };
-
- fs.writeFileSync(filename, image.toPNG());
- }
-
- event.returnValue = args;
- });
-
- ipcMain.on('file-download', async(event, args) => {
- var filename = args.filename;
-
- fs.writeFileSync(filename, args.raw.replace(/^data:image\/png;base64,/, ''), {
- encoding: 'base64',
- // Overwrite file
- flag: 'wx',
- });
- event.returnValue = filename;
- });
-
- ipcMain.on('open-file', async(event, filename) => {
- shell.openItem(filename);
- });
-
- ipcMain.on('open-folder', async(event, dir) => {
- shell.openItem(dir);
- });
-
- ipcMain.on('open-map', (event, args) => {
- event.preventDefault();
- shell.openExternal(args.map);
- });
-
- ipcMain.on('open-image', async(event, args) => {
- var filename = `${imagesCacheDir}/img_${args.dataset.id}`;
-
- fs.writeFileSync(filename, args.base64.replace(/^data:image\/png;base64,/, ''), 'base64');
- shell.openItem(filename);
- });
-
- ipcMain.on('is-suspend', (event, args) => {
- event.returnValue = isSuspend;
- });
-
- ipcMain.once('logined', event => {
- mainWindow.setResizable(true);
- mainWindow.setSize(mainWindowState.width, mainWindowState.height);
- mainWindowState.manage(mainWindow);
- });
-
- powerMonitor.on('resume', () => {
- isSuspend = false;
- mainWindow.webContents.send('os-resume');
- });
-
- powerMonitor.on('suspend', () => {
- isSuspend = true;
- });
-
- if (isOsx) {
- app.setAboutPanelOptions({
- applicationName: pkg.name,
- applicationVersion: pkg.version,
- copyright: 'Made with 💖 by trazyn. \n https://github.com/trazyn/weweChat \nRevise By Riceneeder \n https://gitee.com/spark-community-works-collections/wewechat-plus-plus',
- credits: `With the invaluable help of: \n web.wechat.com`,
- version: pkg.version
- });
- }
-
- [imagesCacheDir, voicesCacheDir].map(e => {
- if (!fs.existsSync(e)) {
- fs.mkdirSync(e);
- }
- });
-
- mainWindow.webContents.setUserAgent('Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_6) AppleWebKit/603.3.8 (KHTML, like Gecko) Version/10.1.2 Safari/603.3.8');
- createMenu();
-};
-
-app.setName(pkg.name);
-app.dock && app.dock.setIcon(icon);
-
-app.on('ready', createMainWindow);
-app.on('before-quit', () => {
- // Fix issues #14
- forceQuit = true;
-});
-app.on('activate', e => {
- if (!mainWindow.isVisible()) {
- mainWindow.show();
- }
-});
-
-autoUpdater.on('update-not-available', e => {
- dialog.showMessageBox({
- type: 'info',
- buttons: ['OK'],
- title: pkg.name,
- message: `${pkg.name} is up to date :)`,
- detail: `${pkg.name} ${pkg.version} is currently the newest version available, It looks like you're already rocking the latest version!`
- });
-
- console.log('Update not available.');
-});
-
-autoUpdater.on('update-available', e => {
- downloading = true;
- checkForUpdates();
-});
-
-autoUpdater.on('error', err => {
- dialog.showMessageBox({
- type: 'error',
- buttons: ['Cancel update'],
- title: pkg.name,
- message: `Failed to update ${pkg.name} :(`,
- detail: `An error occurred in retrieving update information, Please try again later.`,
- });
-
- downloading = false;
- console.error(err);
-});
-
-autoUpdater.on('update-downloaded', info => {
- var { releaseNotes, releaseName } = info;
- var index = dialog.showMessageBox({
- type: 'info',
- buttons: ['Restart', 'Later'],
- title: pkg.name,
- message: `The new version has been downloaded. Please restart the application to apply the updates.`,
- detail: `${releaseName}\n\n${releaseNotes}`
- });
- downloading = false;
-
- if (index === 1) {
- return;
- }
-
- autoUpdater.quitAndInstall();
- setTimeout(() => {
- mainWindow = null;
- app.quit();
- });
-});
diff --git a/package.json b/package.json
index baaa056..03f3fff 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "wewechat",
- "version": "1.2.0",
+ "version": "1.2.0-1",
"description": "make weweChat great again!!!",
"main": "main.js",
"scripts": {