!21 修复保存的图片没有加.jpg后缀

Merge pull request !21 from silentdoer/master
修复保存的图片没有附加后缀
2023-05-23 01:02:47 +00:00 · 2023-05-22 23:37:32 +08:00 · 2023-04-04 09:47:46 +00:00 · 2023-04-04 09:47:23 +00:00 · 2023-04-04 09:11:19 +00:00 · 2023-04-04 09:04:12 +00:00
9 changed files with 49 additions and 173 deletions
--- a/.workflow/pipeline-build-20220901.yml
+++ b/.workflow/pipeline-build-20220901.yml
@ -24,7 +24,7 @@ stages:
          - 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/"
+          - yarn config set electron_mirror "https://ghproxy.com/https://github.com/Riceneeder/electron-releases/raw/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/
@ -32,19 +32,19 @@ stages:
          - 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 '
+          - 'wget https://ghproxy.com/https://github.com/Riceneeder/electron-releases/raw/master/fpm-1.9.3-2.3.1-linux-x86_64.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
+          - wget https://ghproxy.com/https://github.com/Riceneeder/electron-releases/raw/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
+          - wget https://ghproxy.com/https://github.com/Riceneeder/electron-releases/raw/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
          - '###'
--- a/.workflow/pipeline-build-pr-20220902.yml
+++ b/.workflow/pipeline-build-pr-20220902.yml
@ -24,7 +24,7 @@ stages:
          - 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/"
+          - yarn config set electron_mirror "https://ghproxy.com/https://github.com/Riceneeder/electron-releases/raw/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/
@ -32,19 +32,19 @@ stages:
          - 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 '
+          - 'wget https://ghproxy.com/https://github.com/Riceneeder/electron-releases/raw/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
+          - wget https://ghproxy.com/https://github.com/Riceneeder/electron-releases/raw/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
+          - wget https://ghproxy.com/https://github.com/Riceneeder/electron-releases/raw/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
          - '###'
--- a/CHANGELOG.MD
+++ b/CHANGELOG.MD
@ -1,71 +0,0 @@
-
-
-# 1.1.4
-
-### 2017-09-22
-
-#### Improvements
- 发送消息后滚动到对话窗口最下面
-
-#### Bug fixed
- 修复 #34 快速`enter`时会重复发送消息
- 修复点击状态栏小图标展开菜单后，收到消息后重新创建小图标导致程序退出的问题
-
-# 1.1.3
-
-### 2017-09-19
-
-#### Bug fixed
- #36 #34 优化内存使用，修复由于1.1.1显示头像到菜单栏，接收新消息时刷新菜单中会话列表，重复创建nativeImage导致GC无法及时回收所造成内存占用过高
-
-
-# 1.1.2
-
-### 2017-09-18
-
-#### Improvements
- 增加自动更新
-
-
-# 1.1.1
-
-### 2017-09-14
-
-#### Improvements
- 增加用户头像到菜单栏
-
-#### Bug fixed
- 修复登出时网络错误，导致未提示客户端已离线
-
-### 2017-09-12
-#29 替换`html`为对应`emoji`
-
-### 2017-09-11
-#28 在 windows 和 linux 上不显示菜单
-
-### 2017-09-10
-
-#### Bug fixed
- 联系人列表只显示好友，不显示临时联系人
-
-### 2017-09-08
-
-#### Improvements
- 添加文件助手, #27
-
-#### Bug fixed
- 修改样式，防止文字信息内容过长
-
-### 2017-09-07
-
-#### Improvements
- 调整表情框表情大小
- 聊天窗口用户名取消换行
-
-#### Feature
- 多文件拖拽发送
-
-#### Bug fixed
- 仅在聊天开启时允许文件拖拽
- 修复手机端消息同步客户端错误
- 修复图片加载失败使用错误`src`进行回滚导致客户端卡死的问题
--- a/main.js
+++ b/main.js
@ -1,16 +1,14 @@

 import fs from 'fs';
 import tmp from 'tmp';
-import { app, powerMonitor, BrowserWindow, Tray, Menu, ipcMain, clipboard, shell, nativeImage, dialog } from 'electron';
+import { app, powerMonitor, BrowserWindow, Tray, Menu, ipcMain, clipboard, shell, nativeImage, Notification } 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 = {};
@ -28,6 +26,17 @@ let mainMenu = [
            {
                label: `About ${pkg.name}`,
                selector: 'orderFrontStandardAboutPanel:',
+                click() {
+                    let note = new Notification({
+                        title: 'WeweChat',
+                        subtitle: 'about',
+                        icon: `${__dirname}/src/assets/images/dock.png`,
+                        body: `Made with 💖 by trazyn.\nRevise with 🔥 By Riceneeder\nversion: ${pkg.version}`,
+                        silent: true,
+                        closeButtonText: '了解了'
+                    });
+                    note.show();
+                }
            },
            {
                label: '首选项...',
@ -139,7 +148,7 @@ let mainMenu = [
        ]
    },
    {
-        label: '群聊',
+        label: '聊天列表',
        submenu: [
            {
                label: 'Loading...',
@ -147,15 +156,12 @@ let mainMenu = [
        ],
    },
    {
-        label: '私聊',
+        label: '联系人',
        submenu: [
            {
                label: 'Loading...',
            }
        ],
-    },
-    {
-
    },
    {
        label: '编辑',
@ -375,22 +381,6 @@ async function getIcon(cookies, userid, src) {
    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
@ -672,7 +662,7 @@ const createMainWindow = () => {
    });

    ipcMain.on('open-image', async(event, args) => {
-        var filename = `${imagesCacheDir}/img_${args.dataset.id}`;
+        var filename = `${imagesCacheDir}/img_${args.dataset.id}.jpg`;

        fs.writeFileSync(filename, args.base64.replace(/^data:image\/png;base64,/, ''), 'base64');
        shell.openItem(filename);
@ -697,15 +687,15 @@ const createMainWindow = () => {
        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
-        });
-    }
+    // 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)) {
@ -730,55 +720,3 @@ app.on('activate', e => {
        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();
-    });
-});
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "wewechat",
-  "version": "1.2.3",
+  "version": "1.2.5",
  "description": "make weweChat great again!!!",
  "main": "main.js",
  "scripts": {
@ -54,11 +54,16 @@
    },
    "linux": {
      "icon": "../resource",
-      "category": "Network",
+      "category": "Chat",
      "executableName": "wewechat",
      "target": [
-        "deb",
-        "AppImage"
+        {
+          "target": "deb",
+          "arch":[
+            "x64",
+            "arm64"
+          ]
+        }
      ]
    },
    "win": {
@ -125,7 +130,6 @@
    "css-loader": "^1.0.0",
    "electron": "^2.0.16",
    "electron-builder": "^19.56.2",
-    "electron-updater": "^3.0.1",
    "eslint": "^5.1.0",
    "eslint-config-standard": "^11.0.0",
    "eslint-config-standard-react": "^6.0.0",
@ -156,4 +160,4 @@
    "webpack-dev-middleware": "^3.1.3",
    "webpack-hot-middleware": "^2.20.0"
  }
-}
+}
--- a/src/assets/images/icon-new-message.png
+++ b/src/assets/images/icon-new-message.png
--- a/src/assets/images/icon.png
+++ b/src/assets/images/icon.png
--- a/src/js/pages/Footer/Settings.js
+++ b/src/js/pages/Footer/Settings.js
@ -9,7 +9,7 @@ export default class Placeholder extends Component {
            <div className={classes.settings}>
                <a
                    className={classes.button}
-                    href="mailto:var.845541909@qq.com?Subject=WeWeChat%20Feedback"
+                    href="mailto:845541909@qq.com?Subject=WeWeChat%20Feedback"
                    target="_blank">
                    发送反馈
                    <i className="icon-ion-ios-email-outline" />
--- a/src/js/pages/Settings/index.js
+++ b/src/js/pages/Settings/index.js
@ -135,6 +135,7 @@ export default class Settings extends Component {
                                <span>记住上次的聊天内容</span>
                                <Switch
                                    checked={rememberConversation}
+                                    disabled={true}
                                    id="rememberConversation"
                                    onChange={e => setRememberConversation(e.target.checked)} />
                            </label>
@ -175,10 +176,14 @@ export default class Settings extends Component {
                    <h2>更新记录:</h2>

                    <p>
+                        v1.2.5 修复翻译;纠正反馈邮箱;禁用‘记住上次聊天内容’，此功能等待修复<br />
+                        v1.2.4 更多的翻译;为darkmode添加过渡动画;删去不必要的代码，去除自动检查更新;修改托盘图标让其更加明显<br />
                        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
+                        v1.2.0 Make weweChat great again!!! Fix uos support<br />
+                        <hr />
+                        <strong>Riceneeder: 本人不会React且较为业余，此项目除重大bug外不再更新，有能力者可提PR或联系星火的shenmo参与项目</strong>
                    </p>
                </div>
            </div>
Author	SHA1	Message	Date
Riceneeder	01493bd37a	!21 修复保存的图片没有加.jpg后缀 Merge pull request !21 from silentdoer/master	2023-05-23 01:02:47 +00:00
silentdoer	4bb999e514	修复保存的图片没有附加后缀	2023-05-22 23:37:32 +08:00
Riceneeder	46d9cdce48	!20 修改package.json Merge pull request !20 from Riceneeder/N/A	2023-04-04 09:47:46 +00:00
Riceneeder	fe46d42a0f	修改package.json Signed-off-by: Riceneeder <845541909@qq.com>	2023-04-04 09:47:23 +00:00
Riceneeder	52ed587a5c	!16 support arm64 Merge pull request !16 from Riceneeder/auto-7828755-master-804f47a1	2023-04-04 09:11:19 +00:00
Riceneeder	e568e29870	!19 github加速 Merge pull request !19 from Riceneeder/tmp	2023-04-04 09:04:12 +00:00
Riceneeder	43d497a3b7	github加速 Signed-off-by: Riceneeder <845541909@qq.com>	2023-04-04 09:03:05 +00:00
Riceneeder	aa6d25ea1e	!18 electron依赖链接地址修正 Merge pull request !18 from Riceneeder/tmp	2023-04-04 06:58:22 +00:00
Riceneeder	678f880b7e	electron依赖链接地址修正 Signed-off-by: Riceneeder <845541909@qq.com>	2023-04-04 06:56:56 +00:00
Riceneeder	16821fd070	!17 更改electron依赖拉取网络位置 Merge pull request !17 from Riceneeder/tmp	2023-04-04 06:52:57 +00:00
Riceneeder	e46f74aa04	更改electron依赖拉取位置 Signed-off-by: Riceneeder <845541909@qq.com>	2023-04-04 06:51:16 +00:00
Riceneeder	8bc00785a2	support arm64	2023-04-03 20:26:47 +08:00
Riceneeder	dd982b2086	!15 Merge branch 'master' of https://gitee.com/spark-community-works-collections/wewechat-plus-plus Merge pull request !15 from Riceneeder/auto-7828755-master-a74786b5	2022-11-18 11:51:31 +00:00
梵高先生	f1d3a3f99e	Merge branch 'master' of https://gitee.com/spark-community-works-collections/wewechat-plus-plus	2022-11-19 03:51:01 +08:00
梵高先生	05f7912754	1.2.5	2022-11-19 03:50:34 +08:00
梵高先生	63770b7016	Merge branch 'master' of https://gitee.com/spark-community-works-collections/wewechat-plus-plus	2022-11-19 03:41:50 +08:00
梵高先生	96143fd0b9	fix	2022-11-19 03:41:45 +08:00
梵高先生	9ca18d51c5	更新记录	2022-11-19 03:37:20 +08:00
梵高先生	858086e29f	change:禁用记住上次聊天内容，等待修复	2022-11-19 03:35:46 +08:00
梵高先生	7b89d45783	fix:翻译错误	2022-11-19 03:32:41 +08:00
梵高先生	3ae3cdd270	fix:setting界面反馈按钮邮箱错误	2022-11-19 03:26:47 +08:00
Riceneeder	cd96af99bf	!14 Merge branch 'master' of https://gitee.com/spark-community-works-collections/wewechat-plus-plus Merge pull request !14 from Riceneeder/auto-7828755-master-f8496f93	2022-11-18 11:43:06 +00:00
Riceneeder	75c553d4bb	!13 Merge pull request !13 from Riceneeder/auto-7828755-master-3b4c5980	2022-11-18 11:39:25 +00:00
Riceneeder	c8c59d3519	!12 发布v1.2.4 v1.2.4 更多的翻译;为darkmode添加过渡动画;删去不必要的代码，去除自动检查更新;修改托盘图标让其更加明显	2022-09-10 10:37:52 +00:00
Riceneeder	8d2fbd1773	fix package.json	2022-09-10 17:59:27 +08:00
Riceneeder	a3f04e6efb	v1.2.4	2022-09-10 17:48:52 +08:00
Riceneeder	1e5e250f6a	!10 优化，减少可能到来的1.2.4的工作量 1.增加翻译 2.为darkmode添加过度动画 3.修改package.json	2022-09-03 13:29:19 +00:00