From f5f1f9659510854f1408b6503e92170a90c5b8a0 Mon Sep 17 00:00:00 2001 From: Amine Mouafik Date: Thu, 19 Sep 2019 15:09:48 +0700 Subject: 5.3.4-beta.1 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4ce2893a3..5af53d3cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "ferdi", - "version": "5.3.0", + "version": "5.3.4-beta.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index a90ea1405..061eb7e6b 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "ferdi", "productName": "Ferdi", "appId": "com.kytwb.ferdi", - "version": "5.3.3", + "version": "5.3.4-beta.1", "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.", "copyright": "kytwb", "main": "index.js", -- cgit v1.2.3-54-g00ecf From d01c4a9b7f4ffa511358bbdbf5221c64a68e6713 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Thu, 19 Sep 2019 08:18:56 +0000 Subject: docs: update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f9bf75af4..0a029751c 100644 --- a/README.md +++ b/README.md @@ -81,7 +81,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d - + -- cgit v1.2.3-54-g00ecf From 007388718f02f8c711e6890e54339b170b6df55d Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Thu, 19 Sep 2019 08:18:57 +0000 Subject: docs: update .all-contributorsrc --- .all-contributorsrc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 724b50b78..9a4c4e0ae 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -20,7 +20,8 @@ "design", "doc", "ideas", - "translation" + "translation", + "example" ] }, { -- cgit v1.2.3-54-g00ecf From d084d95db5e5196f63b31fe0ba166ae84cd61614 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Thu, 19 Sep 2019 08:27:22 +0000 Subject: docs: update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0a029751c..270bc673b 100644 --- a/README.md +++ b/README.md @@ -83,7 +83,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d - + -- cgit v1.2.3-54-g00ecf From abadb6ead102f588bd22745a9af07c06ca7dcaa3 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Thu, 19 Sep 2019 08:27:23 +0000 Subject: docs: update .all-contributorsrc --- .all-contributorsrc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 9a4c4e0ae..281192086 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -54,7 +54,8 @@ "maintenance", "platform", "projectManagement", - "review" + "review", + "infra" ] }, { -- cgit v1.2.3-54-g00ecf From 45acc8bf0d72c4e7e4e6664b12a3a1026f7fb998 Mon Sep 17 00:00:00 2001 From: Amine Mouafik Date: Thu, 19 Sep 2019 15:44:40 +0700 Subject: Update @vantezzen as a contributor --- .all-contributorsrc | 6 +++++- README.md | 7 +++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 281192086..889f8292f 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -21,7 +21,11 @@ "doc", "ideas", "translation", - "example" + "example", + "bug", + "content", + "infra", + "userTesting" ] }, { diff --git a/README.md b/README.md index 270bc673b..d9081e270 100644 --- a/README.md +++ b/README.md @@ -78,10 +78,11 @@ Deliverables will be available in the ./out folder. Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)): - + +
Bennett
Bennett
πŸ’» 🎨 πŸ“– πŸ€” 🌍		Bennett
Bennett
πŸ’» 🎨 πŸ“– πŸ€” 🌍 πŸ’‘		 Stefan Malzner
Stefan Malzner
πŸ’» πŸ–‹ 🎨 πŸ“– πŸ€” πŸš‡ πŸ“† ⚠️ 🌍		 Amine Mouafik
Amine Mouafik
πŸ’¬ πŸ’» πŸ“– πŸ€” 🚧 πŸ“¦ πŸ“† πŸ‘€		 ZeroCool
ZeroCool
πŸ’» πŸ€”
Bennett
Bennett
πŸ’» 🎨 πŸ“– πŸ€” 🌍 πŸ’‘		 Stefan Malzner
Stefan Malzner
πŸ’» πŸ–‹ 🎨 πŸ“– πŸ€” πŸš‡ πŸ“† ⚠️ 🌍		Amine Mouafik
Amine Mouafik
πŸ’¬ πŸ’» πŸ“– πŸ€” 🚧 πŸ“¦ πŸ“† πŸ‘€		Amine Mouafik
Amine Mouafik
πŸ’¬ πŸ’» πŸ“– πŸ€” 🚧 πŸ“¦ πŸ“† πŸ‘€ πŸš‡		 ZeroCool
ZeroCool
πŸ’» πŸ€”		 rseitbekov
rseitbekov
πŸ’»		 Peter Bittner
Peter Bittner
πŸ€”
- + @@ -98,6 +99,8 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
Bennett
Bennett
πŸ’» 🎨 πŸ“– πŸ€” 🌍 πŸ’‘		Bennett
Bennett
πŸ’» 🎨 πŸ“– πŸ€” 🌍 πŸ’‘ πŸ› πŸ–‹ πŸš‡ πŸ““		 Stefan Malzner
Stefan Malzner
πŸ’» πŸ–‹ 🎨 πŸ“– πŸ€” πŸš‡ πŸ“† ⚠️ 🌍		 Amine Mouafik
Amine Mouafik
πŸ’¬ πŸ’» πŸ“– πŸ€” 🚧 πŸ“¦ πŸ“† πŸ‘€ πŸš‡		 ZeroCool
ZeroCool
πŸ’» πŸ€”
+ + -- cgit v1.2.3-54-g00ecf From 4ab432fef0e458cf57566570e1a88b2d4bfa4b66 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Thu, 19 Sep 2019 08:45:37 +0000 Subject: docs: update README.md --- README.md | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index d9081e270..54e195f9b 100644 --- a/README.md +++ b/README.md @@ -78,8 +78,7 @@ Deliverables will be available in the ./out folder. Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)): - - + @@ -87,7 +86,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d - + @@ -99,8 +98,6 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
Bennett
Bennett
πŸ’» 🎨 πŸ“– πŸ€” 🌍 πŸ’‘ πŸ› πŸ–‹ πŸš‡ πŸ““		Amine Mouafik
Amine Mouafik
πŸ’¬ πŸ’» πŸ“– πŸ€” 🚧 πŸ“¦ πŸ“† πŸ‘€ πŸš‡		 ZeroCool
ZeroCool
πŸ’» πŸ€”		 rseitbekov
rseitbekov
πŸ’»		Peter Bittner
Peter Bittner
πŸ€”		Peter Bittner
Peter Bittner
πŸ€” πŸ›		 Justus Saul
Justus Saul
πŸ› πŸ€”
- - -- cgit v1.2.3-54-g00ecf From 8bcaf1ff40783d0414c32396e579dc5fab29277b Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Thu, 19 Sep 2019 08:45:38 +0000 Subject: docs: update .all-contributorsrc --- .all-contributorsrc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 889f8292f..f6f55168e 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -87,7 +87,8 @@ "avatar_url": "https://avatars2.githubusercontent.com/u/665072?v=4", "profile": "https://djangogigs.com/developers/peter-bittner/", "contributions": [ - "ideas" + "ideas", + "bug" ] }, { -- cgit v1.2.3-54-g00ecf From e4b948ab5aeff2ce68ffd23f5e17d2029a364870 Mon Sep 17 00:00:00 2001 From: Amine Mouafik Date: Thu, 19 Sep 2019 15:50:22 +0700 Subject: Update @vantezzen as a contributor --- .all-contributorsrc | 5 ++++- README.md | 7 +++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index f6f55168e..b81d7e88c 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -25,7 +25,10 @@ "bug", "content", "infra", - "userTesting" + "userTesting", + "question", + "projectManagement", + "review" ] }, { diff --git a/README.md b/README.md index 54e195f9b..5c4782b1c 100644 --- a/README.md +++ b/README.md @@ -78,10 +78,11 @@ Deliverables will be available in the ./out folder. Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)): - + + - + @@ -98,6 +99,8 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
Bennett
Bennett
πŸ’» 🎨 πŸ“– πŸ€” 🌍 πŸ’‘ πŸ› πŸ–‹ πŸš‡ πŸ““		Bennett
Bennett
πŸ’» 🎨 πŸ“– πŸ€” 🌍 πŸ’‘ πŸ› πŸ–‹ πŸš‡ πŸ““ πŸ’¬ πŸ“† πŸ‘€		 Stefan Malzner
Stefan Malzner
πŸ’» πŸ–‹ 🎨 πŸ“– πŸ€” πŸš‡ πŸ“† ⚠️ 🌍		 Amine Mouafik
Amine Mouafik
πŸ’¬ πŸ’» πŸ“– πŸ€” 🚧 πŸ“¦ πŸ“† πŸ‘€ πŸš‡		 ZeroCool
ZeroCool
πŸ’» πŸ€”
+ + -- cgit v1.2.3-54-g00ecf From 81ae489640234799cf0a4ff3a02d0057db4f1118 Mon Sep 17 00:00:00 2001 From: Amine Mouafik Date: Thu, 19 Sep 2019 15:57:34 +0700 Subject: Review all-contributors settings and re-render --- .all-contributorsrc | 4 ++-- README.md | 24 ++++++++++++------------ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index b81d7e88c..f5f5e7843 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -6,7 +6,7 @@ "files": [ "README.md" ], - "imageSize": 100, + "imageSize": 40, "commit": true, "commitConvention": "none", "contributors": [ @@ -150,5 +150,5 @@ ] } ], - "contributorsPerLine": 7 + "contributorsPerLine": 6 } diff --git a/README.md b/README.md index 5c4782b1c..cddb525d4 100644 --- a/README.md +++ b/README.md @@ -82,20 +82,20 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d - - - - - - - + + + + + + - - - - - + + + + + +
Bennett
Bennett
πŸ’» 🎨 πŸ“– πŸ€” 🌍 πŸ’‘ πŸ› πŸ–‹ πŸš‡ πŸ““ πŸ’¬ πŸ“† πŸ‘€		Stefan Malzner
Stefan Malzner
πŸ’» πŸ–‹ 🎨 πŸ“– πŸ€” πŸš‡ πŸ“† ⚠️ 🌍		Amine Mouafik
Amine Mouafik
πŸ’¬ πŸ’» πŸ“– πŸ€” 🚧 πŸ“¦ πŸ“† πŸ‘€ πŸš‡		ZeroCool
ZeroCool
πŸ’» πŸ€”		rseitbekov
rseitbekov
πŸ’»		Peter Bittner
Peter Bittner
πŸ€” πŸ›		Justus Saul
Justus Saul
πŸ› πŸ€”		Bennett
Bennett
πŸ’» 🎨 πŸ“– πŸ€” 🌍 πŸ’‘ πŸ› πŸ–‹ πŸš‡ πŸ““ πŸ’¬ πŸ“† πŸ‘€		Stefan Malzner
Stefan Malzner
πŸ’» πŸ–‹ 🎨 πŸ“– πŸ€” πŸš‡ πŸ“† ⚠️ 🌍		Amine Mouafik
Amine Mouafik
πŸ’¬ πŸ’» πŸ“– πŸ€” 🚧 πŸ“¦ πŸ“† πŸ‘€ πŸš‡		ZeroCool
ZeroCool
πŸ’» πŸ€”		rseitbekov
rseitbekov
πŸ’»		Peter Bittner
Peter Bittner
πŸ€” πŸ›
igreil
igreil
πŸ€”		Marco Lopes
Marco Lopes
πŸ€”		dayzlun
dayzlun
πŸ›		Tobias GΓΌnther
Tobias GΓΌnther
πŸ€”		AGCaesar
AGCaesar
πŸ“¦		Justus Saul
Justus Saul
πŸ› πŸ€”		igreil
igreil
πŸ€”		Marco Lopes
Marco Lopes
πŸ€”		dayzlun
dayzlun
πŸ›		Tobias GΓΌnther
Tobias GΓΌnther
πŸ€”		AGCaesar
AGCaesar
πŸ“¦
-- cgit v1.2.3-54-g00ecf From 7566ccd18fae69912c759df0701d1398235a7426 Mon Sep 17 00:00:00 2001 From: vantezzen Date: Thu, 19 Sep 2019 11:07:56 +0200 Subject: Parse unread messages count as integer before sending to host This will correct errors that recipes may introduce, e.g. by sending a String instead of an integer (as seen on old versions of the ProtonMail recipe) --- src/webview/lib/RecipeWebview.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/webview/lib/RecipeWebview.js b/src/webview/lib/RecipeWebview.js index be29142af..cae6c7dc4 100644 --- a/src/webview/lib/RecipeWebview.js +++ b/src/webview/lib/RecipeWebview.js @@ -39,9 +39,15 @@ class RecipeWebview { if (this.countCache.direct === direct && this.countCache.indirect === indirect) return; + // Parse number to integer + // This will correct errors that recipes may introduce, e.g. + // by sending a String instead of an integer + const directInt = parseInt(direct); + const indirectInt = parseInt(indirect); + const count = { - direct: direct > 0 ? direct : 0, - indirect: indirect > 0 ? indirect : 0, + direct: directInt > 0 ? directInt : 0, + indirect: indirectInt > 0 ? indirectInt : 0, }; ipcRenderer.sendToHost('messages', count); -- cgit v1.2.3-54-g00ecf From fefd60add21e2f1b3cf7d5cbb5e96125126a4b35 Mon Sep 17 00:00:00 2001 From: vantezzen Date: Thu, 19 Sep 2019 11:11:05 +0200 Subject: Fix lint --- src/webview/lib/RecipeWebview.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/webview/lib/RecipeWebview.js b/src/webview/lib/RecipeWebview.js index cae6c7dc4..877e45e35 100644 --- a/src/webview/lib/RecipeWebview.js +++ b/src/webview/lib/RecipeWebview.js @@ -42,8 +42,8 @@ class RecipeWebview { // Parse number to integer // This will correct errors that recipes may introduce, e.g. // by sending a String instead of an integer - const directInt = parseInt(direct); - const indirectInt = parseInt(indirect); + const directInt = parseInt(direct, 10); + const indirectInt = parseInt(indirect, 10); const count = { direct: directInt > 0 ? directInt : 0, -- cgit v1.2.3-54-g00ecf From 8d71adb82425f13e0dab9a6aac87bbd78affb865 Mon Sep 17 00:00:00 2001 From: Amine Mouafik Date: Thu, 19 Sep 2019 16:29:48 +0700 Subject: #53 Remove Travis artifacts upload to S3 --- .travis.yml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4cc941eff..63d106195 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,19 +21,6 @@ script: - npm run test - travis_wait 30 npm run build cache: npm -deploy: - provider: s3 - access_key_id: AKIAQ5BBD2PS3SMVP3EZ - secret_access_key: - secure: E57KoS2chEeYbW3LNXDpXIUAHWRV0IXSu6QxondJqXTK+Nh486+RaOx2Ln8xwjsN57rgE1nJkRrWzOzTGXjU1AEWWk4BLXeKrd/1nAK0akw7BYB7+IOPX15+n+PxO057oHyhzpf36iPhmXc3xz6mI8qvF6g5XIHGlTTs/+W6Va+OuhlXlotT5i4bRhsszpn7Mjd0fc5pVergFTu279eQtPkKEGfAyX1pAZJ5OObbsUckpFYTw2UG26qvAGZhzN6NdzNItKjDLzTw6WN1AJ6PZUu78xQRCbHJ0D+2BZSw+yvVx4UxC+ifJuouyzSlsRgRoOI4zNHDzOqDbiZ0gxbq7Eh0M+mFqMMq9U4FTZw7EjUuF3+929fLiyrdC+MD5+S98O3xZMdNl8C1rBUunWo/0nLMLROElZ/Zq9C7+Hfzz3HsN6+YHcvkKCBibHUmQB970090NspVy4fFCjze3XyJGDVgYMSB7dJ+zjawkZ3irEsA9g1h9V9GXiwHQ5Anuek1PtLHlwfNg9rOZDJQyaaZ96D6F1jYPw+JSDhiSvQgjeLbCPVdkp/UPWu8Aiks6p9oqMheKmd6J647H+/wrjU2GDbZiBOv0bSlPnaoBnapM3yVUSX8nkfVBpbewvIC+U9duzq7rZTVEwRWS3AIh1Z6aLYpGss9iZHE7vxJUKWVpyk= - bucket: ferdi-travis - region: ap-southeast-1 - local_dir: out - upload-dir: "$TRAVIS_BUILD_NUMBER" - skip_cleanup: true - acl: public_read - on: - tags: true env: global: -- cgit v1.2.3-54-g00ecf