single

Merge pull request !6 from shenmo/auto-4915358-master-c04635a6

.workflow/pipeline-build-20220901.yml

@@ -7,10 +7,6 @@ triggers:
     tags:
       prefix:
         - ''
-  pr:
-    branches:
-      prefix:
-        - ''
 stages:
   - name: stage-82deebcf
     displayName: 构建

.workflow/pipeline-build-pr-20220902.yml

@@ -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'

main.js

@@ -203,7 +203,7 @@ let mainMenu = [
                 }
             },
             {
-                label: '显示群聊',
+                label: '显示聊天列表',
                 accelerator: !isOsx ? 'Ctrl+Shift+M' : 'Shift+Cmd+M',
                 click() {
                     mainWindow.show();
@@ -331,6 +331,8 @@ 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;
@@ -477,11 +479,20 @@ function createMenu() {
         mainWindow.setMenu(menu);
     }
 }
+// 实现单例，在启动第二个实例后，激活主窗口，然后退出第二个实例
+const shouldQuit = app.makeSingleInstance(() => {
+    if (mainWindow) {
+        if (mainWindow.isMinimized()) mainWindow.restore()
+        mainWindow.focus()
+    }
+})
+
+shouldQuit && app.quit()
 
 const createMainWindow = () => {
     var mainWindowState = windowStateKeeper({
-        defaultWidth: 745,
-        defaultHeight: 450,
+        defaultWidth: 1300,
+        defaultHeight: 700,
     });
 
     mainWindow = new BrowserWindow({
@@ -703,7 +714,6 @@ const createMainWindow = () => {
     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);
 
@@ -712,6 +722,7 @@ app.on('before-quit', () => {
     // Fix issues #14
     forceQuit = true;
 });
+
 app.on('activate', e => {
     if (!mainWindow.isVisible()) {
         mainWindow.show();

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wewechat",
-  "version": "1.2.0-1",
+  "version": "1.2.2",
   "description": "make weweChat great again!!!",
   "main": "main.js",
   "scripts": {

src/js/pages/Footer/Settings.js

@@ -11,7 +11,7 @@ export default class Placeholder extends Component {
                     className={classes.button}
                     href="mailto:var.845541909@qq.com?Subject=WeWeChat%20Feedback"
                     target="_blank">
-                    发送反馈
+                    Send Feedback
                     <i className="icon-ion-ios-email-outline" />
                 </a>
 

src/js/pages/Forward/index.js

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

src/js/pages/Home/ChatContent/index.js

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

src/js/pages/Home/Chats/index.js

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

src/js/pages/UserInfo/index.js

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