From fc9360beea4d420ad3ed8369a89aaac83da9639d Mon Sep 17 00:00:00 2001
From: Jeremy Mahieu <JeremyM@dynamics.be>
Date: Sun, 5 Apr 2020 21:00:30 +0200
Subject: [PATCH 1/5] Add TikTok plugin

---
 js/plugins.js | 42 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

diff --git a/js/plugins.js b/js/plugins.js
index 2dcabc4..d7e4952 100644
--- a/js/plugins.js
+++ b/js/plugins.js
@@ -553,8 +553,48 @@ plugins.factory('userPlugins', function() {
         }
     });
 
+    /*
+     * TikTok embedded player
+     * Very similar to twitter
+     */
+    var tikTokPlugin = new UrlPlugin('TikTok', function(url) {
+        var regex = /^https?:\/\/(www\.)?tiktok\.com\/(.+)/i,
+            match = url.match(regex);
+
+        if (match){
+
+            return function() {
+
+                var element = this.getElement();
+
+                GetEmbedContent( "https://www.tiktok.com/oembed?url=" + url, element);
+
+                function GetEmbedContent(embedurl, element)
+                {
+                    fetch(embedurl)
+                    .then(function(response) {
+                        return response.json();
+                      })
+                    .then(function(data) {
+                        // separate the HTML into content and script tag
+                        var scriptIndex = data.html.indexOf("<script ");
+                        var content = data.html.substr(0, scriptIndex);
+    
+                        element.innerHTML = content;
+    
+                        // The script tag needs to be generated manually or the browser won't load it
+                        var scriptElem = document.createElement('script');
+                        // Hardcoding the URL here, I don't suppose it's going to change anytime soon
+                        scriptElem.src = "https://www.tiktok.com/embed.js";
+                        element.appendChild(scriptElem);
+                    });
+                }
+            };
+        }
+    });
+
     return {
-        plugins: [youtubePlugin, dailymotionPlugin, allocinePlugin, imagePlugin, videoPlugin, audioPlugin, spotifyPlugin, cloudmusicPlugin, googlemapPlugin, asciinemaPlugin, yrPlugin, gistPlugin, pastebinPlugin, giphyPlugin, tweetPlugin, streamablePlugin]
+        plugins: [youtubePlugin, dailymotionPlugin, allocinePlugin, imagePlugin, videoPlugin, audioPlugin, spotifyPlugin, cloudmusicPlugin, googlemapPlugin, asciinemaPlugin, yrPlugin, gistPlugin, pastebinPlugin, giphyPlugin, tweetPlugin, streamablePlugin, tikTokPlugin]
     };
 
 

From 73e1af56262ccd52628d7cc79f68a31edcc4b1fa Mon Sep 17 00:00:00 2001
From: Jeremy Mahieu <JeremyM@dynamics.be>
Date: Sun, 5 Apr 2020 21:06:19 +0200
Subject: [PATCH 2/5] codestyle

---
 js/plugins.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/js/plugins.js b/js/plugins.js
index d7e4952..8297762 100644
--- a/js/plugins.js
+++ b/js/plugins.js
@@ -561,7 +561,7 @@ plugins.factory('userPlugins', function() {
         var regex = /^https?:\/\/(www\.)?tiktok\.com\/(.+)/i,
             match = url.match(regex);
 
-        if (match){
+        if (match) {
 
             return function() {
 
@@ -569,8 +569,7 @@ plugins.factory('userPlugins', function() {
 
                 GetEmbedContent( "https://www.tiktok.com/oembed?url=" + url, element);
 
-                function GetEmbedContent(embedurl, element)
-                {
+                function GetEmbedContent(embedurl, element) {
                     fetch(embedurl)
                     .then(function(response) {
                         return response.json();

From f228c8fce7aa92c5379de2b869b75ba2fc19b0af Mon Sep 17 00:00:00 2001
From: Jeremy Mahieu <JeremyM@dynamics.be>
Date: Mon, 6 Apr 2020 14:18:24 +0200
Subject: [PATCH 3/5] Remove unnecessary function tiktok plugin

---
 js/plugins.js | 38 ++++++++++++++++----------------------
 1 file changed, 16 insertions(+), 22 deletions(-)

diff --git a/js/plugins.js b/js/plugins.js
index 8297762..038f260 100644
--- a/js/plugins.js
+++ b/js/plugins.js
@@ -564,30 +564,24 @@ plugins.factory('userPlugins', function() {
         if (match) {
 
             return function() {
+                fetch("https://www.tiktok.com/oembed?url=" + url)
+                .then(function(response) {
+                    return response.json();
+                    })
+                .then(function(data) {
+                    // separate the HTML into content and script tag
+                    var scriptIndex = data.html.indexOf("<script ");
+                    var content = data.html.substr(0, scriptIndex);
 
-                var element = this.getElement();
+                    var element = this.getElement();
+                    element.innerHTML = content;
 
-                GetEmbedContent( "https://www.tiktok.com/oembed?url=" + url, element);
-
-                function GetEmbedContent(embedurl, element) {
-                    fetch(embedurl)
-                    .then(function(response) {
-                        return response.json();
-                      })
-                    .then(function(data) {
-                        // separate the HTML into content and script tag
-                        var scriptIndex = data.html.indexOf("<script ");
-                        var content = data.html.substr(0, scriptIndex);
-    
-                        element.innerHTML = content;
-    
-                        // The script tag needs to be generated manually or the browser won't load it
-                        var scriptElem = document.createElement('script');
-                        // Hardcoding the URL here, I don't suppose it's going to change anytime soon
-                        scriptElem.src = "https://www.tiktok.com/embed.js";
-                        element.appendChild(scriptElem);
-                    });
-                }
+                    // The script tag needs to be generated manually or the browser won't load it
+                    var scriptElem = document.createElement('script');
+                    // Hardcoding the URL here, I don't suppose it's going to change anytime soon
+                    scriptElem.src = "https://www.tiktok.com/embed.js";
+                    element.appendChild(scriptElem);
+                });
             };
         }
     });

From e253f312a68857ec316c2d021fb8cd0f206cdb41 Mon Sep 17 00:00:00 2001
From: Jeremy Mahieu <JeremyM@dynamics.be>
Date: Mon, 6 Apr 2020 14:44:17 +0200
Subject: [PATCH 4/5] Make tiktok regex more specific

---
 js/plugins.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/js/plugins.js b/js/plugins.js
index 038f260..8218f78 100644
--- a/js/plugins.js
+++ b/js/plugins.js
@@ -558,12 +558,14 @@ plugins.factory('userPlugins', function() {
      * Very similar to twitter
      */
     var tikTokPlugin = new UrlPlugin('TikTok', function(url) {
-        var regex = /^https?:\/\/(www\.)?tiktok\.com\/(.+)/i,
+        var regex = /^https?:\/\/(www\.)?tiktok\.com\/@(.+)\/video\/(.+)/i,
             match = url.match(regex);
 
         if (match) {
 
             return function() {
+                var element = this.getElement();
+                
                 fetch("https://www.tiktok.com/oembed?url=" + url)
                 .then(function(response) {
                     return response.json();
@@ -573,7 +575,6 @@ plugins.factory('userPlugins', function() {
                     var scriptIndex = data.html.indexOf("<script ");
                     var content = data.html.substr(0, scriptIndex);
 
-                    var element = this.getElement();
                     element.innerHTML = content;
 
                     // The script tag needs to be generated manually or the browser won't load it

From 79af5abe3f93c15b9fa576a8c0a135b45e0f9117 Mon Sep 17 00:00:00 2001
From: Jeremy Mahieu <JeremyM@dynamics.be>
Date: Mon, 6 Apr 2020 15:08:19 +0200
Subject: [PATCH 5/5] Add unit tests for tiktok plugin

---
 test/unit/plugins.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/test/unit/plugins.js b/test/unit/plugins.js
index 10a7e53..9d646ab 100644
--- a/test/unit/plugins.js
+++ b/test/unit/plugins.js
@@ -169,5 +169,15 @@ describe('filter', function() {
             plugins);
         }));
 
+        it('should recognize tiktoks', inject(function(plugins) {
+            expectTheseMessagesToContain([
+                'https://www.tiktok.com/@scout2015/video/6718335390845095173',
+                'https://www.tiktok.com/@lewiscatpaldi/video/6800461190058298629',
+                'https://www.tiktok.com/@bhattrai_fam5_kavita/video/6811222914768047365',
+            ],
+            'TikTok',
+            plugins);
+        }));
+
     });
 });