From b5fb5d4a83ca4340c8858433e1b70f180665b97c Mon Sep 17 00:00:00 2001 From: Amine Mouafik Date: Fri, 17 Apr 2020 21:05:38 +0100 Subject: Remove svg size check preventing repackaging --- scripts/api/package.js | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/scripts/api/package.js b/scripts/api/package.js index 2d265f6..9c3ede5 100644 --- a/scripts/api/package.js +++ b/scripts/api/package.js @@ -73,24 +73,10 @@ For more information about recipe icons visit https://github.com/getferdi/recipe // Check that icons have the right dimensions const pngSize = sizeOf(pngIcon); const pngHasRightSize = pngSize.width === 1024 && pngSize.height === 1024; - const svgSize = sizeOf(svgIcon); - const svgHasRightSize = svgSize.width === 1024 && svgSize.height === 1024; - if (!pngHasRightSize && !svgHasRightSize) { - console.log(`⚠️ Could not add your recipe: Icons require to be 1024x1024px in size. -Both your "icon.png" and "icon.svg" don't seem to have the right size. -You can use software like Photoshop, GIMP or Photopea (https://www.photopea.com/) to resize your icons. -For more information about recipe icons visit https://github.com/getferdi/recipes/blob/master/docs/integration.md#icons`); - return; - } else if (!pngHasRightSize) { + if (!pngHasRightSize) { console.log(`⚠️ Could not add your recipe: "icon.png" should be to be 1024x1024px in size. Please make sure that your "icon.png" has the right size of 1024x1024px in size. You can use software like Photoshop, GIMP or Photopea (https://www.photopea.com/) to resize your icons. -For more information about recipe icons visit https://github.com/getferdi/recipes/blob/master/docs/integration.md#icons`); - return; - } else if (!svgHasRightSize) { - console.log(`⚠️ Could not add your recipe: "icon.svg" should be to be 1024x1024px in size. -Please make sure that your "icon.svg" has the right size of 1024x1024px in size. -You can use software like Photoshop, GIMP or Photopea (https://www.photopea.com/) to resize your icons. For more information about recipe icons visit https://github.com/getferdi/recipes/blob/master/docs/integration.md#icons`); return; } -- cgit v1.2.3-70-g09d2 From 554a9af6b5248d0ec66264c1c0c51e3f26f47642 Mon Sep 17 00:00:00 2001 From: Amine Mouafik Date: Sun, 19 Apr 2020 16:40:55 +0000 Subject: Fix user agents override and bump minor versions --- uncompressed/jira/index.js | 15 +++++++++------ uncompressed/jira/package.json | 2 +- uncompressed/kaizala/index.js | 15 +++++++++------ uncompressed/kaizala/package.json | 2 +- uncompressed/messenger/index.js | 15 +++++++++------ uncompressed/messenger/package.json | 2 +- uncompressed/msteams/index.js | 2 +- uncompressed/msteams/package.json | 2 +- uncompressed/skype/index.js | 15 +++++++++------ uncompressed/skype/package.json | 2 +- uncompressed/steamchat/index.js | 18 +++++++++++------- uncompressed/steamchat/package.json | 2 +- uncompressed/whatsapp/index.js | 15 +++++++++------ uncompressed/whatsapp/package.json | 2 +- 14 files changed, 64 insertions(+), 45 deletions(-) diff --git a/uncompressed/jira/index.js b/uncompressed/jira/index.js index 9edb279..0431300 100644 --- a/uncompressed/jira/index.js +++ b/uncompressed/jira/index.js @@ -1,8 +1,11 @@ "use strict"; -module.exports = Franz => class Jira extends Franz { - overrideUserAgent() { - return window.navigator.userAgent.replace(/(Franz|Electron)([^\s]+\s)/g, ''); - } - -}; \ No newline at end of file +module.exports = (Franz) => + class Jira extends Franz { + overrideUserAgent() { + return window.navigator.userAgent.replace( + /(Ferdi|Electron)\/\S+ \([^)]+\)/g, + "" + ); + } + }; diff --git a/uncompressed/jira/package.json b/uncompressed/jira/package.json index be90dbb..6a1aee2 100644 --- a/uncompressed/jira/package.json +++ b/uncompressed/jira/package.json @@ -1,7 +1,7 @@ { "id": "jira", "name": "Jira", - "version": "1.0.1", + "version": "1.1.0", "description": "Jira", "main": "index.js", "author": "Leonardo Bragatti and The Ferdi Team ", diff --git a/uncompressed/kaizala/index.js b/uncompressed/kaizala/index.js index dd10055..f9b8099 100644 --- a/uncompressed/kaizala/index.js +++ b/uncompressed/kaizala/index.js @@ -1,8 +1,11 @@ "use strict"; -module.exports = Franz => class Messenger extends Franz { - overrideUserAgent() { - return window.navigator.userAgent.replace(/(Franz|Electron)([^\s]+\s)/g, ''); - } - -}; \ No newline at end of file +module.exports = (Franz) => + class Messenger extends Franz { + overrideUserAgent() { + return window.navigator.userAgent.replace( + /(Ferdi|Electron)\/\S+ \([^)]+\)/g, + "" + ); + } + }; diff --git a/uncompressed/kaizala/package.json b/uncompressed/kaizala/package.json index 598ef74..2867216 100644 --- a/uncompressed/kaizala/package.json +++ b/uncompressed/kaizala/package.json @@ -1,7 +1,7 @@ { "id": "kaizala", "name": "Microsoft Kaizala", - "version": "1.0.0", + "version": "1.1.0", "description": "Microsoft Kaizala", "main": "index.js", "author": "Stefan Malzner ", diff --git a/uncompressed/messenger/index.js b/uncompressed/messenger/index.js index dd10055..f9b8099 100644 --- a/uncompressed/messenger/index.js +++ b/uncompressed/messenger/index.js @@ -1,8 +1,11 @@ "use strict"; -module.exports = Franz => class Messenger extends Franz { - overrideUserAgent() { - return window.navigator.userAgent.replace(/(Franz|Electron)([^\s]+\s)/g, ''); - } - -}; \ No newline at end of file +module.exports = (Franz) => + class Messenger extends Franz { + overrideUserAgent() { + return window.navigator.userAgent.replace( + /(Ferdi|Electron)\/\S+ \([^)]+\)/g, + "" + ); + } + }; diff --git a/uncompressed/messenger/package.json b/uncompressed/messenger/package.json index 30cbbdf..b26d37d 100644 --- a/uncompressed/messenger/package.json +++ b/uncompressed/messenger/package.json @@ -1,7 +1,7 @@ { "id": "messenger", "name": "Messenger", - "version": "1.0.8", + "version": "1.1.0", "description": "Facebook Messenger", "main": "index.js", "author": "Stefan Malzner ", diff --git a/uncompressed/msteams/index.js b/uncompressed/msteams/index.js index 0afc5c9..b85bf33 100644 --- a/uncompressed/msteams/index.js +++ b/uncompressed/msteams/index.js @@ -2,7 +2,7 @@ module.exports = Franz => class MicrosoftTeams extends Franz { overrideUserAgent() { - return window.navigator.userAgent.replace(/(Franz|Electron)([^\s]+\s)/g, '').replace(/(Chrome\/)([^ ]*)/g, '$163.0.3239.84'); + return window.navigator.userAgent.replace(/(Ferdi|Electron)\/\S+ \([^)]+\)/g, '').replace(/(Chrome\/)([^ ]*)/g, '$163.0.3239.84'); } }; \ No newline at end of file diff --git a/uncompressed/msteams/package.json b/uncompressed/msteams/package.json index 037b3c4..85993a8 100644 --- a/uncompressed/msteams/package.json +++ b/uncompressed/msteams/package.json @@ -1,7 +1,7 @@ { "id": "msteams", "name": "Microsoft Teams", - "version": "1.1.0", + "version": "1.2.0", "description": "Microsoft Teams", "main": "index.js", "author": "Stefan Malzner ", diff --git a/uncompressed/skype/index.js b/uncompressed/skype/index.js index dd10055..f9b8099 100644 --- a/uncompressed/skype/index.js +++ b/uncompressed/skype/index.js @@ -1,8 +1,11 @@ "use strict"; -module.exports = Franz => class Messenger extends Franz { - overrideUserAgent() { - return window.navigator.userAgent.replace(/(Franz|Electron)([^\s]+\s)/g, ''); - } - -}; \ No newline at end of file +module.exports = (Franz) => + class Messenger extends Franz { + overrideUserAgent() { + return window.navigator.userAgent.replace( + /(Ferdi|Electron)\/\S+ \([^)]+\)/g, + "" + ); + } + }; diff --git a/uncompressed/skype/package.json b/uncompressed/skype/package.json index 4ca6899..b61e4a3 100644 --- a/uncompressed/skype/package.json +++ b/uncompressed/skype/package.json @@ -1,7 +1,7 @@ { "id": "skype", "name": "Skype", - "version": "1.2.0", + "version": "1.3.0", "description": "Skype", "main": "index.js", "author": "Stefan Malzner ", diff --git a/uncompressed/steamchat/index.js b/uncompressed/steamchat/index.js index 877a4e1..08b28c6 100644 --- a/uncompressed/steamchat/index.js +++ b/uncompressed/steamchat/index.js @@ -1,8 +1,12 @@ -'use strict'; +"use strict"; -module.exports = Franz => class SteamChat extends Franz { - overrideUserAgent() { - return window.navigator.userAgent.replace(/(Franz|Electron)([^\s]+\s)/g, ''); - } -}; -//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInN0ZWFtY2hhdC9pbmRleC5qcyJdLCJuYW1lcyI6WyJtb2R1bGUiLCJleHBvcnRzIiwiRnJhbnoiLCJTdGVhbUNoYXQiLCJvdmVycmlkZVVzZXJBZ2VudCIsIndpbmRvdyIsIm5hdmlnYXRvciIsInVzZXJBZ2VudCIsInJlcGxhY2UiXSwibWFwcGluZ3MiOiI7O0FBQUFBLE9BQU9DLE9BQVAsR0FBaUJDLFNBQVMsTUFBTUMsU0FBTixTQUF3QkQsS0FBeEIsQ0FBOEI7QUFDdERFLHNCQUFvQjtBQUNsQixXQUFPQyxPQUFPQyxTQUFQLENBQWlCQyxTQUFqQixDQUEyQkMsT0FBM0IsQ0FBbUMsNkJBQW5DLEVBQWtFLEVBQWxFLENBQVA7QUFDRDtBQUhxRCxDQUF4RCIsImZpbGUiOiJzdGVhbWNoYXQvaW5kZXguanMiLCJzb3VyY2VzQ29udGVudCI6WyJtb2R1bGUuZXhwb3J0cyA9IEZyYW56ID0+IGNsYXNzIFN0ZWFtQ2hhdCBleHRlbmRzIEZyYW56IHtcbiAgb3ZlcnJpZGVVc2VyQWdlbnQoKSB7XG4gICAgcmV0dXJuIHdpbmRvdy5uYXZpZ2F0b3IudXNlckFnZW50LnJlcGxhY2UoLyhGcmFuenxFbGVjdHJvbikoW15cXHNdK1xccykvZywgJycpO1xuICB9XG59O1xuIl19 \ No newline at end of file +module.exports = (Franz) => + class SteamChat extends Franz { + overrideUserAgent() { + return window.navigator.userAgent.replace( + /(Ferdi|Electron)\/\S+ \([^)]+\)/g, + "" + ); + } + }; +//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInN0ZWFtY2hhdC9pbmRleC5qcyJdLCJuYW1lcyI6WyJtb2R1bGUiLCJleHBvcnRzIiwiRnJhbnoiLCJTdGVhbUNoYXQiLCJvdmVycmlkZVVzZXJBZ2VudCIsIndpbmRvdyIsIm5hdmlnYXRvciIsInVzZXJBZ2VudCIsInJlcGxhY2UiXSwibWFwcGluZ3MiOiI7O0FBQUFBLE9BQU9DLE9BQVAsR0FBaUJDLFNBQVMsTUFBTUMsU0FBTixTQUF3QkQsS0FBeEIsQ0FBOEI7QUFDdERFLHNCQUFvQjtBQUNsQixXQUFPQyxPQUFPQyxTQUFQLENBQWlCQyxTQUFqQixDQUEyQkMsT0FBM0IsQ0FBbUMsNkJBQW5DLEVBQWtFLEVBQWxFLENBQVA7QUFDRDtBQUhxRCxDQUF4RCIsImZpbGUiOiJzdGVhbWNoYXQvaW5kZXguanMiLCJzb3VyY2VzQ29udGVudCI6WyJtb2R1bGUuZXhwb3J0cyA9IEZyYW56ID0+IGNsYXNzIFN0ZWFtQ2hhdCBleHRlbmRzIEZyYW56IHtcbiAgb3ZlcnJpZGVVc2VyQWdlbnQoKSB7XG4gICAgcmV0dXJuIHdpbmRvdy5uYXZpZ2F0b3IudXNlckFnZW50LnJlcGxhY2UoLyhGcmFuenxFbGVjdHJvbikoW15cXHNdK1xccykvZywgJycpO1xuICB9XG59O1xuIl19 diff --git a/uncompressed/steamchat/package.json b/uncompressed/steamchat/package.json index 30ce277..2563a61 100644 --- a/uncompressed/steamchat/package.json +++ b/uncompressed/steamchat/package.json @@ -1,7 +1,7 @@ { "id": "steamchat", "name": "SteamChat", - "version": "1.0.1", + "version": "1.1.0", "description": "Steam Chat", "main": "index.js", "author": "Kevin Oestmark ", diff --git a/uncompressed/whatsapp/index.js b/uncompressed/whatsapp/index.js index dd10055..f9b8099 100644 --- a/uncompressed/whatsapp/index.js +++ b/uncompressed/whatsapp/index.js @@ -1,8 +1,11 @@ "use strict"; -module.exports = Franz => class Messenger extends Franz { - overrideUserAgent() { - return window.navigator.userAgent.replace(/(Franz|Electron)([^\s]+\s)/g, ''); - } - -}; \ No newline at end of file +module.exports = (Franz) => + class Messenger extends Franz { + overrideUserAgent() { + return window.navigator.userAgent.replace( + /(Ferdi|Electron)\/\S+ \([^)]+\)/g, + "" + ); + } + }; diff --git a/uncompressed/whatsapp/package.json b/uncompressed/whatsapp/package.json index e5ef63a..3eccc69 100644 --- a/uncompressed/whatsapp/package.json +++ b/uncompressed/whatsapp/package.json @@ -1,7 +1,7 @@ { "id": "whatsapp", "name": "WhatsApp", - "version": "1.0.20", + "version": "1.1.0", "description": "WhatsApp", "main": "index.js", "author": "Stefan Malzner ", -- cgit v1.2.3-70-g09d2 From 7b3a61a07ae81afd5581ace4323b61fba163e522 Mon Sep 17 00:00:00 2001 From: Amine Mouafik Date: Sun, 19 Apr 2020 16:47:50 +0000 Subject: Repackage updates recipes --- all.json | 20 ++++++++++---------- archives/jira.tar.gz | Bin 31777 -> 31776 bytes archives/kaizala.tar.gz | Bin 5047 -> 66378 bytes archives/messenger.tar.gz | Bin 149566 -> 149354 bytes archives/msteams.tar.gz | Bin 12009 -> 12654 bytes archives/skype.tar.gz | Bin 73401 -> 73228 bytes archives/steamchat.tar.gz | Bin 78609 -> 78646 bytes archives/whatsapp.tar.gz | Bin 141745 -> 183468 bytes 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/all.json b/all.json index 6b153b3..f658631 100644 --- a/all.json +++ b/all.json @@ -385,11 +385,11 @@ } }, { - "author": "Amine Mouafik ", + "author": "Stefan Malzner ", "featured": false, "id": "instagram", - "name": "Instagram", - "version": "1.0.0", + "name": "instagram", + "version": "2.0.2", "icons": { "png": "https://cdn.jsdelivr.net/gh/getferdi/recipes/uncompressed/instagram/icon.png", "svg": "https://cdn.jsdelivr.net/gh/getferdi/recipes/uncompressed/instagram/icon.svg" @@ -411,7 +411,7 @@ "featured": false, "id": "jira", "name": "Jira", - "version": "1.0.1", + "version": "1.1.0", "icons": { "png": "https://cdn.jsdelivr.net/gh/getferdi/recipes/uncompressed/jira/icon.png", "svg": "https://cdn.jsdelivr.net/gh/getferdi/recipes/uncompressed/jira/icon.svg" @@ -433,7 +433,7 @@ "featured": false, "id": "kaizala", "name": "Microsoft Kaizala", - "version": "1.0.0", + "version": "1.1.0", "icons": { "png": "https://cdn.jsdelivr.net/gh/getferdi/recipes/uncompressed/kaizala/icon.png", "svg": "https://cdn.jsdelivr.net/gh/getferdi/recipes/uncompressed/kaizala/icon.svg" @@ -488,7 +488,7 @@ "featured": false, "id": "messenger", "name": "Messenger", - "version": "1.0.8", + "version": "1.1.0", "icons": { "png": "https://cdn.jsdelivr.net/gh/getferdi/recipes/uncompressed/messenger/icon.png", "svg": "https://cdn.jsdelivr.net/gh/getferdi/recipes/uncompressed/messenger/icon.svg" @@ -510,7 +510,7 @@ "featured": false, "id": "msteams", "name": "Microsoft Teams", - "version": "1.1.0", + "version": "1.2.0", "icons": { "png": "https://cdn.jsdelivr.net/gh/getferdi/recipes/uncompressed/msteams/icon.png", "svg": "https://cdn.jsdelivr.net/gh/getferdi/recipes/uncompressed/msteams/icon.svg" @@ -730,7 +730,7 @@ "featured": false, "id": "skype", "name": "Skype", - "version": "1.2.0", + "version": "1.3.0", "icons": { "png": "https://cdn.jsdelivr.net/gh/getferdi/recipes/uncompressed/skype/icon.png", "svg": "https://cdn.jsdelivr.net/gh/getferdi/recipes/uncompressed/skype/icon.svg" @@ -763,7 +763,7 @@ "featured": false, "id": "steamchat", "name": "SteamChat", - "version": "1.0.1", + "version": "1.1.0", "icons": { "png": "https://cdn.jsdelivr.net/gh/getferdi/recipes/uncompressed/steamchat/icon.png", "svg": "https://cdn.jsdelivr.net/gh/getferdi/recipes/uncompressed/steamchat/icon.svg" @@ -972,7 +972,7 @@ "featured": false, "id": "whatsapp", "name": "WhatsApp", - "version": "1.0.20", + "version": "1.1.0", "icons": { "png": "https://cdn.jsdelivr.net/gh/getferdi/recipes/uncompressed/whatsapp/icon.png", "svg": "https://cdn.jsdelivr.net/gh/getferdi/recipes/uncompressed/whatsapp/icon.svg" diff --git a/archives/jira.tar.gz b/archives/jira.tar.gz index 4d81f3f..4646271 100644 Binary files a/archives/jira.tar.gz and b/archives/jira.tar.gz differ diff --git a/archives/kaizala.tar.gz b/archives/kaizala.tar.gz index d25b27b..c353f9f 100644 Binary files a/archives/kaizala.tar.gz and b/archives/kaizala.tar.gz differ diff --git a/archives/messenger.tar.gz b/archives/messenger.tar.gz index e7f8eef..7094f40 100644 Binary files a/archives/messenger.tar.gz and b/archives/messenger.tar.gz differ diff --git a/archives/msteams.tar.gz b/archives/msteams.tar.gz index 9acdb64..6ecac06 100644 Binary files a/archives/msteams.tar.gz and b/archives/msteams.tar.gz differ diff --git a/archives/skype.tar.gz b/archives/skype.tar.gz index 2a7a34f..5d316d0 100644 Binary files a/archives/skype.tar.gz and b/archives/skype.tar.gz differ diff --git a/archives/steamchat.tar.gz b/archives/steamchat.tar.gz index 8701127..294faa1 100644 Binary files a/archives/steamchat.tar.gz and b/archives/steamchat.tar.gz differ diff --git a/archives/whatsapp.tar.gz b/archives/whatsapp.tar.gz index 2ba5712..0a78ed7 100644 Binary files a/archives/whatsapp.tar.gz and b/archives/whatsapp.tar.gz differ -- cgit v1.2.3-70-g09d2 From 2f0474e0d1d87fec5f21470c1b01b2ca37d3d7cd Mon Sep 17 00:00:00 2001 From: Amine Mouafik Date: Sun, 19 Apr 2020 16:48:07 +0000 Subject: Review wrongly sized recipes png icons --- uncompressed/kaizala/icon.png | Bin 2567 -> 80000 bytes uncompressed/msteams/icon.png | Bin 14804 -> 28663 bytes uncompressed/whatsapp/icon.png | Bin 66312 -> 120797 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/uncompressed/kaizala/icon.png b/uncompressed/kaizala/icon.png index 34817f9..895b808 100644 Binary files a/uncompressed/kaizala/icon.png and b/uncompressed/kaizala/icon.png differ diff --git a/uncompressed/msteams/icon.png b/uncompressed/msteams/icon.png index 9e1f0e8..fc23e58 100644 Binary files a/uncompressed/msteams/icon.png and b/uncompressed/msteams/icon.png differ diff --git a/uncompressed/whatsapp/icon.png b/uncompressed/whatsapp/icon.png index 05e4a8c..f0987b0 100644 Binary files a/uncompressed/whatsapp/icon.png and b/uncompressed/whatsapp/icon.png differ -- cgit v1.2.3-70-g09d2 From e30279992a44aeca06b15d1836f7949a0d5e42e2 Mon Sep 17 00:00:00 2001 From: Amine Mouafik Date: Sun, 19 Apr 2020 17:12:13 +0000 Subject: Revert Instagram-related changes in all.json Mixed up with another branch --- all.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/all.json b/all.json index f658631..32527d2 100644 --- a/all.json +++ b/all.json @@ -388,8 +388,8 @@ "author": "Stefan Malzner ", "featured": false, "id": "instagram", - "name": "instagram", - "version": "2.0.2", + "name": "Instagram", + "version": "1.0.0", "icons": { "png": "https://cdn.jsdelivr.net/gh/getferdi/recipes/uncompressed/instagram/icon.png", "svg": "https://cdn.jsdelivr.net/gh/getferdi/recipes/uncompressed/instagram/icon.svg" -- cgit v1.2.3-70-g09d2