From a3f04e6efb33b3e1448715aed55416b5ae4430b4 Mon Sep 17 00:00:00 2001 From: Riceneeder <845541909@qq.com> Date: Sat, 10 Sep 2022 17:48:52 +0800 Subject: [PATCH 1/2] v1.2.4 --- CHANGELOG.MD | 71 ----------------- main.js | 104 +++++-------------------- package.json | 8 +- src/assets/images/icon-new-message.png | Bin 14871 -> 676 bytes src/assets/images/icon.png | Bin 15286 -> 1163 bytes src/js/pages/Settings/index.js | 5 +- 6 files changed, 30 insertions(+), 158 deletions(-) delete mode 100644 CHANGELOG.MD diff --git a/CHANGELOG.MD b/CHANGELOG.MD deleted file mode 100644 index a7fe933..0000000 --- a/CHANGELOG.MD +++ /dev/null @@ -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`进行回滚导致客户端卡死的问题 diff --git a/main.js b/main.js index 4576bea..d1f51a0 100644 --- 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: '首选项...', @@ -153,9 +162,6 @@ let mainMenu = [ 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 @@ -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(); - }); -}); diff --git a/package.json b/package.json index 0e2ba3d..b4a930a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wewechat", - "version": "1.2.3", + "version": "1.2.4", "description": "make weweChat great again!!!", "main": "main.js", "scripts": { @@ -54,7 +54,10 @@ }, "linux": { "icon": "../resource", - "category": "Network", + "category": [ + "Network", + "Chat" + ], "executableName": "wewechat", "target": [ "deb", @@ -125,7 +128,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", diff --git a/src/assets/images/icon-new-message.png b/src/assets/images/icon-new-message.png index 668dea9d4c92bb49f36f132dc3eda8abb8737e44..f838291ce3f7c94a2c12d70706ee4d8448218b17 100644 GIT binary patch literal 676 zcmV;V0$crwP)otf_KnH>!XkNn^xM;Q-g_z+qkHj2-m^rfi>Pdhz z@F5T!aP`!60z}kDz*eQ{UWV(+7T_WfiTYVe&Jkc~TP*EIb(Y=wpi0vgaS zE~=Vx*7CS4xMmmC566)yd7~2x2x(7L*;=lOoIVVhR3WY{{l-KDf;@}wGiSwI7M|zB z&jKfpT!aDJvLJOOh2ianeL*9@Rqn%~^xQI_EuBVRtU4OdTZI7muxEa7uhlI|#h*(- z8fcva@(!`^W3(Z#QDCFMxMQ`sS01d=2iUjGP3`Ex*KkeXA#N^-%s!yc1S_6CcF&jv zayuap5!cM@-P*u85Dz!sc(|#jV?OP%JWqjWF4PSWF4KeSG71(_Kz*h?>htXQQh^Zt z5dwF@IdB=^(54Up>8$1lPpAP?2(Pv1&&MJ{g$X?5lp6wz6!-^L|57l8jt{5+0000< KMNUMnLSTZVIWs%} literal 14871 zcmeI3eQXnD9LH~oyv;CiLEaN;35bLC?)tX&XgkL`*n-{WD9|Pd+^)~Ib8YX|yU}hW zvVcTH4G1hDkZ1rQ;bn>lB5H&LQ6#=$GBqkjM*sm4h&Y4<@wv8ZpLHD%82)^kZTH*r ze80cnbD!s>_s_jlQ#E^d{A zeW_MZ=l9m=%A_dJS&cS>z?$v4Vuz8nI_xIPbe)M|Z8YPcS&M;TImW>;tS zj0WquTF9lGN7J!b%osBprDy}qIvfs~G0`TI0V)hiYeePahKMpLnWQ(5 z2Pi^RlvPoR=(N0ioz$Yb^m?sO`jfh^u$(RwQBv$6MLN#QG;3t&T&AFq_Q);KP-197 zfd(NE1`$<(J~pRMZj@9>X_N*ineHC2Fq{*wH(fjDc*EhGr4_Y&DMXM$n$xNHT4g}j z0!370?p_t^Gn3ONlh!lf*g;$zz^3&iZHc9joFON?SFS7ycvXt}Bq`)h zuCkh5gu1daZB-TPrh0injA&e+bkfDvA(r8N3nsi8%$;&t0myrVl)S$%+3LKP>@&od&+`pkvu_xtCyl-UUiFM zz5&p3q`^sN8WClBU2$bnNQ%N?0k_#n=W0e=iM7U6MiiBg2%ysAh7Cqh403|QYH`?t zc0(}`fWhLh1`Q4%@P=XwaMW4NmO86oNkH^^QG37C9!Y4?_Dd>t@IF%`_I|0Wqar-( z_zyX@0#sDqfYH$cO7fJ&g6I@tCsDR)?X<%c53yTO95L_q? zY)o)r5upNt3#EaL2`(%mR6uZ{G_Wzjg++u42riTcHYT{Rh)@B+h0?&r1Q!+&Dj>K} z8rYcN!XiQi1Q$vJ8{ZXIe&z*05P@&~#o+6G9e)mLhOY+dgo;`(MYT<)sP>fMU9r$FFrntqVgIlJ*B?*kAG||sh-J>JidI#je;o!>u#u?y6!5K zKRbTR7?y2*%C9bMmb<6Dzlpgu><9nYfPdl8{o_1^J(sRh6YqG23@+S!;DYPW`RhGz zcACxaohl6Ny1Xjp_ji{Tb$l@R_4ex}Ew_%Ik?nh{^F|-}taQXjE9cBOy6M+v_A$>= zd9VDtgs}(2Rl9f2b1iZ{aW9@`g~zOAJ7%80Jj?_6y^zxPDYH0R1s2IbsW6BmDT>F=LUt~tg`So`s;7e|F1 zPh8x&-OC;;f4rb#%7!xszwh)78)s&hN1W|16^lr=I%MeR$`7?bXf7 M@+!|;GncIR57Bm2N&o-= diff --git a/src/assets/images/icon.png b/src/assets/images/icon.png index 09dcb38f83f10063bb2cda7c3d4c7af8e9732de0..9d97ba0ca6fb040167204f92accd72ff21659527 100644 GIT binary patch literal 1163 zcmV;61a$j}P)Yxd6uoc8_KXQlj9LkWLU1d!5{s(N0zo&4-CtlAC`*F6sJiM9vs?;mlBaiQU_q=oO zJ@+x%W@FnNpZ;3_j4EXqPt9_sYK{Uk5`a?I0M?~F{S?UB?3m2giT&WSK zAF;6bH2I988Z2f3V#!GlKWUaWz~aDs3`l3!^RRr}S@A%V_ZS}0pt*u+w7pbt&B{*&`2+$!n zEMvZ9p^C$X^yC@0Cpg3~}V)<(FF|Xq7Piy#=CpoM0*_a`e7r9` z^TU4q&0pZu;0i4ro0(r04B>aJ7b^h3Mz8wY#HeaeK=vuLV3!k3yN};cI6qT8ze5ve zeoCr4rfxhc(~J5WG?fsmX=N(zE0EQ?~$%Tk39Bg`@7bi*20)C1ug&-2b;hj1>Xt*&QV4& z3t(M<^efuJSLHmjS?%%WZ}e;XYw5K|J48DZlfkX%Zfl7icOG;Pj(_k%sc@?4X+wW* zLMunSSXeEuFk-WDYpiaQZmya1%2<(hYq^U@XXlNu5Cw!HZqsV5ob4(MbrEmh{#~I> zq~^8f<|x6^&7=AGT>&Wu)m&LYZ(zgdRttt%xc-U3I7g9=HbMRG?K9=;!rSQkhN%b{-EEK9pN%N=8)q z(7?h6y1#sEcD@*YCkzPG;KIUiFQkS9keqs$Nxpo1Ox;am>SRcKqEctu%JkcXGxeC2EyNU59vXs*fZ+>htie0`oZjwUt780eC*97T zd+z_7ncuzV?0lKW8|r5cFBx4zQPl9dT7M%vml~g2Z-)Qhdm}s*o`%F~7ibjaU2S{@ zeYIw`7^-EAb?F7$5?4flfriQH@V{Ey=h%{B8_07CJda zZ}(cNjD&PB&_Gu!Dxh7q3aiLDD(NY18|QLY+MSbWJIhrttefGSR+i&gH_vi(`mp#) z;5Uydh4@B)O*$R4yp}dykMRr>kH>9shfPsi8P4r?GpwDl+pTbhRqKlCLc$u=#-@T~ z;`o6ks&Y)1l_+h*6zK+3GUU}Cr?fj~BQ-s_D-@}}1G8J!S88fjjo*3=aP zOe4^g4pjs*I^nI1&3E^@9Lg z2(5sLMO!^gZqPI{yRZ0aC9J6MvVhOwVe$=|RLQ-@*F`m5h>D=j?}Gz2S(bQrixY4n zCs={o<*+(oO^In)-JW8eXA?e6#7@A$M{j= zVI{*|B_u0|^DzC!a+y=}gGNP$JCgIAZ1P|@nmfN;<+!~UxoUBwPFB{ircuW&&jp~;aJrWVWe zK$fh-)F^!1gHM`F_EEE6iDrA*jr@|kqZ=6&iA9niK=3BPh3A8K2`&T(-Xys2d=M|e zg#f{u1Q(tU;w88cAb6AD!t+7A1Q!AXZxUR1K8Tm#LV(~+f(y?F@e*7J5WGon;rSq5 zf(rqHHwi90AH+*=AwcjZ!G-68cnK~92;L;P@O%(2!G!?9n*W6{{%fx9jly6Ge5f6m?+{Me!Rcs!Un;;QKWcHE33yzp5$m^~Lr3W))S9 zTyy}Otl7L|=-Jz*_s;ojO!r~+ ztz{F6x1Scx>yJlQ!R&rlWogCJyAZYsCdZQwX4b=S@JSPZ=$8`RlO6v zdlxrsJv(fC$?Br29luX=9N6-~j?nI|*DhbVa3Q~^tpYH&Mj)+ysPKFBMSrjdoGRXzGFqG z`T5y*m0jEX4HDj#n0I_f(*Y2CJi9(CD|Bg%Tc)ZqiiyN-{j`__1~wr)nf|J8dJt^5<# C0l-QC diff --git a/src/js/pages/Settings/index.js b/src/js/pages/Settings/index.js index c5d73f7..df6c9da 100644 --- a/src/js/pages/Settings/index.js +++ b/src/js/pages/Settings/index.js @@ -175,10 +175,13 @@ export default class Settings extends Component {

更新记录:

+ v1.2.4 更多的翻译;为darkmode添加过渡动画;删去不必要的代码，去除自动检查更新;修改托盘图标让其更加明显
v1.2.3 增添darkmode，调整优化界面、颜色，以适应darkmode
v1.2.2 添加单例运行，在后台时在启动器中启动会拉到前台而不是再启动一个wewechat，更多的汉化
v1.2.1 汉化
- v1.2.0 Make weweChat great again!!! Fix uos support + v1.2.0 Make weweChat great again!!! Fix uos support
+

+ Riceneeder: 本人不会React且较为业余，此项目除重大bug外不再更新，有能力者可提PR或联系星火的shenmo参与项目

From 8d2fbd1773aa5e6270e5f3049c6f47ba88a50341 Mon Sep 17 00:00:00 2001 From: Riceneeder <845541909@qq.com> Date: Sat, 10 Sep 2022 17:59:27 +0800 Subject: [PATCH 2/2] fix package.json --- package.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/package.json b/package.json index b4a930a..dbbc920 100644 --- a/package.json +++ b/package.json @@ -54,10 +54,7 @@ }, "linux": { "icon": "../resource", - "category": [ - "Network", - "Chat" - ], + "category": "Chat", "executableName": "wewechat", "target": [ "deb",