From 88364768e1cef4d3245fb71de4fa842eb8a68e2a Mon Sep 17 00:00:00 2001 From: kentarohorie Date: Sun, 26 Jun 2022 20:47:55 +0900 Subject: [PATCH 1/5] Fix instagram regex pattern --- src/services.js | 2 +- test/services.js | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/services.js b/src/services.js index c6b44910..b32e9a7c 100644 --- a/src/services.js +++ b/src/services.js @@ -123,7 +123,7 @@ export default { id: (ids) => ids.join('/embed/'), }, instagram: { - regex: /https?:\/\/www\.instagram\.com\/p\/([^\/\?\&]+)\/?/, + regex: /https?:\/\/www\.instagram\.com\/p\/([^\/\?\&]+)\/?.*/, embedUrl: 'https://www.instagram.com/p/<%= remote_id %>/embed', html: '', height: 505, diff --git a/test/services.js b/test/services.js index 6c49ad8c..3ac0006a 100644 --- a/test/services.js +++ b/test/services.js @@ -279,6 +279,10 @@ describe('Services Regexps', () => { source: 'https://www.instagram.com/p/B--iRCFHVxI/', embed: 'https://www.instagram.com/p/B--iRCFHVxI/embed' }, + { + source: 'https://www.instagram.com/p/CfQzzGNphD8/?utm_source=ig_web_copy_link', + embed: 'https://www.instagram.com/p/CfQzzGNphD8/embed' + }, ]; urls.forEach(url => { From 41556830f74944b7865e06b03aef77800c1c3ba1 Mon Sep 17 00:00:00 2001 From: kentarohorie Date: Sun, 26 Jun 2022 20:48:16 +0900 Subject: [PATCH 2/5] Bump to 2.5.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 718447b1..9ddca9a6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@editorjs/embed", - "version": "2.5.1", + "version": "2.5.2", "keywords": [ "codex editor", "embed", From 939aed17aafaaabd223f88a1d337b86bdc124f20 Mon Sep 17 00:00:00 2001 From: Mikhail Fishchev Date: Tue, 6 Sep 2022 20:39:42 +0300 Subject: [PATCH 3/5] Ignore 'list' parameter if it's known to break YouTube embed --- src/services.js | 6 ++++++ test/services.js | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/services.js b/src/services.js index b32e9a7c..5056497f 100644 --- a/src/services.js +++ b/src/services.js @@ -42,6 +42,12 @@ export default { return null; } + if (value === 'LL' + || value.startsWith('RDMM') + || value.startsWith('FL')) { + return null; + } + return `${paramsMap[name]}=${value}`; }) .filter(param => !!param); diff --git a/test/services.js b/test/services.js index 3ac0006a..a17d1589 100644 --- a/test/services.js +++ b/test/services.js @@ -21,7 +21,10 @@ describe('Services Regexps', () => { const urls = [ { source: 'https://www.youtube.com/watch?v=wZZ7oFKsKzY&t=120', embed: 'https://www.youtube.com/embed/wZZ7oFKsKzY?start=120' }, { source: 'https://www.youtube.com/embed/_q51LZ2HpbE?list=PLLy6qvPKpdlV3OAw00EuZMoYPz4pYuwuN', embed: 'https://www.youtube.com/embed/_q51LZ2HpbE?list=PLLy6qvPKpdlV3OAw00EuZMoYPz4pYuwuN' }, - { source: 'https://www.youtube.com/watch?time_continue=173&v=Nd9LbCWpHp8', embed: 'https://www.youtube.com/embed/Nd9LbCWpHp8?start=173' } + { source: 'https://www.youtube.com/watch?time_continue=173&v=Nd9LbCWpHp8', embed: 'https://www.youtube.com/embed/Nd9LbCWpHp8?start=173' }, + { source: 'https://www.youtube.com/watch?v=efBBjIK3b8I&list=LL&t=1337s', embed: 'https://www.youtube.com/embed/efBBjIK3b8I?start=1337' }, + { source: 'https://www.youtube.com/watch?v=yQUeAin7fII&list=RDMMnMXCzscqi_M', embed: 'https://www.youtube.com/embed/yQUeAin7fII?' }, + { source: 'https://www.youtube.com/watch?v=3kw2sttGXMI&list=FLgc4xqIMDoiP4KOTFS21TJA', embed: 'https://www.youtube.com/embed/3kw2sttGXMI?' }, ]; urls.forEach(url => { From 28953e47f37747ca9fe8fe2e80f24de69b93e538 Mon Sep 17 00:00:00 2001 From: Mikhail Fishchev Date: Wed, 7 Sep 2022 10:05:20 +0300 Subject: [PATCH 4/5] Fix of failing test --- test/services.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/services.js b/test/services.js index a17d1589..39b18761 100644 --- a/test/services.js +++ b/test/services.js @@ -22,7 +22,7 @@ describe('Services Regexps', () => { { source: 'https://www.youtube.com/watch?v=wZZ7oFKsKzY&t=120', embed: 'https://www.youtube.com/embed/wZZ7oFKsKzY?start=120' }, { source: 'https://www.youtube.com/embed/_q51LZ2HpbE?list=PLLy6qvPKpdlV3OAw00EuZMoYPz4pYuwuN', embed: 'https://www.youtube.com/embed/_q51LZ2HpbE?list=PLLy6qvPKpdlV3OAw00EuZMoYPz4pYuwuN' }, { source: 'https://www.youtube.com/watch?time_continue=173&v=Nd9LbCWpHp8', embed: 'https://www.youtube.com/embed/Nd9LbCWpHp8?start=173' }, - { source: 'https://www.youtube.com/watch?v=efBBjIK3b8I&list=LL&t=1337s', embed: 'https://www.youtube.com/embed/efBBjIK3b8I?start=1337' }, + { source: 'https://www.youtube.com/watch?v=efBBjIK3b8I&list=LL&t=1337', embed: 'https://www.youtube.com/embed/efBBjIK3b8I?start=1337' }, { source: 'https://www.youtube.com/watch?v=yQUeAin7fII&list=RDMMnMXCzscqi_M', embed: 'https://www.youtube.com/embed/yQUeAin7fII?' }, { source: 'https://www.youtube.com/watch?v=3kw2sttGXMI&list=FLgc4xqIMDoiP4KOTFS21TJA', embed: 'https://www.youtube.com/embed/3kw2sttGXMI?' }, ]; From 23de06be69bb9e636a2278b0d54f8c2d85d7ae13 Mon Sep 17 00:00:00 2001 From: Peter Savchenko Date: Wed, 7 Sep 2022 14:32:10 +0300 Subject: [PATCH 5/5] increment a patch version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9ddca9a6..840b614a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@editorjs/embed", - "version": "2.5.2", + "version": "2.5.3", "keywords": [ "codex editor", "embed",