56 Commits

Author SHA1 Message Date
Riceneeder
8cc58d9e68 !9 v1.2.3
Merge pull request !9 from Riceneeder/dev;
v1.2.3 增添darkmode,调整优化界面、颜色,以适应darkmode
2022-09-03 02:48:28 +00:00
Riceneeder
8794bf428e Merge branch 'master' of gitee.com:spark-community-works-collections/wewechat-plus-plus into dev
Signed-off-by: Riceneeder <845541909@qq.com>
2022-09-03 02:18:10 +00:00
Riceneeder
f07197c39f v1.2.3
v1.2.3 增添darkmode,调整优化界面、颜色,以适应darkmode

Signed-off-by: Riceneeder <86492950+Riceneeder@users.noreply.github.com>
2022-09-03 10:07:48 +08:00
Riceneeder
e625954b2a !8 1.2.2
Merge pull request !8 from shenmo/auto-4915358-master-5d4eb191
2022-09-02 13:09:19 +00:00
90d68492eb single 2022-09-02 14:18:11 +08:00
4c2cdd9499 single 2022-09-02 14:08:16 +08:00
ff988aa446 single 2022-09-02 14:02:41 +08:00
62c2d3d99d single 2022-09-02 13:59:05 +08:00
442489dce2 1.2.2 2022-09-02 13:15:27 +08:00
fbc14e854a 更多翻译 2022-09-02 13:11:12 +08:00
96d67f0b6a update pipeline-build-20220901.yml 2022-09-02 03:49:18 +00:00
223edaf650 !6 1.2.1 release
Merge pull request !6 from shenmo/auto-4915358-master-c04635a6
2022-09-02 03:47:53 +00:00
9e9cd47a6f 1.2.1 release 2022-09-02 11:47:37 +08:00
7b396be00b !5 更正错误翻译 美观优化 准备发布1.2.1
* Merge branch 'master' of gitee.com:spark-community-works-collections/w…
* 更正错误翻译
* 翻译
2022-09-02 03:46:43 +00:00
b119fab5a4 update pipeline-build-pr-20220902.yml 2022-09-02 03:37:00 +00:00
fe92afef48 create pipeline-build-pr-20220902.yml 2022-09-02 03:36:42 +00:00
295b455e50 update pipeline-build-20220901.yml 2022-09-02 03:35:42 +00:00
ae58bf7a27 !4 翻译
* 翻译
2022-09-02 03:33:04 +00:00
Riceneeder
29ef5be718 !3 修改: main.js 修改: package.json
Merge pull request !3 from shenmo/auto-4915358-master-4a4e0891
2022-09-02 03:08:56 +00:00
d45193bbfe 修改: main.js
修改:     package.json
2022-09-02 10:36:18 +08:00
Riceneeder
9c8aaa2f8d !2 翻译
Merge pull request !2 from shenmo/auto-4915358-master-8749a79f
2022-09-02 02:10:11 +00:00
Riceneeder
adc2b60992 !1 upgrade .gitignore
Merge pull request !1 from Riceneeder/auto-7828755-master-e346c694
2022-09-02 02:03:12 +00:00
3bfde67f69 修改: .workflow/pipeline-build-20220901.yml
修改:     main.js
	删除:     main.js.autosave
	修改:     package.json
2022-09-02 10:01:41 +08:00
68c8b93d4b 翻译 2022-09-02 09:52:16 +08:00
Riceneeder
064a554383 upgrade .gitignore 2022-09-02 09:44:06 +08:00
a9fc0b6160 修改: main.js
修改:     src/js/pages/Login/index.js
2022-09-02 09:40:28 +08:00
7b1f97a6b0 update pipeline-build-20220901.yml 2022-09-02 01:23:32 +00:00
608c164ef2 update package.json.
Signed-off-by: shenmo <jifengshenmo@outlook.com>
2022-09-01 17:30:35 +00:00
2f960e06ab update pipeline-build-20220901.yml 2022-09-01 17:30:13 +00:00
9763b56387 update pipeline-build-20220901.yml 2022-09-01 17:25:07 +00:00
e63e4cbae6 update pipeline-build-20220901.yml 2022-09-01 17:18:47 +00:00
de8ae1160c update package.json.
Signed-off-by: shenmo <jifengshenmo@outlook.com>
2022-09-01 17:18:30 +00:00
62c6fd3cee update package.json.
Signed-off-by: shenmo <jifengshenmo@outlook.com>
2022-09-01 17:08:46 +00:00
16fae28bec update pipeline-build-20220901.yml 2022-09-01 17:04:13 +00:00
0dfdcb4e59 update pipeline-build-20220901.yml 2022-09-01 16:58:48 +00:00
e9fa7cfeb2 update pipeline-build-20220901.yml 2022-09-01 16:48:52 +00:00
27a68c9a2f update pipeline-build-20220901.yml 2022-09-01 16:44:39 +00:00
0dba00a789 update pipeline-build-20220901.yml 2022-09-01 16:37:53 +00:00
30e0b31cf4 update package.json.
Signed-off-by: shenmo <jifengshenmo@outlook.com>
2022-09-01 16:31:30 +00:00
55da47be2e update package.json.
Signed-off-by: shenmo <jifengshenmo@outlook.com>
2022-09-01 16:23:56 +00:00
5454152d42 update package.json.
Signed-off-by: shenmo <jifengshenmo@outlook.com>
2022-09-01 16:18:50 +00:00
f1ce7ad848 update pipeline-build-20220901.yml 2022-09-01 16:18:27 +00:00
bd55a0f918 update pipeline-build-20220901.yml 2022-09-01 15:55:54 +00:00
41e16c067b update package.json.
Signed-off-by: shenmo <jifengshenmo@outlook.com>
2022-09-01 15:41:35 +00:00
6c0d92d332 update package.json.
Signed-off-by: shenmo <jifengshenmo@outlook.com>
2022-09-01 15:29:56 +00:00
523316b34f update pipeline-build-20220901.yml 2022-09-01 15:11:05 +00:00
4ccf7ba00d update pipeline-build-20220901.yml 2022-09-01 14:41:01 +00:00
73b82e0822 update pipeline-build-20220901.yml 2022-09-01 14:37:28 +00:00
494372e0b2 update pipeline-build-20220901.yml 2022-09-01 14:24:17 +00:00
26f5928656 update pipeline-build-20220901.yml 2022-09-01 14:17:37 +00:00
ca11918754 update pipeline-build-20220901.yml 2022-09-01 14:09:55 +00:00
cda3db4105 update pipeline-build-20220901.yml 2022-09-01 14:05:01 +00:00
e148ae1975 update pipeline-build-20220901.yml 2022-09-01 13:49:36 +00:00
d6a322d990 create pipeline-build-20220901.yml 2022-09-01 13:48:38 +00:00
Riceneeder
69e2bcb928 change repo url 2022-09-01 21:05:47 +08:00
Riceneeder
0ecde84844 'client-version': '2.0.0' -> '2.1.5' 2022-09-01 21:02:53 +08:00
26 changed files with 272 additions and 89 deletions

1
.gitignore vendored
View File

@@ -7,6 +7,7 @@
dist/ dist/
release/ release/
package-lock.json package-lock.json
yarn.lock
# Xcode # Xcode
# #

View File

@@ -0,0 +1,76 @@
version: '1.0'
name: pipeline-build-20220901
displayName: pipeline-build
triggers:
trigger: auto
push:
tags:
prefix:
- ''
stages:
- name: stage-82deebcf
displayName: 构建
strategy: naturally
trigger: auto
executor: []
steps:
- step: build@nodejs
name: build_nodejs
displayName: Nodejs 构建
nodeVersion: 16.14.2
commands:
- '# 设置NPM源提升安装速度'
- npm config set registry https://registry.npmmirror.com
- npm i yarn -g
- yarn config set registry "https://registry.npmmirror.com"
- yarn config set electron_builder_binaries_mirror "https://npmmirror.com/mirrors/electron-builder-binaries/"
- yarn config set electron_mirror "https://code.gitlink.org.cn/shenmo7192/electron-releases/raw/branch/master/"
- mkdir -p /root/.cache/electron-builder/app-builder/
- mkdir ../release
- ELECTRON_BUILDER_BINARIES_MIRROR =https://registry.npmmirror.com/binary.html?path=electron-builder-binaries/
- '###'
- mkdir -p /root/.cache/electron-builder/app-builder/app-builder-v0.6.1-x64
- WORK_DIR=`pwd`
- cd /root/.cache/electron-builder/app-builder/app-builder-v0.6.1-x64
- 'wget https://code.gitlink.org.cn/shenmo7192/electron-releases/raw/branch/master/app-builder-v0.6.1-linux-x64.7z '
- '7z x app-builder-v0.6.1-linux-x64.7z '
- cd $WORK_DIR
- '###'
- mkdir -p /root/.cache/electron-builder/appimage/appimage-9.0.5
- cd /root/.cache/electron-builder/appimage/appimage-9.0.5
- wget https://code.gitlink.org.cn/shenmo7192/electron-releases/raw/branch/master/appimage-9.0.5.7z
- 7z x appimage-9.0.5.7z
- cd $WORK_DIR
- '###'
- 'mkdir -p /root/.cache/electron-builder/fpm/fpm-1.9.3-2.3.1-linux-x86_64 '
- 'cd /root/.cache/electron-builder/fpm/fpm-1.9.3-2.3.1-linux-x86_64 '
- wget https://code.gitlink.org.cn/shenmo7192/electron-releases/raw/branch/master/fpm-1.9.3-2.3.1-linux-x86_64.7z
- 7z x fpm-1.9.3-2.3.1-linux-x86_64.7z
- cd $WORK_DIR
- '###'
- yarn
- yarn package-linux
- mv ../release ./release
- rm -r ./release/linux-unpacked
artifacts:
- name: BUILD_ARTIFACT
path:
- ./release
caches: []
notify: []
strategy:
retry: '0'
- name: stage-cd5d9e5b
displayName: 上传制品
strategy: naturally
trigger: auto
executor: []
steps:
- step: publish@general_artifacts
name: publish_general_artifacts
displayName: 上传制品
dependArtifact: BUILD_ARTIFACT
artifactName: output
notify: []
strategy:
retry: '0'

View File

@@ -0,0 +1,76 @@
version: '1.0'
name: pipeline-build-pr-20220902
displayName: pipeline-build-pr
triggers:
trigger: auto
pr:
branches:
prefix:
- ''
stages:
- name: stage-82deebcf
displayName: 构建
strategy: naturally
trigger: auto
executor: []
steps:
- step: build@nodejs
name: build_nodejs
displayName: Nodejs 构建
nodeVersion: 16.14.2
commands:
- '# 设置NPM源提升安装速度'
- npm config set registry https://registry.npmmirror.com
- npm i yarn -g
- yarn config set registry "https://registry.npmmirror.com"
- yarn config set electron_builder_binaries_mirror "https://npmmirror.com/mirrors/electron-builder-binaries/"
- yarn config set electron_mirror "https://code.gitlink.org.cn/shenmo7192/electron-releases/raw/branch/master/"
- mkdir -p /root/.cache/electron-builder/app-builder/
- mkdir ../release
- ELECTRON_BUILDER_BINARIES_MIRROR =https://registry.npmmirror.com/binary.html?path=electron-builder-binaries/
- '###'
- mkdir -p /root/.cache/electron-builder/app-builder/app-builder-v0.6.1-x64
- WORK_DIR=`pwd`
- cd /root/.cache/electron-builder/app-builder/app-builder-v0.6.1-x64
- 'wget https://code.gitlink.org.cn/shenmo7192/electron-releases/raw/branch/master/app-builder-v0.6.1-linux-x64.7z '
- '7z x app-builder-v0.6.1-linux-x64.7z '
- cd $WORK_DIR
- '###'
- mkdir -p /root/.cache/electron-builder/appimage/appimage-9.0.5
- cd /root/.cache/electron-builder/appimage/appimage-9.0.5
- wget https://code.gitlink.org.cn/shenmo7192/electron-releases/raw/branch/master/appimage-9.0.5.7z
- 7z x appimage-9.0.5.7z
- cd $WORK_DIR
- '###'
- 'mkdir -p /root/.cache/electron-builder/fpm/fpm-1.9.3-2.3.1-linux-x86_64 '
- 'cd /root/.cache/electron-builder/fpm/fpm-1.9.3-2.3.1-linux-x86_64 '
- wget https://code.gitlink.org.cn/shenmo7192/electron-releases/raw/branch/master/fpm-1.9.3-2.3.1-linux-x86_64.7z
- 7z x fpm-1.9.3-2.3.1-linux-x86_64.7z
- cd $WORK_DIR
- '###'
- yarn
- yarn package-linux
- mv ../release ./release
- rm -r ./release/linux-unpacked
artifacts:
- name: BUILD_ARTIFACT
path:
- ./release
caches: []
notify: []
strategy:
retry: '0'
- name: stage-cd5d9e5b
displayName: 上传制品
strategy: naturally
trigger: auto
executor: []
steps:
- step: publish@general_artifacts
name: publish_general_artifacts
displayName: 上传制品
dependArtifact: BUILD_ARTIFACT
artifactName: output
notify: []
strategy:
retry: '0'

81
main.js
View File

@@ -30,7 +30,7 @@ let mainMenu = [
selector: 'orderFrontStandardAboutPanel:', selector: 'orderFrontStandardAboutPanel:',
}, },
{ {
label: 'Preferences...', label: '首选项...',
accelerator: !isOsx ? 'Ctrl+,' : 'Cmd+,', accelerator: !isOsx ? 'Ctrl+,' : 'Cmd+,',
click() { click() {
mainWindow.show(); mainWindow.show();
@@ -58,17 +58,17 @@ let mainMenu = [
role: 'unhide' role: 'unhide'
}, },
{ {
label: 'Check for updates', label: '检查更新',
accelerator: !isOsx ? 'Ctrl+U' : 'Cmd+U', accelerator: !isOsx ? 'Ctrl+U' : 'Cmd+U',
click() { click() {
checkForUpdates(); shell.openExternal('spk://store/chat/wewechat');
} }
}, },
{ {
type: 'separator' type: 'separator'
}, },
{ {
label: 'Quit weweChat', label: '退出 weweChat',
accelerator: !isOsx ? 'Alt+Q' : 'Command+Q', accelerator: !isOsx ? 'Alt+Q' : 'Command+Q',
selector: 'terminate:', selector: 'terminate:',
click() { click() {
@@ -80,10 +80,10 @@ let mainMenu = [
] ]
}, },
{ {
label: 'File', label: '聊天操作',
submenu: [ submenu: [
{ {
label: 'New Chat', label: '新建聊天',
accelerator: !isOsx ? 'Ctrl+N' : 'Cmd+N', accelerator: !isOsx ? 'Ctrl+N' : 'Cmd+N',
click() { click() {
mainWindow.show(); mainWindow.show();
@@ -91,7 +91,7 @@ let mainMenu = [
} }
}, },
{ {
label: 'Search...', label: '搜索',
accelerator: !isOsx ? 'Ctrl+F' : 'Cmd+F', accelerator: !isOsx ? 'Ctrl+F' : 'Cmd+F',
click() { click() {
mainWindow.show(); mainWindow.show();
@@ -99,7 +99,7 @@ let mainMenu = [
} }
}, },
{ {
label: 'Batch Send Message', label: '群发消息',
accelerator: !isOsx ? 'Ctrl+B' : 'Cmd+B', accelerator: !isOsx ? 'Ctrl+B' : 'Cmd+B',
click() { click() {
mainWindow.show(); mainWindow.show();
@@ -110,7 +110,7 @@ let mainMenu = [
type: 'separator', type: 'separator',
}, },
{ {
label: 'Insert emoji', label: '插入表情符号',
accelerator: !isOsx ? 'Ctrl+I' : 'Cmd+I', accelerator: !isOsx ? 'Ctrl+I' : 'Cmd+I',
click() { click() {
mainWindow.show(); mainWindow.show();
@@ -121,7 +121,7 @@ let mainMenu = [
type: 'separator', type: 'separator',
}, },
{ {
label: 'Next conversation', label: '下一个聊天',
accelerator: !isOsx ? 'Ctrl+J' : 'Cmd+J', accelerator: !isOsx ? 'Ctrl+J' : 'Cmd+J',
click() { click() {
mainWindow.show(); mainWindow.show();
@@ -129,7 +129,7 @@ let mainMenu = [
} }
}, },
{ {
label: 'Previous conversation', label: '上一个聊天',
accelerator: !isOsx ? 'Ctrl+K' : 'Cmd+K', accelerator: !isOsx ? 'Ctrl+K' : 'Cmd+K',
click() { click() {
mainWindow.show(); mainWindow.show();
@@ -139,7 +139,7 @@ let mainMenu = [
] ]
}, },
{ {
label: 'Conversations', label: '群聊',
submenu: [ submenu: [
{ {
label: 'Loading...', label: 'Loading...',
@@ -147,7 +147,7 @@ let mainMenu = [
], ],
}, },
{ {
label: 'Contacts', label: '私聊',
submenu: [ submenu: [
{ {
label: 'Loading...', label: 'Loading...',
@@ -158,7 +158,7 @@ let mainMenu = [
}, },
{ {
label: 'Edit', label: '编辑',
submenu: [ submenu: [
{ {
role: 'undo' role: 'undo'
@@ -203,7 +203,7 @@ let mainMenu = [
} }
}, },
{ {
label: 'Toggle Conversations', label: '显示聊天列表',
accelerator: !isOsx ? 'Ctrl+Shift+M' : 'Shift+Cmd+M', accelerator: !isOsx ? 'Ctrl+Shift+M' : 'Shift+Cmd+M',
click() { click() {
mainWindow.show(); mainWindow.show();
@@ -214,7 +214,12 @@ let mainMenu = [
type: 'separator', type: 'separator',
}, },
{ {
label: '' label: 'Darkmode',
accelerator: !isOsx ? 'Ctrl+Shift+D' : 'Shift+Cmd+D',
click() {
mainWindow.show();
mainWindow.webContents.send('darkmode');
}
}, },
{ {
type: 'separator', type: 'separator',
@@ -242,15 +247,15 @@ let mainMenu = [
role: 'help', role: 'help',
submenu: [ submenu: [
{ {
label: '反馈(不一定解决)', label: '反馈',
click() { click() {
shell.openExternal('https://github.com/Riceneeder/weweChat/issues'); shell.openExternal('https://gitee.com/spark-community-works-collections/wewechat-plus-plus/issues');
} }
}, },
{ {
label: 'Fork me on Github', label: '在Gitee主页查看',
click() { click() {
shell.openExternal('https://github.com/Riceneeder/weweChat'); shell.openExternal('https://gitee.com/spark-community-works-collections/wewechat-plus-plus');
} }
}, },
] ]
@@ -258,14 +263,14 @@ let mainMenu = [
]; ];
let trayMenu = [ let trayMenu = [
{ {
label: `You have 0 messages`, label: `您有0条未读消息`,
click() { click() {
mainWindow.show(); mainWindow.show();
mainWindow.webContents.send('show-messages'); mainWindow.webContents.send('show-messages');
} }
}, },
{ {
label: 'Toggle main window', label: '打开主窗口',
click() { click() {
let isVisible = mainWindow.isVisible(); let isVisible = mainWindow.isVisible();
isVisible ? mainWindow.hide() : mainWindow.show(); isVisible ? mainWindow.hide() : mainWindow.show();
@@ -275,7 +280,7 @@ let trayMenu = [
type: 'separator' type: 'separator'
}, },
{ {
label: 'Preferences...', label: '首选项...',
accelerator: !isOsx ? 'Ctrl+,' : 'Cmd+,', accelerator: !isOsx ? 'Ctrl+,' : 'Cmd+,',
click() { click() {
mainWindow.show(); mainWindow.show();
@@ -283,16 +288,16 @@ let trayMenu = [
} }
}, },
{ {
label: 'Fork me on Github', label: '在Gitee主页查看',
click() { click() {
shell.openExternal('https://github.com/Riceneeder/weweChat'); shell.openExternal('https://gitee.com/spark-community-works-collections/wewechat-plus-plus');
} }
}, },
{ {
type: 'separator' type: 'separator'
}, },
{ {
label: 'Toggle DevTools', label: '打开开发者工具',
accelerator: !isOsx ? 'Ctrl+Alt+I' : 'Alt+Command+I', accelerator: !isOsx ? 'Ctrl+Alt+I' : 'Alt+Command+I',
click() { click() {
mainWindow.show(); mainWindow.show();
@@ -300,7 +305,7 @@ let trayMenu = [
} }
}, },
{ {
label: 'Hide menu bar icon', label: '隐藏菜单栏图标',
click() { click() {
mainWindow.webContents.send('hide-tray'); mainWindow.webContents.send('hide-tray');
} }
@@ -309,14 +314,14 @@ let trayMenu = [
type: 'separator' type: 'separator'
}, },
{ {
label: 'Check for updates', label: '检查更新',
accelerator: !isOsx ? 'Ctrl+U' : 'Cmd+U', accelerator: !isOsx ? 'Ctrl+U' : 'Cmd+U',
click() { click() {
checkForUpdates(); shell.openExternal('spk://store/chat/wewechat');
} }
}, },
{ {
label: 'Quit weweChat', label: '退出 weweChat',
accelerator: !isOsx ? 'Alt+Q' : 'Command+Q', accelerator: !isOsx ? 'Alt+Q' : 'Command+Q',
selector: 'terminate:', selector: 'terminate:',
click() { click() {
@@ -393,7 +398,7 @@ function updateTray(unread = 0) {
} }
// Update unread mesage count // Update unread mesage count
trayMenu[0].label = `You have ${unread} messages`; trayMenu[0].label = `您有 ${unread} 条未读消息`;
if (settings.showOnTray) { if (settings.showOnTray) {
if (tray if (tray
@@ -477,6 +482,14 @@ function createMenu() {
mainWindow.setMenu(menu); mainWindow.setMenu(menu);
} }
} }
const shouldQuit = app.makeSingleInstance(() => {
if (mainWindow) {
if (mainWindow.isMinimized()) mainWindow.restore();
mainWindow.show();
mainWindow.focus();
}
});
shouldQuit && app.quit();
const createMainWindow = () => { const createMainWindow = () => {
var mainWindowState = windowStateKeeper({ var mainWindowState = windowStateKeeper({
@@ -548,8 +561,8 @@ const createMainWindow = () => {
ipcMain.on('menu-update', async(event, args) => { ipcMain.on('menu-update', async(event, args) => {
var { cookies, contacts = [], conversations = [] } = args; var { cookies, contacts = [], conversations = [] } = args;
var conversationsMenu = mainMenu.find(e => e.label === 'Conversations'); var conversationsMenu = mainMenu.find(e => e.label === '群聊');
var contactsMenu = mainMenu.find(e => e.label === 'Contacts'); var contactsMenu = mainMenu.find(e => e.label === '私聊');
var shouldUpdate = false; var shouldUpdate = false;
// if (!isOsx) { // if (!isOsx) {
@@ -688,7 +701,7 @@ const createMainWindow = () => {
app.setAboutPanelOptions({ app.setAboutPanelOptions({
applicationName: pkg.name, applicationName: pkg.name,
applicationVersion: pkg.version, applicationVersion: pkg.version,
copyright: 'Made with 💖 by trazyn. \n https://github.com/trazyn/weweChat \nRevise By Riceneeder \n https://github.com/Riceneeder/weweChat', 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`, credits: `With the invaluable help of: \n web.wechat.com`,
version: pkg.version version: pkg.version
}); });

View File

@@ -1,6 +1,6 @@
{ {
"name": "wewechat", "name": "wewechat",
"version": "1.2.0", "version": "1.2.3",
"description": "make weweChat great again!!!", "description": "make weweChat great again!!!",
"main": "main.js", "main": "main.js",
"scripts": { "scripts": {
@@ -23,9 +23,10 @@
"author": { "author": {
"email": "845541909@qq.com" "email": "845541909@qq.com"
}, },
"homepage": "https://gitee.com/spark-community-works-collections/wewechat-plus-plus/README.md",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "https://github.com/Riceneeder/weweChat" "url": "https://gitee.com/spark-community-works-collections/wewechat-plus-plus"
}, },
"license": "MIT", "license": "MIT",
"build": { "build": {
@@ -57,7 +58,6 @@
"executableName": "wewechat", "executableName": "wewechat",
"target": [ "target": [
"deb", "deb",
"rpm",
"AppImage" "AppImage"
] ]
}, },
@@ -86,6 +86,7 @@
"axios": "^0.18.0", "axios": "^0.18.0",
"browser-md5-file": "^1.0.0", "browser-md5-file": "^1.0.0",
"classname": "^0.0.0", "classname": "^0.0.0",
"darkmode-js": "^1.5.7",
"delegate": "^3.1.3", "delegate": "^3.1.3",
"electron-context-menu": "^0.10.0", "electron-context-menu": "^0.10.0",
"electron-json-storage": "^4.0.2", "electron-json-storage": "^4.0.2",

View File

@@ -4,6 +4,7 @@ import { render } from 'react-dom';
import { Provider } from 'mobx-react'; import { Provider } from 'mobx-react';
import { HashRouter } from 'react-router-dom'; import { HashRouter } from 'react-router-dom';
import { ipcRenderer } from 'electron'; import { ipcRenderer } from 'electron';
import Darkmode from 'darkmode-js';
import './global.css'; import './global.css';
import './assets/fonts/icomoon/style.css'; import './assets/fonts/icomoon/style.css';
@@ -27,6 +28,11 @@ class App extends Component {
componentDidMount() { componentDidMount() {
var navigator = this.refs.navigator; var navigator = this.refs.navigator;
const options = {
time: '0.5s',
mixColor: '#cccccc',
};
const darkmode = new Darkmode(options);
// Hide the tray icon // Hide the tray icon
ipcRenderer.on('hide-tray', () => { ipcRenderer.on('hide-tray', () => {
@@ -130,6 +136,11 @@ class App extends Component {
ipcRenderer.on('show-errors', (event, args) => { ipcRenderer.on('show-errors', (event, args) => {
stores.snackbar.showMessage(args.message); stores.snackbar.showMessage(args.message);
}); });
// Dark mode
ipcRenderer.on('darkmode', () => {
darkmode.toggle();
});
} }
render() { render() {

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 20 KiB

View File

@@ -180,7 +180,7 @@ export default class MessageInput extends Component {
id="messageInput" id="messageInput"
ref="input" ref="input"
type="text" type="text"
placeholder="Type something to send..." placeholder="在此输入内容..."
readOnly={!canisend} readOnly={!canisend}
onPaste={e => this.handlePaste(e)} onPaste={e => this.handlePaste(e)}
onKeyPress={e => this.handleEnter(e)} onKeyPress={e => this.handleEnter(e)}

View File

@@ -14,7 +14,7 @@
border: 0; border: 0;
padding-right: 17px; padding-right: 17px;
background: 0; background: 0;
color: #333; color: #808080;
font-size: 14px; font-size: 14px;
outline: 0; outline: 0;
} }

View File

@@ -58,7 +58,7 @@ export default class Contacts extends Component {
dangerouslySetInnerHTML={{__html: e.RemarkName || e.NickName}} /> dangerouslySetInnerHTML={{__html: e.RemarkName || e.NickName}} />
<p <p
className={classes.signature} className={classes.signature}
dangerouslySetInnerHTML={{__html: e.Signature || 'No Signature'}} /> dangerouslySetInnerHTML={{__html: e.Signature || '无签名'}} />
</div> </div>
</div> </div>
); );

View File

@@ -37,13 +37,13 @@ export default class Filter extends Component {
<div className={classes.contacts}> <div className={classes.contacts}>
<input <input
onInput={e => this.doFilter(e.target.value)} onInput={e => this.doFilter(e.target.value)}
placeholder="Type something to search..." placeholder="在此搜索..."
ref="filter" ref="filter"
type="text" /> type="text" />
<div className={classes.action}> <div className={classes.action}>
<label htmlFor="showGroup"> <label htmlFor="showGroup">
<span className={classes.options}>Show Groups</span> <span className={classes.options}>显示群聊</span>
<Switch <Switch
defaultChecked={this.props.showGroup} defaultChecked={this.props.showGroup}
id="showGroup" id="showGroup"

View File

@@ -11,16 +11,16 @@ export default class Placeholder extends Component {
className={classes.button} className={classes.button}
href="mailto:var.845541909@qq.com?Subject=WeWeChat%20Feedback" href="mailto:var.845541909@qq.com?Subject=WeWeChat%20Feedback"
target="_blank"> target="_blank">
Send feedback Send Feedback
<i className="icon-ion-ios-email-outline" /> <i className="icon-ion-ios-email-outline" />
</a> </a>
<a <a
className={classes.button} className={classes.button}
href="https://github.com/Riceneeder/weweChat" href="https://gitee.com/spark-community-works-collections/wewechat-plus-plus"
target="_blank"> target="_blank">
Fork on Github Fork on Gitee
<i className="icon-ion-social-github" /> <i className="icon-ion-fork-repo" />
</a> </a>
</div> </div>
); );

View File

@@ -7,7 +7,6 @@
.footer { .footer {
position: relative; position: relative;
background: #fff;
box-shadow: inset 0 1px 0 0 var(--shadow-color); box-shadow: inset 0 1px 0 0 var(--shadow-color);
z-index: 9; z-index: 9;
@@ -78,7 +77,7 @@
line-height: 60px; line-height: 60px;
border: 0; border: 0;
background: 0; background: 0;
color: #333; color: #808080;
font-size: 14px; font-size: 14px;
outline: 0; outline: 0;
} }
@@ -107,7 +106,7 @@
position: relative; position: relative;
margin-right: 17px; margin-right: 17px;
width: 166px; width: 166px;
color: rgba(0, 0, 0, .8); color: #808080;
font-size: 14px; font-size: 14px;
padding: 9px 8px; padding: 9px 8px;
font-family: 'Roboto'; font-family: 'Roboto';

View File

@@ -78,7 +78,7 @@ export default class Forward extends Component {
onCancel={e => this.close()} onCancel={e => this.close()}
show={this.props.show}> show={this.props.show}>
<ModalBody className={classes.container}> <ModalBody className={classes.container}>
Forward Message 转发消息
<div className={classes.avatars}> <div className={classes.avatars}>
{ {
@@ -100,7 +100,7 @@ export default class Forward extends Component {
<button <button
disabled={!this.state.selected.length} disabled={!this.state.selected.length}
onClick={e => this.send(this.state.selected)}> onClick={e => this.send(this.state.selected)}>
Send Message 发送消息
</button> </button>
<button onClick={e => this.close()}>Cancel</button> <button onClick={e => this.close()}>Cancel</button>

View File

@@ -8,7 +8,7 @@
font-family: "system-ui"; font-family: "system-ui";
font-weight: normal; font-weight: normal;
width: 100%; width: 100%;
color: #777; color: #c3c3c3;
text-align: center; text-align: center;
background: rgba(255, 255, 255, 1); background: rgba(255, 255, 255, 1);
-webkit-user-select: none; -webkit-user-select: none;

View File

@@ -448,7 +448,7 @@ export default class ChatContent extends Component {
var caniforward = [1, 3, 47, 43, 49 + 6].includes(message.MsgType); var caniforward = [1, 3, 47, 43, 49 + 6].includes(message.MsgType);
var templates = [ var templates = [
{ {
label: 'Delete', label: '删除',
click: () => { click: () => {
this.props.deleteMessage(message.MsgId); this.props.deleteMessage(message.MsgId);
} }
@@ -458,7 +458,7 @@ export default class ChatContent extends Component {
if (caniforward) { if (caniforward) {
templates.unshift({ templates.unshift({
label: 'Forward', label: '转发',
click: () => { click: () => {
this.props.showForward(message); this.props.showForward(message);
} }
@@ -468,7 +468,7 @@ export default class ChatContent extends Component {
if (message.isme if (message.isme
&& message.CreateTime - new Date() < 2 * 60 * 1000) { && message.CreateTime - new Date() < 2 * 60 * 1000) {
templates.unshift({ templates.unshift({
label: 'Recall', label: '撤回',
click: () => { click: () => {
this.props.recallMessage(message); this.props.recallMessage(message);
} }
@@ -494,7 +494,7 @@ export default class ChatContent extends Component {
type: 'separator', type: 'separator',
}, },
{ {
label: 'Empty Content', label: '清空聊天内容',
click: () => { click: () => {
this.props.empty(user); this.props.empty(user);
} }
@@ -503,13 +503,13 @@ export default class ChatContent extends Component {
type: 'separator' type: 'separator'
}, },
{ {
label: helper.isTop(user) ? 'Unsticky' : 'Sticky on Top', label: helper.isTop(user) ? '取消置顶' : '聊天置顶',
click: () => { click: () => {
this.props.sticky(user); this.props.sticky(user);
} }
}, },
{ {
label: 'Delete', label: '删除',
click: () => { click: () => {
this.props.removeChat(user); this.props.removeChat(user);
} }
@@ -670,7 +670,7 @@ export default class ChatContent extends Component {
<img <img
className="disabledDrag" className="disabledDrag"
src="assets/images/noselected.png" /> src="assets/images/noselected.png" />
<h1>No Chat selected :(</h1> <h1>未选择聊天 :(</h1>
</div> </div>
) )
} }

View File

@@ -114,7 +114,7 @@
width: 32px; width: 32px;
border-radius: 0; border-radius: 0;
z-index: 9; z-index: 9;
box-shadow: 0 0 10px 0 rgba(0, 0, 0, .5); box-shadow: 0 0 10px 0 rgba(225, 225, 225, 0.5);
cursor: pointer; cursor: pointer;
} }
@@ -165,7 +165,7 @@
& .content { & .content {
position: relative; position: relative;
max-width: 100%; max-width: 100%;
background: #fff; background: rgba(225, 225, 225, 0.5);
box-shadow: 0 6px 28px 0 rgba(230, 230, 230, 100); box-shadow: 0 6px 28px 0 rgba(230, 230, 230, 100);
} }
@@ -538,7 +538,7 @@
} }
& .content { & .content {
background: #7ebef8; background: rgba(0, 0, 200, 0.5);
} }
& p { & p {

View File

@@ -56,7 +56,7 @@ export default class Chats extends Component {
showContextMenu(user) { showContextMenu(user) {
var menu = new remote.Menu.buildFromTemplate([ var menu = new remote.Menu.buildFromTemplate([
{ {
label: 'Send Message', label: '发送消息',
click: () => { click: () => {
this.props.chatTo(user); this.props.chatTo(user);
} }
@@ -65,19 +65,19 @@ export default class Chats extends Component {
type: 'separator' type: 'separator'
}, },
{ {
label: helper.isTop(user) ? 'Unsticky' : 'Sticky on Top', label: helper.isTop(user) ? '取消置顶' : '聊天置顶',
click: () => { click: () => {
this.props.sticky(user); this.props.sticky(user);
} }
}, },
{ {
label: 'Delete', label: '删除',
click: () => { click: () => {
this.props.removeChat(user); this.props.removeChat(user);
} }
}, },
{ {
label: 'Mark as Read', label: '标为已读',
click: () => { click: () => {
this.props.markedRead(user.UserName); this.props.markedRead(user.UserName);
} }
@@ -146,7 +146,7 @@ export default class Chats extends Component {
<span <span
className={classes.message} className={classes.message}
dangerouslySetInnerHTML={{__html: helper.getMessageContent(message) || 'No Message'}} /> dangerouslySetInnerHTML={{__html: helper.getMessageContent(message) || '未收到消息'}} />
</div> </div>
</div> </div>

View File

@@ -3,7 +3,6 @@
height: calc(100vh - 100px); height: calc(100vh - 100px);
overflow: hidden; overflow: hidden;
overflow-y: auto; overflow-y: auto;
background: rgba(255, 255, 255, .8);
box-shadow: inset 0 1px 0 0 #eaedea; box-shadow: inset 0 1px 0 0 #eaedea;
filter: blur(0); filter: blur(0);
transition: .2s; transition: .2s;

View File

@@ -39,10 +39,10 @@ export default class Login extends Component {
code && (<img className="disabledDrag" src={`https://login.weixin.qq.com/qrcode/${code}`} />) code && (<img className="disabledDrag" src={`https://login.weixin.qq.com/qrcode/${code}`} />)
} }
<a href={window.location.pathname + '?' + +new Date()}>Refresh the QR Code</a> <a href={window.location.pathname + '?' + +new Date()}>刷新二维码</a>
<p>Scan to log in to WeChat</p> <p>扫描二维码登录微信</p>
<p>Log in on phone to use WeChat on Web</p> <p>使用手机登录网页版微信</p>
</div> </div>
); );
} }

View File

@@ -109,7 +109,7 @@ export default class Members extends Component {
id="messageInput" id="messageInput"
maxLength={30} maxLength={30}
onInput={e => this.props.search(e.target.value)} onInput={e => this.props.search(e.target.value)}
placeholder="Type something to search..." placeholder="在此搜索..."
ref="input" ref="input"
type="text" /> type="text" />
</div> </div>

View File

@@ -1,6 +1,6 @@
.container { .container {
background: #fff; background: rgba(142, 142, 142, 0.6);
height: 100vh; height: 100vh;
width: 100vw; width: 100vw;
display: flex; display: flex;

View File

@@ -66,14 +66,14 @@ export default class Settings extends Component {
return ( return (
<div className={classes.container}> <div className={classes.container}>
<div className={classes.column}> <div className={classes.column}>
<h2>Settings</h2> <h2>设置</h2>
<ul> <ul>
{ {
user && ( user && (
<li className={classes.user}> <li className={classes.user}>
<Avatar src={this.props.user.User.HeadImgUrl} /> <Avatar src={this.props.user.User.HeadImgUrl} />
<button onClick={e => this.props.logout()}>Logout</button> <button onClick={e => this.props.logout()}>登出</button>
</li> </li>
) )
} }
@@ -83,15 +83,15 @@ export default class Settings extends Component {
onChange={e => setDownloads(e.target.files[0])} onChange={e => setDownloads(e.target.files[0])}
ref="downloads" ref="downloads"
type="file" /> type="file" />
<p>Downloads</p> <p>下载目录</p>
<p onClick={e => this.choiceDownloadDir()}>{downloads}</p> <p onClick={e => this.choiceDownloadDir()}>{downloads}</p>
</div> </div>
<button onClick={e => this.choiceDownloadDir()}>Change</button> <button onClick={e => this.choiceDownloadDir()}>更改</button>
</li> </li>
<li> <li>
<label htmlFor="alwaysOnTop"> <label htmlFor="alwaysOnTop">
<span>Always on Top</span> <span>窗口置顶</span>
<Switch <Switch
checked={alwaysOnTop} checked={alwaysOnTop}
id="alwaysOnTop" id="alwaysOnTop"
@@ -101,7 +101,7 @@ export default class Settings extends Component {
<li> <li>
<label htmlFor="showOnTray"> <label htmlFor="showOnTray">
<span>Show on Tray</span> <span>显示托盘图标</span>
<Switch <Switch
checked={showOnTray} checked={showOnTray}
disabled={!helper.isOsx} disabled={!helper.isOsx}
@@ -112,7 +112,7 @@ export default class Settings extends Component {
<li> <li>
<label htmlFor="showNotification"> <label htmlFor="showNotification">
<span>Send Desktop Notifications</span> <span>发送桌面通知</span>
<Switch <Switch
checked={showNotification} checked={showNotification}
id="showNotification" id="showNotification"
@@ -122,7 +122,7 @@ export default class Settings extends Component {
<li> <li>
<label htmlFor="blockRecall"> <label htmlFor="blockRecall">
<span>Block Message Recall</span> <span>反撤回功能</span>
<Switch <Switch
checked={blockRecall} checked={blockRecall}
id="blockRecall" id="blockRecall"
@@ -132,7 +132,7 @@ export default class Settings extends Component {
<li> <li>
<label htmlFor="rememberConversation"> <label htmlFor="rememberConversation">
<span>Remember the last Conversation</span> <span>记住上次的聊天内容</span>
<Switch <Switch
checked={rememberConversation} checked={rememberConversation}
id="rememberConversation" id="rememberConversation"
@@ -142,7 +142,7 @@ export default class Settings extends Component {
<li> <li>
<label htmlFor="showRedIcon"> <label htmlFor="showRedIcon">
<span>Show the red button</span> <span>显示首页红色加号按钮</span>
<Switch <Switch
checked={showRedIcon} checked={showRedIcon}
id="showRedIcon" id="showRedIcon"
@@ -152,7 +152,7 @@ export default class Settings extends Component {
<li> <li>
<label htmlFor="confirmImagePaste"> <label htmlFor="confirmImagePaste">
<span>Image paste Confirmation</span> <span>在粘贴图片时弹框确认</span>
<Switch <Switch
checked={confirmImagePaste} checked={confirmImagePaste}
id="confirmImagePaste" id="confirmImagePaste"
@@ -162,7 +162,7 @@ export default class Settings extends Component {
<li> <li>
<label htmlFor="startup"> <label htmlFor="startup">
<span>Launch at startup</span> <span>开机自启动</span>
<Switch <Switch
checked={startup} checked={startup}
id="startup" id="startup"
@@ -172,7 +172,14 @@ export default class Settings extends Component {
</ul> </ul>
</div> </div>
<div className={classes.column}> <div className={classes.column}>
<h2>TODO:</h2> <h2>更新记录:</h2>
<p>
v1.2.3 增添darkmode调整优化界面颜色以适应darkmode<br />
v1.2.2 添加单例运行在后台时在启动器中启动会拉到前台而不是再启动一个wewechat更多的汉化<br />
v1.2.1 汉化<br />
v1.2.0 Make weweChat great again!!! Fix uos support
</p>
</div> </div>
</div> </div>
); );

View File

@@ -4,7 +4,7 @@
justify-content: space-between; justify-content: space-between;
padding: 12px 17px 0; padding: 12px 17px 0;
font-family: 'Helvetica Neue'; font-family: 'Helvetica Neue';
color: #000; color: #808080;
& h2 { & h2 {
font-weight: 300; font-weight: 300;

View File

@@ -210,7 +210,7 @@ class UserInfo extends Component {
color: buttonColor, color: buttonColor,
opacity: .6, opacity: .6,
}}> }}>
{helper.isChatRoom(UserName) || isFriend ? 'Send Message' : 'Add Friend'} {helper.isChatRoom(UserName) || isFriend ? '发送消息' : '添加好友'}
</div> </div>
</div> </div>

View File

@@ -12,7 +12,7 @@ import contacts from './contacts';
const CancelToken = axios.CancelToken; const CancelToken = axios.CancelToken;
const headers = { const headers = {
'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/54.0.2840.71 Safari/537.36', 'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/54.0.2840.71 Safari/537.36',
'client-version': '2.0.0', 'client-version': '2.1.5',
extspam: 'Go8FCIkFEokFCggwMDAwMDAwMRAGGvAESySibk50w5Wb3uTl2c2h64jVVrV7gNs06GFlWplHQbY/5FfiO++1yH4ykCyNPWKXmco+wfQzK5R98D3so7rJ5LmGFvBLjGceleySrc3SOf2Pc1gVehzJgODeS0lDL3/I/0S2SSE98YgKleq6Uqx6ndTy9yaL9qFxJL7eiA/R3SEfTaW1SBoSITIu+EEkXff+Pv8NHOk7N57rcGk1w0ZzRrQDkXTOXFN2iHYIzAAZPIOY45Lsh+A4slpgnDiaOvRtlQYCt97nmPLuTipOJ8Qc5pM7ZsOsAPPrCQL7nK0I7aPrFDF0q4ziUUKettzW8MrAaiVfmbD1/VkmLNVqqZVvBCtRblXb5FHmtS8FxnqCzYP4WFvz3T0TcrOqwLX1M/DQvcHaGGw0B0y4bZMs7lVScGBFxMj3vbFi2SRKbKhaitxHfYHAOAa0X7/MSS0RNAjdwoyGHeOepXOKY+h3iHeqCvgOH6LOifdHf/1aaZNwSkGotYnYScW8Yx63LnSwba7+hESrtPa/huRmB9KWvMCKbDThL/nne14hnL277EDCSocPu3rOSYjuB9gKSOdVmWsj9Dxb/iZIe+S6AiG29Esm+/eUacSba0k8wn5HhHg9d4tIcixrxveflc8vi2/wNQGVFNsGO6tB5WF0xf/plngOvQ1/ivGV/C1Qpdhzznh0ExAVJ6dwzNg7qIEBaw+BzTJTUuRcPk92Sn6QDn2Pu3mpONaEumacjW4w6ipPnPw+g2TfywJjeEcpSZaP4Q3YV5HG8D6UjWA4GSkBKculWpdCMadx0usMomsSS/74QgpYqcPkmamB4nVv1JxczYITIqItIKjD35IGKAUwAA==', extspam: 'Go8FCIkFEokFCggwMDAwMDAwMRAGGvAESySibk50w5Wb3uTl2c2h64jVVrV7gNs06GFlWplHQbY/5FfiO++1yH4ykCyNPWKXmco+wfQzK5R98D3so7rJ5LmGFvBLjGceleySrc3SOf2Pc1gVehzJgODeS0lDL3/I/0S2SSE98YgKleq6Uqx6ndTy9yaL9qFxJL7eiA/R3SEfTaW1SBoSITIu+EEkXff+Pv8NHOk7N57rcGk1w0ZzRrQDkXTOXFN2iHYIzAAZPIOY45Lsh+A4slpgnDiaOvRtlQYCt97nmPLuTipOJ8Qc5pM7ZsOsAPPrCQL7nK0I7aPrFDF0q4ziUUKettzW8MrAaiVfmbD1/VkmLNVqqZVvBCtRblXb5FHmtS8FxnqCzYP4WFvz3T0TcrOqwLX1M/DQvcHaGGw0B0y4bZMs7lVScGBFxMj3vbFi2SRKbKhaitxHfYHAOAa0X7/MSS0RNAjdwoyGHeOepXOKY+h3iHeqCvgOH6LOifdHf/1aaZNwSkGotYnYScW8Yx63LnSwba7+hESrtPa/huRmB9KWvMCKbDThL/nne14hnL277EDCSocPu3rOSYjuB9gKSOdVmWsj9Dxb/iZIe+S6AiG29Esm+/eUacSba0k8wn5HhHg9d4tIcixrxveflc8vi2/wNQGVFNsGO6tB5WF0xf/plngOvQ1/ivGV/C1Qpdhzznh0ExAVJ6dwzNg7qIEBaw+BzTJTUuRcPk92Sn6QDn2Pu3mpONaEumacjW4w6ipPnPw+g2TfywJjeEcpSZaP4Q3YV5HG8D6UjWA4GSkBKculWpdCMadx0usMomsSS/74QgpYqcPkmamB4nVv1JxczYITIqItIKjD35IGKAUwAA==',
referer: 'https://wx.qq.com/?&lang=zh_CN&target=t', referer: 'https://wx.qq.com/?&lang=zh_CN&target=t',
}; };